From 810794a2e2984142929563f45fa52bb053d5d96b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 11:46:24 +0000 Subject: [PATCH 0001/1062] c-blosc: 1.20.1 -> 1.21.0 --- pkgs/development/libraries/c-blosc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 7dfcce8e9d8c..a6d9136326b7 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "0a3yrig78plzjbazfqcfrzqhnw17xd0dcayvp4z4kp415kgs2a3s"; + sha256 = "sha256-B8SFOc1oGgU5AGAbkqe5oz045H08TnymNAbzz2oOKoo="; }; nativeBuildInputs = [ cmake ]; From bcc809ac856eb5db8175afef55a7354f29937511 Mon Sep 17 00:00:00 2001 From: David Costa Date: Sun, 24 Jan 2021 16:39:17 +0100 Subject: [PATCH 0002/1062] bundlerEnv: ignore bundler configuration file Change will make packaged ruby application ignore the user-wide bundle configuration. Fix #85989 --- pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index 2bf9d84caa06..3106e9c24ca7 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -34,6 +34,7 @@ paths.each do |path| ENV["BUNDLE_GEMFILE"] = #{gemfile.dump} ENV.delete 'BUNDLE_PATH' ENV['BUNDLE_FROZEN'] = '1' +ENV['BUNDLE_IGNORE_CONFIG'] = '1' Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} } From 47586a182d768f96bda3e25ce32a76f2e8755dbd Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Sat, 24 Apr 2021 22:14:04 +0100 Subject: [PATCH 0003/1062] ffmpeg: add support for libsrt based upon https://github.com/NixOS/nixpkgs/commit/47801afc3d342907fc00ea4467d23af636c4a3c4 --- pkgs/development/libraries/ffmpeg/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 82f1a8bf5646..587eaa9d822b 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -2,6 +2,7 @@ , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d +, srt ? null , openglSupport ? false, libGLU ? null, libGL ? null , libmfxSupport ? false, intel-media-sdk ? null , libaomSupport ? false, libaom ? null @@ -94,6 +95,7 @@ stdenv.mkDerivation rec { # Build flags "--enable-shared" (ifMinVer "0.6" "--enable-pic") + (enableFeature (srt != null) "libsrt") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") "--enable-hardcoded-tables" ] ++ @@ -171,7 +173,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvorbis xz soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers + libvorbis xz soxr x264 x265 xvidcore zlib libopus speex srt nv-codec-headers ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom From d9bf02324af69a6543a3c5131f4a0f58cea6567a Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 2 Jun 2021 02:02:18 +0200 Subject: [PATCH 0004/1062] tk-8_6: fix hash after tcl-8_6 update tcl-8_6 was updated in 4fb92ae60d68344254b2bb753c03fd72f3ffb35c from 8.6.9 -> 8.6.11 but tk's hash wasn't updated at the same time, which means the current hash was still from tk 8.6.9 rather than 8.6.11. --- pkgs/development/interpreters/tcl/8.5.nix | 2 ++ pkgs/development/interpreters/tcl/8.6.nix | 2 ++ pkgs/development/libraries/tk/8.6.nix | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/tcl/8.5.nix b/pkgs/development/interpreters/tcl/8.5.nix index 193ff4f93769..9daf67fe2bd0 100644 --- a/pkgs/development/interpreters/tcl/8.5.nix +++ b/pkgs/development/interpreters/tcl/8.5.nix @@ -4,6 +4,8 @@ callPackage ./generic.nix (args // rec { release = "8.5"; version = "${release}.18"; + # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated! + src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3"; diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix index 37a7fee8a859..03fcb8317792 100644 --- a/pkgs/development/interpreters/tcl/8.6.nix +++ b/pkgs/development/interpreters/tcl/8.6.nix @@ -4,6 +4,8 @@ callPackage ./generic.nix (args // rec { release = "8.6"; version = "${release}.11"; + # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated! + src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c"; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index fdffbeba2c93..33e3f8e41675 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x - sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; + sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00"; }; patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; From 03137b50d2e44e4649e505a429deac7272c3084f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 17 Jun 2021 11:01:16 -0400 Subject: [PATCH 0005/1062] darwin.Libsystem: add definitions TARGET_OS_{IOS,WATCH,BRIDGE,TV,SIMULATOR,NANO} to TargetConditionals.h These are defined in the SDK for Apple compilers and some projects assume those are defined unconditionally. https://reviews.llvm.org/D103598 --- .../darwin/apple-source-releases/Libsystem/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index cb85566b5128..66190b7b4e37 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -69,7 +69,13 @@ appleDerivation' stdenv { #define TARGET_OS_UNIX 0 #define TARGET_OS_EMBEDDED 0 #define TARGET_OS_IPHONE 0 + #define TARGET_OS_IOS 0 + #define TARGET_OS_WATCH 0 + #define TARGET_OS_BRIDGE 0 + #define TARGET_OS_TV 0 + #define TARGET_OS_SIMULATOR 0 #define TARGET_IPHONE_SIMULATOR 0 + #define TARGET_OS_NANO 0 #define TARGET_OS_LINUX 0 #define TARGET_CPU_PPC 0 From 4c483076c5658911dc9860bef15c19da29a0248f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 17 Jun 2021 11:04:04 -0400 Subject: [PATCH 0006/1062] Revert "llvmPackages_12.compiler-rt: fix build on darwin" This is not needed after we've added the defintions to the TargetConditionals.h from darwin.Libsystem This reverts commit cf4e1b9e62ab987552eb676f7618ea085f12a751. --- .../darwin-targetconditionals.patch | 71 ------------------- .../compilers/llvm/12/compiler-rt/default.nix | 2 - 2 files changed, 73 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index cde1317ca35d..895af8f2f020 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation { # extra `/`. ./normalize-var.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - # Prevent a compilation error on darwin - ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks From 2810201833ae619818179f11a225b2d584d25ec9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 9 Mar 2020 02:10:06 -0400 Subject: [PATCH 0007/1062] netbsd: Split out path merging from bsd setup hook I plan on doing the sources for FreeBSD differently. Indeed we might want to change this for NetBSD too eventually. In any event, the way we manage sources is not intrinsically the same across BSDs so it makes sense to pull this out. --- pkgs/os-specific/bsd/netbsd/default.nix | 41 +++++++++++++---------- pkgs/os-specific/bsd/netbsd/setup-hook.sh | 10 ++++++ pkgs/os-specific/bsd/setup-hook.sh | 6 ---- 3 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 pkgs/os-specific/bsd/netbsd/setup-hook.sh diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 1e9331480007..b903bc461560 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -16,6 +16,10 @@ let tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; }; + netbsdSetupHook = makeSetupHook { + name = "netbsd-setup-hook"; + } ./setup-hook.sh; + otherSplices = { selfBuildBuild = pkgsBuildBuild.netbsd; selfBuildHost = pkgsBuildHost.netbsd; @@ -60,7 +64,7 @@ in lib.makeScopeWithSplicing extraPaths = [ ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder mandoc groff statHook rsync ]; @@ -118,7 +122,7 @@ in lib.makeScopeWithSplicing version = "9.2"; buildInputs = with self; []; - nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook rsync ]; + nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook rsync ]; skipIncludesPhase = true; @@ -126,6 +130,7 @@ in lib.makeScopeWithSplicing patchShebangs configure ${self.make.postPatch} ''; + buildPhase = '' runHook preBuild @@ -133,6 +138,7 @@ in lib.makeScopeWithSplicing runHook postBuild ''; + installPhase = '' runHook preInstall @@ -143,6 +149,7 @@ in lib.makeScopeWithSplicing runHook postInstall ''; + extraPaths = with self; [ make.src ] ++ make.extraPaths; }; @@ -165,7 +172,7 @@ in lib.makeScopeWithSplicing HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc"; nativeBuildInputs = with buildPackages.netbsd; commonDeps ++ [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal rsync ]; @@ -238,7 +245,7 @@ in lib.makeScopeWithSplicing sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = with self; [ mtree.src make.src ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal mandoc groff rsync ]; @@ -262,7 +269,7 @@ in lib.makeScopeWithSplicing sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "9.2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook rsync + bsdSetupHook netbsdSetupHook rsync ]; propagatedBuildInputs = with self; compatIfNeeded; extraPaths = with self; [ @@ -298,7 +305,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -320,7 +327,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -331,7 +338,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -433,7 +440,7 @@ in lib.makeScopeWithSplicing HOSTPROG = "tic"; buildInputs = with self; compatIfNeeded; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff nbperf ]; @@ -465,7 +472,7 @@ in lib.makeScopeWithSplicing sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc byacc flex rsync ]; buildInputs = with self; compatIfNeeded; @@ -483,7 +490,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync nbperf rpcgen ]; @@ -510,7 +517,7 @@ in lib.makeScopeWithSplicing propagatedBuildInputs = with self; [ include ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder statHook rsync uudecode config genassym ]; @@ -573,7 +580,7 @@ in lib.makeScopeWithSplicing sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; extraPaths = with self; [ common libc.src sys.src ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal byacc install tsort lorder mandoc statHook ]; @@ -607,7 +614,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder mandoc statHook nbperf tic ]; buildInputs = with self; compatIfNeeded; @@ -670,7 +677,7 @@ in lib.makeScopeWithSplicing makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder rpcgen statHook ]; @@ -748,7 +755,7 @@ in lib.makeScopeWithSplicing sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff flex byacc genassym gencat lorder tsort statHook rsync @@ -786,7 +793,7 @@ in lib.makeScopeWithSplicing (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff flex byacc genassym gencat lorder tsort statHook rsync rpcgen diff --git a/pkgs/os-specific/bsd/netbsd/setup-hook.sh b/pkgs/os-specific/bsd/netbsd/setup-hook.sh new file mode 100644 index 000000000000..17a8d6fca84a --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/setup-hook.sh @@ -0,0 +1,10 @@ +mergeNetBSDSourceDir() { + # merge together all extra paths + # there should be a better way to do this + chmod -R u+w $BSDSRCDIR + for path in $extraPaths; do + rsync -Er --chmod u+w $path/ $BSDSRCDIR/ + done +} + +postUnpackHooks+=(mergeNetBSDSourceDir) diff --git a/pkgs/os-specific/bsd/setup-hook.sh b/pkgs/os-specific/bsd/setup-hook.sh index 98fee66f5dfe..ec23620b194b 100644 --- a/pkgs/os-specific/bsd/setup-hook.sh +++ b/pkgs/os-specific/bsd/setup-hook.sh @@ -63,15 +63,9 @@ addMakeFlags() { } setBSDSourceDir() { - # merge together all extra paths - # there should be a better way to do this sourceRoot=$PWD/$sourceRoot export BSDSRCDIR=$sourceRoot export _SRC_TOP_=$BSDSRCDIR - chmod -R u+w $sourceRoot - for path in $extraPaths; do - rsync -Er --chmod u+w $path/ $sourceRoot/ - done cd $sourceRoot if [ -d "$BSD_PATH" ] From c5f0c9273be61437075c214c14e655f64dedda2c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 26 Jul 2021 13:12:36 +0200 Subject: [PATCH 0008/1062] systemd: nixpkgs-fmt --- pkgs/os-specific/linux/systemd/default.nix | 105 ++++++++++----------- 1 file changed, 51 insertions(+), 54 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a33bb3c1a1d6..816952985f53 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -90,7 +90,6 @@ # name argument , pname ? "systemd" - , libxslt , docbook_xsl , docbook_xml_dtd_42 @@ -267,55 +266,53 @@ stdenv.mkDerivation { outputs = [ "out" "man" "dev" ]; - nativeBuildInputs = - [ - pkg-config - gperf - ninja - meson - coreutils # meson calls date, stat etc. - glibcLocales - patchelf - getent - m4 + nativeBuildInputs = [ + pkg-config + gperf + ninja + meson + coreutils # meson calls date, stat etc. + glibcLocales + patchelf + getent + m4 - intltool - gettext + intltool + gettext - libxslt - docbook_xsl - docbook_xml_dtd_42 - docbook_xml_dtd_45 - (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ])) - ]; + libxslt + docbook_xsl + docbook_xml_dtd_42 + docbook_xml_dtd_45 + (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ])) + ]; - buildInputs = - [ - acl - audit - glib - kmod - libcap - libgcrypt - libidn2 - libuuid - linuxHeaders - pam - ] + buildInputs = [ + acl + audit + glib + kmod + libcap + libgcrypt + libidn2 + libuuid + linuxHeaders + pam + ] - ++ lib.optional withApparmor libapparmor - ++ lib.optional wantCurl (lib.getDev curl) - ++ lib.optionals withCompression [ bzip2 lz4 xz ] - ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) - ++ lib.optional withEfi gnu-efi - ++ lib.optional withKexectools kexectools - ++ lib.optional withLibseccomp libseccomp - ++ lib.optional withNetworkd iptables - ++ lib.optional withPCRE2 pcre2 - ++ lib.optional withResolved libgpgerror - ++ lib.optional withSelinux libselinux - ++ lib.optional withRemote libmicrohttpd - ++ lib.optionals withHomed [ p11-kit libfido2 ] + ++ lib.optional withApparmor libapparmor + ++ lib.optional wantCurl (lib.getDev curl) + ++ lib.optionals withCompression [ bzip2 lz4 xz ] + ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) + ++ lib.optional withEfi gnu-efi + ++ lib.optional withKexectools kexectools + ++ lib.optional withLibseccomp libseccomp + ++ lib.optional withNetworkd iptables + ++ lib.optional withPCRE2 pcre2 + ++ lib.optional withResolved libgpgerror + ++ lib.optional withSelinux libselinux + ++ lib.optional withRemote libmicrohttpd + ++ lib.optionals withHomed [ p11-kit libfido2 ] ; #dontAddPrefix = true; @@ -368,14 +365,14 @@ stdenv.mkDerivation { "-Db_pie=true" "-Dinstall-sysconfdir=false" /* - As of now, systemd doesn't allow runtime configuration of these values. So - the settings in /etc/login.defs have no effect on it. Many people think this - should be supported however, see - - https://github.com/systemd/systemd/issues/3855 - - https://github.com/systemd/systemd/issues/4850 - - https://github.com/systemd/systemd/issues/9769 - - https://github.com/systemd/systemd/issues/9843 - - https://github.com/systemd/systemd/issues/10184 + As of now, systemd doesn't allow runtime configuration of these values. So + the settings in /etc/login.defs have no effect on it. Many people think this + should be supported however, see + - https://github.com/systemd/systemd/issues/3855 + - https://github.com/systemd/systemd/issues/4850 + - https://github.com/systemd/systemd/issues/9769 + - https://github.com/systemd/systemd/issues/9843 + - https://github.com/systemd/systemd/issues/10184 */ "-Dsystem-uid-max=999" "-Dsystem-gid-max=999" From 444292aae881d7494f95ec052565c69197d76757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Jul 2021 13:14:06 +0200 Subject: [PATCH 0009/1062] systemd: push version further down, use rec --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 816952985f53..45786151aa8b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -112,10 +112,10 @@ assert withCryptsetup -> let wantCurl = withRemote || withImportd; - version = "247.6"; in -stdenv.mkDerivation { - inherit version pname; +stdenv.mkDerivation rec { + inherit pname; + version = "247.6"; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. From b6ac1dedf50af4cc70b9c0ce7e774fe20896c1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Jul 2021 13:18:24 +0200 Subject: [PATCH 0010/1062] systemd: remove patchelf, coreutils from nativeBuildInputs as it is part of the stdenv --- pkgs/os-specific/linux/systemd/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 45786151aa8b..fc4c6c872b49 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -12,7 +12,6 @@ , coreutils , gperf , getent -, patchelf , glibcLocales , glib , substituteAll @@ -271,9 +270,7 @@ stdenv.mkDerivation rec { gperf ninja meson - coreutils # meson calls date, stat etc. glibcLocales - patchelf getent m4 From 01ccfa48595692dc3f13239eaaa188d10c79e80d Mon Sep 17 00:00:00 2001 From: V Date: Tue, 27 Jul 2021 07:56:45 +0200 Subject: [PATCH 0011/1062] bundler: 2.2.20 -> 2.2.24 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 912bace20201..330664836821 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.2.20"; - source.sha256 = "259ba486173d72a71df43fee8e3bc8dcb868c8a65e0c4020af3a6f13c3a57ff8"; + version = "2.2.24"; + source.sha256 = "1x3czmqhlyb593ap7mxkk47idi2jnbnrpwj8xlsjdpi7iair9y62"; dontPatchShebangs = true; postFixup = '' From f95ff13919d63e4df060e0f2a8ea10fa5e096774 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 16:46:40 +0200 Subject: [PATCH 0012/1062] which: replace name with pname&version --- pkgs/tools/system/which/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index f4c871d5af08..de823f98596a 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "which-2.21"; + pname = "which"; + version = "2.21"; src = fetchurl { - url = "mirror://gnu/which/${name}.tar.gz"; + url = "mirror://gnu/which/which-${version}.tar.gz"; sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; }; From 7cd26e87963a4c7e849a35a23bbae20e0f267b05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 18:33:24 +0000 Subject: [PATCH 0013/1062] gnomeExtensions.arcmenu: 12 -> 14 --- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 2720026357d2..68898fa42b0e 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "12"; + version = "14"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-R1OUDf/YMyMlxwXM9rNsrasPumHEoYhJK0evnYGeIkA="; + sha256 = "sha256-Iobu5eNWSvAiTRe6wyx/0PgUtB9QIC9KdH0M1xhsM1I="; }; patches = [ From 8deddc21331bb86cf45d6f22afd8f54733d6d603 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 28 Jul 2021 23:27:45 +0200 Subject: [PATCH 0014/1062] yabar: support cross-compilation, format --- .../window-managers/yabar/build.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index f9b5d227b0e8..207e3a83ab2b 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -19,16 +19,33 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + pkg-config + asciidoc + docbook_xsl + libxslt + makeWrapper + libconfig + pango + ]; buildInputs = [ - cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl - alsa-lib wirelesstools asciidoc libxslt makeWrapper + cairo + gdk-pixbuf + libconfig + pango + xcbutilwm + alsa-lib + wirelesstools ]; postPatch = '' substituteInPlace ./Makefile \ --replace "\$(shell git describe)" "${version}" \ - --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" + --replace "a2x" "a2x --no-xmllint" ''; makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; From acf77c298e0fcc0bcc3ddcdcd2bce80c41a3b43d Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 28 Jul 2021 23:51:19 +0200 Subject: [PATCH 0015/1062] libaom: support cross-compilation by setting AS --- pkgs/development/libraries/libaom/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 4a78f3c5e51d..83bfffe6b975 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: "-DCONFIG_RUNTIME_CPU_DETECT=0" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as" ]; postFixup = '' From ba7992dc54a7b813c2131a750c8948c915cfe84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 10:23:37 +0200 Subject: [PATCH 0016/1062] gawk: format, cleanup --- pkgs/tools/text/gawk/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index fd746ca117e8..3eb9ed3000c2 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -15,9 +15,6 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; -let - inherit (lib) optional; -in stdenv.mkDerivation rec { pname = "gawk"; version = "5.1.0"; @@ -28,14 +25,14 @@ stdenv.mkDerivation rec { }; # When we do build separate interactive version, it makes sense to always include man. - outputs = [ "out" "info" ] ++ optional (!interactive) "man"; + outputs = [ "out" "info" ] + ++ lib.optional (!interactive) "man"; - nativeBuildInputs = optional (doCheck && stdenv.isLinux) glibcLocales; + nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales; - buildInputs = - optional withSigsegv libsigsegv - ++ optional interactive readline - ++ optional stdenv.isDarwin locale; + buildInputs = lib.optional withSigsegv libsigsegv + ++ lib.optional interactive readline + ++ lib.optional stdenv.isDarwin locale; configureFlags = [ (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv") @@ -60,7 +57,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnu.org/software/gawk/"; description = "GNU implementation of the Awk programming language"; - longDescription = '' Many computer users need to manipulate text files: extract and then operate on data from parts of certain lines while discarding the rest, @@ -74,11 +70,8 @@ stdenv.mkDerivation rec { makes it possible to handle many data-reformatting jobs with just a few lines of code. ''; - license = licenses.gpl3Plus; - platforms = platforms.unix ++ platforms.windows; - maintainers = [ ]; }; } From d540e306be8aabd95ecd2206bb3439605d7d9716 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Jul 2021 11:29:58 +0200 Subject: [PATCH 0017/1062] dav1d: 0.9.0 -> 0.9.1 --- pkgs/development/libraries/dav1d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index fe6926fe809a..c85e14257885 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -10,14 +10,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0ki3wlyaqr80gl1srbbd18dd5bs1sl9icxym8ar62abpvgzxl5yk"; + sha256 = "15ngaqyjbwkj0rd9mvxaqf3i9vzsnlrqgr50cnxxjqnpf7xdmslj"; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; From 7a45ae6de6e49301ed955dc6310920386260973e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:41:11 +0200 Subject: [PATCH 0018/1062] hologram: cleanup --- pkgs/tools/security/hologram/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index c4e90bd94bb2..ebb884378267 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -2,13 +2,12 @@ buildGoPackage rec { pname = "hologram"; - version = "2018-03-19"; - rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac"; + version = "unstable-2018-03-19"; src = fetchFromGitHub { owner = "AdRoll"; repo = "hologram"; - inherit rev; + rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac"; sha256 = "00scryz8js6gbw8lp2y23qikbazz2dd992r97rqh0l1q4baa0ckn"; }; From 371ebd83c8dbc75bdffba0860827fa301f4506d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:41:16 +0200 Subject: [PATCH 0019/1062] mbox: cleanup --- pkgs/tools/security/mbox/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index d7a303a3672f..a39d226aac57 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "mbox"; - version = "20140526"; + version = "unstable-2014-05-26"; src = fetchFromGitHub { owner = "tsgates"; @@ -28,13 +28,12 @@ stdenv.mkDerivation { ./testall.sh ''; - meta = with lib; - { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; - homepage = "http://pdos.csail.mit.edu/mbox/"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - broken = true; - }; - + meta = with lib; { + description = "Lightweight sandboxing mechanism that any user can use without special privileges"; + homepage = "http://pdos.csail.mit.edu/mbox/"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + broken = true; + }; } From 61f5b6271d23a9b70e3917585990a846d57a25c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:41:22 +0200 Subject: [PATCH 0020/1062] meo: cleanup --- pkgs/tools/security/meo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 4b96f2b42c23..491bef3e0543 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "meo"; - version = "20121113"; + version = "unstable-2012-11-13"; src = fetchhg { url = "http://oss.stamfest.net/hg/meo"; @@ -25,12 +25,12 @@ stdenv.mkDerivation { cp meo-gui/meo-gui $out/bin ''; - meta = { + meta = with lib; { homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only"; description = "Tools to use cryptography for things like four-eyes principles"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.linux; broken = true; }; } From 7803a33a629bdd95970c93ce97c37ef31c62053f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:41:27 +0200 Subject: [PATCH 0021/1062] pwgen: cleanup --- pkgs/tools/security/pwgen/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index fc410f19843b..6da6c1e1741b 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,17 +1,22 @@ -{lib, stdenv, fetchurl, autoreconfHook}: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + stdenv.mkDerivation rec { pname = "pwgen"; version = "2.08"; - src = fetchurl { - url = "https://github.com/tytso/pwgen/archive/v${version}.tar.gz"; - sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; + src = fetchFromGitHub { + owner = "tytso"; + repo = "pwgen"; + rev = "v${version}"; + sha256 = "8d6e94f58655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with lib; { description = "Password generator which creates passwords which can be easily memorized by a human"; - platforms = lib.platforms.all; + maintainers = with maintainers; [ ]; + license = with licenses; [ gpl2Only ]; + platforms = platforms.all; }; } From 0c175998c7752d9e9873ce70bc68cfb96497e730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:42:11 +0200 Subject: [PATCH 0022/1062] ipmitool: cleanup --- pkgs/tools/system/ipmitool/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 416fab94ddc9..2ad0d11f95f0 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -1,11 +1,8 @@ { stdenv, lib, fetchurl, openssl, fetchpatch, static ? stdenv.hostPlatform.isStatic }: -let +stdenv.mkDerivation rec { pname = "ipmitool"; version = "1.8.18"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; From 6f5e013d53c681d8ff2d061528a046afbf1c52a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:43:04 +0200 Subject: [PATCH 0023/1062] loadwatch: cleanup --- pkgs/tools/system/loadwatch/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/tools/system/loadwatch/default.nix index 722e5a9afde1..27e33a22d4b9 100644 --- a/pkgs/tools/system/loadwatch/default.nix +++ b/pkgs/tools/system/loadwatch/default.nix @@ -1,17 +1,20 @@ -{ lib, stdenv, fetchgit, ... }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "loadwatch"; version = "1.1-1-g6d2544c"; + src = fetchgit { url = "git://woffs.de/git/fd/loadwatch.git"; sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e"; }; + installPhase = '' mkdir -p $out/bin install loadwatch lw-ctl $out/bin ''; + meta = with lib; { description = "Run a program using only idle cycles"; license = licenses.gpl2; From 26664dad9263fc52416c26461f020ed18225e72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:44:18 +0200 Subject: [PATCH 0024/1062] localtime: cleanup --- pkgs/tools/system/localtime/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 4c12c9eb27da..0ad17c6c6595 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "localtime"; - version = "2017-11-07"; + version = "unstable-2017-11-07"; src = fetchFromGitHub { owner = "Stebalien"; @@ -32,6 +32,7 @@ buildGoPackage rec { meta = with lib; { description = "A daemon for keeping the system timezone up-to-date based on the current location"; homepage = "https://github.com/Stebalien/localtime"; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl3; }; From 66cd9d343b547e20e8ca78e38905da03ab86ab82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:44:36 +0200 Subject: [PATCH 0025/1062] opencl-info: cleanup --- pkgs/tools/system/opencl-info/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix index 173de5f607fe..124b53512d72 100644 --- a/pkgs/tools/system/opencl-info/default.nix +++ b/pkgs/tools/system/opencl-info/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "opencl-info"; - version = "2014-02-21"; + version = "unstable-2014-02-21"; src = fetchFromGitHub { owner = "marchv"; From 408f5304a6e7b0c69048cdd9c03fcb2b29baa2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:44:59 +0200 Subject: [PATCH 0026/1062] rowhammer-test: cleanup --- pkgs/tools/system/rowhammer-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 685697f861ff..993bfdaf834a 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "rowhammer-test"; - version = "20150811"; + version = "unstable-2015-08-11"; src = fetchFromGitHub { owner = "google"; repo = "rowhammer-test"; - rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; # 2015-08-11 + rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; From e4ade0952aed4ab76a40a4c9265d6e25e3ea93a2 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 29 Jul 2021 20:39:13 +0200 Subject: [PATCH 0027/1062] srtp: support cross, switch to cmake, enable tests --- pkgs/development/libraries/srtp/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 0dbfef2c6394..8bf6c6d11d5a 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config -, openssl ? null, libpcap ? null +, openssl, libpcap, cmake }: with lib; @@ -16,21 +16,26 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config cmake ]; # libsrtp.pc references -lcrypto -lpcap without -L propagatedBuildInputs = [ openssl libpcap ]; - configureFlags = [ - "--disable-debug" - ] ++ optional (openssl != null) "--enable-openssl"; - - buildFlags = [ "shared_library" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DENABLE_OPENSSL=ON" + "-DBUILD_TESTING=ON" + ]; postInstall = '' rm -rf $out/bin ''; + doCheck = true; + preCheck = '' + export LD_PRELOAD=./libsrtp2.so + ''; + meta = { homepage = "https://github.com/cisco/libsrtp"; description = "Secure RTP (SRTP) Reference Implementation"; From aa0011881bab9e743cb77b49f23d793bc5460bec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 18:54:24 +0000 Subject: [PATCH 0028/1062] hwinfo: 21.75 -> 21.76 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 9ee77bfc6d3d..bf9e5cd9438b 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.75"; + version = "21.76"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-w2Lb+4FvPXw2uFqwsmzVdKIXY8IXV/TAb8FHFPl/K40="; + sha256 = "sha256-C0aYEgJC+ITxWcYBLPehNz9J1Y25gS1+UDVc3+7nIKQ="; }; postPatch = '' From 23e348bfe2b161e761dd37e3be86a807f3cd6f94 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Apr 2021 11:42:10 +0200 Subject: [PATCH 0029/1062] python2 and python3: build unoptimized bytecode again In 9d03ff52229f36ff4b4e9d0ee2db4a46b90512bb I made the CPython builds reproducible. This required not generating default unoptimized bytecode. I was under the impression the optimized bytecode would be used then, but you need to opt-in on that. Not having the default bytecode resulted in a significant performance hit. Therefore, bytecode is generated again in this commit, and thereby the builds are no longer reproducible. https://bugs.python.org/issue29708 --- .../interpreters/python/cpython/2.7/default.nix | 12 ++++++++---- .../interpreters/python/cpython/default.nix | 16 +++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5ee88ebb8810..ad2b7fe68605 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -27,9 +27,9 @@ , sha256 , passthruFun , static ? false -, stripBytecode ? reproducibleBuild +, stripBytecode ? true , rebuildBytecode ? true -, reproducibleBuild ? true +, reproducibleBuild ? false , enableOptimizations ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -48,6 +48,8 @@ assert lib.assertMsg (reproducibleBuild -> stripBytecode) assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations)) "Deterministic builds are not achieved when optimizations are enabled."; +assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) + "Deterministic builds are not achieved when (default unoptimized) bytecode is created."; with lib; @@ -296,8 +298,10 @@ in with passthru; stdenv.mkDerivation ({ # First we delete all old bytecode. find $out -name "*.pyc" -delete '' + optionalString rebuildBytecode '' - # Then, we build for the two optimization levels. - # We do not build unoptimized bytecode, because its not entirely deterministic yet. + # We build 3 levels of optimized bytecode. Note the default level, without optimizations, + # is not reproducible yet. https://bugs.python.org/issue29708 + # Not creating bytecode will result in a large performance loss however, so we do build it. + find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + optionalString stdenv.hostPlatform.isCygwin '' diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index f52255f4748b..d59d3cb44708 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -35,7 +35,7 @@ , stripTests ? false , stripTkinter ? false , rebuildBytecode ? true -, stripBytecode ? reproducibleBuild +, stripBytecode ? true , includeSiteCustomize ? true , static ? stdenv.hostPlatform.isStatic , enableOptimizations ? false @@ -46,7 +46,7 @@ # enabling LTO on 32bit arch causes downstream packages to fail when linking # enabling LTO on *-darwin causes python3 to fail when linking. , enableLTO ? stdenv.is64bit && stdenv.isLinux -, reproducibleBuild ? true +, reproducibleBuild ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -73,6 +73,9 @@ assert lib.assertMsg (reproducibleBuild -> stripBytecode) assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations)) "Deterministic builds are not achieved when optimizations are enabled."; +assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) + "Deterministic builds are not achieved when (default unoptimized) bytecode is created."; + with lib; let @@ -422,11 +425,14 @@ in with passthru; stdenv.mkDerivation { # First we delete all old bytecode. find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" '' + optionalString rebuildBytecode '' - # Then, we build for the two optimization levels. - # We do not build unoptimized bytecode, because its not entirely deterministic yet. # Python 3.7 implements PEP 552, introducing support for deterministic bytecode. - # compileall uses this checked-hash method by default when `SOURCE_DATE_EPOCH` is set. + # compileall uses the therein introduced checked-hash method by default when + # `SOURCE_DATE_EPOCH` is set. # We exclude lib2to3 because that's Python 2 code which fails + # We build 3 levels of optimized bytecode. Note the default level, without optimizations, + # is not reproducible yet. https://bugs.python.org/issue29708 + # Not creating bytecode will result in a large performance loss however, so we do build it. + find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - ''; From 1d1ef50501d0dd2d30394b5e0ca1d8aec8498988 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Jul 2021 07:30:36 +0000 Subject: [PATCH 0030/1062] rustc: 1.53.1 -> 1.54.0 Tested builds of fd and firefox on x86_64-linux. --- .../compilers/rust/{1_53.nix => 1_54.nix} | 30 +++++++++---------- pkgs/top-level/all-packages.nix | 8 ++--- 2 files changed, 19 insertions(+), 19 deletions(-) rename pkgs/development/compilers/rust/{1_53.nix => 1_54.nix} (56%) diff --git a/pkgs/development/compilers/rust/1_53.nix b/pkgs/development/compilers/rust/1_54.nix similarity index 56% rename from pkgs/development/compilers/rust/1_53.nix rename to pkgs/development/compilers/rust/1_54.nix index dda6d3931903..b31dbc8bb9a9 100644 --- a/pkgs/development/compilers/rust/1_53.nix +++ b/pkgs/development/compilers/rust/1_54.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.53.0"; - rustcSha256 = "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw"; + rustcVersion = "1.54.0"; + rustcSha256 = "0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; @@ -34,24 +34,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.52.1"; + bootstrapVersion = "1.53.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "c91f0431c8137a4e98e097ab47b49846820531aafb6e9c249b71b770771832e9"; - x86_64-unknown-linux-gnu = "617ae06e212cb65bc4abbf52b158b0328b9f1a6c2f822c27c95b274d6fbc0627"; - x86_64-unknown-linux-musl = "c3eae6e78ee29e03416897f89b54448b2a03d063f07a78cde41757ad2e02c2f0"; - arm-unknown-linux-gnueabihf = "ef412d923a0c5a9fa54422f40cde62f2e85a62339057cb8b986a545b108d3347"; - armv7-unknown-linux-gnueabihf = "ec47b3f5c801f8a4df7180e088dcc1817ee160df34ef64ddac4fa50f714f119f"; - aarch64-unknown-linux-gnu = "17d9aa7bb73b819ef70d81013498727b7218533ee6cf3bd802c4eac29137fbcb"; - aarch64-unknown-linux-musl = "f2bae2b32f05a90eec041352d9329deb3e907f5560b9fda525788df3b8008b6b"; - x86_64-apple-darwin = "cfa73228ea54e2c94f75d1b142ea41444c463f4ee8562a3eca1b11b2fe8af95a"; - aarch64-apple-darwin = "217e9723f828c5359467d69b363a342d702bdcbbcc4107be907e6bc4531f4912"; - powerpc64le-unknown-linux-gnu = "f258c5d7d6d9022108672b7383412d930a5f59d7644d148e413c3ab0ae45604f"; - riscv64gc-unknown-linux-gnu = "c1c98ccc8bb4147a819411a10162c8f8ce1aaa5c65cf2c74802dce4dacd6e64b"; + i686-unknown-linux-gnu = "4ebeeba05448b9484bb2845dba2ff4c0e2b7208fa8b08bef2b2ca3b171d0db99"; + x86_64-unknown-linux-gnu = "5e9e556d2ccce27aa8f01a528f1348bf8cdd34496c35ec2abf131660b9792fed"; + x86_64-unknown-linux-musl = "908b6163b62660f289bcd1eda1a0eb6d849b4b29da12546d24a033e5718e93ff"; + arm-unknown-linux-gnueabihf = "6ae3108f4a0b0478c76f5dbaf1827c9e4a983fa78a9f973b24d501e693cfdcab"; + armv7-unknown-linux-gnueabihf = "886e78f7c5bd92e16322ca3af70d1899c064837343cdfeb9a216b76edfd18157"; + aarch64-unknown-linux-gnu = "cba81d5c3d16deee04098ea18af8636bc7415315a44c9e44734fd669aa778040"; + aarch64-unknown-linux-musl = "a0065a6313bf370f2844af6f3b47fe292360e9cca3da31b5f6cb32db311ba686"; + x86_64-apple-darwin = "940a4488f907b871f9fb1be309086509e4a48efb19303f8b5fe115c6f12abf43"; + aarch64-apple-darwin = "c519da905514c05240a8fe39e459de2c4ef5943535e3655502e8fb756070aee1"; + powerpc64le-unknown-linux-gnu = "9f6c17427d1023b10694e4ba60d6d9deec0aeb07d051f99763789ed18e07e2e6"; + riscv64gc-unknown-linux-gnu = "6ae23ac00269df72b0790f10f2d9a98d03acf542c6090f4d30a87365fafd14ed"; }; - selectRustPackage = pkgs: pkgs.rust_1_53; + selectRustPackage = pkgs: pkgs.rust_1_54; rustcPatches = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a77b27b3002a..a099392d2720 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12047,19 +12047,19 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_10 = llvmPackages_10.libllvm; }; - rust_1_53 = callPackage ../development/compilers/rust/1_53.nix { + rust_1_54 = callPackage ../development/compilers/rust/1_54.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_12 = llvmPackages_12.libllvm; }; - rust = rust_1_53; + rust = rust_1_54; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_53 = rust_1_53.packages.stable; - rustPackages = rustPackages_1_53; + rustPackages_1_54 = rust_1_54.packages.stable; + rustPackages = rustPackages_1_54; inherit (rustPackages) cargo clippy rustc rustPlatform; From 9e3ca9d8ee0edd5e0ef4b92d90d796fc6e9f6adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Jul 2021 09:51:43 +0200 Subject: [PATCH 0031/1062] cmake: format, cleanup --- .../tools/build-managers/cmake/default.nix | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 2de586f97cbf..c12b8f5acc92 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { pname = "cmake" - + lib.optionalString isBootstrap "-boot" - + lib.optionalString useNcurses "-cursesUI" - + lib.optionalString withQt5 "-qt5UI"; + + lib.optionalString isBootstrap "-boot" + + lib.optionalString useNcurses "-cursesUI" + + lib.optionalString withQt5 "-qt5UI"; version = "3.19.7"; src = fetchurl { @@ -48,8 +48,7 @@ stdenv.mkDerivation rec { ++ lib.optionals buildDocs [ texinfo ] ++ lib.optionals withQt5 [ wrapQtAppsHook ]; - buildInputs = [] - ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] + buildInputs = lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] ++ lib.optional useOpenSSL openssl ++ lib.optional useNcurses ncurses ++ lib.optional withQt5 qtbase; @@ -62,27 +61,24 @@ stdenv.mkDerivation rec { --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} - '' - # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake - + '' + # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" ''; configureFlags = [ "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup - ++ lib.optional withQt5 "--qt-gui" - ++ lib.optionals buildDocs [ - "--sphinx-build=${sphinx}/bin/sphinx-build" - "--sphinx-man" - "--sphinx-info" - ] - # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 - ++ lib.optionals stdenv.hostPlatform.is32bit [ - "CFLAGS=-D_FILE_OFFSET_BITS=64" - "CXXFLAGS=-D_FILE_OFFSET_BITS=64" - ] - ++ [ + ++ lib.optional withQt5 "--qt-gui" + ++ lib.optionals buildDocs [ + "--sphinx-build=${sphinx}/bin/sphinx-build" + "--sphinx-man" + "--sphinx-info" + ] + # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 + ++ lib.optionals stdenv.hostPlatform.is32bit [ + "CFLAGS=-D_FILE_OFFSET_BITS=64" + "CXXFLAGS=-D_FILE_OFFSET_BITS=64" + ] ++ [ "--" # We should set the proper `CMAKE_SYSTEM_NAME`. # http://www.cmake.org/Wiki/CMake_Cross_Compiling @@ -117,8 +113,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://cmake.org/"; - changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/" - + "release/${lib.versions.majorMinor version}.html"; + changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/release/${lib.versions.majorMinor version}.html"; description = "Cross-Platform Makefile Generator"; longDescription = '' CMake is an open-source, cross-platform family of tools designed to From 419a0f39acdfdff50c3fbc878ecbe67ca628d855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Jul 2021 15:10:52 +0200 Subject: [PATCH 0032/1062] cacert: convert to pname + version, format, cleanup --- pkgs/data/misc/cacert/default.nix | 134 +++++++++++++++--------------- 1 file changed, 69 insertions(+), 65 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index b4a8ebc4ef27..bd67e2a58f12 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,28 +1,17 @@ -{ lib, stdenv, fetchurl, nss, python3 -, blacklist ? [] +{ lib +, stdenv +, fetchurl +, nss +, python3 +, blacklist ? [ ] -# Used for tests only + # Used for tests only , runCommand , cacert , openssl }: -with lib; - let - version = "3.66"; - - underscoreVersion = builtins.replaceStrings ["."] ["_"] version; -in - -stdenv.mkDerivation { - name = "nss-cacert-${version}"; - - src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz"; - sha256 = "1jfdnh5l4k57r2vb07s06hqi7m2qzk0d9x25lsdsrw3cflx9x9w9"; - }; - certdata2pem = fetchurl { name = "certdata2pem.py"; urls = [ @@ -31,6 +20,16 @@ stdenv.mkDerivation { ]; sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; }; +in + +stdenv.mkDerivation rec { + pname = "nss-cacert"; + version = "3.66"; + + src = fetchurl { + url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; + sha256 = "1jfdnh5l4k57r2vb07s06hqi7m2qzk0d9x25lsdsrw3cflx9x9w9"; + }; outputs = [ "out" "unbundled" ]; @@ -40,11 +39,11 @@ stdenv.mkDerivation { ln -s nss/lib/ckfw/builtins/certdata.txt cat << EOF > blacklist.txt - ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} + ${lib.concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} EOF # copy from the store, otherwise python will scan it for imports - cat "$certdata2pem" > certdata2pem.py + cat "${certdata2pem}" > certdata2pem.py ''; buildPhase = '' @@ -63,61 +62,66 @@ stdenv.mkDerivation { # install individual certs in unbundled output mkdir -pv $unbundled/etc/ssl/certs cp -v *.crt $unbundled/etc/ssl/certs - rm -f $unbundled/etc/ssl/certs/ca-bundle.crt # not wanted in unbundled + rm $unbundled/etc/ssl/certs/ca-bundle.crt # not wanted in unbundled ''; setupHook = ./setup-hook.sh; - passthru.updateScript = ./update.sh; - passthru.tests = { - # Test that building this derivation with a blacklist works, and that UTF-8 is supported. - blacklist-utf8 = let - blacklistCAToFingerprint = { - # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint. - "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD"; - "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98"; - }; - mapBlacklist = f: concatStringsSep "\n" (mapAttrsToList f blacklistCAToFingerprint); - in runCommand "verify-the-cacert-filter-output" { - cacert = cacert.unbundled; - cacertWithExcludes = (cacert.override { - blacklist = builtins.attrNames blacklistCAToFingerprint; - }).unbundled; + passthru = { + updateScript = ./update.sh; + tests = { + # Test that building this derivation with a blacklist works, and that UTF-8 is supported. + blacklist-utf8 = + let + blacklistCAToFingerprint = { + # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint. + "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD"; + "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98"; + }; + mapBlacklist = f: lib.concatStringsSep "\n" (lib.mapAttrsToList f blacklistCAToFingerprint); + in + runCommand "verify-the-cacert-filter-output" + { + cacert = cacert.unbundled; + cacertWithExcludes = (cacert.override { + blacklist = builtins.attrNames blacklistCAToFingerprint; + }).unbundled; - nativeBuildInputs = [ openssl ]; - } '' - isPresent() { - # isPresent - for f in $1/etc/ssl/certs/*.crt; do - fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)" - if [[ "x$fingerprint" == "x$3" ]]; then - return 0 - fi - done - return 1 - } + nativeBuildInputs = [ openssl ]; + } '' + isPresent() { + # isPresent + for f in $1/etc/ssl/certs/*.crt; do + fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)" + if [[ "x$fingerprint" == "x$3" ]]; then + return 0 + fi + done + return 1 + } - # Ensure that each certificate is in the main "cacert". - ${mapBlacklist (caName: caFingerprint: '' - isPresent "$cacert" "${caName}" "${caFingerprint}" || ({ - echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2 - exit 1 - }) - '')} + # Ensure that each certificate is in the main "cacert". + ${mapBlacklist (caName: caFingerprint: '' + isPresent "$cacert" "${caName}" "${caFingerprint}" || ({ + echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2 + exit 1 + }) + '')} - # Ensure that each certificate is NOT in the "cacertWithExcludes". - ${mapBlacklist (caName: caFingerprint: '' - isPresent "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({ - echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2 - exit 1 - }) - '')} + # Ensure that each certificate is NOT in the "cacertWithExcludes". + ${mapBlacklist (caName: caFingerprint: '' + isPresent "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({ + echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2 + exit 1 + }) + '')} - touch $out - ''; + touch $out + ''; + }; }; - meta = { + meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; From 2cd8f37e635001bf86c4d1383a6f31673f4d3bfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 13:57:36 +0000 Subject: [PATCH 0033/1062] rust-cbindgen: 0.19.0 -> 0.20.0 --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index c1bc2fb4c07b..69963ea7d1fa 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0753dklr5lm1dmk6hy5khh8k3xyr5srfsq11l07685h71j7z0r00"; + sha256 = "sha256-BLiAFYkqVJSpeNPW7UF2PpAttd6ADGeQ9yneiVfNi4g="; }; - cargoSha256 = "0qyw0iqin7i31kk23ddsmywk7z0xxpd5n4q6dr6mf44y35a8krm8"; + cargoSha256 = "sha256-P58qANcl0mYqJDP1QnSx560y8BLH+ePTZ+uHuix89R4="; buildInputs = lib.optional stdenv.isDarwin Security; From e95d10eeab61954ef55070d9b9914bb9ec0bbc2a Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 29 Jul 2021 20:58:15 +0200 Subject: [PATCH 0034/1062] newt: support cross-compilation --- pkgs/development/libraries/newt/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index dc6b604bd8e2..7b5316b144a2 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -12,16 +12,21 @@ stdenv.mkDerivation rec { sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6"; }; - patchPhase = '' + postPatch = '' sed -i -e s,/usr/bin/install,install, -e s,-I/usr/include/slang,, Makefile.in po/Makefile substituteInPlace configure \ --replace "/usr/include/python" "${pythonIncludePath}" substituteInPlace configure.ac \ --replace "/usr/include/python" "${pythonIncludePath}" + + substituteInPlace Makefile.in \ + --replace "ar rv" "${stdenv.cc.targetPrefix}ar rv" ''; - buildInputs = [ slang popt python ]; + strictDeps = true; + nativeBuildInputs = [ python ]; + buildInputs = [ slang popt ]; NIX_LDFLAGS = "-lncurses"; From 064b1e0c30b2f41fbd6ee67bd8238693104efe41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 12:26:53 +0000 Subject: [PATCH 0035/1062] gerbera: 1.8.2 -> 1.9.0 --- pkgs/servers/gerbera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index acb8c139be6f..04043600e961 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-RVFzATHNCW4lR9dVrtY2fo2BiJrXPCpelBaUXBwOWyY="; + sha256 = "sha256-2nSxc5Tvy5EXYH1FqR455r84Y07Jg0sOgIScuAdDn6Q="; }; postPatch = lib.optionalString enableMysql '' From 1961e567977656a4ed645f8f17adcf7f8201c130 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 17 May 2021 23:43:27 +0200 Subject: [PATCH 0036/1062] graphite2: pull in libgcc if not using gcc for compilation graphite2 needs to link against libgcc. If stdenv.cc.isGNU this always works, but for clang based stdenvs, the build would fail. We can pull in the standalone libgcc derivation in those cases. --- pkgs/development/libraries/silgraphite/graphite2.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 25f4b5e13177..05315243960c 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -5,6 +5,7 @@ , freetype , cmake , static ? stdenv.hostPlatform.isStatic +, libgcc }: stdenv.mkDerivation rec { @@ -18,7 +19,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ freetype ]; + buildInputs = [ freetype ] + ++ lib.optionals (!stdenv.cc.isGNU) [ libgcc ]; patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; From 6d89e209ab61e6f08a6a4dd1670b71ed7fb7ebb8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 1 Aug 2021 22:29:49 +0200 Subject: [PATCH 0037/1062] inetutils: replace name with pname&version --- pkgs/tools/networking/inetutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 285031aaca52..6c28b30b8dc5 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "inetutils-1.9.4"; + pname = "inetutils"; + version = "1.9.4"; src = fetchurl { - url = "mirror://gnu/inetutils/${name}.tar.gz"; + url = "mirror://gnu/inetutils/inetutils-${version}.tar.gz"; sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; }; From 999758f9e6c600f7f6e789a3b2c06f701fab63ed Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 1 Aug 2021 23:39:09 +0200 Subject: [PATCH 0038/1062] grub: replace name with pname&version --- pkgs/tools/misc/grub/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 2371bdb0e055..bf66a467620d 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: -stdenv.mkDerivation { - name = "grub-0.97-73"; +stdenv.mkDerivation rec { + pname = "grub"; + version = "0.97-73"; src = fetchurl { - url = "https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz"; + url = "https://alpha.gnu.org/gnu/grub/grub-${lib.versions.majorMinor version}.tar.gz"; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; From 63fb3d8f2dd8c1aa62a2ad39d3d1dc41b57cb364 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 18 Jul 2021 10:52:04 -0700 Subject: [PATCH 0039/1062] kernel: Enable Chrome platform modules They were enabled in 5.4 but then removed. Let's enable them explicitly here. To keep the version constraints simple, we match kernel >5.4 even though some of them are available since 4.x. --- pkgs/os-specific/linux/kernel/common-config.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 09117a8525d0..1cf5596024c5 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -881,6 +881,22 @@ let # Keeping it a built-in ensures it will be used if possible. FB_SIMPLE = yes; + } // optionalAttrs (versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) { + # Required for various hardware features on Chrome OS devices + CHROME_PLATFORMS = yes; + CHROMEOS_TBMC = module; + + CROS_EC = module; + + CROS_EC_I2C = module; + CROS_EC_SPI = module; + CROS_EC_LPC = module; + CROS_EC_ISHTP = module; + + CROS_KBD_LED_BACKLIGHT = module; + } // optionalAttrs (versionAtLeast version "5.4" && stdenv.hostPlatform.system == "x86_64-linux") { + CHROMEOS_LAPTOP = module; + CHROMEOS_PSTORE = module; }; }; in From c1bc2c8b68c9ce67d87bade4a30366cd924f305c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Aug 2021 04:40:57 +0000 Subject: [PATCH 0040/1062] go-task: 3.6.0 -> 3.7.0 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index d9b32c2c5248..c1cff6562f23 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-3DTjxcMxgaTMunctHaCgOX5/P85lJDRin6RpMuv9Rfg="; + sha256 = "sha256-EksCnhSde25hradmKaDSOfIa/QnMAlIbgbQWX6k5v+4="; }; - vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI="; + vendorSha256 = "sha256-Y2Yuc2pcxW0M1CJfN3dezPB9cg6MvOUg5A+yFHCwntk="; doCheck = false; From c16d933595f7eb9fc27d0c3e8e65efcc1239e889 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Aug 2021 04:43:53 +0000 Subject: [PATCH 0041/1062] gobgp: 2.29.0 -> 2.30.0 --- pkgs/tools/networking/gobgp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 98925489e548..5347efcef075 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.29.0"; + version = "2.30.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; + sha256 = "sha256-YerInFAUHFGEU0XSYeqKly9EiCq/uSjtMLnzI/ekSJ4="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; From 6f5ee12acb04bb531601ee918324936b6790ac9d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 11:40:56 +0200 Subject: [PATCH 0042/1062] man-db: replace name with pname&version --- pkgs/tools/misc/man-db/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 9c8adc1d8d41..f1739cbd50dd 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.9.4"; + pname = "man-db"; + version = "2.9.4"; src = fetchurl { - url = "mirror://savannah/man-db/${name}.tar.xz"; + url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; sha256 = "sha256-tmyZ7frRatkoyIn4fPdjgCY8FgkyPCgLOp5pY/2xZ1Y="; }; From 38069b922f0b545c782f82f75140df3bbeb47e2c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 11:41:34 +0200 Subject: [PATCH 0043/1062] parted: replace name with pname&version --- pkgs/tools/misc/parted/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index e954bfbe5e4d..e4ac6b624ce4 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -15,10 +15,11 @@ }: stdenv.mkDerivation rec { - name = "parted-3.4"; + pname = "parted"; + version = "3.4"; src = fetchurl { - url = "mirror://gnu/parted/${name}.tar.xz"; + url = "mirror://gnu/parted/parted-${version}.tar.xz"; sha256 = "sha256-4SmAIkctpVibfyvh1e48G2bsPZbfutA9xkKv0AnaU0I="; }; From ed3e73f08cb44e5f7a1d16d447bb0138fb5103b5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 11:42:46 +0200 Subject: [PATCH 0044/1062] xfstests: replace name with pname&version --- pkgs/tools/misc/xfstests/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 769e23c389c7..a35b57626110 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -4,7 +4,8 @@ , time, util-linux, which, writeScript, xfsprogs, runtimeShell }: stdenv.mkDerivation { - name = "xfstests-2019-09-08"; + pname = "xfstests"; + version = "unstable-2019-09-08"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; From 810d491af42c24b72dc9e672531981ed96de1d5c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 11:13:00 +0200 Subject: [PATCH 0045/1062] psutils: replace name with pname&version --- pkgs/tools/typesetting/psutils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index fe3223ae6c90..c7f68f2bd52b 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl }: -stdenv.mkDerivation { - name = "psutils-17"; +stdenv.mkDerivation rec { + pname = "psutils"; + version = "17"; src = fetchurl { - url = "ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz"; + url = "ftp://ftp.knackered.org/pub/psutils/psutils-p${version}.tar.gz"; sha256 = "1r4ab1fvgganm02kmm70b2r1azwzbav2am41gbigpa2bb1wynlrq"; }; From 1a69d54885d27eed21a74814581eda591267d7f4 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 11:12:13 +0200 Subject: [PATCH 0046/1062] tools/{text/typesetting}: replace name with pname&version --- pkgs/tools/text/catdocx/default.nix | 3 ++- pkgs/tools/text/convertlit/default.nix | 7 ++++--- pkgs/tools/text/diffstat/default.nix | 7 ++++--- pkgs/tools/text/ebook-tools/default.nix | 5 +++-- pkgs/tools/text/html2text/default.nix | 7 ++++--- pkgs/tools/text/kakasi/default.nix | 5 +++-- pkgs/tools/text/mairix/default.nix | 5 +++-- pkgs/tools/text/mawk/default.nix | 7 ++++--- pkgs/tools/text/mpage/default.nix | 6 ++++-- pkgs/tools/text/multitran/data/default.nix | 4 +++- pkgs/tools/text/multitran/libbtree/default.nix | 8 +++++--- pkgs/tools/text/multitran/libfacet/default.nix | 7 ++++--- pkgs/tools/text/multitran/libmtquery/default.nix | 8 +++++--- pkgs/tools/text/multitran/libmtsupport/default.nix | 8 +++++--- pkgs/tools/text/multitran/mtutils/default.nix | 8 +++++--- pkgs/tools/text/qprint/default.nix | 5 +++-- pkgs/tools/text/sgml/openjade/default.nix | 5 +++-- pkgs/tools/text/sgml/opensp/default.nix | 7 ++++--- pkgs/tools/text/uni2ascii/default.nix | 6 ++++-- pkgs/tools/text/xml/xml2/default.nix | 7 ++++--- pkgs/tools/text/xml/xmlstarlet/default.nix | 5 +++-- pkgs/tools/text/xml/xpf/default.nix | 7 ++++--- pkgs/tools/text/yaml-merge/default.nix | 3 ++- pkgs/tools/typesetting/docbook2odf/default.nix | 5 +++-- pkgs/tools/typesetting/docbook2x/default.nix | 5 +++-- pkgs/tools/typesetting/halibut/default.nix | 5 +++-- pkgs/tools/typesetting/hevea/default.nix | 5 +++-- pkgs/tools/typesetting/lout/default.nix | 9 +++++---- pkgs/tools/typesetting/tex/lkproof/default.nix | 3 ++- pkgs/tools/typesetting/tex/pgfplots/default.nix | 7 ++++--- pkgs/tools/typesetting/tex/tetex/default.nix | 9 +++++---- 31 files changed, 113 insertions(+), 75 deletions(-) diff --git a/pkgs/tools/text/catdocx/default.nix b/pkgs/tools/text/catdocx/default.nix index adf78397fcb3..c762e15c80e2 100644 --- a/pkgs/tools/text/catdocx/default.nix +++ b/pkgs/tools/text/catdocx/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, unzip, catdoc }: stdenv.mkDerivation { - name = "catdocx-20170102"; + pname = "catdocx"; + version = "unstable-2017-01-02"; src = fetchFromGitHub { owner = "jncraton"; diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 18dc01c01d02..4225934d2d4e 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchzip, libtommath}: -stdenv.mkDerivation { - name = "convertlit-1.8"; +stdenv.mkDerivation rec { + pname = "convertlit"; + version = "1.8"; src = fetchzip { - url = "http://www.convertlit.com/convertlit18src.zip"; + url = "http://www.convertlit.com/convertlit${lib.replaceStrings ["."] [""] version}src.zip"; sha256 = "182nsin7qscgbw2h92m0zadh3h8q410h5cza6v486yjfvla3dxjx"; stripRoot = false; }; diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index c8ff1e973a50..3e156cf3132d 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,12 +1,13 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "diffstat-1.64"; + pname = "diffstat"; + version = "1.64"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" - "https://invisible-mirror.net/archives/diffstat/${name}.tgz" + "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" + "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w="; }; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index bb93b217ea24..1a46110e2a42 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: stdenv.mkDerivation rec { - name = "ebook-tools-0.2.2"; + pname = "ebook-tools"; + version = "0.2.2"; src = fetchurl { - url = "mirror://sourceforge/ebook-tools/${name}.tar.gz"; + url = "mirror://sourceforge/ebook-tools/ebook-tools-${version}.tar.gz"; sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index ae92f3ba9d9a..fff3e44baf69 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "html2text-1.3.2a"; +stdenv.mkDerivation rec { + pname = "html2text"; + version = "1.3.2a"; src = fetchurl { - url = "http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz"; + url = "http://www.mbayer.de/html2text/downloads/html2text-${version}.tar.gz"; sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; }; diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index 609b8aff9b56..d2cf1f701ee9 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "kakasi-2.3.6"; + pname = "kakasi"; + version = "2.3.6"; buildInputs = lib.optional stdenv.isDarwin [ libiconv ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://kakasi.namazu.org/stable/${name}.tar.xz"; + url = "http://kakasi.namazu.org/stable/kakasi-${version}.tar.xz"; sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f"; }; diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index 57e05bf19f6e..aa58ecdd35a9 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2, bison, flex }: stdenv.mkDerivation rec { - name = "mairix-0.24"; + pname = "mairix"; + version = "0.24"; src = fetchurl { - url = "mirror://sourceforge/mairix/${name}.tar.gz"; + url = "mirror://sourceforge/mairix/mairix-${version}.tar.gz"; sha256 = "0msaxz5c5hf7k1ci16i67m4ynrbrpsxbqzk84nz6z2vnkh3jww50"; }; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index d5f228d78730..62a23318ca2f 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20200120"; + pname = "mawk"; + version = "1.3.4-20200120"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/mawk/${name}.tgz" - "https://invisible-mirror.net/archives/mawk/${name}.tgz" + "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" + "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" ]; sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z"; }; diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 99cfec97a70b..b48f89d66180 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -1,9 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "mpage-2.5.7"; + pname = "mpage"; + version = "2.5.7"; + src = fetchurl { - url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; + url = "https://www.mesa.nl/pub/mpage/mpage-${version}.tgz"; sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi"; }; diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index a94f5bc96887..bfc148df782b 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -6,7 +6,9 @@ # The store file mentioned is in "${glibc.out}/lib/locale/locale-archive" stdenv.mkDerivation { - name = "multitran-data-0.3"; + pname = "multitran-data"; + version = "0.3"; + src = fetchurl { url = "mirror://sourceforge/multitran/multitran-data.tar.bz2"; sha256 = "9c2ff5027c2fe72b0cdf056311cd7543f447feb02b455982f20d4a3966b7828c"; diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 893c1e1d9316..91c4bb0ea7f8 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl} : -stdenv.mkDerivation { - name = "libbtree-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libbtree"; + version = "0.0.1alpha2"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libbtree-${version}.tar.bz2"; sha256 = "34a584e45058950337ff9342693b6739b52c3ce17e66440526c4bd6f9575802c"; }; patchPhase = '' diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 3895f3a922c2..0e6dd0d6e652 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libmtsupport }: -stdenv.mkDerivation { - name = "libfacet-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libfacet"; + version = "0.0.1alpha2"; src = fetchurl { - url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libfacet-${version}.tar.bz2"; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; }; diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index 3b7dd681e8ae..5cc8e724e71f 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } : -stdenv.mkDerivation { - name = "libmtquery-0.0.1alpha3"; +stdenv.mkDerivation rec { + pname = "libmtquery"; + version = "0.0.1alpha3"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2"; + url = "mirror://sourceforge/multitran/libmtquery-${version}.tar.bz2"; sha256 = "e24c7c15772445f1b14871928d84dd03cf93bd88f9d2b2ed1bf0257c2cf2b15e"; }; diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index eebc88189f25..454709b8eb79 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl} : -stdenv.mkDerivation { - name = "libmtsupport-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libmtsupport"; + version = "0.0.1alpha2"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libmtsupport-${version}.tar.bz2"; sha256 = "481f0f1ec15d7274f1e4eb93e7d060df10a181efd037eeff5e8056d283a9298b"; }; patchPhase = '' diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index 00325276fdb1..2428caada5b8 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} : -stdenv.mkDerivation { - name = "mt-utils-0.0.1alpha3"; +stdenv.mkDerivation rec { + pname = "mt-utils"; + version = "0.0.1alpha3"; + src = fetchurl { - url = "mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2"; + url = "mirror://sourceforge/multitran/mt-utils-${version}.tar.bz2"; sha256 = "e407702c90c5272882386914e1eeca5f6c5039393af9a44538536b94867b0a0e"; }; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index e2621ab18766..19f2d7b1cbd6 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "qprint-1.1"; + pname = "qprint"; + version = "1.1"; src = fetchurl { - url = "https://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/qprint/qprint-${version}.tar.gz"; sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz"; }; diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index 785ef3205967..f87bd5d7b1a1 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, opensp, perl }: stdenv.mkDerivation rec { - name = "openjade-1.3.2"; + pname = "openjade"; + version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/${name}.tar.gz"; + url = "mirror://sourceforge/openjade/openjade-${version}.tar.gz"; sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 1c9131d29dc5..6924c8953eef 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 , libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: -stdenv.mkDerivation { - name = "opensp-1.5.2"; +stdenv.mkDerivation rec { + pname = "opensp"; + version = "1.5.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz"; + url = "mirror://sourceforge/openjade/OpenSP-${version}.tar.gz"; sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index e2bda04d13f1..d83e9393f941 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uni2ascii-4.18"; + pname = "uni2ascii"; + version = "4.18"; + src = fetchurl { - url = "https://billposer.org/Software/Downloads/${name}.tar.gz"; + url = "https://billposer.org/Software/Downloads/uni2ascii-${version}.tar.gz"; sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; }; diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 4c312250bf65..265ab10e5ac8 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libxml2 }: -stdenv.mkDerivation { - name = "xml2-0.5"; +stdenv.mkDerivation rec { + pname = "xml2"; + version = "0.5"; src = fetchurl { - url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz"; + url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-${version}.tar.gz"; sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index e179c3153e10..39d53088babf 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "xmlstarlet-1.6.1"; + pname = "xmlstarlet"; + version = "1.6.1"; src = fetchurl { - url = "mirror://sourceforge/xmlstar/${name}.tar.gz"; + url = "mirror://sourceforge/xmlstar/xmlstarlet-${version}.tar.gz"; sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index 29170394d1e6..ce0813c2ef4a 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -2,11 +2,12 @@ assert libxml2.pythonSupport == true; -stdenv.mkDerivation { - name = "xpf-0.2"; +stdenv.mkDerivation rec { + pname = "xpf"; + version = "0.2"; src = fetchurl { - url = "http://tarballs.nixos.org/xpf-0.2.tar.gz"; + url = "http://tarballs.nixos.org/xpf-${version}.tar.gz"; sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index 7c4ecc49df5d..e5794b439a53 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation { - name= "yaml-merge-2016-02-16"; + pname = "yaml-merge"; + version = "unstable-2016-02-16"; src = fetchFromGitHub { owner = "abbradar"; diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index affa12c40190..f3fdcd32502e 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perlPackages, makeWrapper, zip, libxslt }: stdenv.mkDerivation rec { - name = "docbook2odf-0.244"; + pname = "docbook2odf"; + version = "0.244"; src = fetchurl { - url = "http://open.comsultia.com/docbook2odf/dwn/${name}.tar.gz"; + url = "http://open.comsultia.com/docbook2odf/dwn/docbook2odf-${version}.tar.gz"; sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; }; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 4b9e571c0ad3..aac992552d31 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -4,10 +4,11 @@ , makeWrapper }: stdenv.mkDerivation rec { - name = "docbook2X-0.8.8"; + pname = "docbook2X"; + version = "0.8.8"; src = fetchurl { - url = "mirror://sourceforge/docbook2x/${name}.tar.gz"; + url = "mirror://sourceforge/docbook2x/docbook2X-${version}.tar.gz"; sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"; }; diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index d077ef823ffc..ec5598e4d689 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "halibut-1.2"; + pname = "halibut"; + version = "1.2"; src = fetchurl { - url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz"; + url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz"; sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s"; }; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index ad6427e56224..8253d73e3dbb 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.35"; + pname = "hevea"; + version = "2.35"; src = fetchurl { - url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; + url = "https://pauillac.inria.fr/~maranget/hevea/distri/hevea-${version}.tar.gz"; sha256 = "sha256-8Ym62l0+WzWFXf39tbJwyZT8eiNmsBJQ12E1mtZsnss="; }; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 4737c5d74097..f5bf22c0f338 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -1,13 +1,14 @@ {lib, stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { - name = "lout-3.40"; + pname = "lout"; + version = "3.40"; src = fetchurl { urls = [ - "ftp://ftp.cs.usyd.edu.au/jeff/lout/${name}.tar.gz" - "mirror://savannah/lout/${name}.tar.gz" # new! - "mirror://sourceforge/lout/${name}.tar.gz" # to be phased out + "ftp://ftp.cs.usyd.edu.au/jeff/lout/${pname}-${version}.tar.gz" + "mirror://savannah/lout/${pname}-${version}.tar.gz" # new! + "mirror://sourceforge/lout/${pname}-${version}.tar.gz" # to be phased out # XXX: We could add the CTAN mirrors # (see https://www.ctan.org/tex-archive/support/lout/). ]; diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index 4f896ef32baf..6b866b43d1b9 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "lkproof-3.1"; + pname = "lkproof"; + version = "3.1"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/lkproof.zip"; diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index fe928615eb42..0a2667f284e9 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "pgfplots-1.5.1"; +stdenv.mkDerivation rec { + pname = "pgfplots"; + version = "1.5.1"; src = fetchurl { - url = "mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip"; + url = "mirror://sourceforge/pgfplots/pgfplots_${version}.tds.zip"; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 0f6bf5d0d55c..d15386417218 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -1,15 +1,16 @@ { lib, stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }: -stdenv.mkDerivation { - name = "tetex-3.0"; +stdenv.mkDerivation rec { + pname = "tetex"; + version = "3.0"; src = fetchurl { - url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz"; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-src-${version}.tar.gz"; sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz"; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-texmf-${version}.tar.gz"; sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; From 41e55422d52acefc599339cf4612eaee89e94e88 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 2 Aug 2021 21:29:43 +0200 Subject: [PATCH 0047/1062] libmbim: 1.24.8 -> 1.26.0 Overview of changes in libmbim 1.26 ---------------------------------------- * Build now requires GLib/GObject/GIO 2.56. * The GUdev optional build/runtime requirement is now fully dropped, it's no longer used. * Building from git no longer requires autoconf-archive, the needed AX_ macros are now shipped inside m4/. * In addition to building from a source release tarball, or building from git checkouts using the GNU autotools suite (autoconf/automake/libtool), this release includes the initial support for the meson build system. The meson port is not fully complete yet, as there are some missing things in the doc generation steps, but for system integration or development purposes, the port should be fully operational. This major release, including all its stable updates in the 1.26.x series, will be the last ones providing support for GNU autotools. The next major release will likely be a meson-only one, and will therefore not be based on a source release tarball any more, but on specific git tags instead. * Implemented new link management operations, exclusively for the cdc_mbim driver for now. These new operations allow creating or deleting VLAN network interfaces in order to run multiplexed data sessions over one single physical network interface. * Added support for the Microsoft-defined SAR service, including the following operations: ** MBIM_CID_MS_SAR_CONFIG ** MBIM_CID_MS_SAR_TRANSMISSION_STATUS * Added support for the Microsoft-defined UICC Low Level Access service, including the following operations: ** MBIM_CID_MS_UICC_LOW_LEVEL_ACCESS_ATR ** MBIM_CID_MS_UICC_LOW_LEVEL_ACCESS_OPEN_CHANNEL ** MBIM_CID_MS_UICC_LOW_LEVEL_ACCESS_CLOSE_CHANNEL ** MBIM_CID_MS_UICC_LOW_LEVEL_ACCESS_APDU ** MBIM_CID_MS_UICC_LOW_LEVEL_ACCESS_TERMINAL_CAPABILITY ** MBIM_CID_MS_UICC_LOW_LEVEL_ACCESS_RESET * Added support for the Qualcomm-defined QDU service, including the following operations: ** MBIM_CID_QDU_UPDATE_SESSION ** MBIM_CID_QDU_FILE_OPEN ** MBIM_CID_QDU_FILE_WRITE * Extended the Microsoft-defined Basic Connect Extensions service, including the following operations: ** MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_CAPS ** MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SYS_CAPS ** MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SLOT_INFO_STATUS ** MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_DEVICE_SLOT_MAPPINGS * libmbim-glib: ** Logic updated to make sure full packets are written at once, instead of writing them in chunks. ** Updated the "LTE attach status" APIs in order to avoid creating unneeded struct types in the interface. The older methods have been deprecated and maintained in the library for compatibility purposes only. * mbim-proxy: ** Internal buffer size updated from 512 bytes to 4096 bytes. * mbimcli: ** New '--ms-set-sar-config' and '--ms-query-sar-config' actions. ** New '--ms-set-transmission-status' and '--ms-query-transmission-status' actions. ** Updated '--enter-pin', '--disable-pin' and '--unlock-pin' to allow other PIN types, not just assuming PIN1. ** New '--link-add', '--link-delete', '--link-list' and '--link-delete-all' actions. ** New '--ms-query-sys-caps' action. ** New '--ms-query-slot-info-status' action. ** New '--ms-query-device-slot-mappings' and '--ms-set-device-slot-mappings' actions. ** Renamed '--ms-query-lte-attach-status' to '--ms-query-lte-attach-info', and kept the old name for compatibility purposes. * mbim-network: ** When using the mbim-proxy, skip trying to manage the MBIM session and transaction ids as that is implicitly done by the proxy already. * Several other minor improvements and fixes. The following features which were backported to 1.24.x releases are also present in libmbim 1.26.0: * Fixed merged subscribe list reporting and handling in the proxy. * Fixed transaction id handling when multiple fragments are involved. * Fixed read overflows on malformed messages. * Skip warnings if descriptors file cannot be read, as in new MBIM backends other than cdc_mbim. --- pkgs/development/libraries/libmbim/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 43a88f9dd5fb..cfd4b4743cda 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , glib , python3 , systemd -, libgudev , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection }: stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.8"; + version = "1.26.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-AlkHNhY//xDlcyGR/MwbmSCWlhbdxZYToAMFKhFqPCU="; + sha256 = "1kqkx139z62w391bz6lwmcjg7v12jxlcm7hj88222xrcn8k0j7qy"; }; outputs = [ "out" "dev" "man" ]; @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libgudev systemd ]; From e59d302e25484fabdea8464f47a634233e248573 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 2 Aug 2021 22:07:10 +0200 Subject: [PATCH 0048/1062] libmbim: update license to gpl2Plus As per https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/blob/master/meson.build#L7. --- pkgs/development/libraries/libmbim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index cfd4b4743cda..83950e982583 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } From 0900850680c6cc7c97085d254cf1b91f4c28263d Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 19 Jul 2021 15:56:02 +0900 Subject: [PATCH 0049/1062] stdenv: conservative undefined variables --- pkgs/build-support/setup-hooks/autoreconf.sh | 2 +- pkgs/build-support/setup-hooks/reproducible-builds.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index c08cab158688..6ce879ac092d 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,4 +1,4 @@ -preConfigurePhases+=" autoreconfPhase" +preConfigurePhases="${preConfigurePhases:-} autoreconfPhase" autoreconfPhase() { runHook preAutoreconf diff --git a/pkgs/build-support/setup-hooks/reproducible-builds.sh b/pkgs/build-support/setup-hooks/reproducible-builds.sh index 5b01c213fe4a..7b52f84df67b 100644 --- a/pkgs/build-support/setup-hooks/reproducible-builds.sh +++ b/pkgs/build-support/setup-hooks/reproducible-builds.sh @@ -2,8 +2,9 @@ # This should ensure that it is deterministic across rebuilds of the same # derivation and not easily collide with other builds. # We also truncate the hash so that it cannot cause reference cycles. -export NIX_CFLAGS_COMPILE+=" -frandom-seed=$( +NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -frandom-seed=$( outbase="${out##*/}" randomseed="${outbase:0:10}" echo $randomseed )" +export NIX_CFLAGS_COMPILE From 065a8102c9867e85e47af0d94596a5ff24b9257d Mon Sep 17 00:00:00 2001 From: MatthewCroughan Date: Tue, 3 Aug 2021 13:02:23 +0100 Subject: [PATCH 0050/1062] Update pkgs/development/libraries/ffmpeg/generic.nix Co-authored-by: Michal Sojka --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 587eaa9d822b..bd0e79acad6b 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { # Build flags "--enable-shared" (ifMinVer "0.6" "--enable-pic") - (enableFeature (srt != null) "libsrt") + (ifMinVer "4.0" (enableFeature (srt != null) "libsrt")) (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") "--enable-hardcoded-tables" ] ++ From bce4746a3d0b95d3a799dc64a68c0b987a3cfe65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Aug 2021 12:07:15 +0000 Subject: [PATCH 0051/1062] btrfs-progs: 5.13 -> 5.13.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 158c7d593992..c17b684604bf 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.13"; + version = "5.13.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-Tikh0iA9Jl4qlBu9brB37dXjmBHi1p6MEbLwPc9eWEM="; + sha256 = "sha256-PX5aAeaPuvSFxfHaFca4p9FFX7V7bnWnBvjiuzf085k="; }; nativeBuildInputs = [ From 1450bc80fbd243e130ba52cea41a9c153a487744 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 11:38:45 +0200 Subject: [PATCH 0052/1062] tools/misc: replace name with pname&version --- pkgs/tools/misc/apparix/default.nix | 5 +++-- pkgs/tools/misc/aws-mturk-clt/default.nix | 5 +++-- pkgs/tools/misc/bfr/default.nix | 2 +- pkgs/tools/misc/bogofilter/default.nix | 6 ++++-- pkgs/tools/misc/ccze/default.nix | 5 +++-- pkgs/tools/misc/convmv/default.nix | 5 +++-- pkgs/tools/misc/dbacl/default.nix | 6 ++++-- pkgs/tools/misc/detox/default.nix | 7 ++++--- pkgs/tools/misc/dmg2img/default.nix | 5 +++-- pkgs/tools/misc/dvtm/default.nix | 5 +++-- pkgs/tools/misc/dvtm/dvtm.nix | 4 ++-- pkgs/tools/misc/dvtm/unstable.nix | 3 ++- pkgs/tools/misc/ent/default.nix | 3 ++- pkgs/tools/misc/fasd/default.nix | 2 +- pkgs/tools/misc/figlet/default.nix | 7 ++++--- pkgs/tools/misc/fileschanged/default.nix | 5 +++-- pkgs/tools/misc/git-fire/default.nix | 3 ++- pkgs/tools/misc/jdiskreport/default.nix | 7 ++++--- pkgs/tools/misc/kermit/default.nix | 3 ++- pkgs/tools/misc/kisslicer/default.nix | 7 ++++--- pkgs/tools/misc/logtop/default.nix | 7 ++++--- pkgs/tools/misc/lrzsz/default.nix | 5 +++-- pkgs/tools/misc/makebootfat/default.nix | 5 +++-- pkgs/tools/misc/mysql2pgsql/default.nix | 7 ++++--- pkgs/tools/misc/odroid-xu3-bootloader/default.nix | 3 ++- pkgs/tools/misc/pal/default.nix | 5 +++-- pkgs/tools/misc/pg_top/default.nix | 5 +++-- pkgs/tools/misc/pk2cmd/default.nix | 7 ++++--- pkgs/tools/misc/proxytunnel/default.nix | 7 ++++--- pkgs/tools/misc/pv/default.nix | 5 +++-- pkgs/tools/misc/qjoypad/default.nix | 5 +++-- pkgs/tools/misc/renameutils/default.nix | 7 ++++--- pkgs/tools/misc/riemann-c-client/default.nix | 5 +++-- pkgs/tools/misc/rkflashtool/default.nix | 5 +++-- pkgs/tools/misc/rrdtool/default.nix | 5 +++-- pkgs/tools/misc/sixpair/default.nix | 3 ++- pkgs/tools/misc/slsnif/default.nix | 7 ++++--- pkgs/tools/misc/smc/default.nix | 7 ++++--- pkgs/tools/misc/t1utils/default.nix | 5 +++-- pkgs/tools/misc/timidity/default.nix | 7 ++++--- pkgs/tools/misc/tmpwatch/default.nix | 7 ++++--- pkgs/tools/misc/tmux-cssh/default.nix | 3 ++- pkgs/tools/misc/ttf2pt1/default.nix | 7 ++++--- pkgs/tools/misc/ttmkfdir/default.nix | 3 ++- pkgs/tools/misc/unclutter/default.nix | 7 ++++--- pkgs/tools/misc/uucp/default.nix | 5 +++-- pkgs/tools/misc/uudeview/default.nix | 5 +++-- pkgs/tools/misc/vorbisgain/default.nix | 5 +++-- pkgs/tools/misc/wv2/default.nix | 5 +++-- pkgs/tools/misc/xdxf2slob/default.nix | 3 ++- pkgs/tools/misc/xflux/default.nix | 3 ++- pkgs/tools/misc/xtitle/default.nix | 7 ++++--- pkgs/tools/misc/yubico-piv-tool/default.nix | 5 +++-- pkgs/tools/misc/yubikey-personalization-gui/default.nix | 5 +++-- 54 files changed, 165 insertions(+), 112 deletions(-) diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index 8e682aefcc39..1c78a7854256 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apparix-11-062"; + pname = "apparix"; + version = "11-062"; src = fetchurl { - url = "https://micans.org/apparix/src/${name}.tar.gz"; + url = "https://micans.org/apparix/src/apparix-${version}.tar.gz"; sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235"; }; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index 7e60d4988424..9b03e2dd1bdb 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "aws-mturk-clt-1.3.0"; + pname = "aws-mturk-clt"; + version = "1.3.0"; src = fetchurl { - url = "https://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; + url = "https://mturk.s3.amazonaws.com/CLTSource/aws-mturk-clt-${version}.tar.gz"; sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3"; }; diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 80ec398ef8c7..7bda1d92afbe 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bfr-1.6"; + pname = "bfr"; version = "1.6"; src = fetchurl { diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 30a17bf188a6..0446a58efbc4 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,9 +1,11 @@ {fetchurl, lib, stdenv, flex, db}: stdenv.mkDerivation rec { - name = "bogofilter-1.2.4"; + pname = "bogofilter"; + version = "1.2.4"; + src = fetchurl { - url = "mirror://sourceforge/bogofilter/${name}.tar.bz2"; + url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.bz2"; sha256 = "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1"; }; diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix index af37d7a33c1a..348cbb1f529c 100644 --- a/pkgs/tools/misc/ccze/default.nix +++ b/pkgs/tools/misc/ccze/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoconf, ncurses, pcre }: stdenv.mkDerivation rec { - name = "ccze-0.2.1-2"; + pname = "ccze"; + version = "0.2.1-2"; src = fetchurl { - url = "https://github.com/madhouse/ccze/archive/${name}.tar.gz"; + url = "https://github.com/madhouse/ccze/archive/ccze-${version}.tar.gz"; sha256 = "1amavfvyls4v0gnikk43n2rpciaspxifgrmvi99qj6imv3mfg66n"; }; diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index b9b775a1bff9..6ed8c78361ec 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-2.05"; + pname = "convmv"; + version = "2.05"; src = fetchurl { - url = "https://www.j3e.de/linux/convmv/${name}.tar.gz"; + url = "https://www.j3e.de/linux/convmv/convmv-${version}.tar.gz"; sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; }; diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index d8510975915b..eb2b445d069d 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -1,9 +1,11 @@ {fetchurl, lib, stdenv}: stdenv.mkDerivation rec { - name = "dbacl-1.14"; + pname = "dbacl"; + version = "1.14"; + src = fetchurl { - url = "https://www.lbreyer.com/gpl/${name}.tar.gz"; + url = "https://www.lbreyer.com/gpl/dbacl-${version}.tar.gz"; sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 6aa66b349dc7..774ba885b4b1 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, flex}: -stdenv.mkDerivation { - name = "detox-1.2.0"; +stdenv.mkDerivation rec { + pname = "detox"; + version = "1.2.0"; src = fetchurl { - url = "mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz"; + url = "mirror://sourceforge/detox/${version}/detox-${version}.tar.gz"; sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; }; diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index a3f023e2ad5c..7f9c41cda32c 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "dmg2img-1.6.7"; + pname = "dmg2img"; + version = "1.6.7"; src = fetchurl { - url = "http://vu1tur.eu.org/tools/${name}.tar.gz"; + url = "http://vu1tur.eu.org/tools/dmg2img-${version}.tar.gz"; sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2"; }; diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 695187b3e840..ea5a051c62b1 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -1,9 +1,10 @@ {callPackage, fetchurl}: callPackage ./dvtm.nix rec { - name = "dvtm-0.15"; + pname = "dvtm"; + version = "0.15"; src = fetchurl { - url = "http://www.brain-dump.org/projects/dvtm/${name}.tar.gz"; + url = "https://www.brain-dump.org/projects/dvtm/dvtm-${version}.tar.gz"; sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g"; }; diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index 9a42655b7378..feb9c7a92f82 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, ncurses, customConfig ? null, name, src, patches ? [] }: +{ lib, stdenv, ncurses, customConfig ? null, pname, version, src, patches ? [] }: stdenv.mkDerivation { - inherit name src patches; + inherit pname version src patches; CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; diff --git a/pkgs/tools/misc/dvtm/unstable.nix b/pkgs/tools/misc/dvtm/unstable.nix index 6ee2a465c69a..65e62be07497 100644 --- a/pkgs/tools/misc/dvtm/unstable.nix +++ b/pkgs/tools/misc/dvtm/unstable.nix @@ -1,6 +1,7 @@ {callPackage, fetchFromGitHub, fetchpatch}: callPackage ./dvtm.nix { - name = "dvtm-unstable-2018-03-31"; + pname = "dvtm-unstable"; + version = "2018-03-31"; src = fetchFromGitHub { owner = "martanne"; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index b0dc4f1e3df9..de2f2cc8a865 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "ent-1.1"; + pname = "ent"; + version = "1.1"; src = fetchurl { url = "https://www.fourmilab.ch/random/random.zip"; diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index a3cdc388cdf7..7e50c3e75513 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "fasd"; - name = "${pname}-unstable-2016-08-11"; + version = "unstable-2016-08-11"; src = fetchFromGitHub { owner = "clvv"; diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 01ff40b2b743..b16b6821e318 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch }: -stdenv.mkDerivation { - name = "figlet-2.2.5"; +stdenv.mkDerivation rec { + pname = "figlet"; + version = "2.2.5"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz"; + url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz"; sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 2c64c4c1edca..f44011a98a71 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { - name = "fileschanged-0.6.9"; + pname = "fileschanged"; + version = "0.6.9"; src = fetchurl { - url = "mirror://savannah/fileschanged/${name}.tar.gz"; + url = "mirror://savannah/fileschanged/fileschanged-${version}.tar.gz"; sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc"; }; diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix index 15dc34cd5267..32d7a169d72e 100644 --- a/pkgs/tools/misc/git-fire/default.nix +++ b/pkgs/tools/misc/git-fire/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "git-fire-unstable-2017-08-27"; + pname = "git-fire"; + version = "unstable-2017-08-27"; src = fetchFromGitHub { owner = "qw3rtman"; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index abd8398601cd..22b16c7f9b34 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -10,11 +10,12 @@ let type = "Application"; }; in -stdenv.mkDerivation { - name = "jdiskreport-1.4.1"; +stdenv.mkDerivation rec { + pname = "jdiskreport"; + version = "1.4.1"; src = fetchurl { - url = "http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip"; + url = "https://www.jgoodies.com/download/jdiskreport/jdiskreport-${lib.replaceStrings ["."] ["_"] version}.zip"; sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index 8af0674f54bf..33644e911c63 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, ncurses, glibc }: stdenv.mkDerivation { - name = "kermit-9.0.302"; + pname = "kermit"; + version = "9.0.302"; src = fetchurl { url = "ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz"; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 73d86e7dfc65..31bc0b2b6a12 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -17,11 +17,12 @@ let in -stdenv.mkDerivation { - name = "kisslicer-1.6.3"; +stdenv.mkDerivation rec { + pname = "kisslicer"; + version = "1.6.3"; src = fetchzip { - url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.3_release.zip"; + url = "https://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_${version}_release.zip"; sha256 = "1xmywj5jrcsqv1d5x3mphhvafs4mfm9l12npkhk7l03qxbwg9j82"; stripRoot = false; }; diff --git a/pkgs/tools/misc/logtop/default.nix b/pkgs/tools/misc/logtop/default.nix index 2113da9976fb..0aa99fd18aa7 100644 --- a/pkgs/tools/misc/logtop/default.nix +++ b/pkgs/tools/misc/logtop/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, ncurses, uthash, pkg-config }: -stdenv.mkDerivation { - name = "logtop-0.7"; +stdenv.mkDerivation rec { + pname = "logtop"; + version = "0.7"; src = fetchFromGitHub { - rev = "a0935ab2e7056feb3e8a90f5129990c9b335a587"; + rev = "logtop-${version}"; owner = "JulienPalard"; repo ="logtop"; sha256 = "1f8vk9gybldxvc0kwz38jxmwvzwangsvlfslpsx8zf04nvbkqi12"; diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix index 09e90ca07940..e4b5e71a2560 100644 --- a/pkgs/tools/misc/lrzsz/default.nix +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, gettext, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "lrzsz-0.12.20"; + pname = "lrzsz"; + version = "0.12.20"; src = fetchurl { - url = "https://ohse.de/uwe/releases/${name}.tar.gz"; + url = "https://ohse.de/uwe/releases/lrzsz-${version}.tar.gz"; sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"; }; diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index 1f512d04a225..d55b5727d00c 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "makebootfat-1.4"; + pname = "makebootfat"; + version = "1.4"; src = fetchurl { - url = "mirror://sourceforge/advancemame/${name}.tar.gz"; + url = "mirror://sourceforge/advancemame/makebootfat-${version}.tar.gz"; sha256 = "0v0g1xax0y6hmw2x10nfhchp9n7vqyvgc33gcxqax8jdq2pxm1q2"; }; diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index f0556b69f23e..680e37387683 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, perl }: # The homepage says this script is mature.. -stdenv.mkDerivation { - name = "mysql2pgsql-0.0.1a"; +stdenv.mkDerivation rec { + pname = "mysql2pgsql"; + version = "0.0.1a"; src = fetchurl { - url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz"; + url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-${version}.tgz"; sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp"; }; diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix index 052c46cef8cb..2dbffe3384ce 100644 --- a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix +++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3, runtimeShell }: stdenv.mkDerivation { - name = "odroid-xu3-bootloader-2015-12-04"; + pname = "odroid-xu3-bootloader"; + version = "unstable-2015-12-04"; src = fetchFromGitHub { owner = "hardkernel"; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 635c6e0b5245..c37325170ace 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, glib, gettext, readline, pkg-config }: stdenv.mkDerivation rec { - name = "pal-0.4.3"; + pname = "pal"; + version = "0.4.3"; src = fetchurl { - url = "mirror://sourceforge/palcal/${name}.tgz"; + url = "mirror://sourceforge/palcal/pal-${version}.tgz"; sha256 = "072mahxvd7lcvrayl32y589w4v3vh7bmlcnhiksjylknpsvhqiyf"; }; diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index f5d42431e4f2..9521136977f3 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ncurses, postgresql }: stdenv.mkDerivation rec { - name = "pg_top-3.7.0"; + pname = "pg_top"; + version = "3.7.0"; src = fetchurl { - url = "http://pgfoundry.org/frs/download.php/1781/${name}.tar.gz"; + url = "https://pgfoundry.org/frs/download.php/1781/pg_top-${version}.tar.gz"; sha256 = "17xrv0l58rv3an06gkajzw0gg6v810xx6vl137an1iykmhvfh7h2"; }; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 009d841bf557..b6678f52d748 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: -stdenv.mkDerivation { - name = "pk2cmd-1.20"; +stdenv.mkDerivation rec { + pname = "pk2cmd"; + version = "1.20"; src = fetchurl { - url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz"; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv${version}LinuxMacSource.tar.gz"; sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 7743793143a2..1319a6bfabe9 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, openssl }: -stdenv.mkDerivation { - name = "proxytunnel-1.9.0"; +stdenv.mkDerivation rec { + pname = "proxytunnel"; + version = "1.9.0"; src = fetchurl { - url = "mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz"; + url = "mirror://sourceforge/proxytunnel/proxytunnel-${version}.tgz"; sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f"; }; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 013ddb8e3dab..237f18de97b4 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.6.6"; + pname = "pv"; + version = "1.6.6"; src = fetchurl { - url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2"; + url = "https://www.ivarch.com/programs/sources/pv-${version}.tar.bz2"; sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0"; }; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 7fc578ec8579..0c3b4a9ed2f8 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }: stdenv.mkDerivation rec { - name = "qjoypad-4.1.0"; + pname = "qjoypad"; + version = "4.1.0"; src = fetchurl { - url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; + url = "mirror://sourceforge/qjoypad/qjoypad-${version}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index e730b583d7c8..2dff399cc9a4 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, readline}: -stdenv.mkDerivation { - name = "renameutils-0.12.0"; +stdenv.mkDerivation rec { + pname = "renameutils"; + version = "0.12.0"; src = fetchurl { - url = "mirror://savannah/renameutils/renameutils-0.12.0.tar.gz"; + url = "mirror://savannah/renameutils/renameutils-${version}.tar.gz"; sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb"; }; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index c60dd9f7c7a0..bce293d7cf8d 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.4"; + pname = "riemann-c-client"; + version = "1.10.4"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; - rev = name; + rev = "riemann-c-client-${version}"; sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index b96d9be8a4dd..fa37c98966eb 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libusb1 }: stdenv.mkDerivation rec { - name = "rkflashtool-5.1"; + pname = "rkflashtool"; + version = "5.1"; src = fetchurl { - url = "mirror://sourceforge/rkflashtool/${name}-src.tar.bz2"; + url = "mirror://sourceforge/rkflashtool/rkflashtool-${version}-src.tar.bz2"; sha256 = "0dbp1crw7pjav9gffrnskhkf0gxlj4xgp65clqhvfmv32460xb9c"; }; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 2f8b9092eeaa..b03cd4a9a7e6 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -2,10 +2,11 @@ , tcl-8_5, darwin }: perl.pkgs.toPerlModule (stdenv.mkDerivation rec { - name = "rrdtool-1.7.2"; + pname = "rrdtool"; + version = "1.7.2"; src = fetchurl { - url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/rrdtool/pub/rrdtool-${version}.tar.gz"; sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; }; diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index 52c61d917b12..71a0af158246 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { - name = "sixpair-2007-04-18"; + pname = "sixpair"; + version = "unstable-2007-04-18"; src = fetchurl { url = "http://www.pabr.org/sixlinux/sixpair.c"; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index 7f6f9fa40c2b..fd2b4c53d60a 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "slsnif-0.4.4"; +stdenv.mkDerivation rec { + pname = "slsnif"; + version = "0.4.4"; src = fetchurl { - url = "mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz"; + url = "mirror://sourceforge/slsnif/slsnif-${version}.tar.gz"; sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index 5b0342621e80..4c1156a83663 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, jre, runtimeShell }: -stdenv.mkDerivation { - name = "smc-6.6.3"; +stdenv.mkDerivation rec { + pname = "smc"; + version = "6.6.3"; src = fetchurl { - url = "mirror://sourceforge/project/smc/smc/6_6_3/smc_6_6_3.tgz"; + url = "mirror://sourceforge/project/smc/smc/${lib.replaceStrings ["."] ["_"] version}/smc_${lib.replaceStrings ["."] ["_"] version}.tgz"; sha256 = "1gv0hrgdl4wp562virpf9sib6pdhapwv4zvwbl0d5f5xyx04il11"; }; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 690fbe8abcb3..7946b58c5f75 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "t1utils-1.41"; + pname = "t1utils"; + version = "1.41"; src = fetchurl { - url = "https://www.lcdf.org/type/${name}.tar.gz"; + url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz"; sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; }; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 760284140b11..368efcf9de30 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, libjack2, ncurses, pkg-config }: -stdenv.mkDerivation { - name = "timidity-2.15.0"; +stdenv.mkDerivation rec { + pname = "timidity"; + version = "2.15.0"; src = fetchurl { - url = "mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2"; + url = "mirror://sourceforge/timidity/TiMidity++-${version}.tar.bz2"; sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; }; diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 1ef486fa8556..7389e0c4c593 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, psmisc }: -stdenv.mkDerivation { - name = "tmpwatch-2.11"; +stdenv.mkDerivation rec { + pname = "tmpwatch"; + version = "2.11"; src = fetchurl { - url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-2.11.tar.bz2"; + url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-${version}.tar.bz2"; sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix index 830c365fa403..c69853635e90 100644 --- a/pkgs/tools/misc/tmux-cssh/default.nix +++ b/pkgs/tools/misc/tmux-cssh/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, tmux }: stdenv.mkDerivation { - name = "tmux-cssh-20151015"; + pname = "tmux-cssh"; + version = "unstable-2015-10-15"; src = fetchFromGitHub { owner = "dennishafemann"; diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index fcab21eb92b3..7e0c12535bb6 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, freetype }: -stdenv.mkDerivation { - name = "ttf2pt1-3.4.4"; +stdenv.mkDerivation rec { + pname = "ttf2pt1"; + version = "3.4.4"; src = fetchurl { - url = "mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz"; + url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${version}.tgz"; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index bc1279a7dec7..77bc9f172c6f 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: stdenv.mkDerivation { - name = "ttf-mkfontdir-3.0.9-6"; + pname = "ttf-mkfontdir"; + version = "3.0.9-6"; src = fetchurl { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 66344c9fdeef..74fc46563c7e 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, xlibsWrapper}: -stdenv.mkDerivation { - name = "unclutter-8"; +stdenv.mkDerivation rec { + pname = "unclutter"; + version = "8"; src = fetchurl { - url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz"; + url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-${version}.tar.gz"; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 42084fa6296e..443c4b10457e 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uucp-1.07"; + pname = "uucp"; + version = "1.07"; src = fetchurl { - url = "mirror://gnu/uucp/${name}.tar.gz"; + url = "mirror://gnu/uucp/uucp-${version}.tar.gz"; sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306"; }; diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index 47bc916ceb50..82edd2df4dd9 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, tcl, tk }: stdenv.mkDerivation rec { - name = "uudeview-0.5.20"; + pname = "uudeview"; + version = "0.5.20"; src = fetchurl { - url = "http://www.fpx.de/fp/Software/UUDeview/download/${name}.tar.gz"; + url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz"; sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4"; }; diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 7aebfeab2cee..b0b4e5e34e12 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libogg, libvorbis }: stdenv.mkDerivation rec { - name = "vorbisgain-0.37"; + pname = "vorbisgain"; + version = "0.37"; src = fetchurl { - url = "https://sjeng.org/ftp/vorbis/${name}.tar.gz"; + url = "https://sjeng.org/ftp/vorbis/vorbisgain-${version}.tar.gz"; sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx"; }; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index c0f85b4b8de7..105a1f734dc9 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { - name = "wv2-0.4.2"; + pname = "wv2"; + version = "0.4.2"; src = fetchurl { - url = "mirror://sourceforge/wvware/${name}.tar.bz2"; + url = "mirror://sourceforge/wvware/wv2-${version}.tar.bz2"; sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz"; }; diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index 28c952400f17..4a89db07c45c 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,7 +1,8 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { - name = "xdxf2slob-unstable-2015-06-30"; + pname = "xdxf2slob"; + version = "unstable-2015-06-30"; src = fetchFromGitHub { owner = "itkach"; diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index 92c00d7e44d1..54a339f1d775 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -1,6 +1,7 @@ {lib, stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: stdenv.mkDerivation { - name = "xflux-2013-09-01"; + pname = "xflux"; + version = "unstable-2013-09-01"; src = fetchurl { url = "https://justgetflux.com/linux/xflux64.tgz"; sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 5199977e587f..2820958443ed 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: -stdenv.mkDerivation { - name = "xtitle-0.4.4"; +stdenv.mkDerivation rec { + pname = "xtitle"; + version = "0.4.4"; src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/0.4.4.tar.gz"; + url = "https://github.com/baskerville/xtitle/archive/${version}.tar.gz"; sha256 = "0w490a6ki90si1ri48jzhma473a598l1b12j8dp4ckici41z9yy2"; }; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 827eaec048ff..6d80cd2400d2 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-2.0.0"; + pname = "yubico-piv-tool"; + version = "2.0.0"; src = fetchurl { - url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs"; }; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index af6843e38202..7e311b6ea23f 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -2,10 +2,11 @@ , libyubikey, yubikey-personalization }: mkDerivation rec { - name = "yubikey-personalization-gui-3.1.25"; + pname = "yubikey-personalization-gui"; + version = "3.1.25"; src = fetchurl { - url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/yubikey-personalization-gui-${version}.tar.gz"; sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; From fccbcf5568aca6847c409df6f21ba0f003f956c2 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 3 Aug 2021 03:50:39 +0000 Subject: [PATCH 0053/1062] xorg.libXfont2: 2.0.4 -> 2.0.5 https://lists.x.org/archives/xorg-announce/2021-August/003103.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9a75403cec62..9a89fc7e9dfb 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1002,11 +1002,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { pname = "libXfont2"; - version = "2.0.4"; + version = "2.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; - sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; + url = "mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2"; + sha256 = "0gmm20p3qq23pd2bhc5rsxil60wqvj9xi7l1nh55q8gp3hhnyz5a"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 42cb2da3a0d6..61d91c8f4cd0 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -187,7 +187,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 From 8a39aa70ca8bbfd44100904e147a576decf6fd85 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 3 Aug 2021 23:37:44 -0400 Subject: [PATCH 0054/1062] python3Packages.pbr: add setuptools dependency pbr doesn't list any explicit requirements, but it actually requires setuptools (for pkg_resources). Ref: * https://bugs.launchpad.net/pbr/+bug/1868899 * https://opendev.org/openstack/pbr/src/tag/5.6.0/pbr/version.py#L439 (cherry picked from commit 21d70a8301b2ee5c063ca953aa6748d554301ef8) --- pkgs/development/python-modules/pbr/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 9ce3d72a20d9..9c69e2fea544 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "pbr"; @@ -9,8 +9,11 @@ buildPythonPackage rec { sha256 = "42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd"; }; + propagatedBuildInputs = [ setuptools ]; + # circular dependencies with fixtures doCheck = false; + pythonImportsCheck = [ "pbr" ]; meta = with lib; { homepage = "http://docs.openstack.org/developer/pbr/"; From 8675ca0e947f7e847d82828e6bfd4d08822c489c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 4 Aug 2021 08:29:53 +0000 Subject: [PATCH 0055/1062] xorg.xorgcffiles: 1.0.6 -> 1.0.7 https://lists.x.org/archives/xorg-announce/2021-August/003105.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 39c601f00f3e..c1acdeb6cd78 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3057,11 +3057,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "xorg-cf-files"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; - sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; + url = "mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2"; + sha256 = "0233jyjxjkhlar03vp8l5sm3iq6354izm3crk41h5291pgap39vl"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0339d5832923..c70b153f7885 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -217,5 +217,5 @@ mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 -mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 +mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz From f3a42b27e3bb9187d7496cee65572be2dafe21a3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 21:35:28 +0200 Subject: [PATCH 0056/1062] boost-build: allow supplying a boost version to build b2 for The `useBoost` argument expects an attribute set with an src and version attribute (so a boost derivation works) and builds b2 for the given version of boost. This is useful when bootstrapping boost: We can override boost-build to get a boost-build derivation matching the current boost version we want to build (b2 is not backwards compatible enough to build older boost versions) without the need of having one boost-build${version} attribute for every boost version we have which is not very useful for nixpkgs' users. --- .../development/tools/boost-build/default.nix | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 5016aa590b5f..c6c66d4d212d 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -2,18 +2,36 @@ , stdenv , fetchFromGitHub , bison +# boost derivation to use for the src and version. +# This is used by the boost derivation to build +# a b2 matching their version (by overriding this +# argument). Infinite recursion is not an issue +# since we only look at src and version of boost. +, useBoost ? {} }: -stdenv.mkDerivation rec { - pname = "boost-build"; - version = "4.4.1"; +let + defaultVersion = "4.4.1"; +in - src = fetchFromGitHub { +stdenv.mkDerivation { + pname = "boost-build"; + version = + if useBoost ? version + then "boost-${useBoost.version}" + else defaultVersion; + + src = useBoost.src or (fetchFromGitHub { owner = "boostorg"; repo = "build"; - rev = version; + rev = defaultVersion; sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54"; - }; + }); + + # b2 is in a subdirectory of boost source tarballs + postUnpack = lib.optionalString (useBoost ? src) '' + sourceRoot="$sourceRoot/tools/build" + ''; patches = [ # Upstream defaults to gcc on darwin, but we use clang. @@ -32,8 +50,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + ./b2 install --prefix="$out" - ln -s b2 "$out/bin/bjam" + + # older versions of b2 created this symlink, + # which we want to support building via useBoost. + test -e "$out/bin/bjam" || ln -s b2 "$out/bin/bjam" + runHook postInstall ''; From d20aa4955d4c31d8393753ddf088e1ee82c5d12e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 23:05:12 +0200 Subject: [PATCH 0057/1062] boost*: use packaged b2 instead it of building in configurePhase If we build two things in one derivation, it becomes more complicated and its build time is extended. Therefore we should avoid this if possible. There's a good opportunity for this with boost: We have boost-build packaged already. This has the additional benefit that we can get rid of $CC_FOR_BUILD entirely in boost, meaning we don't need to rely on (as many) hacks to make boost understand our way of cross compiling. Unfortunately boost-build is not backwards compatible, so we need to build a specific boost-build for each boost derivation (the number could probably be reduced, but I'm not interested in testing a lot of boost builds at the moment). Additionally we fix a few cross compilation problems: - boost couldn't cope with different types of compilers for native and cross (as happens if useLLVM is true). Since we only use one of them per derivation, this is no longer an issue. - boost didn't find the cross ar and ranlib for compilation (since it doesn't check $AR or $RANLIB). Instead it used plain ar and ranlib form $PATH which were the native ones before. This is now fixed by setting these tools explicitly in user-config.jam (and no longer providing the native tools). With these changes, pkgsLLVM.boost builds. On darwin, instead of patching the clang-darwin.jam definition, we instead supply -rpath $out/lib via which causes the correct directory to be added to the libraries' rpaths, so that they find each other. --- pkgs/development/libraries/boost/default.nix | 47 ++++++++++++++++ pkgs/development/libraries/boost/generic.nix | 56 +++++++++++++------- pkgs/top-level/all-packages.nix | 31 ++++++----- 3 files changed, 101 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/libraries/boost/default.nix diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix new file mode 100644 index 000000000000..3b79378605f2 --- /dev/null +++ b/pkgs/development/libraries/boost/default.nix @@ -0,0 +1,47 @@ +{ lib +, callPackage +, boost-build +, fetchurl +}: + +let + # for boost 1.55 we need to use 1.56's b2 + # since 1.55's build system is not working + # with our derivation + useBoost156 = rec { + version = "1.56.0"; + src = fetchurl { + url = "mirror://sourceforge/boost/boost_${lib.replaceStrings ["."] ["_"] version}.tar.bz2"; + sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk"; + }; + }; + + makeBoost = file: + lib.fix (self: + callPackage file { + boost-build = boost-build.override { + # useBoost allows us passing in src and version from + # the derivation we are building to get a matching b2 version. + useBoost = + if lib.versionAtLeast self.version "1.56" + then self + else useBoost156; # see above + }; + } + ); +in { + boost155 = makeBoost ./1.55.nix; + boost159 = makeBoost ./1.59.nix; + boost160 = makeBoost ./1.60.nix; + boost165 = makeBoost ./1.65.nix; + boost166 = makeBoost ./1.66.nix; + boost167 = makeBoost ./1.67.nix; + boost168 = makeBoost ./1.68.nix; + boost169 = makeBoost ./1.69.nix; + boost170 = makeBoost ./1.70.nix; + boost171 = makeBoost ./1.71.nix; + boost172 = makeBoost ./1.72.nix; + boost173 = makeBoost ./1.73.nix; + boost174 = makeBoost ./1.74.nix; + boost175 = makeBoost ./1.75.nix; +} diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 1f9bbe5ffcad..f1a39c3d8cdb 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,7 +1,7 @@ { lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv +, boost-build , fetchpatch , which -, buildPackages , toolset ? /**/ if stdenv.cc.isClang then "clang" else null , enableRelease ? true @@ -67,6 +67,8 @@ let else "$NIX_BUILD_CORES"; + needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || stdenv.isDarwin; + b2Args = concatStringsSep " " ([ "--includedir=$dev/include" "--libdir=$out/lib" @@ -95,7 +97,7 @@ let ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" ++ optional (!enablePython) "--without-python" - ++ optional (useMpi || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam" + ++ optional needUserConfig "--user-config=user-config.jam" ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [ "threadapi=win32" ] ++ extraB2Args @@ -137,22 +139,39 @@ stdenv.mkDerivation { maintainers = with maintainers; [ peti ]; }; - preConfigure = '' - if test -f tools/build/src/tools/clang-darwin.jam ; then - substituteInPlace tools/build/src/tools/clang-darwin.jam \ - --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; - fi; - '' + optionalString useMpi '' + preConfigure = optionalString useMpi '' cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; EOF - '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + '' + # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly, + # otherwise the dynamic linker is unable to resolve the reference to @rpath + # when the boost libraries want to load each other at runtime. + + optionalString (stdenv.isDarwin && enableShared) '' cat << EOF >> user-config.jam - using gcc : cross : ${stdenv.cc.targetPrefix}c++ ; + using clang-darwin : : ${stdenv.cc.targetPrefix}c++ + : "-rpath $out/lib/" + ; + EOF + '' + # b2 has trouble finding the correct compiler and tools for cross compilation + # since it apparently ignores $CC, $AR etc. Thus we need to set everything + # in user-config.jam. To keep things simple we just set everything in an + # uniform way for clang and gcc (which works thanks to our cc-wrapper). + # We pass toolset later which will make b2 invoke everything in the right + # way -- the other toolset in user-config.jam will be ignored. + + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + cat << EOF >> user-config.jam + using gcc : cross : ${stdenv.cc.targetPrefix}c++ + : $AR + $RANLIB + ; + + using clang : cross : ${stdenv.cc.targetPrefix}c++ + : $AR + $RANLIB + ; EOF - # Build b2 with buildPlatform CC/CXX. - sed '2i export CC=$CC_FOR_BUILD; export CXX=$CXX_FOR_BUILD' \ - -i ./tools/build/src/engine/build.sh ''; NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin @@ -160,9 +179,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ which ] + nativeBuildInputs = [ which boost-build ] ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu ++ optional enablePython python @@ -173,13 +191,13 @@ stdenv.mkDerivation { configureFlags = [ "--includedir=$(dev)/include" "--libdir=$(out)/lib" + "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase ] ++ optional enablePython "--with-python=${python.interpreter}" - ++ [ (if stdenv.hostPlatform == stdenv.buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ] - ++ optional (toolset != null) "--with-toolset=${toolset}"; + ++ [ (if stdenv.hostPlatform == stdenv.buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ]; buildPhase = '' runHook preBuild - ./b2 ${b2Args} + b2 ${b2Args} runHook postBuild ''; @@ -191,7 +209,7 @@ stdenv.mkDerivation { cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ # Let boost install everything else - ./b2 ${b2Args} install + b2 ${b2Args} install runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 412985e644a5..9330e230b97d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14815,22 +14815,25 @@ in boolstuff = callPackage ../development/libraries/boolstuff { }; - boost155 = callPackage ../development/libraries/boost/1.55.nix { }; - boost159 = callPackage ../development/libraries/boost/1.59.nix { }; + inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) + boost155 + boost159 + boost160 + boost165 + boost166 + boost167 + boost168 + boost169 + boost170 + boost171 + boost172 + boost173 + boost174 + boost175 + ; + boost15x = boost159; - boost160 = callPackage ../development/libraries/boost/1.60.nix { }; - boost165 = callPackage ../development/libraries/boost/1.65.nix { }; - boost166 = callPackage ../development/libraries/boost/1.66.nix { }; - boost167 = callPackage ../development/libraries/boost/1.67.nix { }; - boost168 = callPackage ../development/libraries/boost/1.68.nix { }; - boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost169; - boost170 = callPackage ../development/libraries/boost/1.70.nix { }; - boost171 = callPackage ../development/libraries/boost/1.71.nix { }; - boost172 = callPackage ../development/libraries/boost/1.72.nix { }; - boost173 = callPackage ../development/libraries/boost/1.73.nix { }; - boost174 = callPackage ../development/libraries/boost/1.74.nix { }; - boost175 = callPackage ../development/libraries/boost/1.75.nix { }; boost17x = boost175; boost = boost16x; From 14b3a15778669c87ca9e87ec7f7ac65dc6dc90f9 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 4 Aug 2021 10:08:53 -0700 Subject: [PATCH 0058/1062] qemu: move makeWrapper to nativeBuildInputs --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4df14e030aea..d4ee107df24e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { sha256 = "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47"; }; - nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja ] + nativeBuildInputs = [ makeWrapper python python.pkgs.sphinx pkg-config flex bison meson ninja ] ++ optionals gtkSupport [ wrapGAppsHook ] ++ optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ zlib glib perl pixman - vde2 texinfo makeWrapper lzo snappy + vde2 texinfo lzo snappy gnutls nettle curl ] ++ optionals ncursesSupport [ ncurses ] From 88c53421a729c9a3030c8e43f91844d5f1f2d146 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 4 Aug 2021 20:37:40 +0200 Subject: [PATCH 0059/1062] libsndfile: 1.0.30 -> 1.0.31 Fixes CVE-2021-3246. https://github.com/libsndfile/libsndfile/releases/tag/1.0.31 --- pkgs/development/libraries/libsndfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 61e6d9cd7652..dbe108f586f4 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libsndfile"; - version = "1.0.30"; + version = "1.0.31"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa"; + rev = version; + sha256 = "1alba3iv8i7i2jb5fd6q5s7j9bcj48sf28nfjd3qigz2n2is5jl2"; }; nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; From 43e0f0688a19bbd88cdf898efb7b14ecf09717c4 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 4 Aug 2021 23:48:22 +0200 Subject: [PATCH 0060/1062] boost: always set toolset for known compilers There is an edge case when cross compiling where the auto detection script would not correctly recognize the compiler (as it is only good at recognizing native compilers, really, which we don't have anymore since we don't need the build->build one anymore). If bootstrap.sh doesn't detect the compiler correctly, it'll generate a project-config.jam with a syntax error which breaks the build in a hard to spot way: only a warning is displayed after configuring, the build will appear to run normally until it fails quietly just before installing. By providing it explicitly, we can prevent this. --- pkgs/development/libraries/boost/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index f1a39c3d8cdb..7ea7902e0873 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -3,6 +3,7 @@ , fetchpatch , which , toolset ? /**/ if stdenv.cc.isClang then "clang" + else if stdenv.cc.isGNU then "gcc" else null , enableRelease ? true , enableDebug ? false @@ -193,6 +194,7 @@ stdenv.mkDerivation { "--libdir=$(out)/lib" "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase ] ++ optional enablePython "--with-python=${python.interpreter}" + ++ optional (toolset != null) "--with-toolset=${toolset}" ++ [ (if stdenv.hostPlatform == stdenv.buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ]; buildPhase = '' From c4591134f4c2f9acf1e8d4a1f48cba0b9c190598 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Aug 2021 11:21:37 +0200 Subject: [PATCH 0061/1062] python3Packages.numpy: 1.20.3 -> 1.21.1 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index dbbd750acf5b..b4482af99586 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.20.3"; + version = "1.21.1"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e55185e51b18d788e49fe8305fd73ef4470596b33fc2c1ceb304566b99c71a69"; + sha256 = "1za22ggjxzm7drs2vd15s81ad9rlshk4p7pv7mxcbz4acdiszx6z"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 46398325f5ad6a733c116e21dd3baa8b73220f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 5 Aug 2021 16:15:36 +0200 Subject: [PATCH 0062/1062] patchelf: 0.12 -> 0.13 --- pkgs/development/tools/misc/patchelf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index a0c002d8a8c5..28eead7c2e53 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "14npmdxppmh0ci140w8i8cy7zg1pnqg81a1mdsnza711ab7k36k9"; + sha256 = "1v8px6g0zvhfxqa1inmdqfj4gc8dm70x7874hri4s48szjyd8zjc"; }; setupHook = [ ./setup-hook.sh ]; From d96ee7c7bdae9bdf95f70c37a797750cc1f3bfa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 5 Aug 2021 16:49:10 +0200 Subject: [PATCH 0063/1062] libinput: format, cleanup --- .../libraries/libinput/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 8f1511de3304..63391aa1d73b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,14 +1,10 @@ { lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja , libevdev, mtdev, udev, libwacom -, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation -, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null, python3 ? null +, documentationSupport ? false, doxygen, graphviz # Documentation +, eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support +, testsSupport ? false, check, valgrind, python3 }: -assert documentationSupport -> doxygen != null && graphviz != null && python3 != null; -assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; -assert testsSupport -> check != null && valgrind != null && python3 != null; - let mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; @@ -24,7 +20,6 @@ let else null; in -with lib; stdenv.mkDerivation rec { pname = "libinput"; version = "1.16.4"; @@ -48,7 +43,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config meson ninja ] - ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]; + ++ lib.optionals documentationSupport [ doxygen graphviz sphinx-build ]; buildInputs = [ libevdev @@ -60,8 +55,7 @@ stdenv.mkDerivation rec { pyyaml setuptools ])) - ] - ++ optionals eventGUISupport [ cairo glib gtk3 ]; + ] ++ lib.optionals eventGUISupport [ cairo glib gtk3 ]; checkInputs = [ check @@ -73,15 +67,16 @@ stdenv.mkDerivation rec { patches = [ ./udev-absolute-path.patch ]; postPatch = '' - patchShebangs tools/helper-copy-and-exec-from-tmp.sh - patchShebangs test/symbols-leak-test - patchShebangs test/check-leftover-udev-rules.sh - patchShebangs test/helper-copy-and-exec-from-tmp.sh + patchShebangs \ + tools/helper-copy-and-exec-from-tmp.sh \ + test/symbols-leak-test \ + test/check-leftover-udev-rules.sh \ + test/helper-copy-and-exec-from-tmp.sh ''; doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; - meta = { + meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; From 0e6b107cacdc76dfdc2c4c7c8131e79e4cf2ee4c Mon Sep 17 00:00:00 2001 From: deliciouslytyped <47436522+deliciouslytyped@users.noreply.github.com> Date: Thu, 5 Aug 2021 17:44:25 +0200 Subject: [PATCH 0064/1062] setup-hooks: separate-debug-info.sh: Remove extraneous local variable originally used in ec5b66eb --- pkgs/build-support/setup-hooks/separate-debug-info.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 19dbb10d18e7..2481d8f50470 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -14,7 +14,7 @@ _separateDebugInfo() { dst="$dst/lib/debug/.build-id" # Find executables and dynamic libraries. - local i magic + local i while IFS= read -r -d $'\0' i; do if ! isELF "$i"; then continue; fi From 832287ede63e739f96c4e7f236da9fa05977de9a Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 5 Aug 2021 18:36:08 +0200 Subject: [PATCH 0065/1062] libqmi: 1.28.6 -> 1.28.8 --- pkgs/development/libraries/libqmi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 157445cfee82..196b9d3ad521 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.28.6"; + version = "1.28.8"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1zg5k8f6l87iy9hmzwckdx532s845z9c5npblmpf1pp17n4r1f6b"; + sha256 = "sha256-bju70gC8G2SyP2JU/vkhLyaZ7HfPsyB10rpQecc6n3g="; }; nativeBuildInputs = [ @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { # Tools gpl2Plus ]; + changelog = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/${version}/NEWS"; }; } From 44fbbb22c232eec821c17c43f109e100bf0fa4b2 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 5 Aug 2021 18:41:38 +0200 Subject: [PATCH 0066/1062] mobile-broadband-provider-info: 202001225 -> 20210805 --- pkgs/data/misc/mobile-broadband-provider-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 49755dbd8ad6..51598a53d50a 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20201225"; + version = "20210805"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1g9x2i4xjm2sagaha07n9psacbylrwfrmfqkp17gjwhpyi6w0zqd"; + sha256 = "sha256-a/ihVY6lVBr7xve0QV50zJ9aqYKbE07Ks+8ch0ElaLw="; }; nativeBuildInputs = [ From 04d50d249fb23ca0cbda2720caed666518cdfb1f Mon Sep 17 00:00:00 2001 From: marius851000 Date: Fri, 6 Aug 2021 12:45:31 +0200 Subject: [PATCH 0067/1062] file: fix detection of mimetype of xz files (#132809) --- pkgs/tools/misc/file/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index cc56205243d5..700700e862ec 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, file, zlib, libgnurx }: +{ lib, stdenv, fetchurl, file, zlib, libgnurx, fetchpatch }: stdenv.mkDerivation rec { pname = "file"; @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; + patches = [ + # Fix the mime type detection of xz file. Is merged in master. + (fetchpatch { + url = "https://github.com/file/file/commit/9b0459afab309a82aa4e46f73a4e50dd641f3d39.patch"; + sha256 = "sha256-6vjyIn5gVbgmhUlfXJKFRVltm8YKATKmh0/X6+2lLnM="; + }) + ]; + doCheck = true; makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; From 645e8d172576fe86beed7877361ca015c0ca8305 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Aug 2021 18:32:56 +0000 Subject: [PATCH 0068/1062] glib-networking: 2.68.1 -> 2.68.2 --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 690279fcf213..6842470be4c0 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.68.1"; + version = "2.68.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c1vylxly8k7g454g02spi44ybjidlwg461vp713zxd94k8qnpfh"; + sha256 = "U168BU72l9tWpP/+2RvA4RyO4cmstIqtKMjh1cPVmU8="; }; patches = [ From 9254bfc0e0e7446a3cf30e359c2aee9eba3a2450 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 6 Aug 2021 15:16:39 -0400 Subject: [PATCH 0069/1062] python3Packages.numpy: workaround flakey compiler feature detection --- pkgs/development/python-modules/numpy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index b4482af99586..9071cec1b03d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -73,6 +73,10 @@ in buildPythonPackage rec { ln -s ${cfg} site.cfg ''; + # Workaround flakey compiler feature detection + # https://github.com/numpy/numpy/issues/19624 + hardeningDisable = [ "strictoverflow" ]; + enableParallelBuilding = true; checkInputs = [ From a39a7d95910ca908590cdc26b26efaead430b86a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Aug 2021 00:42:20 -0700 Subject: [PATCH 0070/1062] krita: 4.4.5 -> 4.4.7 (#133093) --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 85830f9a0455..3a86d1d4cc73 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.4.5"; + version = "4.4.7"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-S/1ygIcNEGCgDREj2Db8Gltb+KAoZ2Z58CaM1ef7dWg="; + sha256 = "sha256-I6fFxPRCcRU5dyFXZPvGvTb9MuGikrvTaGCXpp4LRRk="; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; From b75bb092e717a151bfe426833342337ff9b18d4a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 3 Aug 2021 08:53:10 +0000 Subject: [PATCH 0071/1062] libinput: 1.16.4 -> 1.18.1 --- pkgs/development/libraries/libinput/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 63391aa1d73b..375154ea46ad 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja +{ lib, stdenv, fetchurl, pkg-config, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen, graphviz # Documentation , eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support @@ -22,14 +22,11 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.16.4"; + version = "1.18.1"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = pname; - repo = pname; - rev = version; - sha256 = "1c81429kh9av9fanxmnjw5rvsjbzcyi7d0dx0gkyq5yysmpmrppi"; + src = fetchurl { + url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; + sha256 = "1jx7y48ym89grjz67jmn80h5j8c36qgwb0h5c703nln2zchl18cw"; }; outputs = [ "bin" "out" "dev" ]; @@ -72,6 +69,9 @@ stdenv.mkDerivation rec { test/symbols-leak-test \ test/check-leftover-udev-rules.sh \ test/helper-copy-and-exec-from-tmp.sh + + # Don't create an empty /etc directory. + sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; From bc4484fa115e42747935c3004aa57073801cb671 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 6 Aug 2021 11:16:20 +0200 Subject: [PATCH 0072/1062] ell: 0.41 -> 0.42 --- pkgs/os-specific/linux/ell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index a43b9eff3c81..7cc28e7f314f 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.41"; + version = "0.42"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "sha256-UCE+PgGmbePlOoAc8jXxCX6fHr16qf1AQMKxizfSTJM="; + sha256 = "sha256-GgQhSzVqGCpljWewtevCc9rpkks7devRNp5TN+5JNN4="; }; nativeBuildInputs = [ From 1590a4f82d574f624930bdc8024473f8a49927b8 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 6 Aug 2021 11:16:27 +0200 Subject: [PATCH 0073/1062] iwd: 1.15 -> 1.16 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index e0a1a566d777..fbae4a6011ba 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.15"; + version = "1.16"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-qGQDIzJfeBT9VLwr9Ci9vXcM0ZvFvjL2E9PcKoZ8E94="; + sha256 = "sha256-Nu6vb5UOJ/KgmJZM4bMKwLpOoKMLcnZPYCqFBQjuCYY="; }; outputs = [ "out" "man" ] From bce379dd870eb2aefda283d513dcfc0825fe3d74 Mon Sep 17 00:00:00 2001 From: marius david Date: Tue, 10 Aug 2021 11:55:15 +0200 Subject: [PATCH 0074/1062] portmod: 2.0_beta9 -> 2.0.3 --- pkgs/games/portmod/default.nix | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index 9db57d3e0a94..b677c63defeb 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -1,22 +1,22 @@ { lib, callPackage, python3Packages, fetchFromGitLab, cacert, rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip, - jre, makeWrapper, tr-patcher, tes3cmd }: + jre, makeWrapper, tr-patcher, tes3cmd, fetchpatch }: let - version = "2.0_beta9"; + version = "2.0.3"; src = fetchFromGitLab { owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - sha256 = "0a598rb0z6gsdyr4n0lc0yc583njjii07p6vxw75xsh7292vxksc"; + sha256 = "sha256-vMdyaI1Ps7bFoRvwdVNVG9vPFEiGb7CPvKEWfxiM128="; }; portmod-rust = rustPlatform.buildRustPackage rec { inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-7Ce+EIbZuOur7iGOUXNWiXReuZO54LQJu+sJPw1CJGg="; + cargoHash = "sha256-tAghZmlg34jHr8gtNgL3MQ8EI7K6/TfDcTbBjxdWLr0="; nativeBuildInputs = [ python3Packages.python ]; @@ -44,9 +44,18 @@ python3Packages.buildPythonApplication rec { prePatch = '' substituteInPlace setup.py \ --replace "from setuptools_rust import Binding, RustExtension" "" \ - --replace "RustExtension(\"portmod.portmod\", binding=Binding.PyO3, strip=True)" "" + --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" "" ''; + patches = [ + (fetchpatch { + # fix error when symlinks are present in the path (https://gitlab.com/portmod/portmod/-/merge_requests/393) + # happen with ~/.nix-profile + url = "https://gitlab.com/portmod/portmod/-/merge_requests/393.patch"; + sha256 = "sha256-XHifwD/Nh7UiMZdvSNudVF7qpBOpjGTKSr4VVdJqUdA="; + }) + ]; + propagatedBuildInputs = with python3Packages; [ setuptools-scm setuptools @@ -61,6 +70,7 @@ python3Packages.buildPythonApplication rec { redbaron patool packaging + fasteners ]; checkInputs = with python3Packages; [ @@ -68,7 +78,7 @@ python3Packages.buildPythonApplication rec { ] ++ bin-programs; preCheck = '' - cp ${portmod-rust}/lib/libportmod.so portmod/portmod.so + cp ${portmod-rust}/lib/libportmod.so portmodlib/portmod.so export HOME=$(mktemp -d) ''; @@ -79,11 +89,14 @@ python3Packages.buildPythonApplication rec { "test_execute_network_permissions" "test_execute_permissions_bleed" "test_git" + "test_sync" + "test_manifest" + "test_add_repo" ]; # for some reason, installPhase doesn't copy the compiled binary postInstall = '' - cp ${portmod-rust}/lib/libportmod.so $out/${python3Packages.python.sitePackages}/portmod/portmod.so + cp ${portmod-rust}/lib/libportmod.so $out/${python3Packages.python.sitePackages}/portmodlib/portmod.so makeWrapperArgs+=("--prefix" "GIT_SSL_CAINFO" ":" "${cacert}/etc/ssl/certs/ca-bundle.crt" \ "--prefix" "PATH" ":" "${lib.makeBinPath bin-programs }") From dfa906adbcc847f97bd7565f7bb51ec73b68960e Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 10 Aug 2021 12:03:56 +0200 Subject: [PATCH 0075/1062] modemmanager: 1.16.8 -> 1.16.10 --- pkgs/tools/networking/modem-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 9d8f13a40709..7e0a8a80699c 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.16.8"; + version = "1.16.10"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-If36+UFxJhrZ2ZdxiU9a3kvDnvPR/x1CEFTRRxPpeIA="; + sha256 = "sha256-LM8fcWwtEh6OZwm8+K8p7oaXGpCtrMoujWKIswJ4hi4="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; From 21321de496ec764a00bdd0540c5bc4ff89b3f648 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 10 Aug 2021 12:06:57 +0200 Subject: [PATCH 0076/1062] modemmanager: fix pname/directory --- .../networking/{modem-manager => modemmanager}/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/tools/networking/{modem-manager => modemmanager}/default.nix (98%) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modemmanager/default.nix similarity index 98% rename from pkgs/tools/networking/modem-manager/default.nix rename to pkgs/tools/networking/modemmanager/default.nix index 7e0a8a80699c..e352e67d3fe5 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - pname = "modem-manager"; + pname = "modemmanager"; version = "1.16.10"; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f41b4b9d716c..eec30ce4692b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7175,7 +7175,7 @@ with pkgs; mmixware = callPackage ../development/tools/mmixware { }; - modemmanager = callPackage ../tools/networking/modem-manager {}; + modemmanager = callPackage ../tools/networking/modemmanager {}; modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; From 47da9ffbd3864f1559f11bbc4e0830b57926d97b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 13:44:28 +0000 Subject: [PATCH 0077/1062] enchant: 2.3.0 -> 2.3.1 --- pkgs/development/libraries/enchant/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index f2a4ae31346e..e81a61bd40b9 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.3.0"; + version = "2.3.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-32gGO2wTskX6ckaw4JigPnT3qRxtiUe8XE9CzlXi5B0="; + sha256 = "sha256-e0sa/PLNi/ppHe6mGIQE0zfyMXS7w5ucKt0r80Bzbpw="; }; nativeBuildInputs = [ From 4a377fd6179c998ae779a7eac8b567afb116acc6 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 1 Oct 2019 15:43:42 +0200 Subject: [PATCH 0078/1062] openmoji-black,openmoji-color: init at 12.0.0 --- pkgs/data/fonts/openmoji/default.nix | 79 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 83 insertions(+) create mode 100644 pkgs/data/fonts/openmoji/default.nix diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix new file mode 100644 index 000000000000..0e6843c07451 --- /dev/null +++ b/pkgs/data/fonts/openmoji/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, fetchFromGitHub +, scfbuild +, variant ? "color" # "color" or "black" +}: + +let + filename = builtins.replaceStrings + [ "color" "black" ] + [ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ] + variant; + +in stdenv.mkDerivation rec { + pname = "openmoji"; + version = "12.0.0"; + + src = fetchFromGitHub { + owner = "hfg-gmuend"; + repo = pname; + rev = version; + sha256 = "0h8sr74gbdmcm8vv8pxlig50mmbf9w9lh4p8ih2lqqi5iry1dvhj"; + }; + + nativeBuildInputs = [ + scfbuild + ]; + + # Some id and data-* attributes in the svg files contain unicode characters, + # which scfbuild (a python2 program) does not like + # (https://github.com/13rac1/scfbuild/issues/14). + # Fortunately, it's only metadata which we can remove: + postPatch = '' + sed -Ei 's/(id|data-[^=]*)="[^"]*"//g' black/svg/*.svg color/svg/*.svg + ''; + + buildPhase = '' + # Bash reimplementation of helpers/export-svg-font.js + # so we don't need to build all the node deps first + hexcodes=() + missingGlyphBlack='./black/svg/25A1.svg' + missingGlyphColor='./color/svg/25A1.svg' + for f in ./color/svg/*.svg; do + basename=$(basename "$f" .svg) + hexcodes+=(''${basename//-/ }) + filename=$(basename "$f"); + cp "./color/svg/$filename" "./font/tmp-color/$filename" + cp "./black/svg/$filename" "./font/tmp-black/$filename" + done + + hexcodes=($(uniq<<<"$hexcodes")) + + for h in $hexcodes; do + filename="$h.svg" + if [ ! -e "./color/svg/$filename" ]; then + echo "$h is missing -> substitute with \"Missing Glyph\": $filename" + cp $missingGlyphColor "./font/tmp-color/$filename" + cp $missingGlyphBlack "./font/tmp-black/$filename" + fi + done + + # Actually build the font: + cd font + scfbuild -c scfbuild-${variant}.yml + ''; + + installPhase = '' + install -Dm644 ${filename} $out/share/fonts/truetype/${filename} + ''; + + meta = with stdenv.lib; { + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + homepage = "https://openmoji.org/"; + downloadPage = "https://github.com/hfg-gmuend/openmoji/releases"; + description = "Open-source emojis for designers, developers and everyone else"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a0ac74a862c..88daca494c0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22589,6 +22589,10 @@ in open-sans = callPackage ../data/fonts/open-sans { }; + openmoji-color = callPackage ../data/fonts/openmoji { variant = "color"; }; + + openmoji-black = callPackage ../data/fonts/openmoji { variant = "black"; }; + openzone-cursors = callPackage ../data/themes/openzone { }; oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { }; From 68cbdf8fe5d9ec15ae569b17f7dd7e33f7b496bb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 2 Oct 2019 06:33:31 -0500 Subject: [PATCH 0079/1062] openmoji: fix array shell variable, don't only process the first code :) --- pkgs/data/fonts/openmoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index 0e6843c07451..36cb0b1ee245 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -47,9 +47,9 @@ in stdenv.mkDerivation rec { cp "./black/svg/$filename" "./font/tmp-black/$filename" done - hexcodes=($(uniq<<<"$hexcodes")) + hexcodes=($(uniq<<<"''${hexcodes[@]}")) - for h in $hexcodes; do + for h in ''${hexcodes[@]}; do filename="$h.svg" if [ ! -e "./color/svg/$filename" ]; then echo "$h is missing -> substitute with \"Missing Glyph\": $filename" From 5a75f0586323d36842ff45bb81ab26caa50f667e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 7 Jan 2020 23:31:37 +0100 Subject: [PATCH 0080/1062] openmoji-black,openmoji-color: 12.0.0 -> 12.1.0 --- pkgs/data/fonts/openmoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index 36cb0b1ee245..b5dcd703849a 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "openmoji"; - version = "12.0.0"; + version = "12.1.0"; src = fetchFromGitHub { owner = "hfg-gmuend"; repo = pname; rev = version; - sha256 = "0h8sr74gbdmcm8vv8pxlig50mmbf9w9lh4p8ih2lqqi5iry1dvhj"; + sha256 = "11221xw13lsv2znxs295m61cn69wkp5934b0aaddpki2vp6q3n0r"; }; nativeBuildInputs = [ From 33f73db2e5354dc3f0878b4415936ff60ed4abdb Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 6 Jul 2020 12:21:48 +0200 Subject: [PATCH 0081/1062] openmoji-black,openmoji-color: 12.1.0 -> 12.4.0 --- pkgs/data/fonts/openmoji/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index b5dcd703849a..fc7af3d0e1fb 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , scfbuild +, python3Packages , variant ? "color" # "color" or "black" }: @@ -9,20 +10,33 @@ let [ "color" "black" ] [ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ] variant; + scfbuildOptions = stdenv.lib.optionalString (variant == "black") "--glyph-only"; + + # We have to use their scfbuild fork: + # https://github.com/hfg-gmuend/openmoji/tree/master/font#setup + scfbuildPatched = scfbuild.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "b-g"; + repo = "scfbuild"; + rev = "880f690332fc9cc4dee0790921d331f13bd5acaa"; + sha256 = "0d61gn69hgxn17jvs69xpblq9z1l85aymbrn6jjwqamhpcl42c04"; + }; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ python3Packages.lxml ]; + }); in stdenv.mkDerivation rec { pname = "openmoji"; - version = "12.1.0"; + version = "12.4.0"; src = fetchFromGitHub { owner = "hfg-gmuend"; repo = pname; rev = version; - sha256 = "11221xw13lsv2znxs295m61cn69wkp5934b0aaddpki2vp6q3n0r"; + sha256 = "0zis0i7fn7dqv39c9ms7f1p4dqqzwdfwkdgrijaak1cmb8rkn3a0"; }; nativeBuildInputs = [ - scfbuild + scfbuildPatched ]; # Some id and data-* attributes in the svg files contain unicode characters, @@ -60,7 +74,7 @@ in stdenv.mkDerivation rec { # Actually build the font: cd font - scfbuild -c scfbuild-${variant}.yml + scfbuild ${scfbuildOptions} -c scfbuild-${variant}.yml ''; installPhase = '' From 3c7fbeaf4ab650eab91a3f8d14b0a71858c55900 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Mon, 2 Aug 2021 21:11:14 +0200 Subject: [PATCH 0082/1062] Revert "Revert "cmake: 3.19.7 -> 3.21.0"" This reverts commit bd57a30d1ba907783e73fe1d887bf62b8a7c1760. --- .../cmake/application-services.patch | 26 +++++++++---------- .../tools/build-managers/cmake/default.nix | 5 ++-- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index f64e220eb29b..7c77336b41be 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -1,8 +1,8 @@ diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt -index 1b6bb00d4c..487114daa8 100644 +index 9a18184fd3..278d146dd1 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt -@@ -893,7 +893,6 @@ endif() +@@ -933,7 +933,6 @@ endif() # On Apple we need CoreFoundation and CoreServices if(APPLE) target_link_libraries(CMakeLib "-framework CoreFoundation") @@ -11,27 +11,25 @@ index 1b6bb00d4c..487114daa8 100644 if(WIN32 AND NOT UNIX) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx -index a5ce5d18f4..3d6838ce82 100644 +index 77403b076a..d5aac95e1e 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx -@@ -43,11 +43,10 @@ - - struct cmLinkImplementation; +@@ -49,10 +49,6 @@ struct cmLinkImplementation; #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) --# define HAVE_APPLICATION_SERVICES --# include -+# include + # include +-# if !TARGET_OS_IPHONE +-# define HAVE_APPLICATION_SERVICES +-# include +-# endif #endif - - #if !defined(CMAKE_BOOTSTRAP) - # include "cmXMLParser.h" + #if !defined(CMAKE_BOOTSTRAP) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index bfcaf30bb7..1da540aee5 100644 +index 79452ffff6..a848731b7e 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -2007,11 +2007,6 @@ IF(ENABLE_TEST) +@@ -2013,11 +2013,6 @@ IF(ENABLE_TEST) ENDIF(ENABLE_TEST) ENDIF() diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index c12b8f5acc92..34714c762378 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI"; - version = "3.19.7"; + version = "3.21.0"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "sha256-WKFfDVagr8zDzFNxI0/Oc/zGyPnb13XYmOUQuDF1WI4="; + sha256 = "sha256-SkLVZEmlH004CatNO2H9SpakaeViZuiWzhAJtXaL0qs="; }; patches = [ From a5704278e8be508baf196937612e87db87bded88 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Tue, 10 Aug 2021 18:26:52 -0400 Subject: [PATCH 0083/1062] fontforge: Apply patch to avoid segfault. This segfault appears when trying to build some fonts such as openmoji. See https://github.com/NixOS/nixpkgs/pull/70177 for discussion. --- pkgs/tools/misc/fontforge/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 5f64057c46c3..72879fdb9d1e 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; }) + # Fix segmentation fault with some fonts. + # This is merged and should be present in the next release. + (fetchpatch { + url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch"; + sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29"; + }) ]; # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps From 739e12c85fcedd7be8afe498ec5a4721a84e0a23 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 01:25:50 +0000 Subject: [PATCH 0084/1062] brave: 1.27.111 -> 1.28.105 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 019075592e87..924b9a7fb827 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.27.111"; + version = "1.28.105"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "nQkna1r8wSjTPEWp9RxOz45FVmz97NHzTlb4Hh5lXcs="; + sha256 = "1E2KWG5vHYBuph6Pv9J6FBOsUpegx4Ix/H99ZQ/x4zI="; }; dontConfigure = true; From 521f74dc8cec33b7366e53bc93e9a67a16ca65e2 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 12 Aug 2021 07:25:34 +0200 Subject: [PATCH 0085/1062] networkmanager: 1.32.6 -> 1.32.8 --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 63c52a337103..359c880c8531 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.6"; + version = "1.32.8"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-PSdGBR87MylArCk1TgFpEVnUZ4PXL9IyvTbpgijOWgk="; + sha256 = "sha256-5+Qq0FrXuQVPviJ5MPQCE/Lp169k3SVC5gMYoLGnbHU="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From 3bc7ad5378e6aaf050d34a8eb54d8964e4165fc3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 10 Aug 2021 08:27:52 +0000 Subject: [PATCH 0086/1062] lvm2: remove probably-unnecessary Musl patch e606e4d6a92 ("lvm2: musl patches from alpine") added all these patches from Alpine to fix Musl builds, but one doesn't actually seem related to Musl. The Alpine issue[1] that led to its introduction links to a Gentoo issue[2] about the same thing on Glibc. We shouldn't be applying a fix for a non-libc-specific bug only to Musl builds, and if this was going to be an issue for us we'd expect to have seen it on Glibc by now. It's more likely that it's been fixed in the meantime. [1]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/3107 [2]: https://bugs.gentoo.org/335492 --- pkgs/os-specific/linux/lvm2/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 2e52e49639e2..4c07c0f74776 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -79,11 +79,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) - (fetchpatch { - name = "mlockall-default-config.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; - sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; - }) ]; doCheck = false; # requires root From ad3ed169292942d5bd17683e533eb3f2fdc69596 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 10 Aug 2021 08:55:48 +0000 Subject: [PATCH 0087/1062] lvm2: fix musl patches; apply unconditionally Alpine's version of the first patch no longer applied, because we're on a newer lvm2 version. The fixes in both of these patches are either Musl-specific, or shouldn't negatively affect Glibc, so change to applying them unconditionally so they don't bitrot in future. --- pkgs/os-specific/linux/lvm2/default.nix | 10 ++-- .../linux/lvm2/fix-stdio-usage.patch | 53 +++++++++++++++++++ 2 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 4c07c0f74776..fed7152d07ae 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -67,13 +67,9 @@ stdenv.mkDerivation rec { sed -i 's|^#define LVM_CONFIGURE_LINE.*$|#define LVM_CONFIGURE_LINE ""|g' ./include/configure.h ''; - - patches = lib.optionals stdenv.hostPlatform.isMusl [ - (fetchpatch { - name = "fix-stdio-usage.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; - sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p"; - }) + patches = [ + # Musl fixes from Alpine. + ./fix-stdio-usage.patch (fetchpatch { name = "mallinfo.patch"; url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; diff --git a/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch b/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch new file mode 100644 index 000000000000..59666ffbad5a --- /dev/null +++ b/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch @@ -0,0 +1,53 @@ +diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c +index 296618686..96343eeb7 100644 +--- a/lib/commands/toolcontext.c ++++ b/lib/commands/toolcontext.c +@@ -1619,7 +1619,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, + /* FIXME Make this configurable? */ + reset_lvm_errno(1); + +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + /* Set in/out stream buffering before glibc */ + if (set_buffering + #ifdef SYS_gettid +@@ -2006,7 +2006,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + + if (cmd->pending_delete_mem) + dm_pool_destroy(cmd->pending_delete_mem); +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + if (cmd->linebuffer) { + /* Reset stream buffering to defaults */ + if (is_valid_fd(STDIN_FILENO) && +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index d97ff5720..bbbda82bd 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -3342,7 +3342,7 @@ static int _check_standard_fds(void) + int err = is_valid_fd(STDERR_FILENO); + + if (!is_valid_fd(STDIN_FILENO) && +- !(stdin = fopen(_PATH_DEVNULL, "r"))) { ++ !freopen(_PATH_DEVNULL, "r", stdin)) { + if (err) + perror("stdin stream open"); + else +@@ -3352,7 +3352,7 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDOUT_FILENO) && +- !(stdout = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stdout)) { + if (err) + perror("stdout stream open"); + /* else no stdout */ +@@ -3360,7 +3360,7 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDERR_FILENO) && +- !(stderr = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stderr)) { + printf("stderr stream open: %s\n", + strerror(errno)); + return 0; From 12da67f0c682d909ace9ad8847f9b13c69fb3844 Mon Sep 17 00:00:00 2001 From: tobim Date: Wed, 11 Aug 2021 17:45:28 +0200 Subject: [PATCH 0088/1062] cmake: 3.21.0 -> 3.21.1 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 34714c762378..860c1384849d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI"; - version = "3.21.0"; + version = "3.21.1"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-SkLVZEmlH004CatNO2H9SpakaeViZuiWzhAJtXaL0qs="; + sha256 = "sha256-+sORUXHU3/JZE5ddcS925prvRL9zi6e5dnk6RYtM/tQ="; }; patches = [ From 4aac491f1806e8b272367236611ba44456ce67a0 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 29 Jul 2021 17:46:58 +0200 Subject: [PATCH 0089/1062] cmake: Fix on darwin-arm64 Adds the SystemConfiguration framework to buildInputs unless we're bootstrapping. For the bootstrap version, we revert https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 instead so CMake builds without SystemConfiguration. --- .../tools/build-managers/cmake/default.nix | 8 +- .../remove-systemconfiguration-dep.patch | 89 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/build-managers/cmake/remove-systemconfiguration-dep.patch diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 860c1384849d..4a6b192dc3da 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -2,6 +2,7 @@ , bzip2, curlMinimal, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes +, SystemConfiguration , ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) @@ -33,7 +34,9 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; + ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch + # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 + ++ lib.optional (stdenv.isDarwin && isBootstrap) ./remove-systemconfiguration-dep.patch; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; @@ -50,7 +53,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] ++ lib.optional useOpenSSL openssl ++ lib.optional useNcurses ncurses - ++ lib.optional withQt5 qtbase; + ++ lib.optional withQt5 qtbase + ++ lib.optional (stdenv.isDarwin && !isBootstrap) SystemConfiguration; propagatedBuildInputs = lib.optional stdenv.isDarwin ps; diff --git a/pkgs/development/tools/build-managers/cmake/remove-systemconfiguration-dep.patch b/pkgs/development/tools/build-managers/cmake/remove-systemconfiguration-dep.patch new file mode 100644 index 000000000000..984aaf983067 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/remove-systemconfiguration-dep.patch @@ -0,0 +1,89 @@ +From 76523ca5b2227085bb65253900e866b08a2b5efb Mon Sep 17 00:00:00 2001 +From: Tobias Mayer +Date: Fri, 30 Jul 2021 10:50:16 +0200 +Subject: [PATCH] Disable NAT64 address synthesis on darwin + +This intentionally breaks the feature by partially reverting +https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 + +This is a stop-gap to get CMake to build without the SystemConfiguration +framework. +--- + Utilities/cmcurl/CMakeLists.txt | 8 -------- + Utilities/cmcurl/lib/curl_setup.h | 4 ---- + Utilities/cmcurl/lib/hostip.c | 17 ----------------- + 3 files changed, 29 deletions(-) + +diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt +index 16ef037ccc..17564bbb69 100644 +--- a/Utilities/cmcurl/CMakeLists.txt ++++ b/Utilities/cmcurl/CMakeLists.txt +@@ -511,14 +511,6 @@ if(CMAKE_USE_SECTRANSP) + list(APPEND CURL_LIBS "${COREFOUNDATION_FRAMEWORK}" "${SECURITY_FRAMEWORK}") + endif() + +-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration") +- if(NOT SYSTEMCONFIGURATION_FRAMEWORK) +- message(FATAL_ERROR "SystemConfiguration framework not found") +- endif() +- list(APPEND CURL_LIBS "${SYSTEMCONFIGURATION_FRAMEWORK}") +-endif() +- + if(CMAKE_USE_OPENSSL) + find_package(OpenSSL) + if(NOT OpenSSL_FOUND) +diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h +index 2d13a40a55..35160bc0f5 100644 +--- a/Utilities/cmcurl/lib/curl_setup.h ++++ b/Utilities/cmcurl/lib/curl_setup.h +@@ -251,11 +251,7 @@ + * performing this task will result in a synthesized IPv6 address. + */ + #if defined(__APPLE__) && !defined(USE_ARES) +-#include + #define USE_RESOLVE_ON_IPS 1 +-# if defined(TARGET_OS_OSX) && TARGET_OS_OSX +-# define CURL_OSX_CALL_COPYPROXIES 1 +-# endif + #endif + + #ifdef USE_LWIPSOCK +diff --git a/Utilities/cmcurl/lib/hostip.c b/Utilities/cmcurl/lib/hostip.c +index e0e3cfc2cb..45190a100b 100644 +--- a/Utilities/cmcurl/lib/hostip.c ++++ b/Utilities/cmcurl/lib/hostip.c +@@ -68,10 +68,6 @@ + #include "curl_memory.h" + #include "memdebug.h" + +-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) +-#include +-#endif +- + #if defined(CURLRES_SYNCH) && \ + defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) + /* alarm-based timeouts can only be used with all the dependencies satisfied */ +@@ -533,19 +529,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, + return CURLRESOLV_ERROR; + } + +-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) +- /* +- * The automagic conversion from IPv4 literals to IPv6 literals only works +- * if the SCDynamicStoreCopyProxies system function gets called first. As +- * Curl currently doesn't support system-wide HTTP proxies, we therefore +- * don't use any value this function might return. +- * +- * This function is only available on a macOS and is not needed for +- * IPv4-only builds, hence the conditions above. +- */ +- SCDynamicStoreCopyProxies(NULL); +-#endif +- + #ifndef USE_RESOLVE_ON_IPS + /* First check if this is an IPv4 address string */ + if(Curl_inet_pton(AF_INET, hostname, &in) > 0) +-- +2.32.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eec30ce4692b..4eb8baee168b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13482,10 +13482,15 @@ with pkgs; cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake { isBootstrap = true; + # There is no SystemConfiguration in bootstrapTools, so this version gets + # patched to remove that dependency. + SystemConfiguration = null; }; cmakeCurses = cmake.override { useNcurses = true; }; From c62f911507977ac67fd5e8547af2d1071c5e0891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 17 May 2021 19:49:44 +0200 Subject: [PATCH 0090/1062] top-level: move linux kernels, packages and related functions to linux-kernels.nix --- .../cd-dvd/system-tarball-fuloong2f.nix | 2 +- .../installer/cd-dvd/system-tarball-pc.nix | 2 +- .../cd-dvd/system-tarball-sheevaplug.nix | 2 +- .../sd-card/sd-image-raspberrypi.nix | 2 +- nixos/modules/system/boot/kernel.nix | 2 +- nixos/tests/kernel-generic.nix | 18 +- pkgs/os-specific/linux/zfs/default.nix | 4 +- pkgs/top-level/aliases.nix | 36 +- pkgs/top-level/all-packages.nix | 545 ++--------------- pkgs/top-level/linux-kernels.nix | 546 ++++++++++++++++++ 10 files changed, 638 insertions(+), 521 deletions(-) create mode 100644 pkgs/top-level/linux-kernels.nix diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index 123f487baf93..054c8c74a76b 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -93,7 +93,7 @@ in boot.initrd.availableKernelModules = [ "vfat" "reiserfs" ]; - boot.kernelPackages = pkgs.linuxPackages_3_10; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; boot.kernelParams = [ "console=tty1" ]; boot.postBootCommands = diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix index a79209d7dfef..674fb6c8a33c 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix @@ -114,7 +114,7 @@ in # To be able to use the systemTarball to catch troubles. boot.crashDump = { enable = true; - kernelPackages = pkgs.linuxPackages_3_4; + kernelPackages = pkgs.linuxKernel.packages.linux_3_4; }; # No grub for the tarball. diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 95579f3ca06d..458e313a3f75 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -111,7 +111,7 @@ in # "console=ttyS0,115200n8" # serial console ]; - boot.kernelPackages = pkgs.linuxPackages_3_4; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_4; boot.supportedFilesystems = [ "reiserfs" ]; diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix index 83850f4c1158..103d6787a03c 100644 --- a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix @@ -12,7 +12,7 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.consoleLogLevel = lib.mkDefault 7; - boot.kernelPackages = pkgs.linuxPackages_rpi1; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_rpi1; sdImage = { populateFirmwareCommands = let diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 1a6a9d99d5bb..15a5fd236092 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -47,7 +47,7 @@ in # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. defaultText = "pkgs.linuxPackages"; - example = literalExample "pkgs.linuxPackages_2_6_25"; + example = literalExample "pkgs.linuxKernel.packages.linux_5_10"; description = '' This option allows you to override the Linux kernel used by NixOS. Since things like external kernel module packages are diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index cd32049dff46..6511d8db5b77 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -23,16 +23,18 @@ let assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") ''; }) args); + + packages = pkgs.linuxKernel.packages; in with pkgs; { - linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4; - linux_4_9 = makeKernelTest "4.9" linuxPackages_4_9; - linux_4_14 = makeKernelTest "4.14" linuxPackages_4_14; - linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19; - linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; - linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; - linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; - linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13; + linux_4_4 = makeKernelTest "4.4" packages.linux_4_4; + linux_4_9 = makeKernelTest "4.9" packages.linux_4_9; + linux_4_14 = makeKernelTest "4.14" packages.linux_4_14; + linux_4_19 = makeKernelTest "4.19" packages.linux_4_19; + linux_5_4 = makeKernelTest "5.4" packages.linux_5_4; + linux_5_10 = makeKernelTest "5.10" packages.linux_5_10; + linux_5_12 = makeKernelTest "5.12" packages.linux_5_12; + linux_5_13 = makeKernelTest "5.13" packages.linux_5_13; linux_testing = makeKernelTest "testing" linuxPackages_testing; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 517e6036e780..6f0f32d5230b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ pkgs, lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, nixosTests , configFile ? "all" @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_13 +, linuxPackages_5_13 ? pkgs.linuxKernel.packages.linux_5_13 }: with lib; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87c582987468..ef18a4aa927c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -435,8 +435,40 @@ mapAliases ({ libwnck3 = libwnck; lilypond-unstable = lilypond; # added 2021-03-11 links = links2; # added 2016-01-31 - linux_rpi0 = linux_rpi1; - linuxPackages_rpi0 = linuxPackages_rpi1; + linux_rpi0 = linuxKernel.kernels.linux_rpi1; + linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; + linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; + linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; + linuxPackages_rt_5_11 = linuxKernel.packages.linux_rt_5_11; + linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; + linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; + linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; + linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4; + linuxPackages_4_4 = linuxKernel.packages.linux_4_4; + linuxPackages_4_9 = linuxKernel.packages.linux_4_9; + linuxPackages_4_14 = linuxKernel.packages.linux_4_14; + linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; + linuxPackages_4_19 = linuxKernel.packages.linux_4_19; + linuxPackages_5_4 = linuxKernel.packages.linux_5_4; + linuxPackages_5_10 = linuxKernel.packages.linux_5_10; + linuxPackages_5_12 = linuxKernel.packages.linux_5_12; + linuxPackages_5_13 = linuxKernel.packages.linux_5_13; + + linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; + linux_rpi1 = linuxKernel.kernels.linux_rpi1; + linux_rpi2 = linuxKernel.kernels.linux_rpi2; + linux_rpi3 = linuxKernel.kernels.linux_rpi3; + linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_4_4 = linuxKernel.kernels.linux_4_4; + linux_4_9 = linuxKernel.kernels.linux_4_9; + linux_4_14 = linuxKernel.kernels.linux_4_14; + linux_4_19 = linuxKernel.kernels.linux_4_19; + linux_5_4 = linuxKernel.kernels.linux_5_4; + linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; + linux_5_10 = linuxKernel.kernels.linux_5_10; + linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; + linux_5_12 = linuxKernel.kernels.linux_5_12; + linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; # added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8cc410c3385..48f98f2fb768 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21045,465 +21045,31 @@ with pkgs; tgt = callPackage ../tools/networking/tgt { }; - # -- Linux kernel expressions ------------------------------------------------ - lkl = callPackage ../applications/virtualization/lkl { }; inherit (callPackages ../os-specific/linux/kernel-headers { }) linuxHeaders makeLinuxHeaders; - kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; - klibc = callPackage ../os-specific/linux/klibc { }; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); - linux_mptcp = linux_mptcp_95; + linuxKernel = recurseIntoAttrs (callPackage ./linux-kernels.nix { }); - linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { - kernelPatches = linux_4_19.kernelPatches; - }; + inherit (linuxKernel) buildLinux linuxConfig kernelPatches; - linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 1; - }; + linuxPackagesFor = linuxKernel.packagesFor; - linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 2; - }; + hardenedLinuxPackagesFor = linuxKernel.hardenedPackagesFor; - linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 3; - }; + linuxManualConfig = linuxKernel.manualConfig; - linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 4; - }; - - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.9" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.rtl8761b_support - ]; - }; - - linux-rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - - linux-rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - - linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_13; - kernelPatches = kernel.kernelPatches; - }; - - linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_xanmod = callPackage ../os-specific/linux/kernel/linux-xanmod.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - /* Linux kernel modules are inherently tied to a specific kernel. So - rather than provide specific instances of those packages for a - specific kernel, we have a function that builds those packages - for a specific kernel. This function can then be called for - whatever kernel you're using. */ - - linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; { - callPackage = newScope self; - - kernel = kernel_; - inherit (kernel) stdenv; # in particular, use the same compiler by default - - # to help determine module compatibility - inherit (kernel) isZen isHardened isLibre; - inherit (kernel) kernelOlder kernelAtLeast; - - # Obsolete aliases (these packages do not depend on the kernel). - inherit (pkgs) odp-dpdk pktgen; # added 2018-05 - - acpi_call = callPackage ../os-specific/linux/acpi-call {}; - - akvcam = callPackage ../os-specific/linux/akvcam { - inherit (qt5) qmake; - }; - - amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; - - anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; - - apfs = callPackage ../os-specific/linux/apfs { }; - - batman_adv = callPackage ../os-specific/linux/batman-adv {}; - - bcc = callPackage ../os-specific/linux/bcc { - python = python3; - }; - - bpftrace = callPackage ../os-specific/linux/bpftrace { }; - - bbswitch = callPackage ../os-specific/linux/bbswitch {}; - - chipsec = callPackage ../tools/security/chipsec { - inherit kernel; - withDriver = true; - }; - - cryptodev = callPackage ../os-specific/linux/cryptodev { }; - - cpupower = callPackage ../os-specific/linux/cpupower { }; - - ddcci-driver = callPackage ../os-specific/linux/ddcci { }; - - digimend = callPackage ../os-specific/linux/digimend { }; - - dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; - - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; - - evdi = callPackage ../os-specific/linux/evdi { }; - - fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; - - gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; - - hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { }; - - hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - - e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; - - intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; - - ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; - - it87 = callPackage ../os-specific/linux/it87 {}; - - asus-wmi-sensors = callPackage ../os-specific/linux/asus-wmi-sensors {}; - - ena = callPackage ../os-specific/linux/ena {}; - - v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; - - lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; - - broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { }; - - tbs = callPackage ../os-specific/linux/tbs { }; - - mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; - - nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - - nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); - - nvidia_x11_legacy340 = nvidiaPackages.legacy_340; - nvidia_x11_legacy390 = nvidiaPackages.legacy_390; - nvidia_x11_beta = nvidiaPackages.beta; - nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; - nvidia_x11 = nvidiaPackages.stable; - - openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; - - ply = callPackage ../os-specific/linux/ply { }; - - r8125 = callPackage ../os-specific/linux/r8125 { }; - - r8168 = callPackage ../os-specific/linux/r8168 { }; - - rtl8188eus-aircrack = callPackage ../os-specific/linux/rtl8188eus-aircrack { }; - - rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; - - rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; - - rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; - - rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; - - rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack { }; - - rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; - - rtl8821ce = callPackage ../os-specific/linux/rtl8821ce { }; - - rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; - - rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; - - rtw88 = callPackage ../os-specific/linux/rtw88 { }; - rtlwifi_new = rtw88; - - rtw89 = callPackage ../os-specific/linux/rtw89 { }; - - openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; - openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; - # Current stable release; don't backport release updates! - openafs = openafs_1_8; - - facetimehd = callPackage ../os-specific/linux/facetimehd { }; - - tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; - - jool = callPackage ../os-specific/linux/jool { }; - - kvmfr = callPackage ../os-specific/linux/kvmfr { }; - - mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; - - mwprocapture = callPackage ../os-specific/linux/mwprocapture { }; - - mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; - - # compiles but has to be integrated into the kernel somehow - # Let's have it uncommented and finish it.. - ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; - - netatop = callPackage ../os-specific/linux/netatop { }; - - oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - - perf = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; - - phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; - - # Disable for kernels 4.15 and above due to compatibility issues - prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; - - sch_cake = callPackage ../os-specific/linux/sch_cake { }; - - isgx = callPackage ../os-specific/linux/isgx { }; - - sysdig = callPackage ../os-specific/linux/sysdig {}; - - systemtap = callPackage ../development/tools/profiling/systemtap { }; - - system76 = callPackage ../os-specific/linux/system76 { }; - - system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; - - system76-power = callPackage ../os-specific/linux/system76-power { }; - - system76-io = callPackage ../os-specific/linux/system76-io { }; - - tmon = callPackage ../os-specific/linux/tmon { }; - - tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; - - turbostat = callPackage ../os-specific/linux/turbostat { }; - - usbip = callPackage ../os-specific/linux/usbip { }; - - v86d = callPackage ../os-specific/linux/v86d { }; - - veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; - - vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; - - vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; - - virtualbox = callPackage ../os-specific/linux/virtualbox { - virtualbox = pkgs.virtualboxHardened; - }; - - virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { - virtualbox = pkgs.virtualboxHardened; - }; - - wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; - - x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; - - xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; - - xpadneo = callPackage ../os-specific/linux/xpadneo { }; - - zenpower = callPackage ../os-specific/linux/zenpower { }; - - inherit (callPackages ../os-specific/linux/zfs { - configFile = "kernel"; - inherit kernel; - }) zfsStable zfsUnstable; - zfs = zfsStable; - - can-isotp = callPackage ../os-specific/linux/can-isotp { }; - } // lib.optionalAttrs (config.allowAliases or false) { - # aliases or removed packages - ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18 - }); - - # The current default kernel / kernel modules. - linuxPackages = linuxPackages_5_10; - linux = linuxPackages.kernel; - - # Update this when adding the newest kernel major version! - # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_13; - linux_latest = linuxPackages_latest.kernel; - - # Realtime kernel packages. - linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; - linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; - linuxPackages-rt_5_11 = linuxPackagesFor pkgs.linux-rt_5_11; - linuxPackages-rt = linuxPackages-rt_5_4; - linuxPackages-rt_latest = linuxPackages-rt_5_11; - linux-rt = linuxPackages-rt.kernel; - linux-rt_latest = linuxPackages-rt_latest.kernel; - - linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; - linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; - linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; - linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3; - linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4; - # Build kernel modules for some of the kernels. - linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); - linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); - linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); - linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); - linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); - - # When adding to the list above: - # - Update linuxPackages_latest to the latest version - # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. - - # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. - linuxPackages_testing = linuxPackagesFor pkgs.linux_testing; - - linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }: - recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile lib stdenv allowImportFromDerivation; - })); + linuxPackages_custom = linuxKernel.customPackage; # This serves as a test for linuxPackages_custom linuxPackages_custom_tinyconfig_kernel = let base = pkgs.linuxPackages.kernel; - tinyLinuxPackages = pkgs.linuxPackages_custom { + tinyLinuxPackages = linuxKernel.customPackage { inherit (base) version src; allowImportFromDerivation = false; configfile = pkgs.linuxConfig { @@ -21513,83 +21079,54 @@ with pkgs; }; in tinyLinuxPackages.kernel; - # Build a kernel with bcachefs module - linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); + # The current default kernel / kernel modules. + linuxPackages = linuxKernel.packageAliases.linux_default; + linux = linuxPackages.kernel; - # Hardened Linux - hardenedLinuxPackagesFor = kernel': overrides: - let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_12; - kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; - in linuxPackagesFor (kernel.override { - structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit lib; - inherit (kernel) version; - }; - kernelPatches = kernel.kernelPatches ++ [ - kernelPatches.hardened.${kernel.meta.branch} - ]; - modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; - isHardened = true; - }); + linuxPackages_latest = linuxKernel.packageAliases.linux_latest; + linux_latest = linuxPackages_latest.kernel; - linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); + # Testing (rc) kernel + linuxPackages_testing = linuxKernel.packages.linux_testing; + linux_testing = linuxKernel.kernels.linux_testing; + + linuxPackages_testing_bcachefs = linuxKernel.packages.linux_testing_bcachefs; + linux_testing_bcachefs = linuxKernel.kernels.linux_testing_bcachefs; + + # kernel with mtcp support + linuxPackages_mptcp = linuxKernel.packageAliases.linux_mptcp; + linux_mptcp = linuxPackages_mptcp.kernel; + + # Realtime kernel + linuxPackages-rt = linuxKernel.packageAliases.linux_rt_default; + linuxPackages-rt_latest = linuxKernel.packageAliases.linux_rt_latest; + linux-rt = linuxPackages-rt.kernel; + linux-rt_latest = linuxPackages-rt_latest.kernel; + + # hardened kernels + linuxPackages_hardened = linuxKernel.packages.linux_hardened; linux_hardened = linuxPackages_hardened.kernel; - - linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { }); + linuxPackages_latest_hardened = linuxKernel.packages.linux_latest_hardened; linux_latest_hardened = linuxPackages_latest_hardened.kernel; # Hardkernel (Odroid) kernels. - linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); - linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; + linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel; # GNU Linux-libre kernels - linuxPackages-libre = recurseIntoAttrs (linuxPackagesFor linux-libre); - linux-libre = callPackage ../os-specific/linux/kernel/linux-libre.nix {}; - linuxPackages_latest-libre = recurseIntoAttrs (linuxPackagesFor linux_latest-libre); - linux_latest-libre = linux-libre.override { linux = linux_latest; }; + linuxPackages-libre = linuxKernel.packages.linux_libre; + linux-libre = linuxPackages-libre.kernel; + linuxPackages_latest-libre = linuxKernel.packages.linux_latest_libre; + linux_latest-libre = linuxPackages_latest-libre.kernel; # zen-kernel - linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); - linuxPackages_lqx = recurseIntoAttrs (linuxPackagesFor pkgs.linux_lqx); + linuxPackages_zen = linuxKernel.packages.linux_zen; + linuxPackages_lqx = linuxKernel.packages.linux_lqx; # XanMod kernel - linuxPackages_xanmod = recurseIntoAttrs (linuxPackagesFor pkgs.linux_xanmod); + linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; - # A function to build a manually-configured kernel - linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); - - # Derive one of the default .config files - linuxConfig = { - src, - version ? (builtins.parseDrvName src.name).version, - makeTarget ? "defconfig", - name ? "kernel.config", - }: stdenvNoCC.mkDerivation { - inherit name src; - depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; - postPatch = '' - patchShebangs scripts/ - ''; - buildPhase = '' - ( - set -x - make \ - ARCH=${stdenv.hostPlatform.linuxArch} \ - HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ - ${makeTarget} - ) - ''; - installPhase = '' - cp .config $out - ''; - }; - - buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; - - cryptodev = linuxPackages_4_9.cryptodev; + cryptodev = linuxKernel.packages.linux_4_9.cryptodev; dpdk = callPackage ../os-specific/linux/dpdk { kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix new file mode 100644 index 000000000000..86d451865957 --- /dev/null +++ b/pkgs/top-level/linux-kernels.nix @@ -0,0 +1,546 @@ +{ pkgs +, config +, buildPackages +, callPackage +, makeOverridable +, recurseIntoAttrs +, dontRecurseIntoAttrs +, stdenv +, stdenvNoCC +, newScope +, lib +}: + +# When adding a kernel: + # - Update packageAliases.linux_latest to the latest version + # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. + # - Update linux_latest_hardened when the patches become available + +let + kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; + + deblobKernel = kernel: callPackage ../os-specific/linux/kernel/linux-libre.nix { + linux = kernel; + }; + + kernels = lib.makeExtensible (self: with self; + let callPackage = newScope self; in { + + linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { + kernelPatches = linux_4_19.kernelPatches; + }; + + linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 1; + }; + + linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 2; + }; + + linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 3; + }; + + linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 4; + }; + + linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper_updated + kernelPatches.cpu-cgroup-v2."4.4" + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper_updated + kernelPatches.cpu-cgroup-v2."4.9" + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.rtl8761b_support + ]; + }; + + linux_rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate + ]; + }; + + linux_rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate + ]; + }; + + linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { + kernel = linux_5_13; + kernelPatches = kernel.kernelPatches; + }; + + linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_xanmod = callPackage ../os-specific/linux/kernel/linux-xanmod.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_libre = deblobKernel packageAliases.linux_default.kernel; + + linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel; + + }); + /* Linux kernel modules are inherently tied to a specific kernel. So + rather than provide specific instances of those packages for a + specific kernel, we have a function that builds those packages + for a specific kernel. This function can then be called for + whatever kernel you're using. */ + + packagesFor = kernel_: lib.makeExtensible (self: with self; + let callPackage = newScope self; in { + inherit callPackage; + kernel = kernel_; + inherit (kernel) stdenv; # in particular, use the same compiler by default + + # to help determine module compatibility + inherit (kernel) isZen isHardened isLibre; + inherit (kernel) kernelOlder kernelAtLeast; + # Obsolete aliases (these packages do not depend on the kernel). + inherit (pkgs) odp-dpdk pktgen; # added 2018-05 + + acpi_call = callPackage ../os-specific/linux/acpi-call {}; + + akvcam = callPackage ../os-specific/linux/akvcam { + inherit (pkgs.qt5) qmake; + }; + + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; + + anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; + + apfs = callPackage ../os-specific/linux/apfs { }; + + batman_adv = callPackage ../os-specific/linux/batman-adv {}; + + bcc = callPackage ../os-specific/linux/bcc { + python = pkgs.python3; + }; + + bpftrace = callPackage ../os-specific/linux/bpftrace { }; + + bbswitch = callPackage ../os-specific/linux/bbswitch {}; + + chipsec = callPackage ../tools/security/chipsec { + inherit kernel; + withDriver = true; + }; + + cryptodev = callPackage ../os-specific/linux/cryptodev { }; + + cpupower = callPackage ../os-specific/linux/cpupower { }; + + ddcci-driver = callPackage ../os-specific/linux/ddcci { }; + + digimend = callPackage ../os-specific/linux/digimend { }; + + dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; + + exfat-nofuse = callPackage ../os-specific/linux/exfat { }; + + evdi = callPackage ../os-specific/linux/evdi { }; + + fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; + + gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; + hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { }; + + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; + + e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; + + intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; + + ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; + + it87 = callPackage ../os-specific/linux/it87 {}; + + asus-wmi-sensors = callPackage ../os-specific/linux/asus-wmi-sensors {}; + + ena = callPackage ../os-specific/linux/ena {}; + + v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; + + lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; + + broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { }; + + tbs = callPackage ../os-specific/linux/tbs { }; + + mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; + + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; + + nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); + + nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_legacy390 = nvidiaPackages.legacy_390; + nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; + nvidia_x11 = nvidiaPackages.stable; + + openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; + + ply = callPackage ../os-specific/linux/ply { }; + + r8125 = callPackage ../os-specific/linux/r8125 { }; + + r8168 = callPackage ../os-specific/linux/r8168 { }; + + rtl8188eus-aircrack = callPackage ../os-specific/linux/rtl8188eus-aircrack { }; + + rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; + + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; + + rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; + + rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; + + rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack {}; + + rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; + + rtl8821ce = callPackage ../os-specific/linux/rtl8821ce { }; + + rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; + + rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; + + rtw88 = callPackage ../os-specific/linux/rtw88 { }; + rtlwifi_new = rtw88; + + rtw89 = callPackage ../os-specific/linux/rtw89 { }; + + openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; + openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; + # Current stable release; don't backport release updates! + openafs = openafs_1_8; + + facetimehd = callPackage ../os-specific/linux/facetimehd { }; + + tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; + + jool = callPackage ../os-specific/linux/jool { }; + + kvmfr = callPackage ../os-specific/linux/kvmfr { }; + + mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; + + mwprocapture = callPackage ../os-specific/linux/mwprocapture { }; + + mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; + + # compiles but has to be integrated into the kernel somehow + # Let's have it uncommented and finish it.. + ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; + + netatop = callPackage ../os-specific/linux/netatop { }; + + oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; + + perf = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; + + phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; + + # Disable for kernels 4.15 and above due to compatibility issues + prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; + + sch_cake = callPackage ../os-specific/linux/sch_cake { }; + + isgx = callPackage ../os-specific/linux/isgx { }; + + sysdig = callPackage ../os-specific/linux/sysdig {}; + + systemtap = callPackage ../development/tools/profiling/systemtap { }; + + system76 = callPackage ../os-specific/linux/system76 { }; + + system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; + + system76-power = callPackage ../os-specific/linux/system76-power { }; + + system76-io = callPackage ../os-specific/linux/system76-io { }; + + tmon = callPackage ../os-specific/linux/tmon { }; + + tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; + + turbostat = callPackage ../os-specific/linux/turbostat { }; + + usbip = callPackage ../os-specific/linux/usbip { }; + + v86d = callPackage ../os-specific/linux/v86d { }; + + veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; + vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; + + vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + + virtualbox = callPackage ../os-specific/linux/virtualbox { + virtualbox = pkgs.virtualboxHardened; + }; + + virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { + virtualbox = pkgs.virtualboxHardened; + }; + + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; + + x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; + + xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; + + xpadneo = callPackage ../os-specific/linux/xpadneo { }; + + zenpower = callPackage ../os-specific/linux/zenpower { }; + + inherit (callPackage ../os-specific/linux/zfs { + configFile = "kernel"; + inherit pkgs kernel; + }) zfsStable zfsUnstable; + zfs = zfsStable; + + can-isotp = callPackage ../os-specific/linux/can-isotp { }; + + } // lib.optionalAttrs (config.allowAliases or false) { + ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; + }); + + # Hardened Linux + hardenedPackagesFor = kernel': overrides: + let kernel = kernel'.override overrides; + in packagesFor (kernel.override { + structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { + inherit lib; + inherit (kernel) version; + }; + kernelPatches = kernel.kernelPatches ++ [ + kernelPatches.hardened.${kernel.meta.branch} + ]; + modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; + isHardened = true; + }); + + vanillaPackages = { + # recurse to build modules for the kernels + linux_4_4 = recurseIntoAttrs (packagesFor kernels.linux_4_4); + linux_4_9 = recurseIntoAttrs (packagesFor kernels.linux_4_9); + linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); + linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); + linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); + linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); + linux_5_12 = recurseIntoAttrs (packagesFor kernels.linux_5_12); + linux_5_13 = recurseIntoAttrs (packagesFor kernels.linux_5_13); + }; + + rtPackages = { + # realtime kernel packages + linux_rt_5_4 = packagesFor kernels.linux_rt_5_4; + linux_rt_5_10 = packagesFor kernels.linux_rt_5_10; + linux_rt_5_11 = packagesFor kernels.linux_rt_5_11; + }; + + rpiPackages = { + linux_rpi1 = packagesFor kernels.linux_rpi1; + linux_rpi2 = packagesFor kernels.linux_rpi2; + linux_rpi3 = packagesFor kernels.linux_rpi3; + linux_rpi4 = packagesFor kernels.linux_rpi4; + }; + + packages = vanillaPackages // rtPackages // rpiPackages // { + linux_mptcp_95 = packagesFor kernels.linux_mptcp_95; + + # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. + linux_testing = packagesFor kernels.linux_testing; + linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); + + linux_hardened = recurseIntoAttrs (hardenedPackagesFor packageAliases.linux_default.kernel { }); + # Note: We use an explicit version instead of linux_latest since the hardened patches + # can lag behind and we don't want to delay updates. + linux_latest_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_12 { }); + + linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); + linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); + linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); + + hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); + + linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre); + + linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); + }; + + packageAliases = { + linux_default = packages.linux_5_10; + # Update this when adding the newest kernel major version! + linux_latest = packages.linux_5_13; + linux_mptcp = packages.linux_mptcp_95; + linux_rt_default = packages.linux_rt_5_4; + linux_rt_latest = packages.linux_rt_5_11; + linux_hardkernel_latest = packages.hardkernel_4_14; + }; + + manualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + +in + +{ + packages = recurseIntoAttrs packages; + kernels = recurseIntoAttrs kernels; + inherit packageAliases; + inherit vanillaPackages rtPackages rpiPackages; + inherit kernelPatches packagesFor hardenedPackagesFor; + + customPackage = { version, src, configfile, allowImportFromDerivation ? true }: + recurseIntoAttrs (packagesFor (manualConfig { + inherit version src configfile lib stdenv allowImportFromDerivation; + })); + + inherit manualConfig; + + # Derive one of the default .config files + linuxConfig = { + src, + version ? (builtins.parseDrvName src.name).version, + makeTarget ? "defconfig", + name ? "kernel.config", + }: stdenvNoCC.mkDerivation { + inherit name src; + depsBuildBuild = [ buildPackages.stdenv.cc ] + ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; + postPatch = '' + patchShebangs scripts/ + ''; + buildPhase = '' + set -x + make \ + ARCH=${stdenv.hostPlatform.linuxArch} \ + HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ + ${makeTarget} + ''; + installPhase = '' + cp .config $out + ''; + }; + + buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; + +} + From b4e9cd8596b00e38bad1a455d3664984364e01fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 29 Jun 2021 08:27:07 +0200 Subject: [PATCH 0091/1062] docs: adjust to the new structure of kernel packages --- doc/builders/packages/linux.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/builders/packages/linux.section.md b/doc/builders/packages/linux.section.md index 1b8d6eda749d..d8f0d0ad445f 100644 --- a/doc/builders/packages/linux.section.md +++ b/doc/builders/packages/linux.section.md @@ -16,7 +16,7 @@ How to add a new (major) version of the Linux kernel to Nixpkgs: 1. Copy the old Nix expression (e.g. `linux-2.6.21.nix`) to the new one (e.g. `linux-2.6.22.nix`) and update it. -2. Add the new kernel to `all-packages.nix` (e.g., create an attribute `kernel_2_6_22`). +2. Add the new kernel to the `kernels` attribute set in `linux-kernels.nix` (e.g., create an attribute `kernel_2_6_22`). 3. Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (`i686`, `x86_64`, `uml`) do the following: @@ -36,6 +36,6 @@ How to add a new (major) version of the Linux kernel to Nixpkgs: 5. Copy `.config` over the new config file (e.g. `config-2.6.22-i686-smp`). -4. Test building the kernel: `nix-build -A kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it. +4. Test building the kernel: `nix-build -A linuxKernel.kernels.kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it. -5. It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the `linuxPackagesFor` function in `all-packages.nix` (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. +5. It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the `linuxPackagesFor` function in `linux-kernels.nix` (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. From 66fe289724941cfe2037decf42190360aa37c928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 29 Jun 2021 08:28:58 +0200 Subject: [PATCH 0092/1062] nixos/doc: adjust to the new structure of kernel packages --- .../doc/manual/configuration/linux-kernel.xml | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 529ac1b1cd46..2675220b3a80 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -9,12 +9,14 @@ . For instance, this selects the Linux 3.10 kernel: - = pkgs.linuxPackages_3_10; + = pkgs.linuxKernel.packages.linux_3_10; Note that this not only replaces the kernel, but also packages that are - specific to the kernel version, such as the NVIDIA video drivers. This - ensures that driver packages are consistent with the kernel. - +specific to the kernel version, such as the NVIDIA video drivers. This ensures that driver packages are consistent with the kernel. + + + While pkgs.linuxKernel.packages contains all available kernel packages, you may want to use one of the unversioned pkgs.linuxPackages_* aliases such as pkgs.linuxPackages_latest, that are kept up to date with new versions. + The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: @@ -27,14 +29,13 @@ zcat /proc/config.gz linkend="sec-customising-packages" />). For instance, to enable support for the kernel debugger KGDB: -nixpkgs.config.packageOverrides = pkgs: - { linux_3_4 = pkgs.linux_3_4.override { - extraConfig = - '' - KGDB y - ''; - }; +nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { + linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override { + extraConfig = '' + KGDB y + ''; }; +}; extraConfig takes a list of Linux kernel configuration options, one per line. The name of the option should not include the prefix @@ -73,15 +74,16 @@ nixpkgs.config.packageOverrides = pkgs: The first step before compiling the kernel is to generate an appropriate .config configuration. Either you pass your own config via the configfile setting of - linuxManualConfig: + linuxKernel.manualConfig: You can edit the config with this snippet (by default make From c53354d1d29dad754a80493748ce854d4c18ff53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 29 Jun 2021 08:29:16 +0200 Subject: [PATCH 0093/1062] nixos/rl-2111: mention changes to linux kernel infrastructure --- .../from_md/release-notes/rl-2111.section.xml | 14 ++++++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ 2 files changed, 17 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 68d09a778131..786414bc32c2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -708,6 +708,20 @@
Other Notable Changes + + + The linux kernel package infrastructure was moved out of + all-packages.nix, and restructured. Linux + related functions and attributes now live under the + pkgs.linuxKernel attribute set. In + particular the versioned linuxPackages_* + package sets (such as linuxPackages_5_4) + and kernels from pkgs were moved there and + now live under pkgs.linuxKernel.packages.*. + The unversioned ones (such as + linuxPackages_latest) remain untouched. + + The setting diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index d7c38056ef61..76e0f7a966f8 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -181,6 +181,9 @@ To be able to access the web UI this port needs to be opened in the firewall. ## Other Notable Changes {#sec-release-21.11-notable-changes} +- The linux kernel package infrastructure was moved out of `all-packages.nix`, and restructured. Linux related functions and attributes now live under the `pkgs.linuxKernel` attribute set. + In particular the versioned `linuxPackages_*` package sets (such as `linuxPackages_5_4`) and kernels from `pkgs` were moved there and now live under `pkgs.linuxKernel.packages.*`. The unversioned ones (such as `linuxPackages_latest`) remain untouched. + - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs. From a160dfbf354934bf756fca2cb7e7ff005c27f17b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 6 Aug 2021 17:59:18 +0200 Subject: [PATCH 0094/1062] mariadb: 10.5.11 -> 10.6.3 new minor release https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/ --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ pkgs/servers/sql/mariadb/default.nix | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 68d09a778131..7e93c0a6cd26 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -881,6 +881,13 @@ sign OCSP responses and server certificates. + + + MariaDB was upgraded from 10.5.x to 10.6.x. Please read the + upstream + release notes for changes and upgrade instructions. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index d7c38056ef61..b30f158c4bd7 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -226,3 +226,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. - Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. + +- MariaDB was upgraded from 10.5.x to 10.6.x. Please read the [upstream release notes](https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/) for changes and upgrade instructions. diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fa9b5c414ed9..29c6e6f00897 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.5.11"; + version = "10.6.3"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "0yn4bhqciy6jyig31rmkjc588l03k4bj3194yf9y6373bxh5643n"; + sha256 = "1nqq1g6h2gvsraqziv2qq42v7y6fzbfw357mh3d1zv7md9h2bhav"; name = "mariadb-${version}.tar.gz"; }; From 5055c1e96914bd345656175e1c08062517318fbb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 6 Aug 2021 18:06:50 +0200 Subject: [PATCH 0095/1062] mariadb-galera: 26.4.8 -> 26.4.9 --- pkgs/servers/sql/mariadb/galera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 2b387db66cdc..1f4bbc0586ff 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.8"; + version = "26.4.9"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369"; + sha256 = "1nf8vv0b9v7rjsxl93avgvv0lz5jjg91brnric0dhlnp2dzzxi6g"; fetchSubmodules = true; }; From 9aad42590407b05cf81444a9a601d40a312d30ce Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 6 Aug 2021 18:22:48 +0200 Subject: [PATCH 0096/1062] libmysqlclient: init 3.2 and default to it https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/ --- .../manual/from_md/release-notes/rl-2111.section.xml | 11 +++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ pkgs/servers/sql/mariadb/connector-c/3_2.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 6 ++++-- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/sql/mariadb/connector-c/3_2.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 7e93c0a6cd26..ae5af984306d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -888,6 +888,17 @@ release notes for changes and upgrade instructions. + + + The MariaDB C client library, also known as libmysqlclient or + mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While + this should hopefully not have any impact, this upgrade comes + with some changes to default behavior, so you might want to + review the + upstream + release notes. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index b30f158c4bd7..6af01d5966b3 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -228,3 +228,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. - MariaDB was upgraded from 10.5.x to 10.6.x. Please read the [upstream release notes](https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/) for changes and upgrade instructions. + +- The MariaDB C client library, also known as libmysqlclient or mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While this should hopefully not have any impact, this upgrade comes with some changes to default behavior, so you might want to review the [upstream release notes](https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/). diff --git a/pkgs/servers/sql/mariadb/connector-c/3_2.nix b/pkgs/servers/sql/mariadb/connector-c/3_2.nix new file mode 100644 index 000000000000..8b1c8b04bdce --- /dev/null +++ b/pkgs/servers/sql/mariadb/connector-c/3_2.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./. (args // { + version = "3.2.3"; + sha256 = "1x1i4ck4c3sgkw083v02zk3rbkm5h0x1vl4m58j95q1qcijkiamn"; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8cc410c3385..7120b620e33a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20124,10 +20124,12 @@ with pkgs; rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { }; - libmysqlclient = libmysqlclient_3_1; + libmysqlclient = libmysqlclient_3_2; libmysqlclient_3_1 = mariadb-connector-c_3_1; - mariadb-connector-c = mariadb-connector-c_3_1; + libmysqlclient_3_2 = mariadb-connector-c_3_2; + mariadb-connector-c = mariadb-connector-c_3_2; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; + mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { }; mariadb-galera = callPackage ../servers/sql/mariadb/galera { asio = asio_1_10; From 5d1b3c9159ada1e8a8d986f576efbaa31e734691 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 7 Aug 2021 13:17:44 +0200 Subject: [PATCH 0097/1062] automysqlbackup: update and switch to fork last release on sourceforge is from 10 years ago and the test fails now --- pkgs/tools/backup/automysqlbackup/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix index 5ecdcc4e7edb..55186cfb21f0 100644 --- a/pkgs/tools/backup/automysqlbackup/default.nix +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }: stdenv.mkDerivation rec { pname = "automysqlbackup"; - version = "3.0_rc6"; + version = "3.0.6"; - src = fetchurl { - url = "mirror://sourceforge/automysqlbackup/AutoMySQLBackup/AutoMySQLBackup%20VER%203.0/automysqlbackup-v${version}.tar.gz"; - sha256 = "1h1wq86q6my1a682nr8pjagjhai4lxz967m17lhpw1vb116hd7l8"; + src = fetchFromGitHub { + owner = "sixhop"; + repo = pname; + rev = version; + sha256 = "0lki2049npc38r8m08garymywp1rzgflm0mxsfdznn9jfp4pk2lp"; }; - sourceRoot = "."; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A script to run daily, weekly and monthly backups for your MySQL database"; - homepage = "https://sourceforge.net/projects/automysqlbackup/"; + homepage = "https://github.com/sixhop/AutoMySQLBackup"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; license = licenses.gpl2Plus; From e728a35bfbb16a05d538f5830a6d3007e3267405 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 8 Aug 2021 23:47:05 +0200 Subject: [PATCH 0098/1062] nixos/automysqlbackup: fix after mariadb 10.6 upgrade client tries to connect over TCP, which failes because this uses socket auth --- nixos/modules/services/backup/automysqlbackup.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix index e3a8d1f79934..4fcaf9eb9301 100644 --- a/nixos/modules/services/backup/automysqlbackup.nix +++ b/nixos/modules/services/backup/automysqlbackup.nix @@ -73,6 +73,7 @@ in services.automysqlbackup.config = mapAttrs (name: mkDefault) { mysql_dump_username = user; mysql_dump_host = "localhost"; + mysql_dump_socket = "/run/mysqld/mysqld.sock"; backup_dir = "/var/backup/mysql"; db_exclude = [ "information_schema" "performance_schema" ]; mailcontent = "stdout"; From 14a1a01c4e8e074902437a14e0150ae3208b0bbf Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 16 Sep 2020 11:23:38 +0200 Subject: [PATCH 0099/1062] scfbuild: 1.0.3 -> 2.0.0 --- pkgs/tools/misc/scfbuild/default.nix | 12 ++----- pkgs/tools/misc/scfbuild/python-3.patch | 46 ------------------------- 2 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 pkgs/tools/misc/scfbuild/python-3.patch diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix index d604f1a68fe2..78434414b1a4 100644 --- a/pkgs/tools/misc/scfbuild/default.nix +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -2,23 +2,17 @@ buildPythonApplication { pname = "scfbuild"; - version = "1.0.3"; + version = "2.0.0"; format = "other"; src = fetchFromGitHub { owner = "13rac1"; repo = "scfbuild"; - rev = "9acc7fc5fedbf48683d8932dd5bd7583bf922bae"; - sha256 = "1zlqsxkpg7zvmhdjgbqwwc9qgac2b8amzq8c5kwyh5cv95zcp6qn"; + rev = "6d84339512a892972185d894704efa67dd82e87a"; + sha256 = "0wkyzkhshlax9rvdmn441gv87n9abfr0qqmgs8bkg9kbcjb4bhad"; }; - patches = [ - # Convert to Python 3 - # https://github.com/13rac1/scfbuild/pull/19 - ./python-3.patch - ]; - propagatedBuildInputs = [ pyyaml fonttools fontforge ]; installPhase = '' diff --git a/pkgs/tools/misc/scfbuild/python-3.patch b/pkgs/tools/misc/scfbuild/python-3.patch deleted file mode 100644 index 5a0178ad8c8e..000000000000 --- a/pkgs/tools/misc/scfbuild/python-3.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/bin/scfbuild -+++ b/bin/scfbuild -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from __future__ import (absolute_import, division, print_function, ---- a/scfbuild/builder.py -+++ b/scfbuild/builder.py -@@ -287,8 +287,8 @@ def _add_name_record(self, text, name_id, platform_id, plat_enc_id, lang_id): - # TODO: The installed version of fontTools doesn't have - # table__n_a_m_e.setName(). - record = NameRecord() -- # PyYAML creates strings, force to Unicode -- record.string = unicode(text) -+ # PyYAML creates strings, which are unicode as of Python3 -+ record.string = text - record.nameID = name_id - record.platformID = platform_id - record.platEncID = plat_enc_id ---- a/scfbuild/fforge.py -+++ b/scfbuild/fforge.py -@@ -84,7 +84,7 @@ def add_glyphs(font, svg_filepaths, conf): - u_ids = [int(u_id, 16) for u_id in filename.split("-")] - # Example: (0x1f441, 0x1f5e8) - -- u_str = ''.join(map(unichr, u_ids)) -+ u_str = ''.join(map(chr, u_ids)) - # Example: "U\0001f441U\0001f5e8" - - # Replace sequences with correct ZWJ/VS16 versions as needed ---- a/scfbuild/main.py -+++ b/scfbuild/main.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - # SCFBuild is released under the GNU General Public License v3. -index 0000000..99418b5 ---- /dev/null -+++ b/scfbuild/requirements.txt -@@ -0,0 +1,2 @@ -+fonttools>=3.41.2 -+PyYAML>=5.1 From 0d454fd76c5a332afa2d65f21bbfc45046015617 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 16 Sep 2020 11:24:54 +0200 Subject: [PATCH 0100/1062] openmoji-black,openmoji-color: use scfbuild 2 --- pkgs/data/fonts/openmoji/default.nix | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index fc7af3d0e1fb..52072f45230e 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -10,19 +10,6 @@ let [ "color" "black" ] [ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ] variant; - scfbuildOptions = stdenv.lib.optionalString (variant == "black") "--glyph-only"; - - # We have to use their scfbuild fork: - # https://github.com/hfg-gmuend/openmoji/tree/master/font#setup - scfbuildPatched = scfbuild.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "b-g"; - repo = "scfbuild"; - rev = "880f690332fc9cc4dee0790921d331f13bd5acaa"; - sha256 = "0d61gn69hgxn17jvs69xpblq9z1l85aymbrn6jjwqamhpcl42c04"; - }; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ python3Packages.lxml ]; - }); in stdenv.mkDerivation rec { pname = "openmoji"; @@ -36,17 +23,9 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - scfbuildPatched + scfbuild ]; - # Some id and data-* attributes in the svg files contain unicode characters, - # which scfbuild (a python2 program) does not like - # (https://github.com/13rac1/scfbuild/issues/14). - # Fortunately, it's only metadata which we can remove: - postPatch = '' - sed -Ei 's/(id|data-[^=]*)="[^"]*"//g' black/svg/*.svg color/svg/*.svg - ''; - buildPhase = '' # Bash reimplementation of helpers/export-svg-font.js # so we don't need to build all the node deps first @@ -74,7 +53,7 @@ in stdenv.mkDerivation rec { # Actually build the font: cd font - scfbuild ${scfbuildOptions} -c scfbuild-${variant}.yml + scfbuild -c scfbuild-${variant}.yml ''; installPhase = '' From 778525fd49bc8a68d9b5b88314b5af1786736c3b Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Tue, 10 Aug 2021 18:26:52 -0400 Subject: [PATCH 0101/1062] fontforge: Apply patch to avoid segfault. --- pkgs/tools/misc/fontforge/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 5f64057c46c3..72879fdb9d1e 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; }) + # Fix segmentation fault with some fonts. + # This is merged and should be present in the next release. + (fetchpatch { + url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch"; + sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29"; + }) ]; # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps From 4e12e3002a6a66518203e6d72a1dcef4591022cb Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 3 Dec 2020 10:49:04 +0100 Subject: [PATCH 0102/1062] openmoji-black,openmoji-color: 12.4.0 -> 13.1.0 --- pkgs/data/fonts/openmoji/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index 52072f45230e..b2afde61bd64 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , scfbuild , python3Packages @@ -13,13 +14,13 @@ let in stdenv.mkDerivation rec { pname = "openmoji"; - version = "12.4.0"; + version = "13.1.0"; src = fetchFromGitHub { owner = "hfg-gmuend"; repo = pname; rev = version; - sha256 = "0zis0i7fn7dqv39c9ms7f1p4dqqzwdfwkdgrijaak1cmb8rkn3a0"; + sha256 = "sha256-7G6a+LFq79njyPhnDhhSJ98Smw5fWlfcsFj6nWBPsSk="; }; nativeBuildInputs = [ @@ -60,7 +61,7 @@ in stdenv.mkDerivation rec { install -Dm644 ${filename} $out/share/fonts/truetype/${filename} ''; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.cc-by-sa-40; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; @@ -69,4 +70,3 @@ in stdenv.mkDerivation rec { description = "Open-source emojis for designers, developers and everyone else"; }; } - From f1732edcd2ba9738ea9d5d626f052cb3b2cd9f15 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 12 Aug 2021 17:13:26 +0200 Subject: [PATCH 0103/1062] nodePackages.glob,nodePackages.lodash: init needed for openmoji-color --- .../node-packages/node-packages.json | 2 + .../node-packages/node-packages.nix | 10657 +++++++++------- 2 files changed, 5951 insertions(+), 4708 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 1bf813952eaa..ad2961efda77 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -106,6 +106,7 @@ , "git-ssb" , "git-standup" , "gitmoji-cli" +, "glob" , "graphql-cli" , "grunt-cli" , "makam" @@ -154,6 +155,7 @@ , "less-plugin-clean-css" , "live-server" , "livedown" +, "lodash" , {"lumo-build-deps": "../interpreters/clojurescript/lumo" } , "madoko" , "markdownlint-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8c9726808957..919dbb865570 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1201.2" = { + "@angular-devkit/architect-0.1202.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1201.2"; + version = "0.1202.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.2.tgz"; - sha512 = "hR5kI03WoeEY9dkAsQNLlhL1iEFC2L77ansaKquN+HCAeOGHby4w95suSlZUAg0r6ZhPhPH0tkIRZXU9NMa09g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.0.tgz"; + sha512 = "99O8iLO9LEVTPYN6kj6XINHxjw13ofTS48hm3D0i44QMEyq3SRH1ctH6HcUAtbgPF3VjOUFr5vRYpQN1OdOCXw=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -67,22 +67,22 @@ let sha512 = "zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA=="; }; }; - "@angular-devkit/core-12.1.1" = { + "@angular-devkit/core-12.1.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.1.1"; + version = "12.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.1.tgz"; - sha512 = "z5+O3ugXbo8djKPjUtf/UfnYCmco2K1LVhQ6cWLhKi3NKRBiHeNmZh5nAycqFD8/Q+oI/+Ao40MkmkK1Tq0jsw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz"; + sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; }; }; - "@angular-devkit/core-12.1.2" = { + "@angular-devkit/core-12.2.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.1.2"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.2.tgz"; - sha512 = "TeaRbvsNEeAkRJcIBlT6yUNh0vaVVBGBYfXYFIMg/I04ex/HI0ApEowu78GeTzCqlE0r4t+WaGT46m7+NIljKg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.0.tgz"; + sha512 = "9H2NfE4eazpMPwbAx4ZbtTNijo6419DZsmQzlzwQWzTInO3+CAjQuyW53W5Nt/IoauNVOgOEsC8/YbYjNmN0Aw=="; }; }; "@angular-devkit/schematics-12.0.5" = { @@ -94,31 +94,31 @@ let sha512 = "iW3XuDHScr3TXuunlEjF5O01zBpwpLgfr1oEny8PvseFGDlHK4Nj8zNIoIn3Yg936aiFO4GJAC/UXsT8g5vKxQ=="; }; }; - "@angular-devkit/schematics-12.1.1" = { + "@angular-devkit/schematics-12.1.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.1.1"; + version = "12.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.1.tgz"; - sha512 = "oRsvlhJQLXkGWdJvArOby+G4j8UX2uCHwrN4EC1hXUKs84UsD+UATYOAh4h2auy+I+sdrmELUaHwdI4wdKpqnw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz"; + sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; - "@angular-devkit/schematics-12.1.2" = { + "@angular-devkit/schematics-12.2.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.1.2"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.2.tgz"; - sha512 = "/UGcAJChq+g7wf46Exr5iIyuVw3j4TxTIntTpuKg/z/xf9Y+8mzJAZgGittu/yFcHAJ9aYcOHctffrfEdV7QSA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.0.tgz"; + sha512 = "C+eutMKtOLROk/2zs1NkXeLZJpFtvZm7ctWmcns0Yh83Di2sCgGiSqdqNZFyDplxkt5W5lF2cdBSGyP8ZH+/ug=="; }; }; - "@angular-devkit/schematics-cli-12.1.1" = { + "@angular-devkit/schematics-cli-12.1.4" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "12.1.1"; + version = "12.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-12.1.1.tgz"; - sha512 = "mIwE9iD7RKnARNlm39Ao3WtXqUFkemX77AHuqWUatQ4QsaOG3fxrTH8UYPP7Oi17J4wRipIkzia1cOIStluTVA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-12.1.4.tgz"; + sha512 = "BJiyZu7TaOJUnH4XH4OKz1LjW1364BLAhpwCBAueu11YkI7hghlsx/ogvvd5RYX9JmQL70iVOVkBsoYA7XVreg=="; }; }; "@antora/asciidoc-loader-2.3.4" = { @@ -238,6 +238,15 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; + "@apollo/client-3.4.7" = { + name = "_at_apollo_slash_client"; + packageName = "@apollo/client"; + version = "3.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.7.tgz"; + sha512 = "EmqGxXD8hr05cIFWJFwtGXifc+Lo8hTCEuiaQMtKknHszJfqIFXSxqP+H+eJnjfuoxH74aTSsZKtJlnE83Vt6w=="; + }; + }; "@apollo/protobufjs-1.2.2" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; @@ -265,6 +274,15 @@ let sha512 = "tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw=="; }; }; + "@apollographql/graphql-playground-html-1.6.29" = { + name = "_at_apollographql_slash_graphql-playground-html"; + packageName = "@apollographql/graphql-playground-html"; + version = "1.6.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz"; + sha512 = "xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA=="; + }; + }; "@apollographql/graphql-upload-8-fork-8.1.3" = { name = "_at_apollographql_slash_graphql-upload-8-fork"; packageName = "@apollographql/graphql-upload-8-fork"; @@ -346,13 +364,13 @@ let sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/compat-data-7.14.7" = { + "@babel/compat-data-7.15.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.14.7"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz"; - sha512 = "nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz"; + sha512 = "0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="; }; }; "@babel/core-7.10.5" = { @@ -364,13 +382,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.14.8" = { + "@babel/core-7.15.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.14.8"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz"; - sha512 = "/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz"; + sha512 = "tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw=="; }; }; "@babel/core-7.9.0" = { @@ -382,13 +400,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.8" = { + "@babel/generator-7.15.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.8"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz"; - sha512 = "cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz"; + sha512 = "eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ=="; }; }; "@babel/helper-annotate-as-pure-7.14.5" = { @@ -409,22 +427,22 @@ let sha512 = "YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w=="; }; }; - "@babel/helper-compilation-targets-7.14.5" = { + "@babel/helper-compilation-targets-7.15.0" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.14.5"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; - sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz"; + sha512 = "h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.8" = { + "@babel/helper-create-class-features-plugin-7.15.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.8"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz"; - sha512 = "bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz"; + sha512 = "MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q=="; }; }; "@babel/helper-create-regexp-features-plugin-7.14.5" = { @@ -481,13 +499,13 @@ let sha512 = "R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ=="; }; }; - "@babel/helper-member-expression-to-functions-7.14.7" = { + "@babel/helper-member-expression-to-functions-7.15.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.14.7"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; - sha512 = "TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz"; + sha512 = "Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg=="; }; }; "@babel/helper-module-imports-7.14.5" = { @@ -499,13 +517,13 @@ let sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; }; }; - "@babel/helper-module-transforms-7.14.8" = { + "@babel/helper-module-transforms-7.15.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.14.8"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz"; - sha512 = "RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz"; + sha512 = "RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg=="; }; }; "@babel/helper-optimise-call-expression-7.14.5" = { @@ -544,13 +562,13 @@ let sha512 = "rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A=="; }; }; - "@babel/helper-replace-supers-7.14.5" = { + "@babel/helper-replace-supers-7.15.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.14.5"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; - sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz"; + sha512 = "6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA=="; }; }; "@babel/helper-simple-access-7.14.8" = { @@ -580,13 +598,13 @@ let sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; }; }; - "@babel/helper-validator-identifier-7.14.8" = { + "@babel/helper-validator-identifier-7.14.9" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; - sha512 = "ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha512 = "pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="; }; }; "@babel/helper-validator-option-7.14.5" = { @@ -607,13 +625,13 @@ let sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.8" = { + "@babel/helpers-7.15.3" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz"; - sha512 = "ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz"; + sha512 = "HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g=="; }; }; "@babel/highlight-7.14.5" = { @@ -634,13 +652,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.14.8" = { + "@babel/parser-7.15.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz"; - sha512 = "syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz"; + sha512 = "O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -661,22 +679,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.14.7" = { + "@babel/plugin-proposal-async-generator-functions-7.14.9" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.14.7"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz"; - sha512 = "RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q=="; - }; - }; - "@babel/plugin-proposal-class-properties-7.12.13" = { - name = "_at_babel_slash_plugin-proposal-class-properties"; - packageName = "@babel/plugin-proposal-class-properties"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz"; - sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz"; + sha512 = "d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw=="; }; }; "@babel/plugin-proposal-class-properties-7.14.5" = { @@ -1039,22 +1048,22 @@ let sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.14.5" = { + "@babel/plugin-transform-block-scoping-7.15.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.14.5"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz"; - sha512 = "LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; + sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; }; }; - "@babel/plugin-transform-classes-7.14.5" = { + "@babel/plugin-transform-classes-7.14.9" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.14.5"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz"; - sha512 = "J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz"; + sha512 = "NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A=="; }; }; "@babel/plugin-transform-computed-properties-7.14.5" = { @@ -1156,13 +1165,13 @@ let sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.14.5" = { + "@babel/plugin-transform-modules-commonjs-7.15.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.14.5"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz"; - sha512 = "en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz"; + sha512 = "3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig=="; }; }; "@babel/plugin-transform-modules-systemjs-7.14.5" = { @@ -1183,13 +1192,13 @@ let sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.14.7" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.14.9" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.14.7"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz"; - sha512 = "DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"; + sha512 = "l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA=="; }; }; "@babel/plugin-transform-new-target-7.14.5" = { @@ -1237,22 +1246,22 @@ let sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; }; }; - "@babel/plugin-transform-react-display-name-7.14.5" = { + "@babel/plugin-transform-react-display-name-7.15.1" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.14.5"; + version = "7.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz"; - sha512 = "07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz"; + sha512 = "yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q=="; }; }; - "@babel/plugin-transform-react-jsx-7.14.5" = { + "@babel/plugin-transform-react-jsx-7.14.9" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.14.5"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz"; - sha512 = "7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz"; + sha512 = "30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw=="; }; }; "@babel/plugin-transform-react-jsx-development-7.14.5" = { @@ -1264,13 +1273,13 @@ let sha512 = "rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.14.5" = { + "@babel/plugin-transform-react-jsx-self-7.14.9" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.14.5"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.5.tgz"; - sha512 = "M/fmDX6n0cfHK/NLTcPmrfVAORKDhK8tyjDhyxlUjYyPYYO8FRWwuxBA3WBx8kWN/uBUuwGa3s/0+hQ9JIN3Tg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.9.tgz"; + sha512 = "Fqqu0f8zv9W+RyOnx29BX/RlEsBRANbOf5xs5oxb2aHP4FKbLXxIaVPUiCti56LAR1IixMH4EyaixhUsKqoBHw=="; }; }; "@babel/plugin-transform-react-jsx-source-7.14.5" = { @@ -1309,13 +1318,13 @@ let sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; }; }; - "@babel/plugin-transform-runtime-7.14.5" = { + "@babel/plugin-transform-runtime-7.15.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.14.5"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz"; - sha512 = "fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz"; + sha512 = "sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw=="; }; }; "@babel/plugin-transform-shorthand-properties-7.14.5" = { @@ -1363,13 +1372,13 @@ let sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-typescript-7.14.6" = { + "@babel/plugin-transform-typescript-7.15.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.14.6"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz"; - sha512 = "XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz"; + sha512 = "WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w=="; }; }; "@babel/plugin-transform-unicode-escapes-7.14.5" = { @@ -1390,22 +1399,13 @@ let sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; - "@babel/preset-env-7.12.17" = { + "@babel/preset-env-7.15.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.12.17"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.17.tgz"; - sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; - }; - }; - "@babel/preset-env-7.14.8" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.14.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz"; - sha512 = "a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz"; + sha512 = "FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1453,31 +1453,22 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.12.17" = { + "@babel/preset-typescript-7.15.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.12.17"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.17.tgz"; - sha512 = "T513uT4VSThRcmWeqcLkITKJ1oGQho9wfWuhQm10paClQkp1qyd0Wf8mvC8Se7UYssMyRSj4tZYpVTkCmAK/mA=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz"; + sha512 = "lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow=="; }; }; - "@babel/preset-typescript-7.14.5" = { - name = "_at_babel_slash_preset-typescript"; - packageName = "@babel/preset-typescript"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz"; - sha512 = "u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw=="; - }; - }; - "@babel/register-7.14.5" = { + "@babel/register-7.15.3" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.14.5"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.14.5.tgz"; - sha512 = "TjJpGz/aDjFGWsItRBQMOFTrmTI9tr79CHOK+KIvLeCkbxuOAk2M5QHjvruIMGoo9OuccMh5euplPzc5FjAKGg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz"; + sha512 = "mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw=="; }; }; "@babel/runtime-7.13.9" = { @@ -1489,13 +1480,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.8" = { + "@babel/runtime-7.15.3" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz"; - sha512 = "twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; + sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; }; }; "@babel/runtime-7.9.0" = { @@ -1507,22 +1498,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.8" = { + "@babel/runtime-corejs3-7.15.3" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz"; - sha512 = "4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz"; + sha512 = "30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A=="; }; }; - "@babel/standalone-7.14.8" = { + "@babel/standalone-7.15.3" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.8.tgz"; - sha512 = "5Aa1Bhis4oZD23iLJE5CDYHEs1zSC3ejppHE5aim0OWjGCWTa9Oq1PwopK4u1++ao6B6POW/PqNZjOCZNTSx0Q=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.3.tgz"; + sha512 = "Bst2YWEyQ2ROyO0+jxPVnnkSmUh44/x54+LSbe5M4N5LGfOkxpajEUKVE4ndXtIVrLlHCyuiqCPwv3eC1ItnCg=="; }; }; "@babel/template-7.14.5" = { @@ -1534,13 +1525,13 @@ let sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.8" = { + "@babel/traverse-7.15.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.8"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz"; - sha512 = "kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz"; + sha512 = "392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw=="; }; }; "@babel/types-7.13.12" = { @@ -1552,13 +1543,13 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.14.8" = { + "@babel/types-7.15.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.8"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz"; - sha512 = "iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz"; + sha512 = "OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1570,22 +1561,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.10.5" = { + "@bugsnag/browser-7.11.0" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.10.5.tgz"; - sha512 = "LxzQ0g8kbVq2YAoZkLM58pzNGqKWV/JxVTBCudHQVp92Wm9Wl7aFVMNPzUWCjp9T9XrNl3h9lrs6Bb127SomyA=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.11.0.tgz"; + sha512 = "iOKXJcZzdl9XsjJnL62S+T4OQZJ21mUMCXXOiMRlLnDCrw30BwD4BoAZ5s3oQ0VE0azrv/CUsXQzU63NUcsb+Q=="; }; }; - "@bugsnag/core-7.10.0" = { + "@bugsnag/core-7.11.0" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.10.0.tgz"; - sha512 = "sDa2nDxwsxHQx2/2/tsBWjYqH0TewCR8N/r5at6B+irwVkI0uts7Qc2JyqDTfiEiBXKVEXFK+fHTz1x9b8tsiA=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.11.0.tgz"; + sha512 = "xCaaONqQEAewifrvHC8v+yqN+Is4WNUcmK+sdeLcSb+ghLQ52y3BQ9nEDYzQxGuJRpv1zW3edCVIB4RN5eunSQ=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1597,22 +1588,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.10.5" = { + "@bugsnag/js-7.11.0" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.10.5.tgz"; - sha512 = "zLlZI+KoBUFTg5gmB9swUq17wVRm1kgY+DDuPGBCv9EqBV+ofXCdfZaSFIXles4fqTH/edN6WXeVrXZ2QnQStg=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.11.0.tgz"; + sha512 = "2KQZdiBUQRayrTweMrH8LuT+YFcZSYxPVb+RaAx5J1z3vWWFar7Lw3II34zA4e+zs/7wMSTKll5p+O7Wuz60/A=="; }; }; - "@bugsnag/node-7.10.1" = { + "@bugsnag/node-7.11.0" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.10.1"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.10.1.tgz"; - sha512 = "kpasrz/im5ljptt2JOqrjbOu4b0i5sAZOYU4L0psWXlD31/wXytk7im11QlNALdI8gZZBxIFsVo8ks6dR6mHzg=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.11.0.tgz"; + sha512 = "hwIG7LTE2lwaIjAes1JxYbjSoih9Eu07MSf+QJoMILY6tJoHMgxJ6v0/8AfldJeEAb753qBtlQLO8Rtr2LKHBA=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1624,22 +1615,31 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2json-0.4.1" = { - name = "_at_cdktf_slash_hcl2json"; - packageName = "@cdktf/hcl2json"; - version = "0.4.1"; + "@cdktf/hcl2cdk-0.5.0" = { + name = "_at_cdktf_slash_hcl2cdk"; + packageName = "@cdktf/hcl2cdk"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.4.1.tgz"; - sha512 = "yabxBeKkCJvj3gFQmHfsS/P6JaQMBqbyEZ1G67gTCtfkbOSEGib8KWsl3ZA+u5Fs2z5q9M4emLcCBHHPrmSG3g=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.5.0.tgz"; + sha512 = "E9/uA3JxXPPVKkiTX6DhUZHkAH5ZFWrNewhJB/woOejTkn7P4saOGxXYgrxiu6MCz2lgN8iE4YNGSTKPcxq8sA=="; }; }; - "@chemzqm/neovim-5.2.13" = { + "@cdktf/hcl2json-0.5.0" = { + name = "_at_cdktf_slash_hcl2json"; + packageName = "@cdktf/hcl2json"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.5.0.tgz"; + sha512 = "3E4/6sCLEcoPUk6FJHOpLGqBNSE2AHrIrErXKRFU3je/MZotxvWrfrZY3IsENJgjJ69Zv0dxMxTZo/l+BVNa3w=="; + }; + }; + "@chemzqm/neovim-5.3.4" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.2.13"; + version = "5.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.13.tgz"; - sha512 = "Eo1NBUj0e2vtOdNA7fpHra6xviDtwDWbYZiPzH5BWGwPtbRa0XjNGPMggcDCCKKKFRJgp9AaAfmT0LaqIyQvyg=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.3.4.tgz"; + sha512 = "UVH9xoNSwhzsnEhhcIc4hoDpmyUhGcqBbco5tuISdGV4gEgOKN48c7WhVMmyrsSGogohVCwPHuDugdssUx66tQ=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -1660,13 +1660,13 @@ let sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; - "@corestore/networker-1.1.0" = { + "@corestore/networker-1.2.0" = { name = "_at_corestore_slash_networker"; packageName = "@corestore/networker"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.1.0.tgz"; - sha512 = "Pj5Cfyfck1OJfVd4diO4UVo8qabW9O/wgDz5HeY6Okuan98KjMxrAJZG8MPk7I+mjRoYDFgFPVgssx9zv420Ag=="; + url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.2.0.tgz"; + sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA=="; }; }; "@cronvel/get-pixels-3.4.0" = { @@ -1795,166 +1795,166 @@ let sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; }; }; - "@electron-forge/async-ora-6.0.0-beta.58" = { + "@electron-forge/async-ora-6.0.0-beta.59" = { name = "_at_electron-forge_slash_async-ora"; packageName = "@electron-forge/async-ora"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.58.tgz"; - sha512 = "osJoCA+Mxda0ToHnVh0c52UiqG0vYRChFp7YZnXSOFAyv/pJhO1gaSfJeTX+2ddki0SLvWQbgiJS5ysMax6Veg=="; + url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.59.tgz"; + sha512 = "vF60XyjHCyoyXHgkDi/tZy+OB9K6oSBio2at7B4pwZLO6nqstofkeAB+Gz/XUsVj9Nim+vHKtyXPzE0BTXQkZQ=="; }; }; - "@electron-forge/core-6.0.0-beta.58" = { + "@electron-forge/core-6.0.0-beta.59" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.58.tgz"; - sha512 = "mro6o/Oa2BETPfnzlWcpLJ5W5IWVuDokE7HZPzb9c6OTlcm/BWwl8pbfSZU19Q9SLsjou9hAuMwqzFveZRqGew=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.59.tgz"; + sha512 = "DRls31VQdVqGlna9EviHGKPchTkcbYPsRjOHSTrpksyOBQGck7for/hD1sxFREQ0r1qfKMR4xtmXbpXqzD8AyQ=="; }; }; - "@electron-forge/installer-base-6.0.0-beta.58" = { + "@electron-forge/installer-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-base"; packageName = "@electron-forge/installer-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.58.tgz"; - sha512 = "VXA9cjCy9HHWyOcPGkO1Q5ym63AAfBLj/dL0Ezpw9r0/GKbgAN0g8HWgTwvs+rqWCdOAeyhIs+sTNI0rZQjc+A=="; + url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.59.tgz"; + sha512 = "rmayhhJXj5aXed8xrkqOPTGF4J1DqZdTGo05RAVKoCmXv0iGBPUp0VvkiQinOvoBopr/5XorZTzCxgqps0UC6w=="; }; }; - "@electron-forge/installer-darwin-6.0.0-beta.58" = { + "@electron-forge/installer-darwin-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-darwin"; packageName = "@electron-forge/installer-darwin"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.58.tgz"; - sha512 = "yfx97cL7+kB77xTeniNqRT4Va++uJX6j9kZwIwgaBFvtyLHZ1DChOlOI8IR6/qctzEtrZHW41DySFKXnsWYwuw=="; + url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.59.tgz"; + sha512 = "2bssItA6CWgdL0G0/opG5usUdpCurCptdrA1bC8el6hlgv/v+hhRxalkPX9A38cWTB3w8VMhesDti+PpEYnniw=="; }; }; - "@electron-forge/installer-deb-6.0.0-beta.58" = { + "@electron-forge/installer-deb-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-deb"; packageName = "@electron-forge/installer-deb"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.58.tgz"; - sha512 = "Ukw1ccUtmTOKCiorYLJCAIWGT5zxpinH1W9UpxlMP3JhrzQXApm2rF7n9TEGowkTMtPciEsNXaF/F9lzjRqIpQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.59.tgz"; + sha512 = "z2095DHbNm81gClIn+fkid/Z8FKlBnAySIodDRFKNjNDaGcWcg2Wurv3vV32Xq4kBlsHRduhxA31IqnGY1zOvA=="; }; }; - "@electron-forge/installer-dmg-6.0.0-beta.58" = { + "@electron-forge/installer-dmg-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-dmg"; packageName = "@electron-forge/installer-dmg"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.58.tgz"; - sha512 = "zw46CQSZ2Jihx7GBUcEPHGBQJD1pIBv6oTi5HPR7IkEJ7CQ/yjESAfDuu1UfQc9mgAKI+6s+QMuFZMW+ZMqYPg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.59.tgz"; + sha512 = "QAYJ0H31hVMiTQDQ9ngBkAFBbSTb9Okj3mKNsym+Yw4RlQJQEc9XWWOmiTjPHCB1LR/NmaescT06sJ6Kh0wtQw=="; }; }; - "@electron-forge/installer-exe-6.0.0-beta.58" = { + "@electron-forge/installer-exe-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-exe"; packageName = "@electron-forge/installer-exe"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.58.tgz"; - sha512 = "Z7gl1CX8WJ/9kr5As9y0GELK8/u754j7bzSlxmaeyhaO/vSf5+M/MjkEiPUQUKVmqZ77ngdzN/T4IfDGxpk++A=="; + url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.59.tgz"; + sha512 = "FJ0vu65K6wBz8gY5RJNfLanXJEGMs2w/WrawSLh5xGH5GzOkWwq3RRD5AdN1CFRrkXSCBbgkdF6x+F1kdwH7OQ=="; }; }; - "@electron-forge/installer-linux-6.0.0-beta.58" = { + "@electron-forge/installer-linux-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-linux"; packageName = "@electron-forge/installer-linux"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.58.tgz"; - sha512 = "39A2mmhsJg2MEjYS+gtF/9FUYLKEoVmD6e4S+Rn0u9Yv/WOtdqOR0KR/pLYPtsiQKsGQA5nD2V2/ZN8N/qTxZw=="; + url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.59.tgz"; + sha512 = "dB1A8j6oubCnAOQQzmtFWQWTMMSijeiClaGMricNOlC0wC2U3BHiBwrU2jJqxvy4M401kfgR9UiMs6mQNSPdPg=="; }; }; - "@electron-forge/installer-rpm-6.0.0-beta.58" = { + "@electron-forge/installer-rpm-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-rpm"; packageName = "@electron-forge/installer-rpm"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.58.tgz"; - sha512 = "RyuKOGJoJknnp1C9WPFDc06Jw9K+KBM574byYegNiJPm5eGu+ZL/4tU9hD29YAtImyoGUy8L5dquApaC4d9zKA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.59.tgz"; + sha512 = "h/S5uMl8Vvg+Euv5xIhynjB8Q6biaBauJJoPtlALxSgSNuKnWWIuc4edwqY5F0cBIw3WO4tnmA/CE6gVWgGJMg=="; }; }; - "@electron-forge/installer-zip-6.0.0-beta.58" = { + "@electron-forge/installer-zip-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-zip"; packageName = "@electron-forge/installer-zip"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.58.tgz"; - sha512 = "J71WhNtHdgFDNCYB2vm3vv4Zt/rCuXFgtXxXRowb+pT39wxyL35DjXsOi/a6j5Vb2lGq0mekMuHvpcD/4MSo8w=="; + url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.59.tgz"; + sha512 = "sTYv2NR0liFUUa9snpQs+SCWPMOUddVNK/sNBNkwU1q5jrO+ZjfTF22u5C5RawIWKgTrwxc3dFUYDYXh8753og=="; }; }; - "@electron-forge/maker-base-6.0.0-beta.58" = { + "@electron-forge/maker-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.58.tgz"; - sha512 = "Ztbv99kznlOAK/iDM03Hu/XmdTEXmfLnkcfAJ+uBlRwJmFqiAcPWNlUrPWtCu5KKxHcOiDl6mN3OC/Ae2/3fMA=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.59.tgz"; + sha512 = "S/Qdu2kwio5PdZgoDDxZPo6JSf2YwcuXi3sy9Tw2Qj58+ZT9nOHn0C+JBHI8sREv3IRK52Axu1/RYkwtX9+V8w=="; }; }; - "@electron-forge/plugin-base-6.0.0-beta.58" = { + "@electron-forge/plugin-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.58.tgz"; - sha512 = "RMRjw8iRqkPChSMKdTSWCSubvDMSdJx+9Q9eO8n3GRN0jx4ExizhSIkxWpLSuze5dPyJXm3i24YUZjKOAR21EA=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.59.tgz"; + sha512 = "S30s/hfuIjKhCI2U4DwChjTx1ulGouqyorXpkHn3hlyfIXiC35T6fJ4Baw4Ng1W4BJrnZTmkVnglEHriFyV+Lg=="; }; }; - "@electron-forge/publisher-base-6.0.0-beta.58" = { + "@electron-forge/publisher-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.58.tgz"; - sha512 = "pnAZ7VXnL0vosYn4Au347WukXVTU0XLqUSQrjC4pYCMs7YumL4n+ya+JNy51D6SkcFMmd0nCU2ohz7IHo3ttcg=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.59.tgz"; + sha512 = "W+fKf8ehtHU6GQLZnpnyy1XS+9o2dw8PJcRBU+pQNEUcbFqBxcAJhLkfh6cGE2tQQ/rN+N77RMWEnLh9GjZMCQ=="; }; }; - "@electron-forge/shared-types-6.0.0-beta.58" = { + "@electron-forge/shared-types-6.0.0-beta.59" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.58.tgz"; - sha512 = "Kz21kMg+EnINGK3H6qW4YXjFbXYvRv24O8PBnVaQiFXYIaUOXpaXj42QeytDXR/zMSA/jy78GoGodJLKE+gbdA=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.59.tgz"; + sha512 = "3tRCgfHqn5/8LijlVZsLb2xHm9W3qgzQ+KZNWXdYhb0Wj1+h6/sXn8rlxw10Mmb2mlYJEBW/NvIhpUDHgrGPXA=="; }; }; - "@electron-forge/template-base-6.0.0-beta.58" = { + "@electron-forge/template-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.58.tgz"; - sha512 = "U2iT2YUY9R2wz9RNkM9dAEzv5q+b3HSDJcqPy/B7lzT3lB9kni0HZTZKihZttlQYGRO6jj+9aWnLqaE3HmtgsQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.59.tgz"; + sha512 = "PHPSHlJ72fYlk8hrEj6+6ok0Xlxz3EeFkn2DSO4ol7fjFJI7cqbaSdNuDL55CmsWsWr/3RUqk/44pn5ywmvoOg=="; }; }; - "@electron-forge/template-typescript-6.0.0-beta.58" = { + "@electron-forge/template-typescript-6.0.0-beta.59" = { name = "_at_electron-forge_slash_template-typescript"; packageName = "@electron-forge/template-typescript"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.58.tgz"; - sha512 = "x3dJeB4VDg18c69GOOUSk0LFRygaN2fDYxxjTZcGMlnsUTyypXkuaVIoEnMnB01TlY+gTPrsoITeB2e7ahSyaQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.59.tgz"; + sha512 = "GD+KyNv9y1ga6RbbXwlTNVsBeg055E/92Q5+1Y/dM+f2LLx0El0whXEwBf8eJ1+AXzrBsD0JQzAFkAIFyECLkQ=="; }; }; - "@electron-forge/template-typescript-webpack-6.0.0-beta.58" = { + "@electron-forge/template-typescript-webpack-6.0.0-beta.59" = { name = "_at_electron-forge_slash_template-typescript-webpack"; packageName = "@electron-forge/template-typescript-webpack"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.58.tgz"; - sha512 = "PTh0TW+ohn7BT+jjdQ3ubqFU9biP2ilfA36vA1Dgnv9/N8P1IBoEtXFJ4ilsMZOAfbp344ja9vsTFG+qGTsiDw=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.59.tgz"; + sha512 = "OPYA8eVbkFZFIpXCVTmDJntPTatzgaESyF2+eKwN1f6/j00kvHCbREL9zbXbji3gryt0a59bT+GKigWXldln5g=="; }; }; - "@electron-forge/template-webpack-6.0.0-beta.58" = { + "@electron-forge/template-webpack-6.0.0-beta.59" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.58.tgz"; - sha512 = "Uf7Ck17bn3djuoSglzOioXhOBRqY72pqMSZF0K84zNGwfzsW/KSonizmOMG3yrvSDEQf48JE5Ezhssla3SSgiA=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.59.tgz"; + sha512 = "ScPVUQ//zqqnpr53/WY8pVygs6KVTpXsPlAoo0ZeYfOjuTRh2uSMPN0+2UnUUD5FGjLm3hkpIibUH4ZMtLu8aw=="; }; }; "@electron/get-1.12.4" = { @@ -2074,22 +2074,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-5.0.5" = { + "@expo/config-5.0.7" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "5.0.5"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-5.0.5.tgz"; - sha512 = "r3/Y6mFhOmGqEfhhkUncP6/Qg8Aexg1G66TzDzd97iNezCY2LP9c2hwyN7SwhBv5l1YBNc2zeT556xXe0v4Qgw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-5.0.7.tgz"; + sha512 = "7Wzao9uALHmRSf59FMsHk1vxW4m4alDCJmfo+enXnl5o6UYiCDYfjNXctMwnW+fBM3opta4FbmmPGIftfXOesw=="; }; }; - "@expo/config-plugins-3.0.5" = { + "@expo/config-plugins-3.0.7" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "3.0.5"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.5.tgz"; - sha512 = "hHKr6i201QG16ms93XiXwcI1IhDYhITCRt7hWNO1UPxt2Cm7yDOG2YoGkauP0V/nAN3TEocDYbCrltGFBdoCTg=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.7.tgz"; + sha512 = "7YOoFtxB6XqDil+OlGXi7iredKHxXVFCAOIVfFyEDzO3oo0gBmWGmUnHgrPDvpMj0q+adCCh5BL8OcvGfc9ITQ=="; }; }; "@expo/config-types-42.0.0" = { @@ -2101,22 +2101,22 @@ let sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w=="; }; }; - "@expo/dev-server-0.1.80" = { + "@expo/dev-server-0.1.82" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.80"; + version = "0.1.82"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.80.tgz"; - sha512 = "+5HaLrd0QM8/CpqDhK9qDghZl1DkdqGz0QnSkPZDexnfZjTrEjPX8aXd0H5mv67W9ev1eUtoiABY6iU0wZ7czg=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.82.tgz"; + sha512 = "g7H4FDxcdt9y41MpivtpYqgNwEqoaSKA+lrR+qPCVPcZbIcq+xRq/coYfeXhp/L203vAab67cNVnqTQetj1T3A=="; }; }; - "@expo/dev-tools-0.13.110" = { + "@expo/dev-tools-0.13.113" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.110"; + version = "0.13.113"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.110.tgz"; - sha512 = "heG6yXLwN87o0jMn90xstsl5GULNABtDx03/jPS6sy3Yqgf6SiqZpwXCWp+kZgSi+fWFE6TRAsk91eWhLRHjug=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.113.tgz"; + sha512 = "3z1gIBSnDATukcyvN1Q6ywT5FExJrf/wfg+1T0nQ8OZcyzFbi6u/tdns0mjT5Z+AyXDKtyHbQzGnRzegy82i3Q=="; }; }; "@expo/devcert-1.0.0" = { @@ -2128,49 +2128,49 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; - "@expo/image-utils-0.3.15" = { + "@expo/image-utils-0.3.16" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.15"; + version = "0.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.15.tgz"; - sha512 = "uLJMNZ6ux5nBpLxxP1tUtFjpPG6stv0IGEBug6nVZfwQgR/BAsEao+RqZFqrcKhiXw2rIwhKhkspfWU5G6e1dw=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.16.tgz"; + sha512 = "ZggQK5w7awqYdA/TE0DT02nYxWirQm2r7NNy043zVtzBCtjhLpFpluk1v9W0pH4+nT1ChGk1c67j0mYRKcBkjg=="; }; }; - "@expo/json-file-8.2.31" = { + "@expo/json-file-8.2.33" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.31"; + version = "8.2.33"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.31.tgz"; - sha512 = "GvbL1tQnM3kGOM9hG+lwGbPJ/1tX+Sb8ZkqRrJlRpWGRa4DwnpLvIZHlWMb1ug/ye1QC7+RK/KwRZ7xcAXergA=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.33.tgz"; + sha512 = "CDnhjdirUs6OdN5hOSTJ2y3i9EiJMk7Z5iDljC5xyCHCrUex7oyI8vbRsZEojAahxZccgL/PrO+CjakiFFWurg=="; }; }; - "@expo/metro-config-0.1.80" = { + "@expo/metro-config-0.1.82" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.80"; + version = "0.1.82"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.80.tgz"; - sha512 = "A2jFV4XWNaT/LR7oKkLMFbCNTpI7JWCbns1mmhjA3zKf8k03Kj2mLEoJMI17JtLtz0WuH9hvqr5OuaK7jlmegQ=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.82.tgz"; + sha512 = "rgx0ykWFvu+7jXDSe/cJB0fpIKqJX4X2k+azBIS9KmVLl5/ceKuCr6Abjy70HZTAXX/SQ7fS0C+FhzIX2Upgrg=="; }; }; - "@expo/osascript-2.0.29" = { + "@expo/osascript-2.0.30" = { name = "_at_expo_slash_osascript"; packageName = "@expo/osascript"; - version = "2.0.29"; + version = "2.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.29.tgz"; - sha512 = "R0DtZY0NOGCwd+JHS/OO6I/Jkg7acpHAqFFDuwCPfEPgL9HJPr1fKc1rTuMYE7+der5/Pe1EXlo1/c3GFYlHxw=="; + url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.30.tgz"; + sha512 = "IlBCyso1wJl8AbgS8n5lcUcXa/8TTU/rHgurWvJRWjErtFOELsqV4O+NCcB7jr4bvv8uZHeRKHQpsoyZWmmk/g=="; }; }; - "@expo/package-manager-0.0.44" = { + "@expo/package-manager-0.0.46" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.44"; + version = "0.0.46"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.44.tgz"; - sha512 = "Yw8gHc1+kt64VXcUtrZ3w6ljy7Xxb5P0YY5acZiAaW6cdeOYtkeCtYcKrCAWlQaGdg8mYOWtfPEF1Ydy8IOjpg=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.46.tgz"; + sha512 = "+Mo7UzRNUy52uzefRkeKv8+YEE+2NhBpXfvZ1Btha2/zSJ+8fxDT0mTQUiupiaeMRPyCMqdkoE39qjF26xifYA=="; }; }; "@expo/plist-0.0.13" = { @@ -2182,13 +2182,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-2.0.5" = { + "@expo/prebuild-config-2.0.7" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.5.tgz"; - sha512 = "TTqKtfnavnlNSMKsdAVfR8bNOYQrR2WM6QpyOISgT9Cuu11ykxMbrmFEGazvIIGmYJhh6f9+CVwoqoZbf9hH7Q=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.7.tgz"; + sha512 = "EMgo4ywR9hk+I90XEwtl/UHWOlw8GE01BQtrLWQbIR0pr+bvDOYINfe8PzA21oODPGUkbMvp5Z8E79VZBqqjfg=="; }; }; "@expo/results-1.0.0" = { @@ -2200,13 +2200,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.30" = { + "@expo/schemer-1.3.31" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.30"; + version = "1.3.31"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.30.tgz"; - sha512 = "RYg6eiz2i3ETGlydUejszHoKkj9OaCedp3eVVr3065DY2MYTPoPwyfapU8CBljIJBeKpW9tc/Yvr9ZJbXibkVg=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.31.tgz"; + sha512 = "gW4r6FIHjlD1sJfAO7JZtrHiIYEf6s5mbEsgU1lxi8bs3vV2feVqb05U8oTCuf0imawNf5aHhvgTL8CUVLA5tA=="; }; }; "@expo/sdk-runtime-versions-1.0.0" = { @@ -2218,15 +2218,6 @@ let sha512 = "Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="; }; }; - "@expo/simple-spinner-1.0.2" = { - name = "_at_expo_slash_simple-spinner"; - packageName = "@expo/simple-spinner"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/simple-spinner/-/simple-spinner-1.0.2.tgz"; - sha1 = "b31447de60e5102837a4edf702839fcc8f7f31f3"; - }; - }; "@expo/spawn-async-1.5.0" = { name = "_at_expo_slash_spawn-async"; packageName = "@expo/spawn-async"; @@ -2236,13 +2227,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.13.1" = { + "@expo/webpack-config-0.14.0" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.13.1"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.13.1.tgz"; - sha512 = "OaTtB5nQp4Vqxx+ORDIn7ROL4yEqQBFYPp3TnPVKi9AxOOxqjatxvcIUreDJlb2r9G+Eeub9dW0DSF6ETtBnGg=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.14.0.tgz"; + sha512 = "YsWLjOQIUN/+pJ5CEmhWfERwjpp6KGjxbd2Nm2KWx4v69wphyPudyrKJaD/b/41Iw5TKHGjV3hlHrYWvZ6OFaA=="; }; }; "@expo/xcpretty-3.1.4" = { @@ -2281,13 +2272,13 @@ let sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; - "@fluentui/date-time-utilities-8.2.1" = { + "@fluentui/date-time-utilities-8.2.2" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.1.tgz"; - sha512 = "0AYXaXFQ3bPsOtiOi3bJSihzf+w3L44iQK38EiQgp3uAXei/i36VtDCToHZehYV+eS4s1qb/QGksoL0F4G6WCQ=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.2.tgz"; + sha512 = "djHrX/38ty+F93qLQjzmRzPzK598CW9g/RPhQH6GyrFBLPSWM1swYKB5TP6E7FrIf+fT4pVqrNUSYZhgi2rrOQ=="; }; }; "@fluentui/dom-utilities-1.1.2" = { @@ -2299,31 +2290,31 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; - "@fluentui/dom-utilities-2.1.3" = { + "@fluentui/dom-utilities-2.1.4" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.3.tgz"; - sha512 = "i2YECSldnkzPAhVmrxksuKSbqBKfMbHrexGqDJm7dy6KoIx+JSilbA5Lz0YNhA7VEgCy1X01GHlWBvqhCNQW8g=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.4.tgz"; + sha512 = "+gsAnEjgoKB37o+tsMdSLtgqZ9z2PzpvnHx/2IqhRWjQQd7Xc7MbQsbZaQ5qfkioFHLnWGc/+WORpqKPy/sWrg=="; }; }; - "@fluentui/font-icons-mdl2-8.1.6" = { + "@fluentui/font-icons-mdl2-8.1.8" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.1.6"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.6.tgz"; - sha512 = "tNAaX72NQYbvR9zeiOiVQBQhYtVgPUgh68LKTGywuYGc2WffBu20Xk9wII8iLGmAijLI1QClaCQxaRAL0IkfBA=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.8.tgz"; + sha512 = "kZkCHM/mP8WWLLExz3x3wK5yQHPP4tAcvlHVqe69TbG8+3fxRGJSMOxzZO/04CFQp2A7/wOskSRtqeIBtaXJfw=="; }; }; - "@fluentui/foundation-legacy-8.1.6" = { + "@fluentui/foundation-legacy-8.1.8" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.1.6"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.6.tgz"; - sha512 = "TJzUFcpfcJefXNmTOAJBKgIlQXDPw/dIcpO9l2nBfORvy4RnrJK4QjpdJPp5XOhDPtDVjlKPB1WvavoRkPRrbg=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.8.tgz"; + sha512 = "m0zbRbZaJbzBjv8Ziv3zpwoGFjuzzPIAmhsn58g66MZvQBd9vN92hFJBNG2bO2+ivlprns4WnLEAiPK8CjoAsA=="; }; }; "@fluentui/keyboard-key-0.2.17" = { @@ -2335,40 +2326,40 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/keyboard-key-0.3.3" = { + "@fluentui/keyboard-key-0.3.4" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.3.tgz"; - sha512 = "3qX1WNCgJlKq7uGH76rLC4cdESgwdLhMH9WjcQUkQNJKtBpL4vs5O99M1keEhd3pfooW7zasr6AcYcWq4BRB4g=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.4.tgz"; + sha512 = "pVY2m3IC5+LLmMzsaPApX9eKTzpOzdgQwrR3FNTE6mGx3N/+QWYM7fdF+T1ldZQt87dCRSeQnmAo5kqjtxeA/w=="; }; }; - "@fluentui/merge-styles-8.1.3" = { + "@fluentui/merge-styles-8.1.4" = { name = "_at_fluentui_slash_merge-styles"; packageName = "@fluentui/merge-styles"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.3.tgz"; - sha512 = "5vZUyXnbOb9M1rMLzQ7Kj5uadHgSTsp3gv0xDv6bfPvzB9RgQa3dEuJ6TA34tLezw8sFYuA6NnKd57nlb4aXMA=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.4.tgz"; + sha512 = "zCAEjZyALk0CGW1H9YNJU+e/MW0P5sFJfrDvac27K4S/dIQvKnOwMUNOWRkNz3yUEt0R9vo0NtiO3cW04cZq3A=="; }; }; - "@fluentui/react-7.173.1" = { + "@fluentui/react-7.174.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.173.1"; + version = "7.174.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.173.1.tgz"; - sha512 = "+6PB+CwwL2GNHy4GrDR6871ng7A7FRGXSHQzGqfeLq7Dr7vjO82fGuIsrIaFO1Ry1lug6c41uC5Bon/mKcs1KQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.174.0.tgz"; + sha512 = "nPng19/ncq34ZwbHMa26US3Fu+7Q3GBo7DDcGnj5+csvw+XaGkJ+OeKDx0PyulkI5WM+hkR358VwxDJ87jlH1A=="; }; }; - "@fluentui/react-8.22.0" = { + "@fluentui/react-8.27.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.22.0"; + version = "8.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.22.0.tgz"; - sha512 = "mn/zUd7vJNFLqpXZhc3ePNpDcNx4mhYdQ5vCC6kqcFIYjMg2ve5WqBP9tpFlbD3LEBa8NyOvIWfdG0NZdKejLg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.27.0.tgz"; + sha512 = "5LSh5XVU3qy6nY949jxS3BwF7UZA6jGjcH9JOTosgtxuHZUIXkzfZlT7fyt5xp+27B1B5ro9K9u2pDjItDHVHg=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -2380,22 +2371,22 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; - "@fluentui/react-focus-8.1.8" = { + "@fluentui/react-focus-8.1.10" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.1.8"; + version = "8.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.8.tgz"; - sha512 = "EUI1TZwM7T2keNEjqIAkeV9ALMlLjz7abqHk0AypKJG3v4YPQHycal37KAHQb+gdVJX2hjVQLxynI1yrquKFUw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.10.tgz"; + sha512 = "sojXA6epu2QJbFf+XqP1AHOrrWssoQJWJNuzp0MCzQOWCUlLLqRpRUHtUKZzCnrbD9G5MOW8/192m/rSPyM7eA=="; }; }; - "@fluentui/react-hooks-8.2.4" = { + "@fluentui/react-hooks-8.2.6" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.2.4"; + version = "8.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.4.tgz"; - sha512 = "qc/j0YdxC0zAWVqh8BJppZuK3o9/rfyu5psY4N/AL9dmKrTFWszRgTSB5uiRShN99L88UUEV9RtlfknnLDGrUg=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.6.tgz"; + sha512 = "nz0iycSUmGX6eBKsmW23ocmKn/HdV7c8HnMHx5fcGIQbOqOH8Hv4wq8t3RozsZBapIi/nDjpZs2UvB4zDFsg1g=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -2407,31 +2398,31 @@ let sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; - "@fluentui/react-window-provider-2.1.3" = { + "@fluentui/react-window-provider-2.1.4" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.3.tgz"; - sha512 = "3NWL3Kkqp3elD/aTrUaEufRUrN7K7hYsXEsOY2bDCDjPadLGtZlTGWNYFbUYNsaL/v79gZHhH+voCECP85HqRg=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.4.tgz"; + sha512 = "RztmJ7ol2eMDr3NCs2OcAA1cQjZdPPUEa4aurgh4Aq+JM/BiY0aK6S4SeFtVD7F8Q7PBOz/xwOG4HlnSMQtlsg=="; }; }; - "@fluentui/set-version-8.1.3" = { + "@fluentui/set-version-8.1.4" = { name = "_at_fluentui_slash_set-version"; packageName = "@fluentui/set-version"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.3.tgz"; - sha512 = "QYLFBnwa6xJj0phEy6r+iO5bXWXxkhS1uNngUwfWsHaTskDa4PXDDdjZAXjTVV935xqmoM4GZhZk+Tcoe/OaXA=="; + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.4.tgz"; + sha512 = "2otMyJ+s+W+hjBD4BKjwYKKinJUDeIKYKz93qKrrJS0i3fKfftNroy9dHFlIblZ7n747L334plLi3bzQO1bnvA=="; }; }; - "@fluentui/style-utilities-8.2.0" = { + "@fluentui/style-utilities-8.2.2" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.2.0"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.0.tgz"; - sha512 = "gdAgBnevDOHbgqAKCaQG4CXN6dONMg8BRSZNqha0I9WdgLJy7F7t4xVo8elPjlDUP72ciYT8J9Z/YNljZzbE0w=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.2.tgz"; + sha512 = "PKixlYfY93XOZRPNi+I8Qw9SkcBZsnG/qg2+3IxLGXpCVYKOmP52oR7N5j/nmspQZXdEoHehYa2z/lsKC2xw1w=="; }; }; "@fluentui/theme-1.7.4" = { @@ -2443,22 +2434,22 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; - "@fluentui/theme-2.1.4" = { + "@fluentui/theme-2.2.1" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.1.4"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.4.tgz"; - sha512 = "Y4FWgnYldvAFOo24tfsREMb8/3Tn5uDoYgGO7AAdrksP7VAaavaEVQCOgvHWy3l89Bsxf00/fE+QJ/AHv5Z4CA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.1.tgz"; + sha512 = "1G92TftVulrGXklL5upaN/WrrSzY/va39RM1eo0XO/Q3+kAhAajclQAXb7XanqOsVFcAqK1DbVvWayrY9DG2Qg=="; }; }; - "@fluentui/utilities-8.2.1" = { + "@fluentui/utilities-8.2.2" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.1.tgz"; - sha512 = "ezRkBUDhHQjrqAWA6H1TwWU3STauW/EjthDAe/upJbmXeP3ynn7tTpx1gpNi/vHjJlRkO1JjNoiSc6P4MZWkYw=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.2.tgz"; + sha512 = "aM2/CgoTIssMDs7MoTla+q/VXN5Gkk4s12S8GZNp87cmEzDy008tKkiRpHj6PXZuvJL5bctZco9YQgusO0jZEg=="; }; }; "@google-cloud/paginator-3.0.5" = { @@ -2497,13 +2488,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.16.1" = { + "@google-cloud/pubsub-2.16.2" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.1"; + version = "2.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.1.tgz"; - sha512 = "+uO7r9uRfD/x0BzBI67clbIu0VIdqYLZ5NINuGEsMiAXIGWQWmceuLMixMEb/JOxeaqKygH1mL2rshkDisUmGg=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.2.tgz"; + sha512 = "9sECwj4ae04RZpL9LZ6HZVvp0jGKR9O2V4ERfIHS6vhPQa8bUITVmqw+EH6KxsaquXkuVD1dWUCvXkUlMaWc3w=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2578,13 +2569,40 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.14" = { + "@graphql-tools/load-6.2.8" = { + name = "_at_graphql-tools_slash_load"; + packageName = "@graphql-tools/load"; + version = "6.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.8.tgz"; + sha512 = "JpbyXOXd8fJXdBh2ta0Q4w8ia6uK5FHzrTNmcvYBvflFuWly2LDTk2abbSl81zKkzswQMEd2UIYghXELRg8eTA=="; + }; + }; + "@graphql-tools/merge-6.2.17" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.14"; + version = "6.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.14.tgz"; - sha512 = "RWT4Td0ROJai2eR66NHejgf8UwnXJqZxXgDWDI+7hua5vNA2OW8Mf9K1Wav1ZkjWnuRp4ztNtkZGie5ISw55ow=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.17.tgz"; + sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; + }; + }; + "@graphql-tools/merge-7.0.0" = { + name = "_at_graphql-tools_slash_merge"; + packageName = "@graphql-tools/merge"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-7.0.0.tgz"; + sha512 = "u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w=="; + }; + }; + "@graphql-tools/mock-8.1.8" = { + name = "_at_graphql-tools_slash_mock"; + packageName = "@graphql-tools/mock"; + version = "8.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.8.tgz"; + sha512 = "ZLt4THOdDrwzMP5bKYaWJwJFYmacQojNWHt5Oo0c50N0jWe+PD/AbPbrn8Jb7mdVMhnxDgdMGwhsEFBhHSKJVA=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2596,6 +2614,15 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; + "@graphql-tools/schema-8.0.3" = { + name = "_at_graphql-tools_slash_schema"; + packageName = "@graphql-tools/schema"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.3.tgz"; + sha512 = "ufJH7r/RcetVPd3kKCZ16/JTRkOX8aB1yGbYnUjqWEIdYEZc3Fpg7AVlcliu2JlvwR+WSNlgWn2QK76QCsFFdA=="; + }; + }; "@graphql-tools/url-loader-6.10.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; @@ -2623,6 +2650,15 @@ let sha512 = "d334r6bo9mxdSqZW6zWboEnnOOFRrAPVQJ7LkU8/6grglrbcu6WhwCLzHb90E94JI3TD3ricC3YGbUqIi9Xg0w=="; }; }; + "@graphql-tools/utils-8.0.2" = { + name = "_at_graphql-tools_slash_utils"; + packageName = "@graphql-tools/utils"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.2.tgz"; + sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; + }; + }; "@graphql-tools/wrap-7.0.8" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; @@ -2632,6 +2668,15 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; + "@graphql-typed-document-node/core-3.1.0" = { + name = "_at_graphql-typed-document-node_slash_core"; + packageName = "@graphql-typed-document-node/core"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.0.tgz"; + sha512 = "wYn6r8zVZyQJ6rQaALBEln5B1pzxb9shV5Ef97kTvn6yVGrqyXVnDqnU24MXnFubR+rZjBY9NWuxX3FB2sTsjg=="; + }; + }; "@grpc/grpc-js-1.3.2" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -2668,6 +2713,15 @@ let sha512 = "v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg=="; }; }; + "@grpc/grpc-js-1.3.7" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz"; + sha512 = "CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA=="; + }; + }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -2740,15 +2794,6 @@ let sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; - "@hapi/formula-1.2.0" = { - name = "_at_hapi_slash_formula"; - packageName = "@hapi/formula"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/formula/-/formula-1.2.0.tgz"; - sha512 = "UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA=="; - }; - }; "@hapi/hoek-8.5.1" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; @@ -2776,24 +2821,6 @@ let sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; }; }; - "@hapi/joi-16.1.8" = { - name = "_at_hapi_slash_joi"; - packageName = "@hapi/joi"; - version = "16.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.8.tgz"; - sha512 = "wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg=="; - }; - }; - "@hapi/pinpoint-1.0.2" = { - name = "_at_hapi_slash_pinpoint"; - packageName = "@hapi/pinpoint"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-1.0.2.tgz"; - sha512 = "dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ=="; - }; - }; "@hapi/topo-3.1.6" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; @@ -3037,13 +3064,13 @@ let sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@jcubic/lily-0.1.0" = { + "@jcubic/lily-0.2.0" = { name = "_at_jcubic_slash_lily"; packageName = "@jcubic/lily"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.1.0.tgz"; - sha512 = "kIsp4dmIUHn3YHIqFhEylY+mgI988KcYI8f19og7LqmLzkouPZNBip/oL8iemElie0gqx5CeQ5HxZv/SuNkOaA=="; + url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.2.0.tgz"; + sha512 = "KV+CBO6epprxj0AHBDOUI5vfcJZPfhuK5Bdf+AqoJFIVBapSJjuHlZsMGLGLTHCQW48oYvwv8wCC/olzRC/Ndw=="; }; }; "@jest/transform-25.5.1" = { @@ -3082,301 +3109,22 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; - "@jimp/bmp-0.12.1" = { - name = "_at_jimp_slash_bmp"; - packageName = "@jimp/bmp"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.12.1.tgz"; - sha512 = "t16IamuBMv4GiGa1VAMzsgrVKVANxXG81wXECzbikOUkUv7pKJ2vHZDgkLBEsZQ9sAvFCneM1+yoSRpuENrfVQ=="; - }; - }; - "@jimp/core-0.12.1" = { - name = "_at_jimp_slash_core"; - packageName = "@jimp/core"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/core/-/core-0.12.1.tgz"; - sha512 = "mWfjExYEjHxBal+1gPesGChOQBSpxO7WUQkrO9KM7orboitOdQ15G5UA75ce7XVZ+5t+FQPOLmVkVZzzTQSEJA=="; - }; - }; - "@jimp/custom-0.12.1" = { - name = "_at_jimp_slash_custom"; - packageName = "@jimp/custom"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.12.1.tgz"; - sha512 = "bVClp8FEJ/11GFTKeRTrfH7NgUWvVO5/tQzO/68aOwMIhbz9BOYQGh533K9+mSy29VjZJo8jxZ0C9ZwYHuFwfA=="; - }; - }; - "@jimp/gif-0.12.1" = { - name = "_at_jimp_slash_gif"; - packageName = "@jimp/gif"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.12.1.tgz"; - sha512 = "cGn/AcvMGUGcqR6ByClGSnrja4AYmTwsGVXTQ1+EmfAdTiy6ztGgZCTDpZ/tq4SpdHXwm9wDHez7damKhTrH0g=="; - }; - }; - "@jimp/jpeg-0.12.1" = { - name = "_at_jimp_slash_jpeg"; - packageName = "@jimp/jpeg"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.12.1.tgz"; - sha512 = "UoCUHbKLj2CDCETd7LrJnmK/ExDsSfJXmc1pKkfgomvepjXogdl2KTHf141wL6D+9CfSD2VBWQLC5TvjMvcr9A=="; - }; - }; - "@jimp/plugin-blit-0.12.1" = { - name = "_at_jimp_slash_plugin-blit"; - packageName = "@jimp/plugin-blit"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.12.1.tgz"; - sha512 = "VRBB6bx6EpQuaH0WX8ytlGNqUQcmuxXBbzL3e+cD0W6MluYibzQy089okvXcyUS72Q+qpSMmUDCVr3pDqLAsSA=="; - }; - }; - "@jimp/plugin-blur-0.12.1" = { - name = "_at_jimp_slash_plugin-blur"; - packageName = "@jimp/plugin-blur"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.12.1.tgz"; - sha512 = "rTFY0yrwVJFNgNsAlYGn2GYCRLVEcPQ6cqAuhNylXuR/7oH3Acul+ZWafeKtvN8D8uMlth/6VP74gruXvwffZw=="; - }; - }; - "@jimp/plugin-circle-0.12.1" = { - name = "_at_jimp_slash_plugin-circle"; - packageName = "@jimp/plugin-circle"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.12.1.tgz"; - sha512 = "+/OiBDjby7RBbQoDX8ZsqJRr1PaGPdTaaKUVGAsrE7KCNO9ODYNFAizB9lpidXkGgJ4Wx5R4mJy21i22oY/a4Q=="; - }; - }; - "@jimp/plugin-color-0.12.1" = { - name = "_at_jimp_slash_plugin-color"; - packageName = "@jimp/plugin-color"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.12.1.tgz"; - sha512 = "xlnK/msWN4uZ+Bu7+UrCs9oMzTSA9QE0jWFnF3h0aBsD8t1LGxozkckHe8nHtC/y/sxIa8BGKSfkiaW+r6FbnA=="; - }; - }; - "@jimp/plugin-contain-0.12.1" = { - name = "_at_jimp_slash_plugin-contain"; - packageName = "@jimp/plugin-contain"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.12.1.tgz"; - sha512 = "WZ/D6G0jhnBh2bkBh610PEh/caGhAUIAxYLsQsfSSlOxPsDhbj3S6hMbFKRgnDvf0hsd5zTIA0j1B0UG4kh18A=="; - }; - }; - "@jimp/plugin-cover-0.12.1" = { - name = "_at_jimp_slash_plugin-cover"; - packageName = "@jimp/plugin-cover"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.12.1.tgz"; - sha512 = "ddWwTQO40GcabJ2UwUYCeuNxnjV4rBTiLprnjGMqAJCzdz3q3Sp20FkRf+H+E22k2v2LHss8dIOFOF4i6ycr9Q=="; - }; - }; - "@jimp/plugin-crop-0.12.1" = { - name = "_at_jimp_slash_plugin-crop"; - packageName = "@jimp/plugin-crop"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.12.1.tgz"; - sha512 = "CKjVkrNO8FDZKYVpMireQW4SgKBSOdF+Ip/1sWssHHe77+jGEKqOjhYju+VhT3dZJ3+75rJNI9II7Kethp+rTw=="; - }; - }; - "@jimp/plugin-displace-0.12.1" = { - name = "_at_jimp_slash_plugin-displace"; - packageName = "@jimp/plugin-displace"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.12.1.tgz"; - sha512 = "MQAw2iuf1/bVJ6P95WWTLA+WBjvIZ7TeGBerkvBaTK8oWdj+NSLNRIYOIoyPbZ7DTL8f1SN4Vd6KD6BZaoWrwg=="; - }; - }; - "@jimp/plugin-dither-0.12.1" = { - name = "_at_jimp_slash_plugin-dither"; - packageName = "@jimp/plugin-dither"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.12.1.tgz"; - sha512 = "mCrBHdx2ViTLJDLcrobqGLlGhZF/Mq41bURWlElQ2ArvrQ3/xR52We9DNDfC08oQ2JVb6q3v1GnCCdn0KNojGQ=="; - }; - }; - "@jimp/plugin-fisheye-0.12.1" = { - name = "_at_jimp_slash_plugin-fisheye"; - packageName = "@jimp/plugin-fisheye"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.12.1.tgz"; - sha512 = "CHvYSXtHNplzkkYzB44tENPDmvfUHiYCnAETTY+Hx58kZ0w8ERZ+OiLhUmiBcvH/QHm/US1iiNjgGUAfeQX6dg=="; - }; - }; - "@jimp/plugin-flip-0.12.1" = { - name = "_at_jimp_slash_plugin-flip"; - packageName = "@jimp/plugin-flip"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.12.1.tgz"; - sha512 = "xi+Yayrnln8A/C9E3yQBExjxwBSeCkt/ZQg1CxLgszVyX/3Zo8+nkV8MJYpkTpj8LCZGTOKlsE05mxu/a3lbJQ=="; - }; - }; - "@jimp/plugin-gaussian-0.12.1" = { - name = "_at_jimp_slash_plugin-gaussian"; - packageName = "@jimp/plugin-gaussian"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.12.1.tgz"; - sha512 = "7O6eKlhL37hsLfV6WAX1Cvce7vOqSwL1oWbBveC1agutDlrtvcTh1s2mQ4Pde654hCJu55mq1Ur10+ote5j3qw=="; - }; - }; - "@jimp/plugin-invert-0.12.1" = { - name = "_at_jimp_slash_plugin-invert"; - packageName = "@jimp/plugin-invert"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.12.1.tgz"; - sha512 = "JTAs7A1Erbxwl+7ph7tgcb2PZ4WzB+3nb2WbfiWU8iCrKj17mMDSc5soaCCycn8wfwqvgB1vhRfGpseOLWxsuQ=="; - }; - }; - "@jimp/plugin-mask-0.12.1" = { - name = "_at_jimp_slash_plugin-mask"; - packageName = "@jimp/plugin-mask"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.12.1.tgz"; - sha512 = "bnDdY0RO/x5Mhqoy+056SN1wEj++sD4muAKqLD2CIT8Zq5M/0TA4hkdf/+lwFy3H2C0YTK39PSE9xyb4jPX3kA=="; - }; - }; - "@jimp/plugin-normalize-0.12.1" = { - name = "_at_jimp_slash_plugin-normalize"; - packageName = "@jimp/plugin-normalize"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.12.1.tgz"; - sha512 = "4kSaI4JLM/PNjHwbnAHgyh51V5IlPfPxYvsZyZ1US32pebWtocxSMaSuOaJUg7OGSkwSDBv81UR2h5D+Dz1b5A=="; - }; - }; - "@jimp/plugin-print-0.12.1" = { - name = "_at_jimp_slash_plugin-print"; - packageName = "@jimp/plugin-print"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.12.1.tgz"; - sha512 = "T0lNS3qU9SwCHOEz7AGrdp50+gqiWGZibOL3350/X/dqoFs1EvGDjKVeWncsGCyLlpfd7M/AibHZgu8Fx2bWng=="; - }; - }; - "@jimp/plugin-resize-0.12.1" = { - name = "_at_jimp_slash_plugin-resize"; - packageName = "@jimp/plugin-resize"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.12.1.tgz"; - sha512 = "sbNn4tdBGcgGlPt9XFxCuDl4ZOoxa8/Re8nAikyxYhRss2Dqz91ARbBQxOf1vlUGeicQMsjEuWbPQAogTSJRug=="; - }; - }; - "@jimp/plugin-rotate-0.12.1" = { - name = "_at_jimp_slash_plugin-rotate"; - packageName = "@jimp/plugin-rotate"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.12.1.tgz"; - sha512 = "RYkLzwG2ervG6hHy8iepbIVeWdT1kz4Qz044eloqo6c66MK0KAqp228YI8+CAKm0joQnVDC/A0FgRIj/K8uyAw=="; - }; - }; - "@jimp/plugin-scale-0.12.1" = { - name = "_at_jimp_slash_plugin-scale"; - packageName = "@jimp/plugin-scale"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.12.1.tgz"; - sha512 = "zjNVI1fUj+ywfG78T1ZU33g9a5sk4rhEQkkhtny8koAscnVsDN2YaZEKoFli54kqaWh5kSS5DDL7a/9pEfXnFQ=="; - }; - }; - "@jimp/plugin-shadow-0.12.1" = { - name = "_at_jimp_slash_plugin-shadow"; - packageName = "@jimp/plugin-shadow"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.12.1.tgz"; - sha512 = "Z82IwvunXWQ2jXegd3W3TYUXpfJcEvNbHodr7Z+oVnwhM1OoQ5QC6RSRQwsj2qXIhbGffQjH8eguHgEgAV+u5w=="; - }; - }; - "@jimp/plugin-threshold-0.12.1" = { - name = "_at_jimp_slash_plugin-threshold"; - packageName = "@jimp/plugin-threshold"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.12.1.tgz"; - sha512 = "PFezt5fSk0q+xKvdpuv0eLggy2I7EgYotrK8TRZOT0jimuYFXPF0Z514c6szumoW5kEsRz04L1HkPT1FqI97Yg=="; - }; - }; - "@jimp/plugins-0.12.1" = { - name = "_at_jimp_slash_plugins"; - packageName = "@jimp/plugins"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.12.1.tgz"; - sha512 = "7+Yp29T6BbYo+Oqnc+m7A5AH+O+Oy5xnxvxlfmsp48+SuwEZ4akJp13Gu2PSmRlylENzR7MlWOxzhas5ERNlIg=="; - }; - }; - "@jimp/png-0.12.1" = { - name = "_at_jimp_slash_png"; - packageName = "@jimp/png"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/png/-/png-0.12.1.tgz"; - sha512 = "tOUSJMJzcMAN82F9/Q20IToquIVWzvOe/7NIpVQJn6m+Lq6TtVmd7d8gdcna9AEFm2FIza5lhq2Kta6Xj0KXhQ=="; - }; - }; - "@jimp/tiff-0.12.1" = { - name = "_at_jimp_slash_tiff"; - packageName = "@jimp/tiff"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.12.1.tgz"; - sha512 = "bzWDgv3202TKhaBGzV9OFF0PVQWEb4194h9kv5js348SSnbCusz/tzTE1EwKrnbDZThZPgTB1ryKs7D+Q9Mhmg=="; - }; - }; - "@jimp/types-0.12.1" = { - name = "_at_jimp_slash_types"; - packageName = "@jimp/types"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/types/-/types-0.12.1.tgz"; - sha512 = "hg5OKXpWWeKGuDrfibrjWWhr7hqb7f552wqnPWSLQpVrdWgjH+hpOv6cOzdo9bsU78qGTelZJPxr0ERRoc+MhQ=="; - }; - }; - "@jimp/utils-0.12.1" = { - name = "_at_jimp_slash_utils"; - packageName = "@jimp/utils"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.12.1.tgz"; - sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; - }; - }; - "@joplin/fork-htmlparser2-4.1.28" = { + "@joplin/fork-htmlparser2-4.1.31" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.28"; + version = "4.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.28.tgz"; - sha512 = "aY8o+hi42Rn0BCcjI33nXC/tHwm1mYoAMrqnEfNVQ1ZDGJbbKVnYWADf6o5tGMR+Klkn9lbbR9tn+U8hKHbFhA=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.31.tgz"; + sha512 = "5v7vYawEQP+0wHjT3sXi5LgRiWWImbnNdsTf6mdKg+IeX9KCjYnc7aZRGdC+yQlEQbcIRpu8bKUQnh/WoaMG7g=="; }; }; - "@joplin/fork-sax-1.2.32" = { + "@joplin/fork-sax-1.2.35" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.32"; + version = "1.2.35"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.32.tgz"; - sha512 = "N6Nk2qdsmCM31zIYjyIEH2hTSFd9rZv6tcvN9bjsuxTQ97WW74d6fI8+ReBWz2cFs7joXxaPay0iNwwDDXV0Kg=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.35.tgz"; + sha512 = "+0K4PbooQweodhTIaehh9QdC9g6SH7IpFzeNsv3Eh3T7LT985XJ1mZfXEjRI5pfWrRj9ibvxHcgvMzEQuXPM3g=="; }; }; "@joplin/lib-2.1.1" = { @@ -3406,22 +3154,22 @@ let sha512 = "XxmquKGZxlrjUorx924ogAACc39p22pzWp06DJX/eElU2kLZ/s+RC0EXAFj503EuDj/dd2voV+Tciz0wfCPc0Q=="; }; }; - "@joplin/turndown-4.0.50" = { + "@joplin/turndown-4.0.53" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.50"; + version = "4.0.53"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.50.tgz"; - sha512 = "oqMCmkudn3OUxkI68mbBy5AWqnmgWBlIL9lz3XSoq3iYJZdXYCDyYUA0Wb64eRHf6muUN8V23WdeVjc02dsbEQ=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.53.tgz"; + sha512 = "uYeROpicdZKWq2WLOuKTAsG5wEZu8cy/kjWRBIkuyql575NRzyONh9e4UtT6tiWmPWtuVNHmaBJJyIzAwstfLg=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.32" = { + "@joplin/turndown-plugin-gfm-1.0.35" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.32"; + version = "1.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.32.tgz"; - sha512 = "5jodAeZz90xt4p5FSvnRi4V1NyiPS0L9O7WufG8lN55sacZ9pkXUvELex4PQ7kiHvmOv67x4XcvTjfqX/mnKnA=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.35.tgz"; + sha512 = "jMc8Cjq3K2szQGsi39yQpxMuR3JCCkIFWjQxKRlOW7JvbaTeMPuGqpEafuNqtn7qU6DoYF72p/glKmU8p2t3Dg=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -3442,13 +3190,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.31.0" = { + "@jsii/spec-1.32.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.31.0.tgz"; - sha512 = "qpJqZ+xj4lnKfk/HJYdYURDmHzh9aBIVOTgwd314AxKmwubDAajlAup+D2F9z9kylAB7GsQiva/SXgUlFjBeQw=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.32.0.tgz"; + sha512 = "XjSnqvmBXvFork9w3ehacqaa0JmUVaEYubOzR1l6z67z2FDZ9C4KP7EqMqjnv/S+j+Ou3tWQPfLICnl6aK1iGA=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -4090,13 +3838,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.195" = { + "@microsoft/load-themed-styles-1.10.198" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.195"; + version = "1.10.198"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.195.tgz"; - sha512 = "KDCKYsdIo3/ivmu4kzn/LmdttAOwz/bU2C1KywyKy8jHuTj/gU9LBD2htDNGbHQgKObOuqGTpUNNVpVe92Gghw=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.198.tgz"; + sha512 = "nqIXXJ2ZJy6gtB0T8qluL+yaupGxMe1nj2ZBymtH93hqy09jDXeXW2Y+1ggGn2CHjUHi09YUgOpoEO2m5Tx/kw=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4171,31 +3919,31 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-16.1.0" = { + "@netlify/build-17.11.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "16.1.0"; + version = "17.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-16.1.0.tgz"; - sha512 = "FEPgiR2IoEC7fwCkAguMdWbiWwdAr6Zh1+mEFlgqTPAQDE6j/ji3elD8kuXwtdHHhC8U28YYOTZL6fCodlvRAw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-17.11.0.tgz"; + sha512 = "c9f28mJJMspXP7H1oDH9Mlg1+UgSxJVktPronJPrzoiMQzvEz/AuWjgn37OMopzfTJumOfSxorWlj0YTZyj3Lw=="; }; }; - "@netlify/cache-utils-1.0.7" = { + "@netlify/cache-utils-2.0.0" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.7"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.7.tgz"; - sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.0.tgz"; + sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ=="; }; }; - "@netlify/config-13.0.0" = { + "@netlify/config-14.4.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "13.0.0"; + version = "14.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-13.0.0.tgz"; - sha512 = "d7NNG3lbvZN/w9eCRdlFKBY21Vpjxlwis08v5NJjkZpNTuuAuemNFrhZv2y5zmy33TM+zTrkaoEAk6vJ96R5cQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.3.tgz"; + sha512 = "lCuhs58xDIkDF34A1Xz4CTXvr9xgVHJn5Y5Xwmj1Tgp78eOSQFozgYLVXEwLqTTg3EFiniPoHy0oSPMmrhCZMw=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4207,148 +3955,148 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.7.2" = { + "@netlify/framework-info-5.8.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.7.2"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.7.2.tgz"; - sha512 = "5yO26VRpeXmXorl1kNYbXxgFsJSNcrDaQVnAT9XPqZ5mb7vtjEP/ddEHkNpDsYBj/Y8VBPCvkPhDizg7UPenSw=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.8.0.tgz"; + sha512 = "gc8K0BT6CSHnYFirLmUWLoKah+AjStWBsGmwa7gbRmeAaRThJhkRcRVE03EhSnrMQkAMO3IIIMklbE8i/9UpEg=="; }; }; - "@netlify/functions-utils-1.4.7" = { + "@netlify/functions-utils-2.0.2" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.4.7"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.7.tgz"; - sha512 = "e0y/iUsXWJq65ZUS3mn6ACJlQ6bfVSjtV6DO8Y194tevctnArtQA+F86L08zQklyhJbEV6cmyg4QbHhbLqTNOg=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-2.0.2.tgz"; + sha512 = "mQI0NX0QPNVcYb2TQF5cpxO350BR9309r7vSOSvfn0DHkPWUea1kl3iiLXi1mm/dUC6pd3p5ctc0UboW0u+iVQ=="; }; }; - "@netlify/git-utils-1.0.11" = { + "@netlify/git-utils-2.0.0" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.11"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.11.tgz"; - sha512 = "bvlvFAB9VU3wTYYEEUinsOeRFxZ/MmetffzHehSMEyP00kXakvrySq4XbC6G8u3wCDln34eOjKDt8uPYoqfuNQ=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.0.tgz"; + sha512 = "O8cGi3yRtdqJ2pDkdcoj3t6F9JSB/SokRwZiCJjp2aBQyC+Jg3RsRH7G0MbYEjrjN6JY4/p6j62NTFqsIBGh2A=="; }; }; - "@netlify/local-functions-proxy-0.1.0" = { + "@netlify/local-functions-proxy-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy"; packageName = "@netlify/local-functions-proxy"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-0.1.0.tgz"; - sha512 = "n4Y3LE3I6MrSCCLqLjY4VOVAi/uXdU35Kswd0eK0060Fla5huj+rKSnzu8GIERrvuRJMPi/AY7WFxB5mkFS8qw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-1.1.0.tgz"; + sha512 = "HoxJuJpBqmzflIcdFsnUSuf/KwYsgzrsF/jh+bXPO+aOB9pzZEH0P/e/qCAr2JbJVzOyxo/36Ti3sXbahSDAYQ=="; }; }; - "@netlify/local-functions-proxy-darwin-arm64-0.1.0" = { + "@netlify/local-functions-proxy-darwin-arm64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-darwin-arm64"; packageName = "@netlify/local-functions-proxy-darwin-arm64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-0.1.0.tgz"; - sha512 = "QsVber2F4H2zS2Oi31y226zeLkhWQrjy+9lYV4bsU0lZB9wHqrLGQNlOabqs6MWUQmWMqcDHLv31XMFpfhndnw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.1.0.tgz"; + sha512 = "EOSEA/mt6IyXqou//vOo17vnQwwBKPu8wO+bZZQNb+NNgyjzYl/8wpZE0CvoYHPsEU2h0hk1xeqwaYBMihunKg=="; }; }; - "@netlify/local-functions-proxy-darwin-x64-0.1.0" = { + "@netlify/local-functions-proxy-darwin-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-darwin-x64"; packageName = "@netlify/local-functions-proxy-darwin-x64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-0.1.0.tgz"; - sha512 = "7Wb3ooicvRzHMErMWF+L+QG+rVy7iBEQ7b2GOzywL/VmeajatVk/D16v5b9adM2sX0KX1dyj3O9x2QLkDW2G7w=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.1.0.tgz"; + sha512 = "P+khKO6YwjeEv+zppE7asbInliopo1mJSkQeGT27ebs4UVkZPpYefhtLs8Gs5dau7zFfPBF8PFgE1kCEMKw4+g=="; }; }; - "@netlify/local-functions-proxy-freebsd-arm64-0.1.0" = { + "@netlify/local-functions-proxy-freebsd-arm64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-arm64"; packageName = "@netlify/local-functions-proxy-freebsd-arm64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-0.1.0.tgz"; - sha512 = "Keno1p1rvp5fiGEDZDm0fIOZTbcE1QwyqF5hgVSpD0bxitSAFOaXZwhcyo80x8qcMlBqQp9zWEJWu4zN1UiZMA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.1.0.tgz"; + sha512 = "bqjyD4o7KVWrUPO/cr4HfUfUFUfTJFmjw0KFDFet//itJMSg+RocQGmjkJ8YTqWQZxwDJF7Dp44n/WGhpnWUUg=="; }; }; - "@netlify/local-functions-proxy-freebsd-x64-0.1.0" = { + "@netlify/local-functions-proxy-freebsd-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-x64"; packageName = "@netlify/local-functions-proxy-freebsd-x64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-0.1.0.tgz"; - sha512 = "kyEjE/aW/k7yD1+Oy28LLZjg6W8091HPCqUHzCk5GzT46zvR61vTPfeAEQwNaEL2uFHPJ3SauDNUZ1+U+FNlHA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.1.0.tgz"; + sha512 = "R8a0sW5bcTbX7eKiVzFw1+2F0tO8Sw/+fQL9f9Z+2F4pT5+SKml8CLvfRU5xYl1KcxdHGq5ETcSwu/wyqfMTpA=="; }; }; - "@netlify/local-functions-proxy-linux-arm-0.1.0" = { + "@netlify/local-functions-proxy-linux-arm-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm"; packageName = "@netlify/local-functions-proxy-linux-arm"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-0.1.0.tgz"; - sha512 = "Un4RIA3xaiWT1njCMgYJsYc1etksFuARz8suHtcoKadsEJ1XICh6OzJoCO3AdHCN1kMQlo3cVC/sHoAB2EyEqw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.1.0.tgz"; + sha512 = "iGricZd2RqBiF/LjD0EPnH0qSKjfn6RDEIp90I0BKQ2XRkQu7dPFr7m3QhOuoPIHxGERNNGK2FL4OGZ9jXEXtw=="; }; }; - "@netlify/local-functions-proxy-linux-arm64-0.1.0" = { + "@netlify/local-functions-proxy-linux-arm64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm64"; packageName = "@netlify/local-functions-proxy-linux-arm64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-0.1.0.tgz"; - sha512 = "ZDdy+5fgpHxFqpKghtJuMyyQ5tKWV+LJm6t8tKlXkAgC1n1GuqeWNP0JqHV8DSSShFHRaRNoBVpLoXJbtNIorQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.1.0.tgz"; + sha512 = "G7KGstzhNoQwiiuVjyl64fDnNJ2Z/QsjaLDnElSUEwaqJe+0drog0wUxym/RDuVmBY//XDQfxLtG2Zl5ce4tUA=="; }; }; - "@netlify/local-functions-proxy-linux-ia32-0.1.0" = { + "@netlify/local-functions-proxy-linux-ia32-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-ia32"; packageName = "@netlify/local-functions-proxy-linux-ia32"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-0.1.0.tgz"; - sha512 = "vR1qlu341JKN91t0TPsYt2xC+ug8Bjp/WCqMtARmFT9jaL8NBTm6kiUh89QcGILYCo2hMNcYb9eih8y5D4N5Iw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.1.0.tgz"; + sha512 = "okXWyslbX/mMm3CncfUy+CxnBW0vFoDxFaK2+tIeLz5nVizVVyPaoInTe0bs+sSrAvc3jbtt8AfV9ISmhtPx0A=="; }; }; - "@netlify/local-functions-proxy-linux-ppc64-0.1.0" = { + "@netlify/local-functions-proxy-linux-ppc64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-ppc64"; packageName = "@netlify/local-functions-proxy-linux-ppc64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-0.1.0.tgz"; - sha512 = "pcAPe+PzFkNrHpICvrIHHfxk5KNIVo3GgZKoI67NXECCtVel48aXitvlcOwsodrejD8ruQkfbvossBQs9Deq8A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.1.0.tgz"; + sha512 = "E3sPIN9y2QMU0bvPdNF3dmMi8pMUkGd9WYJHthpY9+fcP7j7L2d5h0uuSfG9TPEZS6/SW0c1XhK8wCDGGZIRaQ=="; }; }; - "@netlify/local-functions-proxy-linux-x64-0.1.0" = { + "@netlify/local-functions-proxy-linux-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-x64"; packageName = "@netlify/local-functions-proxy-linux-x64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-0.1.0.tgz"; - sha512 = "sjlMLoKNJRJnq8Esk+GkxEk9CByDNouKdeQ+doiiQhYGRjLhKXZdXbaC137z2tm/vHhI/94Lg7mhCcGygitJpA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.1.0.tgz"; + sha512 = "NFuOmMm5/tCOpQpuG32cFGp4n15++rsy26rWG1u7IVezOTr9SMKOmnsFxQVJGgOT7r3zBBjBJwYJN0CCNj9J3A=="; }; }; - "@netlify/local-functions-proxy-openbsd-x64-0.1.0" = { + "@netlify/local-functions-proxy-openbsd-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-openbsd-x64"; packageName = "@netlify/local-functions-proxy-openbsd-x64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-0.1.0.tgz"; - sha512 = "Dn9wQfeAU6FvurFo8eJL2scahtVigQyAi6lpV+c4YLD87WUfmiQ/mVgB7dfYB9zMiq5GO/iXbcK6wWjFyAZ6Aw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.1.0.tgz"; + sha512 = "9G1lrpSAxT+Bd83IYYxlkMU1xNCZeLstL7gZvXymygRpLoE2oFHfSERaIOvOdbbDQ3ZkEWuX12OJ6d7TS7ievg=="; }; }; - "@netlify/local-functions-proxy-win32-ia32-0.1.0" = { + "@netlify/local-functions-proxy-win32-ia32-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-win32-ia32"; packageName = "@netlify/local-functions-proxy-win32-ia32"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-0.1.0.tgz"; - sha512 = "LRz6UZpgS0UzB5IKgOvBnVNkpBcnzRfT4YBBSBL31fucJ1J2c0zGJIUTqbFdS8eBLOS9Npq2qUT7qlnrgAWyMw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.1.0.tgz"; + sha512 = "F6ET6+XyAcGVIFjX66nAmj6CkgKICPtA9ZpPDLU2b3qYzvdJxW1hgp/UIRyRSRN1IqkIPJtGQZAteHhzBqnFRQ=="; }; }; - "@netlify/local-functions-proxy-win32-x64-0.1.0" = { + "@netlify/local-functions-proxy-win32-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-win32-x64"; packageName = "@netlify/local-functions-proxy-win32-x64"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-0.1.0.tgz"; - sha512 = "YYzVpBPsAiup/Jg+kCAi0/EsV80BMF6JkQ3/2JjJhUqRuEG99THA+HwrFpsQOpOnr3niJBY93YrQymnJPgrk3A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.1.0.tgz"; + sha512 = "8a5rRjDNovZYBEaAPfN1VSwGNG/ExZanrjo7HnuTgphO6i64StqrKNtNW9/h75IgH+WP+8ZmC6Y0lI0BKq/U5A=="; }; }; "@netlify/open-api-2.5.0" = { @@ -4369,13 +4117,13 @@ let sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; - "@netlify/plugins-list-2.19.3" = { + "@netlify/plugins-list-3.3.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.19.3"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.3.tgz"; - sha512 = "Z2RNrNhO7fsNFmpUQ+eNawgtfHwbGH/4Hji2g+GCRYL7W60kgK5rsWxveky1Nrye45I2OQn/4ZGapKqB1IqTaw=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.3.0.tgz"; + sha512 = "wuwDeBx8FK/jY1hQoI0w2MK+Q/6hcEnbaDDBzw+W0Ueu48r7QRIcZMin2OnOSMkTRpAHXqXyQUrm1lnULXKBfg=="; }; }; "@netlify/routing-local-proxy-0.31.0" = { @@ -4387,76 +4135,76 @@ let sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; }; }; - "@netlify/run-utils-1.0.7" = { + "@netlify/run-utils-2.0.0" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "1.0.7"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.7.tgz"; - sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-2.0.0.tgz"; + sha512 = "bfkyaK73zCm5rAaP6ORvuvk7gIN+yeq1SMeshDzga+xNzu1T9yXt4hoiodJXAhhfgHId5m69hnSoFwaCrnOuIA=="; }; }; - "@netlify/zip-it-and-ship-it-4.14.0" = { + "@netlify/zip-it-and-ship-it-4.17.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.14.0"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.14.0.tgz"; - sha512 = "EFUYbcB7g/7Sa4KYZaqNrqe+mJJCeoosUNl8mFyeF3qIqn0po7txSZn0/y1sgjejuv9mRKv8sm7dH8kMM/HJcg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.17.0.tgz"; + sha512 = "xcumwEFH7m/cw/XEcmv3OB8U94J5zWVsMhjROdfUdT+BE5QU5InEggYS6HnDoTOMgGpVM+mY1vgBQzdgaC+NZw=="; }; }; - "@node-red/editor-api-2.0.1" = { + "@node-red/editor-api-2.0.5" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "2.0.1"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.1.tgz"; - sha512 = "0+wY8FJvS6P3hiRnz7YzjWmkannoJyBMYgnSevQ6euf8dABML5AOYThghpMNPrtl+RzRIar0oabHrTRSoEpDEg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.5.tgz"; + sha512 = "efiWLuNk/lwpIULt4Bu8WycW9+v6xVx0VHAK+j1y8Kl5S6u6sbfkTlmDDpaN2NqPHGdMT+roF9EHKHISTmVN9g=="; }; }; - "@node-red/editor-client-2.0.1" = { + "@node-red/editor-client-2.0.5" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "2.0.1"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.1.tgz"; - sha512 = "9YP0n+VFruudzZfcsTL0fofm7j/BYodKzQTqksL3ZlcZsB075O3d8zM8ZuoNlpj2CfROR/PZi7E72ucmNExzlQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.5.tgz"; + sha512 = "C/Vu7NZX3VGTU/LEXxDUTxEEDu/NFIbAOCAJAcvJKdNPEL4InwTF75PRRiWsfeDu8DhBnvFqFe9XTS4fr+nrPA=="; }; }; - "@node-red/nodes-2.0.1" = { + "@node-red/nodes-2.0.5" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "2.0.1"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.1.tgz"; - sha512 = "op1gcV99xp/xZAVg1B+VRzylNpWk/oF//I6dcRqiF8xoXjff42VfIJ8l01/JqsvuJD3p9+x9fz82QRMmASOu+w=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.5.tgz"; + sha512 = "o9hdie+2YtjoMFFe+vAcIkkHPJIO5pkPrRUNQcx7EHzXPEMP0uxhhr/DpC/J6AQ0tOlfS6shWKge0E4bBKfJDQ=="; }; }; - "@node-red/registry-2.0.1" = { + "@node-red/registry-2.0.5" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "2.0.1"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.1.tgz"; - sha512 = "B2La0qWpSEqbiiBWVmUKTqS4y/c/pZuUDPu7a5ZibGgcUEe032X05uZ68wIYMt1y2/ltnUlrPSdOjjpzpxEhEQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.5.tgz"; + sha512 = "UVM1UFuyNGtyLIL3Fjme67uvlxiiQlYVrabFwzUa0u2zHWf0YpzIQgcwtFY9kIuj3h0rVIN+EzuPZIbQZVISNw=="; }; }; - "@node-red/runtime-2.0.1" = { + "@node-red/runtime-2.0.5" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "2.0.1"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.1.tgz"; - sha512 = "3MbJk5Xum38Nt13FIvDmsuQYcdo5uxzKu2khHbXN3hG7XlECALSaKqLq19t7yg6e8q8Jqnb7j6184A1m34GVqQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.5.tgz"; + sha512 = "eK55TQ+iTX0xZy8k4eW3JJCHywgnxpszuKg1aXurKD1sBURGa9qNztB/IW+0T0upnRYgQSTTI8j//msG6s76LQ=="; }; }; - "@node-red/util-2.0.1" = { + "@node-red/util-2.0.5" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "2.0.1"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.1.tgz"; - sha512 = "gT+3cI134m2pD4U0/iKuOAjRqluPXKlS19eCE06ArWGLxHmqx7Gi6Cyjxu971gNcw69QEfwJzEA2xIrAKRAR+g=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.5.tgz"; + sha512 = "+RF8i+LxgyXcAIKjKyht3rRZFBEhrvgXKN2/HlkMWerADwiDTNfBL8JjQZoMKlFKl1cgapp8vp4P1Xf3glH+fQ=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -4495,13 +4243,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.7.1" = { + "@npmcli/arborist-2.8.0" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.7.1.tgz"; - sha512 = "EGDHJs6dna/52BrStr/6aaRcMLrYxGbSjT4V3JzvoTBY9/w5i2+1KNepmsG80CAsGADdo6nuNnFwb7sDRm8ZAw=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.0.tgz"; + sha512 = "R9rTyak1rGdmVTyiU14dgBb+qMllY3B6I8hp7FB4xXsU9dJDrYZJR8I+191CMo5Y1941jTDCtNcXXW9TldPEFQ=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4630,6 +4378,15 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; + "@oclif/core-0.5.29" = { + name = "_at_oclif_slash_core"; + packageName = "@oclif/core"; + version = "0.5.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.29.tgz"; + sha512 = "v5MMxeTgEKbVcEl7D3jsTVL8Wy3lLTDj0KHX7cOmI751yfjdAOqy9frHQ6IXssxubDkBW6sXzbYN9Bw12zsBqg=="; + }; + }; "@oclif/errors-1.3.5" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -4675,13 +4432,13 @@ let sha512 = "tuzhvxxRtfLnWa96klngXBi5IwHt9S/twedCbQhl9dYIKTFMHI1BcOQcPra6ylct+M+b9jhEF5sjWLv78tB6tw=="; }; }; - "@oclif/plugin-help-3.2.2" = { + "@oclif/plugin-help-3.3.0" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.2.tgz"; - sha512 = "SPZ8U8PBYK0n4srFjCLedk0jWU4QlxgEYLCXIBShJgOwPhTTQknkUlsEwaMIevvCU4iCQZhfMX+D8Pz5GZjFgA=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.3.0.tgz"; + sha512 = "+eYQZXsWnc54IM5Hv2+IoKBTKUSDt+vRbwf5I8w+DaXvzOmx0VzAbLgL1ciJzYh66CknjWMUJf/hxoc8ykJHaQ=="; }; }; "@oclif/plugin-not-found-1.2.4" = { @@ -4756,13 +4513,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-9.1.0" = { + "@octokit/openapi-types-9.6.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.1.0"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.1.0.tgz"; - sha512 = "XBP03pG4XuTU+VgeJM1ozRdmZJerMG4tk6wA+raFKycC4qV9jtD2UQroAg9bAcmI3Q0zWvifeDGtPqsFjMzkLg=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.6.0.tgz"; + sha512 = "L+8x7DpcNtHkMbTxxCxg3cozvHUNP46rOIzFwoMs0piWwQzAGNXqlIQO2GLvnKTWLUh99DkY+UyHVrP4jXlowg=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4774,13 +4531,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.14.0" = { + "@octokit/plugin-paginate-rest-2.15.1" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.14.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.14.0.tgz"; - sha512 = "S2uEu2uHeI7Vf+Lvj8tv3O5/5TCAa8GHS0dUQN7gdM7vKA6ZHAbR6HkAVm5yMb1mbedLEbxOuQ+Fa0SQ7tCDLA=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz"; + sha512 = "47r52KkhQDkmvUKZqXzA1lKvcyJEfYh3TKAIe5+EzMeyDM3d+/s5v11i2gTk8/n6No6DPi3k5Ind6wtDbo/AEg=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4792,13 +4549,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.5.0" = { + "@octokit/plugin-rest-endpoint-methods-5.7.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.5.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.0.tgz"; - sha512 = "v4dNoHF8cXNx7C67yQx7oarHs5Wg2IiafWvp/ULkNcCOuXgQdBOkJtwidpYqPiRPUw4uHDkI6Tgfje+nXB+Deg=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.7.0.tgz"; + sha512 = "G7sgccWRYQMwcHJXkDY/sDxbXeKiZkFQqUtzBCwmrzCNj2GQf3VygQ4T/BFL2crLVpIbenkE/c0ErhYOte2MPw=="; }; }; "@octokit/request-5.6.0" = { @@ -4819,22 +4576,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.7.0" = { + "@octokit/rest-18.9.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.7.0"; + version = "18.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.0.tgz"; - sha512 = "8K8BJFyPFRSfnwu+aSbdjU5w3EtxC33PkDlEi5tyVTYC+t4n7gaqygRg5ajJLCpb/ZzVaXXFJXC9OxQ9TvFRAw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.9.0.tgz"; + sha512 = "VrmrE8gjpuOoDAGjrQq2j9ZhOE6LxaqxaQg0yMrrEnnQZy2ZcAnr5qbVfKsMF0up/48PRV/VFS/2GSMhA7nTdA=="; }; }; - "@octokit/types-6.21.0" = { + "@octokit/types-6.25.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.21.0"; + version = "6.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.21.0.tgz"; - sha512 = "VPSxn9uhCoOUMpxCsOAQhf8DgIx+uzFjZRYDiZS5+TvrKaEwBrWkjr/5NmUVvPbW6xdPC2n3yL3XCnoxa4rxvg=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.25.0.tgz"; + sha512 = "bNvyQKfngvAd/08COlYIN54nRgxskmejgywodizQNyiKoXmWRAjKup2/LYwm+T9V0gsKH6tuld1gM0PzmOiB4Q=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4873,22 +4630,22 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-1.0.1" = { + "@opentelemetry/api-1.0.2" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.1.tgz"; - sha512 = "H5Djcc2txGAINgf3TNaq4yFofYSIK3722PM89S/3R8FuI/eqi1UscajlXk7EBkG9s2pxss/q6SHlpturaavXaw=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.2.tgz"; + sha512 = "DCF9oC89ao8/EJUqrp/beBlDR8Bp2R43jqtzayqCoomIvkwTuPfLcHdVhIGRR69GFlkykFjcDW+V92t0AS7Tww=="; }; }; - "@opentelemetry/semantic-conventions-0.22.0" = { + "@opentelemetry/semantic-conventions-0.24.0" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.22.0"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.22.0.tgz"; - sha512 = "t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz"; + sha512 = "a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA=="; }; }; "@ot-builder/bin-composite-types-1.1.0" = { @@ -5242,6 +4999,33 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; + "@percy/config-1.0.0-beta.63" = { + name = "_at_percy_slash_config"; + packageName = "@percy/config"; + version = "1.0.0-beta.63"; + src = fetchurl { + url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.63.tgz"; + sha512 = "mc2DQwk0uMHV+C7vJOcLm5hrxVqAKLgJvgsN+49Y/fbl6fUTNwY2s1usTi3kfCThdGpnIkqRooVxisnOIxLEUg=="; + }; + }; + "@percy/logger-1.0.0-beta.63" = { + name = "_at_percy_slash_logger"; + packageName = "@percy/logger"; + version = "1.0.0-beta.63"; + src = fetchurl { + url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.63.tgz"; + sha512 = "iumIt1JjrZQiD9fPShbqaUtyqgRBA1crJzwhh6MPZz4s0XJLxcEzhawKzqhtOoiB8Wr5AxVygswLOkTfPcVuFg=="; + }; + }; + "@percy/migrate-0.10.0" = { + name = "_at_percy_slash_migrate"; + packageName = "@percy/migrate"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@percy/migrate/-/migrate-0.10.0.tgz"; + sha512 = "3vOmOPmEeMlIZyCEDClZ2VER+4LH/Zp/YhvLkZeKH9RKxbktROF4Dnfs1u3m4YQ1gglerqK6VXFJfOjLJGyVuw=="; + }; + }; "@pm2/agent-2.0.0" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; @@ -5278,15 +5062,6 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; - "@pmmmwh/react-refresh-webpack-plugin-0.3.3" = { - name = "_at_pmmmwh_slash_react-refresh-webpack-plugin"; - packageName = "@pmmmwh/react-refresh-webpack-plugin"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.3.3.tgz"; - sha512 = "uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw=="; - }; - }; "@primer/octicons-14.1.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; @@ -5386,13 +5161,13 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@putdotio/api-client-8.16.0" = { + "@putdotio/api-client-8.17.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.16.0"; + version = "8.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.16.0.tgz"; - sha512 = "9a00sd5aArb5s1R8MBsHULP3gcRsD9ivokRUCtS3oBf8M53u9XUAx/D79sehhiWbMR20DYxwUFfSoEvM/daq3Q=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.17.0.tgz"; + sha512 = "iLLe3tgQd9W8ZMbfaMXIzoWj/wc5xg5cwys5WEV39RDRL5x7uP6YvELJ0QDNxQTX9S+bT6SzwJiBEmX8DADPHA=="; }; }; "@reach/router-1.3.4" = { @@ -5512,15 +5287,6 @@ let sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; }; }; - "@rollup/plugin-replace-2.4.2" = { - name = "_at_rollup_slash_plugin-replace"; - packageName = "@rollup/plugin-replace"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz"; - sha512 = "IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg=="; - }; - }; "@rollup/pluginutils-3.1.0" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -5557,13 +5323,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.1.2" = { + "@schematics/angular-12.2.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.1.2"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.2.tgz"; - sha512 = "nnFPp9uHLinP05r9TFsWT+fwlbwbLHg3yzJr+0aIOX1OsZQFV8hblEFEqdzFQJyx1uGMp4nvBHvCUlYv9GVQLg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.0.tgz"; + sha512 = "2NolT/PNKgjINIHvz6o4sYFj4D4ai7Usf+HspQCi9W30qtLV4Z6hRXoEhmDxrGSlF67vJdwUwDM3sP+6Tg8XEw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5593,13 +5359,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.14.0" = { + "@serverless/components-3.15.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.14.0"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.0.tgz"; - sha512 = "Ssuu+OcyWvisGIMZD4Lr9Uj20Ndgb9a8Z/Jw4VbhFS+grc89uK7vZR3pS9I4LTfTUKH4HUbMJXxDndNEFGgLAA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.15.0.tgz"; + sha512 = "oi5a1QjyAoH4CiSCNB+kIyvXMcs3tfLMGXM+pk7Ns1ra5ZWoD3PImRQKRUu/2BTSYqB6iUM3+HmMQGT1yORgBg=="; }; }; "@serverless/core-1.1.2" = { @@ -5629,22 +5395,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.5" = { + "@serverless/platform-client-4.2.6" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.5"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.5.tgz"; - sha512 = "PqQptakqHs6DHVY3fCqyMqdaFSKgehvUGrobWBUhcsmovnGY1Fzw9s3uqnqt2jmaCICNzPn/hPN+P+JbsG7itA=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.6.tgz"; + sha512 = "TVwlUvYnNjotd4010I9Vh0Dr0c2XByaUTEjpxLJm/Ti51Ka6vLIJ44JxuNZ6TmvkRh66yFZbaZUsVv6W4wNUVQ=="; }; }; - "@serverless/platform-client-china-2.2.0" = { + "@serverless/platform-client-china-2.2.2" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.2.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.0.tgz"; - sha512 = "cNEMjQ826PfZOYSY00eIOSFZEdmy4QU4L6wU9rzhpIhURRsoULnPE5tfYAs2yTYPBRSgV9o3eqLmh5+pOcVbLw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.2.tgz"; + sha512 = "58B0UOueZIZiR8btPgSav53Jvzz8ce0LMVp2bPnWUyu4oKrmlCSgO/vYCeklyCd4kBDGZQ3aefHNxLMusE/XRQ=="; }; }; "@serverless/template-1.1.4" = { @@ -5845,13 +5611,13 @@ let sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; - "@snyk/cloud-config-parser-1.9.3" = { + "@snyk/cloud-config-parser-1.10.1" = { name = "_at_snyk_slash_cloud-config-parser"; packageName = "@snyk/cloud-config-parser"; - version = "1.9.3"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.3.tgz"; - sha512 = "qv9NsIESPtyC2vKkqA7wEFePNuklksnQWJTWX8Cy3CQoCpZk80XwH50OVpDIU2szgnkWUm1XNSahG/IwVMSbOw=="; + url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.10.1.tgz"; + sha512 = "boqO3H4zkGo+Q2C7qyG2l/sQX80ZRSOlPCiRtgN9Xa7u9fM+qFGOaFOgNWfZZtU0wLBy2yDs5ipzdfqvp0ZEjg=="; }; }; "@snyk/cocoapods-lockfile-parser-3.6.2" = { @@ -5863,13 +5629,13 @@ let sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; }; }; - "@snyk/code-client-3.9.0" = { + "@snyk/code-client-4.0.0" = { name = "_at_snyk_slash_code-client"; packageName = "@snyk/code-client"; - version = "3.9.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.9.0.tgz"; - sha512 = "sscrpiODOlQI87B4OFIClnoZmHEHzJ7vULYhikS/R/2KavG4vGPw7Qe2to5rximxR3VFdWQ0wNVFB0RkU2mjPQ=="; + url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.0.0.tgz"; + sha512 = "x6ZsL6jBz6rDSg1cFVnaqg4fVvQEerRaATem7aeq7l+HiPb8VnorJbq/61MlTgO7gWnA1WijzmzfJK5kAUpO1A=="; }; }; "@snyk/composer-lockfile-parser-1.4.1" = { @@ -5890,13 +5656,13 @@ let sha512 = "ti5fPYivhBGCJ7rZGznMX2UJE1M5lR811WvVyBWTRJwLYVFYkhxRXKfgZUXEB0tq8vpo3V7tm3syrBd5TLPIMA=="; }; }; - "@snyk/docker-registry-v2-client-2.2.4" = { + "@snyk/docker-registry-v2-client-2.3.0" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.2.4.tgz"; - sha512 = "7JoxHCYAjJQBOEa11Sdb1scjtq/K4HVDlcE10pNFKbmcUn5Gcm/VDJ2RMEbG2oBdmHTTJMJ5RopIiNMSFd669w=="; + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.3.0.tgz"; + sha512 = "VYQe/1SuIdQ8C7bA6nzfcEeafsqG1cHaZDFaIt1uYGwI1TI0OWzUIvGRkfgkMkwFBVLRqS1hFczSoxGTT7OMfA=="; }; }; "@snyk/fast-glob-3.2.6-patch" = { @@ -5971,22 +5737,13 @@ let sha512 = "aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q=="; }; }; - "@snyk/java-call-graph-builder-1.21.0" = { + "@snyk/java-call-graph-builder-1.23.1" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.21.0"; + version = "1.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.21.0.tgz"; - sha512 = "i0c4N0+pYjpXEgqAkFniM3Q9YANvy+RtbbkQMPIvdEw41+XJISfEHzZ968ZmGWcoi480cgo5t9oxZEadFuHzyg=="; - }; - }; - "@snyk/java-call-graph-builder-1.23.0" = { - name = "_at_snyk_slash_java-call-graph-builder"; - packageName = "@snyk/java-call-graph-builder"; - version = "1.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.23.0.tgz"; - sha512 = "Go/UV33/R0SW10nvshrs/s8GjY2mnbJaRV4Xkj4zGrwpK80lL30th6LDpXDKEdXPZ66EbYGS1Q9gGlL7GzOdeA=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.23.1.tgz"; + sha512 = "mm6EI/BXFYq8boOHKs61j0R1n3JPsvwxlBsaO35cGFu9fTQaFRsBJdenKW41uJuLX+aFOC4zascbJDNfeE5THQ=="; }; }; "@snyk/mix-parser-1.3.2" = { @@ -6016,13 +5773,13 @@ let sha512 = "WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A=="; }; }; - "@snyk/snyk-docker-pull-3.6.3" = { + "@snyk/snyk-docker-pull-3.7.0" = { name = "_at_snyk_slash_snyk-docker-pull"; packageName = "@snyk/snyk-docker-pull"; - version = "3.6.3"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.6.3.tgz"; - sha512 = "SXhIAVfBVB/WoMgh3pTJNEKehpHygzqnnqHpg3ucw2rc5z0LqSAJQyYWl3jSAUnl5LgA11UuYD8zj0dsRbed2A=="; + url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.7.0.tgz"; + sha512 = "YRNysIPXmVPrP6+Gn8aG8T414r4GiSbxBP2R8CMXgBWFOdAPBoEoFjs7StjBfaVL1p0xl01AudgDnd42HDK9PA=="; }; }; "@snyk/snyk-hex-plugin-1.1.4" = { @@ -6151,15 +5908,6 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@surma/rollup-plugin-off-main-thread-1.4.2" = { - name = "_at_surma_slash_rollup-plugin-off-main-thread"; - packageName = "@surma/rollup-plugin-off-main-thread"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz"; - sha512 = "yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A=="; - }; - }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -6349,6 +6097,15 @@ let sha512 = "XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w=="; }; }; + "@tokenizer/token-0.3.0" = { + name = "_at_tokenizer_slash_token"; + packageName = "@tokenizer/token"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz"; + sha512 = "OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="; + }; + }; "@toml-tools/lexer-0.3.1" = { name = "_at_toml-tools_slash_lexer"; packageName = "@toml-tools/lexer"; @@ -6628,13 +6385,13 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/debug-4.1.6" = { + "@types/debug-4.1.7" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.6"; + version = "4.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.6.tgz"; - sha512 = "7fDOJFA/x8B+sO1901BmHlf5dE1cxBU8mRXj8QOEDnn16hhGJv/IHxJtZhvsabZsIMn0eLIyeOKAeqSNJJYTpA=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz"; + sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; }; }; "@types/decompress-4.2.4" = { @@ -6682,13 +6439,13 @@ let sha512 = "DIOOg+POSrYl+OlNRHQuIEqCd8DCtynG57H862UCce16nXJX7J8eWxNGgOcf8Eyge8zXeSs27mz1UcFu8L/L7g=="; }; }; - "@types/engine.io-3.1.6" = { + "@types/engine.io-3.1.7" = { name = "_at_types_slash_engine.io"; packageName = "@types/engine.io"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.6.tgz"; - sha512 = "uFIEJESFKNNiuKt93ri5PnvRntAHCm/Aw9tTO2L25xXJSLzC/ARGmpDSJkuTCit7sUW5xUxr91Ta+UOiYaO3+A=="; + url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.7.tgz"; + sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; }; }; "@types/eslint-7.28.0" = { @@ -6727,15 +6484,6 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.49" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.49"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.49.tgz"; - sha512 = "K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw=="; - }; - }; "@types/estree-0.0.50" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; @@ -6898,13 +6646,13 @@ let sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; }; }; - "@types/http-assert-1.5.1" = { + "@types/http-assert-1.5.2" = { name = "_at_types_slash_http-assert"; packageName = "@types/http-assert"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz"; - sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ=="; + url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.2.tgz"; + sha512 = "Ddzuzv/bB2prZnJKlS1sEYhaeT50wfJjhcTTTQLjEsEZJlk3XB4Xohieyq+P4VXIzg7lrQ1Spd/PfRnBpQsdqA=="; }; }; "@types/http-cache-semantics-4.0.1" = { @@ -7024,13 +6772,13 @@ let sha512 = "MhCUjojzDhVLnZnxwPwa+rETFRDQ0ffjxYdrqOP6TBO2O0/Z64PV5tNeYApo4bc4y4frbWOrRwv/eEkXlI13Rw=="; }; }; - "@types/json-schema-7.0.8" = { + "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.8"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz"; - sha512 = "YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; "@types/keygrip-1.0.2" = { @@ -7078,13 +6826,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.171" = { + "@types/lodash-4.14.172" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.171"; + version = "4.14.172"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz"; - sha512 = "7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz"; + sha512 = "/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw=="; }; }; "@types/lodash.chunk-4.2.6" = { @@ -7105,6 +6853,15 @@ let sha512 = "KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ=="; }; }; + "@types/lodash.pick-4.4.6" = { + name = "_at_types_slash_lodash.pick"; + packageName = "@types/lodash.pick"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash.pick/-/lodash.pick-4.4.6.tgz"; + sha512 = "u8bzA16qQ+8dY280z3aK7PoWb3fzX5ATJ0rJB6F+uqchOX2VYF02Aqa+8aYiHiHgPzQiITqCgeimlyKFy4OA6g=="; + }; + }; "@types/lodash.union-4.6.6" = { name = "_at_types_slash_lodash.union"; packageName = "@types/lodash.union"; @@ -7213,6 +6970,15 @@ let sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; }; }; + "@types/ms-0.7.31" = { + name = "_at_types_slash_ms"; + packageName = "@types/ms"; + version = "0.7.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz"; + sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; + }; + }; "@types/multer-1.4.4" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; @@ -7276,13 +7042,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.5" = { + "@types/node-14.17.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.5"; + version = "14.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.5.tgz"; - sha512 = "bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz"; + sha512 = "CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g=="; }; }; "@types/node-15.12.5" = { @@ -7294,13 +7060,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.2" = { + "@types/node-15.14.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.2"; + version = "15.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.2.tgz"; - sha512 = "dvMUE/m2LbXPwlvVuzCyslTEtQ2ZwuuFClDrOQ6mp2CenCg971719PTILZ4I6bTP27xfFFc+o7x2TkLuun/MPw=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.7.tgz"; + sha512 = "FA45p37/mLhpebgbPWWCKfOisTjxGK9lwcHlJ6XVLfu3NgfcazOJHdYUZCWPMK8QX4LhNZdmfo6iMz9FqpUbaw=="; }; }; "@types/node-15.6.1" = { @@ -7330,13 +7096,22 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.0" = { + "@types/node-16.4.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.0"; + version = "16.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz"; - sha512 = "HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz"; + sha512 = "bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg=="; + }; + }; + "@types/node-16.4.3" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.4.3.tgz"; + sha512 = "GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg=="; }; }; "@types/node-6.14.13" = { @@ -7366,13 +7141,13 @@ let sha512 = "/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ=="; }; }; - "@types/node-fetch-2.5.11" = { + "@types/node-fetch-2.5.12" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.5.11"; + version = "2.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.11.tgz"; - sha512 = "2upCKaqVZETDRb8A2VTaRymqFBEgH8u6yr96b/u3+1uQEPDRo3mJLEiPk7vdXBHRtjwkjqzFYMJXrt0Z9QsYjQ=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"; + sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; }; }; "@types/normalize-package-data-2.4.1" = { @@ -7483,6 +7258,15 @@ let sha512 = "vrZaV3Ij7j/l/3hz6OttZFtpRCu7zlq7XgkYHJP6FwVEAZkGQ095WqyJV08/GlW9eyXKVcp/xmtruHm8eHpw1g=="; }; }; + "@types/request-2.48.7" = { + name = "_at_types_slash_request"; + packageName = "@types/request"; + version = "2.48.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-2.48.7.tgz"; + sha512 = "GWP9AZW7foLd4YQxyFZDBepl0lPsWLMEXDZUjQ/c1gqVPDPECrRZyEzuhJdnPWioFCq3Tv0qoGpMD6U+ygd4ZA=="; + }; + }; "@types/request-promise-native-1.0.18" = { name = "_at_types_slash_request-promise-native"; packageName = "@types/request-promise-native"; @@ -7546,13 +7330,13 @@ let sha512 = "iZUcRrGuz/Tbg3loODpW7vrQJkUtpY2fFSf4ELqqkApcS2TkZ1msk7ie8iZPB86lDOP8QOTTmuvWjc5S0R9OjQ=="; }; }; - "@types/semver-7.3.7" = { + "@types/semver-7.3.8" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.3.7"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.3.7.tgz"; - sha512 = "4g1jrL98mdOIwSOUh6LTlB0Cs9I0dQPwINUhBg7C6pN4HLr8GS8xsksJxilW6S6dQHVi2K/o+lQuQcg7LroCnw=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz"; + sha512 = "D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now=="; }; }; "@types/serve-static-1.13.10" = { @@ -7726,13 +7510,13 @@ let sha512 = "1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg=="; }; }; - "@types/vscode-1.58.1" = { + "@types/vscode-1.59.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.58.1"; + version = "1.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.58.1.tgz"; - sha512 = "sa76rDXiSif09he8KoaWWUQxsuBr2+uND0xn1GUbEODkuEjp2p7Rqd3t5qlvklfmAedLFdL7MdnsPa57uzwcOw=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.59.0.tgz"; + sha512 = "Zg38rusx2nU6gy6QdF7v4iqgxNfxzlBlDhrRCjOiPQp+sfaNrp3f9J6OHIhpGNN1oOAca4+9Hq0+8u3jwzPMlQ=="; }; }; "@types/webpack-4.41.30" = { @@ -7744,13 +7528,13 @@ let sha512 = "GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA=="; }; }; - "@types/webpack-sources-2.1.1" = { + "@types/webpack-sources-3.2.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "2.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.1.tgz"; - sha512 = "MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha512 = "Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg=="; }; }; "@types/websocket-1.0.2" = { @@ -7852,13 +7636,22 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.4" = { + "@types/zen-observable-0.8.3" = { + name = "_at_types_slash_zen-observable"; + packageName = "@types/zen-observable"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.3.tgz"; + sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; + }; + }; + "@typescript-eslint/eslint-plugin-4.29.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.4"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; - sha512 = "s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz"; + sha512 = "AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7870,13 +7663,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.4" = { + "@typescript-eslint/experimental-utils-4.29.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.4"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; - sha512 = "OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz"; + sha512 = "kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7888,22 +7681,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.4" = { + "@typescript-eslint/parser-4.29.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.4"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.4.tgz"; - sha512 = "4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz"; + sha512 = "3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg=="; }; }; - "@typescript-eslint/scope-manager-4.28.4" = { + "@typescript-eslint/scope-manager-4.29.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.4"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; - sha512 = "ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz"; + sha512 = "Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7915,13 +7708,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.4" = { + "@typescript-eslint/types-4.29.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.4"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.4.tgz"; - sha512 = "3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz"; + sha512 = "Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7933,13 +7726,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.4" = { + "@typescript-eslint/typescript-estree-4.29.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.4"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; - sha512 = "z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz"; + sha512 = "lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7951,13 +7744,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.4" = { + "@typescript-eslint/visitor-keys-4.29.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.4"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; - sha512 = "NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz"; + sha512 = "zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8041,13 +7834,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.1.0" = { + "@unicode/unicode-13.0.0-1.2.0" = { name = "_at_unicode_slash_unicode-13.0.0"; packageName = "@unicode/unicode-13.0.0"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.1.0.tgz"; - sha512 = "iOVqHDBzYSb4EOLBirZM9qNur+J7hAb6YyzGlUoAFx2ubb3Qidc+VhAuRQAxnOOWEqMcIZpnVnJ/OkTxbNmgEA=="; + url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.2.0.tgz"; + sha512 = "ocuWbduBe3lNt/651RUs3eVbWLCQ7S40nxCCuErm0ynDZsraAzT9TGMea2qx9mUR59/un4a+SQSTHs1vB9QfPQ=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -8095,31 +7888,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.1.5" = { + "@vue/compiler-core-3.2.1" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.5.tgz"; - sha512 = "TXBhFinoBaXKDykJzY26UEuQU1K07FOp/0Ie+OXySqqk0bS0ZO7Xvl7UmiTUPYcLrWbxWBR7Bs/y55AI0MNc2Q=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.1.tgz"; + sha512 = "UEJf2ZGww5wGVdrWIXIZo04KdJFGPmI2bHRUsBZ3AdyCAqJ5ykRXKOBn1OR1hvA2YzimudOEyHM+DpbBv91Kww=="; }; }; - "@vue/compiler-dom-3.1.5" = { + "@vue/compiler-dom-3.2.1" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.5.tgz"; - sha512 = "ZsL3jqJ52OjGU/YiT/9XiuZAmWClKInZM2aFJh9gnsAPqOrj2JIELMbkIFpVKR/CrVO/f2VxfPiiQdQTr65jcQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.1.tgz"; + sha512 = "tXg8tkPb3j54zNfWqoao9T1JI41yWPz8TROzmif/QNNA46eq8/SRuRsBd36i47GWaz7mh+yg3vOJ87/YBjcMyQ=="; }; }; - "@vue/shared-3.1.5" = { + "@vue/shared-3.2.1" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.5.tgz"; - sha512 = "oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.1.tgz"; + sha512 = "INN92dVBNgd0TW9BqfQQKx/HWGCHhUUbAV5EZ5FgSCiEdwuZsJbGt1mdnaD9IxGhpiyOjP2ClxGG8SFp7ELcWg=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -8644,6 +8437,15 @@ let sha512 = "4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw=="; }; }; + "@wry/context-0.6.1" = { + name = "_at_wry_slash_context"; + packageName = "@wry/context"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@wry/context/-/context-0.6.1.tgz"; + sha512 = "LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw=="; + }; + }; "@wry/equality-0.1.11" = { name = "_at_wry_slash_equality"; packageName = "@wry/equality"; @@ -8653,6 +8455,24 @@ let sha512 = "mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA=="; }; }; + "@wry/equality-0.5.2" = { + name = "_at_wry_slash_equality"; + packageName = "@wry/equality"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@wry/equality/-/equality-0.5.2.tgz"; + sha512 = "oVMxbUXL48EV/C0/M7gLVsoK6qRHPS85x8zECofEZOVvxGmIPLA9o5Z27cc2PoAyZz1S2VoM2A7FLAnpfGlneA=="; + }; + }; + "@wry/trie-0.3.1" = { + name = "_at_wry_slash_trie"; + packageName = "@wry/trie"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@wry/trie/-/trie-0.3.1.tgz"; + sha512 = "WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw=="; + }; + }; "@xtuc/ieee754-1.2.0" = { name = "_at_xtuc_slash_ieee754"; packageName = "@xtuc/ieee754"; @@ -8689,31 +8509,31 @@ let sha512 = "FYjcPNTfDfMKLFafQPt49EY28jnYC82Z2S7oMwLPUh144BL8v8YXzb4aCnFyi5nFC5h2kcrJfZh7+Pm/qvCqGw=="; }; }; - "@yarnpkg/fslib-2.4.0" = { + "@yarnpkg/fslib-2.5.0" = { name = "_at_yarnpkg_slash_fslib"; packageName = "@yarnpkg/fslib"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.4.0.tgz"; - sha512 = "CwffYY9owtl3uImNOn1K4jl5iIb/L16a9UZ9Q3lkBARk6tlUsPrNFX00eoUlFcLn49TTfd3zdN6higloGCyncw=="; + url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.5.0.tgz"; + sha512 = "xkKmuW3HwQeWOPqOhBCbDjTGbgimP/VWN2bPpx4FnfgbVj1xjULyOtZR5h9p49jA7IIZsccG91+Ad9kLZ2A4DA=="; }; }; - "@yarnpkg/json-proxy-2.1.0" = { + "@yarnpkg/json-proxy-2.1.1" = { name = "_at_yarnpkg_slash_json-proxy"; packageName = "@yarnpkg/json-proxy"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/json-proxy/-/json-proxy-2.1.0.tgz"; - sha512 = "rOgCg2DkyviLgr80mUMTt9vzdf5RGOujQB26yPiXjlz4WNePLBshKlTNG9rKSoKQSOYEQcw6cUmosfOKDatrCw=="; + url = "https://registry.npmjs.org/@yarnpkg/json-proxy/-/json-proxy-2.1.1.tgz"; + sha512 = "meUiCAgCYpXTH1qJfqfz+dX013ohW9p2dKfwIzUYAFutH+lsz1eHPBIk72cuCV84adh9gX6j66ekBKH/bIhCQw=="; }; }; - "@yarnpkg/libzip-2.2.1" = { + "@yarnpkg/libzip-2.2.2" = { name = "_at_yarnpkg_slash_libzip"; packageName = "@yarnpkg/libzip"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.2.1.tgz"; - sha512 = "AYDJXrkzayoDd3ZlVgFJ+LyDX+Zj/cki3vxIpcYxejtgkl3aquVWOxlC0DD9WboBWsJFIP1MjrUbchLyh++/7A=="; + url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.2.2.tgz"; + sha512 = "M7ziz16f+tFFnJSCreLtemaGPpjT+NC0E21JQaWXAAlRmFIXz6zl2EZ+tXLxV9yJaplpNDbTgX1j5GPiwg5H5w=="; }; }; "@yarnpkg/lockfile-1.1.0" = { @@ -8725,13 +8545,13 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-2.3.0" = { + "@yarnpkg/parsers-2.4.0" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.3.0.tgz"; - sha512 = "qgz0QUgOvnhtF92kaluIhIIKBUHlYlHUBQxqh5v9+sxEQvUeF6G6PKiFlzo3E6O99XwvNEGpVu1xZPoSGyGscQ=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.4.0.tgz"; + sha512 = "XWgiNGh4MkhdBTJVEbXEqzk66JKjvxTtKGeLPqo3rnJ7JiJnRaK2n9MLTKQB0uoRMWYzPlISdIlok6H9OdlOVQ=="; }; }; "@yarnpkg/pnp-2.3.2" = { @@ -9031,6 +8851,15 @@ let sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; }; + "acorn-import-assertions-1.7.6" = { + name = "acorn-import-assertions"; + packageName = "acorn-import-assertions"; + version = "1.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz"; + sha512 = "FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA=="; + }; + }; "acorn-jsx-3.0.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; @@ -9157,13 +8986,13 @@ let sha512 = "LjwZql59OKrQgppreOvRcgJDYrnj9XKVW2gb5Q1ZyGG3CH46VCiiNHJB6nYMgOntLo+DPQwQQPOSknZ1zW+wTw=="; }; }; - "addr-to-ip-port-1.5.1" = { + "addr-to-ip-port-1.5.4" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; - version = "1.5.1"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.5.1.tgz"; - sha512 = "bA+dyydTNuQtrEDJ0g9eR7XabNhvrM5yZY0hvTbNK3yvoeC73ZqMES6E1cEqH9WPxs4uMtMsOjfwS4FmluhsAA=="; + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.5.4.tgz"; + sha512 = "ByxmJgv8vjmDcl3IDToxL2yrWFrRtFpZAToY0f46XFXl8zS081t7El5MXIodwm7RC6DhHBRoOSMLFSPKCtHukg=="; }; }; "address-1.1.2" = { @@ -9175,15 +9004,6 @@ let sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; }; }; - "adm-zip-0.4.16" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.16"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz"; - sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="; - }; - }; "adm-zip-0.5.5" = { name = "adm-zip"; packageName = "adm-zip"; @@ -9850,15 +9670,6 @@ let sha512 = "Ydgbey4zqUmmNN2i2OVeVHXig3PxHRbok2X6B2Sogmb92JzZUFfTL806dT7os6tBL1peXItfeFt76CP3zsoXUg=="; }; }; - "any-base-1.1.0" = { - name = "any-base"; - packageName = "any-base"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz"; - sha512 = "uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="; - }; - }; "any-observable-0.3.0" = { name = "any-observable"; packageName = "any-observable"; @@ -9958,6 +9769,15 @@ let sha512 = "y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA=="; }; }; + "apollo-datasource-3.0.3" = { + name = "apollo-datasource"; + packageName = "apollo-datasource"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.0.3.tgz"; + sha512 = "oboGz50DbGW6LNaNvB/bpJRypXvYFE1SRO5VxYSUnkz1P7TDcemWfJLRjNnfxCIMVyd0hmmwrmSaGKPQZvmT9Q=="; + }; + }; "apollo-graphql-0.9.3" = { name = "apollo-graphql"; packageName = "apollo-graphql"; @@ -9994,6 +9814,15 @@ let sha512 = "B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg=="; }; }; + "apollo-reporting-protobuf-3.0.0" = { + name = "apollo-reporting-protobuf"; + packageName = "apollo-reporting-protobuf"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.0.0.tgz"; + sha512 = "jmCD+6gECt8KS7PxP460hztT/5URTbv2Kg0zgnR6iWPGce88IBmSUjcqf1Z6wJJq7Teb8Hu7WbyyMhn0vN5TxQ=="; + }; + }; "apollo-server-caching-0.7.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; @@ -10003,6 +9832,15 @@ let sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; }; }; + "apollo-server-caching-3.0.1" = { + name = "apollo-server-caching"; + packageName = "apollo-server-caching"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-3.0.1.tgz"; + sha512 = "Cd0imFQlU6IKrkm+RNY0MQvKTMBTME+518EuwCaw3TKNUYDpir1vOuIdc4bALXDANilOR73k/UQs/oPxayXfrg=="; + }; + }; "apollo-server-core-2.25.2" = { name = "apollo-server-core"; packageName = "apollo-server-core"; @@ -10012,6 +9850,15 @@ let sha512 = "lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA=="; }; }; + "apollo-server-core-3.1.2" = { + name = "apollo-server-core"; + packageName = "apollo-server-core"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.1.2.tgz"; + sha512 = "bFmzPDGBT97vMzdhhjlycL9Ey4YDa0eCVaHjI5TcYQM8Vphzvndd033DvvQFVRPWoZr8uwupeUyVa82Ne/iM6A=="; + }; + }; "apollo-server-env-3.1.0" = { name = "apollo-server-env"; packageName = "apollo-server-env"; @@ -10021,6 +9868,15 @@ let sha512 = "iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ=="; }; }; + "apollo-server-env-4.0.3" = { + name = "apollo-server-env"; + packageName = "apollo-server-env"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.0.3.tgz"; + sha512 = "B32+RUOM4GUJAwnQqQE1mT1BG7+VfW3a0A87Bp3gv/q8iNnhY2BIWe74Qn03pX8n27g3EGVCt0kcBuHhjG5ltA=="; + }; + }; "apollo-server-errors-2.5.0" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; @@ -10030,6 +9886,15 @@ let sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; + "apollo-server-errors-3.0.1" = { + name = "apollo-server-errors"; + packageName = "apollo-server-errors"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.0.1.tgz"; + sha512 = "PSp64IFeN1YK5EYZ3V/8iDRESMMyE00h1vE5aCr83wHL3T0mN7VRiMKoOIZ+2rUtnn7CpK73o6QLmouhxPtXsQ=="; + }; + }; "apollo-server-express-2.25.2" = { name = "apollo-server-express"; packageName = "apollo-server-express"; @@ -10039,6 +9904,15 @@ let sha512 = "A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ=="; }; }; + "apollo-server-express-3.1.2" = { + name = "apollo-server-express"; + packageName = "apollo-server-express"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.1.2.tgz"; + sha512 = "GeeQlFjFqugiGfLApBNmgLtyDXGVqacLdGhBccn7GQaxzpJ9YSsREUsoN+Fze6RVQ4/Igaq3QoNgBhrahXwBBQ=="; + }; + }; "apollo-server-plugin-base-0.13.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; @@ -10048,6 +9922,15 @@ let sha512 = "L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg=="; }; }; + "apollo-server-plugin-base-3.1.1" = { + name = "apollo-server-plugin-base"; + packageName = "apollo-server-plugin-base"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.1.1.tgz"; + sha512 = "gkV/UtMji6SrX8CdZ5/3IlRBVE57CM+DL6x9MA3pjNEc357OOC3dnh1SXNmp0cvqn66CB1kODGrqKGRxyl/qpA=="; + }; + }; "apollo-server-types-0.9.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; @@ -10057,6 +9940,15 @@ let sha512 = "qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg=="; }; }; + "apollo-server-types-3.1.1" = { + name = "apollo-server-types"; + packageName = "apollo-server-types"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.1.1.tgz"; + sha512 = "dTNlRxqdo+wnrcOFpFfzehdmcYHl6MQKuLnCCRzAHuVR5yOiuhQ5CIGhIjvMx2bP9ZoyON1SvXOIDTyTaU9gaQ=="; + }; + }; "apollo-tracing-0.15.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; @@ -10642,6 +10534,15 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; + "array-union-3.0.1" = { + name = "array-union"; + packageName = "array-union"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz"; + sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="; + }; + }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -11056,6 +10957,15 @@ let sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; + "async-3.2.1" = { + name = "async"; + packageName = "async"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-3.2.1.tgz"; + sha512 = "XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="; + }; + }; "async-append-only-log-3.0.9" = { name = "async-append-only-log"; packageName = "async-append-only-log"; @@ -11380,13 +11290,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.951.0" = { + "aws-sdk-2.965.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.951.0"; + version = "2.965.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.951.0.tgz"; - sha512 = "YPqhdESUzd4+pSuGJcfMnG1qNVbmZjnmsa85Z9jofR1ilIpuV31onIiFHv8iubM59ETok/+zy3QOmxRSLYzFmQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.965.0.tgz"; + sha512 = "jifeFsA6IEKXM65WI5gvBNSCXKw4n64Wf9Q7/8E7wZ5vzRbBGoHzGpyhK6ZBBRvE2YvNp/ykTWChO7RydkA+AQ=="; }; }; "aws-sign2-0.6.0" = { @@ -11497,15 +11407,6 @@ let sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA=="; }; }; - "babel-eslint-10.1.0" = { - name = "babel-eslint"; - packageName = "babel-eslint"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="; - }; - }; "babel-helper-evaluate-path-0.5.0" = { name = "babel-helper-evaluate-path"; packageName = "babel-helper-evaluate-path"; @@ -11740,13 +11641,13 @@ let sha512 = "kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ=="; }; }; - "babel-plugin-polyfill-corejs3-0.2.3" = { + "babel-plugin-polyfill-corejs3-0.2.4" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz"; - sha512 = "rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz"; + sha512 = "z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ=="; }; }; "babel-plugin-polyfill-regenerator-0.2.2" = { @@ -12424,13 +12325,13 @@ let sha512 = "N+VOSP5MkoX+xgnp6Y056iCY5TmCZg9rgPNPQe0bIiXchxYFP4vs/Tf0dTdQ+qQhP7HM2gvfFq+sUVjQsGy5Zw=="; }; }; - "bencode-2.0.1" = { + "bencode-2.0.2" = { name = "bencode"; packageName = "bencode"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-2.0.1.tgz"; - sha512 = "2uhEl8FdjSBUyb69qDTgOEeeqDTa+n3yMQzLW0cOzNf1Ow5bwcg3idf+qsWisIKRH8Bk8oC7UXL8irRcPA8ZEQ=="; + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.2.tgz"; + sha512 = "0ilVjnE2diLdbec/3KN14SP0KE85wh8v/FceNRMbAB2ioc3yTj9tgqdoK9tFEH++TZ10JreTS29qTwg7+SpTiQ=="; }; }; "bent-7.3.12" = { @@ -12442,13 +12343,13 @@ let sha512 = "T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w=="; }; }; - "bep53-range-1.1.0" = { + "bep53-range-1.1.1" = { name = "bep53-range"; packageName = "bep53-range"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.1.0.tgz"; - sha512 = "yGQTG4NtwTciX0Bkgk1FqQL4p+NiCQKpTSFho2lrxvUkXIlzyJDwraj8aYxAxRZMnnOhRr7QlIBoMRPEnIR34Q=="; + url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.1.1.tgz"; + sha512 = "ct6s33iiwRCUPp9KXnJ4QMWDgHIgaw36caK/5XEQ9L8dCzSQlJt1Vk6VmHh1VD4AlGCAI4C2zmtfItifBBPrhQ=="; }; }; "bessel-1.0.2" = { @@ -12577,15 +12478,6 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; - "bignumber.js-4.1.0" = { - name = "bignumber.js"; - packageName = "bignumber.js"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz"; - sha512 = "eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA=="; - }; - }; "bignumber.js-9.0.0" = { name = "bignumber.js"; packageName = "bignumber.js"; @@ -12622,22 +12514,22 @@ let sha512 = "wFzVTqavpgCCYAh8SVBdnZdiQMxTkGR+T3b14CNpBXIBe2neJWaMGAZ55XWWHELJJ89dscuq0VCBqcVaIOgCMg=="; }; }; - "bin-version-2.0.0" = { + "bin-version-3.1.0" = { name = "bin-version"; packageName = "bin-version"; - version = "2.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bin-version/-/bin-version-2.0.0.tgz"; - sha1 = "2cc95d83b522bdef2e99978e76aeb5491c8114ff"; + url = "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz"; + sha512 = "Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ=="; }; }; - "bin-version-check-3.0.0" = { + "bin-version-check-4.0.0" = { name = "bin-version-check"; packageName = "bin-version-check"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-3.0.0.tgz"; - sha1 = "e24ebfa6b63cb0387c5fc174f86e5cc812ca7cc9"; + url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz"; + sha512 = "sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ=="; }; }; "binary-0.3.0" = { @@ -12694,13 +12586,13 @@ let sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; }; }; - "binaryextensions-4.15.0" = { + "binaryextensions-4.18.0" = { name = "binaryextensions"; packageName = "binaryextensions"; - version = "4.15.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.15.0.tgz"; - sha512 = "MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw=="; + url = "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.18.0.tgz"; + sha512 = "PQu3Kyv9dM4FnwB7XGj1+HucW+ShvJzJqjuw1JkKVs1mWdwOKVcRjOi+pV9X52A0tNvrPCsPkbFFQb+wE1EAXw=="; }; }; "bindings-1.2.1" = { @@ -12811,15 +12703,6 @@ let sha512 = "CYS3HRGgIlm7A6/zqGFd/KPSUIv4EoEQVQ8mWcvBEdlf0db1q3j/fj5W/PXJasBfsvN2jM0Tzw3w1C7HUoR/fg=="; }; }; - "bitcoin-core-2.3.0" = { - name = "bitcoin-core"; - packageName = "bitcoin-core"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bitcoin-core/-/bitcoin-core-2.3.0.tgz"; - sha512 = "SMbw2kFu09iBajicODSE4pn/K0tOibWyqct71TlzR8cYUBk+u7rkhqGY7US2iYz0HmP851IW7F7eXfXvz09yXA=="; - }; - }; "bitcoin-ops-1.4.1" = { name = "bitcoin-ops"; packageName = "bitcoin-ops"; @@ -12865,13 +12748,13 @@ let sha512 = "wrDhHe7LUkqaytxgbsFXoemzHRv6e8FrVNWWsQCgUfmuVYW6ke44hoGc9VdpjgfIsJ/ejmCFA8wDtDqACNAvyw=="; }; }; - "bittorrent-dht-10.0.1" = { + "bittorrent-dht-10.0.2" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "10.0.1"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.1.tgz"; - sha512 = "aR0vAgm+SgLiwTCEtNgeuqtT2deg+E/xHCTb7iryikvLbqbR58oFHbNYX4CM6EzyNGSKfcdBKp1gWI5Gcn2Aaw=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.2.tgz"; + sha512 = "V7+V6ZCfxHtn/wvaRuUvxucJhocb8StgKurQJUdHboVjNGWjALVG+VAYuZqz5iN+/j4vmd4GwqjR1ixYCMkyVA=="; }; }; "bittorrent-dht-6.4.2" = { @@ -12892,31 +12775,31 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; - "bittorrent-lsd-1.1.0" = { + "bittorrent-lsd-1.1.1" = { name = "bittorrent-lsd"; packageName = "bittorrent-lsd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.1.0.tgz"; - sha512 = "j9F+bDt1R//+kLfeSgkmc1A3x0u70gjb/FXaRgTtw+V3wIeYjOekiIlmsXf1SNKuxU5YHDkNL8CFNHx+MfSPSw=="; + url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.1.1.tgz"; + sha512 = "dWxU2Mr2lU6jzIKgZrTsXgeXDCIcYpR1b6f2n89fn7juwPAYbNU04OgWjcQPLiNliY0filsX5CQAWntVErpk+Q=="; }; }; - "bittorrent-peerid-1.3.3" = { + "bittorrent-peerid-1.3.4" = { name = "bittorrent-peerid"; packageName = "bittorrent-peerid"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.3.tgz"; - sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w=="; + url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.4.tgz"; + sha512 = "Xzk1FJFHmsc9H8IKFtDUkfAZIT1HW8r6UqajfZBBxWmpA1v7FsPO8xPFtnFzCqcXlPN3yi8dDmlqZCemyB7P8w=="; }; }; - "bittorrent-protocol-3.4.2" = { + "bittorrent-protocol-3.4.3" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.4.2.tgz"; - sha512 = "a7ueJzmCImWIXfKrJ+dT6mgqi5+LFByAXoMXhV/cYt/y8kplaC8N9ZWfpiTidJY4H2o1GTsyMy73o62a/rZ0Ow=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.4.3.tgz"; + sha512 = "FNQMWrVptQlOxT5+s4M8QO6yWv67WwquUwpg+0dMcPj2UjwGt+XP3U/jVPg16PxxOBz0N371L+Qe7H2LdALC9Q=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -12928,13 +12811,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.17.3" = { + "bittorrent-tracker-9.17.4" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.17.3"; + version = "9.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.17.3.tgz"; - sha512 = "Z37yunPPT8pIEkB0Q0bDP1fMke2Rez7JSsmqwqGKoJWh4zjAtFgrEw2GHYNllRRvcy+fkfVPWt7ArvxsGoUmfA=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.17.4.tgz"; + sha512 = "ykhdVQHtLfn4DYSJUQD/zFAbP8YwnF6nGlj2SBnCY4xkW5bhwXPeFZUhryAtdITl0qNL/FpmFOamBZfxIwkbxg=="; }; }; "bl-1.2.3" = { @@ -13027,13 +12910,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.10.0" = { + "blessed-contrib-4.10.1" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.10.0"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.10.0.tgz"; - sha512 = "NbMkaBNPNZikQo5XBKsXTGIu/gxAywRANHPt2Zc4oFmtiXGHgAGgl6Q6mg6sr9SvG08zidPxokRDcgso+HGmzw=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.10.1.tgz"; + sha512 = "S3jE7riCbWnAK8OT+ta4Z8RX/X6nfISxzn0SDIMFYuY90qUwqx7w7e9fIsc2m2ODwma7dFcXNwGSjyayfKd1DQ=="; }; }; "blgr-0.1.8" = { @@ -13162,15 +13045,6 @@ let sha512 = "vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="; }; }; - "bmp-js-0.1.0" = { - name = "bmp-js"; - packageName = "bmp-js"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz"; - sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233"; - }; - }; "bmutex-0.1.6" = { name = "bmutex"; packageName = "bmutex"; @@ -13360,13 +13234,13 @@ let sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; }; - "bootstrap-5.0.0-beta3" = { + "bootstrap-5.0.2" = { name = "bootstrap"; packageName = "bootstrap"; - version = "5.0.0-beta3"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta3.tgz"; - sha512 = "0urccjfIOzhrb9qJysN8XW/DRw6rg3zH7qLeKIp4Zyl8+Ens4JWB0NC0cB5AhnSFPd2tftRggjwCMxablo6Tpg=="; + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.2.tgz"; + sha512 = "1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q=="; }; }; "bootstrap-vue-helper-json-1.1.1" = { @@ -13468,15 +13342,6 @@ let sha512 = "cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A=="; }; }; - "boxen-4.1.0" = { - name = "boxen"; - packageName = "boxen"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-4.1.0.tgz"; - sha512 = "Iwq1qOkmEsl0EVABa864Bbj3HCL4186DRZgFW/NrFs5y5GMM3ljsxzMLgOHdWISDRvcM8beh8q4tTNzXz+mSKg=="; - }; - }; "boxen-4.2.0" = { name = "boxen"; packageName = "boxen"; @@ -13801,13 +13666,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.16.6" = { + "browserslist-4.16.7" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.6"; + version = "4.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz"; - sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz"; + sha512 = "7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA=="; }; }; "brq-0.1.8" = { @@ -13882,6 +13747,16 @@ let sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w=="; }; }; + "btc-rpc-client-git://github.com/btc21/btc-rpc-client" = { + name = "bitcoin-core"; + packageName = "bitcoin-core"; + version = "3.0.0"; + src = fetchgit { + url = "git://github.com/btc21/btc-rpc-client"; + rev = "8ed164d9ea4964d5c059084f48818b1a14bf86c9"; + sha256 = "963ea67486cf531755c04d655bcff31d24f64682debd05a6c0ef469fd1e09bbb"; + }; + }; "btcp-0.1.5" = { name = "btcp"; packageName = "btcp"; @@ -14089,13 +13964,13 @@ let sha512 = "RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="; }; }; - "buffer-from-1.1.1" = { + "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; "buffer-indexof-1.1.1" = { @@ -14800,13 +14675,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001246" = { + "caniuse-lite-1.0.30001249" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001246"; + version = "1.0.30001249"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz"; - sha512 = "Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz"; + sha512 = "vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw=="; }; }; "canvas-2.8.0" = { @@ -14953,6 +14828,15 @@ let sha512 = "rgt2RFogHGDLFU5r0kSfyeBc+de55DwYHP73KxKsQxsR5b0CYuQPH6AnJaXByiohpLdjQqj/K0SFcOV+dXdhSA=="; }; }; + "cbor-8.0.0" = { + name = "cbor"; + packageName = "cbor"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cbor/-/cbor-8.0.0.tgz"; + sha512 = "nMmaLWbj7+bC6MsApKRIig8h+yjgNLhPLXaCelq5+C7mpWsHgIcseZSdvgexSY5uE1Q3m2uPvIDZwSdxdo7qig=="; + }; + }; "ccount-1.1.0" = { name = "ccount"; packageName = "ccount"; @@ -14962,31 +14846,31 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.24" = { + "cdk8s-1.0.0-beta.27" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.24"; + version = "1.0.0-beta.27"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.24.tgz"; - sha512 = "1aezBDPxwYvVd0/k5ts2UsgB6/NrvRNUksbZxbzZK1+thHl2iOLNYjnFMEOb64m6z3LrR0QMmAE4SLrXzbyMcQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.27.tgz"; + sha512 = "6WGhwIQ0zRrJfGDIxfpqwCsj6Varuds90xp3dEwym68ZLfROn/sq8Kdwr8QlMWf50qbcja+TLdqKgAt185a/ig=="; }; }; - "cdk8s-plus-17-1.0.0-beta.30" = { + "cdk8s-plus-17-1.0.0-beta.42" = { name = "cdk8s-plus-17"; packageName = "cdk8s-plus-17"; - version = "1.0.0-beta.30"; + version = "1.0.0-beta.42"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.30.tgz"; - sha512 = "e2xfSVsbwUPz+Zv5UycVKRgIcoca7ND00ov57iIsxRkc0yJ7rbILTxtrFoJ0fkEccgDVCDSoC6KfKkKh9Xzhqw=="; + url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.42.tgz"; + sha512 = "GIe4xGLtd9zF7OPag8g4NVb7bsw/x/UcVH2w1WSTuXPe3ZFPNJ+zUAeEhuOL4BB90Czg0QIMDvIo7Vw00y3MmQ=="; }; }; - "cdktf-0.4.1" = { + "cdktf-0.5.0" = { name = "cdktf"; packageName = "cdktf"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.4.1.tgz"; - sha512 = "U5aap+QH+w/0ibeFRYm8T/JtaA8AkjCkQ6c60eL/5hY0K0qi8rjEBpQcEho9KljqZvWap6mD2yD+JqunbLzRGA=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.5.0.tgz"; + sha512 = "V/3JOJLvD01vGy8Tvft7jH0NY3R7biKWqJ/BjGCx7+J9KAz6k9aFvtIpRhgcvXMo98B+lmdnMwSgfW2jXhnauQ=="; }; }; "center-align-0.1.3" = { @@ -15133,6 +15017,15 @@ let sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; }; }; + "chalk-4.1.2" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -15241,6 +15134,15 @@ let sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; }; }; + "chart.js-3.5.0" = { + name = "chart.js"; + packageName = "chart.js"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chart.js/-/chart.js-3.5.0.tgz"; + sha512 = "J1a4EAb1Gi/KbhwDRmoovHTRuqT8qdF0kZ4XgwxpGethJHUdDrkqyPYwke0a+BuvSeUxPf8Cos6AX2AB8H8GLA=="; + }; + }; "chartjs-color-2.4.1" = { name = "chartjs-color"; packageName = "chartjs-color"; @@ -15727,13 +15629,13 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; - "clean-css-5.1.3" = { + "clean-css-5.1.5" = { name = "clean-css"; packageName = "clean-css"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.3.tgz"; - sha512 = "qGXzUCDpLwAlPx0kYeU4QXjzQIcIYZbJjD4FNm7NnSjoP0hYMVZhHOpUYJ6AwfkMX2cceLRq54MeCgHy/va1cA=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.5.tgz"; + sha512 = "9dr/cU/LjMpU57PXlSvDkVRh0rPxJBXiBtD0+SgYt8ahTCsXtfKjCkNYgIoTC6mBg8CFr5EKhW3DKCaGMUbUfQ=="; }; }; "clean-deep-3.4.0" = { @@ -16456,13 +16358,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.31.0" = { + "codemaker-1.32.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.31.0.tgz"; - sha512 = "gyWhtZ4YU5b+pIijCfOZkGrH0DCkUQXyRG3BQtDlnwFJuXyJnDoz+dpM5ErkJuDD9w6Qns4aryyG/bU78huaSg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.32.0.tgz"; + sha512 = "RYHzKPI83NJi0u7KjUVeAm4rmMwIPjLsFjcSv8sIZizNiVFwWNxON99YhtFvbg0YMbdMnjpkx0W/VADNuwETGA=="; }; }; "codepage-1.4.0" = { @@ -16618,6 +16520,15 @@ let sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; }; }; + "colorette-1.3.0" = { + name = "colorette"; + packageName = "colorette"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz"; + sha512 = "ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="; + }; + }; "colornames-1.1.1" = { name = "colornames"; packageName = "colornames"; @@ -16969,6 +16880,15 @@ let sha512 = "Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ=="; }; }; + "commander-8.1.0" = { + name = "commander"; + packageName = "commander"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-8.1.0.tgz"; + sha512 = "mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -17248,13 +17168,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-10.0.1" = { + "conf-10.0.2" = { name = "conf"; packageName = "conf"; - version = "10.0.1"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-10.0.1.tgz"; - sha512 = "QClEoNcruwBL84QgMEPHibL3ERxWIrRKhbjJKG1VsFBadm5QpS0jsu4QjY/maxUvhyAKXeyrs+ws+lC6PajnEg=="; + url = "https://registry.npmjs.org/conf/-/conf-10.0.2.tgz"; + sha512 = "iyy4ArqyQ/yrzNASNBN+jaylu53JRuq0ztvL6KAWYHj4iN56BVuhy2SrzEEHBodNbacZr2Pd/4nWhoAwc66T1g=="; }; }; "conf-6.2.4" = { @@ -17491,13 +17411,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.99" = { + "constructs-3.3.119" = { name = "constructs"; packageName = "constructs"; - version = "3.3.99"; + version = "3.3.119"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.99.tgz"; - sha512 = "uX3bZtp6Zn53Utyurp4DrKolIDUuiDddHVTgsQ39KhVRkQ8TRMtl0nyXllysMtu78t8zLo9QygeyQ0QOBy3LHw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.119.tgz"; + sha512 = "eGzrRRPSFPAoe1x85p4+3u5cUbw/sYrvMYmlAl+SObQ43mSCk09qEnzg23oBDE9vBNrR/P1Pp/MHqQsx6JlEfw=="; }; }; "consume-http-header-1.0.0" = { @@ -17573,13 +17493,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.30.0" = { + "contentful-management-7.31.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.30.0"; + version = "7.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.30.0.tgz"; - sha512 = "2aAIqLrxxCJt2bWg1LN+wxjYaevAHTsfZGkIPA5QRKK11WhpffrUMkTthbED6UWaY58BAM0TYXT3Z0s7nFu5zg=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.31.0.tgz"; + sha512 = "YhPikvkO/ckRTO400I+iHYpVLuHwPyMzTQcMwBWpUluXYCF45I/RpWw7cyNQciQ19Q0NpjgEfUTQnhFhIqHtwA=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -18005,31 +17925,31 @@ let sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; }; }; - "core-js-3.15.2" = { + "core-js-3.16.1" = { name = "core-js"; packageName = "core-js"; - version = "3.15.2"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz"; - sha512 = "tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.16.1.tgz"; + sha512 = "AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw=="; }; }; - "core-js-compat-3.15.2" = { + "core-js-compat-3.16.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.15.2"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.2.tgz"; - sha512 = "Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz"; + sha512 = "NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ=="; }; }; - "core-js-pure-3.15.2" = { + "core-js-pure-3.16.1" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.15.2"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.2.tgz"; - sha512 = "D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.1.tgz"; + sha512 = "TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg=="; }; }; "core-util-is-1.0.2" = { @@ -18266,13 +18186,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.10.0" = { + "create-gatsby-1.11.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.10.0.tgz"; - sha512 = "EiN8bJepWMN4itheoQ9ul1jNrSWoWy5Cw+kAfF1sN0J7ZWtuYCFfRZX97VRTt6C7bvlHkTw7gew2pUbFS8La+Q=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.11.0.tgz"; + sha512 = "3FM3YJI5OExHIUUiJSASBibwzo7oBKtQYxHB0YeLC/7U7rkSJWjSbJ+cJllC+NeCGoDIzZ21QTkhczzzz7j1FQ=="; }; }; "create-graphback-1.0.1" = { @@ -18311,13 +18231,13 @@ let sha512 = "dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw=="; }; }; - "create-torrent-4.7.0" = { + "create-torrent-5.0.1" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.7.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.7.0.tgz"; - sha512 = "Pb3XjZNKdCs0Nk46yFKb82y+a3xRQeMvGi1AlJfIV40y/iwkgBqzS5EfqdnakEOvh2jzTOx3v8QxZpkz4hPzyw=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.1.tgz"; + sha512 = "fVvg1YYSogo3TlU1WFeTt937nhGQlf5KtB6M2HyDa/U02dbeMBE2AY9PcPlMufXNQoM/UCO28y26EmuApM7ZmA=="; }; }; "cron-1.8.2" = { @@ -18482,13 +18402,13 @@ let sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; - "crypto-js-4.0.0" = { + "crypto-js-4.1.1" = { name = "crypto-js"; packageName = "crypto-js"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz"; - sha512 = "bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="; + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; + sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; }; }; "crypto-random-string-1.0.0" = { @@ -19742,6 +19662,15 @@ let sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; }; + "date-fns-2.23.0" = { + name = "date-fns"; + packageName = "date-fns"; + version = "2.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz"; + sha512 = "5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA=="; + }; + }; "date-format-2.1.0" = { name = "date-format"; packageName = "date-format"; @@ -19832,13 +19761,13 @@ let sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; }; }; - "deasync-0.1.21" = { + "deasync-0.1.22" = { name = "deasync"; packageName = "deasync"; - version = "0.1.21"; + version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.21.tgz"; - sha512 = "kUmM8Y+PZpMpQ+B4AuOW9k2Pfx/mSupJtxOsLzmnHY2WqZUYRFccFn2RhzPAqt3Xb+sorK/badW2D4zNzqZz5w=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.22.tgz"; + sha512 = "o21R8Vhv3wX0E19jpATUJIAinQ1I2rHIlAnzRRsMynWlIrvU0HbCwjpquPIYR544Tvg9z/L+NZQev5cjVD1/nQ=="; }; }; "death-1.1.0" = { @@ -20021,13 +19950,13 @@ let sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; }; }; - "debugnyan-1.0.0" = { + "debugnyan-2.0.2" = { name = "debugnyan"; packageName = "debugnyan"; - version = "1.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/debugnyan/-/debugnyan-1.0.0.tgz"; - sha1 = "90386d5ebc2c63588f17f272be5c2a93b7665d83"; + url = "https://registry.npmjs.org/debugnyan/-/debugnyan-2.0.2.tgz"; + sha512 = "g4yO/Qc/bdu8JYCgC0L6RUTgGyQCH8fGJkDDicvd6G3k95glh96x9sIusgIdyjFRpWTH7xbnjhObOjYjJgRGQw=="; }; }; "decache-4.4.0" = { @@ -20327,15 +20256,6 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; - "deep-scope-analyser-1.7.0" = { - name = "deep-scope-analyser"; - packageName = "deep-scope-analyser"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-scope-analyser/-/deep-scope-analyser-1.7.0.tgz"; - sha512 = "rl5Dmt2IZkFpZo6XbEY1zG8st2Wpq8Pi/dV2gz8ZF6BDYt3fnor2JNxHwdO1WLo0k6JbmYp0x8MNy8kE4l1NtA=="; - }; - }; "deepcopy-2.1.0" = { name = "deepcopy"; packageName = "deepcopy"; @@ -20543,6 +20463,15 @@ let sha512 = "aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg=="; }; }; + "degenerator-3.0.1" = { + name = "degenerator"; + packageName = "degenerator"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz"; + sha512 = "LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ=="; + }; + }; "del-4.1.1" = { name = "del"; packageName = "del"; @@ -20957,13 +20886,13 @@ let sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA=="; }; }; - "devtools-protocol-0.0.883894" = { + "devtools-protocol-0.0.901419" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.883894"; + version = "0.0.901419"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.883894.tgz"; - sha512 = "33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; + sha512 = "4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ=="; }; }; "dezalgo-1.0.3" = { @@ -21092,13 +21021,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.7" = { + "diff2html-3.4.9" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.7"; + version = "3.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.7.tgz"; - sha512 = "QbQMz1qKFxQqqWvpDAxzD37iZb7i9ixVoBjHh7y5PLg1EagYgbrM4Fley4u5YM6i2elNrJNnKjNzyNtGBx3xjw=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.9.tgz"; + sha512 = "33x45h6Xgfasjt49e0ldfLnUdCjLjHIdablpAlrKnQyyG1RA7w+4cbp9+bUfNLxfFj584BookXqh5KJEt4+MLA=="; }; }; "diff3-0.0.3" = { @@ -21380,24 +21309,6 @@ let sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; }; }; - "dockerfile-ast-0.1.0" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.1.0.tgz"; - sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ=="; - }; - }; - "dockerfile-ast-0.2.0" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.2.0.tgz"; - sha512 = "iQyp12k1A4tF3sEfLAq2wfFPKdpoiGTJeuiu2Y1bdEqIZu0DfSSL2zm0fk7a/UHeQkngnYaRRGuON+C+2LO1Fw=="; - }; - }; "dockerfile-ast-0.2.1" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -21407,31 +21318,31 @@ let sha512 = "ut04CVM1G6zIITTcYPDIXhPZk9mCa21m4dfW8FcDDGxwgTQhYyHDu6U7M8klZ7QsjqVcJhryKi+TGOX6bjgKdQ=="; }; }; - "dockerfile-language-service-0.3.0" = { - name = "dockerfile-language-service"; - packageName = "dockerfile-language-service"; + "dockerfile-ast-0.3.0" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.3.0.tgz"; - sha512 = "BUStimzz1Ozh41o+2AgMfwW8M7KsqzOBllNlLkf7NDe6W9KvcC3d8j4MTc+cU9wfRUoVckK39M2btvRFFDK61w=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.3.0.tgz"; + sha512 = "wEbFtqeHZffyOYP2pMfMLQ0m2wdHUzty0UTDoAMNa6/nvLfDRSEaPkszIWFy86tuWwHucBtcczIHQlFATJ54eA=="; }; }; - "dockerfile-utils-0.2.0" = { - name = "dockerfile-utils"; - packageName = "dockerfile-utils"; - version = "0.2.0"; + "dockerfile-language-service-0.4.0" = { + name = "dockerfile-language-service"; + packageName = "dockerfile-language-service"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.2.0.tgz"; - sha512 = "B8tEGwLd3w0dWALshXS0gkAwDYdqFKAKm9zIyp/nCFkx8+BOhbz5CiAFlVU+WRvv6kd6AP/YtYVOzSL54MJlmQ=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.4.0.tgz"; + sha512 = "P4yj9in7PMLeN3StBn5e+Ofiju+nfs5ZdDv4EqfK91mYx/+U7wm8QipyP05iUXaVKFh6I9tn9Qmi1tpt5jj2hw=="; }; }; - "dockerfile-utils-0.4.2" = { + "dockerfile-utils-0.5.0" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.4.2.tgz"; - sha512 = "WfJEuXWdVdiarhxJgRlZ9bkMO/9un6dZDz+u3z6AYEXfsH2XRwYqdIvyOqFzaDDP0Hc6pR5rb9FJRSKyo+NuxA=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.5.0.tgz"; + sha512 = "a12B6qAwLpl7D9Y6Zxt0AhW74g0k5NarpWF+NUb66A6la5vs1igI/KfdXZbFoQtpTOsv1T+OfKmhlE982Ars1w=="; }; }; "doctrine-2.1.0" = { @@ -21803,13 +21714,13 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "dotnet-deps-parser-5.0.0" = { + "dotnet-deps-parser-5.1.0" = { name = "dotnet-deps-parser"; packageName = "dotnet-deps-parser"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-5.0.0.tgz"; - sha512 = "1l9K4UnQQHSfKgeHeLrxnB53AidCZqPyf9dkRL4/fZl8//NPiiDD43zHtgylw8DHlO7gvM8+O5a0UPHesNYZKw=="; + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-5.1.0.tgz"; + sha512 = "/VVFME8IwiYJMC7amuVzHf+CZHiXxYjEjgKpRvvY3lKYFirdqacLwqLlrBl1dYYcUEwmHb/90cssTKInc9pvYg=="; }; }; "downgrade-root-1.2.2" = { @@ -22055,15 +21966,6 @@ let sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; - "ecstatic-3.3.2" = { - name = "ecstatic"; - packageName = "ecstatic"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz"; - sha512 = "fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog=="; - }; - }; "ecstatic-4.1.4" = { name = "ecstatic"; packageName = "ecstatic"; @@ -22145,13 +22047,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-notarize-1.0.0" = { + "electron-notarize-1.1.0" = { name = "electron-notarize"; packageName = "electron-notarize"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.0.tgz"; - sha512 = "dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og=="; + url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.0.tgz"; + sha512 = "Dmp/jm2y3PTcjmjVe+jCT0sjsbBfbNuk7GOPtduZce2iae1hgAPnlNErk6x70TalsGIL5Ip3liSryqde/6eB5w=="; }; }; "electron-osx-sign-0.5.0" = { @@ -22181,13 +22083,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.782" = { + "electron-to-chromium-1.3.802" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.782"; + version = "1.3.802"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz"; - sha512 = "6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz"; + sha512 = "dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22705,15 +22607,6 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; - "entity-decode-2.0.2" = { - name = "entity-decode"; - packageName = "entity-decode"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/entity-decode/-/entity-decode-2.0.2.tgz"; - sha512 = "5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg=="; - }; - }; "env-editor-0.4.2" = { name = "env-editor"; packageName = "env-editor"; @@ -22867,13 +22760,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.18.3" = { + "es-abstract-1.18.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.3"; + version = "1.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz"; - sha512 = "nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz"; + sha512 = "DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA=="; }; }; "es-get-iterator-1.1.2" = { @@ -23218,22 +23111,13 @@ let sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; }; - "eslint-7.31.0" = { + "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; - version = "7.31.0"; + version = "7.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; - sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; - }; - }; - "eslint-config-prettier-8.3.0" = { - name = "eslint-config-prettier"; - packageName = "eslint-config-prettier"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; - sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; "eslint-plugin-no-unsanitized-3.1.5" = { @@ -23245,15 +23129,6 @@ let sha512 = "s/6w++p1590h/H/dE2Wo660bOkaM/3OEK14Y7xm1UT0bafxkKw1Cq0ksjxkxLdH/WWd014DlsLKuD6CyNrR2Dw=="; }; }; - "eslint-plugin-prettier-3.4.0" = { - name = "eslint-plugin-prettier"; - packageName = "eslint-plugin-prettier"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz"; - sha512 = "UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw=="; - }; - }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -23263,13 +23138,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.14.0" = { + "eslint-plugin-vue-7.16.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.14.0"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz"; - sha512 = "IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.16.0.tgz"; + sha512 = "0E2dVvVC7I2Xm1HXyx+ZwPj9CNX4NJjs4K4r+GVsHWyt5Pew3JLD4fI7A91b2jeL0TXE7LlszrwLSTJU9eqehw=="; }; }; "eslint-scope-3.7.3" = { @@ -23902,15 +23777,6 @@ let sha512 = "nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w=="; }; }; - "execa-0.1.1" = { - name = "execa"; - packageName = "execa"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.1.1.tgz"; - sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd"; - }; - }; "execa-0.10.0" = { name = "execa"; packageName = "execa"; @@ -24037,15 +23903,6 @@ let sha512 = "8ORl1YRygYGPdR+zcClMqzaU+JQuvdNIw/s0RNwYluxNecEHkDEcXFmO6A5T79p7e48KI8iXJYt6KIn4Z9z4bg=="; }; }; - "exif-parser-0.1.12" = { - name = "exif-parser"; - packageName = "exif-parser"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz"; - sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; - }; - }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -24136,13 +23993,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.90" = { + "expo-pwa-0.0.92" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.90"; + version = "0.0.92"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.90.tgz"; - sha512 = "0uVXBgpe4Vt3xBKgAu7mmT+TMxiRJHXtMcP7FhaAPv1LkCxDrtMuK+SYERRJlTYRLX/qA2yDIWix3ySzvpWWzA=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.92.tgz"; + sha512 = "lY+m28IQkqpCPZQdAlMBUGgm5HbTEHVaMNt0QnMAeX/siN11rfhxBr2nFQRYfK0R5Kklh6yUTyAjz+vOd2bSKw=="; }; }; "express-2.5.11" = { @@ -24253,13 +24110,13 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; - "express-openapi-7.5.0" = { + "express-openapi-8.0.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.5.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.5.0.tgz"; - sha512 = "94JMAXcBkBHYazc8y85akJQvq/7PFdBHOWc5B421liyQXdDzvq49ct4tbTHRnpOZ3aPlsufLGVQdhJIuGUNiTQ=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-8.0.0.tgz"; + sha512 = "MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg=="; }; }; "express-session-1.17.2" = { @@ -25126,13 +24983,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.5.2" = { + "file-type-16.5.3" = { name = "file-type"; packageName = "file-type"; - version = "16.5.2"; + version = "16.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.2.tgz"; - sha512 = "lnHRZj2USLF3v4C5ZY7/vQQeoTVA1YV9TtD6UUCr9z5Cd0uyutqxPBJxkXzM6lufPNuSfefq/yFmnSPz0C3wNw=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.3.tgz"; + sha512 = "uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A=="; }; }; "file-type-3.9.0" = { @@ -25180,15 +25037,6 @@ let sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; }; }; - "file-type-9.0.0" = { - name = "file-type"; - packageName = "file-type"; - version = "9.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz"; - sha512 = "Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="; - }; - }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -25477,13 +25325,13 @@ let sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; }; - "find-versions-2.0.0" = { + "find-versions-3.2.0" = { name = "find-versions"; packageName = "find-versions"; - version = "2.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/find-versions/-/find-versions-2.0.0.tgz"; - sha1 = "2ad90d490f6828c1aa40292cf709ac3318210c3c"; + url = "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz"; + sha512 = "P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww=="; }; }; "find-yarn-workspace-root-2.0.0" = { @@ -25702,13 +25550,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.2.1" = { + "flatted-3.2.2" = { name = "flatted"; packageName = "flatted"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz"; - sha512 = "OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz"; + sha512 = "JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA=="; }; }; "flatten-0.0.1" = { @@ -25747,13 +25595,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.155.1" = { + "flow-parser-0.157.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.155.1"; + version = "0.157.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.155.1.tgz"; - sha512 = "EU55hHBilG20Qu80tMYrVjEIqB3FcXPPJwndNcf6UryvhiF74dQ2FX8zPV1LIpuvkW3P13wgZlsnG94oRihgpw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.157.0.tgz"; + sha512 = "p0vdtrM8oAMlscIXpX0e/eGWll5NPteVChNtlQncbIbivH+BdiwXHN5QO6myAfmebd027r9RiQKdUPsFAiEVgQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -26044,13 +25892,13 @@ let sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; - "fork-ts-checker-webpack-plugin-6.2.12" = { + "fork-ts-checker-webpack-plugin-6.3.1" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.2.12"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.12.tgz"; - sha512 = "BzXGIfM47q1WFwXsNLl22dQVMFwSBgldL07lvqRJFxgrhT76QQ3nri5PX01Rxfa2RYvv/hqACULO8K5gT8fFuA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.3.1.tgz"; + sha512 = "uxqlKTEeSJ5/JRr0zaCiw2U+kOV8F4/MhCnnRf6vbxj4ZU3Or0DLl/0CNtXro7uLWDssnuR7wUN7fU9w1I0REA=="; }; }; "form-data-1.0.0-rc3" = { @@ -26188,13 +26036,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.10.5" = { + "fp-ts-2.11.1" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.10.5"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.10.5.tgz"; - sha512 = "X2KfTIV0cxIk3d7/2Pvp/pxL/xr2MV1WooyEzKtTWYSc1+52VF4YzjBTXqeOlSiZsPCxIBpDGfT9Dyo7WEY0DQ=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.1.tgz"; + sha512 = "CJOfs+Heq/erkE5mqH2mhpsxCKABGmcLyeEwPxtbTlkLkItGUs6bmk2WqjB2SgoVwNwzTE5iKjPQJiq06CPs5g=="; }; }; "fraction.js-4.1.1" = { @@ -26521,6 +26369,15 @@ let sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; }; }; + "fs-routes-8.0.0" = { + name = "fs-routes"; + packageName = "fs-routes"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-8.0.0.tgz"; + sha512 = "EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ=="; + }; + }; "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; @@ -26728,31 +26585,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.10.0" = { + "gatsby-core-utils-2.11.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.10.0.tgz"; - sha512 = "xvVebKSrjHkZQQkeEjuAekCAg17KT2l44d/yn7w2dzBGay244m8hoY8LRtLRdsrSp30ix89QklefuP9frEfhbA=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.11.0.tgz"; + sha512 = "t5PL1/MvTPSG6IeJn+Yd3Fxp0L3HfLI1vvVsmxXvxEiwDp5MJjjtZbrSnWpST1oylMSKI/UECUEKQUax9UJW+A=="; }; }; - "gatsby-recipes-0.21.0" = { + "gatsby-recipes-0.22.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.21.0.tgz"; - sha512 = "oo9ci5G6TiXc5wVnRrTfJhX92ZsjICVa0ldX7aQ/8JR77HelfO3MFfQuIkswla+o0MGcbyxgVoLX45kgzY7aaA=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.22.0.tgz"; + sha512 = "FQrM59qd64Pwe6UVJmuTAwyZx4IVkj0huwZ1y37IWn49Xuq0Ihhmsrb1BgP99euXZz34c+PWhsFnWvW26skgtw=="; }; }; - "gatsby-telemetry-2.10.0" = { + "gatsby-telemetry-2.11.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.10.0.tgz"; - sha512 = "uon+KRo6NQqkc6Qk/QTw+RmaxIjFFIK7cSU8XXE3y353il2Tk04Kxct2hMHn8Zdl4TYyKla1T5UIvVV/EfpBcg=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.11.0.tgz"; + sha512 = "6GEcZpsY5N/+K+SGGdDHuOknjer6vsYLJsUuUWkz32t8OK9lE1cLvXIdO2eTHdS4rtWFM324a/yFMlizp59SbA=="; }; }; "gauge-1.2.7" = { @@ -26773,6 +26630,15 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; + "gauge-3.0.1" = { + name = "gauge"; + packageName = "gauge"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-3.0.1.tgz"; + sha512 = "6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ=="; + }; + }; "gaxios-4.3.0" = { name = "gaxios"; packageName = "gaxios"; @@ -26935,15 +26801,6 @@ let sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; }; - "get-own-enumerable-property-symbols-3.0.2" = { - name = "get-own-enumerable-property-symbols"; - packageName = "get-own-enumerable-property-symbols"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; - }; - }; "get-package-info-1.0.0" = { name = "get-package-info"; packageName = "get-package-info"; @@ -27142,13 +26999,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "gh-release-fetch-2.0.1" = { + "gh-release-fetch-2.0.2" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.1.tgz"; - sha512 = "Ca5chpW8/yXeJPYdAxDLB8UShrWViOgnlYl4QTlQi4Y6sJnMXrXK9GMjKHyjJtNAw9IiSh0DbcTMiJZyp6vfMg=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.2.tgz"; + sha512 = "VIlw5FzT8b31rwwH3A4zg05wd9R1/7vPYY+Dow14U1mXEkGF348+x8HUk5fY9py6icVVU3z/v4L7m5BV/7xxjA=="; }; }; "git-apply-delta-0.0.7" = { @@ -27547,15 +27404,6 @@ let sha512 = "+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg=="; }; }; - "global-cache-dir-1.0.1" = { - name = "global-cache-dir"; - packageName = "global-cache-dir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/global-cache-dir/-/global-cache-dir-1.0.1.tgz"; - sha512 = "wYGh6O3Xkx1LsMXQpObr/uu3PsFpbWhpbslgn9Xq52rbDZ6YOwJcQtU5R4lSEQgCDtXLItV9EH5X1F/VnBTAlw=="; - }; - }; "global-cache-dir-2.0.0" = { name = "global-cache-dir"; packageName = "global-cache-dir"; @@ -27737,6 +27585,15 @@ let sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; }; }; + "globby-11.0.3" = { + name = "globby"; + packageName = "globby"; + version = "11.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; + sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + }; + }; "globby-11.0.4" = { name = "globby"; packageName = "globby"; @@ -27746,6 +27603,15 @@ let sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; + "globby-12.0.0" = { + name = "globby"; + packageName = "globby"; + version = "12.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-12.0.0.tgz"; + sha512 = "3mOIUduqSMHm6gNjIw9E641TZ93NB8lFVt+6MKIw6vUaIS5aSsw/6cl0gT86z1IoKlaL90BiOQlA593GUMlzEA=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -27863,13 +27729,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.3.0" = { + "google-auth-library-7.5.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.3.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.3.0.tgz"; - sha512 = "MPeeMlnsYnoiiVFMwX3hgaS684aiXrSqKoDP+xL4Ejg4Z0qLvIeg4XsaChemyFI8ZUO7ApwDAzNtgmhWSDNh5w=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.5.0.tgz"; + sha512 = "iRMwc060kiA6ncZbAoQN90nlwT8jiHVmippofpMgo4YFEyRBaPouyM7+ZB742wKetByyy+TahshVRTx0tEyXGQ=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -27881,22 +27747,22 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.19.0" = { + "google-gax-2.22.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.19.0"; + version = "2.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.19.0.tgz"; - sha512 = "2a6WY+p6YMVMmwXmkRqiLreXx67xHDZhkmflcL8aDUkl1csx9ywxEI01veoDXy6T1l0JJD6zLbl5TIbWimmXrw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.22.1.tgz"; + sha512 = "/X5Ym6f6Q4sH/3blMr1w/QzFhH0ZKnx9kOusUPwwZH6JmSwLpbuyUDbOc7MAvadl4r7yI2AASILLWK3fT+1Thg=="; }; }; - "google-p12-pem-3.1.0" = { + "google-p12-pem-3.1.2" = { name = "google-p12-pem"; packageName = "google-p12-pem"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.0.tgz"; - sha512 = "JUtEHXL4DY/N+xhlm7TC3qL797RPAtk0ZGXNs3/gWyiDHYoA/8Rjes0pztkda+sZv4ej1EoO2KhWgW5V9KTrSQ=="; + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz"; + sha512 = "tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A=="; }; }; "goosig-0.10.0" = { @@ -28034,13 +27900,13 @@ let sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg=="; }; }; - "graceful-fs-4.2.6" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "graceful-readlink-1.0.1" = { @@ -28079,6 +27945,24 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; + "graphology-0.20.0" = { + name = "graphology"; + packageName = "graphology"; + version = "0.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphology/-/graphology-0.20.0.tgz"; + sha512 = "h5mJWgZXpuZQzBAMWhVIOluGNIYUP043eh7BHcecRWhSkD4eiZAh+uM4XX2rGL1vig9XQ3JVYl9gmK+ajy+JPA=="; + }; + }; + "graphology-types-0.19.3" = { + name = "graphology-types"; + packageName = "graphology-types"; + version = "0.19.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.19.3.tgz"; + sha512 = "N9zuoXkhoEhx/7FaMlMTgHqPl17Mcub67YHLk0d+i8mOSsxpD9kLzvUwUo5v39xeoOUqRb3rC0Y2h9zTssZUGg=="; + }; + }; "graphql-0.11.7" = { name = "graphql"; packageName = "graphql"; @@ -28700,6 +28584,15 @@ let sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; + "has-tostringtag-1.0.0" = { + name = "has-tostringtag"; + packageName = "has-tostringtag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -29754,13 +29647,13 @@ let sha512 = "wcGvY31MpFNHIkUcXHHnvrE4IKYlpvitJw5P/1u892gMBAM46muQ+RH7UN1d+Ntnfx5apnOnVY6vcLmrWHOLwg=="; }; }; - "http2-client-1.3.3" = { + "http2-client-1.3.5" = { name = "http2-client"; packageName = "http2-client"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/http2-client/-/http2-client-1.3.3.tgz"; - sha512 = "nUxLymWQ9pzkzTmir24p2RtsgruLmhje7lH3hLX1IpwvyTg77fW+1brenPPP3USAR+rQ36p5sTA/x7sjCJVkAA=="; + url = "https://registry.npmjs.org/http2-client/-/http2-client-1.3.5.tgz"; + sha512 = "EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA=="; }; }; "http2-wrapper-1.0.3" = { @@ -29889,13 +29782,13 @@ let sha512 = "yozWXZx3yXVprf/MM9WqMt5WY60Im8k6ELJDNFGfyMeO+UieITbDmkvVwMnKQA3ptWqUK8fPf/tEGgklWh7Weg=="; }; }; - "hyperbee-1.5.5" = { + "hyperbee-1.6.0" = { name = "hyperbee"; packageName = "hyperbee"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.5.5.tgz"; - sha512 = "0zX5JzBgB0kW7stpq2RXiVxzETckGuXJX43hAD5Fom60NUvpnEl6Q2VGKGjfDET04FjPCZAqA08pM2JXa48LjQ=="; + url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.6.0.tgz"; + sha512 = "bID+XBR4/z6mbBrHDRQTam2hs0sU9Vni1SKcYZ/Osp+su5/BaBVZlT+/e5bspDiUY+T/q0CmJKq7+LBQXsWk4A=="; }; }; "hypercore-7.7.1" = { @@ -29997,13 +29890,13 @@ let sha512 = "OcN2zq9DEoArC84q9VCSrf9Hx1QUkR6ineCOwyOwhE4v/8aUTOx87mAk1nyjMOf76DQmF+tl2vnS2FssLx5N+Q=="; }; }; - "hyperdrive-10.20.0" = { + "hyperdrive-10.21.0" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "10.20.0"; + version = "10.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-10.20.0.tgz"; - sha512 = "ejikKQc9L8qUzmmkGe2dk/FGzisY0RTtE1Jw4WfWWXGTun9t/yZ/sV4JfamNBJRd3C0BWV6ZQYeI+1xQDuK3WQ=="; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-10.21.0.tgz"; + sha512 = "kvq7aGODR8mcV+c1vTGrqVLhdJKl604/aNYXiOEg6pH6qb3t9AGTm/DKvQrbR+DA5Qq8X9TbQZWeZw4wgJRlXw=="; }; }; "hyperdrive-9.16.0" = { @@ -30708,6 +30601,15 @@ let sha512 = "wiqkrB2tgnCnv51r2LpNLVfgrd/V+UXF3ccry+/Q7on9CBt8LVavX6NDYRMdXljuM+CcFV/sVro0bCr5oxB05w=="; }; }; + "ink-use-stdout-dimensions-1.0.5" = { + name = "ink-use-stdout-dimensions"; + packageName = "ink-use-stdout-dimensions"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-use-stdout-dimensions/-/ink-use-stdout-dimensions-1.0.5.tgz"; + sha512 = "rVsqnw4tQEAJUoknU09+zHdDf30GJdkumkHr0iz/TOYMYEZJkYqziQSGJAM+Z+M603EDfO89+Nxyn/Ko2Zknfw=="; + }; + }; "inline-source-map-0.6.2" = { name = "inline-source-map"; packageName = "inline-source-map"; @@ -30870,6 +30772,15 @@ let sha512 = "mzNrusCk5L6kSzlN0Ioddn8yzrhYNLli+Sn2ZxMuLechMYAzakiFCIULxsxlQb5YKzthLGfrFACcWoAvM7p04Q=="; }; }; + "inquirer-glob-prompt-0.1.0" = { + name = "inquirer-glob-prompt"; + packageName = "inquirer-glob-prompt"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer-glob-prompt/-/inquirer-glob-prompt-0.1.0.tgz"; + sha512 = "Zw9XYJdrBBJ5TZjLH8Nu8PIa54huvkP0xeNOTtKh3bis0DNAJWMtdpT9PIJBkqheMUnwIPmv8jkjOr7aPKYFqg=="; + }; + }; "insert-module-globals-7.2.1" = { name = "insert-module-globals"; packageName = "insert-module-globals"; @@ -31005,6 +30916,15 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; + "internal-slot-1.0.3" = { + name = "internal-slot"; + packageName = "internal-slot"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; "internmap-1.0.1" = { name = "internmap"; packageName = "internmap"; @@ -31383,13 +31303,13 @@ let sha512 = "UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A=="; }; }; - "is-arguments-1.1.0" = { + "is-arguments-1.1.1" = { name = "is-arguments"; packageName = "is-arguments"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz"; - sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; + sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; "is-arrayish-0.2.1" = { @@ -31419,13 +31339,13 @@ let sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; - "is-bigint-1.0.2" = { + "is-bigint-1.0.3" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz"; - sha512 = "0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz"; + sha512 = "ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg=="; }; }; "is-binary-path-1.0.1" = { @@ -31446,13 +31366,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-boolean-object-1.1.1" = { + "is-boolean-object-1.1.2" = { name = "is-boolean-object"; packageName = "is-boolean-object"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; - sha512 = "bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng=="; + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; }; }; "is-buffer-1.1.6" = { @@ -31473,13 +31393,13 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; - "is-callable-1.2.3" = { + "is-callable-1.2.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; - sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; "is-canonical-base64-1.1.1" = { @@ -31554,13 +31474,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.4" = { + "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz"; - sha512 = "/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; "is-decimal-1.0.4" = { @@ -31770,13 +31690,13 @@ let sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="; }; }; - "is-generator-function-1.0.9" = { + "is-generator-function-1.0.10" = { name = "is-generator-function"; packageName = "is-generator-function"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.9.tgz"; - sha512 = "ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A=="; + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"; + sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; }; }; "is-glob-2.0.1" = { @@ -32049,13 +31969,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-number-object-1.0.5" = { + "is-number-object-1.0.6" = { name = "is-number-object"; packageName = "is-number-object"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz"; - sha512 = "RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="; + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; + sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; }; }; "is-obj-1.0.1" = { @@ -32283,22 +32203,13 @@ let sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; }; }; - "is-regex-1.0.5" = { + "is-regex-1.1.4" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; - }; - }; - "is-regex-1.1.3" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz"; - sha512 = "qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; }; "is-regexp-1.0.0" = { @@ -32427,13 +32338,13 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-stream-2.0.0" = { + "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; "is-stream-ended-0.1.4" = { @@ -32445,13 +32356,13 @@ let sha512 = "xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="; }; }; - "is-string-1.0.6" = { + "is-string-1.0.7" = { name = "is-string"; packageName = "is-string"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz"; - sha512 = "2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="; + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; }; "is-supported-regexp-flag-1.0.1" = { @@ -32481,13 +32392,13 @@ let sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; }; }; - "is-typed-array-1.1.5" = { + "is-typed-array-1.1.7" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz"; - sha512 = "S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.7.tgz"; + sha512 = "VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA=="; }; }; "is-typedarray-1.0.0" = { @@ -32562,6 +32473,15 @@ let sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; + "is-valid-domain-0.1.2" = { + name = "is-valid-domain"; + packageName = "is-valid-domain"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.2.tgz"; + sha512 = "vm/9Ynw80MusgfSMffjGRuMhO8hjk5MOxLoFL7nYWvWXTPCxTGQtACiCwO055UqHICG8xP6hIvRXK1iwnuU9GA=="; + }; + }; "is-valid-glob-1.0.0" = { name = "is-valid-glob"; packageName = "is-valid-glob"; @@ -33111,22 +33031,22 @@ let sha512 = "qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA=="; }; }; - "jimp-0.12.1" = { - name = "jimp"; - packageName = "jimp"; - version = "0.12.1"; + "jimp-compact-0.16.1" = { + name = "jimp-compact"; + packageName = "jimp-compact"; + version = "0.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/jimp/-/jimp-0.12.1.tgz"; - sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; + url = "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1.tgz"; + sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-3.1.5" = { + "jitdb-3.1.7" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.5"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.5.tgz"; - sha512 = "O3z6dmk4FY+Il3zt4CEnDwgbCWP89dsGvCK1Gx7pVOSsKML31WupDJMTICZ3PUagYi52NNUhvCZHUeJVJFdgTA=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.7.tgz"; + sha512 = "AV5AnBPlrQO75I3MKJFQMzQyM0ZQDwKcij299C1kBXt/U7dDqwQa8FaYYiHnbK8w9J4qXsvQOlM8P5HGY24zBQ=="; }; }; "jju-1.4.0" = { @@ -33165,13 +33085,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joi-17.4.1" = { + "joi-17.4.2" = { name = "joi"; packageName = "joi"; - version = "17.4.1"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.4.1.tgz"; - sha512 = "gDPOwQ5sr+BUxXuPDGrC1pSNcVR/yGGcTI0aCnjYxZEa3za60K/iCQ+OFIkEHWZGVCUcUlXlFKvMmrlmxrG6UQ=="; + url = "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz"; + sha512 = "Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw=="; }; }; "join-component-1.1.0" = { @@ -33237,13 +33157,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.27.1" = { + "jquery.terminal-2.28.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.27.1"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.27.1.tgz"; - sha512 = "EixPlbZdM0tgtjC/KosdSjhRS2QZqG7qKLZ202og4hBTNLgNgZ4Ke6DP1mhC6IKciMHD6IWNYQgSnzQRbIQjIQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.28.1.tgz"; + sha512 = "2y/MFSTMbEbvUsd8Fq0GLDaI/bsGv5QVs3h+vgQ2BqBQMmIDlnuNTDJbtOFiTLksghlWG0P9iXjovrjMLwcOhQ=="; }; }; "js-base64-2.6.4" = { @@ -33480,13 +33400,13 @@ let sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; }; }; - "jsdom-16.6.0" = { + "jsdom-16.7.0" = { name = "jsdom"; packageName = "jsdom"; - version = "16.6.0"; + version = "16.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz"; - sha512 = "Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz"; + sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; "jsdom-7.2.2" = { @@ -33525,58 +33445,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.31.0" = { + "jsii-1.32.0" = { name = "jsii"; packageName = "jsii"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.31.0.tgz"; - sha512 = "q/p5a6OLO9V0pIcyzS5sygkU9lPskY57KM7KbmppLDPVi5nIqpsRyFfsbPnGWFfDBMk//nkcfj+dbKJIplVkgg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.32.0.tgz"; + sha512 = "Vw/xjiRgMdb+wbSSUaA7DTvVfSYfCR0k8Gdei43xSOOqmRfyLsmrWkN4ypnsbfaWfEYLpTj/HXGc4rJmw9Vnrw=="; }; }; - "jsii-pacmak-1.31.0" = { + "jsii-pacmak-1.32.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.31.0.tgz"; - sha512 = "fGiAoooRPMadwTWU0vfHJdcNzeYdESnkU/8LmlI4k6yF1iIlFMIbWPulBxP6fV7SqV3CZQKGpUbcPD/Uzf1glg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.32.0.tgz"; + sha512 = "zH+5ys4w9rSz7ZbfDTX0XZ8zhqpoygikuAppiWWVqjMmdk8qqZUgY9fLncZliMnI42YCXSz7q43g4tVL7dd3ng=="; }; }; - "jsii-reflect-1.31.0" = { + "jsii-reflect-1.32.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.31.0.tgz"; - sha512 = "jKc3tryVeEyEBZFv5bDB8rOaEgW+yBPh0DE4GQCKQQLdkp76Lm9ZSkrnJk5e0gEuAWsmuc1DUs35OcVNr8QRWg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.32.0.tgz"; + sha512 = "BJN8pgxSa3LlP5yPfxtaviSjsHKpG9b4xOr2kXv6w/SElIX15Q5/tKauI4/ZHTnBHGimRWh9ACNtxXAxvH0Vqg=="; }; }; - "jsii-rosetta-1.31.0" = { + "jsii-rosetta-1.32.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.31.0.tgz"; - sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.32.0.tgz"; + sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; }; }; - "jsii-srcmak-0.1.302" = { + "jsii-srcmak-0.1.321" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.302"; + version = "0.1.321"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.302.tgz"; - sha512 = "UsXZ6LGLqP/nUNyq0ey3xOLpNDpkye5HeNAnJCVqw4vsT9o5EX7MHv9ca/JDlt7fWn+cUdo/Bcj5UZJvg+Chfg=="; - }; - }; - "json-bigint-0.2.3" = { - name = "json-bigint"; - packageName = "json-bigint"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.2.3.tgz"; - sha1 = "118d7f6ff1d38659f19f94cf73e64a75a3f988a8"; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.321.tgz"; + sha512 = "rQ1WYU12g/QKkjNWSafZhFpM5ICSVAA8m33mQ7kzSUBmjFbF6707VcvvNdJS2aA+LUcpdY4E5nUgNESiZN2JGw=="; }; }; "json-bigint-1.0.0" = { @@ -33876,13 +33787,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.272" = { + "json2jsii-0.1.291" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.272"; + version = "0.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.272.tgz"; - sha512 = "OUZqjQhnRalQmQx3kFM3mG5DQcfEYzmUYBWGdb6QwGLuvwB/eJ2PhXuLEkGF+PhRwOrW5IyEcF8U+O39mh3G5Q=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.291.tgz"; + sha512 = "Gut4WuVUOLTv85Xm7dHU6k6K5otIEWMfkjl7c4Fa9+j35b6YzEsKZ1nS4s2eeb6YFbGEuE+IDdrpys7oo7jyFg=="; }; }; "json3-3.2.6" = { @@ -34137,13 +34048,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "jstat-1.9.4" = { + "jstat-1.9.5" = { name = "jstat"; packageName = "jstat"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/jstat/-/jstat-1.9.4.tgz"; - sha512 = "IiTPlI7pcrsq41EpDzrghlA1fhiC9GXxNqO4k5ogsjsM1XAWQ8zESH/bZsExLVgQsYpXE+7c11kEbbuxTLUpJQ=="; + url = "https://registry.npmjs.org/jstat/-/jstat-1.9.5.tgz"; + sha512 = "cWnp4vObF5GmB2XsIEzxI/1ZTcYlcfNqxQ/9Fp5KFUa0Jf/4tO0ZkGVnqoEHDisJvYgvn5n3eWZbd2xTVJJPUQ=="; }; }; "jstransform-10.1.0" = { @@ -34182,22 +34093,22 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.4.0" = { + "jszip-3.7.0" = { name = "jszip"; packageName = "jszip"; - version = "3.4.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; - sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz"; + sha512 = "Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw=="; }; }; - "jszip-3.6.0" = { + "jszip-3.7.1" = { name = "jszip"; packageName = "jszip"; - version = "3.6.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz"; - sha512 = "jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz"; + sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg=="; }; }; "junk-3.1.0" = { @@ -35272,6 +35183,15 @@ let sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; }; }; + "lightning-3.5.0" = { + name = "lightning"; + packageName = "lightning"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.5.0.tgz"; + sha512 = "6Kj1JX8tG3JiV5LXYGuZkKckiRJ/OU8ukb/R5qsp7RWq/xw32LDccCKvOK8oRnOGw9K+G8jcZAOY21exr9OSFA=="; + }; + }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -35299,6 +35219,15 @@ let sha512 = "kUfYO29baIJzY3S4/j7qaWl0GdjxT88SEaIcUN98YGdhYh+m7Zkt1N4jGubVF05A7dzjfjgtQD/NI5APKl38RQ=="; }; }; + "limiter-1.1.5" = { + name = "limiter"; + packageName = "limiter"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz"; + sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; + }; + }; "line-reader-0.4.0" = { name = "line-reader"; packageName = "line-reader"; @@ -35416,13 +35345,13 @@ let sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; - "ln-service-51.10.0" = { + "ln-service-51.10.1" = { name = "ln-service"; packageName = "ln-service"; - version = "51.10.0"; + version = "51.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.0.tgz"; - sha512 = "k6wGBB6RfyHhMY296MsHhZrVuJSqNsqx3nF3WM5lkKAg+58OdU6bLzqVttpit9uHamc6tssD2GDxNS6gdUzOYQ=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.1.tgz"; + sha512 = "fXsA/gDh65+YYVYJ6GNDB2ALPa0rjXV59I9kgciOCkgiJo3F7AYkhNULYIGu0r2FK83J1M85AsH6tycImRVWRQ=="; }; }; "ln-service-51.8.2" = { @@ -35479,15 +35408,6 @@ let sha512 = "pjAkD1VLGLvwu1Dso3HvQDcK25L/slRX8nB7hTDDEznn+rRzxBJd1sXuNaFovwJHughvK3ZxUxAHC0BfzIatEw=="; }; }; - "load-bmfont-1.4.1" = { - name = "load-bmfont"; - packageName = "load-bmfont"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz"; - sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="; - }; - }; "load-ip-set-2.2.1" = { name = "load-ip-set"; packageName = "load-ip-set"; @@ -36757,6 +36677,15 @@ let sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; }; + "lodash.pick-4.4.0" = { + name = "lodash.pick"; + packageName = "lodash.pick"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + }; + }; "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; @@ -37261,13 +37190,13 @@ let sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; - "lossless-json-1.0.4" = { + "lossless-json-1.0.5" = { name = "lossless-json"; packageName = "lossless-json"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.4.tgz"; - sha512 = "zEkWwELMSQQISdtOF44vk0bRJhN/PJ93qcgJLcodizQjxrJKdFrq2H1+Xv5QDe7v3dTYYbBI5hOsh4a9l0B2Ow=="; + url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.5.tgz"; + sha512 = "RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA=="; }; }; "lossy-store-1.2.4" = { @@ -37855,13 +37784,13 @@ let sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; }; }; - "markdown-it-12.1.0" = { + "markdown-it-12.2.0" = { name = "markdown-it"; packageName = "markdown-it"; - version = "12.1.0"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.1.0.tgz"; - sha512 = "7temG6IFOOxfU0SgzhqR+vr2diuMhyO5uUIEZ3C5NbXhqC9uFUHoU41USYuDFoZRsaY7BEIEei874Z20VMLF6A=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.2.0.tgz"; + sha512 = "Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg=="; }; }; "markdown-it-8.4.2" = { @@ -38629,13 +38558,13 @@ let sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; }; }; - "mem-fs-editor-9.0.1" = { + "mem-fs-editor-9.1.0" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "9.0.1"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.0.1.tgz"; - sha512 = "SqW+DkPbxZVzVldNHexoo5MiUR3YpIqiCVcZ/SZ6f7KToaSV7pMd4/URrkD5mnj35bd6NAK7SlftHSyW+Kgk4w=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.1.0.tgz"; + sha512 = "BrfhBTJ2oEmE9HRCbv70e7gnpflIDnV7OvDrCt5bcgoORTyleyXz7WberDt5+S/gqMpGfXpwkoXcsGoSMfb2xg=="; }; }; "memfs-3.2.2" = { @@ -38908,13 +38837,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.11.0" = { + "mermaid-8.11.4" = { name = "mermaid"; packageName = "mermaid"; - version = "8.11.0"; + version = "8.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.0.tgz"; - sha512 = "c/SprR4mJ2Pj7A+3mEvva7XrhEkXQJUal7fIyOkMhOhsPX2u5gQjjm5CEhHQ6WdGsqP+yiR+Fcgnd1i8mpFK8w=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.4.tgz"; + sha512 = "iUJylv5VmsOm/6dkAVpSYRSD8iZ8NOjuiHG0Q6nMgPdmmQ9xy8z61v8MuRZn81K51JlvOeWMN06blejmsMQHqg=="; }; }; "meros-1.1.4" = { @@ -39070,15 +38999,6 @@ let sha512 = "Z2uZi/IUMGQDCXASdujXRqrXXEwSY0XffUrAOllhqzQI3wpUyZbiZTiE2JuYC0HSG2G7DbCS5jZmsEKEGZuemg=="; }; }; - "microbuffer-1.0.0" = { - name = "microbuffer"; - packageName = "microbuffer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz"; - sha1 = "8b3832ed40c87d51f47bb234913a698a756d19d2"; - }; - }; "microee-0.0.6" = { name = "microee"; packageName = "microee"; @@ -39385,13 +39305,13 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-db-1.48.0" = { + "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.48.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz"; - sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; "mime-types-2.1.18" = { @@ -39421,13 +39341,13 @@ let sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; - "mime-types-2.1.31" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.31"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz"; - sha512 = "XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "mimic-fn-1.2.0" = { @@ -40294,6 +40214,15 @@ let sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; }; }; + "multer-1.4.3" = { + name = "multer"; + packageName = "multer"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.4.3.tgz"; + sha512 = "np0YLKncuZoTzufbkM6wEKp68EhWJXcU6fq6QqrSwkckd2LlMgd1UqhUJLj6NS/5sZ8dE8LYDWslsltJznnXlg=="; + }; + }; "multi-progress-2.0.0" = { name = "multi-progress"; packageName = "multi-progress"; @@ -40384,15 +40313,6 @@ let sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; }; }; - "multimatch-4.0.0" = { - name = "multimatch"; - packageName = "multimatch"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz"; - sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ=="; - }; - }; "multimatch-5.0.0" = { name = "multimatch"; packageName = "multimatch"; @@ -40681,6 +40601,15 @@ let sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; + "nan-2.15.0" = { + name = "nan"; + packageName = "nan"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"; + sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; + }; + }; "nan-2.3.5" = { name = "nan"; packageName = "nan"; @@ -40870,15 +40799,6 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "native-url-0.2.6" = { - name = "native-url"; - packageName = "native-url"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz"; - sha512 = "k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA=="; - }; - }; "natives-1.1.6" = { name = "natives"; packageName = "natives"; @@ -41186,22 +41106,22 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-7.0.1" = { + "netlify-8.0.0" = { name = "netlify"; packageName = "netlify"; - version = "7.0.1"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-7.0.1.tgz"; - sha512 = "Gd1aexpJ3RrOzkssdE8ipS67PuppOAkJNhRqQPp2in2XnJKPm5kvYonYMNVadasSFlNdmVCk9nELV3TnbAfklw=="; + url = "https://registry.npmjs.org/netlify/-/netlify-8.0.0.tgz"; + sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q=="; }; }; - "netlify-redirect-parser-8.1.0" = { + "netlify-redirect-parser-8.2.0" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.1.0.tgz"; - sha512 = "y5uzRHSyHVDDIgcFwvRRIELliBc7SKFuvuyVgsIMZWaNDCKNO4Etk2CIeGlJG+++g7NFD/XlYJaqgw2jJkqe4A=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.2.0.tgz"; + sha512 = "XaCojsgAKs19vlT2C4CEs4bp166bBsgA/brt10x2HLsgp4tF3dSacClPfZgGknyHB1MnMK8j3SFp9yq6rYm8CQ=="; }; }; "netlify-redirector-0.2.1" = { @@ -41528,6 +41448,15 @@ let sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; + "node-emoji-1.11.0" = { + name = "node-emoji"; + packageName = "node-emoji"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz"; + sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A=="; + }; + }; "node-emoji-git+https://github.com/laurent22/node-emoji.git" = { name = "node-emoji"; packageName = "node-emoji"; @@ -41772,13 +41701,13 @@ let sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="; }; }; - "node-object-hash-2.3.7" = { + "node-object-hash-2.3.8" = { name = "node-object-hash"; packageName = "node-object-hash"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.7.tgz"; - sha512 = "ybV3ZKZZoHJPSelxgRY5LYRHQToMtxvJxNbkY8WtWCy5Z/t3V0gyy/6O6kGoh0PrzZIATxVVDG2q+eM6iZMjKQ=="; + url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.8.tgz"; + sha512 = "hg/4TUqBOFdEhKjLF4jnn64utX3OWPVPWunVaDsaKxY+TVoViOFyW4lu34DES8yAqAqULSFm2jFL9SqVGes0Zg=="; }; }; "node-persist-2.1.0" = { @@ -41835,13 +41764,13 @@ let sha512 = "dBljNubVsolJkgfXUAF3KrCAO+hi5AXz+cftGjfHT76PyVB9pFUbAgTrkjZmKciC/B/14kEV5Ds+SwonqyTMfg=="; }; }; - "node-releases-1.1.73" = { + "node-releases-1.1.74" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.73"; + version = "1.1.74"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz"; - sha512 = "uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.74.tgz"; + sha512 = "caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw=="; }; }; "node-source-walk-4.2.0" = { @@ -41970,6 +41899,15 @@ let sha512 = "FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug=="; }; }; + "nofilter-3.0.3" = { + name = "nofilter"; + packageName = "nofilter"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nofilter/-/nofilter-3.0.3.tgz"; + sha512 = "TN/MCrQmXQk5DyUJ8TGUq1Il8rv4fTsjddLmMopV006QP8DMkglmGgYfQKD5620vXLRXfr8iGI6ZZ4/ZWld2cQ=="; + }; + }; "noise-peer-2.1.1" = { name = "noise-peer"; packageName = "noise-peer"; @@ -42465,6 +42403,15 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; + "npmlog-5.0.0" = { + name = "npmlog"; + packageName = "npmlog"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.0.tgz"; + sha512 = "ftpIiLjerL2tUg3dCqN8pOSoB90gqZlzv/gaZoxHaKjeLClrfJIEQ1Pdxi6qSzflz916Bljdy8dTWQ4J7hAFSQ=="; + }; + }; "nprogress-0.2.0" = { name = "nprogress"; packageName = "nprogress"; @@ -42781,15 +42728,6 @@ let sha512 = "wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw=="; }; }; - "object-inspect-1.7.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; - }; - }; "object-is-1.1.5" = { name = "object-is"; packageName = "object-is"; @@ -42961,6 +42899,15 @@ let sha512 = "eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="; }; }; + "obliterator-1.6.1" = { + name = "obliterator"; + packageName = "obliterator"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz"; + sha512 = "9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig=="; + }; + }; "observ-0.2.0" = { name = "observ"; packageName = "observ"; @@ -43015,13 +42962,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.173.1" = { + "office-ui-fabric-react-7.174.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.173.1"; + version = "7.174.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.173.1.tgz"; - sha512 = "7FKJ4lVXGkVRQccPz3XDeCAysE0h687elFyaRir3BUVAtkqoye9IB7IF/68SsUQahv6Q0LI3YTWym0IG/tlBEQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.174.0.tgz"; + sha512 = "hnuISSifwA7nSihuxpdNlh5plAmaPJqcDZUdhswak964Kb/8/ckMz/7BRQf+u9pGNs6LR14iDfRF/4RjLLzs6g=="; }; }; "omggif-1.0.10" = { @@ -43195,13 +43142,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.31.0" = { + "oo-ascii-tree-1.32.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.31.0.tgz"; - sha512 = "gNb2MyP1ZcF7cX0WgsAjYe4gZcx7BMLBWKE2TJZZbQ9/j4D8gbJh5Aq6RlXBgev74ODlgAVVcPr2wKU4Dufhqg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.32.0.tgz"; + sha512 = "QCYSWgdhbQwvMzw1OguyZ+K2KwZeQ1xvhFXa0/XV8XfmUXgr07MlnUoNthntfYgY6w7w+KI8WvqIxr+Q/NF5gw=="; }; }; "opal-runtime-1.0.11" = { @@ -43294,6 +43241,15 @@ let sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; }; }; + "openapi-default-setter-8.0.0" = { + name = "openapi-default-setter"; + packageName = "openapi-default-setter"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; + sha512 = "Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA=="; + }; + }; "openapi-framework-0.26.0" = { name = "openapi-framework"; packageName = "openapi-framework"; @@ -43312,6 +43268,15 @@ let sha512 = "t+sGVNMs2apX6d/rf5oq/3S6tCyBTgCjgFY0EDEIKKWepO4v3wM+kjy/Ve9iU92Ui5GeWbGR6ceFKY6VP/OKfQ=="; }; }; + "openapi-framework-8.0.0" = { + name = "openapi-framework"; + packageName = "openapi-framework"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-8.0.0.tgz"; + sha512 = "T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ=="; + }; + }; "openapi-jsonschema-parameters-1.2.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; @@ -43330,6 +43295,15 @@ let sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; }; }; + "openapi-jsonschema-parameters-8.0.0" = { + name = "openapi-jsonschema-parameters"; + packageName = "openapi-jsonschema-parameters"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; + sha512 = "yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA=="; + }; + }; "openapi-request-coercer-2.4.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; @@ -43348,6 +43322,15 @@ let sha512 = "wvrh3xSEpmgKaHiAnVhPxL6Yp9IXW+NEI192z6X5RiU6xe+jszn6A3v8vJcceyNsvDBA4tkm4I3mFndDlhc6Zw=="; }; }; + "openapi-request-coercer-8.0.0" = { + name = "openapi-request-coercer"; + packageName = "openapi-request-coercer"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; + sha512 = "CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw=="; + }; + }; "openapi-request-validator-4.2.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; @@ -43366,6 +43349,15 @@ let sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw=="; }; }; + "openapi-request-validator-8.0.0" = { + name = "openapi-request-validator"; + packageName = "openapi-request-validator"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; + sha512 = "7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ=="; + }; + }; "openapi-response-validator-4.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; @@ -43384,6 +43376,15 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; + "openapi-response-validator-8.0.0" = { + name = "openapi-response-validator"; + packageName = "openapi-response-validator"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; + sha512 = "h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA=="; + }; + }; "openapi-sampler-1.1.0" = { name = "openapi-sampler"; packageName = "openapi-sampler"; @@ -43411,6 +43412,15 @@ let sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; }; }; + "openapi-schema-validator-8.0.0" = { + name = "openapi-schema-validator"; + packageName = "openapi-schema-validator"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; + sha512 = "cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA=="; + }; + }; "openapi-security-handler-2.0.4" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; @@ -43429,6 +43439,15 @@ let sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; }; }; + "openapi-security-handler-8.0.0" = { + name = "openapi-security-handler"; + packageName = "openapi-security-handler"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; + sha512 = "XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw=="; + }; + }; "openapi-to-graphql-2.2.5" = { name = "openapi-to-graphql"; packageName = "openapi-to-graphql"; @@ -43474,6 +43493,15 @@ let sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; }; }; + "openapi-types-8.0.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-8.0.0.tgz"; + sha512 = "dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g=="; + }; + }; "openapi3-ts-2.0.1" = { name = "openapi3-ts"; packageName = "openapi3-ts"; @@ -43573,6 +43601,15 @@ let sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; + "optimism-0.16.1" = { + name = "optimism"; + packageName = "optimism"; + version = "0.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimism/-/optimism-0.16.1.tgz"; + sha512 = "64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg=="; + }; + }; "optimist-0.2.8" = { name = "optimist"; packageName = "optimist"; @@ -43825,13 +43862,13 @@ let sha512 = "h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg=="; }; }; - "os-name-4.0.0" = { + "os-name-4.0.1" = { name = "os-name"; packageName = "os-name"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz"; - sha512 = "caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg=="; + url = "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz"; + sha512 = "xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw=="; }; }; "os-shim-0.1.3" = { @@ -44320,6 +44357,15 @@ let sha512 = "ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q=="; }; }; + "pac-proxy-agent-5.0.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz"; + sha512 = "CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ=="; + }; + }; "pac-resolver-4.2.0" = { name = "pac-resolver"; packageName = "pac-resolver"; @@ -44329,6 +44375,15 @@ let sha512 = "rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ=="; }; }; + "pac-resolver-5.0.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.0.tgz"; + sha512 = "H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA=="; + }; + }; "package-json-1.2.0" = { name = "package-json"; packageName = "package-json"; @@ -44419,15 +44474,6 @@ let sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; }; }; - "pacote-11.3.4" = { - name = "pacote"; - packageName = "pacote"; - version = "11.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.3.4.tgz"; - sha512 = "RfahPCunM9GI7ryJV/zY0bWQiokZyLqaSNHXtbNSoLb7bwTvBbJBEyCJ01KWs4j1Gj7GmX8crYXQ1sNX6P2VKA=="; - }; - }; "pacote-11.3.5" = { name = "pacote"; packageName = "pacote"; @@ -44563,33 +44609,6 @@ let sha1 = "d3460bf1ddd0dfaeed42da754242e65fb684a81f"; }; }; - "parse-bmfont-ascii-1.0.6" = { - name = "parse-bmfont-ascii"; - packageName = "parse-bmfont-ascii"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"; - sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285"; - }; - }; - "parse-bmfont-binary-1.0.6" = { - name = "parse-bmfont-binary"; - packageName = "parse-bmfont-binary"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"; - sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006"; - }; - }; - "parse-bmfont-xml-1.1.4" = { - name = "parse-bmfont-xml"; - packageName = "parse-bmfont-xml"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"; - sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; - }; - }; "parse-conflict-json-1.1.1" = { name = "parse-conflict-json"; packageName = "parse-conflict-json"; @@ -44671,13 +44690,13 @@ let sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; }; - "parse-headers-2.0.3" = { + "parse-headers-2.0.4" = { name = "parse-headers"; packageName = "parse-headers"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz"; - sha512 = "QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA=="; + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.4.tgz"; + sha512 = "psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw=="; }; }; "parse-help-1.0.0" = { @@ -44824,13 +44843,13 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-9.1.3" = { + "parse-torrent-9.1.4" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.3.tgz"; - sha512 = "/Yr951CvJM8S6TjMaqrsmMxeQEAjDeCX+MZ3hGXXc7DG2wqzp/rzOsHtDzIVqN6NsFRCqy6wYLF/W7Sgvq7bXw=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.4.tgz"; + sha512 = "NSlG8ewolqfcEWevUUsrpvxzVWYGaKWwPHMcXTAV2qYYo6pPugVOacQXt8uDlEYh23Ituz+A9pAZK5YaXTV8Pg=="; }; }; "parse-torrent-file-2.1.4" = { @@ -45418,22 +45437,13 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; - "peek-readable-3.1.4" = { + "peek-readable-4.0.1" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.4"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; - sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; - }; - }; - "peek-readable-4.0.0" = { - name = "peek-readable"; - packageName = "peek-readable"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.0.tgz"; - sha512 = "kLbU4cz6h86poGVBKgAVMpFmD47nX04fPPQNKnv9fuj+IJZYkEBjsYAVu5nDbZWx0ZsWwWlMzeG90zQa5KLBaA=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.1.tgz"; + sha512 = "7qmhptnR0WMSpxT5rMHG9bW/mYSR1uqaPFj2MHvT+y/aOUu6msJijpKt5SkTDKySwg65OWG2JwTMBlgcbwMHrQ=="; }; }; "peek-stream-1.1.3" = { @@ -45544,13 +45554,13 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-pool-3.3.0" = { + "pg-pool-3.4.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz"; - sha512 = "0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz"; + sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="; }; }; "pg-protocol-1.5.0" = { @@ -45580,15 +45590,6 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "phin-2.9.3" = { - name = "phin"; - packageName = "phin"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/phin/-/phin-2.9.3.tgz"; - sha512 = "CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="; - }; - }; "physical-cpu-count-2.0.0" = { name = "physical-cpu-count"; packageName = "physical-cpu-count"; @@ -45778,15 +45779,6 @@ let sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; }; }; - "pixelmatch-4.0.2" = { - name = "pixelmatch"; - packageName = "pixelmatch"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz"; - sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; - }; - }; "pkg-conf-1.1.3" = { name = "pkg-conf"; packageName = "pkg-conf"; @@ -45832,13 +45824,13 @@ let sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; }; - "pkg-fetch-3.1.1" = { + "pkg-fetch-3.2.2" = { name = "pkg-fetch"; packageName = "pkg-fetch"; - version = "3.1.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.1.1.tgz"; - sha512 = "3GfpNwbwoTxge2TrVp6Oyz/FZJOoxF1r0+1YikOhnBXa2Di/VOJKtUObFHap76BFnyFo1fwh5vARWFR9TzLKUg=="; + url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.2.2.tgz"; + sha512 = "bLhFNT4cNnONxzbHo1H2mCCKuQkCR4dgQtv0gUZnWtp8TDP0v0UAXKHG7DXhAoTC5IYP3slLsFJtIda9ksny8g=="; }; }; "pkg-up-2.0.0" = { @@ -45922,13 +45914,13 @@ let sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; }; }; - "plist-3.0.2" = { + "plist-3.0.3" = { name = "plist"; packageName = "plist"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz"; - sha512 = "MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ=="; + url = "https://registry.npmjs.org/plist/-/plist-3.0.3.tgz"; + sha512 = "ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA=="; }; }; "plist-with-patches-0.5.1" = { @@ -47048,15 +47040,6 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-linter-helpers-1.0.0" = { - name = "prettier-linter-helpers"; - packageName = "prettier-linter-helpers"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; - sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; - }; - }; "prettier-plugin-svelte-2.3.1" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; @@ -47192,15 +47175,6 @@ let sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q=="; }; }; - "pretty-quick-3.1.1" = { - name = "pretty-quick"; - packageName = "pretty-quick"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.1.tgz"; - sha512 = "ZYLGiMoV2jcaas3vTJrLvKAYsxDoXQBUn8OSTxkl67Fyov9lyXivJTl0+2WVh+y6EovGcw7Lm5ThYpH+Sh3XxQ=="; - }; - }; "pretty-time-1.1.0" = { name = "pretty-time"; packageName = "pretty-time"; @@ -47723,6 +47697,15 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; + "proto3-json-serializer-0.1.1" = { + name = "proto3-json-serializer"; + packageName = "proto3-json-serializer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.1.tgz"; + sha512 = "Wucuvf7SqAw1wcai0zV+3jW3QZJiO/W9wZoJaTheebYdwfj2k9VfF3Gw9r2vGAaTeslhMbkVbojJG0+LjpgLxQ=="; + }; + }; "protobufjs-3.8.2" = { name = "protobufjs"; packageName = "protobufjs"; @@ -47804,6 +47787,15 @@ let sha512 = "ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA=="; }; }; + "proxy-agent-5.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz"; + sha512 = "gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g=="; + }; + }; "proxy-from-env-1.1.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -48146,15 +48138,6 @@ let sha1 = "146b36e3e043d7a666b59a14165fdd3bef3cf44c"; }; }; - "pull-async-filter-1.0.0" = { - name = "pull-async-filter"; - packageName = "pull-async-filter"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-async-filter/-/pull-async-filter-1.0.0.tgz"; - sha1 = "ebc3617d9de2463908c89fd01671c727564d6831"; - }; - }; "pull-awaitable-1.0.0" = { name = "pull-awaitable"; packageName = "pull-awaitable"; @@ -48776,13 +48759,13 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-10.1.0" = { + "puppeteer-10.2.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "10.1.0"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.1.0.tgz"; - sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.2.0.tgz"; + sha512 = "OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw=="; }; }; "puppeteer-9.1.1" = { @@ -48839,13 +48822,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.157" = { + "pyright-1.1.161" = { name = "pyright"; packageName = "pyright"; - version = "1.1.157"; + version = "1.1.161"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.157.tgz"; - sha512 = "slTex47hQKuyoi579Zk7lEhVH+4Dmn+eZ3gP1JGcFBcbcmDwd9ZI1ESww3jY3YoOYdNbYTafxBNuh3RHGkGiMA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.161.tgz"; + sha512 = "ahZ8KyDAMdyFTt9j0P/WL6SAeZWKI9qxoFRmTxw71JwyCVPSqXaeo2rK3304YjfKZKAtuHNMgtuZiAVT8U/Pbw=="; }; }; "q-0.9.7" = { @@ -49127,6 +49110,15 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; + "queue-tick-1.0.0" = { + name = "queue-tick"; + packageName = "queue-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.0.tgz"; + sha512 = "ULWhjjE8BmiICGn3G8+1L9wFpERNxkf8ysxkAer4+TFdRefDaXOCV5m92aMB9FtBVmn/8sETXLXY6BfW7hyaWQ=="; + }; + }; "quick-format-unescaped-4.0.3" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -49721,15 +49713,6 @@ let sha512 = "Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA=="; }; }; - "react-refresh-0.8.3" = { - name = "react-refresh"; - packageName = "react-refresh"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz"; - sha512 = "X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="; - }; - }; "react-side-effect-2.1.1" = { name = "react-side-effect"; packageName = "react-side-effect"; @@ -49856,13 +49839,13 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; - "read-package-json-fast-2.0.2" = { + "read-package-json-fast-2.0.3" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz"; - sha512 = "5fyFUyO9B799foVk4n6ylcoAktG/FbE3jwRKxvwaeSrIunaoMc0u81dzXxjeAFKOce7O5KncdfwpGvvs6r5PsQ=="; + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz"; + sha512 = "W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ=="; }; }; "read-package-tree-5.3.1" = { @@ -50117,15 +50100,6 @@ let sha1 = "c580d77ef2cfc8752b132498060dc9793a7ac01c"; }; }; - "readline-sync-1.4.10" = { - name = "readline-sync"; - packageName = "readline-sync"; - version = "1.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz"; - sha512 = "gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw=="; - }; - }; "readline2-0.1.1" = { name = "readline2"; packageName = "readline2"; @@ -50180,13 +50154,13 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; - "recast-0.20.4" = { + "recast-0.20.5" = { name = "recast"; packageName = "recast"; - version = "0.20.4"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.20.4.tgz"; - sha512 = "6qLIBGGRcwjrTZGIiBpJVC/NeuXpogXNyRQpqU1zWPUigCphvApoCs9KIwDYh1eDuJ6dAFlQoi/QUyE5KQ6RBQ=="; + url = "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz"; + sha512 = "E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ=="; }; }; "rechoir-0.6.2" = { @@ -50306,13 +50280,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.55" = { + "redoc-2.0.0-rc.56" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.55"; + version = "2.0.0-rc.56"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.55.tgz"; - sha512 = "32sUHhc33m8zQKz2V7xREwlf05S52dDOkn7K0WMquu2GDl6ZquxmrQfqnlj0IPoVCWQPR+XosmmIJj4rZbqjeA=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.56.tgz"; + sha512 = "ir2TtQ2d/1FqZWIoLmUZ3qvAAnO6jg8dt0SV75TanmfCXpEABcElXWH3mtUf6qKlvgDVt40diDCVuSvyPPxkAw=="; }; }; "reduce-component-1.0.1" = { @@ -50342,13 +50316,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "redux-4.1.0" = { + "redux-4.1.1" = { name = "redux"; packageName = "redux"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz"; - sha512 = "uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g=="; + url = "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz"; + sha512 = "hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw=="; }; }; "reflect-metadata-0.1.13" = { @@ -50414,13 +50388,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.8" = { + "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.8"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.8.tgz"; - sha512 = "o/ASGwgZ6UiVjspr4YnzHKF1NbBdX+mCPkSeymofk/d7I+csCYn3ZgZMMVtXeecpT8DBiI2nAlYkHd+xNCqu4A=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "regenerator-transform-0.14.5" = { @@ -51206,13 +51180,13 @@ let sha512 = "qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="; }; }; - "resolve-1.17.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.17.0"; + "reserved-words-0.1.2" = { + name = "reserved-words"; + packageName = "reserved-words"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + url = "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz"; + sha1 = "00a0940f98cd501aeaaac316411d9adc52b31ab1"; }; }; "resolve-1.20.0" = { @@ -51746,13 +51720,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.3" = { + "rollup-2.56.2" = { name = "rollup"; packageName = "rollup"; - version = "2.53.3"; + version = "2.56.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; - sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.2.tgz"; + sha512 = "s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51953,6 +51927,15 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; + "run-con-1.2.10" = { + name = "run-con"; + packageName = "run-con"; + version = "1.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/run-con/-/run-con-1.2.10.tgz"; + sha512 = "n7PZpYmMM26ZO21dd8y3Yw1TRtGABjRtgPSgFS/nhzfvbJMXFtJhJVyEgayMiP+w/23craJjsnfDvx4W4ue/HQ=="; + }; + }; "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; @@ -52079,13 +52062,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.2.0" = { + "rxjs-7.3.0" = { name = "rxjs"; packageName = "rxjs"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.2.0.tgz"; - sha512 = "aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz"; + sha512 = "p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw=="; }; }; "s3-stream-upload-2.0.2" = { @@ -52241,13 +52224,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.35.2" = { + "sass-1.37.5" = { name = "sass"; packageName = "sass"; - version = "1.35.2"; + version = "1.37.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.35.2.tgz"; - sha512 = "jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz"; + sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA=="; }; }; "sax-0.5.8" = { @@ -52331,15 +52314,6 @@ let sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; }; }; - "schema-utils-0.4.7" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz"; - sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ=="; - }; - }; "schema-utils-1.0.0" = { name = "schema-utils"; packageName = "schema-utils"; @@ -52673,13 +52647,13 @@ let sha512 = "d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ=="; }; }; - "semver-regex-1.0.0" = { + "semver-regex-2.0.0" = { name = "semver-regex"; packageName = "semver-regex"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; - sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz"; + sha512 = "mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw=="; }; }; "semver-truncate-1.1.2" = { @@ -53402,13 +53376,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.41.1" = { + "simple-git-2.42.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.41.1"; + version = "2.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.41.1.tgz"; - sha512 = "n1STz1tfnemvYndzWakgKa0JB4s/LrUG4btXMetWB9N9ZoIAJQd0ZtWj9sBwWxIZ/X/tYdA/tq+KHfFNAGzZhQ=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.42.0.tgz"; + sha512 = "illpUX0bcrdB3AyvBGLz0ToRVP7lXNJOGVybGVuVk7PpivPNK5YKJx2aagKdKbveaMtt0DCLK4/jfjDb6b2M2g=="; }; }; "simple-handshake-3.0.0" = { @@ -53627,6 +53601,15 @@ let sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; + "slash-4.0.0" = { + name = "slash"; + packageName = "slash"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; + sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + }; + }; "slasp-0.0.4" = { name = "slasp"; packageName = "slasp"; @@ -53717,15 +53700,6 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "slugid-1.1.0" = { - name = "slugid"; - packageName = "slugid"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slugid/-/slugid-1.1.0.tgz"; - sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; - }; - }; "slugify-1.4.7" = { name = "slugify"; packageName = "slugify"; @@ -53744,13 +53718,13 @@ let sha512 = "FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang=="; }; }; - "smart-buffer-4.1.0" = { + "smart-buffer-4.2.0" = { name = "smart-buffer"; packageName = "smart-buffer"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz"; - sha512 = "iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="; + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; }; "smartdc-auth-2.3.1" = { @@ -53906,13 +53880,13 @@ let sha512 = "1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q=="; }; }; - "snyk-gradle-plugin-3.16.0" = { + "snyk-gradle-plugin-3.16.1" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.16.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.16.0.tgz"; - sha512 = "PQegG8GOweJvUDSroysO1E0RK3MxphSUvNG5siRqGHJQ8s+dw9DddYN8kMn5+pTrfzo6zddgDPJxjqsfNR+NIw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.16.1.tgz"; + sha512 = "ii+W544+vCsRe+I4FdmhnYwGq5ZZYacEkUswJoUYmj1sIkkN1G0iUyas/r9mX+ERjQlvzyN4diptZe9OeaTaaA=="; }; }; "snyk-module-3.1.0" = { @@ -53924,13 +53898,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.26.1" = { + "snyk-mvn-plugin-2.26.2" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.26.1"; + version = "2.26.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.1.tgz"; - sha512 = "DCs53aRT/uK2e1jXzeVG2d+Ll0bmY/YHL+jEYaWJko8XwGoVwqCrVOkRyzXd2KOZUk3gpD6MaxIrBWsc8RJzRA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.2.tgz"; + sha512 = "XS6I10OYMzUq60DUqf0Lf4m8uLXZTFH58O++n5W/X4MtSmYV4frrpgZOrrDfzxBM5S7SH9FlKDL3p+1m84yqzg=="; }; }; "snyk-nodejs-lockfile-parser-1.35.0" = { @@ -53951,13 +53925,13 @@ let sha512 = "NiXN+MdWaZxseXVDgCM4CZ5aBgI5LloUbwUP9c3oMZDih9Zj6Vf5edDcL8eM3BGl+a6LceJzB6w+xrIqKCXgQA=="; }; }; - "snyk-nuget-plugin-1.21.1" = { + "snyk-nuget-plugin-1.22.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.21.1"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.1.tgz"; - sha512 = "nRtedIvrow5ODqOKkQWolKrxn8ZoNL3iNJGuW0jNhwv+/9K0XE1UORM5F1ENAsd+nzCSO/kiYAXCc5CNK8HWEw=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.22.0.tgz"; + sha512 = "R0pmcEYeoM3B6BUMUf30jPQgQo8ngHW0gAabyGMnBV3ZDvJ99TCa7McSIjI/3obdT1ERIKKF6bZxuzps4uzVOA=="; }; }; "snyk-paket-parser-1.6.0" = { @@ -53987,13 +53961,13 @@ let sha512 = "MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA=="; }; }; - "snyk-policy-1.19.0" = { + "snyk-policy-1.22.0" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.19.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz"; - sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg=="; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.22.0.tgz"; + sha512 = "torzlNhDWcoMQLcX2xsTbCXfKXE614+5YvLHxEefQPwC1JNkbCN5u3/pU0c+2RfC2cPCa1AKEBqIx5gvr6mNyQ=="; }; }; "snyk-python-plugin-1.19.11" = { @@ -54554,15 +54528,6 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; - "source-map-0.8.0-beta.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.8.0-beta.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz"; - sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; - }; - }; "source-map-js-0.6.2" = { name = "source-map-js"; packageName = "source-map-js"; @@ -54725,13 +54690,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.9" = { + "spdx-license-ids-3.0.10" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; - sha512 = "Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; }; }; "spdx-license-list-6.4.0" = { @@ -54788,6 +54753,15 @@ let sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="; }; }; + "speed-limiter-1.0.2" = { + name = "speed-limiter"; + packageName = "speed-limiter"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/speed-limiter/-/speed-limiter-1.0.2.tgz"; + sha512 = "Ax+TbUOho84bWUc3AKqWtkIvAIVws7d6QI4oJkgH4yQ5Yil+lR3vjd/7qd51dHKGzS5bFxg0++QwyNRN7s6rZA=="; + }; + }; "speedometer-0.1.4" = { name = "speedometer"; packageName = "speedometer"; @@ -55094,13 +55068,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.1.4" = { + "ssb-db2-2.1.5" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.4.tgz"; - sha512 = "r70wOz0taaIgpFX/I1DbzT1mucfLSHMmXfNMaenmLcrV6vDZFyFvZVyQTn26xgv7JwDkrdD9B/1Y85AH0qjYow=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.5.tgz"; + sha512 = "3Sbdf5AavoSqo7h1OQXSZ+RFIuTeu9CJpL2ojI8ySFZMZTsnPo7X7LQ1Bd4cNYTK7DBCvfjwvY01sO8VjFzlgw=="; }; }; "ssb-ebt-5.6.7" = { @@ -55175,13 +55149,13 @@ let sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ=="; }; }; - "ssb-keys-8.1.0" = { + "ssb-keys-8.2.0" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.1.0.tgz"; - sha512 = "RC2gFMptimj2QZZESOViKVhzqgXCnfW3IqUeKLQ/E8nnTdODuCVa3soLYu4KUF8nGIzFIfdKq7L2Teg32kD85w=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.2.0.tgz"; + sha512 = "U5vmEvWlMdmJQDHyiWYzXQwxlq+Th6cYvHy/cfhyoGU1vopiB5ytYm339bfhdmtjjRDSV2SPrm3vcgLrN3KH2w=="; }; }; "ssb-links-3.0.10" = { @@ -55319,13 +55293,13 @@ let sha512 = "/QX6+DJkghqq1ZTbgYpOvaI+gx2O7ee1TRUM9yiOlVjh1XAQBevcBj0zO+W3TsNllX86urqBrySd/AEfFfUpIw=="; }; }; - "ssb-ref-2.14.3" = { + "ssb-ref-2.16.0" = { name = "ssb-ref"; packageName = "ssb-ref"; - version = "2.14.3"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.3.tgz"; - sha512 = "XhzVmezsUJLlKxTfWlicxhiPRTEYHfJLskYQNRSnw4USqgo9LVx53+MJAhdZOYpZTW2jINR0TeetWs9M27gcbA=="; + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.16.0.tgz"; + sha512 = "ylyrfz9NLxwTCbeDDAdLo++O3elhNs6/gUqMhZ22F+gSOIjwXy2X7dpg5Q1YTH7uALOSu307Rpo1UfK9sj7Sjw=="; }; }; "ssb-replicate-1.3.3" = { @@ -55337,15 +55311,6 @@ let sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; - "ssb-sort-1.1.3" = { - name = "ssb-sort"; - packageName = "ssb-sort"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ssb-sort/-/ssb-sort-1.1.3.tgz"; - sha512 = "oPsF8lGgcHcIb4F1GddV3CbZTJZ0OzxI9fHXH0Zc7ZjqjFlYdqMDxFSuvqJnmtDydJcswyGANiziP1ghd69jOw=="; - }; - }; "ssb-unix-socket-1.0.0" = { name = "ssb-unix-socket"; packageName = "ssb-unix-socket"; @@ -55373,13 +55338,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.22" = { + "sscaff-1.2.42" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.22"; + version = "1.2.42"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.22.tgz"; - sha512 = "aEkcIR+UIro2xsDASNy/K0v7hxGi18jgFshHpGrJ/tfB0GlQHQJR0W9y23mNxfDmFg/lbTaR0BdEsgC0znNEGA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.42.tgz"; + sha512 = "OMJBrQ32Gg5/xWwZ81hEz5Ds7mdRneyRGC/WH2nDG6YPu+dGwMFktJHcoeorvKUT7/nDQe36yuIv+lr8t3+3wg=="; }; }; "ssh-config-1.1.6" = { @@ -56030,13 +55995,13 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; - "streamx-2.10.3" = { + "streamx-2.11.1" = { name = "streamx"; packageName = "streamx"; - version = "2.10.3"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.10.3.tgz"; - sha512 = "Ss4rEDWlTAUrIqaQsX6tNBNANHxSmbyrA5PlCji0a6xdJtVzfkEMLLrkVW5OSyr4TshiSb1WA2TqMGMUpGnouQ=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.11.1.tgz"; + sha512 = "GG/cBcuwhKEu2MxJIdlFnrstgtwERx0yX0tjZUVFHmmq65ROrCEAVrfoYbNQnXdq76rH0Y/SuO9VcgW+ZPkeMQ=="; }; }; "strftime-0.10.0" = { @@ -56246,13 +56211,13 @@ let sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; }; }; - "string2compact-1.3.0" = { + "string2compact-1.3.2" = { name = "string2compact"; packageName = "string2compact"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/string2compact/-/string2compact-1.3.0.tgz"; - sha512 = "004ulKKANDuQilQsNxy2lisrpMG0qUJxBU+2YCEF7KziRyNR0Nredm2qk0f1V82nva59H3y9GWeHXE63HzGRFw=="; + url = "https://registry.npmjs.org/string2compact/-/string2compact-1.3.2.tgz"; + sha512 = "3XUxUgwhj7Eqh2djae35QHZZT4mN3fsO7kagZhSGmhhlrQagVvWSFuuFIWnpxFS0CdTB2PlQcaL16RDi14I8uw=="; }; }; "string_decoder-0.10.31" = { @@ -56318,15 +56283,6 @@ let sha512 = "3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg=="; }; }; - "stringify-object-3.3.0" = { - name = "stringify-object"; - packageName = "stringify-object"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; - sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; - }; - }; "stringify-package-1.0.1" = { name = "stringify-package"; packageName = "stringify-package"; @@ -56498,15 +56454,6 @@ let sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; }; }; - "strip-comments-2.0.1" = { - name = "strip-comments"; - packageName = "strip-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz"; - sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; - }; - }; "strip-dirs-2.1.0" = { name = "strip-dirs"; packageName = "strip-dirs"; @@ -56651,22 +56598,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.1.3" = { + "strtok3-6.2.4" = { name = "strtok3"; packageName = "strtok3"; - version = "6.1.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; - sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; - }; - }; - "strtok3-6.2.2" = { - name = "strtok3"; - packageName = "strtok3"; - version = "6.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.2.tgz"; - sha512 = "iUzLl3UhF2RfqQah80JngnfltQFLEidGyTX8+hHFMQFjzUj3UpIpOx824FtFmRI9bwyywReENpdHGDkFJwJlGQ=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz"; + sha512 = "GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw=="; }; }; "structured-source-3.0.2" = { @@ -56759,13 +56697,13 @@ let sha512 = "luHn2OAMGJouOnadm6Fim6WXodQ2AWDkWjYq0rMdyEwzO5PdE4LzoXAEn9LL2snmBAlwUp1URVOTF7lZR3KU+Q=="; }; }; - "stylis-3.5.4" = { + "stylis-4.0.10" = { name = "stylis"; packageName = "stylis"; - version = "3.5.4"; + version = "4.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz"; - sha512 = "8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="; + url = "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz"; + sha512 = "m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="; }; }; "stylus-0.54.8" = { @@ -56831,6 +56769,15 @@ let sha1 = "3a26ab96e06f78cf4ace8d083f6227fa55970947"; }; }; + "sucrase-3.20.1" = { + name = "sucrase"; + packageName = "sucrase"; + version = "3.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sucrase/-/sucrase-3.20.1.tgz"; + sha512 = "BIG59HaJOxNct9Va6KvT5yzBA/rcMGetzvZyTx0ZdCcspIbpJTPS64zuAfYlJuOj+3WaI5JOdA+F0bJQQi8ZiQ=="; + }; + }; "sudo-block-1.2.0" = { name = "sudo-block"; packageName = "sudo-block"; @@ -57065,13 +57012,13 @@ let sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; - "svelte2tsx-0.4.2" = { + "svelte2tsx-0.4.5" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.2"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.2.tgz"; - sha512 = "ya93OOdT/WvHVEEvQ3u+Y4lkUqq0D+mD1szbGUWcYVOdBjJyXUF5MhKS5HEJHWQw4r+XK9UlHk52BMeXR2SI8A=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.5.tgz"; + sha512 = "5SbnH3rGA5eymeSidlPZ3qxL0P6SfJv0pWaoTVuJDxpHbI00dUZpuDTNn/WZ8yMXfU7vjY/QxKC/iYiDTbJEjg=="; }; }; "sver-compat-1.5.0" = { @@ -57218,13 +57165,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.51.1" = { + "swagger-ui-dist-3.51.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.51.1"; + version = "3.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.1.tgz"; - sha512 = "df2mEeVgnJp/FcXY3DRh3CsTfvHVTaO6g3FJP/kfwhxfOD1+YTXqBZrOIIsYTPtcRIFBkCAto0NFCxAV4XFRbw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.2.tgz"; + sha512 = "7aDfpvGrya61WQN4Eb6x5TELvYb5+7SRJQNYySkKUDGiRIwj1A8B2PNsXs4xMD0/5t8uNi4zW58KSofutcBdhw=="; }; }; "swagger2openapi-7.0.8" = { @@ -57362,13 +57309,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.7.8" = { + "systeminformation-5.8.0" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.7.8"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.8.tgz"; - sha512 = "gpFGDPtOtWDxMaQ6/7oe2XM/4ErgSvev1l3sdxChnm1AqDJKzZ3cu+VK7Dq1N02pChPiNNsIbUwe6dCLixfWRg=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.8.0.tgz"; + sha512 = "l4drbK2PtNynGKblaShY9hDLW/gg1zxUq2+Yk4gTyd6a2JUvFyTGP8PhHV9iOh+MzS25PQa8W1t0kvcIvr9n7Q=="; }; }; "table-3.8.3" = { @@ -57534,13 +57481,13 @@ let sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; }; }; - "tape-4.13.3" = { + "tape-4.14.0" = { name = "tape"; packageName = "tape"; - version = "4.13.3"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.13.3.tgz"; - sha512 = "0/Y20PwRIUkQcTCSi4AASs+OANZZwqPKaipGCEwp10dQMipVvSZwUUCi01Y/OklIGyHKFhIcjock+DKnBfLAFw=="; + url = "https://registry.npmjs.org/tape/-/tape-4.14.0.tgz"; + sha512 = "z0+WrUUJuG6wIdWrl4W3rTte2CR26G6qcPOj3w1hfRdcmhF3kHBhOBW9VHsPVAkz08ZmGzp7phVpDupbLzrYKQ=="; }; }; "tar-0.1.17" = { @@ -57561,13 +57508,13 @@ let sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; - "tar-4.4.13" = { + "tar-4.4.16" = { name = "tar"; packageName = "tar"; - version = "4.4.13"; + version = "4.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.16.tgz"; + sha512 = "gOVUT/KWPkGFZQmCRDVFNUWBl7niIo/PRR7lzrIqtZpit+st54lGROuVjc6zEQM9FhH+dJfQIl+9F0k8GNXg5g=="; }; }; "tar-4.4.6" = { @@ -57588,13 +57535,22 @@ let sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; }; - "tar-6.1.0" = { + "tar-6.1.2" = { name = "tar"; packageName = "tar"; - version = "6.1.0"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; - sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.2.tgz"; + sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q=="; + }; + }; + "tar-6.1.7" = { + name = "tar"; + packageName = "tar"; + version = "6.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.7.tgz"; + sha512 = "PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA=="; }; }; "tar-fs-1.16.3" = { @@ -57705,13 +57661,13 @@ let sha512 = "6u5UyW2KpMS/hwC4DKLGlicK/rVSYCahPFgF14ioP6BzwcDwQlciHCB/oWguvxLJaYGrvY6crzLHfjupFTBPXw=="; }; }; - "telegraf-4.4.0" = { + "telegraf-4.4.1" = { name = "telegraf"; packageName = "telegraf"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-4.4.0.tgz"; - sha512 = "DjVVEz37/5Hp0n8eLhAVjErwoyrWsqLyFAoRj8sU5XiD2CVAbBOx9J6a7cLn/B46pPgDqgbrdjiOeK0fQMiLOA=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-4.4.1.tgz"; + sha512 = "jxV8fC/K6abcUTlhy/l8txJAmEJIkJoDu/cN0yXOJWLp9csfLIp+cD4qlwJ6ko+4EgOJmNZvWK7Tr2dxKolJQQ=="; }; }; "temp-0.6.0" = { @@ -57813,15 +57769,6 @@ let sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; }; }; - "tempy-0.6.0" = { - name = "tempy"; - packageName = "tempy"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz"; - sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; - }; - }; "tempy-0.7.1" = { name = "tempy"; packageName = "tempy"; @@ -57876,13 +57823,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.49.3" = { + "terminal-kit-1.49.4" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.49.3"; + version = "1.49.4"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.49.3.tgz"; - sha512 = "7GovmExYxwGWOGfTh9LlH9uRt5braMj0bi6HmrhdhGi78Xi3S8hfJhTnio/h4iaN4pKtbAn3ugdGF2ypviZvMA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.49.4.tgz"; + sha512 = "ehoNOk7xB/QBVX38P2kpoLip+s4Tlb6qYDBAoLg/rdRrrtRlDgs97a9MG0xU1IGq/Qpn47n1rwb5fWbM/Bprag=="; }; }; "terminal-link-2.1.1" = { @@ -58002,13 +57949,13 @@ let sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; }; - "textextensions-5.12.0" = { + "textextensions-5.14.0" = { name = "textextensions"; packageName = "textextensions"; - version = "5.12.0"; + version = "5.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/textextensions/-/textextensions-5.12.0.tgz"; - sha512 = "IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w=="; + url = "https://registry.npmjs.org/textextensions/-/textextensions-5.14.0.tgz"; + sha512 = "4cAYwNFNYlIAHBUo7p6zw8POUvWbZor+/R0Tanv+rIhsauEyV9QSrEXL40pI+GfTQxKX8k6Tyw6CmdSDSmASrg=="; }; }; "textlint-rule-helper-1.2.0" = { @@ -58407,15 +58354,6 @@ let sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; - "timm-1.7.1" = { - name = "timm"; - packageName = "timm"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz"; - sha512 = "IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="; - }; - }; "timsort-0.3.0" = { name = "timsort"; packageName = "timsort"; @@ -58461,15 +58399,6 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; - "tinycolor2-1.4.2" = { - name = "tinycolor2"; - packageName = "tinycolor2"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; - sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; - }; - }; "titleize-1.0.1" = { name = "titleize"; packageName = "titleize"; @@ -58803,13 +58732,13 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; - "token-types-3.1.0" = { + "token-types-4.1.1" = { name = "token-types"; packageName = "token-types"; - version = "3.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-3.1.0.tgz"; - sha512 = "WhoeIW7UTn7NC7L0t/4x3vU/YYSS1oeUxYgiGXQLd82Kaf1qtlxOex3ETY0+o2QuRgAdyursMlUhQBKDCfMUkQ=="; + url = "https://registry.npmjs.org/token-types/-/token-types-4.1.1.tgz"; + sha512 = "hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w=="; }; }; "toml-2.3.6" = { @@ -58893,13 +58822,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.4.0" = { + "torrent-discovery-9.4.4" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.0"; + version = "9.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.0.tgz"; - sha512 = "+YW9JGbO5bCuDw9YYW//p4iVLV0aP4C+AYrNQjL/+dSNPUtD1ufK1V8UZERt6rIoeNGhutkSVyeO4Fid9Tjxjg=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.4.tgz"; + sha512 = "psD/QcqSevMouHFbPKz4V9X5u2HuR/SaxeIp2T/JAduHKmDoq/pgxMQiAe/4DlhDgSCIAYWEB2xKP0dUTInBpQ=="; }; }; "torrent-piece-1.1.2" = { @@ -59082,13 +59011,13 @@ let sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="; }; }; - "tree-kit-0.6.2" = { + "tree-kit-0.7.0" = { name = "tree-kit"; packageName = "tree-kit"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.6.2.tgz"; - sha512 = "95UzJA0EMbFfu5sGUUOoXixQMUGkwu82nGM4lmqLyQl+R4H3FK+lS0nT8TZJ5x7JhSHy+saVn7/AOqh6d+tmOg=="; + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.0.tgz"; + sha512 = "MAqFo2oJJ39zmxq3xETx0nMAgZw2z6pnJPjIAehEcrDaeePDhBBTshAlyhCDtezMDTIu1Av+vGE501xN3Sh8VA=="; }; }; "treeify-1.1.0" = { @@ -59235,6 +59164,15 @@ let sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; }; }; + "ts-interface-checker-0.1.13" = { + name = "ts-interface-checker"; + packageName = "ts-interface-checker"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz"; + sha512 = "Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="; + }; + }; "ts-invariant-0.4.4" = { name = "ts-invariant"; packageName = "ts-invariant"; @@ -59244,6 +59182,15 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; + "ts-invariant-0.9.1" = { + name = "ts-invariant"; + packageName = "ts-invariant"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.9.1.tgz"; + sha512 = "hSeYibh29ULlHkuEfukcoiyTct+s2RzczMLTv4x3NWC/YrBy7x7ps5eYq/b4Y3Sb9/uAlf54+/5CAEMVxPhuQw=="; + }; + }; "ts-loader-8.0.4" = { name = "ts-loader"; packageName = "ts-loader"; @@ -59730,15 +59677,6 @@ let sha512 = "IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw=="; }; }; - "type-fest-0.5.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz"; - sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="; - }; - }; "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; @@ -59820,13 +59758,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.4.1" = { + "typegram-3.4.3" = { name = "typegram"; packageName = "typegram"; - version = "3.4.1"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.4.1.tgz"; - sha512 = "O3HT/D46tsiIX1Y83gGF6sFoJiEITcqM5S8l8Iz9eyjDvarXFzUQ4mNoHZHoJ1JXlokB17GJk/vOT7Nx+TcpNA=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.4.3.tgz"; + sha512 = "pH0TQJzCWM2+7y6yiBoQVNt7PO9ZvAu/lQukVx4sm68FIBBZEBWI+2MzuMcdbwrD5mD5NrEMAyml9N6DupUZag=="; }; }; "typescript-2.9.2" = { @@ -59991,6 +59929,15 @@ let sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; }; }; + "uglify-js-3.14.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; + sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -60198,15 +60145,6 @@ let sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A=="; }; }; - "underscore-1.12.1" = { - name = "underscore"; - packageName = "underscore"; - version = "1.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz"; - sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; - }; - }; "underscore-1.13.1" = { name = "underscore"; packageName = "underscore"; @@ -61215,13 +61153,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.1" = { + "url-parse-1.5.3" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz"; - sha512 = "HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz"; + sha512 = "IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ=="; }; }; "url-parse-lax-1.0.0" = { @@ -61360,13 +61298,13 @@ let sha512 = "3XZZuJSeoIUyMYSuDbTbVtP4KAVGHPfU8nmHFkr8LJc+THCaUXwnu/2AV+LCSLarET/hL9IlbNfYTGrt6fOVuQ=="; }; }; - "ut_pex-3.0.1" = { + "ut_pex-3.0.2" = { name = "ut_pex"; packageName = "ut_pex"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ut_pex/-/ut_pex-3.0.1.tgz"; - sha512 = "t1MHIDHSISgOJcmq8UM6Qv9/hRQYVaUvzqSNnXa5ATDbS9hXfhBpyBo2HcSyJtwPSHsmMtNui8G6yKirwJ8vow=="; + url = "https://registry.npmjs.org/ut_pex/-/ut_pex-3.0.2.tgz"; + sha512 = "3xM88t+AVU5GR0sIY3tmRMLUS+YKiwStc7U7+ZFQ+UHQpX7BjVJOomhmtm0Bs+8R2n812Dt2ymXm01EqDrOOpQ=="; }; }; "utf-8-validate-1.2.2" = { @@ -61432,15 +61370,6 @@ let sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048"; }; }; - "utif-2.0.1" = { - name = "utif"; - packageName = "utif"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utif/-/utif-2.0.1.tgz"; - sha512 = "Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg=="; - }; - }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -61558,6 +61487,15 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; + "utility-types-3.10.0" = { + name = "utility-types"; + packageName = "utility-types"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz"; + sha512 = "O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -61765,6 +61703,15 @@ let sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813"; }; }; + "value-or-promise-1.0.10" = { + name = "value-or-promise"; + packageName = "value-or-promise"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.10.tgz"; + sha512 = "1OwTzvcfXkAfabk60UVr5NdjtjJ0Fg0T5+B1bhxtrOEwSH2fe8y4DnLgoksfCyd8yZCOQQHB0qLMQnwgCjbXLQ=="; + }; + }; "value-or-promise-1.0.6" = { name = "value-or-promise"; packageName = "value-or-promise"; @@ -62170,13 +62117,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.3.0" = { + "verda-1.3.2" = { name = "verda"; packageName = "verda"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.3.0.tgz"; - sha512 = "EldyK2oyHMxIKj5aMC1R75aN1XH8vH96ga1PgkuXrK5ZhYndR4g8TvBTomXpIgGvwhICjq5LZITZ37Xz/YHxAg=="; + url = "https://registry.npmjs.org/verda/-/verda-1.3.2.tgz"; + sha512 = "uheYzfPZDvcyXX5nR/eAIB2jKtvbCPhmcEpbJESU7I3QykvIvZWozdb5MEdBAx9e6LyS6TqtBp6BwGBMTO7Xow=="; }; }; "verror-1.1.0" = { @@ -62575,22 +62522,22 @@ let sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; }; }; - "vscode-debugadapter-testsupport-1.47.0" = { + "vscode-debugadapter-testsupport-1.48.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; - version = "1.47.0"; + version = "1.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.47.0.tgz"; - sha512 = "zhEuaMt2RCOcJoTZ5p35k2WhCzk51UN1PlrtwfWJ8fiFhjDvXIG+682Wkq1VyL12EhTf4qOLMLn0X4JlX7eJ6g=="; + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.48.0.tgz"; + sha512 = "XSPgfFleyHEWvzL1PqleQr+/bFBcqJEKb8lp+fi4xt+JYchNi9Onom+uGpEi22R9hVLdq1J3rE67FTK1xPr1og=="; }; }; - "vscode-debugprotocol-1.47.0" = { + "vscode-debugprotocol-1.48.0" = { name = "vscode-debugprotocol"; packageName = "vscode-debugprotocol"; - version = "1.47.0"; + version = "1.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.47.0.tgz"; - sha512 = "ii7oCz3Wfr/SGtFr5AYop5dJm0dUmpg0hq2lTzTBdaht8nSheYMMjPntxULBR+2TUxXLcCKFZkF2UEJQduYsIQ=="; + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.48.0.tgz"; + sha512 = "l2jtStdGHAca+B/ZmGAeYZtx7NHT9SY9LL6g0QeImKZjQ9P7S6wB2lcBwz1LSkgFltwLw197yFULnCr36OkLKA=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -63142,13 +63089,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.9.0" = { + "vue-eslint-parser-7.10.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.9.0"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz"; - sha512 = "QBlhZ5LteDRVy2dISfQhNEmmcqph+GTaD4SH41bYzXcVHFPJ9p34zCG6QAqOZVa8PKaVgbomFnoZpGJRZi14vg=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz"; + sha512 = "7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -63376,13 +63323,13 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "web3-utils-1.4.0" = { + "web3-utils-1.5.1" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.4.0.tgz"; - sha512 = "b8mEhwh/J928Xk+SQFjtqrR2EGPhpknWLcIt9aCpVPVRXiqjUGo/kpOHKz0azu9c6/onEJ9tWXZt0cVjmH0N5Q=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.1.tgz"; + sha512 = "U8ULaMBwjkp9Rn+kRLjUmgAUHwPqDrM5/Q9tPKgvuDKtMWUggTLC33/KF8RY+PyAhSAlnD+lmNGfZnbjmVKBxQ=="; }; }; "webassemblyjs-1.11.1" = { @@ -63457,15 +63404,6 @@ let sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; }; - "webpack-5.43.0" = { - name = "webpack"; - packageName = "webpack"; - version = "5.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.43.0.tgz"; - sha512 = "ex3nB9uxNI0azzb0r3xGwi+LS5Gw1RCRSKk0kg3kq9MYdIPmLS6UI3oEtG7esBaB51t9I+5H+vHmL3htaxqMSw=="; - }; - }; "webpack-5.45.1" = { name = "webpack"; packageName = "webpack"; @@ -63475,6 +63413,15 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; + "webpack-5.50.0" = { + name = "webpack"; + packageName = "webpack"; + version = "5.50.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.50.0.tgz"; + sha512 = "hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag=="; + }; + }; "webpack-bundle-analyzer-3.9.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; @@ -63511,15 +63458,6 @@ let sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; }; }; - "webpack-deep-scope-plugin-1.6.0" = { - name = "webpack-deep-scope-plugin"; - packageName = "webpack-deep-scope-plugin"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-deep-scope-plugin/-/webpack-deep-scope-plugin-1.6.0.tgz"; - sha512 = "ZYldKNeWQtk9SoV70x7Eb2NRmvHMtNBOjscs0wUdg/pfymntiF+0W/D9v2o76ztufjND6RNFjNVnyFQww25AZg=="; - }; - }; "webpack-dev-middleware-3.7.3" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; @@ -63619,6 +63557,15 @@ let sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; }; }; + "webpack-sources-3.2.0" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha512 = "fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw=="; + }; + }; "webpack-stream-6.1.0" = { name = "webpack-stream"; packageName = "webpack-stream"; @@ -63664,13 +63611,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.2.5" = { + "webtorrent-1.3.9" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.2.5"; + version = "1.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.5.tgz"; - sha512 = "EvtAQ3rK4c7Kf4ZGxYOGvi8Jih8qsZka1IgNB8T5Vxw5UzSNG1nxTVNNTXL0jFhQUMsyRwIOkTgd7ZkJY6bqsw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.9.tgz"; + sha512 = "K52E15SutGIgrBj0YzYNYgkuQMucKePdGk2zxMwLHtFh9sJ0KVPlQgkmORhSbJqC51cRVq/4Xt2jToZde8ioRQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -63862,13 +63809,13 @@ let sha1 = "20b721df05b35b706176ffa10b0909aba4603035"; }; }; - "which-typed-array-1.1.4" = { + "which-typed-array-1.1.6" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz"; - sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.6.tgz"; + sha512 = "DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q=="; }; }; "wide-align-1.1.3" = { @@ -63925,13 +63872,13 @@ let sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA=="; }; }; - "wikipeg-2.0.5" = { + "wikipeg-2.0.6" = { name = "wikipeg"; packageName = "wikipeg"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.5.tgz"; - sha512 = "FMNznSW4Qjexmgqz23YLtXoS6+GKPnbkEsI14xdRxsWv8jQWJ94ffQZ4PpUSsZm7/XAjqrjFiUnbvOOxBhJY4g=="; + url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.6.tgz"; + sha512 = "b3Ni/3kKzoHfqL8OdbwHELvEdFt3jyZfjgNXzz0pDvAu7++DdaKE9iCceyzHS2lOdAidyREcUVRY4F9kWwd/Lg=="; }; }; "wildcard-2.0.0" = { @@ -64195,159 +64142,6 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; - "workbox-background-sync-6.1.5" = { - name = "workbox-background-sync"; - packageName = "workbox-background-sync"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.1.5.tgz"; - sha512 = "VbUmPLsdz+sLzuNxHvMylzyRTiM4q+q7rwLBk3p2mtRL5NZozI8j/KgoGbno96vs84jx4b9zCZMEOIKEUTPf6w=="; - }; - }; - "workbox-broadcast-update-6.1.5" = { - name = "workbox-broadcast-update"; - packageName = "workbox-broadcast-update"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.1.5.tgz"; - sha512 = "zGrTTs+n4wHpYtqYMqBg6kl/x5j1UrczGCQnODSHTxIDV8GXLb/GtA1BCZdysNxpMmdVSeLmTcgIYAAqWFamrA=="; - }; - }; - "workbox-build-6.1.5" = { - name = "workbox-build"; - packageName = "workbox-build"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-build/-/workbox-build-6.1.5.tgz"; - sha512 = "P+fakR5QFVqJN9l9xHVXtmafga72gh9I+jM3A9HiB/6UNRmOAejXnDgD+RMegOHgQHPwnB44TalMToFaXKWIyA=="; - }; - }; - "workbox-cacheable-response-6.1.5" = { - name = "workbox-cacheable-response"; - packageName = "workbox-cacheable-response"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.1.5.tgz"; - sha512 = "x8DC71lO/JCgiaJ194l9le8wc8lFPLgUpDkLhp2si7mXV6S/wZO+8Osvw1LLgYa8YYTWGbhbFhFTXIkEMknIIA=="; - }; - }; - "workbox-core-6.1.5" = { - name = "workbox-core"; - packageName = "workbox-core"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-core/-/workbox-core-6.1.5.tgz"; - sha512 = "9SOEle7YcJzg3njC0xMSmrPIiFjfsFm9WjwGd5enXmI8Lwk8wLdy63B0nzu5LXoibEmS9k+aWF8EzaKtOWjNSA=="; - }; - }; - "workbox-expiration-6.1.5" = { - name = "workbox-expiration"; - packageName = "workbox-expiration"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.1.5.tgz"; - sha512 = "6cN+FVbh8fNq56LFKPMchGNKCJeyboHsDuGBqmhDUPvD4uDjsegQpDQzn52VaE0cpywbSIsDF/BSq9E9Yjh5oQ=="; - }; - }; - "workbox-google-analytics-6.1.5" = { - name = "workbox-google-analytics"; - packageName = "workbox-google-analytics"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.1.5.tgz"; - sha512 = "LYsJ/VxTkYVLxM1uJKXZLz4cJdemidY7kPyAYtKVZ6EiDG89noASqis75/5lhqM1m3HwQfp2DtoPrelKSpSDBA=="; - }; - }; - "workbox-navigation-preload-6.1.5" = { - name = "workbox-navigation-preload"; - packageName = "workbox-navigation-preload"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.1.5.tgz"; - sha512 = "hDbNcWlffv0uvS21jCAC/mYk7NzaGRSWOQXv1p7bj2aONAX5l699D2ZK4D27G8TO0BaLHUmW/1A5CZcsvweQdg=="; - }; - }; - "workbox-precaching-6.1.5" = { - name = "workbox-precaching"; - packageName = "workbox-precaching"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.1.5.tgz"; - sha512 = "yhm1kb6wgi141JeM5X7z42XJxCry53tbMLB3NgrxktrZbwbrJF8JILzYy+RFKC9tHC6u2bPmL789GPLT2NCDzw=="; - }; - }; - "workbox-range-requests-6.1.5" = { - name = "workbox-range-requests"; - packageName = "workbox-range-requests"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.1.5.tgz"; - sha512 = "iACChSapzB0yuIum3ascP/+cfBNuZi5DRrE+u4u5mCHigPlwfSWtlaY+y8p+a8EwcDTVTZVtnrGrRnF31SiLqQ=="; - }; - }; - "workbox-recipes-6.1.5" = { - name = "workbox-recipes"; - packageName = "workbox-recipes"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.1.5.tgz"; - sha512 = "MD1yabHca6O/oj1hrRdfj9cRwhKA5zqIE53rWOAg/dKMMzWQsf9nyRbXRgzK3a13iQvYKuQzURU4Cx58tdnR+Q=="; - }; - }; - "workbox-routing-6.1.5" = { - name = "workbox-routing"; - packageName = "workbox-routing"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.1.5.tgz"; - sha512 = "uC/Ctz+4GXGL42h1WxUNKxqKRik/38uS0NZ6VY/EHqL2F1ObLFqMHUZ4ZYvyQsKdyI82cxusvhJZHOrY0a2fIQ=="; - }; - }; - "workbox-strategies-6.1.5" = { - name = "workbox-strategies"; - packageName = "workbox-strategies"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.1.5.tgz"; - sha512 = "QhiOn9KT9YGBdbfWOmJT6pXZOIAxaVrs6J6AMYzRpkUegBTEcv36+ZhE/cfHoT0u2fxVtthHnskOQ/snEzaXQw=="; - }; - }; - "workbox-streams-6.1.5" = { - name = "workbox-streams"; - packageName = "workbox-streams"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.1.5.tgz"; - sha512 = "OI1kLvRHGFXV+soDvs6aEwfBwdAkvPB0mRryqdh3/K17qUj/1gRXc8QtpgU+83xqx/I/ar2bTCIj0KPzI/ChCQ=="; - }; - }; - "workbox-sw-6.1.5" = { - name = "workbox-sw"; - packageName = "workbox-sw"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.1.5.tgz"; - sha512 = "IMDiqxYbKzPorZLGMUMacLB6r76iVQbdTzYthIZoPfy+uFURJFUtqiWQJKg1L+RMyuYXwKXTahCIGkgFs4jBeg=="; - }; - }; - "workbox-webpack-plugin-6.1.5" = { - name = "workbox-webpack-plugin"; - packageName = "workbox-webpack-plugin"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.1.5.tgz"; - sha512 = "tsgeNAYiFP4STNPDxBVT58eiU8nGUmcv7Lq9FFJkQf5MMu6tPw1OLp+KpszhbCWP+R/nEdu85Gjexs6fY647Kg=="; - }; - }; - "workbox-window-6.1.5" = { - name = "workbox-window"; - packageName = "workbox-window"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-window/-/workbox-window-6.1.5.tgz"; - sha512 = "akL0X6mAegai2yypnq78RgfazeqvKbsllRtEI4dnbhPcRINEY1NmecFmsQk8SD+zWLK1gw5OdwAOX+zHSRVmeA=="; - }; - }; "worker-farm-1.7.0" = { name = "worker-farm"; packageName = "worker-farm"; @@ -64357,15 +64151,6 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "worker-loader-2.0.0" = { - name = "worker-loader"; - packageName = "worker-loader"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz"; - sha512 = "tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw=="; - }; - }; "worker-rpc-0.1.1" = { name = "worker-rpc"; packageName = "worker-rpc"; @@ -64411,15 +64196,6 @@ let sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; }; }; - "wrap-ansi-4.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz"; - sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg=="; - }; - }; "wrap-ansi-5.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -64654,6 +64430,15 @@ let sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; }; }; + "ws-8.0.0" = { + name = "ws"; + packageName = "ws"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.0.0.tgz"; + sha512 = "6AcSIXpBlS0QvCVKk+3cWnWElLsA6SzC0lkQ43ciEglgXJXiCWK3/CGFEJ+Ybgp006CMibamAsqOlxE9s4AvYA=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -64735,13 +64520,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.50" = { + "xdl-59.0.53" = { name = "xdl"; packageName = "xdl"; - version = "59.0.50"; + version = "59.0.53"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.50.tgz"; - sha512 = "T1QdEP3U4m0BfeqRWPJ1J9ywlmicFTM8zBWPqP/1Xw6V/cpX2QHRfhLpl60uEiD7HsCcAPXTe1zIo8khDhFYvA=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.53.tgz"; + sha512 = "U98lIdfMfwwUTmXwsF5t9Pu/VJSe+Bxb/1v0HWq6UK1VoA13EE2cE5JRBGFmu0+mkrust/Mp6AN289VKpguilw=="; }; }; "xenvar-0.5.1" = { @@ -64843,15 +64628,6 @@ let sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; }; }; - "xml-parse-from-string-1.0.1" = { - name = "xml-parse-from-string"; - packageName = "xml-parse-from-string"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz"; - sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28"; - }; - }; "xml2js-0.2.4" = { name = "xml2js"; packageName = "xml2js"; @@ -65159,13 +64935,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.23.0" = { + "xstate-4.23.1" = { name = "xstate"; packageName = "xstate"; - version = "4.23.0"; + version = "4.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.23.0.tgz"; - sha512 = "YIKb7thsDfpb6ooWJJuj+UnNZq923dG264zfpS2/vi4dkZz41ugO0ktC6QCBDeMfH8LBHhhqZ06sR4AYgWWnWg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.23.1.tgz"; + sha512 = "8ZoCe8d6wDSPfkep+GBgi+fKAdMyXcaizoNf5FKceEhlso4+9n1TeK6oviaDsXZ3Z5O8xKkJOxXPNuD4cA9LCw=="; }; }; "xstream-11.14.0" = { @@ -65411,6 +65187,15 @@ let sha512 = "xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ=="; }; }; + "yargs-17.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "17.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.1.0.tgz"; + sha512 = "SQr7qqmQ2sNijjJGHL4u7t8vyDZdZ3Ahkmo4sc1w5xI9TBX0QDdG/g4SFnxtWOsGLjwHQue57eFALfwFCnixgg=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -65591,13 +65376,13 @@ let sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; }; }; - "yarn-1.22.10" = { + "yarn-1.22.11" = { name = "yarn"; packageName = "yarn"; - version = "1.22.10"; + version = "1.22.11"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz"; - sha512 = "IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.11.tgz"; + sha512 = "AWje4bzqO9RUn3sdnM5N8n4ZJ0BqCc/kqFJvpOI5/EVkINXui0yuvU7NDCEF//+WaxHuNay2uOHxA4+tq1P3cg=="; }; }; "yarn-1.22.4" = { @@ -65654,22 +65439,22 @@ let sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7"; }; }; - "yeoman-doctor-4.0.0" = { + "yeoman-doctor-5.0.0" = { name = "yeoman-doctor"; packageName = "yeoman-doctor"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-4.0.0.tgz"; - sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; + url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-5.0.0.tgz"; + sha512 = "9Ni+uXWeFix9+1t7s1q40zZdbcpdi/OwgD4N4cVaqI+bppPciOOXQ/RSggannwZu8m8zrSWELn6/93G7308jgg=="; }; }; - "yeoman-environment-3.4.1" = { + "yeoman-environment-3.5.1" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.4.1.tgz"; - sha512 = "Bu3kN5sTOyAcbO/cKEQf6KOxsLta9oRF59saLOKnt3OQM+hXapnWaAHcrat3dygd6l34KjxwM5AMJp09TDa8yw=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.5.1.tgz"; + sha512 = "XIJoCQDNlttjFubWL+tpf+t1MkFUdsqwtJvR2qhfzhHi8Z7ZzAwiBPgCtTiLK1mwPTfqzV/V0E9l7zX7hrhBdg=="; }; }; "yesno-0.3.1" = { @@ -65753,6 +65538,15 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; + "zen-observable-ts-1.1.0" = { + name = "zen-observable-ts"; + packageName = "zen-observable-ts"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz"; + sha512 = "1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA=="; + }; + }; "zeromq-5.2.8" = { name = "zeromq"; packageName = "zeromq"; @@ -65807,6 +65601,15 @@ let sha1 = "66c6de82cc36b09734b820703776490a6fbbe624"; }; }; + "zod-1.11.17" = { + name = "zod"; + packageName = "zod"; + version = "1.11.17"; + src = fetchurl { + url = "https://registry.npmjs.org/zod/-/zod-1.11.17.tgz"; + sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; + }; + }; "zwitch-1.0.5" = { name = "zwitch"; packageName = "zwitch"; @@ -65831,29 +65634,29 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.1.2"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.2.tgz"; - sha512 = "oBJcSqXJyPzWGYft5/nD3hJhunxTGXlI4++9ehzdF/fRipOLLMqf77vi/4rUA2DGuaPMbYJeunBnIsgXRGIHIg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.0.tgz"; + sha512 = "gxw4e3Wb1YgNE+f9sX90xea5vXatqvlYq3mOWFUWVKYcayAgnt9z97a1ULEkSytS1aVjyL44zzkU/QFufPpadQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1201.2" - sources."@angular-devkit/core-12.1.2" - sources."@angular-devkit/schematics-12.1.2" + sources."@angular-devkit/architect-0.1202.0" + sources."@angular-devkit/core-12.2.0" + sources."@angular-devkit/schematics-12.2.0" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.1.2" + sources."@schematics/angular-12.2.0" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" - sources."ajv-8.6.0" + sources."ajv-8.6.2" sources."ajv-formats-2.1.0" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" @@ -65881,7 +65684,7 @@ in sources."builtins-1.0.3" sources."cacache-15.2.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" @@ -65897,7 +65700,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."defaults-1.0.3" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" @@ -65934,7 +65737,7 @@ in }) sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ @@ -65960,7 +65763,12 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.1.1" + (sources."inquirer-8.1.2" // { + dependencies = [ + sources."rxjs-7.3.0" + sources."tslib-2.1.0" + ]; + }) sources."ip-1.1.5" sources."is-core-module-2.5.0" sources."is-docker-2.2.1" @@ -65986,8 +65794,8 @@ in sources."lru-cache-6.0.0" sources."magic-string-0.25.7" sources."make-fetch-happen-9.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minipass-3.1.3" @@ -66021,7 +65829,7 @@ in sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-11.3.4" + sources."pacote-11.3.5" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."performance-now-2.1.0" @@ -66031,7 +65839,7 @@ in sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" (sources."request-2.88.2" // { dependencies = [ @@ -66050,7 +65858,7 @@ in sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.7.3" @@ -66062,7 +65870,7 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."through-2.3.8" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" @@ -66277,7 +66085,7 @@ in sources."mimic-response-1.0.1" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" (sources."gulp-vinyl-zip-2.2.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -66326,8 +66134,8 @@ in sources."map-obj-4.2.1" sources."marky-1.2.2" sources."matcher-2.1.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -66416,7 +66224,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -66479,7 +66287,7 @@ in sources."big-integer-1.6.48" sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" @@ -66514,7 +66322,7 @@ in sources."fast-levenshtein-2.0.6" sources."figures-3.2.0" sources."form-data-4.0.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."html-encoding-sniffer-2.0.1" sources."http-proxy-agent-4.0.1" @@ -66526,7 +66334,7 @@ in sources."is-potential-custom-element-name-1.0.1" sources."is-promise-2.2.2" sources."is-wsl-2.2.0" - (sources."jsdom-16.6.0" // { + (sources."jsdom-16.7.0" // { dependencies = [ sources."form-data-3.0.1" ]; @@ -66535,8 +66343,8 @@ in sources."lodash-4.17.21" sources."lowdb-1.0.0" sources."lunr-2.3.9" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -66603,13 +66411,13 @@ in "@hyperspace/cli" = nodeEnv.buildNodePackage { name = "_at_hyperspace_slash_cli"; packageName = "@hyperspace/cli"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hyperspace/cli/-/cli-1.5.1.tgz"; - sha512 = "+VU/4tWRLf8jVMYyYo1A/rzkZHg0F3LLSvxNti0515a8VD8iyGbyd07nbh88yZC0SWpzMtUZ9ULtKXB2E53MWQ=="; + url = "https://registry.npmjs.org/@hyperspace/cli/-/cli-2.0.0.tgz"; + sha512 = "YWis7dhbGR5LkGYj7rV3BA/gUusfuugze3LIQUeoggPdF2rdeOZXewSPUydM3UBfsptt0qyw0bPQS+fKT0KDVw=="; }; dependencies = [ - sources."@corestore/networker-1.1.0" + sources."@corestore/networker-1.2.0" sources."@hyperspace/client-1.18.0" sources."@hyperspace/migration-tool-1.2.1" sources."@hyperspace/rpc-1.15.1" @@ -66618,7 +66426,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -66653,7 +66461,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-json-2.0.0" sources."buffer-json-encoding-1.0.2" sources."bulk-write-stream-1.1.4" @@ -66723,7 +66531,7 @@ in sources."encoding-down-6.3.0" sources."end-of-stream-1.4.4" sources."errno-0.1.8" - (sources."es-abstract-1.18.3" // { + (sources."es-abstract-1.18.5" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -66760,13 +66568,14 @@ in sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hashlru-2.3.0" sources."he-1.2.0" sources."hmac-blake2b-2.0.0" sources."hrpc-2.2.0" sources."hrpc-runtime-2.1.1" sources."hyperbeam-1.1.3" - sources."hyperbee-1.5.5" + sources."hyperbee-1.6.0" sources."hypercore-9.10.0" (sources."hypercore-byte-stream-1.0.12" // { dependencies = [ @@ -66788,7 +66597,7 @@ in ]; }) sources."hypercore-streams-1.0.1" - sources."hyperdrive-10.20.0" + sources."hyperdrive-10.21.0" sources."hyperdrive-schemas-2.0.0" sources."hyperspace-3.19.0" (sources."hyperspace-mirroring-service-1.0.7" // { @@ -66805,25 +66614,26 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inspect-custom-symbol-1.1.1" + sources."internal-slot-1.0.3" sources."ipv4-peers-2.0.0" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.3" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-2.0.5" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-options-1.0.1" sources."is-property-1.0.2" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -66936,6 +66746,7 @@ in sources."readable-stream-3.6.0" ]; }) + sources."queue-tick-1.0.0" sources."random-access-file-2.2.0" sources."random-access-memory-3.1.2" sources."random-access-storage-1.4.1" @@ -66972,6 +66783,7 @@ in ]; }) sources."shuffled-priority-queue-2.1.0" + sources."side-channel-1.0.4" sources."signed-varint-2.0.1" (sources."simple-handshake-3.0.0" // { dependencies = [ @@ -67003,7 +66815,7 @@ in sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.10.3" + sources."streamx-2.11.1" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -67030,7 +66842,7 @@ in sources."supports-color-2.0.0" sources."temp-dir-1.0.0" sources."tempy-0.1.0" - sources."textextensions-5.12.0" + sources."textextensions-5.14.0" (sources."through2-4.0.2" // { dependencies = [ sources."readable-stream-3.6.0" @@ -67108,22 +66920,22 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "8.0.2"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.0.2.tgz"; - sha512 = "q46mQvqhRkmnG6fXTzL9Wk7CtDxRaa2rE1IrDX3CgXaeOgjBZsA3oJKkIqelQHfKWvPGuU6yV6gDF5pOXNXixw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.1.1.tgz"; + sha512 = "Jo/vYyrDHJhRIoFevO+A955KX7aLSAV6gn0sbIJBDTKiha1yxfgEbHOk8qP24gNFLwiDn2CKbwph2g6z0v/mNw=="; }; dependencies = [ - sources."@angular-devkit/core-12.1.1" - sources."@angular-devkit/schematics-12.1.1" - (sources."@angular-devkit/schematics-cli-12.1.1" // { + sources."@angular-devkit/core-12.1.4" + sources."@angular-devkit/schematics-12.1.4" + (sources."@angular-devkit/schematics-cli-12.1.4" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."inquirer-8.1.1" ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -67140,15 +66952,15 @@ in sources."@angular-devkit/schematics-12.0.5" sources."ajv-8.2.0" sources."ajv-formats-2.0.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."ora-5.4.0" ]; }) sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" - sources."@types/estree-0.0.49" - sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.0" + sources."@types/estree-0.0.50" + sources."@types/json-schema-7.0.9" + sources."@types/node-16.4.13" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -67183,11 +66995,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -67206,7 +67018,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" @@ -67214,7 +67026,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67240,9 +67052,9 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - (sources."fork-ts-checker-webpack-plugin-6.2.12" // { + (sources."fork-ts-checker-webpack-plugin-6.3.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."fs-extra-9.1.0" ]; }) @@ -67255,7 +67067,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."human-signals-1.1.1" @@ -67266,7 +67078,7 @@ in sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) sources."interpret-1.4.0" @@ -67278,7 +67090,7 @@ in sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-number-7.0.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" (sources."jest-worker-27.0.6" // { @@ -67299,7 +67111,7 @@ in sources."lodash.toarray-4.4.0" (sources."log-symbols-4.1.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) sources."lru-cache-6.0.0" @@ -67307,15 +67119,15 @@ in sources."magic-string-0.25.7" sources."memfs-3.2.2" sources."merge-stream-2.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -67323,10 +67135,10 @@ in sources."onetime-5.1.2" (sources."ora-5.4.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) - sources."os-name-4.0.0" + sources."os-name-4.0.1" sources."os-tmpdir-1.0.2" sources."p-limit-3.1.0" sources."parent-module-1.0.1" @@ -67400,7 +67212,7 @@ in sources."tsconfig-paths-3.10.1" (sources."tsconfig-paths-webpack-plugin-3.5.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) sources."tslib-1.14.1" @@ -67411,7 +67223,7 @@ in sources."util-deprecate-1.0.2" sources."watchpack-2.2.0" sources."wcwidth-1.0.1" - (sources."webpack-5.43.0" // { + (sources."webpack-5.45.1" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -67461,37 +67273,37 @@ in sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-compilation-targets-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -67525,8 +67337,8 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -67538,10 +67350,10 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -67553,24 +67365,24 @@ in sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" - sources."@babel/plugin-transform-typescript-7.14.6" + sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.8" + sources."@babel/preset-env-7.15.0" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.14.5" - (sources."@babel/register-7.14.5" // { + sources."@babel/preset-typescript-7.15.0" + (sources."@babel/register-7.15.3" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -67607,7 +67419,7 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.4" - sources."@types/http-assert-1.5.1" + sources."@types/http-assert-1.5.2" sources."@types/http-errors-1.8.1" sources."@types/inquirer-6.5.0" (sources."@types/jscodeshift-0.7.2" // { @@ -67623,7 +67435,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67638,13 +67450,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.1.5" // { + (sources."@vue/compiler-core-3.2.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.1.5" - sources."@vue/shared-3.1.5" + sources."@vue/compiler-dom-3.2.1" + sources."@vue/shared-3.2.1" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -67712,7 +67524,7 @@ in sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-polyfill-corejs2-0.2.2" - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -67746,13 +67558,13 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."busboy-0.3.1" sources."bytes-3.1.0" @@ -67766,7 +67578,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -67801,7 +67613,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -67823,12 +67635,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.15.2" + sources."core-js-pure-3.16.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -67894,14 +67706,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -67977,7 +67789,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.155.1" + sources."flow-parser-0.157.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -68025,7 +67837,7 @@ in sources."into-stream-3.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphql-14.7.0" sources."graphql-extensions-0.15.0" sources."graphql-subscriptions-1.2.1" @@ -68045,6 +67857,7 @@ in sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.2" sources."has-to-string-tag-x-1.4.1" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -68069,7 +67882,7 @@ in (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -68080,17 +67893,18 @@ in sources."supports-color-7.2.0" ]; }) + sources."internal-slot-1.0.3" sources."into-stream-2.0.1" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" @@ -68104,16 +67918,16 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" @@ -68134,7 +67948,7 @@ in (sources."jscodeshift-0.11.0" // { dependencies = [ sources."ast-types-0.14.2" - sources."recast-0.20.4" + sources."recast-0.20.5" sources."source-map-0.6.1" sources."tslib-2.3.0" ]; @@ -68185,8 +67999,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -68228,7 +68042,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -68353,7 +68167,7 @@ in }) sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ @@ -68413,6 +68227,7 @@ in sources."shell-quote-1.7.2" sources."shellwords-0.1.1" sources."shortid-2.2.16" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -68456,7 +68271,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -68518,7 +68333,7 @@ in sources."cross-spawn-7.0.3" sources."execa-3.4.0" sources."get-stream-5.2.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" sources."onetime-5.1.2" @@ -68787,12 +68602,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.8" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/generator-7.15.0" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.8" + sources."@babel/types-7.15.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -68867,55 +68682,55 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.8" // { + (sources."@babel/generator-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" - sources."async-3.2.0" + sources."async-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001246" + sources."browserslist-4.16.7" + sources."caniuse-lite-1.0.30001249" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" - sources."commander-8.0.0" + sources."commander-8.1.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68935,7 +68750,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" @@ -68961,7 +68776,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -69009,7 +68824,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -69043,13 +68858,13 @@ in sha512 = "L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A=="; }; dependencies = [ - sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001246" - sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.782" + sources."browserslist-4.16.7" + sources."caniuse-lite-1.0.30001249" + sources."colorette-1.3.0" + sources."electron-to-chromium-1.3.802" sources."escalade-3.1.1" sources."fraction.js-4.1.1" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-range-0.1.2" sources."postcss-value-parser-4.1.0" ]; @@ -69073,14 +68888,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.951.0" // { + (sources."aws-sdk-2.965.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69098,7 +68913,7 @@ in sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."bytes-3.1.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.5.0" @@ -69109,7 +68924,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.0.0" + sources."commander-8.1.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."css-select-4.1.3" @@ -69120,7 +68935,7 @@ in sources."defaults-1.0.3" sources."degenerator-2.2.0" sources."depd-1.1.2" - sources."devtools-protocol-0.0.883894" + sources."devtools-protocol-0.0.901419" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" @@ -69154,7 +68969,7 @@ in sources."get-stream-5.2.0" sources."get-uri-3.0.2" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" sources."http-errors-1.7.3" @@ -69209,7 +69024,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-1.3.2" - (sources."puppeteer-10.1.0" // { + (sources."puppeteer-10.2.0" // { dependencies = [ sources."debug-4.3.1" ]; @@ -69220,7 +69035,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - (sources."rxjs-7.2.0" // { + (sources."rxjs-7.3.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -69230,7 +69045,7 @@ in sources."sax-1.2.1" sources."setprototypeof-1.1.1" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -69284,10 +69099,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.1"; + version = "10.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.1.tgz"; - sha512 = "V3LVbkFNTiy+ctpvCDgEgP8e0myUC/Iupm8D9URkS76SFYibAoMX3elcLVtsOXXqM4QyRrg29iGZj+HB+sQCHg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.6.tgz"; + sha512 = "dzYzWcLVcwbHwKfTp60ml7IYvWOmX6rD2rC/J9A2HT6VzefbcQ4/59YdzoPRhdlvmhblvj17jwExN0xQxOQJhQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -69300,7 +69115,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69411,7 +69226,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" @@ -69426,7 +69241,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -69437,7 +69252,7 @@ in sources."camelcase-6.2.0" sources."caporal-1.4.0" sources."caseless-0.12.0" - sources."cbor-7.0.6" + sources."cbor-8.0.0" sources."cert-info-1.5.1" (sources."chalk-1.1.3" // { dependencies = [ @@ -69490,7 +69305,7 @@ in sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."crypto-js-4.0.0" + sources."crypto-js-4.1.1" sources."crypto-random-string-2.0.0" sources."csv-parse-4.16.0" sources."cycle-1.0.3" @@ -69552,10 +69367,11 @@ in sources."cbor-7.0.5" sources."invoices-1.2.1" sources."ln-service-51.8.2" + sources."nofilter-2.0.3" ]; }) sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -69588,7 +69404,7 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."external-editor-3.1.0" @@ -69641,7 +69457,7 @@ in sources."json2csv-5.0.6" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."jstat-1.9.4" + sources."jstat-1.9.5" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" @@ -69652,6 +69468,7 @@ in sources."bn.js-5.2.0" sources."cbor-7.0.5" sources."invoices-1.2.1" + sources."nofilter-2.0.3" ]; }) (sources."ln-accounting-4.3.1" // { @@ -69664,21 +69481,24 @@ in sources."cbor-7.0.5" sources."lightning-3.3.12" sources."ln-service-51.8.5" + sources."nofilter-2.0.3" sources."ws-7.5.0" ]; }) - (sources."ln-service-51.10.0" // { + (sources."ln-service-51.10.1" // { dependencies = [ sources."@grpc/grpc-js-1.3.6" sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" - sources."@types/node-16.3.3" + sources."@types/node-16.4.3" sources."@types/request-2.48.6" sources."@types/ws-7.4.7" sources."bn.js-5.2.0" + sources."cbor-7.0.6" sources."form-data-2.5.1" - sources."lightning-3.4.0" - sources."ws-7.5.3" + sources."lightning-3.5.0" + sources."nofilter-2.0.3" + sources."ws-8.0.0" ]; }) (sources."ln-sync-0.4.7" // { @@ -69690,8 +69510,10 @@ in sources."@types/request-2.48.6" sources."@types/ws-7.4.7" sources."bn.js-5.2.0" + sources."cbor-7.0.6" sources."form-data-2.5.1" sources."lightning-3.4.0" + sources."nofilter-2.0.3" ]; }) (sources."ln-telegram-3.2.9" // { @@ -69703,7 +69525,7 @@ in sources."@types/request-2.48.6" sources."@types/ws-7.4.6" sources."bn.js-5.2.0" - sources."cbor-7.0.5" + sources."cbor-7.0.6" sources."form-data-2.5.1" sources."lightning-3.3.16" sources."ln-service-51.9.0" @@ -69715,9 +69537,11 @@ in sources."@types/node-15.12.5" sources."@types/request-2.48.5" sources."@types/ws-7.4.5" + sources."cbor-7.0.5" sources."lightning-3.3.12" ]; }) + sources."nofilter-2.0.3" sources."ws-7.5.3" ]; }) @@ -69734,7 +69558,7 @@ in (sources."log-symbols-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."supports-color-7.2.0" ]; }) @@ -69776,12 +69600,12 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.6" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."negotiator-0.6.2" sources."node-addon-api-2.0.2" sources."node-fetch-2.6.1" sources."node-gyp-build-4.2.3" - sources."nofilter-2.0.3" + sources."nofilter-3.0.3" sources."normalize-url-4.5.1" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" @@ -69795,7 +69619,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" @@ -69822,6 +69646,7 @@ in sources."cbor-7.0.5" sources."lightning-3.3.12" sources."ln-service-51.8.5" + sources."nofilter-2.0.3" sources."ws-7.5.0" ]; }) @@ -69843,7 +69668,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" ]; }) sources."proxy-addr-2.0.7" @@ -69877,7 +69702,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.2.0" + sources."rxjs-7.3.0" sources."safe-buffer-5.2.1" sources."safe-compare-1.1.4" sources."safer-buffer-2.1.2" @@ -69935,7 +69760,7 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."telegraf-4.4.0" // { + (sources."telegraf-4.4.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -69958,13 +69783,13 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.4.1" + sources."typegram-3.4.3" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."import-lazy-2.1.0" sources."supports-color-7.2.0" ]; @@ -70109,8 +69934,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -70219,7 +70044,7 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) sources."fs.realpath-1.0.0" @@ -70240,24 +70065,24 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) sources."lodash-4.2.1" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.48.0" + sources."mime-db-1.49.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -70273,7 +70098,7 @@ in sources."path-parse-1.0.7" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) sources."pify-2.3.0" @@ -70298,7 +70123,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -70364,7 +70189,7 @@ in }) sources."browserify-zlib-0.2.0" sources."buffer-5.2.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" @@ -70403,7 +70228,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" @@ -70417,6 +70242,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -70431,20 +70257,21 @@ in sources."inherits-2.0.4" sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.1" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" + sources."internal-slot-1.0.3" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" - sources."is-generator-function-1.0.9" + sources."is-date-object-1.0.5" + sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" - sources."is-string-1.0.6" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."isarray-1.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" @@ -70501,6 +70328,7 @@ in sources."sha.js-2.4.11" sources."shasum-object-1.0.0" sources."shell-quote-1.7.2" + sources."side-channel-1.0.4" sources."simple-concat-1.0.1" sources."source-map-0.5.7" (sources."stream-browserify-3.0.0" // { @@ -70537,7 +70365,7 @@ in sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -70554,17 +70382,17 @@ in btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.1.1.tgz"; - sha512 = "QHoiW1H2P6Sx7L5IEvbZnnQsfy7eaibY/KS2UAX9VINXNdGS9RxqEdLOe9yTdcy5pzIFpQKIBspOnHcBOjVa8A=="; + url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.2.0.tgz"; + sha512 = "Va/hSa8+LRP4o6neRo+us8XttwcmLfwgNykeXhtY3xMu3/Y7I2e4EXb6Zd9jElMVI3teWH7eiyLff0KDjnYJdg=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/parser-7.15.3" + sources."@babel/types-7.15.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -70583,7 +70411,7 @@ in sources."asn1-0.2.4" sources."assert-never-1.2.1" sources."assert-plus-1.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -70594,19 +70422,18 @@ in sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."bech32-1.1.4" - sources."bignumber.js-4.1.0" + sources."bech32-2.0.0" + sources."bignumber.js-9.0.1" sources."bindings-1.5.0" sources."bip174-2.0.1" sources."bip32-2.0.6" sources."bip66-1.1.5" - (sources."bitcoin-core-2.3.0" // { + sources."bitcoin-ops-1.4.1" + (sources."bitcoinjs-lib-5.2.0" // { dependencies = [ - sources."semver-5.7.1" + sources."bech32-1.1.4" ]; }) - sources."bitcoin-ops-1.4.1" - sources."bitcoinjs-lib-5.2.0" sources."bluebird-3.7.2" sources."bn.js-4.12.0" (sources."body-parser-1.19.0" // { @@ -70614,16 +70441,17 @@ in sources."debug-2.6.9" ]; }) - sources."bootstrap-5.0.0-beta3" + sources."bootstrap-5.0.2" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."bs58-4.0.1" sources."bs58check-2.1.2" + sources."btc-rpc-client-git://github.com/btc21/btc-rpc-client" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bunyan-1.8.15" sources."bytes-3.1.0" sources."call-bind-1.0.2" @@ -70633,6 +70461,7 @@ in sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."charenc-0.0.2" + sources."chart.js-3.5.0" sources."cipher-base-1.0.4" sources."cliui-5.0.0" sources."color-convert-1.9.3" @@ -70656,7 +70485,7 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypt-0.0.2" - sources."crypto-js-4.0.0" + sources."crypto-js-4.1.1" sources."csrf-3.1.0" (sources."csurf-1.11.0" // { dependencies = [ @@ -70669,7 +70498,7 @@ in sources."ms-2.1.2" ]; }) - (sources."debugnyan-1.0.0" // { + (sources."debugnyan-2.0.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -70687,7 +70516,7 @@ in sources."destroy-1.0.4" sources."dijkstrajs-1.0.2" sources."doctypes-1.1.0" - sources."dotenv-8.6.0" + sources."dotenv-10.0.0" sources."dtrace-provider-0.8.8" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -70742,6 +70571,7 @@ in sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -70769,14 +70599,14 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-typedarray-1.0.0" sources."isarray-2.0.5" sources."isstream-0.1.2" sources."js-stringify-1.0.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" - sources."json-bigint-0.2.3" + sources."json-bigint-1.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -70795,7 +70625,7 @@ in sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" - (sources."markdown-it-12.1.0" // { + (sources."markdown-it-12.2.0" // { dependencies = [ sources."argparse-2.0.1" sources."entities-2.1.0" @@ -70811,8 +70641,8 @@ in sources."merkle-lib-2.0.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."min-indent-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -70830,7 +70660,7 @@ in }) sources."ms-2.0.0" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."negotiator-0.6.2" sources."normalize-package-data-3.0.2" @@ -70933,11 +70763,11 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.41.1" + sources."simple-git-2.42.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."standard-error-1.1.0" @@ -71023,8 +70853,8 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.0" - sources."addr-to-ip-port-1.5.1" + sources."@types/node-16.4.13" + sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" sources."ansi-regex-1.1.1" @@ -71042,8 +70872,8 @@ in sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."bencode-2.0.1" - sources."bep53-range-1.1.0" + sources."bencode-2.0.2" + sources."bep53-range-1.1.1" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -71064,7 +70894,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" @@ -71085,7 +70915,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-8.0.0" + sources."commander-8.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -71146,7 +70976,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.7" sources."got-1.2.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -71204,8 +71034,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -71265,7 +71095,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."plist-3.0.2" + sources."plist-3.0.3" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" sources."protobufjs-6.11.2" @@ -71349,16 +71179,12 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" sources."stream-transcoder-0.0.5" - (sources."string2compact-1.3.0" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) + sources."string2compact-1.3.2" sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" sources."strip-bom-2.0.0" @@ -71412,7 +71238,7 @@ in ]; }) sources."xmlbuilder-9.0.7" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."xspfr-0.3.1" sources."xtend-4.0.2" ]; @@ -71429,13 +71255,13 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.26"; + version = "1.0.0-beta.36"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.26.tgz"; - sha512 = "+ikLey611rDoxLBiYuFaNJZxZ1ytCppSEzW+wBIfV5mkyV8Ug5ldHuFzpeUxShZToyzqq8TwhQ5A3CGTU0tSJw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.36.tgz"; + sha512 = "gNFGC5atE+EZ+B4kXpvoQm0yh/IRm4XAvVQxh/aJzAAY4lwH+OW3J4VdlGqiVdF+20uLm5HoNYbXWS7Mx+pkDw=="; }; dependencies = [ - sources."@jsii/spec-1.31.0" + sources."@jsii/spec-1.32.0" sources."@types/node-10.17.60" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -71444,11 +71270,11 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.24" - sources."cdk8s-plus-17-1.0.0-beta.30" + sources."cdk8s-1.0.0-beta.27" + sources."cdk8s-plus-17-1.0.0-beta.42" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.31.0" // { + (sources."codemaker-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -71457,7 +71283,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.99" + sources."constructs-3.3.119" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71468,7 +71294,7 @@ in sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -71485,58 +71311,60 @@ in sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."has-tostringtag-1.0.0" + sources."internal-slot-1.0.3" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-fullwidth-code-point-3.0.0" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.31.0" // { + (sources."jsii-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.31.0" // { + (sources."jsii-pacmak-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.31.0" // { + (sources."jsii-reflect-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.31.0" // { + (sources."jsii-rosetta-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.302" // { + (sources."jsii-srcmak-0.1.321" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.272" + sources."json2jsii-0.1.291" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71552,7 +71380,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.31.0" + sources."oo-ascii-tree-1.32.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -71572,7 +71400,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.22" + sources."sscaff-1.2.42" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71590,7 +71418,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" @@ -71621,94 +71449,263 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.4.1.tgz"; - sha512 = "bDK7F4MQFFgzkZBoxMimSu297IJ4duhG1ZpOGG/YcQ9MF/IuIKqlxV6WhWUEfPupnSuZuDQMNCRf/PhKsWcy9Q=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.5.0.tgz"; + sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; }; dependencies = [ - sources."@cdktf/hcl2json-0.4.1" - sources."@jsii/spec-1.31.0" + sources."@apollo/client-3.4.7" + (sources."@apollo/protobufjs-1.2.2" // { + dependencies = [ + sources."@types/node-10.17.60" + ]; + }) + sources."@apollographql/apollo-tools-0.5.1" + sources."@apollographql/graphql-playground-html-1.6.29" + (sources."@ardatan/aggregate-error-0.0.6" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."@babel/code-frame-7.14.5" + sources."@babel/generator-7.15.0" + sources."@babel/helper-validator-identifier-7.14.9" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@babel/parser-7.15.3" + sources."@babel/template-7.14.5" + sources."@babel/types-7.15.0" + sources."@cdktf/hcl2cdk-0.5.0" + sources."@cdktf/hcl2json-0.5.0" + (sources."@graphql-tools/graphql-file-loader-6.2.7" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) + (sources."@graphql-tools/import-6.3.1" // { + dependencies = [ + sources."tslib-2.2.0" + ]; + }) + (sources."@graphql-tools/load-6.2.8" // { + dependencies = [ + sources."tslib-2.2.0" + ]; + }) + (sources."@graphql-tools/merge-6.2.17" // { + dependencies = [ + sources."@graphql-tools/utils-8.0.2" + ]; + }) + (sources."@graphql-tools/mock-8.1.8" // { + dependencies = [ + sources."@graphql-tools/merge-7.0.0" + sources."@graphql-tools/utils-8.0.2" + ]; + }) + (sources."@graphql-tools/schema-8.0.3" // { + dependencies = [ + sources."@graphql-tools/merge-7.0.0" + sources."@graphql-tools/utils-8.0.2" + ]; + }) + (sources."@graphql-tools/utils-7.10.0" // { + dependencies = [ + sources."tslib-2.2.0" + ]; + }) + sources."@graphql-typed-document-node/core-3.1.0" + sources."@josephg/resolvable-1.0.1" + sources."@jsii/spec-1.32.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@protobufjs/aspromise-1.1.2" + sources."@protobufjs/base64-1.1.2" + sources."@protobufjs/codegen-2.0.4" + sources."@protobufjs/eventemitter-1.1.0" + sources."@protobufjs/fetch-1.1.0" + sources."@protobufjs/float-1.0.2" + sources."@protobufjs/inquire-1.1.0" + sources."@protobufjs/path-1.1.2" + sources."@protobufjs/pool-1.1.0" + sources."@protobufjs/utf8-1.1.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.10.1" - sources."@types/node-14.17.5" - sources."@types/node-fetch-2.5.11" + sources."@types/accepts-1.3.5" + sources."@types/body-parser-1.19.1" + sources."@types/connect-3.4.35" + sources."@types/cors-2.8.12" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.24" + sources."@types/long-4.0.1" + sources."@types/mime-1.3.2" + sources."@types/node-14.17.9" + sources."@types/node-fetch-2.5.12" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/serve-static-1.13.10" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" + sources."@types/zen-observable-0.8.3" + sources."@wry/context-0.6.1" + sources."@wry/equality-0.5.2" + sources."@wry/trie-0.3.1" + sources."accepts-1.3.7" + sources."address-1.1.2" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" ]; }) sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" + sources."ansi-styles-3.2.1" + (sources."anymatch-3.1.2" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) + sources."apollo-datasource-3.0.3" + sources."apollo-graphql-0.9.3" + sources."apollo-reporting-protobuf-3.0.0" + sources."apollo-server-caching-3.0.1" + (sources."apollo-server-core-3.1.2" // { + dependencies = [ + sources."@graphql-tools/utils-8.0.2" + ]; + }) + sources."apollo-server-env-4.0.3" + sources."apollo-server-errors-3.0.1" + sources."apollo-server-express-3.1.2" + sources."apollo-server-plugin-base-3.1.1" + sources."apollo-server-types-3.1.1" sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { dependencies = [ + sources."normalize-path-3.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" ]; }) + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.0" + sources."async-3.2.1" + sources."async-retry-1.3.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."available-typed-arrays-1.0.4" sources."axios-0.21.1" + sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" + sources."binary-extensions-2.2.0" sources."bl-4.1.0" + sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" + sources."bytes-3.1.0" sources."call-bind-1.0.2" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" + sources."camel-case-4.1.2" + sources."camelcase-6.2.0" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."case-1.6.3" - sources."cdktf-0.4.1" - sources."chalk-4.1.1" + sources."cdktf-0.5.0" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chardet-0.7.0" + (sources."chokidar-3.5.2" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-spinners-2.6.0" sources."cli-truncate-2.1.0" - (sources."cliui-7.0.4" // { + sources."cli-width-3.0.0" + sources."cliui-7.0.4" + sources."clone-1.0.4" + sources."code-excerpt-3.0.0" + (sources."codemaker-0.22.0" // { dependencies = [ - sources."wrap-ansi-7.0.0" + sources."camelcase-5.3.1" ]; }) - sources."clone-2.1.2" - sources."code-excerpt-3.0.0" - sources."codemaker-0.22.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."colors-1.4.0" sources."combined-stream-1.0.8" + sources."commander-2.20.3" sources."commonmark-0.29.3" - sources."compress-commons-4.1.1" + (sources."compress-commons-4.1.1" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) sources."concat-map-0.0.1" - sources."constructs-3.3.99" + sources."constructs-3.3.119" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" sources."convert-to-spaces-1.0.2" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-js-pure-3.16.1" sources."core-util-is-1.0.2" + sources."cors-2.8.5" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" + sources."cross-fetch-3.1.4" + sources."cross-spawn-7.0.3" + sources."cssfilter-0.0.10" + sources."date-fns-2.23.0" sources."date-format-3.0.0" - sources."debug-4.3.2" + sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."deep-equal-2.0.5" // { dependencies = [ sources."isarray-2.0.5" ]; }) + sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."delay-5.0.0" sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" sources."detect-indent-5.0.0" sources."detect-newline-2.1.0" + sources."detect-port-1.3.0" + sources."dir-glob-3.0.1" + sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.0.3" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -71716,108 +71713,167 @@ in }) sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" - sources."escape-string-regexp-2.0.0" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."eventemitter3-3.1.2" + sources."events-3.3.0" + sources."execa-5.1.1" sources."exit-on-epipe-1.0.1" - sources."extract-zip-2.0.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."external-editor-3.1.0" + (sources."extract-zip-2.0.1" // { + dependencies = [ + sources."debug-4.3.2" + sources."get-stream-5.2.0" + sources."ms-2.1.2" + ]; + }) + sources."fast-glob-3.2.7" + sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.11.1" sources."fd-slicer-1.1.0" + sources."figures-3.2.0" + sources."fill-range-7.0.1" + sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" sources."follow-redirects-1.14.1" sources."foreach-2.0.5" sources."form-data-3.0.1" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" + (sources."fs-extra-8.1.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."glob-parent-5.1.2" + sources."globby-11.0.3" + sources."graceful-fs-4.2.8" + sources."graphology-0.20.0" + sources."graphology-types-0.19.3" + sources."graphql-15.5.1" + sources."graphql-subscriptions-1.2.1" + sources."graphql-tag-2.12.5" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" + sources."hoist-non-react-statics-3.3.2" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."human-signals-2.1.0" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."ignore-5.1.8" + sources."import-from-3.0.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" (sources."ink-3.0.9" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."type-fest-0.12.0" + sources."wrap-ansi-6.2.0" ]; }) sources."ink-spinner-4.0.2" sources."ink-text-input-4.0.1" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" + sources."ink-use-stdout-dimensions-1.0.5" + sources."inquirer-8.1.2" + sources."internal-slot-1.0.3" + sources."ipaddr.js-1.9.1" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" sources."is-ci-2.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" + sources."is-number-7.0.0" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-string-1.0.6" + sources."is-stream-2.0.1" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" + sources."is-unicode-supported-0.1.0" + sources."is-valid-domain-0.1.2" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-wsl-2.2.0" sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."iterall-1.3.0" sources."js-tokens-4.0.0" - (sources."jsii-1.31.0" // { + sources."jsesc-2.5.2" + (sources."jsii-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.31.0" // { + (sources."jsii-pacmak-1.32.0" // { dependencies = [ - sources."camelcase-6.2.0" - sources."codemaker-1.31.0" + sources."clone-2.1.2" + sources."codemaker-1.32.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.31.0" // { + (sources."jsii-reflect-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.31.0" // { + (sources."jsii-rosetta-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.302" // { + (sources."jsii-srcmak-0.1.321" // { dependencies = [ sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" ]; }) - sources."jsonfile-4.0.0" + sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" (sources."lazystream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" ]; }) sources."locate-path-5.0.0" @@ -71825,56 +71881,114 @@ in sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" + sources."lodash.isequal-4.5.0" sources."lodash.isplainobject-4.0.6" + sources."lodash.sortby-4.7.0" sources."lodash.union-4.6.0" - sources."log4js-6.3.0" + sources."log-symbols-4.1.0" + (sources."log4js-6.3.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."loglevel-1.7.1" + sources."long-4.0.0" sources."loose-envify-1.4.0" + sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" sources."mdurl-1.0.1" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micromatch-4.0.4" + sources."mime-1.6.0" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."ms-2.1.2" + sources."ms-2.0.0" + sources."mute-stream-0.0.8" sources."ncp-2.0.0" + sources."negotiator-0.6.2" + sources."no-case-3.0.4" sources."node-fetch-2.6.1" - sources."normalize-path-3.0.0" + sources."normalize-path-2.1.1" + sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" + sources."obliterator-1.6.1" + sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.31.0" + sources."oo-ascii-tree-1.32.0" sources."open-7.4.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."optimism-0.16.1" + sources."ora-5.4.1" + sources."os-tmpdir-1.0.2" + sources."p-limit-3.1.0" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."p-try-2.2.0" + sources."parse-gitignore-1.0.1" + sources."parseurl-1.3.3" + sources."pascal-case-3.1.2" sources."patch-console-1.0.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" sources."pend-1.2.0" + sources."picomatch-2.3.0" + sources."prettier-2.3.2" sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" + sources."proxy-addr-2.0.7" sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" sources."react-16.14.0" sources."react-devtools-core-4.14.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" - sources."readline-sync-1.4.10" + sources."readdirp-3.6.0" sources."regexp.prototype.flags-1.3.1" + sources."remove-trailing-separator-1.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" + sources."reserved-words-0.1.2" + sources."resolve-from-5.0.0" sources."restore-cursor-3.1.0" + sources."retry-0.12.0" + sources."reusify-1.0.4" sources."rfdc-1.3.0" - sources."safe-buffer-5.1.2" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."scheduler-0.18.0" sources."semver-7.3.5" (sources."semver-intersect-1.4.0" // { @@ -71882,50 +71996,115 @@ in sources."semver-5.7.1" ]; }) + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shell-quote-1.7.2" sources."side-channel-1.0.4" sources."signal-exit-3.0.3" - sources."slice-ansi-3.0.0" + sources."slash-3.0.0" + (sources."slice-ansi-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."sort-json-2.0.0" + sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.22" - sources."stack-utils-2.0.3" + sources."sscaff-1.2.42" + (sources."stack-utils-2.0.3" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) + sources."statuses-1.5.0" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."string-width-4.2.2" sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.0" - sources."supports-color-7.2.0" + sources."strip-final-newline-2.0.0" + (sources."subscriptions-transport-ws-0.9.19" // { + dependencies = [ + sources."symbol-observable-1.2.0" + ]; + }) + sources."supports-color-5.5.0" + sources."symbol-observable-4.0.0" sources."tar-stream-2.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."ts-invariant-0.9.1" + sources."tslib-2.3.0" sources."type-fest-0.15.1" + sources."type-is-1.6.18" sources."typescript-3.9.10" sources."unbox-primitive-1.0.1" - sources."universalify-0.1.2" + sources."universalify-2.0.0" + sources."unixify-1.0.0" + sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" + sources."utility-types-3.10.0" + sources."utils-merge-1.0.1" sources."uuid-8.3.2" + sources."valid-url-1.0.9" + sources."value-or-promise-1.0.10" + sources."vary-1.1.2" + sources."wcwidth-1.0.1" + sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."widest-line-3.1.0" - sources."wrap-ansi-6.2.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."wrappy-1.0.2" sources."ws-7.5.3" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" + sources."xss-1.0.9" sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" sources."y18n-4.0.3" sources."yargs-parser-18.1.3" ]; @@ -71933,8 +72112,12 @@ in sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" sources."yn-3.1.1" + sources."yocto-queue-0.1.0" sources."yoga-layout-prebuilt-1.10.0" + sources."zen-observable-0.8.15" + sources."zen-observable-ts-1.1.0" sources."zip-stream-4.1.0" + sources."zod-1.11.17" ]; buildInputs = globalBuildInputs; meta = { @@ -71949,15 +72132,15 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.3.0"; + version = "5.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.0.tgz"; - sha512 = "Jri2KVAcan/Y1JuEDo1rUlm3vUoGvMKSOpIL2YEPgalksvoGur/yL2KbtMF2dPs2VlMVj1afzp76Vu0KjxKfvA=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.3.tgz"; + sha512 = "Reo/w25/3J2uRL4EFHvo92Tv97uhefyHranTpxXNqQ7iIRB8oxRNVlXC+Xcq8RWO2LjSyOofrb7AU6I6oXpPpA=="; }; dependencies = [ sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."clean-css-5.1.3" + sources."clean-css-5.1.5" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -71973,7 +72156,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command-line interface to clean-css CSS optimization library"; - homepage = "https://github.com/jakubpawlowicz/clean-css-cli#readme"; + homepage = "https://github.com/clean-css/clean-css-cli#readme"; license = "MIT"; }; production = true; @@ -72068,10 +72251,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.12.0.tgz"; - sha512 = "nRKGxCQLNKvi38q8QIVM+tvGpqEpi1NugCcrRTQfTF78PXofct6ImtVu9aLKDqoq3cAJk9CmngXLPEj+sdgYzQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.13.0.tgz"; + sha512 = "8YsX+hE+PwJy+r8MiHK880KocpMTMAlhLjNfK9TjBNTG8a6+BPjb27FSjwzsa1h4vAw8IJz+PfH/0Jsz+VhJKg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72121,10 +72304,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.20.0"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.20.0.tgz"; - sha512 = "iKMyYYkebv31l1LB0EbZtwQ4DeVW0dUh9nXwE0tG3LDahcUNzNi1eXGWeNVxcy+YhWmaLEkLgKTu9DE4zxpACQ=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.21.1.tgz"; + sha512 = "irXGrafuISXLdlkjZjv8nQ2zTJSKBDXS3HaVDQeEY/+aDirRxKlZlfqYi6uzE70dCrGbna/NqTFfo4J+/9Q+mQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72180,10 +72363,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.11"; + version = "0.18.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.11.tgz"; - sha512 = "L16wPMe5iDrprv5JNlTBtTd3WmRM+kLN9u+lQTDFpj0t6WxE16WzCm2Ktl1jzgpGY+xcdGakbZAL2y9bLXaJqg=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.14.tgz"; + sha512 = "nfJl0hw1/fMhXbaSNEVBHUQTUIGfiBRVQ5KLmYO4gJ7pNvhIcEUas+DKKONDr3WtmV3ZlEWmR0SbvVnaRzKB5w=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -72210,7 +72393,7 @@ in sources."inherits-2.0.4" sources."is-docker-2.2.1" sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."make-dir-3.1.0" @@ -72266,10 +72449,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.1.tgz"; - sha512 = "CgBUD5qPMvbdTUKTIaeKPxmJSieVJNK3JS1PPgr4ivIXqXYZ4ECP4DM7jmnkA+BnK9Xvz1FnlebUTxTv3z/IFQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.3.tgz"; + sha512 = "JJq0jIXe4UyOI51JkyqQYPoAVXkTYWUuYBpWI/FMEDC/RVF8myL42GmqAZN3ikGhO/ErA/r4KmVhhb1UrfQqIQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72483,7 +72666,7 @@ in sha512 = "EiD4lpcGW2WyzxEDpRMYPrjxAa0FhG69SzDoc1KbDht2Do/vgnRzvrtIsufPT14dALAesieN3kVVMCCfA9S6jA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.2.13" + sources."@chemzqm/neovim-5.3.4" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -72519,7 +72702,7 @@ in sources."define-properties-1.1.3" sources."duplexer2-0.1.4" sources."end-of-stream-1.4.4" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" sources."execa-1.0.0" @@ -72527,7 +72710,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.14.1" - sources."fp-ts-2.10.5" + sources."fp-ts-2.11.1" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -72541,10 +72724,11 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."ieee754-1.2.1" @@ -72552,16 +72736,17 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int64-buffer-0.1.10" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."internal-slot-1.0.3" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -72620,6 +72805,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."streamroller-2.2.4" // { dependencies = [ @@ -72631,7 +72817,7 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."traverse-0.3.9" sources."tslib-2.3.0" sources."unbox-primitive-1.0.1" @@ -72690,7 +72876,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -72703,7 +72889,7 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@typescript-eslint/experimental-utils-3.10.1" sources."@typescript-eslint/parser-3.10.1" sources."@typescript-eslint/types-3.10.1" @@ -72769,10 +72955,10 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -72831,7 +73017,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.15.2" + sources."core-js-3.16.1" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -72867,14 +73053,14 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.31.0" // { + (sources."eslint-7.32.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; @@ -72986,7 +73172,7 @@ in sources."fill-range-2.2.4" sources."find-up-2.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -73017,7 +73203,7 @@ in sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -73462,7 +73648,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -73666,13 +73852,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.157"; + version = "1.1.161"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.157.tgz"; - sha512 = "GyjrMQFSqrAnBB0SlZC93JV9E8VAcsDhfCBHZ6DIRDCH9qsSI3g0Y0RGJp7v+JHDDZTrEPJiiPOu1e/6PFA90A=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.161.tgz"; + sha512 = "CFWLqQ3t0o73tioZHqJip0avZ7K9p9sBCMz81voAkBDoaSvUvrqT/SGpbhwXjzsvwBF6H1WY9aEK8FDMVAh+XA=="; }; dependencies = [ - sources."pyright-1.1.157" + sources."pyright-1.1.161" ]; buildInputs = globalBuildInputs; meta = { @@ -73746,10 +73932,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.47.2"; + version = "0.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.2.tgz"; - sha512 = "DtUoWcXd++TT9PjjB5JDT3r+2c6wdZZlf2pCXeInELfwW/P4p10BKxP8EnMhkNq4jIzfP0V9QAwLMMppACFuRA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.48.0.tgz"; + sha512 = "qI+bODEl34n6dFTrbQoc5kjXhRUCLxVhfs0TFvz3iqKBj4Yz9lI5fYxH76DXce9ETlTQNQDt1XQVycC5pPyUdA=="; }; buildInputs = globalBuildInputs; meta = { @@ -73823,32 +74009,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" - sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" + sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -73874,12 +74060,12 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001246" - (sources."chalk-4.1.1" // { + sources."caniuse-lite-1.0.30001249" + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -73894,7 +74080,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.0" @@ -73916,7 +74102,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -73933,7 +74119,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -74013,7 +74199,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -74099,7 +74285,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."specificity-0.4.1" sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { @@ -74203,7 +74389,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -74290,10 +74476,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.8.1"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.1.tgz"; - sha512 = "qkVsa46XLmOCmohpQhhz1SG9vUQN/54b/zZsDI5fnuBM49GX9f+Aya8m9ZidAzuwFKV+ostgvdWaB+GeQPPNPQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.3.tgz"; + sha512 = "dOvu5TY1zuZ/d7l/v3pGhbgYrhBVQSsmTiLNUL1dYzXCuVUuzNNm5CzZcr8yLTr3diCPU2eavLKs8iBwBvs/8g=="; }; dependencies = [ sources."typescript-4.3.5" @@ -74318,7 +74504,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -74340,7 +74526,7 @@ in sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."callsites-3.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -74361,8 +74547,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.31.0" - (sources."eslint-plugin-vue-7.14.0" // { + sources."eslint-7.32.0" + (sources."eslint-plugin-vue-7.16.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -74397,7 +74583,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -74483,7 +74669,7 @@ in sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" - (sources."vue-eslint-parser-7.9.0" // { + (sources."vue-eslint-parser-7.10.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -74507,10 +74693,10 @@ in coc-vimlsp = nodeEnv.buildNodePackage { name = "coc-vimlsp"; packageName = "coc-vimlsp"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.2.tgz"; - sha512 = "vfWz0wpyuyj1U/8v6kXaBnJrhlTK40FWezeKKW/UNLLi9v3rWiV4QoV3uTmJqIMbvW97mhIzD5EynXgqPlD8Bg=="; + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.3.tgz"; + sha512 = "mq6V4fQmcQSiGvilJ0j1pbbj5EHeS8QC6ThuLVBJ+2wRqO8fiTkPYJrXPDUQDcICV9hUjdTBE8klaFYlK6oviA=="; }; buildInputs = globalBuildInputs; meta = { @@ -74703,7 +74889,7 @@ in }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."async-3.2.0" + sources."async-3.2.1" sources."bintrees-1.0.1" sources."color-3.0.0" sources."color-convert-1.9.3" @@ -74722,7 +74908,7 @@ in sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isarray-1.0.0" sources."kuler-2.0.0" sources."logform-2.2.0" @@ -74988,7 +75174,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -75074,7 +75260,7 @@ in sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" @@ -75118,8 +75304,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -75201,7 +75387,7 @@ in sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pkg-up-2.0.0" - sources."plist-3.0.2" + sources."plist-3.0.3" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" @@ -75226,7 +75412,7 @@ in sources."read-1.0.7" sources."read-chunk-3.2.0" sources."read-package-json-2.1.2" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -75272,13 +75458,13 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sshpk-1.16.1" sources."ssri-8.0.1" sources."statuses-1.5.0" @@ -75292,7 +75478,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."systeminformation-4.34.23" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -75353,7 +75539,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -75376,14 +75562,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -75500,7 +75686,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -75678,7 +75864,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -75754,7 +75940,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -75835,8 +76021,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.3" @@ -75933,7 +76119,7 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" sources."inflight-1.0.6" @@ -76111,7 +76297,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bulk-write-stream-1.1.4" sources."bytes-3.1.0" sources."cache-base-1.0.1" @@ -76288,10 +76474,12 @@ in sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -76349,7 +76537,7 @@ in sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -76370,7 +76558,7 @@ in }) (sources."k-rpc-socket-1.11.1" // { dependencies = [ - sources."bencode-2.0.1" + sources."bencode-2.0.2" ]; }) sources."keypress-0.2.1" @@ -76390,8 +76578,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" @@ -76414,7 +76602,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.3.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanoassert-1.1.0" sources."nanobus-4.5.0" sources."nanoguard-1.3.0" @@ -76452,7 +76640,7 @@ in sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-headers-2.0.3" + sources."parse-headers-2.0.4" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -76730,10 +76918,10 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.11.0.tgz"; - sha512 = "4kjsgc/rV+qtH3dTqEnR/ug36yKNjyo5z674ySkD6k08DwlLs10fsP/I+d8BAsbtjpL36bqZxLa9iNgTDqioXQ=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.12.0.tgz"; + sha512 = "oXWAYO2ACrjFRYPTqUOQz3gCE7U1R5HVkuiqXXTFCcujiAprJjzvV5VAjrJolgA7guyRrXE5HliuDGoWJfWHOw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -76758,7 +76946,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -76768,7 +76956,7 @@ in sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."merge2-1.4.1" @@ -76816,30 +77004,20 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.4.1.tgz"; - sha512 = "7mB+HdMd4dfjChK1+37++ylA+sy7wFaf0/3HDy6cJDj5dTx4C4vVDmDKQpZgNJU1gIkxDnW6QCLCxpoe5FPyVA=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.5.0.tgz"; + sha512 = "aDwANs1c1xIh5lQTbMlsGx8tMDk1k+sjsYbIXYjWvGY9Ff2e40MQ6RgALItVVij1dj1049FkG9MOHLFqekxZoA=="; }; dependencies = [ - (sources."dockerfile-ast-0.2.0" // { + (sources."dockerfile-ast-0.3.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; }) - (sources."dockerfile-language-service-0.3.0" // { + sources."dockerfile-language-service-0.4.0" + (sources."dockerfile-utils-0.5.0" // { dependencies = [ - (sources."dockerfile-utils-0.4.2" // { - dependencies = [ - sources."dockerfile-ast-0.2.1" - sources."vscode-languageserver-types-3.16.0" - ]; - }) - ]; - }) - (sources."dockerfile-utils-0.2.0" // { - dependencies = [ - sources."dockerfile-ast-0.1.0" sources."vscode-languageserver-types-3.16.0" ]; }) @@ -76850,6 +77028,7 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) + sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.17.0-next.1" ]; buildInputs = globalBuildInputs; @@ -76865,15 +77044,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.72.0"; + version = "6.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.72.0.tgz"; - sha512 = "sOsFzBwwUkJkP6EZ8cOwz1eFva5sTf6ojhOgl2gplRs7+PkuqGyng/4TnKL3KIFqwE5lFsA66sIh8UQU4Dkecw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.73.0.tgz"; + sha512 = "9QWk+d0xuT6W+AEvr06Zoh1rllXGkDMUH9LxFtey3Abv5E0M2qSvdspGvqb4d6Fw7BZiThX4tDabT6VNpxqftQ=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.5" + sources."@types/node-14.17.9" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -76938,10 +77117,10 @@ in sources."lodash.isnil-4.0.0" sources."lodash.isundefined-3.0.1" sources."lodash.uniq-4.5.0" - sources."lossless-json-1.0.4" + sources."lossless-json-1.0.5" sources."method-missing-1.2.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" @@ -77011,30 +77190,30 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.58.tgz"; - sha512 = "dlGj8lrtUGOwoNaU/zEhbJMOEAqiZUcn9AJrX80saSplkkWEkOpoo4UkLJ256BLyK8nA1+k89pT/KMtFrUFcPg=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.59.tgz"; + sha512 = "cFYnr5LKi+Hg+rzhL2OZq5S7vlqzNS8rlQzXiYtv4Ft6BY27CTJ8mz76nAxgjRFv0/rDUyKTY2NZUOPeztziMQ=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0-beta.58" - sources."@electron-forge/core-6.0.0-beta.58" - sources."@electron-forge/installer-base-6.0.0-beta.58" - sources."@electron-forge/installer-darwin-6.0.0-beta.58" - sources."@electron-forge/installer-deb-6.0.0-beta.58" - sources."@electron-forge/installer-dmg-6.0.0-beta.58" - sources."@electron-forge/installer-exe-6.0.0-beta.58" - sources."@electron-forge/installer-linux-6.0.0-beta.58" - sources."@electron-forge/installer-rpm-6.0.0-beta.58" - sources."@electron-forge/installer-zip-6.0.0-beta.58" - sources."@electron-forge/maker-base-6.0.0-beta.58" - sources."@electron-forge/plugin-base-6.0.0-beta.58" - sources."@electron-forge/publisher-base-6.0.0-beta.58" - sources."@electron-forge/shared-types-6.0.0-beta.58" - sources."@electron-forge/template-base-6.0.0-beta.58" - sources."@electron-forge/template-typescript-6.0.0-beta.58" - sources."@electron-forge/template-typescript-webpack-6.0.0-beta.58" - sources."@electron-forge/template-webpack-6.0.0-beta.58" + sources."@electron-forge/async-ora-6.0.0-beta.59" + sources."@electron-forge/core-6.0.0-beta.59" + sources."@electron-forge/installer-base-6.0.0-beta.59" + sources."@electron-forge/installer-darwin-6.0.0-beta.59" + sources."@electron-forge/installer-deb-6.0.0-beta.59" + sources."@electron-forge/installer-dmg-6.0.0-beta.59" + sources."@electron-forge/installer-exe-6.0.0-beta.59" + sources."@electron-forge/installer-linux-6.0.0-beta.59" + sources."@electron-forge/installer-rpm-6.0.0-beta.59" + sources."@electron-forge/installer-zip-6.0.0-beta.59" + sources."@electron-forge/maker-base-6.0.0-beta.59" + sources."@electron-forge/plugin-base-6.0.0-beta.59" + sources."@electron-forge/publisher-base-6.0.0-beta.59" + sources."@electron-forge/shared-types-6.0.0-beta.59" + sources."@electron-forge/template-base-6.0.0-beta.59" + sources."@electron-forge/template-typescript-6.0.0-beta.59" + sources."@electron-forge/template-typescript-webpack-6.0.0-beta.59" + sources."@electron-forge/template-webpack-6.0.0-beta.59" (sources."@electron/get-1.12.4" // { dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77062,6 +77241,9 @@ in ]; }) sources."@malept/cross-spawn-promise-2.0.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -77069,7 +77251,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77109,18 +77291,19 @@ in sources."bluebird-3.7.2" sources."boolean-3.1.2" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-1.1.4" sources."chromium-pickle-js-0.2.0" @@ -77145,7 +77328,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.15.2" + sources."core-js-3.16.1" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { @@ -77181,7 +77364,7 @@ in sources."detect-node-2.1.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - (sources."electron-notarize-1.0.0" // { + (sources."electron-notarize-1.1.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -77227,11 +77410,14 @@ in sources."extract-zip-2.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.11.1" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" + sources."fill-range-7.0.1" (sources."find-up-5.0.0" // { dependencies = [ sources."locate-path-6.0.0" @@ -77279,6 +77465,7 @@ in sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.7" + sources."glob-parent-5.1.2" sources."global-agent-2.2.0" sources."global-modules-1.0.0" (sources."global-prefix-1.0.2" // { @@ -77289,7 +77476,7 @@ in sources."global-tunnel-ng-2.7.1" sources."globalthis-1.0.2" sources."got-11.8.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -77316,9 +77503,12 @@ in sources."is-arrayish-0.2.1" sources."is-core-module-2.5.0" sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.1" sources."is-interactive-1.0.0" + sources."is-number-7.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" @@ -77376,8 +77566,10 @@ in sources."strip-bom-2.0.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -77410,7 +77602,7 @@ in (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" - sources."tar-4.4.13" + sources."tar-4.4.16" ]; }) sources."nopt-4.0.3" @@ -77468,6 +77660,7 @@ in sources."path-type-2.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" + sources."picomatch-2.3.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -77481,7 +77674,7 @@ in sources."path-exists-4.0.0" ]; }) - sources."plist-3.0.2" + sources."plist-3.0.3" sources."prepend-http-2.0.0" sources."pretty-bytes-1.0.4" sources."pretty-ms-7.0.1" @@ -77493,6 +77686,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."rc-1.2.8" sources."rcedit-3.0.1" @@ -77513,10 +77707,12 @@ in sources."resolve-package-1.0.1" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" + sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."roarr-2.15.4" sources."run-async-2.4.1" - sources."rxjs-7.2.0" + sources."run-parallel-1.2.0" + sources."rxjs-7.3.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -77533,7 +77729,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."speedometer-0.1.4" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" @@ -77553,7 +77749,7 @@ in sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.0" // { + (sources."tar-6.1.7" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -77574,6 +77770,7 @@ in }) sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."trim-newlines-1.0.0" sources."trim-repeated-1.0.0" @@ -77601,7 +77798,7 @@ in }) sources."wrappy-1.0.2" sources."xmlbuilder-9.0.7" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."xtend-2.1.2" sources."y18n-5.0.8" sources."yallist-3.1.1" @@ -77663,15 +77860,15 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -77679,35 +77876,35 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-parameters-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -77726,7 +77923,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -77742,7 +77939,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -77753,7 +77950,7 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" (sources."conf-7.1.2" // { @@ -77779,7 +77976,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -77812,7 +78009,7 @@ in (sources."ink-3.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -77822,7 +78019,7 @@ in (sources."ink-text-input-4.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -77876,7 +78073,7 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-package-data-2.5.0" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" @@ -77956,7 +78153,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -78022,7 +78219,7 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -78033,7 +78230,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.173.1" + sources."@fluentui/react-7.174.0" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -78047,7 +78244,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.195" + sources."@microsoft/load-themed-styles-1.10.198" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -78063,14 +78260,14 @@ in sources."@types/caseless-0.12.2" sources."@types/chart.js-2.9.24" sources."@types/connect-3.4.35" - sources."@types/engine.io-3.1.6" + sources."@types/engine.io-3.1.7" sources."@types/express-4.17.8" sources."@types/express-serve-static-core-4.17.24" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.4" sources."@types/hls.js-0.13.1" sources."@types/js-yaml-3.12.5" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/lodash-4.14.161" sources."@types/material-design-lite-1.1.16" sources."@types/mime-1.3.2" @@ -78269,7 +78466,7 @@ in sources."browserify-zlib-0.2.0" sources."buffer-5.7.1" sources."buffer-equal-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-writer-2.0.0" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" @@ -78289,7 +78486,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.1.0" + sources."tar-6.1.7" ]; }) sources."cache-base-1.0.1" @@ -78673,7 +78870,7 @@ in sources."globby-10.0.2" sources."glogg-1.0.2" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gulp-4.0.2" (sources."gulp-clean-css-4.3.0" // { dependencies = [ @@ -78908,8 +79105,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -78997,7 +79194,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" (sources."needle-2.8.0" // { dependencies = [ @@ -79074,7 +79271,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.173.1" + sources."office-ui-fabric-react-7.174.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -79189,7 +79386,7 @@ in }) sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" - sources."pg-pool-3.3.0" + sources."pg-pool-3.4.1" sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" @@ -79301,7 +79498,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.35.2" // { + (sources."sass-1.37.5" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -79402,7 +79599,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -79480,9 +79677,10 @@ in sources."swagger-ui-dist-3.34.0" sources."tail-2.2.3" sources."tapable-1.1.3" - (sources."tar-4.4.13" // { + (sources."tar-4.4.16" // { dependencies = [ sources."mkdirp-0.5.5" + sources."safe-buffer-5.2.1" sources."yallist-3.1.1" ]; }) @@ -79717,14 +79915,14 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.31.0"; + version = "7.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; - sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79745,7 +79943,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -79794,7 +79992,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -79885,7 +80083,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79908,7 +80106,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -79927,7 +80125,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.31.0" + sources."eslint-7.32.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -79958,7 +80156,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -80043,10 +80241,10 @@ in esy = nodeEnv.buildNodePackage { name = "esy"; packageName = "esy"; - version = "0.6.10"; + version = "0.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/esy/-/esy-0.6.10.tgz"; - sha512 = "O+mWNPB9NJqDr3CA1PUbWUO1ZSy53ksZWivGrvbquATR5INlp3CYguwkq4BzZACg1s1bVYyhr7byjB/l1nuGRA=="; + url = "https://registry.npmjs.org/esy/-/esy-0.6.11.tgz"; + sha512 = "LyrQWS/c7FYwjmgSlmYcj7w7as40iVuF6aCSHKMAZq1xgmdpjorQ7OEqg35ZUf8+xpUgKnDx4HrA3scdnfRTnA=="; }; buildInputs = globalBuildInputs; meta = { @@ -80060,28 +80258,31 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.8.1"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.8.1.tgz"; - sha512 = "oks/ETtrhNKvw1CjKUxQv9vQFXRPIWb+iWKT1Xmjx111cHLDTKXtmxm8hkYXSJZ8zHgqAndlUTRlTc+tDqRbuw=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.10.0.tgz"; + sha512 = "NHQQBPygck2bQUo5nvCB52BHa+JsjxSlXvdQ39lvonJwvbOdn7IACxlqrkmaxvjfopCLBiBADj3yk1uSYh2cnQ=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.9.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."@babel/generator-7.14.8" - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + sources."@babel/code-frame-7.10.4" + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."json5-2.2.0" sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/generator-7.15.0" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.15.0" // { + dependencies = [ + sources."browserslist-4.16.7" + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -80092,88 +80293,63 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" - sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/parser-7.15.3" + sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" - sources."@babel/plugin-proposal-export-namespace-from-7.14.5" - sources."@babel/plugin-proposal-json-strings-7.14.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" - sources."@babel/plugin-proposal-numeric-separator-7.14.5" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" - sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-default-from-7.14.5" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-flow-7.14.5" - sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-jsx-7.14.5" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.14.5" sources."@babel/plugin-syntax-typescript-7.14.5" sources."@babel/plugin-transform-arrow-functions-7.14.5" - sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" - sources."@babel/plugin-transform-dotall-regex-7.14.5" - sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" sources."@babel/plugin-transform-flow-strip-types-7.14.5" sources."@babel/plugin-transform-for-of-7.14.5" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" - sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" - sources."@babel/plugin-transform-modules-systemjs-7.14.5" - sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" - sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-object-assign-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" - sources."@babel/plugin-transform-react-display-name-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" - sources."@babel/plugin-transform-react-jsx-self-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.15.1" + sources."@babel/plugin-transform-react-jsx-7.14.9" + sources."@babel/plugin-transform-react-jsx-self-7.14.9" sources."@babel/plugin-transform-react-jsx-source-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" - sources."@babel/plugin-transform-reserved-words-7.14.5" - (sources."@babel/plugin-transform-runtime-7.14.5" // { + (sources."@babel/plugin-transform-runtime-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -80182,31 +80358,30 @@ in sources."@babel/plugin-transform-spread-7.14.6" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" - sources."@babel/plugin-transform-typeof-symbol-7.14.5" - sources."@babel/plugin-transform-typescript-7.14.6" - sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.12.17" // { + sources."@babel/runtime-7.9.0" + (sources."@babel/template-7.14.5" // { dependencies = [ - sources."semver-5.7.1" + sources."@babel/code-frame-7.14.5" ]; }) - sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.14.8" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + (sources."@babel/traverse-7.15.0" // { + dependencies = [ + sources."@babel/code-frame-7.14.5" + ]; + }) + sources."@babel/types-7.15.0" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-5.0.5" - (sources."@expo/config-plugins-3.0.5" // { + sources."@expo/config-5.0.7" + (sources."@expo/config-plugins-3.0.7" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-42.0.0" - (sources."@expo/dev-server-0.1.80" // { + (sources."@expo/dev-server-0.1.82" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -80223,7 +80398,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.110" + sources."@expo/dev-tools-0.13.113" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -80231,21 +80406,16 @@ in sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.15" // { + (sources."@expo/image-utils-0.3.16" // { dependencies = [ sources."mime-2.5.2" sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.31" // { - dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."json5-1.0.1" - ]; - }) - sources."@expo/metro-config-0.1.80" - sources."@expo/osascript-2.0.29" - (sources."@expo/package-manager-0.0.44" // { + sources."@expo/json-file-8.2.33" + sources."@expo/metro-config-0.1.82" + sources."@expo/osascript-2.0.30" + (sources."@expo/package-manager-0.0.46" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -80255,11 +80425,12 @@ in (sources."@expo/plist-0.0.13" // { dependencies = [ sources."xmlbuilder-14.0.0" + sources."xmldom-0.5.0" ]; }) - sources."@expo/prebuild-config-2.0.5" + sources."@expo/prebuild-config-2.0.7" sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.30" // { + (sources."@expo/schemer-1.3.31" // { dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" @@ -80267,63 +80438,25 @@ in ]; }) sources."@expo/sdk-runtime-versions-1.0.0" - sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.13.1" // { + (sources."@expo/webpack-config-0.14.0" // { dependencies = [ - sources."@babel/runtime-7.9.0" - sources."react-refresh-0.8.3" + (sources."@babel/core-7.9.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."json5-2.2.0" ]; }) (sources."@expo/xcpretty-3.1.4" // { dependencies = [ - sources."@babel/code-frame-7.10.4" sources."js-yaml-4.1.0" ]; }) - sources."@hapi/address-2.1.4" - sources."@hapi/formula-1.2.0" sources."@hapi/hoek-9.2.0" - (sources."@hapi/joi-16.1.8" // { - dependencies = [ - sources."@hapi/hoek-8.5.1" - sources."@hapi/topo-3.1.6" - ]; - }) - sources."@hapi/pinpoint-1.0.2" sources."@hapi/topo-5.1.0" sources."@jest/types-26.6.2" - sources."@jimp/bmp-0.12.1" - sources."@jimp/core-0.12.1" - sources."@jimp/custom-0.12.1" - sources."@jimp/gif-0.12.1" - sources."@jimp/jpeg-0.12.1" - sources."@jimp/plugin-blit-0.12.1" - sources."@jimp/plugin-blur-0.12.1" - sources."@jimp/plugin-circle-0.12.1" - sources."@jimp/plugin-color-0.12.1" - sources."@jimp/plugin-contain-0.12.1" - sources."@jimp/plugin-cover-0.12.1" - sources."@jimp/plugin-crop-0.12.1" - sources."@jimp/plugin-displace-0.12.1" - sources."@jimp/plugin-dither-0.12.1" - sources."@jimp/plugin-fisheye-0.12.1" - sources."@jimp/plugin-flip-0.12.1" - sources."@jimp/plugin-gaussian-0.12.1" - sources."@jimp/plugin-invert-0.12.1" - sources."@jimp/plugin-mask-0.12.1" - sources."@jimp/plugin-normalize-0.12.1" - sources."@jimp/plugin-print-0.12.1" - sources."@jimp/plugin-resize-0.12.1" - sources."@jimp/plugin-rotate-0.12.1" - sources."@jimp/plugin-scale-0.12.1" - sources."@jimp/plugin-shadow-0.12.1" - sources."@jimp/plugin-threshold-0.12.1" - sources."@jimp/plugins-0.12.1" - sources."@jimp/png-0.12.1" - sources."@jimp/tiff-0.12.1" - sources."@jimp/types-0.12.1" - sources."@jimp/utils-0.12.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -80344,7 +80477,6 @@ in sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-5.0.1" (sources."@react-native-community/cli-server-api-5.0.1" // { dependencies = [ @@ -80366,32 +80498,25 @@ in sources."supports-color-7.2.0" ]; }) - sources."@rollup/plugin-babel-5.3.0" - sources."@rollup/plugin-node-resolve-11.2.1" - sources."@rollup/plugin-replace-2.4.2" - sources."@rollup/pluginutils-3.1.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.2" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.0.1" - sources."@surma/rollup-plugin-off-main-thread-1.4.2" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" - sources."@types/estree-0.0.39" sources."@types/glob-7.1.4" sources."@types/html-minifier-terser-5.1.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" sources."@types/node-9.6.61" sources."@types/q-1.5.5" - sources."@types/resolve-1.17.1" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" sources."@types/source-list-map-0.1.2" @@ -80406,7 +80531,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-2.1.1" // { + (sources."@types/webpack-sources-3.2.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -80466,7 +80591,6 @@ in sources."ansi-html-0.0.7" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" - sources."any-base-1.1.0" sources."any-promise-1.3.0" sources."anymatch-3.1.2" sources."apollo-link-1.2.1" @@ -80512,7 +80636,6 @@ in sources."axios-retry-3.1.9" (sources."babel-loader-8.1.0" // { dependencies = [ - sources."json5-1.0.1" sources."loader-utils-1.4.0" ]; }) @@ -80522,15 +80645,10 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0" sources."babel-preset-fbjs-3.4.0" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -80548,7 +80666,6 @@ in sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" - sources."bmp-js-0.1.0" sources."bn.js-5.2.0" (sources."body-parser-1.18.3" // { dependencies = [ @@ -80562,10 +80679,9 @@ in ]; }) sources."boolbase-1.0.0" - (sources."boxen-4.1.0" // { + (sources."boxen-5.0.1" // { dependencies = [ - sources."chalk-2.4.2" - sources."type-fest-0.5.2" + sources."type-fest-0.20.2" ]; }) sources."bplist-creator-0.0.8" @@ -80584,13 +80700,11 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.6" - sources."buffer-5.7.1" - sources."buffer-equal-0.0.1" - sources."buffer-from-1.1.1" + sources."browserslist-4.14.2" + sources."buffer-4.9.2" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-3.2.0" sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" sources."bytes-3.0.0" @@ -80614,11 +80728,11 @@ in sources."tslib-2.3.0" ]; }) - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."caseless-0.12.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -80692,12 +80806,11 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.17.1" - sources."common-tags-1.8.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."component-type-1.2.1" @@ -80749,9 +80862,9 @@ in sources."semver-6.3.0" ]; }) - sources."core-js-2.6.12" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ + sources."browserslist-4.16.7" sources."semver-7.0.0" ]; }) @@ -80776,7 +80889,7 @@ in sources."css-declaration-sorter-4.0.1" (sources."css-loader-3.6.0" // { dependencies = [ - sources."json5-1.0.1" + sources."camelcase-5.3.1" sources."loader-utils-1.4.0" sources."semver-6.3.0" ]; @@ -80822,7 +80935,6 @@ in }) sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" - sources."deep-scope-analyser-1.7.0" sources."deepmerge-4.2.2" sources."default-gateway-4.2.0" sources."defaults-1.0.3" @@ -80863,7 +80975,6 @@ in sources."domhandler-4.2.0" ]; }) - sources."dom-walk-0.1.2" sources."domain-browser-1.2.0" sources."domelementtype-2.2.0" sources."domhandler-3.3.0" @@ -80884,8 +80995,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -80913,9 +81023,8 @@ in sources."err-code-2.0.3" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."error-stack-parser-2.0.6" sources."errorhandler-1.5.1" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -80928,8 +81037,6 @@ in ]; }) sources."estraverse-4.3.0" - sources."estree-walker-1.0.1" - sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-2.0.3" sources."events-3.3.0" @@ -80942,7 +81049,6 @@ in sources."is-stream-1.1.0" ]; }) - sources."exif-parser-0.1.12" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."debug-2.6.9" @@ -80963,7 +81069,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.90" // { + (sources."expo-pwa-0.0.92" // { dependencies = [ sources."commander-2.20.0" ]; @@ -80995,7 +81101,6 @@ in sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."file-loader-6.0.0" - sources."file-type-9.0.0" sources."file-uri-to-path-1.0.0" sources."filesize-6.1.0" sources."fill-range-7.0.1" @@ -81062,7 +81167,6 @@ in sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" sources."get-stream-5.2.0" sources."get-value-2.0.6" @@ -81070,13 +81174,12 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."global-4.4.0" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" sources."globby-11.0.1" sources."got-11.8.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphql-0.13.2" (sources."graphql-tools-3.0.0" // { dependencies = [ @@ -81091,6 +81194,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -81128,7 +81232,6 @@ in }) (sources."html-webpack-plugin-4.3.0" // { dependencies = [ - sources."json5-1.0.1" sources."loader-utils-1.4.0" ]; }) @@ -81183,30 +81286,30 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-ip-4.3.0" + sources."internal-slot-1.0.3" sources."invariant-2.2.4" sources."ip-1.1.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.3" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-function-1.0.2" sources."is-glob-4.0.1" (sources."is-invalid-path-0.1.0" // { dependencies = [ @@ -81215,10 +81318,9 @@ in ]; }) sources."is-lambda-1.0.1" - sources."is-module-1.0.0" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" (sources."is-path-in-cwd-2.1.0" // { @@ -81252,13 +81354,12 @@ in sources."responselike-1.0.2" ]; }) - sources."is-regex-1.1.3" - sources."is-regexp-1.0.0" + sources."is-regex-1.1.4" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" sources."is-root-2.1.0" - sources."is-stream-2.0.0" - sources."is-string-1.0.6" + sources."is-stream-2.0.1" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" @@ -81275,10 +81376,9 @@ in sources."supports-color-7.2.0" ]; }) - sources."jimp-0.12.1" - sources."joi-17.4.1" + sources."jimp-compact-0.16.1" + sources."joi-17.4.2" sources."join-component-1.1.0" - sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" (sources."js-yaml-3.14.1" // { dependencies = [ @@ -81300,7 +81400,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" - sources."json5-2.2.0" + sources."json5-1.0.1" (sources."jsonfile-6.1.0" // { dependencies = [ sources."universalify-2.0.0" @@ -81317,9 +81417,13 @@ in sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" - sources."load-bmfont-1.4.1" + sources."lines-and-columns-1.1.6" sources."loader-runner-2.4.0" - sources."loader-utils-2.0.0" + (sources."loader-utils-2.0.0" // { + dependencies = [ + sources."json5-2.2.0" + ]; + }) sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.assign-4.2.0" @@ -81327,7 +81431,6 @@ in sources."lodash.isobject-3.0.2" sources."lodash.isstring-4.0.1" sources."lodash.memoize-4.1.2" - sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" (sources."log-symbols-2.2.0" // { dependencies = [ @@ -81343,7 +81446,6 @@ in }) sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - sources."magic-string-0.25.7" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -81381,14 +81483,12 @@ in ]; }) sources."mime-1.4.1" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."min-document-2.19.0" (sources."mini-css-extract-plugin-0.5.0" // { dependencies = [ - sources."json5-1.0.1" sources."loader-utils-1.4.0" sources."schema-utils-1.0.0" ]; @@ -81454,9 +81554,8 @@ in sources."multicast-dns-service-types-1.1.0" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."native-url-0.2.6" sources."ncp-2.0.0" (sources."needle-2.8.0" // { dependencies = [ @@ -81484,11 +81583,11 @@ in sources."node-html-parser-1.4.9" (sources."node-libs-browser-2.2.1" // { dependencies = [ - sources."buffer-4.9.2" sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.73" + sources."node-modules-regexp-1.0.0" + sources."node-releases-1.1.74" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -81547,7 +81646,6 @@ in sources."object.pick-1.3.0" sources."object.values-1.1.4" sources."obuf-1.1.2" - sources."omggif-1.0.10" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -81625,10 +81723,6 @@ in ]; }) sources."parse-asn1-5.1.6" - sources."parse-bmfont-ascii-1.0.6" - sources."parse-bmfont-binary-1.0.6" - sources."parse-bmfont-xml-1.1.4" - sources."parse-headers-2.0.3" sources."parse-json-4.0.0" sources."parse-png-2.1.0" sources."parse-srcset-1.0.2" @@ -81655,12 +81749,11 @@ in sources."path-type-4.0.0" sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" - sources."phin-2.9.3" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pixelmatch-4.0.2" + sources."pirates-4.0.1" (sources."pkg-dir-3.0.0" // { dependencies = [ sources."find-up-3.0.0" @@ -81679,7 +81772,7 @@ in sources."path-exists-3.0.0" ]; }) - sources."plist-3.0.2" + sources."plist-3.0.3" sources."pngjs-3.4.0" sources."pnp-webpack-plugin-1.7.0" (sources."portfinder-1.0.28" // { @@ -81847,7 +81940,7 @@ in sources."q-1.5.1" sources."qrcode-terminal-0.11.0" sources."qs-6.5.2" - sources."querystring-0.2.1" + sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -81864,8 +81957,6 @@ in sources."rc-1.2.8" (sources."react-dev-utils-11.0.4" // { dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."browserslist-4.14.2" (sources."chalk-2.4.2" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -81889,13 +81980,13 @@ in sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" @@ -81958,19 +82049,6 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.53.3" - (sources."rollup-plugin-terser-7.0.2" // { - dependencies = [ - sources."commander-2.20.3" - sources."source-map-0.7.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."terser-5.7.1" - ]; - }) sources."router-ips-1.0.0" sources."run-parallel-1.2.0" sources."run-queue-1.0.3" @@ -82014,6 +82092,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" (sources."simple-swizzle-0.2.2" // { @@ -82023,13 +82102,8 @@ in }) sources."sisteransi-1.0.5" sources."slash-3.0.0" - (sources."slugid-1.1.0" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) sources."slugify-1.6.0" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -82078,7 +82152,6 @@ in sources."source-map-resolve-0.5.3" sources."source-map-support-0.4.18" sources."source-map-url-0.4.1" - sources."sourcemap-codec-1.4.8" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -82096,7 +82169,6 @@ in }) sources."stable-0.1.8" sources."stack-trace-0.0.10" - sources."stackframe-1.2.0" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -82136,13 +82208,7 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - (sources."stringify-object-3.3.0" // { - dependencies = [ - sources."is-obj-1.0.1" - ]; - }) sources."strip-ansi-6.0.0" - sources."strip-comments-2.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."style-loader-1.2.1" @@ -82152,6 +82218,11 @@ in ]; }) sources."subscriptions-transport-ws-0.9.8" + (sources."sucrase-3.20.1" // { + dependencies = [ + sources."commander-4.1.1" + ]; + }) sources."sudo-prompt-9.1.1" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.2.0" // { @@ -82177,7 +82248,7 @@ in }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.1.0" // { + (sources."tar-6.1.7" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -82192,7 +82263,6 @@ in sources."unique-string-2.0.0" ]; }) - sources."term-size-2.2.1" sources."terminal-link-2.1.1" (sources."terser-4.8.0" // { dependencies = [ @@ -82225,9 +82295,7 @@ in sources."thunky-1.1.0" sources."timed-out-4.0.1" sources."timers-browserify-2.0.12" - sources."timm-1.7.1" sources."timsort-0.3.0" - sources."tinycolor2-1.4.2" sources."tmp-0.0.33" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" @@ -82241,9 +82309,9 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" - sources."tr46-1.0.1" sources."traverse-0.6.6" sources."tree-kill-1.2.2" + sources."ts-interface-checker-0.1.13" sources."ts-invariant-0.4.4" sources."ts-pnp-1.2.0" sources."tslib-1.14.1" @@ -82287,7 +82355,6 @@ in (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" - sources."querystring-0.2.0" ]; }) sources."url-join-4.0.0" @@ -82296,14 +82363,13 @@ in sources."schema-utils-3.1.1" ]; }) - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" ]; }) sources."use-3.1.1" - sources."utif-2.0.1" (sources."util-0.11.1" // { dependencies = [ sources."inherits-2.0.3" @@ -82344,7 +82410,6 @@ in }) sources."wbuf-1.7.3" sources."wcwidth-1.0.1" - sources."webidl-conversions-4.0.2" (sources."webpack-4.43.0" // { dependencies = [ sources."braces-2.3.2" @@ -82354,7 +82419,6 @@ in sources."fill-range-4.0.0" sources."is-number-3.0.0" sources."is-wsl-1.1.0" - sources."json5-1.0.1" sources."kind-of-3.2.2" sources."loader-utils-1.4.0" sources."lru-cache-5.1.1" @@ -82368,7 +82432,6 @@ in sources."yallist-3.1.1" ]; }) - sources."webpack-deep-scope-plugin-1.6.0" (sources."webpack-dev-middleware-3.7.3" // { dependencies = [ sources."mime-2.5.2" @@ -82474,7 +82537,6 @@ in }) sources."websocket-driver-0.6.5" sources."websocket-extensions-0.1.4" - sources."whatwg-url-7.1.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" @@ -82487,48 +82549,7 @@ in }) sources."widest-line-3.1.0" sources."with-open-file-0.1.7" - sources."workbox-background-sync-6.1.5" - sources."workbox-broadcast-update-6.1.5" - (sources."workbox-build-6.1.5" // { - dependencies = [ - (sources."@babel/core-7.14.8" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."crypto-random-string-2.0.0" - sources."fs-extra-9.1.0" - sources."semver-6.3.0" - sources."source-map-0.8.0-beta.0" - sources."temp-dir-2.0.0" - sources."tempy-0.6.0" - sources."type-fest-0.16.0" - sources."unique-string-2.0.0" - sources."universalify-2.0.0" - ]; - }) - sources."workbox-cacheable-response-6.1.5" - sources."workbox-core-6.1.5" - sources."workbox-expiration-6.1.5" - sources."workbox-google-analytics-6.1.5" - sources."workbox-navigation-preload-6.1.5" - sources."workbox-precaching-6.1.5" - sources."workbox-range-requests-6.1.5" - sources."workbox-recipes-6.1.5" - sources."workbox-routing-6.1.5" - sources."workbox-strategies-6.1.5" - sources."workbox-streams-6.1.5" - sources."workbox-sw-6.1.5" - sources."workbox-webpack-plugin-6.1.5" - sources."workbox-window-6.1.5" sources."worker-farm-1.7.0" - (sources."worker-loader-2.0.0" // { - dependencies = [ - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - sources."schema-utils-0.4.7" - ]; - }) sources."worker-rpc-0.1.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -82545,7 +82566,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.50" // { + (sources."xdl-59.0.53" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -82553,19 +82574,16 @@ in sources."minizlib-1.3.3" sources."p-map-3.0.0" sources."tar-4.4.6" - sources."uuid-3.3.2" sources."yallist-3.1.1" ]; }) - sources."xhr-2.6.0" - sources."xml-parse-from-string-1.0.1" (sources."xml2js-0.4.23" // { dependencies = [ sources."xmlbuilder-11.0.1" ]; }) sources."xmlbuilder-9.0.7" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -82581,7 +82599,11 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-13.1.2" + (sources."yargs-parser-13.1.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."yocto-queue-0.1.0" sources."zen-observable-0.8.15" sources."zen-observable-ts-0.8.21" @@ -82606,38 +82628,38 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-parameters-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -82656,7 +82678,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -82664,7 +82686,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -82675,7 +82697,7 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" @@ -82689,7 +82711,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -82719,7 +82741,7 @@ in (sources."ink-3.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -82757,7 +82779,7 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.1" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -82821,7 +82843,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -82874,24 +82896,12 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.4.tgz"; - sha512 = "KqaoGSmcIBLY6Vr1wWRMu0acuLUpxpKEtjekdwYs+JxMk74vRa8Mwxd96SmEoBat28cPCoLAPfvDyEtzUzkjEg=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.5.tgz"; + sha512 = "yDfb49A/9LCm7/xwk7zRzcjzt4w6FKUPLtSy+sRuOA9h26sNwhh4CYOqj57VOF+N7G55XFixEb0/FGKvDl7AyA=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.8" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" - sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -82907,18 +82917,7 @@ in sources."@nodelib/fs.walk-1.2.8" (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.2" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."chalk-4.1.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."supports-color-7.2.0" - sources."wrap-ansi-4.0.0" + sources."@oclif/plugin-help-3.3.0" ]; }) (sources."@oclif/config-1.17.0" // { @@ -82927,6 +82926,24 @@ in sources."tslib-2.3.0" ]; }) + (sources."@oclif/core-0.5.29" // { + dependencies = [ + sources."chalk-4.1.2" + (sources."cli-ux-5.6.3" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."supports-color-8.1.1" + ]; + }) + sources."fs-extra-9.1.0" + sources."globby-11.0.4" + sources."has-flag-4.0.0" + sources."jsonfile-6.1.0" + sources."supports-color-7.2.0" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + ]; + }) sources."@oclif/errors-1.3.5" sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.5" @@ -82960,10 +82977,11 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."ansi-escapes-3.2.0" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" + sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -82975,10 +82993,10 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."babel-eslint-10.1.0" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -82987,17 +83005,24 @@ in }) sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."bluebird-3.7.2" (sources."boxen-5.0.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."has-flag-4.0.0" sources."supports-color-7.2.0" + sources."type-fest-0.20.2" ]; }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."btoa-lite-1.0.0" + sources."buffer-5.7.1" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ @@ -83016,6 +83041,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) + sources."chardet-0.7.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -83035,27 +83061,40 @@ in }) sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" - sources."cli-table-0.3.6" + sources."cli-cursor-3.1.0" + sources."cli-progress-3.9.0" + sources."cli-spinners-2.6.0" + (sources."cli-table-0.3.6" // { + dependencies = [ + sources."colors-1.0.3" + ]; + }) (sources."cli-ux-4.9.3" // { dependencies = [ + sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."clean-stack-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."extract-stack-1.0.0" sources."fs-extra-7.0.1" + sources."has-flag-2.0.0" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" sources."semver-5.7.1" sources."strip-ansi-5.2.0" + sources."supports-hyperlinks-1.0.1" ]; }) + sources."cli-width-3.0.0" + sources."clone-1.0.4" sources."clone-response-1.0.2" sources."co-4.6.0" sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.0.3" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -83072,6 +83111,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.3" + sources."defaults-1.0.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" @@ -83080,14 +83120,7 @@ in sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."escape-string-regexp-4.0.0" - (sources."escodegen-1.14.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."eslint-config-prettier-8.3.0" - sources."eslint-plugin-prettier-3.4.0" - sources."eslint-visitor-keys-1.3.0" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -83119,27 +83152,32 @@ in sources."is-extendable-1.0.1" ]; }) + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" ]; }) - sources."extract-stack-1.0.0" + sources."extract-stack-2.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-diff-1.2.0" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.11.1" (sources."faunadb-4.3.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" sources."for-in-1.0.2" @@ -83149,14 +83187,13 @@ in sources."from2-2.3.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."get-package-type-0.1.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" - sources."globals-11.12.0" (sources."globby-8.0.2" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" @@ -83188,10 +83225,9 @@ in ]; }) sources."got-8.3.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" @@ -83208,6 +83244,7 @@ in }) (sources."heroku-cli-util-8.0.12" // { dependencies = [ + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" @@ -83219,15 +83256,23 @@ in sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."hyperlinker-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + (sources."inquirer-8.1.2" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -83235,6 +83280,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" sources."is-number-7.0.0" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" @@ -83242,6 +83288,7 @@ in sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -83249,9 +83296,8 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -83265,14 +83311,22 @@ in sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.2" // { @@ -83282,7 +83336,9 @@ in }) sources."moment-2.29.1" sources."ms-2.1.2" + sources."mute-stream-0.0.8" sources."nanomatch-1.2.13" + sources."natural-orderby-2.0.3" (sources."netrc-parser-3.1.6" // { dependencies = [ sources."debug-3.2.7" @@ -83307,21 +83363,34 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-treeify-1.1.33" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" + sources."onetime-5.1.2" sources."opn-3.0.3" sources."optionator-0.8.3" + (sources."ora-5.4.1" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."os-tmpdir-1.0.2" sources."p-cancelable-0.4.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" sources."p-timeout-2.0.1" sources."pascalcase-0.1.1" - sources."password-prompt-1.1.2" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + ]; + }) sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -83330,7 +83399,6 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prettier-2.3.2" - sources."prettier-linter-helpers-1.0.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -83349,12 +83417,18 @@ in sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" - sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."reusify-1.0.4" + sources."run-async-2.4.1" sources."run-parallel-1.2.0" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -83386,6 +83460,7 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -83399,10 +83474,11 @@ in ]; }) sources."sort-keys-2.0.0" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -83432,13 +83508,15 @@ in sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" sources."supports-color-5.5.0" - (sources."supports-hyperlinks-1.0.1" // { + (sources."supports-hyperlinks-2.2.0" // { dependencies = [ - sources."has-flag-2.0.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) + sources."through-2.3.8" sources."timed-out-4.0.1" - sources."to-fast-properties-2.0.0" + sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -83452,7 +83530,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."type-fest-0.20.2" + sources."type-fest-0.21.3" sources."union-value-1.0.1" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { @@ -83473,6 +83551,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" + sources."wcwidth-1.0.1" sources."which-1.3.1" sources."widest-line-3.1.0" sources."word-wrap-1.2.3" @@ -83509,12 +83588,12 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.16.1" // { + (sources."@google-cloud/pubsub-2.16.2" // { dependencies = [ - sources."google-auth-library-7.3.0" + sources."google-auth-library-7.5.0" ]; }) - sources."@grpc/grpc-js-1.3.6" + sources."@grpc/grpc-js-1.3.7" sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { @@ -83522,8 +83601,8 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@opentelemetry/api-1.0.1" - sources."@opentelemetry/semantic-conventions-0.22.0" + sources."@opentelemetry/api-1.0.2" + sources."@opentelemetry/semantic-conventions-0.24.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -83540,10 +83619,10 @@ in sources."@types/archiver-5.3.0" sources."@types/duplexify-3.6.0" sources."@types/glob-7.1.4" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83589,7 +83668,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."ast-types-0.13.4" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -83633,7 +83712,7 @@ in (sources."cacache-15.2.0" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.0" + sources."tar-6.1.7" ]; }) (sources."cacheable-request-6.1.0" // { @@ -83892,14 +83971,14 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.19.0" // { + (sources."google-gax-2.22.1" // { dependencies = [ - sources."google-auth-library-7.3.0" + sources."google-auth-library-7.5.0" ]; }) - sources."google-p12-pem-3.1.0" + sources."google-p12-pem-3.1.2" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gtoken-5.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -83964,7 +84043,7 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-promise-2.2.2" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-stream-ended-0.1.4" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" @@ -84032,7 +84111,6 @@ in sources."lodash.keys-2.4.1" sources."lodash.once-4.1.1" sources."lodash.snakecase-4.1.1" - sources."lodash.toarray-4.4.0" sources."lodash.union-4.6.0" sources."lodash.values-2.4.1" sources."log-symbols-2.2.0" @@ -84062,8 +84140,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -84085,7 +84163,7 @@ in }) sources."ms-2.1.2" sources."mute-stream-0.0.7" - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nash-3.0.0" // { dependencies = [ sources."async-1.5.2" @@ -84095,14 +84173,14 @@ in sources."netmask-2.0.2" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" sources."node-fetch-2.6.1" sources."node-forge-0.10.0" (sources."node-gyp-8.1.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."which-2.0.2" ]; }) @@ -84159,6 +84237,7 @@ in sources."promise-breaker-5.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" + sources."proto3-json-serializer-0.1.1" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" (sources."proxy-agent-4.0.1" // { @@ -84236,7 +84315,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."simple-swizzle-0.2.2" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -84282,7 +84361,7 @@ in sources."has-flag-2.0.0" ]; }) - (sources."tar-4.4.13" // { + (sources."tar-4.4.16" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -84346,7 +84425,7 @@ in dependencies = [ sources."boxen-5.0.1" sources."camelcase-6.2.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."global-dirs-3.0.0" sources."has-flag-4.0.0" sources."ini-2.0.0" @@ -84469,7 +84548,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -84490,7 +84569,7 @@ in sources."astral-regex-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" @@ -84530,7 +84609,7 @@ in sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" @@ -84604,7 +84683,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" @@ -84649,7 +84728,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -84672,7 +84751,7 @@ in sources."buffer-to-arraybuffer-0.0.5" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" @@ -84715,7 +84794,7 @@ in sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."global-4.4.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-4.0.0" @@ -84747,8 +84826,8 @@ in sources."localforage-1.9.0" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-document-2.19.0" @@ -84773,7 +84852,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-headers-2.0.3" + sources."parse-headers-2.0.4" sources."path-exists-4.0.0" sources."performance-now-2.1.0" sources."process-0.11.10" @@ -84822,11 +84901,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."web3-utils-1.4.0" // { - dependencies = [ - sources."underscore-1.12.1" - ]; - }) + sources."web3-utils-1.5.1" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" @@ -84957,7 +85032,7 @@ in sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" @@ -85014,10 +85089,11 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -85029,15 +85105,16 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."internal-slot-1.0.3" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" @@ -85049,14 +85126,14 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-1.0.1" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -85081,7 +85158,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" (sources."nconf-0.6.9" // { dependencies = [ @@ -85260,7 +85337,7 @@ in }) sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" (sources."winston-0.8.3" // { dependencies = [ sources."async-0.2.10" @@ -85293,14 +85370,14 @@ in sources."@medv/blessed-2.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" sources."has-flag-4.0.0" sources."indent-string-4.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."lossless-json-1.0.4" + sources."lossless-json-1.0.5" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" @@ -85336,10 +85413,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.10.0.tgz"; - sha512 = "RgHTA2qdxhdUugoi+S6BCv6LFDYxuV7P8QfbG0QRmmIAybtmpgfse6oLspWgtXwR4liRDZh/hRgwVA4y48JmlA=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.11.0.tgz"; + sha512 = "jrC1VqQHCR4N++if2bZm+iVUpdCazfZgVK0FPnmTb6Uq3xqEqS5agZR9HeE/FV8ebQ1h6/4MfFt9XsSG4Z6TFw=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -85348,20 +85425,20 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.8" // { + (sources."@babel/generator-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -85369,36 +85446,36 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-transform-parameters-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" - sources."@babel/runtime-7.14.8" - sources."@babel/standalone-7.14.8" + sources."@babel/plugin-transform-react-jsx-7.14.9" + sources."@babel/runtime-7.15.3" + sources."@babel/standalone-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -85426,7 +85503,7 @@ in sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tokenizer/token-0.1.1" + sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.1.7" sources."@turist/time-0.0.1" sources."@types/common-tags-1.8.1" @@ -85434,8 +85511,8 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.4.0" - sources."@types/node-fetch-2.5.11" + sources."@types/node-16.4.13" + sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" @@ -85489,7 +85566,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -85501,9 +85578,9 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."ccount-1.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -85540,7 +85617,7 @@ in sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."combined-stream-1.0.8" sources."common-tags-1.8.0" sources."concat-map-0.0.1" @@ -85551,7 +85628,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.30.0" + sources."contentful-management-7.31.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -85562,7 +85639,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.10.0" + sources."create-gatsby-1.11.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -85597,7 +85674,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85613,7 +85690,7 @@ in dependencies = [ sources."cross-spawn-7.0.3" sources."get-stream-6.0.1" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -85649,7 +85726,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.5.2" + sources."file-type-16.5.3" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -85668,13 +85745,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.10.0" - (sources."gatsby-recipes-0.21.0" // { + sources."gatsby-core-utils-2.11.0" + (sources."gatsby-recipes-0.22.0" // { dependencies = [ sources."strip-ansi-6.0.0" ]; }) - sources."gatsby-telemetry-2.10.0" + sources."gatsby-telemetry-2.11.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -85686,7 +85763,7 @@ in sources."global-dirs-3.0.0" sources."globals-11.12.0" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphql-15.5.1" sources."graphql-compose-7.25.1" sources."graphql-subscriptions-1.2.1" @@ -85767,7 +85844,7 @@ in ]; }) sources."jest-get-type-25.2.6" - (sources."joi-17.4.1" // { + (sources."joi-17.4.2" // { dependencies = [ sources."@hapi/hoek-9.2.0" sources."@hapi/topo-5.1.0" @@ -85817,8 +85894,8 @@ in sources."micromark-extension-mdxjs-0.3.0" sources."micromark-extension-mdxjs-esm-0.3.1" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" @@ -85833,8 +85910,8 @@ in sources."no-case-3.0.4" sources."node-eta-0.9.0" sources."node-fetch-2.6.1" - sources."node-object-hash-2.3.7" - sources."node-releases-1.1.73" + sources."node-object-hash-2.3.8" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" @@ -85868,7 +85945,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.4" + sources."peek-readable-4.0.1" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -85903,8 +85980,8 @@ in sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-3.0.2" sources."readdirp-3.6.0" - sources."redux-4.1.0" - sources."regenerator-runtime-0.13.8" + sources."redux-4.1.1" + sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remark-mdx-2.0.0-next.9" @@ -85998,7 +86075,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.1.3" + sources."strtok3-6.2.4" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -86008,7 +86085,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."token-types-3.1.0" + sources."token-types-4.1.1" sources."trim-0.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" @@ -86067,7 +86144,7 @@ in sources."write-file-atomic-3.0.3" sources."ws-7.5.3" sources."xdg-basedir-4.0.0" - sources."xstate-4.23.0" + sources."xstate-4.23.1" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -86196,8 +86273,8 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" @@ -86274,7 +86351,7 @@ in sources."semver-5.7.1" sources."separator-escape-0.0.1" sources."sha.js-2.4.5" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { @@ -86311,7 +86388,7 @@ in }) sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" - sources."ssb-ref-2.14.3" + sources."ssb-ref-2.16.0" (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" @@ -86356,14 +86433,14 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.1.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.1.0.tgz"; - sha512 = "xf6lKP7Ptas6bIdn/KvOn7UqkPS9/BBKcGCDVrsak/e0dWYeDZIOCMNwWxLp/zEjwBMSiPZtJdOdsIdmWap3bQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.5.0.tgz"; + sha512 = "8Zyt0/LQeTBg1biDUJjJ0BuWZQ4cXmNQHH+9wzJrdsfMkXl3vQ9fLJPVM22DHaHhmzpyMfgb6M3RSB3l+kO0mQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86395,11 +86472,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."arrify-1.0.1" - (sources."ast-types-0.13.4" // { - dependencies = [ - sources."tslib-2.3.0" - ]; - }) + sources."ast-types-0.13.4" sources."atomically-1.7.0" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -86419,7 +86492,7 @@ in }) sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -86430,7 +86503,7 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-10.0.1" + sources."conf-10.0.2" (sources."configstore-5.0.1" // { dependencies = [ sources."dot-prop-5.3.0" @@ -86453,7 +86526,7 @@ in sources."deep-is-0.1.3" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."degenerator-2.2.0" + sources."degenerator-3.0.1" sources."depd-1.1.2" sources."dot-prop-6.0.1" sources."duplexer3-0.1.4" @@ -86491,7 +86564,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -86509,8 +86582,13 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-7.3.3" - sources."inquirer-autocomplete-prompt-1.4.0" + sources."inquirer-8.1.2" + (sources."inquirer-autocomplete-prompt-1.4.0" // { + dependencies = [ + sources."rxjs-6.6.7" + sources."tslib-1.14.1" + ]; + }) sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" @@ -86522,7 +86600,7 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-yarn-global-0.3.0" @@ -86585,8 +86663,8 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."pac-proxy-agent-4.1.0" - sources."pac-resolver-4.2.0" + sources."pac-proxy-agent-5.0.0" + sources."pac-resolver-5.0.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" @@ -86599,7 +86677,7 @@ in sources."pkg-up-3.1.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - (sources."proxy-agent-4.0.1" // { + (sources."proxy-agent-5.0.0" // { dependencies = [ sources."lru-cache-5.1.1" sources."yallist-3.1.1" @@ -86641,7 +86719,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.7" + sources."rxjs-7.3.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -86654,14 +86732,14 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."statuses-1.5.0" sources."string-width-4.2.2" sources."string_decoder-1.3.0" @@ -86675,7 +86753,7 @@ in sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."trim-newlines-3.0.1" - sources."tslib-1.14.1" + sources."tslib-2.1.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" @@ -86687,6 +86765,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" + sources."vm2-3.9.3" sources."wcwidth-1.0.1" sources."which-2.0.2" sources."widest-line-3.1.0" @@ -86709,6 +86788,36 @@ in bypassCache = true; reconstructLock = true; }; + glob = nodeEnv.buildNodePackage { + name = "glob"; + packageName = "glob"; + version = "7.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; + }; + dependencies = [ + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "a little globber"; + homepage = "https://github.com/isaacs/node-glob#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; graphql-cli = nodeEnv.buildNodePackage { name = "graphql-cli"; packageName = "graphql-cli"; @@ -86720,7 +86829,7 @@ in dependencies = [ sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86737,13 +86846,18 @@ in (sources."@graphql-tools/batch-execute-7.1.2" // { dependencies = [ sources."@graphql-tools/utils-7.10.0" + sources."camel-case-4.1.2" sources."tslib-2.2.0" + sources."value-or-promise-1.0.6" ]; }) (sources."@graphql-tools/delegate-7.1.5" // { dependencies = [ + sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" + sources."camel-case-4.1.2" sources."tslib-2.2.0" + sources."value-or-promise-1.0.6" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.7" // { @@ -86753,6 +86867,7 @@ in sources."tslib-2.2.0" ]; }) + sources."camel-case-4.1.2" sources."tslib-2.1.0" ]; }) @@ -86768,42 +86883,44 @@ in sources."tslib-2.2.0" ]; }) + (sources."camel-case-4.1.2" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.14" // { + (sources."@graphql-tools/merge-6.2.17" // { dependencies = [ - sources."@graphql-tools/utils-7.10.0" - sources."tslib-2.2.0" + sources."@graphql-tools/utils-8.0.2" + sources."tslib-2.3.0" ]; }) - (sources."@graphql-tools/schema-7.1.5" // { + (sources."@graphql-tools/schema-8.0.3" // { dependencies = [ - sources."@graphql-tools/utils-7.10.0" - sources."tslib-2.2.0" + sources."@graphql-tools/merge-7.0.0" + sources."@graphql-tools/utils-8.0.2" + sources."tslib-2.3.0" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { dependencies = [ sources."@graphql-tools/utils-7.10.0" + sources."camel-case-4.1.2" sources."cross-fetch-3.1.4" sources."form-data-4.0.0" sources."tslib-2.2.0" ]; }) - (sources."@graphql-tools/utils-6.2.4" // { - dependencies = [ - (sources."camel-case-4.1.1" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - ]; - }) + sources."@graphql-tools/utils-6.2.4" (sources."@graphql-tools/wrap-7.0.8" // { dependencies = [ + sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" + sources."camel-case-4.1.2" sources."tslib-2.2.0" + sources."value-or-promise-1.0.6" ]; }) sources."@kwsites/file-exists-1.1.1" @@ -86814,7 +86931,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -86852,9 +86969,9 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callsites-3.1.0" - (sources."camel-case-4.1.2" // { + (sources."camel-case-4.1.1" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-1.14.1" ]; }) sources."caseless-0.12.0" @@ -86908,7 +87025,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" @@ -86956,7 +87073,7 @@ in sources."p-cancelable-1.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphql-15.3.0" (sources."graphql-config-3.0.3" // { dependencies = [ @@ -86972,9 +87089,10 @@ in sources."has-bigints-1.0.1" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" - sources."http2-client-1.3.3" + sources."http2-client-1.3.5" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.1.8" @@ -86998,12 +87116,13 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."is-arguments-1.1.0" + sources."internal-slot-1.0.3" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -87012,14 +87131,14 @@ in sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-promise-4.0.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-set-2.0.2" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-weakmap-2.0.1" @@ -87076,8 +87195,8 @@ in sources."merge2-1.4.1" sources."meros-1.1.4" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -87104,7 +87223,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) sources."oas-schema-walker-1.1.5" @@ -87217,7 +87336,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) sources."symbol-observable-1.2.0" @@ -87239,13 +87358,13 @@ in sources."url-parse-lax-3.0.0" sources."uuid-3.4.0" sources."valid-url-1.0.9" - sources."value-or-promise-1.0.6" + sources."value-or-promise-1.0.10" sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -87402,8 +87521,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -87503,7 +87622,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.10.0" + sources."blessed-contrib-4.10.1" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -87530,19 +87649,18 @@ in sources."inherits-2.0.4" sources."isarray-0.0.1" sources."lodash-4.17.21" - sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-2.1.3" (sources."marked-terminal-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."supports-color-7.2.0" ]; }) sources."memory-streams-0.1.3" sources."memorystream-0.3.1" - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" sources."nopt-2.1.2" sources."optimist-0.3.7" sources."picture-tuber-1.0.2" @@ -87559,7 +87677,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.7.8" + sources."systeminformation-5.8.0" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -87641,7 +87759,7 @@ in ]; }) sources."buffer-equal-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cache-base-1.0.1" sources."call-bind-1.0.2" sources."camelcase-3.0.0" @@ -87774,7 +87892,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" @@ -87846,7 +87964,7 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" @@ -87961,7 +88079,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -88083,7 +88201,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cache-base-1.0.1" sources."call-bind-1.0.2" sources."camelcase-3.0.0" @@ -88175,7 +88293,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gulplog-1.0.0" sources."has-1.0.3" sources."has-symbols-1.0.2" @@ -88358,7 +88476,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -88455,7 +88573,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -88526,8 +88644,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -88565,10 +88683,10 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "0.12.3"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz"; - sha512 = "be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA=="; + url = "https://registry.npmjs.org/http-server/-/http-server-13.0.0.tgz"; + sha512 = "tqOx2M1CiZ3aVaE7Ue/0lup9kOG+Zqg6wdT1HygvxFnvPpU9doBMPcQ1ffT0/QS3J9ua35gipg0o3Dr8N0K0Tg=="; }; dependencies = [ sources."async-2.6.3" @@ -88577,7 +88695,6 @@ in sources."colors-1.4.0" sources."corser-2.0.1" sources."debug-3.2.7" - sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" sources."follow-redirects-1.14.1" sources."function-bind-1.1.1" @@ -88878,7 +88995,7 @@ in sources."object-assign-3.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-ansi-2.0.0" @@ -88931,8 +89048,8 @@ in sources."longest-1.0.1" sources."lowercase-keys-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -89050,7 +89167,7 @@ in }) sources."moment-2.29.1" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -89115,7 +89232,7 @@ in sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA=="; }; dependencies = [ - sources."@jcubic/lily-0.1.0" + sources."@jcubic/lily-0.2.0" sources."@types/jquery-3.5.6" sources."@types/sizzle-2.3.3" sources."ansidec-0.3.4" @@ -89134,7 +89251,7 @@ in sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."historic-readline-1.0.8" sources."iconv-lite-0.6.3" sources."inflight-1.0.6" @@ -89144,7 +89261,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.27.1" + sources."jquery.terminal-2.28.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -89288,7 +89405,7 @@ in sources."get-stream-4.1.0" sources."get-uri-3.0.2" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" @@ -89303,7 +89420,7 @@ in dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -89351,8 +89468,8 @@ in sources."macos-release-2.5.0" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -89414,7 +89531,7 @@ in sources."is-fullwidth-code-point-3.0.0" ]; }) - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -89448,7 +89565,7 @@ in ]; }) sources."supports-color-7.2.0" - sources."tar-4.4.13" + sources."tar-4.4.16" sources."through-2.3.8" sources."through2-3.0.2" sources."tmp-0.0.33" @@ -89506,7 +89623,7 @@ in (sources."@ot-builder/cli-help-shower-1.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -89544,7 +89661,7 @@ in sources."@ot-builder/trace-1.1.0" sources."@ot-builder/var-store-1.1.0" sources."@ot-builder/variance-1.1.0" - sources."@unicode/unicode-13.0.0-1.1.0" + sources."@unicode/unicode-13.0.0-1.2.0" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -89605,7 +89722,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."hashish-0.0.4" sources."iconv-lite-0.6.3" @@ -89670,15 +89787,15 @@ in sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" sources."urix-0.1.0" - (sources."verda-1.3.0" // { + (sources."verda-1.3.2" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) sources."wawoff2-2.0.0" @@ -89829,16 +89946,72 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "2.1.2"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-2.1.2.tgz"; - sha512 = "8xDS/I9zMH0wHuZGZ0xENBn/Ml4gHk2WLMDfShN7L2VNRK/9xowunf2c/fAwI0eNXn/aw2QcMrcgqj37uZ0gbw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-2.2.1.tgz"; + sha512 = "6meo5eWRPmmZACLY+5atvtaecNsclzxcwYeFOUyAPf1JctSH/nCGow2nVkZoLtwNJGgXAnIEzwn08CpNIecDEQ=="; }; dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/generator-7.15.0" + sources."@babel/helper-annotate-as-pure-7.14.5" + (sources."@babel/helper-compilation-targets-7.15.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.15.0" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.15.0" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" + sources."@babel/helper-simple-access-7.14.8" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.15.3" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."@babel/parser-7.15.3" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-syntax-flow-7.14.5" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-typescript-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" + sources."@babel/plugin-transform-typescript-7.15.0" + sources."@babel/preset-flow-7.14.5" + sources."@babel/preset-typescript-7.15.0" + sources."@babel/register-7.15.3" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.28" - sources."@joplin/fork-sax-1.2.32" + sources."@joplin/fork-htmlparser2-4.1.31" + sources."@joplin/fork-sax-1.2.35" (sources."@joplin/lib-2.1.1" // { dependencies = [ (sources."@joplin/renderer-1.8.2" // { @@ -89855,12 +90028,53 @@ in sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@joplin/turndown-4.0.50" // { + (sources."@joplin/turndown-4.0.53" // { dependencies = [ sources."css-2.2.4" + sources."source-map-0.6.1" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.32" + sources."@joplin/turndown-plugin-gfm-1.0.35" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@oclif/command-1.8.0" + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) + (sources."@oclif/core-0.5.29" // { + dependencies = [ + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."strip-ansi-6.0.0" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + ]; + }) + (sources."@oclif/errors-1.3.5" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."@oclif/linewrap-1.0.0" + (sources."@oclif/parser-3.8.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."@oclif/plugin-help-3.3.0" + sources."@oclif/screen-1.0.4" + sources."@percy/config-1.0.0-beta.63" + sources."@percy/logger-1.0.0-beta.63" + sources."@percy/migrate-0.10.0" + sources."@types/parse-json-4.0.0" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -89870,92 +90084,184 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.6" + sources."ajv-8.6.2" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" ]; }) - sources."ansi-regex-2.1.1" - (sources."ansi-styles-4.3.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" sources."anymatch-3.1.2" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) (sources."argparse-1.0.10" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-back-2.0.0" sources."array-equal-1.0.0" sources."array-flatten-3.0.0" + sources."array-union-2.1.0" + sources."array-unique-0.3.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + (sources."ast-types-0.14.2" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) sources."async-mutex-0.1.4" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.951.0" // { + (sources."aws-sdk-2.965.0" // { dependencies = [ - sources."sax-1.2.1" + sources."buffer-4.9.2" + sources."ieee754-1.1.13" sources."uuid-3.3.2" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" ]; }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" + sources."babel-core-7.0.0-bridge.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."base-64-0.1.0" sources."base64-js-1.5.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."buffer-5.7.1" - sources."readable-stream-3.6.0" - ]; - }) + sources."bl-4.1.0" sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."buffer-4.9.2" + sources."browserslist-4.16.7" + sources."buffer-5.7.1" + sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" + sources."cache-base-1.0.1" + sources."call-bind-1.0.2" + sources."callsites-3.1.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" + sources."caniuse-lite-1.0.30001249" + sources."cardinal-2.1.1" sources."caseless-0.12.0" - sources."chalk-4.1.1" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chardet-0.7.0" sources."charenc-0.0.2" sources."chokidar-3.5.2" sources."chownr-1.1.4" sources."chroma-js-2.1.2" - sources."clean-css-4.2.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."clean-css-4.2.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."clean-stack-3.0.1" + sources."cli-cursor-3.1.0" + sources."cli-progress-3.9.0" + sources."cli-spinners-2.6.0" + (sources."cli-ux-5.6.3" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."has-flag-4.0.0" + sources."strip-ansi-6.0.0" + sources."supports-color-8.1.1" + sources."tslib-2.3.0" + ]; + }) + sources."cli-width-3.0.0" sources."cliss-0.0.2" + sources."clone-1.0.4" + sources."clone-deep-4.0.1" sources."code-point-at-1.1.0" - sources."color-3.1.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."collection-visit-1.0.0" + (sources."color-3.1.2" // { + dependencies = [ + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-string-1.6.0" + sources."colorette-1.3.0" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" sources."commander-6.2.1" + sources."commondir-1.0.1" sources."compare-version-0.1.2" sources."compare-versions-3.6.0" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" + (sources."convert-source-map-1.8.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" + sources."cosmiconfig-7.0.0" sources."cross-env-6.0.3" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."crypt-0.0.2" (sources."css-3.0.0" // { dependencies = [ + sources."source-map-0.6.1" sources."source-map-resolve-0.6.0" ]; }) @@ -90006,17 +90312,21 @@ in sources."dagre-d3-0.6.4" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-3.2.7" + sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepmerge-2.2.1" + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."detect-libc-1.0.3" sources."diff-match-patch-1.0.5" + sources."dir-glob-3.0.1" (sources."dom-serializer-1.3.2" // { dependencies = [ sources."domhandler-4.2.0" @@ -90025,16 +90335,21 @@ in sources."domelementtype-2.2.0" sources."domexception-1.0.1" sources."domhandler-3.3.0" + sources."dompurify-2.3.0" (sources."domutils-2.7.0" // { dependencies = [ sources."domhandler-4.2.0" ]; }) sources."ecc-jsbn-0.1.2" + sources."electron-to-chromium-1.3.802" + sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."escape-string-regexp-1.0.5" sources."highlight.js-9.12.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -90047,57 +90362,138 @@ in }) sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."entity-decode-2.0.2" + sources."error-ex-1.3.2" sources."es6-promise-pool-2.5.0" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + (sources."escodegen-1.14.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."events-1.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) sources."expand-template-2.0.3" sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extract-stack-2.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.11.1" sources."fault-1.0.4" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."file-type-10.11.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."find-up-2.1.0" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."flow-parser-0.157.0" sources."follow-redirects-1.14.1" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" + sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."format-0.2.2" + sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" sources."fs-extra-5.0.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."fstream-1.0.12" + sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" sources."strip-ansi-3.0.1" ]; }) + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.1.1" + sources."get-package-type-0.1.0" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" + sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.6" + sources."globals-11.12.0" + sources."globby-11.0.4" + sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" sources."growly-1.3.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-ansi-2.0.0" - sources."has-flag-4.0.0" + (sources."har-validator-5.1.5" // { + dependencies = [ + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" + ]; + }) + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."he-1.2.0" sources."highlight.js-10.7.3" sources."html-encoding-sniffer-1.0.2" @@ -90109,8 +90505,10 @@ in }) sources."http-errors-1.8.0" sources."http-signature-1.2.0" + sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" + sources."ignore-5.1.8" sources."ignore-walk-3.0.4" (sources."image-data-uri-2.0.1" // { dependencies = [ @@ -90120,9 +90518,22 @@ in }) sources."image-type-3.1.0" sources."immer-7.0.15" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + (sources."inquirer-8.1.2" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."inquirer-glob-prompt-0.1.0" // { + dependencies = [ + sources."rxjs-6.6.7" + ]; + }) (sources."inspect-function-0.2.2" // { dependencies = [ sources."split-skip-0.0.1" @@ -90153,20 +90564,31 @@ in }) sources."iota-array-1.0.0" sources."ip-regex-2.1.0" - sources."is-absolute-0.2.6" - sources."is-arrayish-0.3.2" + (sources."is-absolute-0.2.6" // { + dependencies = [ + sources."is-windows-0.2.0" + ]; + }) + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" + sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" sources."is-relative-0.2.1" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" - sources."is-windows-0.2.0" + sources."is-unicode-supported-0.1.0" + sources."is-windows-1.0.2" sources."is-wsl-2.2.0" (sources."is2-0.0.9" // { dependencies = [ @@ -90175,33 +90597,61 @@ in }) sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" + (sources."jscodeshift-0.11.0" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) sources."jsdom-15.2.1" + sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" + sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."katex-0.13.13" sources."keytar-7.7.0" sources."khroma-1.4.1" + sources."kind-of-6.0.3" sources."klaw-1.3.1" sources."lazyness-1.2.0" sources."levenshtein-1.0.5" sources."levn-0.3.0" + sources."lines-and-columns-1.1.6" sources."linkify-it-3.0.2" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash-es-4.17.21" + sources."lodash._reinterpolate-3.0.0" sources."lodash.padend-4.6.1" sources."lodash.repeat-4.1.0" sources."lodash.sortby-4.7.0" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" sources."lodash.toarray-4.4.0" + sources."log-symbols-4.1.0" sources."loose-envify-1.4.0" sources."lower-case-1.1.4" (sources."lowlight-1.9.2" // { @@ -90210,7 +90660,22 @@ in ]; }) sources."lru-cache-6.0.0" - sources."magicli-0.0.8" + (sources."magicli-0.0.8" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" (sources."markdown-it-10.0.0" // { dependencies = [ sources."entities-2.0.3" @@ -90237,9 +90702,12 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.11.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."merge2-1.4.1" + sources."mermaid-8.11.4" + sources."micromatch-4.0.4" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -90249,19 +90717,34 @@ in ]; }) sources."minizlib-1.3.3" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."moment-mini-2.24.0" - sources."ms-2.1.3" + sources."ms-2.1.2" sources."multiparty-4.2.2" sources."mustache-4.2.0" + sources."mute-stream-0.0.8" sources."nanoid-3.1.23" + sources."nanomatch-1.2.13" sources."napi-build-utils-1.0.2" + sources."natural-orderby-2.0.3" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."needle-2.8.0" + (sources."needle-2.8.0" // { + dependencies = [ + sources."debug-3.2.7" + sources."sax-1.2.4" + ]; + }) + sources."neo-async-2.6.2" sources."nextgen-events-1.5.2" + sources."nice-try-1.0.5" sources."no-case-2.3.2" (sources."node-abi-2.30.0" // { dependencies = [ @@ -90270,19 +90753,21 @@ in }) sources."node-addon-api-3.2.1" sources."node-bitmap-0.0.1" - sources."node-emoji-1.10.0" + sources."node-dir-0.1.17" + sources."node-emoji-1.11.0" sources."node-fetch-1.7.3" (sources."node-gyp-3.8.0" // { dependencies = [ sources."nopt-3.0.6" sources."semver-5.3.0" sources."tar-2.2.2" - sources."which-1.3.1" ]; }) + sources."node-modules-regexp-1.0.0" (sources."node-notifier-8.0.2" // { dependencies = [ sources."uuid-8.3.2" + sources."which-2.0.2" ]; }) sources."node-persist-2.1.0" @@ -90291,6 +90776,7 @@ in sources."semver-5.7.1" ]; }) + sources."node-releases-1.1.74" sources."nopt-4.0.3" sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" @@ -90301,6 +90787,20 @@ in sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.1" (sources."object-to-arguments-0.0.8" // { dependencies = [ sources."commander-2.20.3" @@ -90308,27 +90808,51 @@ in sources."magicli-0.0.5" ]; }) + sources."object-treeify-1.1.33" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.pick-1.3.0" sources."omggif-1.0.10" sources."once-1.4.0" + sources."onetime-5.1.2" sources."open-7.4.2" sources."optionator-0.8.3" + (sources."ora-5.4.1" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" sources."param-case-2.1.1" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" sources."parse5-5.1.0" + sources."pascalcase-0.1.1" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."cross-spawn-6.0.5" + sources."semver-5.7.1" + ]; + }) sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" + sources."path-key-2.0.1" + sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" - sources."pify-3.0.0" + sources."pify-4.0.1" sources."pipe-functions-1.3.0" + sources."pirates-4.0.1" + sources."pkg-dir-3.0.0" sources."pn-1.1.0" sources."pngjs-5.0.0" + sources."posix-character-classes-0.1.1" sources."prebuild-install-6.1.3" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" @@ -90342,20 +90866,35 @@ in sources."query-string-4.3.4" sources."querystring-0.2.0" sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" sources."random-bytes-1.0.0" sources."rc-1.2.8" sources."re-reselect-4.0.0" - sources."read-chunk-2.1.0" - (sources."readable-stream-2.3.7" // { + (sources."read-chunk-2.1.0" // { dependencies = [ - sources."safe-buffer-5.1.2" + sources."pify-3.0.0" ]; }) + sources."readable-stream-3.6.0" sources."readdirp-3.6.0" + (sources."recast-0.20.5" // { + dependencies = [ + sources."source-map-0.6.1" + sources."tslib-2.3.0" + ]; + }) + sources."redeyed-2.1.1" sources."reduce-flatten-1.0.1" sources."redux-3.7.2" + sources."regex-not-1.0.2" sources."relateurl-0.2.7" - sources."relative-3.0.2" + (sources."relative-3.0.2" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" @@ -90368,65 +90907,146 @@ in sources."tough-cookie-2.5.0" ]; }) + sources."require-from-string-2.0.2" sources."requires-port-1.0.0" sources."reselect-4.0.0" + sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" + sources."restore-cursor-3.1.0" + sources."ret-0.1.15" sources."retry-0.10.1" - sources."rimraf-2.7.1" + sources."reusify-1.0.4" + sources."rimraf-2.6.3" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" sources."rw-1.3.3" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.2.1" sources."saxes-3.1.11" sources."semver-7.3.5" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" sources."seventh-0.7.40" + sources."shallow-clone-3.0.1" (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."simple-get-4.0.0" ]; }) - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shellwords-0.1.1" sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" - sources."simple-swizzle-0.2.2" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-3.0.0" (sources."slice-ansi-1.0.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."source-map-0.6.1" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."source-map-url-0.4.1" sources."split-skip-0.0.2" + sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sqlite3-5.0.2" sources."sshpk-1.16.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" sources."string-kit-0.11.10" sources."string-padding-1.0.2" - sources."string-to-stream-1.1.1" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) - (sources."string_decoder-1.1.1" // { + (sources."string-to-stream-1.1.1" // { dependencies = [ + sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) + (sources."string-width-4.2.2" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + sources."string_decoder-1.3.0" (sources."stringify-parameters-0.0.4" // { dependencies = [ sources."commander-2.20.3" @@ -90439,62 +91059,90 @@ in ]; }) sources."strip-json-comments-2.0.1" - sources."stylis-3.5.4" - sources."supports-color-7.2.0" + sources."stylis-4.0.10" + sources."supports-color-5.5.0" + (sources."supports-hyperlinks-2.2.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" - (sources."tar-4.4.13" // { + (sources."tar-4.4.16" // { dependencies = [ sources."yallist-3.1.1" ]; }) sources."tar-fs-2.1.1" - (sources."tar-stream-2.2.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."tar-stream-2.2.0" (sources."tcp-port-used-0.1.2" // { dependencies = [ sources."debug-0.7.4" sources."q-0.9.7" ]; }) - sources."terminal-kit-1.49.3" + sources."temp-0.8.4" + sources."terminal-kit-1.49.4" + sources."through-2.3.8" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" - sources."has-flag-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."is-fullwidth-code-point-2.0.0" sources."node-emoji-git+https://github.com/laurent22/node-emoji.git" sources."string-width-2.1.1" - sources."supports-color-5.5.0" + sources."wrap-ansi-3.0.1" ]; }) + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."tr46-1.0.1" - sources."tree-kit-0.6.2" + sources."tree-kit-0.7.0" + sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."type-fest-0.21.3" sources."typical-2.6.1" sources."uc.micro-1.0.6" (sources."uglify-js-3.4.10" // { dependencies = [ sources."commander-2.19.0" + sources."source-map-0.6.1" ]; }) sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" sources."unc-path-regex-0.1.2" + sources."union-value-1.0.1" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unorm-1.6.0" sources."unpack-string-0.0.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) sources."upper-case-1.1.3" sources."uri-js-4.4.1" sources."urix-0.1.0" @@ -90503,7 +91151,8 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" + sources."use-3.1.1" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -90511,27 +91160,39 @@ in sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-1.1.2" + sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" - sources."which-2.0.2" - sources."wide-align-1.1.3" - sources."word-wrap-1.2.3" - sources."wordwrapjs-3.0.0" - (sources."wrap-ansi-3.0.1" // { + sources."which-1.3.1" + (sources."wide-align-1.1.3" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" ]; }) + sources."widest-line-3.1.0" + sources."word-wrap-1.2.3" + sources."wordwrapjs-3.0.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" sources."ws-7.5.3" sources."xml-name-validator-3.0.0" - sources."xml2js-0.4.23" - sources."xmlbuilder-11.0.1" + (sources."xml2js-0.4.23" // { + dependencies = [ + sources."xmlbuilder-11.0.1" + ]; + }) + sources."xmlbuilder-9.0.7" sources."xmlchars-2.2.0" sources."yallist-4.0.0" + sources."yaml-1.10.2" sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; @@ -90617,13 +91278,13 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" sources."entities-2.0.3" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" @@ -90654,10 +91315,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.13.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.13.0.tgz"; - sha512 = "Nd+md9wIeyfDK+RGrbOBzwLONSTdihGMtyGYU/t7zYcN2EgUa4iuY3VK2oxtPYrW5ycTj18iC+UbhNTxe4C66g=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.13.1.tgz"; + sha512 = "vymzfR3OysF5P774x6zYv0bD4EpH6NWRxpq54wO9mA9RuY49yb1teKSICkLx2Ryx+mfzlVVNNbTBtsRtg78t7g=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -90780,8 +91441,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.11.0" @@ -90840,7 +91501,7 @@ in ]; }) sources."camelcase-6.2.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" (sources."cliui-7.0.4" // { @@ -90896,7 +91557,7 @@ in sources."get-stream-4.1.0" sources."global-dirs-3.0.0" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -90941,8 +91602,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -91232,7 +91893,7 @@ in sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."got-5.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -91333,8 +91994,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -91348,7 +92009,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -91549,7 +92210,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { @@ -91658,6 +92319,14 @@ in sources."tslib-2.3.0" ]; }) + (sources."@oclif/core-0.5.29" // { + dependencies = [ + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + ]; + }) sources."@oclif/errors-1.3.5" sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.5" // { @@ -91669,23 +92338,13 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."@oclif/plugin-help-3.2.2" // { + sources."@oclif/plugin-help-3.3.0" + sources."@oclif/screen-1.0.4" + (sources."@putdotio/api-client-8.17.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."axios-0.21.1" ]; }) - sources."@oclif/screen-1.0.4" - sources."@putdotio/api-client-8.16.0" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -91694,11 +92353,18 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" - sources."axios-0.19.2" + sources."at-least-node-1.0.0" + (sources."axios-0.19.2" // { + dependencies = [ + sources."debug-3.1.0" + sources."follow-redirects-1.5.10" + sources."ms-2.0.0" + ]; + }) sources."braces-3.0.2" sources."call-bind-1.0.2" sources."cardinal-2.1.1" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -91763,19 +92429,15 @@ in }) sources."fill-range-7.0.1" sources."find-up-3.0.0" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."follow-redirects-1.14.1" sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" + sources."get-package-type-0.1.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" @@ -91812,8 +92474,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."moment-2.29.1" sources."ms-2.1.2" @@ -91875,6 +92537,7 @@ in sources."universalify-0.1.2" sources."uri-js-4.4.1" sources."urijs-1.19.7" + sources."uuid-8.3.2" sources."which-1.3.1" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" @@ -91924,7 +92587,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -91979,7 +92642,7 @@ in sources."get-caller-file-2.0.5" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."http-errors-1.7.2" sources."http-proxy-1.18.1" sources."iconv-lite-0.4.24" @@ -92001,8 +92664,8 @@ in }) sources."media-typer-0.3.0" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -92123,7 +92786,7 @@ in }) sources."browserify-zlib-0.2.0" sources."buffer-5.2.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."bytesish-0.4.4" @@ -92171,7 +92834,7 @@ in }) sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."events-3.3.0" @@ -92185,10 +92848,11 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -92204,23 +92868,24 @@ in sources."inherits-2.0.4" sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.1" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" + sources."internal-slot-1.0.3" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.9" + sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-plain-obj-2.1.0" - sources."is-regex-1.1.3" - sources."is-stream-2.0.0" - sources."is-string-1.0.6" + sources."is-regex-1.1.4" + sources."is-stream-2.0.1" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."isarray-1.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" @@ -92284,6 +92949,7 @@ in sources."sha.js-2.4.11" sources."shasum-object-1.0.0" sources."shell-quote-1.7.2" + sources."side-channel-1.0.4" sources."simple-concat-1.0.1" sources."slide-1.1.6" sources."source-map-0.5.7" @@ -92326,7 +92992,7 @@ in sources."valid-url-1.0.9" sources."vm-browserify-1.1.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-1.3.4" @@ -92378,7 +93044,7 @@ in sources."glob-7.1.7" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-symbols-1.0.2" sources."inflight-1.0.6" @@ -92559,8 +93225,8 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -92805,8 +93471,8 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."log-symbols-2.2.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -92946,7 +93612,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -93068,19 +93734,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.1.0" + sources."@octokit/openapi-types-9.6.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.14.0" + sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.5.0" + sources."@octokit/plugin-rest-endpoint-methods-5.7.0" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.7.0" - sources."@octokit/types-6.21.0" + sources."@octokit/rest-18.9.0" + sources."@octokit/types-6.25.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -93124,7 +93790,7 @@ in sources."before-after-hook-2.2.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."byline-5.0.0" sources."byte-size-7.0.1" @@ -93134,7 +93800,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."ci-info-2.0.0" @@ -93213,7 +93879,7 @@ in sources."envinfo-7.8.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -93290,7 +93956,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -93299,6 +93965,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" @@ -93334,28 +94001,29 @@ in sources."strip-ansi-6.0.0" ]; }) + sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" sources."is-ci-2.0.0" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-lambda-1.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-ssh-1.3.3" - sources."is-stream-2.0.0" - sources."is-string-1.0.6" + sources."is-stream-2.0.1" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-text-path-1.0.1" sources."is-typedarray-1.0.0" @@ -93422,8 +94090,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -93473,7 +94141,7 @@ in sources."resolve-from-4.0.0" sources."rimraf-2.7.1" sources."semver-5.7.1" - sources."tar-4.4.13" + sources."tar-4.4.16" sources."which-1.3.1" sources."yallist-3.1.1" ]; @@ -93542,7 +94210,7 @@ in sources."read-1.0.7" sources."read-cmd-shim-2.0.0" sources."read-package-json-2.1.2" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."read-package-tree-5.3.1" (sources."read-pkg-3.0.0" // { dependencies = [ @@ -93589,7 +94257,7 @@ in sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."slide-1.1.6" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."sort-keys-2.0.0" @@ -93597,7 +94265,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."split-on-first-1.1.0" sources."split2-3.2.2" @@ -93619,7 +94287,7 @@ in sources."strip-indent-3.0.0" sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."temp-dir-1.0.0" (sources."temp-write-4.0.0" // { dependencies = [ @@ -93642,7 +94310,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -93724,7 +94392,7 @@ in sources."copy-anything-2.0.3" sources."debug-3.2.7" sources."errno-0.1.8" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."iconv-lite-0.4.24" sources."image-size-0.5.5" sources."is-what-3.14.1" @@ -93899,7 +94567,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -93938,12 +94606,12 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" @@ -94247,7 +94915,7 @@ in sources."github-slugger-1.3.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { @@ -94335,8 +95003,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -94344,7 +95012,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -94603,6 +95271,24 @@ in bypassCache = true; reconstructLock = true; }; + lodash = nodeEnv.buildNodePackage { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Lodash modular utilities."; + homepage = "https://lodash.com/"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage { name = "lumo-build-deps"; packageName = "lumo-build-deps"; @@ -94610,42 +95296,42 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-compilation-targets-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -94679,8 +95365,8 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -94691,17 +95377,17 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" - sources."@babel/plugin-transform-runtime-7.14.5" + sources."@babel/plugin-transform-runtime-7.15.0" sources."@babel/plugin-transform-shorthand-properties-7.14.5" sources."@babel/plugin-transform-spread-7.14.6" sources."@babel/plugin-transform-sticky-regex-7.14.5" @@ -94709,13 +95395,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.8" + sources."@babel/preset-env-7.15.0" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -94735,8 +95421,8 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.0" + sources."@types/json-schema-7.0.9" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -94793,7 +95479,7 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."async-each-1.0.3" sources."async-retry-1.3.1" sources."asynckit-0.4.0" @@ -94826,7 +95512,7 @@ in sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" sources."babel-plugin-polyfill-corejs2-0.2.2" - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" @@ -94893,10 +95579,10 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."bser-2.1.1" sources."buffer-5.2.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-modules-3.2.0" sources."builtin-status-codes-3.0.0" @@ -94909,7 +95595,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -94958,7 +95644,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" (sources."combine-source-map-0.8.0" // { dependencies = [ @@ -94981,7 +95667,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -95033,7 +95719,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -95153,7 +95839,7 @@ in }) sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" @@ -95295,8 +95981,8 @@ in sources."bn.js-4.12.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -95316,7 +96002,7 @@ in ]; }) sources."ms-2.1.2" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.2" @@ -95336,7 +96022,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -95430,7 +96116,7 @@ in sources."realpath-native-2.0.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpu-core-4.7.1" @@ -95545,7 +96231,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -95788,16 +96474,16 @@ in markdownlint-cli = nodeEnv.buildNodePackage { name = "markdownlint-cli"; packageName = "markdownlint-cli"; - version = "0.27.1"; + version = "0.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.27.1.tgz"; - sha512 = "p1VV6aSbGrDlpUWzHizAnSNEQAweVR3qUI/AIUubxW7BGPXziSXkIED+uRtSohUlRS/jmqp3Wi4es5j6fIrdeQ=="; + url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.28.1.tgz"; + sha512 = "RBKtRRBzcuAF/H5wMSzb4zvEtbUkyYNEeaDtlQkyH9SoHWPL01emJ2Wrx6NEOa1ZDGwB+seBGvE157Qzc/t/vA=="; }; dependencies = [ sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."commander-7.1.0" + sources."commander-8.0.0" sources."concat-map-0.0.1" sources."deep-extend-0.6.0" sources."entities-2.1.0" @@ -95807,7 +96493,7 @@ in sources."ignore-5.1.8" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" + sources."ini-2.0.0" sources."js-yaml-4.1.0" sources."jsonc-parser-3.0.0" sources."linkify-it-3.0.2" @@ -95821,8 +96507,8 @@ in sources."minimist-1.2.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."rc-1.2.8" - sources."strip-json-comments-2.0.1" + sources."run-con-1.2.10" + sources."strip-json-comments-3.1.1" sources."uc.micro-1.0.6" sources."wrappy-1.0.2" ]; @@ -95849,13 +96535,13 @@ in sources."ansi-styles-4.3.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -95889,8 +96575,8 @@ in sources."lodash-4.17.21" sources."markdown-link-extractor-1.3.0" sources."marked-2.1.3" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.3" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" @@ -95956,7 +96642,7 @@ in sources."beeper-1.1.1" sources."bindings-1.5.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bufferstreams-1.1.3" sources."caller-path-0.1.0" sources."callsites-0.2.0" @@ -96046,7 +96732,7 @@ in sources."glob-7.1.7" sources."globals-9.18.0" sources."glogg-1.0.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gulp-eslint-3.0.1" (sources."gulp-util-3.0.8" // { dependencies = [ @@ -96109,8 +96795,8 @@ in sources."lodash.templatesettings-3.1.1" sources."mastodon-api-1.3.0" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -96274,29 +96960,207 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.11.0"; + version = "8.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.11.0.tgz"; - sha512 = "UyYOnVhvKcfh9e2S4QnK53uRa2hvdgQVo3ZT+FcaP56ZeBDNWKB3IZI/sNzAbxqJBEuRpW6HxoEzHCleis1dFw=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.11.4.tgz"; + sha512 = "4Ke9t29EF84LUbUE4mQOQYVdIJcZpJyOs1dyVq4KqDDKWtyQDrXbdt1JGJ1NxyKqJt9vEmR2e3BZyiLd9vJ/CQ=="; }; dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/generator-7.15.0" + sources."@babel/helper-annotate-as-pure-7.14.5" + (sources."@babel/helper-compilation-targets-7.15.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.15.0" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.15.0" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" + sources."@babel/helper-simple-access-7.14.8" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.15.3" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@babel/parser-7.15.3" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-syntax-flow-7.14.5" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-typescript-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" + sources."@babel/plugin-transform-typescript-7.15.0" + sources."@babel/preset-flow-7.14.5" + sources."@babel/preset-typescript-7.15.0" + sources."@babel/register-7.15.3" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.4.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@oclif/command-1.8.0" + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) + (sources."@oclif/core-0.5.29" // { + dependencies = [ + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + ]; + }) + sources."@oclif/errors-1.3.5" + sources."@oclif/linewrap-1.0.0" + (sources."@oclif/parser-3.8.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@oclif/plugin-help-3.3.0" + sources."@oclif/screen-1.0.4" + sources."@percy/config-1.0.0-beta.63" + sources."@percy/logger-1.0.0-beta.63" + sources."@percy/migrate-0.10.0" + sources."@types/node-16.4.13" + sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" + sources."ajv-8.6.2" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-union-2.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + (sources."ast-types-0.14.2" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."babel-core-7.0.0-bridge.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."chalk-4.1.1" + sources."buffer-from-1.1.2" + sources."cache-base-1.0.1" + sources."call-bind-1.0.2" + sources."callsites-3.1.0" + sources."caniuse-lite-1.0.30001249" + sources."cardinal-2.1.1" + sources."chalk-4.1.2" + sources."chardet-0.7.0" sources."chownr-1.1.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."clean-stack-3.0.1" + sources."cli-cursor-3.1.0" + sources."cli-progress-3.9.0" + sources."cli-spinners-2.6.0" + (sources."cli-ux-5.6.3" // { + dependencies = [ + sources."supports-color-8.1.1" + sources."tslib-2.3.0" + ]; + }) + sources."cli-width-3.0.0" + sources."clone-1.0.4" + sources."clone-deep-4.0.1" + sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.0.0" + sources."colorette-1.3.0" + sources."colors-1.4.0" + sources."commander-8.1.0" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" + (sources."convert-source-map-1.8.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."copy-descriptor-0.1.1" + sources."cosmiconfig-7.0.0" + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."d3-5.16.0" sources."d3-array-1.2.4" sources."d3-axis-1.0.12" @@ -96336,61 +97200,405 @@ in sources."dagre-0.8.5" sources."dagre-d3-0.6.4" sources."debug-4.3.1" - sources."devtools-protocol-0.0.883894" + sources."decode-uri-component-0.2.0" + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."devtools-protocol-0.0.901419" + sources."dir-glob-3.0.1" + sources."dompurify-2.3.0" + sources."electron-to-chromium-1.3.802" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."entity-decode-2.0.2" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + sources."esprima-4.0.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extract-stack-2.0.0" sources."extract-zip-2.0.1" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.7" + sources."fastq-1.11.1" sources."fd-slicer-1.1.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."fill-range-7.0.1" + (sources."find-cache-dir-2.1.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) sources."find-up-4.1.0" + sources."flow-parser-0.157.0" + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" + sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.1.1" + sources."get-package-type-0.1.0" sources."get-stream-5.2.0" + sources."get-value-2.0.6" sources."glob-7.1.7" + sources."glob-parent-5.1.2" + sources."globals-11.12.0" + sources."globby-11.0.4" + sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" + sources."has-1.0.3" sources."has-flag-4.0.0" - sources."he-1.2.0" + sources."has-symbols-1.0.2" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."https-proxy-agent-5.0.0" + sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."ignore-5.1.8" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."inquirer-8.1.2" + (sources."inquirer-glob-prompt-0.1.0" // { + dependencies = [ + sources."rxjs-6.6.7" + ]; + }) + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-docker-2.2.1" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" + sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" + sources."is-unicode-supported-0.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-2.2.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" + (sources."jscodeshift-0.11.0" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-traverse-1.0.0" + sources."json5-2.2.0" + sources."jsonfile-4.0.0" sources."khroma-1.4.1" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mermaid-8.11.0" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."log-symbols-4.1.0" + sources."lru-cache-6.0.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."merge2-1.4.1" + sources."mermaid-8.11.4" + sources."micromatch-4.0.4" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.5" sources."moment-mini-2.24.0" sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."nanomatch-1.2.13" + sources."natural-orderby-2.0.3" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."node-dir-0.1.17" sources."node-fetch-2.6.1" + sources."node-modules-regexp-1.0.0" + sources."node-releases-1.1.74" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.1" + sources."object-treeify-1.1.33" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."onetime-5.1.2" + sources."ora-5.4.1" + sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."pascalcase-0.1.1" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."cross-spawn-6.0.5" + sources."semver-5.7.1" + ]; + }) sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-type-4.0.0" sources."pend-1.2.0" + sources."picomatch-2.3.0" + sources."pify-4.0.1" + sources."pirates-4.0.1" sources."pkg-dir-4.2.0" + sources."posix-character-classes-0.1.1" sources."progress-2.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-10.1.0" + sources."punycode-2.1.1" + sources."puppeteer-10.2.0" + sources."queue-microtask-1.2.3" sources."readable-stream-3.6.0" + (sources."recast-0.20.5" // { + dependencies = [ + sources."source-map-0.6.1" + sources."tslib-2.3.0" + ]; + }) + sources."redeyed-2.1.1" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."require-from-string-2.0.2" + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-3.1.0" + sources."ret-0.1.15" + sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" sources."rw-1.3.3" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" + sources."semver-7.3.5" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shallow-clone-3.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + sources."slash-3.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.1" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."string-width-4.2.2" sources."string_decoder-1.3.0" - sources."stylis-3.5.4" + sources."strip-ansi-6.0.0" + sources."stylis-4.0.10" sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.2.0" sources."tar-fs-2.0.0" sources."tar-stream-2.2.0" + (sources."temp-0.8.4" // { + dependencies = [ + sources."rimraf-2.6.3" + ]; + }) sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."tslib-1.14.1" + sources."type-fest-0.21.3" sources."unbzip2-stream-1.3.3" + sources."union-value-1.0.1" + sources."universalify-0.1.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."uri-js-4.4.1" + sources."urix-0.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" + sources."wcwidth-1.0.1" + sources."which-1.3.1" + sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" sources."ws-7.4.6" + sources."yallist-4.0.0" + sources."yaml-1.10.2" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -96406,30 +97614,29 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.6.0.tgz"; - sha512 = "LrJqn/26CxH9aQ9j7iPqnk9fS6ywI3gpCt7HS26UXeycC3VBfhkoONLZQW/JXW3aJGoUHUlxunsQBI0h89EJIw=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.8.0.tgz"; + sha512 = "uEJ8S5nMNq6MvtxnWso6jLkwfA62RVa0+E3+TbBTOthPeC0FagskjcA6KZb2xNuEkMFoeZUQcAZcMIY5mKkHgQ=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-8.2.1" - sources."@fluentui/dom-utilities-2.1.3" - sources."@fluentui/font-icons-mdl2-8.1.6" - sources."@fluentui/foundation-legacy-8.1.6" - sources."@fluentui/keyboard-key-0.3.3" - sources."@fluentui/merge-styles-8.1.3" - sources."@fluentui/react-8.22.0" - sources."@fluentui/react-focus-8.1.8" - sources."@fluentui/react-hooks-8.2.4" - sources."@fluentui/react-window-provider-2.1.3" - sources."@fluentui/set-version-8.1.3" - sources."@fluentui/style-utilities-8.2.0" - sources."@fluentui/theme-2.1.4" - sources."@fluentui/utilities-8.2.1" - sources."@microsoft/load-themed-styles-1.10.195" + sources."@fluentui/date-time-utilities-8.2.2" + sources."@fluentui/dom-utilities-2.1.4" + sources."@fluentui/font-icons-mdl2-8.1.8" + sources."@fluentui/foundation-legacy-8.1.8" + sources."@fluentui/keyboard-key-0.3.4" + sources."@fluentui/merge-styles-8.1.4" + sources."@fluentui/react-8.27.0" + sources."@fluentui/react-focus-8.1.10" + sources."@fluentui/react-hooks-8.2.6" + sources."@fluentui/react-window-provider-2.1.4" + sources."@fluentui/set-version-8.1.4" + sources."@fluentui/style-utilities-8.2.2" + sources."@fluentui/theme-2.2.1" + sources."@fluentui/utilities-8.2.2" + sources."@microsoft/load-themed-styles-1.10.198" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/cors-2.8.12" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -96450,7 +97657,7 @@ in sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtin-status-codes-3.0.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { @@ -96497,7 +97704,11 @@ in sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.5.0" + (sources."express-openapi-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) sources."external-editor-2.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -96505,7 +97716,7 @@ in sources."finalhandler-1.1.2" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-routes-7.0.1" + sources."fs-routes-8.0.0" sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" sources."glob-7.1.7" @@ -96543,8 +97754,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -96555,7 +97766,6 @@ in ]; }) sources."ms-2.0.0" - sources."munin-plugin-0.0.9" sources."mute-stream-0.0.7" sources."negotiator-0.6.2" sources."node-fetch-1.6.3" @@ -96565,18 +97775,47 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."openapi-default-setter-7.2.3" - (sources."openapi-framework-7.5.0" // { + (sources."openapi-default-setter-8.0.0" // { dependencies = [ - sources."js-yaml-3.14.1" + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-framework-8.0.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-jsonschema-parameters-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-coercer-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-response-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-schema-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-security-handler-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" ]; }) - sources."openapi-jsonschema-parameters-7.2.3" - sources."openapi-request-coercer-7.5.0" - sources."openapi-request-validator-7.4.0" - sources."openapi-response-validator-7.4.0" - sources."openapi-schema-validator-7.2.3" - sources."openapi-security-handler-7.2.3" sources."openapi-types-7.2.3" (sources."opencollective-1.0.3" // { dependencies = [ @@ -96653,7 +97892,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.51.1" + sources."swagger-ui-dist-3.51.2" sources."tail-2.2.3" sources."through-2.3.8" sources."tmp-0.0.33" @@ -96685,10 +97924,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.0.2"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.0.2.tgz"; - sha512 = "FpspiWU+UT9Sixx/wKimvnpkeW0mh6ROAKkIaPokj3xZgxeRhcna/k5X57jJghEr8X+Cgu/Vegf8zCX5ugSuTA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz"; + sha512 = "hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -96703,7 +97942,7 @@ in sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."camelcase-6.2.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" ]; @@ -96848,8 +98087,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.11.0" @@ -96939,28 +98178,28 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "5.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.2.0.tgz"; - sha512 = "Jwy74SaN5rM4xTE2QSZijF0qN1a/ZGh1PJWUmzmVFX1RnEgA1QMZ7MVHW04UXxZ3igx+G03GGzC071+FRLKT6g=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.2.1.tgz"; + sha512 = "aPxlre1FMcHB4JaUG0CjdeHx9WogPDYUxdGfYEYDl0q0cPBWHb9ja/Km8ts/Fvm3ts0wZOTtx0i6NupDwWvpVA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -96971,20 +98210,20 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -96994,9 +98233,9 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -97028,8 +98267,8 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -97040,10 +98279,10 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -97057,40 +98296,47 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.8" // { + (sources."@babel/preset-env-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" - sources."@bugsnag/browser-7.10.5" - sources."@bugsnag/core-7.10.0" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" + sources."@bugsnag/browser-7.11.0" + sources."@bugsnag/core-7.11.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.10.5" - sources."@bugsnag/node-7.10.1" + sources."@bugsnag/js-7.11.0" + sources."@bugsnag/node-7.11.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-16.1.0" // { + (sources."@netlify/build-17.11.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."boxen-4.2.0" - sources."chalk-3.0.0" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) sources."execa-3.4.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" sources."semver-6.3.0" sources."type-fest-0.8.1" - sources."update-notifier-4.1.3" + (sources."update-notifier-4.1.3" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) ]; }) - (sources."@netlify/cache-utils-1.0.7" // { + (sources."@netlify/cache-utils-2.0.0" // { dependencies = [ sources."del-5.1.0" sources."locate-path-5.0.0" @@ -97098,10 +98344,8 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-13.0.0" // { + (sources."@netlify/config-14.4.3" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" sources."dot-prop-5.3.0" sources."execa-3.4.0" sources."find-up-4.1.0" @@ -97110,14 +98354,14 @@ in ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.7.2" // { + (sources."@netlify/framework-info-5.8.0" // { dependencies = [ sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.4.7" - (sources."@netlify/git-utils-1.0.11" // { + sources."@netlify/functions-utils-2.0.2" + (sources."@netlify/git-utils-2.0.0" // { dependencies = [ sources."braces-3.0.2" sources."execa-3.4.0" @@ -97127,33 +98371,33 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/local-functions-proxy-0.1.0" - sources."@netlify/local-functions-proxy-darwin-arm64-0.1.0" - sources."@netlify/local-functions-proxy-darwin-x64-0.1.0" - sources."@netlify/local-functions-proxy-freebsd-arm64-0.1.0" - sources."@netlify/local-functions-proxy-freebsd-x64-0.1.0" - sources."@netlify/local-functions-proxy-linux-arm-0.1.0" - sources."@netlify/local-functions-proxy-linux-arm64-0.1.0" - sources."@netlify/local-functions-proxy-linux-ia32-0.1.0" - sources."@netlify/local-functions-proxy-linux-ppc64-0.1.0" - sources."@netlify/local-functions-proxy-linux-x64-0.1.0" - sources."@netlify/local-functions-proxy-openbsd-x64-0.1.0" - sources."@netlify/local-functions-proxy-win32-ia32-0.1.0" - sources."@netlify/local-functions-proxy-win32-x64-0.1.0" + sources."@netlify/local-functions-proxy-1.1.0" + sources."@netlify/local-functions-proxy-darwin-arm64-1.1.0" + sources."@netlify/local-functions-proxy-darwin-x64-1.1.0" + sources."@netlify/local-functions-proxy-freebsd-arm64-1.1.0" + sources."@netlify/local-functions-proxy-freebsd-x64-1.1.0" + sources."@netlify/local-functions-proxy-linux-arm-1.1.0" + sources."@netlify/local-functions-proxy-linux-arm64-1.1.0" + sources."@netlify/local-functions-proxy-linux-ia32-1.1.0" + sources."@netlify/local-functions-proxy-linux-ppc64-1.1.0" + sources."@netlify/local-functions-proxy-linux-x64-1.1.0" + sources."@netlify/local-functions-proxy-openbsd-x64-1.1.0" + sources."@netlify/local-functions-proxy-win32-ia32-1.1.0" + sources."@netlify/local-functions-proxy-win32-x64-1.1.0" sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.5" + sources."@types/node-14.17.9" ]; }) - sources."@netlify/plugins-list-2.19.3" + sources."@netlify/plugins-list-3.3.0" sources."@netlify/routing-local-proxy-0.31.0" - (sources."@netlify/run-utils-1.0.7" // { + (sources."@netlify/run-utils-2.0.0" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.14.0" // { + (sources."@netlify/zip-it-and-ship-it-4.17.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -97214,6 +98458,31 @@ in sources."tslib-2.3.0" ]; }) + (sources."@oclif/core-0.5.29" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.5" + sources."ansi-styles-4.3.0" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."clean-stack-3.0.1" + sources."dir-glob-3.0.1" + sources."escape-string-regexp-4.0.0" + sources."fast-glob-3.2.7" + sources."fill-range-7.0.1" + sources."fs-extra-9.1.0" + sources."glob-parent-5.1.2" + sources."globby-11.0.4" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."jsonfile-6.1.0" + sources."micromatch-4.0.4" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + sources."wrap-ansi-7.0.0" + ]; + }) (sources."@oclif/errors-1.3.5" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -97232,21 +98501,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/plugin-help-3.2.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) + sources."@oclif/plugin-help-3.3.0" (sources."@oclif/plugin-not-found-1.2.4" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -97280,18 +98535,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.1.0" - sources."@octokit/plugin-paginate-rest-2.14.0" + sources."@octokit/openapi-types-9.6.0" + sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.5.0" + sources."@octokit/plugin-rest-endpoint-methods-5.7.0" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.7.0" - sources."@octokit/types-6.21.0" + sources."@octokit/rest-18.9.0" + sources."@octokit/types-6.25.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -97328,16 +98583,16 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" - sources."@types/node-fetch-2.5.11" + sources."@types/node-16.4.13" + sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" sources."@types/responselike-1.0.0" - sources."@types/semver-7.3.7" + sources."@types/semver-7.3.8" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.28.4" - (sources."@typescript-eslint/typescript-estree-4.28.4" // { + sources."@typescript-eslint/types-4.29.1" + (sources."@typescript-eslint/typescript-estree-4.29.1" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -97354,7 +98609,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.4" + sources."@typescript-eslint/visitor-keys-4.29.1" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -97368,7 +98623,6 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" - sources."global-cache-dir-2.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" @@ -97413,7 +98667,7 @@ in sources."ascii-table-0.0.9" sources."assign-symbols-1.0.0" sources."ast-module-types-2.7.1" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" @@ -97423,7 +98677,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" @@ -97458,14 +98712,14 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-es6-4.9.3" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" sources."builtins-1.0.3" sources."byline-5.0.0" @@ -97487,9 +98741,9 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."cardinal-2.1.1" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -97569,7 +98823,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -97607,7 +98861,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -97753,7 +99007,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -97920,10 +99174,11 @@ in sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" + sources."get-package-type-0.1.0" sources."get-port-5.1.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" - sources."gh-release-fetch-2.0.1" + sources."gh-release-fetch-2.0.2" sources."git-repo-info-2.1.1" sources."gitconfiglocal-2.1.0" sources."glob-7.1.7" @@ -97933,7 +99188,7 @@ in ]; }) sources."glob-to-regexp-0.3.0" - sources."global-cache-dir-1.0.1" + sources."global-cache-dir-2.0.0" sources."global-dirs-2.1.0" sources."globals-11.12.0" (sources."globby-10.0.2" // { @@ -97959,7 +99214,7 @@ in sources."to-readable-stream-1.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -98090,7 +99345,7 @@ in sources."is-promise-2.2.2" sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-1.2.4" @@ -98262,8 +99517,8 @@ in sources."micro-memoize-4.0.9" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -98300,12 +99555,12 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-7.0.1" // { + (sources."netlify-8.0.0" // { dependencies = [ sources."qs-6.10.1" ]; }) - (sources."netlify-redirect-parser-8.1.0" // { + (sources."netlify-redirect-parser-8.2.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; @@ -98313,7 +99568,7 @@ in sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { dependencies = [ @@ -98519,7 +99774,7 @@ in }) sources."rc-1.2.8" sources."react-is-16.13.1" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" (sources."read-pkg-5.2.0" // { dependencies = [ sources."type-fest-0.6.0" @@ -98538,7 +99793,7 @@ in sources."redeyed-2.1.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpu-core-4.7.1" @@ -98571,7 +99826,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.3" + sources."rollup-2.56.2" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -98676,7 +99931,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."split2-1.1.1" sources."sprintf-js-1.0.3" @@ -98900,7 +100155,7 @@ in ]; }) sources."yargs-parser-18.1.3" - sources."yarn-1.22.10" + sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" sources."zip-stream-4.1.0" @@ -98974,7 +100229,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" @@ -99021,14 +100276,14 @@ in sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."ssri-8.0.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."util-deprecate-1.0.2" @@ -99158,7 +100413,7 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-1.0.3" @@ -99205,13 +100460,13 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -99286,7 +100541,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -99432,7 +100687,11 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.13" + (sources."tar-4.4.16" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -99451,17 +100710,17 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "2.0.1"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-2.0.1.tgz"; - sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.0.5.tgz"; + sha512 = "S3vhm/EqQwEvHDBw/375j4f5vVT9YknfTEeQjbA/Fa2XAK0WLCC+ENLV+4HzkpSAIi+9hmrF3TpdhjVLksmk1A=="; }; dependencies = [ - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@mapbox/node-pre-gyp-1.0.5" - sources."@node-red/editor-api-2.0.1" - sources."@node-red/editor-client-2.0.1" - (sources."@node-red/nodes-2.0.1" // { + sources."@node-red/editor-api-2.0.5" + sources."@node-red/editor-client-2.0.5" + (sources."@node-red/nodes-2.0.5" // { dependencies = [ sources."http-errors-1.7.3" sources."iconv-lite-0.6.3" @@ -99474,15 +100733,15 @@ in }) ]; }) - sources."@node-red/registry-2.0.1" - sources."@node-red/runtime-2.0.1" - sources."@node-red/util-2.0.1" + sources."@node-red/registry-2.0.5" + sources."@node-red/runtime-2.0.5" + sources."@node-red/util-2.0.5" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -99533,7 +100792,7 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."busboy-0.2.14" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" @@ -99637,7 +100896,7 @@ in sources."get-stream-5.2.0" sources."glob-7.1.7" sources."got-11.8.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" (sources."help-me-3.0.0" // { @@ -99696,8 +100955,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -99771,7 +101030,7 @@ in sources."raw-body-2.4.0" sources."read-1.0.7" sources."readable-stream-1.1.14" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."reinterval-1.1.0" sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.0" @@ -99810,7 +101069,7 @@ in sources."string-width-1.0.2" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" - (sources."tar-6.1.0" // { + (sources."tar-6.1.2" // { dependencies = [ sources."mkdirp-1.0.4" sources."yallist-4.0.0" @@ -99872,7 +101131,7 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."caseless-0.12.0" sources."chownr-2.0.0" @@ -99912,7 +101171,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -99934,8 +101193,8 @@ in sources."jsonfile-1.0.1" sources."jsprim-1.4.1" sources."lru-cache-6.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" @@ -100001,7 +101260,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -100011,7 +101270,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.1.0" // { + (sources."tar-6.1.7" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -100105,7 +101364,7 @@ in sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -100216,7 +101475,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -100242,7 +101501,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -100283,7 +101542,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" @@ -100360,7 +101619,7 @@ in sources."type-fest-0.10.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."hard-rejection-2.1.0" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -100442,7 +101701,7 @@ in sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" sources."is-scoped-2.1.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-superb-4.0.0" @@ -100684,7 +101943,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" @@ -100746,10 +102005,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.20.0"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.20.0.tgz"; - sha512 = "59Eje4RcXP9EKYPIJvBvQGTyfEvZWaKdOx5+YZ+IJ+fqYhJJH5ng78qcdD8sFPyA1g1MFBR0DYXKfncwbxXpVA=="; + url = "https://registry.npmjs.org/npm/-/npm-7.20.5.tgz"; + sha512 = "vRyu1V79n5BzKn4vkanag1xEjEMLIZ48Ry1V7IyAvHQHi8syOEiYWvUMxNpeDk+e8JKAKCNG3lIYJDm3pM8VMQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -100829,7 +102088,7 @@ in }) sources."camelcase-6.2.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cint-8.2.1" @@ -100894,7 +102153,7 @@ in }) sources."globby-11.0.4" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-4.0.0" @@ -100969,8 +102228,8 @@ in sources."make-fetch-happen-9.0.4" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -101031,7 +102290,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -101056,7 +102315,7 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."slash-3.0.0" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."spawn-please-1.0.0" @@ -101067,7 +102326,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -101151,8 +102410,8 @@ in dependencies = [ sources."abbrev-1.1.1" sources."ajv-6.12.6" - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" + sources."ansi-regex-3.0.0" + sources."aproba-2.0.0" sources."are-we-there-yet-1.1.5" sources."argparse-0.1.15" sources."asn1-0.2.4" @@ -101166,8 +102425,8 @@ in sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."chownr-0.0.2" - sources."code-point-at-1.1.0" sources."coffee-script-1.12.7" + sources."color-support-1.1.3" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" (sources."config-chain-1.1.13" // { @@ -101203,7 +102462,7 @@ in sources."mkdirp-0.5.5" ]; }) - sources."gauge-2.7.4" + sources."gauge-3.0.1" sources."getpass-0.1.7" sources."glob-7.1.7" sources."graceful-fs-2.0.3" @@ -101214,7 +102473,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.1.0" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -101224,8 +102483,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -101244,8 +102503,7 @@ in sources."semver-2.3.2" ]; }) - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" + sources."npmlog-5.0.0" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -101272,13 +102530,13 @@ in sources."signal-exit-3.0.3" sources."slide-1.1.6" sources."sshpk-1.16.1" - sources."string-width-1.0.2" + sources."string-width-2.1.1" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-3.0.1" + sources."strip-ansi-4.0.0" (sources."tar-0.1.17" // { dependencies = [ sources."inherits-1.0.2" @@ -101364,27 +102622,27 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.8" // { + (sources."@babel/generator-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -101395,24 +102653,24 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -101446,8 +102704,8 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -101459,15 +102717,15 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" sources."@babel/plugin-transform-shorthand-properties-7.14.5" @@ -101477,16 +102735,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.8" // { + (sources."@babel/preset-env-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -101546,7 +102804,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -101591,14 +102849,14 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" ]; }) sources."buffer-equal-0.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" @@ -101608,7 +102866,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -101623,7 +102881,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -101635,7 +102893,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -101691,7 +102949,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."deasync-0.1.21" + sources."deasync-0.1.22" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" @@ -101746,7 +103004,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -101756,7 +103014,7 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.18.3" // { + (sources."es-abstract-1.18.5" // { dependencies = [ sources."object-inspect-1.11.0" ]; @@ -101817,7 +103075,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -101830,6 +103088,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -101874,6 +103133,7 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internal-slot-1.0.3" sources."is-absolute-url-2.1.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ @@ -101881,11 +103141,11 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.3" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { @@ -101893,7 +103153,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.3" @@ -101906,12 +103166,12 @@ in sources."is-html-1.1.0" sources."is-negative-zero-2.0.1" sources."is-number-3.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-resolvable-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" @@ -101977,8 +103237,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -101991,7 +103251,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -102008,7 +103268,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -102155,7 +103415,7 @@ in sources."readdirp-2.2.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ @@ -102211,6 +103471,11 @@ in sources."shallow-copy-0.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + (sources."side-channel-1.0.4" // { + dependencies = [ + sources."object-inspect-1.11.0" + ]; + }) sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -102477,12 +103742,13 @@ in sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."heapdump-0.3.15" sources."hot-shots-6.8.7" @@ -102492,7 +103758,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -102522,8 +103788,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -102531,7 +103797,7 @@ in sources."ms-2.0.0" sources."msgpack5-3.6.1" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" @@ -102617,7 +103883,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -102628,7 +103894,7 @@ in sources."verror-1.10.0" sources."which-module-2.0.0" sources."wikimedia-langconv-0.1.0" - sources."wikipeg-2.0.5" + sources."wikipeg-2.0.6" sources."wordwrap-1.0.0" sources."worker-farm-1.7.0" sources."wrap-ansi-5.1.0" @@ -102678,7 +103944,7 @@ in sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -102729,7 +103995,7 @@ in sha512 = "spB+D+GXdM9JcPeWG8bpnWTxfXr/KwyyZ0OjNlpyw62ffxlCsbNhwaSmhXDpDC3wh4HuQejdYc1DlU+zTXL+WA=="; }; dependencies = [ - sources."addr-to-ip-port-1.5.1" + sources."addr-to-ip-port-1.5.4" sources."airplay-protocol-2.0.2" (sources."airplayer-2.0.0" // { dependencies = [ @@ -102744,8 +104010,8 @@ in sources."array-flatten-2.1.2" sources."balanced-match-1.0.2" sources."base64-js-0.0.8" - sources."bencode-2.0.1" - sources."bep53-range-1.1.0" + sources."bencode-2.0.2" + sources."bep53-range-1.1.1" sources."big-integer-1.6.48" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { @@ -102770,7 +104036,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."call-bind-1.0.2" sources."camelcase-2.1.1" @@ -102822,11 +104088,12 @@ in sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."hosted-git-info-2.8.9" sources."http-headers-3.0.2" @@ -102852,13 +104119,13 @@ in sources."ip-1.1.5" sources."ip-set-1.0.2" sources."ipaddr.js-2.0.1" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."k-bucket-0.6.0" @@ -102977,15 +104244,11 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - (sources."string2compact-1.3.0" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) + sources."string2compact-1.3.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -103040,14 +104303,14 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.5.1.tgz"; - sha512 = "sXl2KCt8LCUrL6ezEPD4W5D5b+I0/VVOYlfI0K3GfdVUXkNHcb0q7cogPNjAXmoSMhvb57x2nhZN1xwxgGjzuw=="; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.6.0.tgz"; + sha512 = "NGLR8G6SP7WriloFrS5JDU8Rx1Ia1OlbJOpqGeAzMKxhrajnAdPza8VeXozMUk0oBCS8hr+cuLQ7stprgzISXg=="; }; dependencies = [ sources."accepts-1.3.7" - sources."addr-to-ip-port-1.5.1" + sources."addr-to-ip-port-1.5.4" sources."after-0.8.2" sources."ajv-6.12.6" sources."archiver-3.1.1" @@ -103094,7 +104357,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."caseless-0.12.0" sources."chrome-dgram-3.0.6" @@ -103168,7 +104431,7 @@ in sources."get-browser-rtc-1.1.0" sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { @@ -103210,7 +104473,7 @@ in }) (sources."k-rpc-socket-1.11.1" // { dependencies = [ - sources."bencode-2.0.1" + sources."bencode-2.0.2" ]; }) (sources."lazystream-1.0.0" // { @@ -103230,8 +104493,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -103353,7 +104616,11 @@ in sources."speedometer-0.1.4" sources."sshpk-1.16.1" sources."statuses-1.5.0" - sources."string2compact-1.3.0" + (sources."string2compact-1.3.2" // { + dependencies = [ + sources."ipaddr.js-2.0.1" + ]; + }) sources."string_decoder-1.1.1" sources."tar-stream-2.2.0" sources."thirty-two-0.0.2" @@ -103405,13 +104672,13 @@ in pkg = nodeEnv.buildNodePackage { name = "pkg"; packageName = "pkg"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.3.0.tgz"; - sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; + url = "https://registry.npmjs.org/pkg/-/pkg-5.3.1.tgz"; + sha512 = "jT/sptM1ZG++FNk+jnJYNoWLDQXYd7hqpnBhd5j18SNW1jJzNYo55RahuCiD0KN0PX9mb53GWCqKM0ia/mJytA=="; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/parser-7.13.13" sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.5" @@ -103432,7 +104699,7 @@ in }) sources."braces-3.0.2" sources."buffer-5.7.1" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chownr-1.1.4" sources."cliui-7.0.4" sources."code-point-at-1.1.0" @@ -103475,7 +104742,7 @@ in sources."github-from-package-0.0.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" @@ -103523,7 +104790,7 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.0" - sources."pkg-fetch-3.1.1" + sources."pkg-fetch-3.2.2" sources."prebuild-install-6.0.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" @@ -103639,7 +104906,7 @@ in sources."anymatch-3.1.2" sources."argparse-1.0.10" sources."ast-types-0.13.4" - sources."async-3.2.0" + sources."async-3.2.1" (sources."async-listener-0.6.10" // { dependencies = [ sources."semver-5.7.1" @@ -103653,7 +104920,7 @@ in sources."boolean-3.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."chalk-3.0.0" sources."charm-0.1.2" @@ -103698,7 +104965,7 @@ in sources."git-sha1-0.1.2" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."http-errors-1.7.3" @@ -103779,7 +105046,7 @@ in sources."setprototypeof-1.1.1" sources."shimmer-1.2.1" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -103788,7 +105055,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.7.8" + sources."systeminformation-5.8.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.0" @@ -103823,10 +105090,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.10.3"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.3.tgz"; - sha512 = "GdxerBN3hhe9x9W0mAMmiWoDELy7KekrmHbYdo7WeHC1MthP/gI7MGVYIgcKj9Vy4zWLO9v1hVYOgKUrewkDVg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.12.1.tgz"; + sha512 = "p2fowre11u8/f6rw6n1zadtpNLQd2XNux40sUUdcVQqwryUG0YO7xveP96iRTBSWi+RdyCRlXnDgppyvb31d8g=="; }; buildInputs = globalBuildInputs; meta = { @@ -103850,7 +105117,7 @@ in sources."commander-2.11.0" sources."file-or-stdin-1.0.2" sources."get-stdin-5.0.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."inspect-with-kind-1.0.5" sources."kind-of-6.0.3" sources."poor-mans-t-sql-formatter-1.6.10" @@ -103875,7 +105142,7 @@ in sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; dependencies = [ - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."nanoid-3.1.23" sources."source-map-js-0.6.2" ]; @@ -103908,12 +105175,12 @@ in sources."at-least-node-1.0.0" sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chokidar-3.5.2" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" @@ -103927,7 +105194,7 @@ in sources."get-stdin-8.0.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."ignore-5.1.8" sources."import-cwd-3.0.0" @@ -104117,7 +105384,7 @@ in sources."browserify-zlib-0.2.0" sources."buffer-5.2.1" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" @@ -104169,7 +105436,7 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.7" sources."globule-1.3.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."hash-base-3.1.0" // { dependencies = [ @@ -104329,10 +105596,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.15.2"; + version = "0.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.2.tgz"; - sha512 = "dlxcc6Fv7rcXO3uFVcOgZturcKknB4J00ITJjZCrORTjw5eVbGcSTKrSeSAlNZWaUYu0HQX9NHVKtHDG/6rBNw=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.4.tgz"; + sha512 = "llUv605I8yvraO98rb5RmmqPdpWBno7IpIlgNlX3Nq3Q4lvB7G0OxGK89JuAoVZ8T/xkTzhjyuzw0sty0DoY3Q=="; }; dependencies = [ sources."isexe-2.0.0" @@ -104395,10 +105662,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.157"; + version = "1.1.161"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.157.tgz"; - sha512 = "slTex47hQKuyoi579Zk7lEhVH+4Dmn+eZ3gP1JGcFBcbcmDwd9ZI1ESww3jY3YoOYdNbYTafxBNuh3RHGkGiMA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.161.tgz"; + sha512 = "ahZ8KyDAMdyFTt9j0P/WL6SAeZWKI9qxoFRmTxw71JwyCVPSqXaeo2rK3304YjfKZKAtuHNMgtuZiAVT8U/Pbw=="; }; buildInputs = globalBuildInputs; meta = { @@ -104430,7 +105697,7 @@ in sources."brfs-1.6.1" sources."browser-or-node-1.3.0" sources."buffer-equal-0.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."camelcase-5.3.1" sources."chalk-2.4.2" sources."cliui-4.1.0" @@ -104657,7 +105924,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -104671,22 +105938,24 @@ in sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."internal-slot-1.0.3" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" @@ -104719,7 +105988,7 @@ in sources."utile-0.2.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -104748,21 +106017,21 @@ in dependencies = [ sources."@babel/cli-7.14.8" sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.8" // { + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.14.5" // { + (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-create-class-features-plugin-7.15.0" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -104773,24 +106042,24 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -104825,8 +106094,8 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -104837,21 +106106,21 @@ in sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" - sources."@babel/plugin-transform-react-display-name-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.15.1" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/plugin-transform-react-jsx-development-7.14.5" sources."@babel/plugin-transform-react-pure-annotations-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" - (sources."@babel/plugin-transform-runtime-7.14.5" // { + (sources."@babel/plugin-transform-runtime-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -104863,7 +106132,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.8" // { + (sources."@babel/preset-env-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -104871,17 +106140,17 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.14.5" - sources."@babel/runtime-7.14.8" + sources."@babel/register-7.15.3" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -104975,7 +106244,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-transform-react-remove-prop-types-0.4.24" sources."babel-plugin-universal-import-4.0.2" @@ -105035,13 +106304,13 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -105069,7 +106338,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001249" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -105127,7 +106396,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-4.1.1" sources."commondir-1.0.1" sources."component-bind-1.0.0" @@ -105154,7 +106423,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -105298,7 +106567,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105329,7 +106598,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -105466,7 +106735,7 @@ in sources."pify-3.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gud-1.0.0" sources."gunzip-maybe-1.4.2" sources."gzip-size-5.1.1" @@ -105483,6 +106752,7 @@ in sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.2" sources."has-to-string-tag-x-1.4.1" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -105570,7 +106840,7 @@ in dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."figures-3.2.0" @@ -105579,6 +106849,7 @@ in ]; }) sources."internal-ip-4.3.0" + sources."internal-slot-1.0.3" sources."intersection-observer-0.7.0" sources."into-stream-3.1.0" sources."invariant-2.2.4" @@ -105587,17 +106858,17 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.3" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" @@ -105609,7 +106880,7 @@ in sources."is-natural-number-4.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-object-1.0.2" sources."is-path-cwd-2.2.0" @@ -105617,11 +106888,11 @@ in sources."is-path-inside-2.1.0" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -105696,8 +106967,8 @@ in ]; }) sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -105722,7 +106993,7 @@ in sources."multicast-dns-service-types-1.1.0" sources."mutation-observer-1.0.3" sources."mute-stream-0.0.7" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."neo-async-2.6.2" @@ -105738,7 +107009,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -106011,7 +107282,7 @@ in sources."readdirp-3.6.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" @@ -106126,6 +107397,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shorthash-0.0.2" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -106356,7 +107628,7 @@ in ]; }) sources."url-loader-2.3.0" - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -106512,7 +107784,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -106603,11 +107875,11 @@ in sources."iconv-lite-0.4.24" sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.1" - sources."jsdom-16.6.0" + sources."jsdom-16.7.0" sources."levn-0.3.0" sources."lodash-4.17.21" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.2" sources."nwsapi-2.2.0" sources."optionator-0.8.3" @@ -106638,7 +107910,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.0.1" + sources."yargs-17.1.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -106654,14 +107926,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.2.tgz"; - sha512 = "GyOCEr1g+U/Js7lgHj+0vH9L2uCwbc0m9CJrlb099qp6jzmxnJQ6sC85BiN9DOwr4/fsQfVhoNpWQSkkpFBo5Q=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.3.tgz"; + sha512 = "qTBaEfwVqCvqLbuloZ9sMBQA49WfMOQrLVBGiVyT7pNMAjosQCpMyFESqQL8WqVxDzV2olPCZ1L2rG9cuDGOsA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.14.8" // { + (sources."@babel/generator-7.15.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -106672,13 +107944,13 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" - sources."@babel/runtime-7.14.8" + sources."@babel/parser-7.15.3" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -106687,12 +107959,12 @@ in sources."@redocly/ajv-8.6.2" (sources."@redocly/openapi-core-1.0.0-beta.54" // { dependencies = [ - sources."@types/node-14.17.5" + sources."@types/node-14.17.9" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" - sources."@types/json-schema-7.0.8" - sources."@types/node-15.14.2" + sources."@types/json-schema-7.0.9" + sources."@types/node-15.14.7" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -106744,7 +108016,7 @@ in sources."clsx-1.1.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" @@ -106806,7 +108078,7 @@ in }) sources."hmac-drbg-1.0.1" sources."hoist-non-react-statics-3.3.2" - sources."http2-client-1.3.3" + sources."http2-client-1.3.5" sources."https-browserify-1.0.0" sources."ieee754-1.2.1" sources."inherits-2.0.1" @@ -106893,13 +108165,13 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.55" // { + (sources."redoc-2.0.0-rc.56" // { dependencies = [ sources."path-browserify-1.0.1" ]; }) sources."reftools-1.1.9" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."ripemd160-2.0.2" @@ -106932,7 +108204,7 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -106963,7 +108235,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.0.1" + sources."yargs-17.1.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -107014,7 +108286,7 @@ in sources."figures-3.2.0" sources."find-up-2.1.0" sources."function-bind-1.1.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."hosted-git-info-2.8.9" @@ -107086,7 +108358,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -107168,10 +108440,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.3"; + version = "2.56.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; - sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.2.tgz"; + sha512 = "s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -107193,7 +108465,7 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -107220,20 +108492,20 @@ in sources."@tootallnate/once-1.1.2" sources."@types/estree-0.0.39" sources."@types/glob-7.1.4" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" sources."@types/node-12.12.70" - sources."@types/node-fetch-2.5.11" + sources."@types/node-fetch-2.5.12" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.58.1" - sources."@typescript-eslint/eslint-plugin-4.28.4" - sources."@typescript-eslint/experimental-utils-4.28.4" - sources."@typescript-eslint/parser-4.28.4" - sources."@typescript-eslint/scope-manager-4.28.4" - sources."@typescript-eslint/types-4.28.4" - sources."@typescript-eslint/typescript-estree-4.28.4" - sources."@typescript-eslint/visitor-keys-4.28.4" + sources."@types/vscode-1.59.0" + sources."@typescript-eslint/eslint-plugin-4.29.1" + sources."@typescript-eslint/experimental-utils-4.29.1" + sources."@typescript-eslint/parser-4.29.1" + sources."@typescript-eslint/scope-manager-4.29.1" + sources."@typescript-eslint/types-4.29.1" + sources."@typescript-eslint/typescript-estree-4.29.1" + sources."@typescript-eslint/visitor-keys-4.29.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -107265,7 +108537,7 @@ in sources."callsites-3.1.0" sources."camelcase-6.2.0" sources."chainsaw-0.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -107315,7 +108587,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.31.0" // { + (sources."eslint-7.32.0" // { dependencies = [ (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -107358,7 +108630,7 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -107375,7 +108647,7 @@ in sources."glob-parent-5.1.2" sources."globals-13.10.0" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -107425,8 +108697,8 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -107497,7 +108769,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.3" + sources."rollup-2.56.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -107702,10 +108974,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.35.2"; + version = "1.37.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.35.2.tgz"; - sha512 = "jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz"; + sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -107816,8 +109088,8 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" @@ -107875,10 +109147,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.52.0"; + version = "2.53.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.52.0.tgz"; - sha512 = "MoEA+YLQsfknLuc2d/uV8vTehnAsAJqOXCyQLOZn3/QQ+rdwUFzasbg0m+zZdNMespfcHDTTht+CUgS2/svUJw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.53.1.tgz"; + sha512 = "LK7BWPCpMq0p1TcnJb4uCkxYYrbsM2J7FOCd29BYKmvvUrB+NzFeAVGE1sR/cPF6ECT0PWsR9NEADb24o5D2WA=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -107911,7 +109183,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.14.0" // { + (sources."@serverless/components-3.15.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -107926,7 +109198,6 @@ in sources."argparse-1.0.10" ]; }) - sources."jwt-decode-3.1.2" sources."ramda-0.27.1" sources."strip-ansi-6.0.0" sources."write-file-atomic-3.0.3" @@ -107941,13 +109212,13 @@ in }) sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.5" // { + (sources."@serverless/platform-client-4.2.6" // { dependencies = [ - sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" + sources."jwt-decode-2.2.0" ]; }) - (sources."@serverless/platform-client-china-2.2.0" // { + (sources."@serverless/platform-client-china-2.2.2" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -107957,7 +109228,6 @@ in (sources."@serverless/utils-5.6.0" // { dependencies = [ sources."get-stream-6.0.1" - sources."jwt-decode-3.1.2" sources."write-file-atomic-3.0.3" ]; }) @@ -107965,15 +109235,15 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" - sources."@tokenizer/token-0.1.1" + sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/lodash-4.14.171" + sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.4.0" - sources."@types/request-2.48.6" + sources."@types/node-16.4.13" + sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" sources."@types/tough-cookie-4.0.1" @@ -108006,7 +109276,7 @@ in }) (sources."archiver-5.3.0" // { dependencies = [ - sources."async-3.2.0" + sources."async-3.2.1" sources."bl-4.1.0" sources."tar-stream-2.2.0" ]; @@ -108033,7 +109303,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.951.0" // { + (sources."aws-sdk-2.965.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -108102,7 +109372,7 @@ in sources."traverse-0.3.9" ]; }) - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -108262,7 +109532,7 @@ in sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-16.5.2" + sources."file-type-16.5.3" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" @@ -108315,7 +109585,7 @@ in sources."responselike-2.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -108391,14 +109661,14 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."jszip-3.6.0" // { + (sources."jszip-3.7.1" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) - sources."jwt-decode-2.2.0" + sources."jwt-decode-3.1.2" (sources."kafka-node-5.0.0" // { dependencies = [ sources."uuid-3.4.0" @@ -108449,8 +109719,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -108460,7 +109730,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanoid-2.1.11" sources."napi-build-utils-1.0.2" sources."native-promise-only-0.8.1" @@ -108508,7 +109778,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-3.1.4" + sources."peek-readable-4.0.1" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -108578,7 +109848,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.41.1" // { + (sources."simple-git-2.42.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -108619,7 +109889,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.1.3" + sources."strtok3-6.2.4" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -108651,7 +109921,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.1.0" // { + (sources."tar-6.1.7" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -108680,7 +109950,7 @@ in sources."to-buffer-1.1.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."token-types-3.1.0" + sources."token-types-4.1.1" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -108886,8 +110156,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -109084,7 +110354,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graceful-readlink-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -109291,7 +110561,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -109388,10 +110658,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.664.0"; + version = "1.679.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.664.0.tgz"; - sha512 = "4YPqDdPPZsn3BBN82UiN6+Jy4zdKbBvw4MKClvh2QQgUJy6R9nEm/Q8IbdsM0jOqPByDRWVMwsCPQu3ZpqG3KA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.679.0.tgz"; + sha512 = "ozOSKWSgCOUrlvlvCpjuLdj5x3Eb+SMSntzQaJBqpoQzzdR2osmY0J5HzpHmIX/ORgaEa2Ec0HbANqpLILNkrg=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -109404,16 +110674,21 @@ in sources."@sindresorhus/is-4.0.1" sources."@snyk/child-process-0.3.1" sources."@snyk/cli-interface-2.11.0" - sources."@snyk/cloud-config-parser-1.9.3" + sources."@snyk/cloud-config-parser-1.10.1" sources."@snyk/cocoapods-lockfile-parser-3.6.2" - sources."@snyk/code-client-3.9.0" + (sources."@snyk/code-client-4.0.0" // { + dependencies = [ + sources."debug-3.2.7" + sources."needle-2.8.0" + ]; + }) sources."@snyk/composer-lockfile-parser-1.4.1" (sources."@snyk/dep-graph-1.28.1" // { dependencies = [ sources."semver-7.3.5" ]; }) - sources."@snyk/docker-registry-v2-client-2.2.4" + sources."@snyk/docker-registry-v2-client-2.3.0" sources."@snyk/fast-glob-3.2.6-patch" (sources."@snyk/fix-1.650.0" // { dependencies = [ @@ -109424,11 +110699,13 @@ in (sources."@snyk/fix-pipenv-pipfile-0.5.4" // { dependencies = [ sources."debug-4.3.1" + sources."ms-2.1.2" ]; }) (sources."@snyk/fix-poetry-0.7.2" // { dependencies = [ sources."debug-4.3.1" + sources."ms-2.1.2" ]; }) sources."@snyk/gemfile-1.2.0" @@ -109437,11 +110714,11 @@ in (sources."@snyk/inquirer-7.3.3-patch" // { dependencies = [ sources."ansi-escapes-4.3.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."strip-ansi-6.0.0" ]; }) - (sources."@snyk/java-call-graph-builder-1.23.0" // { + (sources."@snyk/java-call-graph-builder-1.23.1" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -109458,7 +110735,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."@snyk/snyk-docker-pull-3.6.3" // { + (sources."@snyk/snyk-docker-pull-3.7.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -109471,22 +110748,24 @@ in }) sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" - sources."@types/debug-4.1.6" + sources."@types/debug-4.1.7" sources."@types/emscripten-1.39.5" sources."@types/flat-cache-2.0.0" sources."@types/graphlib-2.1.8" sources."@types/http-cache-semantics-4.0.1" sources."@types/js-yaml-3.12.7" sources."@types/keyv-3.1.2" - sources."@types/lodash-4.14.171" + sources."@types/lodash-4.14.172" sources."@types/lodash.chunk-4.2.6" sources."@types/lodash.omit-4.5.6" + sources."@types/lodash.pick-4.4.6" sources."@types/lodash.union-4.6.6" sources."@types/minimatch-3.0.5" + sources."@types/ms-0.7.31" sources."@types/node-13.13.52" sources."@types/responselike-1.0.0" sources."@types/sarif-2.1.4" - sources."@types/semver-7.3.7" + sources."@types/semver-7.3.8" sources."@types/treeify-1.0.0" sources."@types/uuid-8.3.1" (sources."@yarnpkg/core-2.4.0" // { @@ -109501,11 +110780,11 @@ in sources."which-2.0.2" ]; }) - sources."@yarnpkg/fslib-2.4.0" - sources."@yarnpkg/json-proxy-2.1.0" - sources."@yarnpkg/libzip-2.2.1" + sources."@yarnpkg/fslib-2.5.0" + sources."@yarnpkg/json-proxy-2.1.1" + sources."@yarnpkg/libzip-2.2.2" sources."@yarnpkg/lockfile-1.1.0" - sources."@yarnpkg/parsers-2.3.0" + sources."@yarnpkg/parsers-2.4.0" sources."@yarnpkg/pnp-2.3.2" (sources."@yarnpkg/shell-2.4.1" // { dependencies = [ @@ -109541,8 +110820,7 @@ in sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."async-3.2.0" - sources."axios-0.21.1" + sources."async-3.2.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -109553,7 +110831,7 @@ in (sources."boxen-5.0.1" // { dependencies = [ sources."camelcase-6.2.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."strip-ansi-6.0.0" sources."type-fest-0.20.2" sources."wrap-ansi-7.0.0" @@ -109563,7 +110841,7 @@ in sources."braces-3.0.2" sources."browserify-zlib-0.1.4" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -109598,7 +110876,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.15.2" + sources."core-js-3.16.1" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -109606,7 +110884,11 @@ in ]; }) sources."crypto-random-string-2.0.0" - sources."debug-4.3.2" + (sources."debug-4.3.2" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -109627,7 +110909,7 @@ in sources."docker-modem-2.1.3" sources."dockerfile-ast-0.2.1" sources."dot-prop-5.3.0" - sources."dotnet-deps-parser-5.0.0" + sources."dotnet-deps-parser-5.1.0" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { dependencies = [ @@ -109660,7 +110942,6 @@ in sources."fastq-1.11.1" sources."figures-3.2.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.14.1" sources."fs-constants-1.0.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -109678,7 +110959,7 @@ in sources."globalthis-1.0.2" sources."globby-11.0.4" sources."got-11.8.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."grapheme-splitter-1.0.4" sources."gunzip-maybe-1.4.2" sources."has-1.0.3" @@ -109699,7 +110980,7 @@ in sources."inherits-2.0.4" sources."ini-2.0.0" sources."is-3.3.0" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.2.1" @@ -109725,7 +111006,7 @@ in sources."json-buffer-3.0.1" sources."json-file-plus-3.3.1" sources."json-stringify-safe-5.0.1" - (sources."jszip-3.6.0" // { + (sources."jszip-3.7.1" // { dependencies = [ sources."pako-1.0.11" sources."readable-stream-2.3.7" @@ -109772,6 +111053,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.orderby-4.6.0" + sources."lodash.pick-4.4.0" sources."lodash.reduce-4.6.0" sources."lodash.set-4.3.2" sources."lodash.size-4.2.0" @@ -109785,7 +111067,7 @@ in sources."lodash.values-4.3.0" (sources."log-symbols-4.1.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) sources."lowercase-keys-2.0.0" @@ -109806,7 +111088,7 @@ in sources."minipass-3.1.3" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" (sources."needle-2.6.0" // { @@ -109826,7 +111108,7 @@ in sources."open-7.4.2" (sources."ora-5.4.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."strip-ansi-6.0.0" ]; }) @@ -109864,6 +111146,7 @@ in sources."path-key-2.0.1" sources."path-type-4.0.0" sources."peek-stream-1.1.3" + sources."pegjs-0.10.0" sources."picomatch-2.3.0" sources."pluralize-7.0.0" sources."prepend-http-2.0.0" @@ -109923,7 +111206,7 @@ in sources."snyk-config-4.0.0" (sources."snyk-cpp-plugin-2.2.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."tslib-2.3.0" ]; }) @@ -109944,7 +111227,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.16.0" // { + (sources."snyk-gradle-plugin-3.16.1" // { dependencies = [ sources."chalk-3.0.0" sources."rimraf-3.0.2" @@ -109953,19 +111236,9 @@ in ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.26.1" // { + (sources."snyk-mvn-plugin-2.26.2" // { dependencies = [ - (sources."@snyk/java-call-graph-builder-1.21.0" // { - dependencies = [ - sources."tmp-0.2.1" - ]; - }) - sources."rimraf-3.0.2" - (sources."tmp-0.1.0" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."tmp-0.1.0" sources."tslib-1.11.1" ]; }) @@ -109976,9 +111249,9 @@ in sources."p-map-2.1.0" ]; }) - (sources."snyk-nuget-plugin-1.21.1" // { + (sources."snyk-nuget-plugin-1.22.0" // { dependencies = [ - sources."jszip-3.4.0" + sources."jszip-3.7.0" sources."pako-1.0.11" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -109996,9 +111269,10 @@ in sources."tslib-2.3.0" ]; }) - (sources."snyk-policy-1.19.0" // { + (sources."snyk-policy-1.22.0" // { dependencies = [ sources."lru-cache-5.1.1" + sources."semver-7.3.5" sources."snyk-try-require-2.0.1" sources."yallist-3.1.1" ]; @@ -110060,12 +111334,12 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { dependencies = [ - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."type-fest-0.16.0" ]; }) @@ -110093,7 +111367,7 @@ in sources."upath-2.0.1" (sources."update-notifier-5.1.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."semver-7.3.5" ]; }) @@ -110149,7 +111423,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -110159,8 +111433,8 @@ in sources."debug-4.3.2" sources."engine.io-5.1.1" sources."engine.io-parser-4.0.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" @@ -110234,7 +111508,7 @@ in sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.9" @@ -110316,7 +111590,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -110369,7 +111643,6 @@ in sources."random-access-storage-1.3.0" ]; }) - sources."@types/minimatch-3.0.5" sources."abstract-leveldown-6.0.3" sources."aligned-block-file-1.2.2" sources."ansi-escapes-1.4.0" @@ -110380,7 +111653,6 @@ in sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-differ-3.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.2.1" @@ -110423,7 +111695,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -110464,8 +111736,6 @@ in sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.6" sources."collection-visit-1.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."commander-2.20.3" sources."compare-at-paths-1.0.0" sources."component-emitter-1.3.0" @@ -110519,14 +111789,9 @@ in sources."abstract-leveldown-6.3.0" ]; }) - sources."end-of-stream-1.4.4" sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - (sources."es-abstract-1.18.3" // { - dependencies = [ - sources."object-inspect-1.11.0" - ]; - }) + sources."es-abstract-1.18.5" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -110534,16 +111799,6 @@ in }) sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" - (sources."execa-4.1.0" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."onetime-5.1.2" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -110561,7 +111816,6 @@ in sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - sources."find-up-4.1.0" (sources."flumecodec-0.0.0" // { dependencies = [ sources."level-codec-6.2.0" @@ -110607,20 +111861,19 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" - sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" - sources."has-flag-4.0.0" sources."has-network-0.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -110640,16 +111893,15 @@ in sources."he-0.5.0" sources."heap-0.2.6" sources."hoox-0.0.1" - sources."human-signals-1.1.1" sources."idb-kv-store-4.5.0" sources."ieee754-1.2.1" - sources."ignore-5.1.8" sources."immediate-3.2.3" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."int53-1.0.0" + sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."irregular-plurals-1.4.0" (sources."is-accessor-descriptor-1.0.0" // { @@ -110659,19 +111911,20 @@ in }) sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-canonical-base64-1.1.1" + sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" ]; }) - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" (sources."is-descriptor-1.0.2" // { dependencies = [ @@ -110688,7 +111941,7 @@ in sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-2.1.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-options-1.0.1" (sources."is-plain-object-2.0.4" // { dependencies = [ @@ -110697,12 +111950,11 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-stream-2.0.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.20" sources."is-weakmap-2.0.1" @@ -110711,7 +111963,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.5" // { + (sources."jitdb-3.1.7" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -110748,7 +112000,6 @@ in sources."libnested-1.5.0" sources."libsodium-0.7.9" sources."libsodium-wrappers-0.7.9" - sources."locate-path-5.0.0" sources."lodash.debounce-4.0.8" sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" @@ -110764,9 +112015,7 @@ in sources."markdown-table-0.4.0" sources."math-random-1.0.4" sources."mdmanifest-1.0.8" - sources."merge-stream-2.0.0" sources."micromatch-2.3.11" - sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -110778,17 +112027,10 @@ in sources."mkdirp-classic-0.5.3" sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" - sources."mri-1.1.6" sources."ms-2.1.2" sources."multiblob-1.13.7" sources."multiblob-http-1.0.0" sources."multicb-1.2.2" - (sources."multimatch-4.0.0" // { - dependencies = [ - sources."array-union-2.1.0" - sources."arrify-2.0.1" - ]; - }) sources."multiserver-3.7.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" @@ -110802,7 +112044,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -110820,11 +112062,6 @@ in sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" sources."npm-prefix-1.2.0" - (sources."npm-run-path-4.0.1" // { - dependencies = [ - sources."path-key-3.1.1" - ]; - }) sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -110839,7 +112076,7 @@ in }) ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -110867,15 +112104,11 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-defer-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" sources."packet-stream-2.0.6" sources."packet-stream-codec-1.1.3" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.7" @@ -110886,14 +112119,6 @@ in sources."polyraf-1.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" - sources."prettier-2.3.2" - (sources."pretty-quick-3.1.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."supports-color-7.2.0" - ]; - }) sources."private-box-0.3.1" sources."process-nextick-args-2.0.1" sources."promisify-4loc-1.0.0" @@ -110901,17 +112126,11 @@ in sources."prr-1.0.1" sources."pull-abortable-4.0.0" sources."pull-async-1.0.0" - (sources."pull-async-filter-1.0.0" // { - dependencies = [ - sources."pull-stream-2.28.4" - ]; - }) sources."pull-awaitable-1.0.0" sources."pull-box-stream-1.0.13" sources."pull-cat-1.1.11" sources."pull-catch-1.0.1" sources."pull-cont-0.1.1" - sources."pull-core-1.1.0" sources."pull-cursor-3.0.0" sources."pull-defer-0.2.3" sources."pull-drain-gently-1.1.0" @@ -110963,7 +112182,6 @@ in }) sources."pull-write-1.1.4" sources."pull-write-file-0.2.4" - sources."pump-3.0.0" sources."punycode-1.4.1" sources."push-stream-10.1.2" (sources."push-stream-to-pull-stream-1.0.5" // { @@ -111066,7 +112284,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."resolve-1.17.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" sources."resumer-0.0.0" @@ -111095,13 +112313,8 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - (sources."side-channel-1.0.4" // { - dependencies = [ - sources."object-inspect-1.11.0" - ]; - }) - sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."side-channel-1.0.4" + sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -111149,7 +112362,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.1.4" // { + (sources."ssb-db2-2.1.5" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -111163,7 +112376,7 @@ in sources."mkdirp-1.0.4" sources."push-stream-11.0.1" sources."rimraf-3.0.2" - (sources."ssb-keys-8.1.0" // { + (sources."ssb-keys-8.2.0" // { dependencies = [ sources."mkdirp-0.5.5" ]; @@ -111201,13 +112414,12 @@ in }) sources."ssb-plugins-1.0.0" sources."ssb-query-2.4.5" - sources."ssb-ref-2.14.3" + sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" - sources."ssb-sort-1.1.3" sources."ssb-unix-socket-1.0.0" (sources."ssb-validate-4.1.4" // { dependencies = [ - sources."ssb-keys-8.1.0" + sources."ssb-keys-8.2.0" ]; }) sources."ssb-ws-6.2.3" @@ -111242,13 +112454,11 @@ in sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" - sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tape-4.13.3" // { + (sources."tape-4.14.0" // { dependencies = [ sources."glob-7.1.7" - sources."is-regex-1.0.5" ]; }) sources."text-table-0.2.0" @@ -111311,7 +112521,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -111415,7 +112625,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.951.0" // { + (sources."aws-sdk-2.965.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -111453,7 +112663,7 @@ in sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bufferutil-1.3.0" sources."bufferview-1.0.1" sources."bunyan-1.8.15" @@ -111542,7 +112752,7 @@ in sources."drange-1.1.1" (sources."dtrace-provider-0.8.8" // { dependencies = [ - sources."nan-2.14.2" + sources."nan-2.15.0" ]; }) sources."ecc-jsbn-0.1.2" @@ -111624,7 +112834,7 @@ in sources."debug-3.2.7" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -111637,6 +112847,7 @@ in }) sources."has-cors-1.1.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hawk-3.1.3" sources."highlight.js-8.2.0" (sources."hipchatter-0.3.2" // { @@ -111679,7 +112890,7 @@ in sources."is-my-json-valid-2.20.5" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -111772,8 +112983,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" @@ -111782,7 +112993,7 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."ms-2.1.3" - sources."multer-1.4.2" + sources."multer-1.4.3" sources."mustache-2.3.2" sources."mv-2.1.1" sources."my-local-ip-1.0.0" @@ -111976,7 +113187,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -112198,32 +113409,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" - sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.0" + sources."@babel/generator-7.15.0" + sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-member-expression-to-functions-7.15.0" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -112249,12 +113460,12 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001246" - (sources."chalk-4.1.1" // { + sources."caniuse-lite-1.0.30001249" + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -112269,7 +113480,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.0" @@ -112291,7 +113502,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -112307,7 +113518,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -112387,7 +113598,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -112472,7 +113683,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."specificity-0.4.1" sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { @@ -112524,16 +113735,16 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.4"; + version = "0.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.4.tgz"; - sha512 = "ldw4/YQR/gpI29Sgv+u/zkHTIMKn2ohpSvfORmDm2H85fNa/Dw8fUoqK080GbVol32sYO8ThzNKkheBjUT0mCw=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.6.tgz"; + sha512 = "TetCKVY6kf1iJs7heFbyFa9p1iwzZKYa4qkNEBJVt4V0ck0XdTQO5WFVepriUOJDf8m/YpCoZldFUtVwYmuaJA=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -112576,7 +113787,7 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.3" sources."svelte-preprocess-4.7.4" - sources."svelte2tsx-0.4.2" + sources."svelte2tsx-0.4.5" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" sources."typescript-4.3.5" @@ -112609,13 +113820,13 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.3.tgz"; - sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.4.tgz"; + sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; }; dependencies = [ - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -112625,7 +113836,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."callsites-3.1.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chokidar-3.5.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -112686,7 +113897,7 @@ in sources."@trysound/sax-0.1.1" sources."ansi-styles-4.3.0" sources."boolbase-1.0.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" @@ -112779,7 +113990,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" (sources."busboy-0.2.14" // { dependencies = [ sources."isarray-0.0.1" @@ -112924,7 +114135,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" (sources."graphlib-2.1.8" // { dependencies = [ sources."lodash-4.17.21" @@ -113049,8 +114260,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -113068,9 +114279,14 @@ in }) sources."mpath-0.5.2" sources."ms-2.0.0" - sources."multer-1.4.2" + (sources."multer-1.4.3" // { + dependencies = [ + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + ]; + }) sources."mute-stream-0.0.5" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.2" @@ -113295,7 +114511,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -113416,8 +114632,8 @@ in sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."module-alias-2.2.2" sources."moment-2.29.1" @@ -113455,7 +114671,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."typegram-3.4.1" + sources."typegram-3.4.3" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -113585,7 +114801,7 @@ in sources."errno-0.1.8" sources."fs.realpath-1.0.0" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -113623,7 +114839,7 @@ in sha512 = "b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg=="; }; dependencies = [ - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.7.3" (sources."source-map-support-0.5.19" // { @@ -113718,26 +114934,27 @@ in sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-2.1.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-utf8-0.2.1" sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" @@ -113837,7 +115054,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sprintf-js-1.0.3" (sources."string-width-1.0.2" // { dependencies = [ @@ -113949,7 +115166,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -113989,7 +115206,7 @@ in }) sources."brace-expansion-1.1.11" sources."bubble-stream-error-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -114067,7 +115284,7 @@ in ]; }) sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -114253,7 +115470,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -114428,7 +115645,7 @@ in }; dependencies = [ sources."boundary-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."inherits-2.0.4" @@ -114469,7 +115686,7 @@ in sources."@types/unist-2.0.6" sources."bail-1.0.5" sources."boundary-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."ccount-1.1.0" sources."comma-separated-tokens-1.0.8" sources."concat-stream-2.0.0" @@ -114525,7 +115742,7 @@ in sources."@textlint/ast-node-types-4.4.3" sources."@textlint/types-1.5.5" sources."boundary-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."concat-stream-2.0.0" sources."inherits-2.0.4" sources."object-assign-4.1.1" @@ -114567,25 +115784,28 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."has-tostringtag-1.0.0" + sources."internal-slot-1.0.3" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" - sources."is-string-1.0.6" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" + sources."side-channel-1.0.4" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."unbox-primitive-1.0.1" @@ -114673,26 +115893,29 @@ in sources."array-includes-3.1.3" sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" + sources."has-tostringtag-1.0.0" + sources."internal-slot-1.0.3" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" sources."is-capitalized-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" - sources."is-string-1.0.6" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" + sources."side-channel-1.0.4" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."unbox-primitive-1.0.1" @@ -114755,11 +115978,11 @@ in dependencies = [ sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.6" - sources."@tokenizer/token-0.1.1" + sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -114835,7 +116058,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.15.2" + sources."core-js-3.16.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -114912,7 +116135,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.7" sources."got-11.5.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -115059,7 +116282,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.0" + sources."peek-readable-4.0.1" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -115078,7 +116301,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-2.0.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -115144,14 +116367,18 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.2" + sources."strtok3-6.2.4" sources."supports-color-7.2.0" - sources."tar-4.4.13" + sources."tar-4.4.16" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - sources."token-types-2.1.1" + (sources."token-types-2.1.1" // { + dependencies = [ + sources."@tokenizer/token-0.1.1" + ]; + }) sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" @@ -115194,10 +116421,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.130.1"; + version = "0.131.3"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.130.1.tgz"; - sha512 = "OSPPKcGvFSiGkG3jFrwwC76PBV/ZSrGxpBbg28bW8s9GU8r/y2spNGtEXHEb/CVqo0Ctf5Lx2rVaxQZB6OasaA=="; + url = "https://registry.npmjs.org/three/-/three-0.131.3.tgz"; + sha512 = "VkZAv8ZTJqiE/fyEmoWLxcNHImpVcjqW7RO0GzMu3tRpwO0KUvK9pjTmJzJcAbc51BOeB2G38zh80yjHTbP8gQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -115239,7 +116466,7 @@ in sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" @@ -115274,7 +116501,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-signature-1.2.0" @@ -115295,8 +116522,8 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lru-cache-6.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -115429,7 +116656,7 @@ in sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -115600,15 +116827,13 @@ in ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ttf2eot/-/ttf2eot-2.0.0.tgz"; - sha1 = "8e6337a585abd1608a0c84958ab483ce69f6654b"; + url = "https://registry.npmjs.org/ttf2eot/-/ttf2eot-3.0.0.tgz"; + sha512 = "Y/ymhhYr/lLkf66BnLQBs3LjttPDE+1BJcFHq/oJN5SnZTacMWVdPfGLB5eIVnC2iT9gZ2ls/Bre2zbKq6hNsA=="; }; dependencies = [ - sources."argparse-1.0.10" - sources."microbuffer-1.0.0" - sources."sprintf-js-1.0.3" + sources."argparse-2.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -115670,7 +116895,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -115680,7 +116905,7 @@ in sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."jsonfile-6.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" @@ -115723,10 +116948,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.10"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.10.tgz"; - sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; + sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; }; buildInputs = globalBuildInputs; meta = { @@ -115772,7 +116997,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.5" + sources."@types/node-14.17.9" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -115783,7 +117008,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."async-3.2.0" + sources."async-3.2.1" sources."balanced-match-1.0.2" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -115825,7 +117050,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.7" + sources."diff2html-3.4.9" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -115882,7 +117107,7 @@ in sources."is-arrayish-0.3.2" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."jquery-3.6.0" @@ -115912,8 +117137,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -116132,7 +117357,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."node-fetch-2.6.1" sources."nopt-5.0.0" sources."npmlog-4.1.2" @@ -116157,7 +117382,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.0" + sources."tar-6.1.7" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" sources."vega-5.20.2" @@ -116297,7 +117522,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -116319,7 +117544,7 @@ in sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."callsites-3.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -116340,8 +117565,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.31.0" - (sources."eslint-plugin-vue-7.14.0" // { + sources."eslint-7.32.0" + (sources."eslint-plugin-vue-7.16.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -116376,7 +117601,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -116461,7 +117686,7 @@ in sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.9.0" // { + (sources."vue-eslint-parser-7.10.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -116650,10 +117875,10 @@ in sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.58.1" + sources."@types/vscode-1.59.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -116677,6 +117902,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.4.1" + sources."acorn-import-assertions-1.7.6" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -116692,13 +117918,13 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001246" - (sources."chalk-4.1.1" // { + sources."caniuse-lite-1.0.30001249" + (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" ]; @@ -116718,7 +117944,7 @@ in sources."clone-deep-4.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-6.2.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -116737,7 +117963,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116772,7 +117998,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -116792,7 +118018,7 @@ in sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -116829,8 +118055,8 @@ in sources."merge-stream-2.0.0" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -116839,7 +118065,7 @@ in sources."mute-stream-0.0.8" sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" @@ -116891,7 +118117,6 @@ in sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.3" - sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."sprintf-js-1.0.3" @@ -116944,17 +118169,17 @@ in sources."supports-color-5.5.0" ]; }) - sources."vscode-debugadapter-testsupport-1.47.0" - sources."vscode-debugprotocol-1.47.0" + sources."vscode-debugadapter-testsupport-1.48.0" + sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" - sources."webpack-5.45.1" + sources."webpack-5.50.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-2.3.1" + sources."webpack-sources-3.2.0" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" @@ -117100,7 +118325,7 @@ in sources."git-clone-0.1.0" sources."glob-7.1.7" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gray-matter-2.1.1" sources."handlebars-4.7.7" sources."har-schema-2.0.0" @@ -117159,8 +118384,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -117245,7 +118470,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -117287,7 +118512,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -117304,7 +118529,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -117373,7 +118598,7 @@ in ]; }) sources."buefy-helper-json-1.0.3" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { @@ -117504,7 +118729,7 @@ in sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" - (sources."vue-eslint-parser-7.9.0" // { + (sources."vue-eslint-parser-7.10.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -117604,7 +118829,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -117978,7 +119203,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -118227,7 +119452,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.8" + sources."@babel/runtime-corejs3-7.15.3" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -118256,7 +119481,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) sources."brace-expansion-1.1.11" @@ -118279,7 +119504,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.15.2" + sources."core-js-pure-3.16.1" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -118314,7 +119539,7 @@ in sources."gauge-2.7.4" sources."get-caller-file-2.0.5" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."html-encoding-sniffer-2.0.1" sources."http-proxy-agent-4.0.1" @@ -118325,7 +119550,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-potential-custom-element-name-1.0.1" sources."isarray-1.0.0" - sources."jsdom-16.6.0" + sources."jsdom-16.7.0" sources."json5-2.2.0" sources."jsonfile-6.1.0" sources."levn-0.3.0" @@ -118337,8 +119562,8 @@ in sources."semver-6.3.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -118346,7 +119571,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."node-fetch-2.6.1" sources."nopt-5.0.0" sources."npmlog-4.1.2" @@ -118365,7 +119590,7 @@ in sources."punycode-2.1.1" sources."raf-3.4.1" sources."readable-stream-2.3.7" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."require-directory-2.1.1" sources."rgbcolor-1.0.1" sources."rimraf-3.0.2" @@ -118386,7 +119611,7 @@ in sources."svg-pathdata-5.0.5" sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" - sources."tar-6.1.0" + sources."tar-6.1.7" (sources."tough-cookie-4.0.0" // { dependencies = [ sources."universalify-0.1.2" @@ -118450,7 +119675,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -118476,7 +119701,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -118526,7 +119751,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bunyan-1.8.15" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -118553,7 +119778,7 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."columnify-1.5.4" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -118583,7 +119808,7 @@ in sources."delayed-stream-1.0.0" (sources."dispensary-0.62.0" // { dependencies = [ - sources."async-3.2.0" + sources."async-3.2.1" ]; }) sources."doctrine-3.0.0" @@ -118664,7 +119889,7 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatstr-1.0.12" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -118697,7 +119922,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -118705,6 +119930,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-yarn-2.1.0" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.0" @@ -118721,10 +119947,10 @@ in sources."ini-2.0.0" sources."invert-kv-3.0.1" sources."is-absolute-0.1.7" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -118734,9 +119960,9 @@ in sources."is-npm-5.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-relative-0.1.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" @@ -118768,7 +119994,7 @@ in ]; }) sources."jsprim-1.4.1" - sources."jszip-3.6.0" + sources."jszip-3.7.1" sources."jwa-1.4.1" sources."jws-3.2.2" sources."keyv-3.1.0" @@ -118799,8 +120025,8 @@ in sources."marky-1.2.2" sources."mem-5.1.1" sources."merge-stream-2.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -118817,7 +120043,7 @@ in ]; }) sources."mz-2.7.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanoid-3.1.23" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -118883,7 +120109,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regexp.prototype.flags-1.3.1" sources."regexpp-3.2.0" sources."registry-auth-token-4.2.1" @@ -119012,7 +120238,7 @@ in sources."yauzl-2.10.0" (sources."zip-dir-2.0.0" // { dependencies = [ - sources."async-3.2.0" + sources."async-3.2.1" ]; }) ]; @@ -119029,17 +120255,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.45.1"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.45.1.tgz"; - sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.50.0.tgz"; + sha512 = "hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.0" + sources."@types/json-schema-7.0.9" + sources."@types/node-16.4.13" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -119058,15 +120284,16 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.4.1" + sources."acorn-import-assertions-1.7.6" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.16.6" - sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001246" + sources."browserslist-4.16.7" + sources."buffer-from-1.1.2" + sources."caniuse-lite-1.0.30001249" sources."chrome-trace-event-1.0.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.802" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -119081,24 +120308,23 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."jest-worker-27.0.6" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."neo-async-2.6.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."p-limit-3.1.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.1.1" sources."serialize-javascript-6.0.0" - sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."supports-color-8.1.1" @@ -119111,7 +120337,7 @@ in sources."terser-webpack-plugin-5.1.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-2.3.1" + sources."webpack-sources-3.2.0" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -119138,7 +120364,7 @@ in sources."@webpack-cli/info-1.3.0" sources."@webpack-cli/serve-1.5.1" sources."clone-deep-4.0.1" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" @@ -119153,7 +120379,7 @@ in sources."interpret-2.2.0" sources."is-core-module-2.5.0" sources."is-plain-object-2.0.4" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.3" @@ -119204,7 +120430,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.13" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -119412,11 +120638,12 @@ in sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."handle-thing-2.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -119444,11 +120671,11 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-url-3.0.3" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" @@ -119463,7 +120690,7 @@ in sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-stream-1.1.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -119485,8 +120712,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -119495,7 +120722,7 @@ in sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" @@ -119735,7 +120962,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -119786,7 +121013,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" @@ -119840,10 +121067,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.3.tgz"; - sha512 = "Av+6PnflFJueTj19z6Pv/ai9KzOV8r7nClBiQCBbO55eqNL6pNBV47N/KwxDIPx8OeATTFEA/joCohi5AD/8TQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.4.tgz"; + sha512 = "7YZv5fSs6tf0JPSQT5eT02t+IgZR7sHPGGSbT2ZmE4VO3X1a4WhSIP4tIpQCNxbzcKCCe6NFimpTxlxXNF/KEQ=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -119858,37 +121085,37 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.0" - sources."addr-to-ip-port-1.5.1" + sources."@types/node-16.4.13" + sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."bencode-2.0.1" - sources."bep53-range-1.1.0" + sources."bencode-2.0.2" + sources."bep53-range-1.1.1" sources."binary-search-1.3.6" sources."bitfield-4.0.0" - (sources."bittorrent-dht-10.0.1" // { + (sources."bittorrent-dht-10.0.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - (sources."bittorrent-lsd-1.1.0" // { + (sources."bittorrent-lsd-1.1.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."bittorrent-peerid-1.3.3" - (sources."bittorrent-protocol-3.4.2" // { + sources."bittorrent-peerid-1.3.4" + (sources."bittorrent-protocol-3.4.3" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.17.3" // { + (sources."bittorrent-tracker-9.17.4" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -119906,7 +121133,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."bufferutil-4.0.3" sources."cache-chunk-store-3.2.2" @@ -119917,7 +121144,7 @@ in ]; }) sources."castv2-client-1.2.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."charset-1.0.1" sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" @@ -119943,7 +121170,7 @@ in }) sources."core-util-is-1.0.2" sources."cpus-1.0.3" - sources."create-torrent-4.7.0" + sources."create-torrent-5.0.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."define-lazy-prop-2.0.0" @@ -119962,6 +121189,7 @@ in sources."err-code-3.0.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" + sources."fast-fifo-1.0.0" sources."filestream-5.0.0" sources."freelist-1.0.3" (sources."fs-chunk-store-2.0.3" // { @@ -119997,6 +121225,7 @@ in sources."k-rpc-5.1.0" sources."k-rpc-socket-1.11.1" sources."last-one-wins-1.0.4" + sources."limiter-1.1.5" (sources."load-ip-set-2.2.1" // { dependencies = [ sources."decompress-response-6.0.0" @@ -120043,7 +121272,7 @@ in sources."once-1.4.0" sources."open-8.2.1" sources."package-json-versionify-1.0.4" - (sources."parse-torrent-9.1.3" // { + (sources."parse-torrent-9.1.4" // { dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" @@ -120063,6 +121292,7 @@ in sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.2.3" + sources."queue-tick-1.0.0" sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -120102,17 +121332,15 @@ in sources."ms-2.1.2" ]; }) + sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" + sources."streamx-2.11.1" sources."string-width-4.2.2" - (sources."string2compact-1.3.0" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) + sources."string2compact-1.3.2" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" @@ -120121,7 +121349,7 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.0" // { + (sources."torrent-discovery-9.4.4" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -120142,13 +121370,13 @@ in sources."ms-2.1.2" ]; }) - sources."ut_pex-3.0.1" + sources."ut_pex-3.0.2" sources."utf-8-validate-5.0.5" sources."util-deprecate-1.0.2" sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.2.5" // { + (sources."webtorrent-1.3.9" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -120165,7 +121393,7 @@ in sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.0.1" + sources."yargs-17.1.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -120226,10 +121454,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.21.1"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.21.1.tgz"; - sha512 = "13Ann9t+BdAmBKsPlSWoYCISUIo+UFcAVf+YQg9wc7HdLZ0FlIhL5Mhn9+l9GMeO2PGRYEiCEAMbNiGn36Y84g=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.22.0.tgz"; + sha512 = "+b2B5qsQhVdovneS3cU8HzTIZSMw8gn6zsznXqtjHYrdXUZqLCnWhnYNVRWLrWSzrxOHOyczOnx60sSuQNctJw=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -120270,10 +121498,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.22.10"; + version = "1.22.11"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz"; - sha512 = "IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.11.tgz"; + sha512 = "AWje4bzqO9RUn3sdnM5N8n4ZJ0BqCc/kqFJvpOI5/EVkINXui0yuvU7NDCEF//+WaxHuNay2uOHxA4+tq1P3cg=="; }; buildInputs = globalBuildInputs; meta = { @@ -120288,17 +121516,17 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-4.2.0.tgz"; - sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; + url = "https://registry.npmjs.org/yo/-/yo-4.3.0.tgz"; + sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-2.7.1" // { + (sources."@npmcli/arborist-2.8.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -120332,7 +121560,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.2" + sources."@types/node-15.14.7" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -120364,7 +121592,6 @@ in sources."array-differ-3.0.0" sources."array-find-index-1.0.2" sources."array-union-2.1.0" - sources."array-uniq-1.0.3" sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.4" @@ -120383,13 +121610,9 @@ in sources."write-file-atomic-3.0.3" ]; }) - (sources."bin-version-2.0.0" // { - dependencies = [ - sources."execa-0.1.1" - ]; - }) - sources."bin-version-check-3.0.0" - sources."binaryextensions-4.15.0" + sources."bin-version-3.1.0" + sources."bin-version-check-4.0.0" + sources."binaryextensions-4.18.0" (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -120404,7 +121627,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtins-1.0.3" (sources."cacache-15.2.0" // { dependencies = [ @@ -120453,16 +121676,10 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.15.2" + sources."core-js-3.16.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" - (sources."cross-spawn-async-2.2.5" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" @@ -120519,7 +121736,7 @@ in sources."fill-range-7.0.1" sources."filter-obj-2.0.2" sources."find-up-2.1.0" - sources."find-versions-2.0.0" + sources."find-versions-3.2.0" sources."find-yarn-workspace-root2-1.2.16" sources."first-chunk-stream-2.0.0" sources."foreachasync-3.0.0" @@ -120551,7 +121768,7 @@ in sources."p-cancelable-0.4.1" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."grouped-queue-2.0.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -120702,7 +121919,7 @@ in }) sources."mem-5.1.1" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.0.1" + sources."mem-fs-editor-9.1.0" (sources."meow-3.7.0" // { dependencies = [ sources."find-up-1.1.2" @@ -120713,8 +121930,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -120803,7 +122020,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -120895,7 +122112,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."read-cmd-shim-2.0.0" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" (sources."read-pkg-1.1.0" // { dependencies = [ sources."path-type-1.1.0" @@ -120927,7 +122144,7 @@ in sources."indent-string-2.1.0" ]; }) - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" @@ -120956,7 +122173,7 @@ in sources."semver-5.7.1" sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" - sources."semver-regex-1.0.0" + sources."semver-regex-2.0.0" sources."semver-truncate-1.1.2" (sources."serialize-error-7.0.1" // { dependencies = [ @@ -120968,7 +122185,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" (sources."socks-proxy-agent-5.0.1" // { dependencies = [ @@ -120986,7 +122203,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" sources."ssri-8.0.1" @@ -121049,7 +122266,7 @@ in ]; }) sources."taketalk-1.0.0" - (sources."tar-6.1.0" // { + (sources."tar-6.1.7" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -121064,7 +122281,7 @@ in ]; }) sources."text-table-0.2.0" - sources."textextensions-5.12.0" + sources."textextensions-5.14.0" sources."through-2.3.8" sources."timed-out-4.0.1" sources."titleize-1.0.1" @@ -121136,13 +122353,13 @@ in sources."supports-color-3.2.3" ]; }) - sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-3.4.1" // { + sources."yeoman-doctor-5.0.0" + (sources."yeoman-environment-3.5.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."color-convert-2.0.1" @@ -121168,7 +122385,7 @@ in sources."has-flag-4.0.0" sources."inquirer-8.1.2" sources."is-fullwidth-code-point-3.0.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."locate-path-6.0.0" sources."log-symbols-4.1.0" sources."ms-2.1.2" @@ -121181,7 +122398,7 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" - sources."rxjs-7.2.0" + sources."rxjs-7.3.0" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -121224,34 +122441,58 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-2.0.0.tgz"; - sha512 = "OF8YvqseMMmtDaASqO+8+0/tJZvykLK0hX9YBAaRO9l7Hc+YjNKjpgJTjrmncgEURoyDr9Ln4r/qBtEuDNZstg=="; + url = "https://registry.npmjs.org/zx/-/zx-2.1.0.tgz"; + sha512 = "7mCJ92ev894l94w5aXkdQoZ9iE6qXERLMPp/uMhTumGKtyhvN8tWprqFFHiXGS/31HxEy1NtNd9NHmYjGHd85A=="; }; dependencies = [ + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" - sources."@types/node-fetch-2.5.11" + sources."@types/node-16.4.13" + sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" + sources."array-union-3.0.1" sources."asynckit-0.4.0" - sources."chalk-4.1.1" + sources."braces-3.0.2" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."delayed-stream-1.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.7" + sources."fastq-1.11.1" + sources."fill-range-7.0.1" sources."form-data-3.0.1" sources."fs-extra-10.0.0" - sources."graceful-fs-4.2.6" + sources."glob-parent-5.1.2" + sources."globby-12.0.0" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" + sources."ignore-5.1.8" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" sources."isexe-2.0.0" sources."jsonfile-6.1.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."node-fetch-2.6.1" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."queue-microtask-1.2.3" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" + sources."slash-4.0.0" sources."supports-color-7.2.0" + sources."to-regex-range-5.0.1" sources."universalify-2.0.0" sources."which-2.0.2" ]; From 12d2e28182a3ce6d29aad4f2fdb4134321da8e96 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 12 Aug 2021 17:14:19 +0200 Subject: [PATCH 0104/1062] openmoji-color,openmoji-black: use upstream js builder --- pkgs/data/fonts/openmoji/default.nix | 32 ++++++++-------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index b2afde61bd64..d511a78f7250 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -2,6 +2,8 @@ , stdenv , fetchFromGitHub , scfbuild +, nodejs +, nodePackages , python3Packages , variant ? "color" # "color" or "black" }: @@ -25,36 +27,20 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ scfbuild + nodejs + nodePackages.glob + nodePackages.lodash ]; buildPhase = '' - # Bash reimplementation of helpers/export-svg-font.js - # so we don't need to build all the node deps first - hexcodes=() - missingGlyphBlack='./black/svg/25A1.svg' - missingGlyphColor='./color/svg/25A1.svg' - for f in ./color/svg/*.svg; do - basename=$(basename "$f" .svg) - hexcodes+=(''${basename//-/ }) - filename=$(basename "$f"); - cp "./color/svg/$filename" "./font/tmp-color/$filename" - cp "./black/svg/$filename" "./font/tmp-black/$filename" - done + runHook preBuild - hexcodes=($(uniq<<<"''${hexcodes[@]}")) + node helpers/generate-font-glyphs.js - for h in ''${hexcodes[@]}; do - filename="$h.svg" - if [ ! -e "./color/svg/$filename" ]; then - echo "$h is missing -> substitute with \"Missing Glyph\": $filename" - cp $missingGlyphColor "./font/tmp-color/$filename" - cp $missingGlyphBlack "./font/tmp-black/$filename" - fi - done - - # Actually build the font: cd font scfbuild -c scfbuild-${variant}.yml + + runHook postBuild ''; installPhase = '' From 25a3842f0698bfd729857441a927671bc6e3fbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 12 Aug 2021 18:16:30 +0200 Subject: [PATCH 0105/1062] automake: switch to pname + version --- .../tools/misc/automake/automake-1.16.x.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 042aff09a5fc..4547f745a98f 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { # When updating, beware of https://github.com/NixOS/nixpkgs/pull/131928#issuecomment-896614165 - name = "automake-1.16.3"; + pname = "automake"; + version = "1.16.3"; src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; + url = "mirror://gnu/automake/automake-${version}.tar.xz"; sha256 = "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz"; }; @@ -27,18 +28,16 @@ stdenv.mkDerivation rec { # "fixed" path in generated files! dontPatchShebangs = true; - meta = { + meta = with lib; { branch = "1.16"; homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = lib.licenses.gpl2Plus; - + license = licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating `Makefile.in' files compliant with the GNU Coding Standards. Automake requires the use of Autoconf. ''; - - platforms = lib.platforms.all; + platforms = platforms.all; }; } From 8a859eca1fa3aea015d0d099bedd40a2130c47d2 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 12 Aug 2021 18:13:48 +0100 Subject: [PATCH 0106/1062] gdb: Add source-highlight dependency. --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index ffe1fa3662f8..ea0002d78c0a 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -4,7 +4,7 @@ , fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time -, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu +, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null , guile ? null @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ]; - buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ] + buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile sourceHighlight ] ++ lib.optional pythonSupport python3 ++ lib.optional doCheck dejagnu; From db228f3a74fbe1bde4142bc3eebabc185a379ec2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 20:35:32 +0200 Subject: [PATCH 0107/1062] xz: replace name with pname&version --- pkgs/tools/compression/xz/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index cc021a1ef051..8304c34af897 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -8,10 +8,11 @@ # files. stdenv.mkDerivation rec { - name = "xz-5.2.5"; + pname = "xz"; + version = "5.2.5"; src = fetchurl { - url = "https://tukaani.org/xz/${name}.tar.bz2"; + url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; }; From 3acf13c44cc2f58fab4143c10cab38f57bc1955b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 20:38:37 +0200 Subject: [PATCH 0108/1062] zip: replace name with pname&version --- pkgs/tools/archivers/zip/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 58c748fe4e8a..ab91cfc64834 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -2,12 +2,13 @@ assert enableNLS -> libnatspec != null; -stdenv.mkDerivation { - name = "zip-3.0"; +stdenv.mkDerivation rec { + pname = "zip"; + version = "3.0"; src = fetchurl { urls = [ - "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz" + "ftp://ftp.info-zip.org/pub/infozip/src/zip${lib.replaceStrings ["."] [""] version}.tgz" "https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz" ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; From bd4653e2327b46ecad5b38ce98d2ec475df4cc52 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 20:37:24 +0200 Subject: [PATCH 0109/1062] unzip: replace name with pname&version --- pkgs/tools/archivers/unzip/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index e74637ca25ec..584f981aff70 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -3,11 +3,12 @@ , enableNLS ? false, libnatspec }: -stdenv.mkDerivation { - name = "unzip-6.0"; +stdenv.mkDerivation rec { + pname = "unzip"; + version = "6.0"; src = fetchurl { - url = "mirror://sourceforge/infozip/unzip60.tar.gz"; + url = "mirror://sourceforge/infozip/unzip${lib.replaceStrings ["."] [""] version}.tar.gz"; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; From 31d7bd0d59ae3a4da272de9111d6c8ccee017ee7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 21:48:42 +0200 Subject: [PATCH 0110/1062] sharutils: replace name with pname&version --- pkgs/tools/archivers/sharutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index c785211e682f..ec0f096915f1 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext, coreutils }: stdenv.mkDerivation rec { - name = "sharutils-4.15.2"; + pname = "sharutils"; + version = "4.15.2"; src = fetchurl { - url = "mirror://gnu/sharutils/${name}.tar.xz"; + url = "mirror://gnu/sharutils/sharutils-${version}.tar.xz"; sha256 = "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b"; }; From fe0bbb012720352e8ca68ceb2d893b7876deb70d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 22:28:11 +0200 Subject: [PATCH 0111/1062] python3Packages.charset-normalizer: init at 2.0.1 --- .../charset-normalizer/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/charset-normalizer/default.nix diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix new file mode 100644 index 000000000000..dc0f5e1b296a --- /dev/null +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "charset-normalizer"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "Ousret"; + repo = "charset_normalizer"; + rev = version; + sha256 = "04rnyrqay11kma9pzagi1mzhc0sq37ggpv39kad2d4ynm35v2hfq"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=charset_normalizer --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ "charset_normalizer" ]; + + meta = with lib; { + description = "Python module for encoding and language detection"; + homepage = "https://charset-normalizer.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abd21cf5c92d..2bdd1d8f0974 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1417,6 +1417,8 @@ in { chardet = callPackage ../development/python-modules/chardet { }; + charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; + chart-studio = callPackage ../development/python-modules/chart-studio { }; check-manifest = callPackage ../development/python-modules/check-manifest { }; From 9c5577eae40d54839083c4b4c8be7e758d28fc71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Aug 2021 22:50:16 +0200 Subject: [PATCH 0112/1062] python3Packages.fpyutils: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/fpyutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix index 0120391aee1b..493304428524 100644 --- a/pkgs/development/python-modules/fpyutils/default.nix +++ b/pkgs/development/python-modules/fpyutils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "fpyutils"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; rev = version; - sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b"; + sha256 = "1dksx5ykm7f1bi16wg8kqqqlnc874k3vg9kfjbbbalv8w0g2g2am"; }; propagatedBuildInputs = [ From 9e69f1415edd0c821c65bb2e91f04c124bd5b5ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Aug 2021 00:01:24 +0200 Subject: [PATCH 0113/1062] python3Packages.requests: 2.25.1 -> 2.26.0 --- .../python-modules/requests/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 8b5514f63936..876046066895 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,7 +1,9 @@ { lib +, brotlicffi , buildPythonPackage , certifi , chardet +, charset-normalizer , fetchPypi , idna , pytest-mock @@ -9,18 +11,22 @@ , pytestCheckHook , urllib3 , isPy27 +, trustme }: buildPythonPackage rec { pname = "requests"; - version = "2.25.1"; + version = "2.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; + sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; }; - patches = [ ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch ]; + patches = [ + # Use the default NixOS CA bundle from the certifi package + ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch + ]; postPatch = '' # Use latest idna @@ -28,7 +34,9 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + brotlicffi certifi + charset-normalizer chardet idna urllib3 @@ -38,6 +46,7 @@ buildPythonPackage rec { pytest-mock pytest-xdist pytestCheckHook + trustme ]; # AttributeError: 'KeywordMapping' object has no attribute 'get' From 67b954df74e8ade06af7d11e859066018d932175 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 13 Aug 2021 05:47:07 -0500 Subject: [PATCH 0114/1062] mlt: 6.24.0 -> 7.0.1 --- pkgs/development/libraries/mlt/qt-5.nix | 34 +++---------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 5a4b6e34e9dc..6d4ba69cdd61 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, cmake , SDL , ffmpeg , frei0r @@ -26,13 +27,13 @@ let inherit (lib) getDev; in mkDerivation rec { pname = "mlt"; - version = "6.24.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "1my43ica2qax2622307dv4gn3w8hkchy643i9pq8r9yh2hd4pvs9"; + sha256 = "13c5miph9jjbz69dhy0zvbkk5zbb05dr3vraaci0d5fdbrlhyscf"; }; buildInputs = [ @@ -56,42 +57,15 @@ mkDerivation rec { ladspaPlugins ]; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ cmake which ]; outputs = [ "out" "dev" ]; - # Mostly taken from: - # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ - "--avformat-swscale" - "--enable-gpl" - "--enable-gpl3" - "--enable-opengl" - ]; - - # mlt is unable to cope with our multi-prefix Qt build - # because it does not use CMake or qmake. - NIX_CFLAGS_COMPILE = "-I${getDev qtsvg}/include/QtSvg"; - - CXXFLAGS = "-std=c++11"; - qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" ]; - postInstall = '' - # Remove an unnecessary reference to movit.dev. - s=${movit.dev}/include - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" - - # Remove an unnecessary reference to movit.dev. - s=${qtbase.dev}/include - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/mlt/libmltqt.so -e "s|$s|$t|g" - ''; - passthru = { inherit ffmpeg; }; From fc6d263d8c506fcee31b01d64eed158a9bcb72a1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 13 Aug 2021 05:50:34 -0500 Subject: [PATCH 0115/1062] kdeGear: 21.04.0 -> 21.08.0 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1808 ++++++++++++++++---------------- 2 files changed, 909 insertions(+), 901 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 3208fce8767a..73da15cc3c05 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/21.04.0/src -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/release-service/21.08.0/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index f6dd35c83a38..7ef67e7b0362 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1803 +4,1811 @@ { akonadi = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-21.04.0.tar.xz"; - sha256 = "1ka1cxwqvcdyy9i1p7v7vrcrs9d1kx892wzq1dw3jrq9x57l5drz"; - name = "akonadi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadi-21.08.0.tar.xz"; + sha256 = "0qjg8q11ir3dnhxgd068pniy4rwl8p2g0wwaf4cyzz4qw4kp8sbs"; + name = "akonadi-21.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-calendar-21.04.0.tar.xz"; - sha256 = "1yf92jx7x19cp95c8nbkgmz5q1cg7096gdwy525df56h3pgbm651"; - name = "akonadi-calendar-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadi-calendar-21.08.0.tar.xz"; + sha256 = "0f3psag09vc7k29z6p091qpb4b8464k6mjc5qf3mcnrfy2s6viw6"; + name = "akonadi-calendar-21.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-calendar-tools-21.04.0.tar.xz"; - sha256 = "1g0k1c11lysk3mi6k83lw70d64x543pcdgc9af1hyckb6clzh2gm"; - name = "akonadi-calendar-tools-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadi-calendar-tools-21.08.0.tar.xz"; + sha256 = "1pzs9bdh7lm7kqyrg6qhjj70rkdycfy4ys35ibrgwjv7r6zdgvfx"; + name = "akonadi-calendar-tools-21.08.0.tar.xz"; }; }; akonadiconsole = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadiconsole-21.04.0.tar.xz"; - sha256 = "0l6famxpw64w7gmknx4szsg16hjydp3cr2mp0z0dfzi4m1i64gi7"; - name = "akonadiconsole-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadiconsole-21.08.0.tar.xz"; + sha256 = "0sq03jrv9i86qw7217s77hfz6105dc7s51fzdhxw15zzv07qd1hb"; + name = "akonadiconsole-21.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-contacts-21.04.0.tar.xz"; - sha256 = "1130dvx8dpfvqsydhx1qy83bqx4drgb762ycf10cqkjvm6sjg3jh"; - name = "akonadi-contacts-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadi-contacts-21.08.0.tar.xz"; + sha256 = "0ay0fsb5rrv88w4azlcvmrhsdf4hx6nw8ahz0ik54j8x7ciabyq1"; + name = "akonadi-contacts-21.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-import-wizard-21.04.0.tar.xz"; - sha256 = "1idxpymfags4zrqlagndrkp9yvr24vvd4rzm7gm2zxwilw90smdh"; - name = "akonadi-import-wizard-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadi-import-wizard-21.08.0.tar.xz"; + sha256 = "1pcnasgl6f8z4hwgp5nnk4c5hvw210f0b89zjw7v18il2s09vr58"; + name = "akonadi-import-wizard-21.08.0.tar.xz"; }; }; akonadi-mime = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-mime-21.04.0.tar.xz"; - sha256 = "037v29sq0q46i675n177ny3n5rvndvdpvydbika89gkiyag6hh1v"; - name = "akonadi-mime-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadi-mime-21.08.0.tar.xz"; + sha256 = "08c1gn28p3lna8kh33s7ckj37yk5fz26d5n9msrr5497xlf3zyik"; + name = "akonadi-mime-21.08.0.tar.xz"; }; }; akonadi-notes = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-notes-21.04.0.tar.xz"; - sha256 = "0l0m3qpqj4g6j58kfc2xc48cwhhf0538h5bw5m8z123pcggp3w20"; - name = "akonadi-notes-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadi-notes-21.08.0.tar.xz"; + sha256 = "14d18h3jx761d3zh4m90fmw9fgn4yk22dvgif8ibm3xz8rwjc2v9"; + name = "akonadi-notes-21.08.0.tar.xz"; }; }; akonadi-search = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-search-21.04.0.tar.xz"; - sha256 = "189z9vqn05ph7c6sfr413hywrrqs1yn5sj84563bjf3rdzn4zp67"; - name = "akonadi-search-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akonadi-search-21.08.0.tar.xz"; + sha256 = "0sknzn0ks8az27a212mdfymrlybscl5irars3axb3f7r7lg4iw9s"; + name = "akonadi-search-21.08.0.tar.xz"; }; }; akregator = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akregator-21.04.0.tar.xz"; - sha256 = "1px3sxsbhh98822i3yxs9sq019f78njfai07rsyf9wbawa6xj2sm"; - name = "akregator-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/akregator-21.08.0.tar.xz"; + sha256 = "067dmvnssgcs5410xwnpr38lcxvqms4h70vxnqwzivj2yidymybd"; + name = "akregator-21.08.0.tar.xz"; }; }; analitza = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/analitza-21.04.0.tar.xz"; - sha256 = "1g4sfcdp13xsbfc1c64pgj7ax75z9cpqgy3sri4cm4qk9d2kkj0i"; - name = "analitza-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/analitza-21.08.0.tar.xz"; + sha256 = "1nrja7d5kpn1jywld737rx298ykvypb66mi1rxamscr59x2msq4l"; + name = "analitza-21.08.0.tar.xz"; }; }; ark = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ark-21.04.0.tar.xz"; - sha256 = "034ywf6favaj7cbfmcgz00yrmvpb8vxsw4yq8a7y6f40b590aphf"; - name = "ark-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ark-21.08.0.tar.xz"; + sha256 = "08pm60963fp77wklv3as2c4mg3qrhm7k8hdy7fqdq7l2y64syzfx"; + name = "ark-21.08.0.tar.xz"; }; }; artikulate = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/artikulate-21.04.0.tar.xz"; - sha256 = "0pbsbhl1phfzrgb393qf60n8k20f1qkda7a0mk6rxp1zj00pg7zw"; - name = "artikulate-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/artikulate-21.08.0.tar.xz"; + sha256 = "0w7f8yrfx57bg765iflpb3wjclncrpbfk0q0kych1pvynbxxam03"; + name = "artikulate-21.08.0.tar.xz"; }; }; audiocd-kio = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/audiocd-kio-21.04.0.tar.xz"; - sha256 = "1bbdw5gxjzpvvbq28zhazdr2ir1i3diy7rvz77cmw7jlj98x40m0"; - name = "audiocd-kio-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/audiocd-kio-21.08.0.tar.xz"; + sha256 = "12yp1k2z1sp785g5zzhq0v72qpc5gkw0cl7bbm9xn36jy4phi99s"; + name = "audiocd-kio-21.08.0.tar.xz"; }; }; baloo-widgets = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/baloo-widgets-21.04.0.tar.xz"; - sha256 = "08y590n7rrha28pyjmf3liishmfjyx422ryd5viwb21g3isdb5ir"; - name = "baloo-widgets-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/baloo-widgets-21.08.0.tar.xz"; + sha256 = "0hf7lrr502xk5154k7889yxxqdnz6k6v70pkwz1s9qq0d58xrwcy"; + name = "baloo-widgets-21.08.0.tar.xz"; }; }; blinken = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/blinken-21.04.0.tar.xz"; - sha256 = "00fb1a98f6qs2pjcb2hc4rh2zgnqzhg21dal0rc4ddglm0mvgq27"; - name = "blinken-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/blinken-21.08.0.tar.xz"; + sha256 = "0i4qs4bbk3kpi0hg98mbrdrndj687gdnyxnx3riay0vs9myqsa25"; + name = "blinken-21.08.0.tar.xz"; }; }; bomber = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/bomber-21.04.0.tar.xz"; - sha256 = "0fkikbyayd5ickhjwgd57kb89698w9ni89218bc47gkqvgm7zdzy"; - name = "bomber-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/bomber-21.08.0.tar.xz"; + sha256 = "1rkyxzdcjvzf6m6idjjx4xhqrj7j7cybnjmzyy9i81jnraql58gg"; + name = "bomber-21.08.0.tar.xz"; }; }; bovo = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/bovo-21.04.0.tar.xz"; - sha256 = "1k6k9hkzrnz2802k4pq0aabdbkwwdvqi8c669cjhxwqxrpxhlan3"; - name = "bovo-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/bovo-21.08.0.tar.xz"; + sha256 = "09gqf0cw23ia10sbqa4szlycihdjmiccvf024vgz8yyy8hi9n2hr"; + name = "bovo-21.08.0.tar.xz"; }; }; calendarsupport = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/calendarsupport-21.04.0.tar.xz"; - sha256 = "0m3x1pimy5sldgzkggwxyv3r0vn802bysf73nf6azgqachj1rm4g"; - name = "calendarsupport-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/calendarsupport-21.08.0.tar.xz"; + sha256 = "18dy6dhv0z8acvzr47q93rn027pm6dy5r49gagq975jkjw77wncp"; + name = "calendarsupport-21.08.0.tar.xz"; }; }; cantor = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/cantor-21.04.0.tar.xz"; - sha256 = "0saz2xapfqmqlh9cmz8vkhsz5ai9fjgzp5y4rg4nc77b6wfwijpp"; - name = "cantor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/cantor-21.08.0.tar.xz"; + sha256 = "0q7l3x5m0s3j9qlhjjvflzfi613638yzi38kcp1ldas1sw48jh7i"; + name = "cantor-21.08.0.tar.xz"; }; }; cervisia = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/cervisia-21.04.0.tar.xz"; - sha256 = "1r76mdrq4v8f850kgx6wamhhpnvj5giclnfp8ck0f86lqx228xhz"; - name = "cervisia-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/cervisia-21.08.0.tar.xz"; + sha256 = "108wm6r0h2lz29z7g47m0vhg0rmsqrlwgx0is6ymbbaf7kdy8ynm"; + name = "cervisia-21.08.0.tar.xz"; }; }; dolphin = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/dolphin-21.04.0.tar.xz"; - sha256 = "1gmxrxs4h9bk1lxs2gn0gv44067wk19p8mq85n6dbpry9sfyb229"; - name = "dolphin-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/dolphin-21.08.0.tar.xz"; + sha256 = "18b751bmq1mlq8zw6wkk2jw8qqn8n2n84vb9ga4jl6bi2gjdqrjn"; + name = "dolphin-21.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/dolphin-plugins-21.04.0.tar.xz"; - sha256 = "1ll8yhglncbzdmq6kpzavgd2q9llfbcqjyz8x97nlwibqszrbcwz"; - name = "dolphin-plugins-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/dolphin-plugins-21.08.0.tar.xz"; + sha256 = "1d10sbxpgz5fvw7ym8804qkqmrv1w4css5sn96xhd7kb7n23jbh8"; + name = "dolphin-plugins-21.08.0.tar.xz"; }; }; dragon = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/dragon-21.04.0.tar.xz"; - sha256 = "00lnrskgvxclf75h89ycgafajkw1ddqg74lv38dv9yc21lh683k9"; - name = "dragon-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/dragon-21.08.0.tar.xz"; + sha256 = "0d6kradbq010gmknzi4xf7x7b3cl2lmadhdngijmqw0k66g0gi6m"; + name = "dragon-21.08.0.tar.xz"; }; }; elisa = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/elisa-21.04.0.tar.xz"; - sha256 = "152i6748pkgnbpd192wd161w001l13gyinar1gphg46gb0z898sg"; - name = "elisa-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/elisa-21.08.0.tar.xz"; + sha256 = "14zlwx97ia7hlzylc0anj57gd2b300hclpjwhzr512sis704cyym"; + name = "elisa-21.08.0.tar.xz"; }; }; eventviews = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/eventviews-21.04.0.tar.xz"; - sha256 = "1zq97jfgl0k7k1nhv6zcnbicl1af86rz6hzski9hm387bh60rn5v"; - name = "eventviews-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/eventviews-21.08.0.tar.xz"; + sha256 = "06ryds5yc5rb3smdhyc1w94idg0apadfjrv65z7ikh85rw82h62s"; + name = "eventviews-21.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ffmpegthumbs-21.04.0.tar.xz"; - sha256 = "06ycd5q5b4j6xxvrfvvpfdbmzrk8xysv7k8m64yypxnv9r7h1rsa"; - name = "ffmpegthumbs-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ffmpegthumbs-21.08.0.tar.xz"; + sha256 = "0cbinfvfxibpigcv2pwa95yiyd0nll7qrhcb7gcaa21vsq6ggf5m"; + name = "ffmpegthumbs-21.08.0.tar.xz"; }; }; filelight = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/filelight-21.04.0.tar.xz"; - sha256 = "1bfpqc67mkqz1w7wwv3p28q0n55vc78l94nyg805zs9adk00886v"; - name = "filelight-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/filelight-21.08.0.tar.xz"; + sha256 = "1x287k36grk3hn7gl7n7sc89a0ibcciz93bym0znl241fd2ncl3q"; + name = "filelight-21.08.0.tar.xz"; }; }; granatier = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/granatier-21.04.0.tar.xz"; - sha256 = "0qcnr7n2401ykgwbz4lcsgp19fkb90lfbblbmrnbcslfc5pz8jz8"; - name = "granatier-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/granatier-21.08.0.tar.xz"; + sha256 = "119nfjcmi6fw47700cj4lxczgmc1dv3nxg2mjvzmp9gbr0cfmybb"; + name = "granatier-21.08.0.tar.xz"; }; }; grantlee-editor = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/grantlee-editor-21.04.0.tar.xz"; - sha256 = "0rfcv63flw5izccqxz7mz43hvlim1cilnmrvk2vxc258vl1a226p"; - name = "grantlee-editor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/grantlee-editor-21.08.0.tar.xz"; + sha256 = "1jf3bzbg9k4xxhq1r22s5r31f5876gihwgipfdpmk7r7hckz2dzr"; + name = "grantlee-editor-21.08.0.tar.xz"; }; }; grantleetheme = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/grantleetheme-21.04.0.tar.xz"; - sha256 = "1jxdi7as6c81sy7zs59y6a0gmsjz6xwh6vbcr3r64wx62hj6vyls"; - name = "grantleetheme-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/grantleetheme-21.08.0.tar.xz"; + sha256 = "14sl4wnas4xcx0dpdp6bqi0fk6ylmm6k0cwiyhxp3n2mam1v9ia5"; + name = "grantleetheme-21.08.0.tar.xz"; }; }; gwenview = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/gwenview-21.04.0.tar.xz"; - sha256 = "06yyf7f49xbcfzbm10rr0xcmyxmlafh188wq8bjc8mp7p6fq7yd5"; - name = "gwenview-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/gwenview-21.08.0.tar.xz"; + sha256 = "06bgq01zw5vybp78x543fv0j7yaz75wds0f7s1sbddrjyn8ifqwd"; + name = "gwenview-21.08.0.tar.xz"; }; }; incidenceeditor = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/incidenceeditor-21.04.0.tar.xz"; - sha256 = "1fch2d5jgh3raf2zqc4vapgwf3gkdfsd71djvd626q3dsbh82qxz"; - name = "incidenceeditor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/incidenceeditor-21.08.0.tar.xz"; + sha256 = "0z1kbwmrwr430ayawcgc9vjnag11gjj3ydbgybs8x0y64cj5v7c0"; + name = "incidenceeditor-21.08.0.tar.xz"; }; }; itinerary = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/itinerary-21.04.0.tar.xz"; - sha256 = "132y5v5qy89hfvp1j3x6rr6bg4wdzhd177isrs110w0aizdrbjcn"; - name = "itinerary-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/itinerary-21.08.0.tar.xz"; + sha256 = "1zcf6wz263an6lanl0q81f676zzbnznrrx8lsadbxacm7dvz47a8"; + name = "itinerary-21.08.0.tar.xz"; }; }; juk = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/juk-21.04.0.tar.xz"; - sha256 = "11plw0h56n4fmhi47rmjw8qdki3r5yf3v7zfc0svwkb12lrvcp6z"; - name = "juk-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/juk-21.08.0.tar.xz"; + sha256 = "13q9agy9sc7r3cpfc1ip0697jys5v665ih745l2kv6b7sm77w0f5"; + name = "juk-21.08.0.tar.xz"; }; }; k3b = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/k3b-21.04.0.tar.xz"; - sha256 = "1a6gm7bk486fr2haap6212vzx8hhrwkgjplyyq1nb27v61rpir2n"; - name = "k3b-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/k3b-21.08.0.tar.xz"; + sha256 = "0289g6dk03k7qab8wrj19kv4gz4b9d25ni9kii48ny5169whnk40"; + name = "k3b-21.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kaccounts-integration-21.04.0.tar.xz"; - sha256 = "1znfyslk4w45923xfxflipf0zwxf91k949carnbhzfiplab30gpy"; - name = "kaccounts-integration-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kaccounts-integration-21.08.0.tar.xz"; + sha256 = "0kq3pi3lr4bwz0dv8nzdrf8q0dl9mqyj697x2dcmlhydg6vkcyp6"; + name = "kaccounts-integration-21.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kaccounts-providers-21.04.0.tar.xz"; - sha256 = "17rnqsagg60zd5nf7hag74kc9s7nj01ps3z411j8zwa1vlbqidg0"; - name = "kaccounts-providers-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kaccounts-providers-21.08.0.tar.xz"; + sha256 = "0xflvms3y02z52yh9grl4304g8m302k7qw07mlcvfvsma44db1mg"; + name = "kaccounts-providers-21.08.0.tar.xz"; }; }; kaddressbook = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kaddressbook-21.04.0.tar.xz"; - sha256 = "1p9lcs4jd8n52hd0mpckwiv23zivzflkih2lpdbqcw55s75g03bl"; - name = "kaddressbook-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kaddressbook-21.08.0.tar.xz"; + sha256 = "1yhilvq14cx1g6wa21zccm9cfjm7nkfwg297b3iaympwnjb9bny2"; + name = "kaddressbook-21.08.0.tar.xz"; }; }; kajongg = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kajongg-21.04.0.tar.xz"; - sha256 = "11hxc0scc700zmw5736z3vcign09g5rgnfmg98z3j34bms7iff5n"; - name = "kajongg-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kajongg-21.08.0.tar.xz"; + sha256 = "12l3ls1v4ldmmdmrky7d4ihymyr75jvm89zrz7mi44nkh5p1s7c2"; + name = "kajongg-21.08.0.tar.xz"; }; }; kalarm = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kalarm-21.04.0.tar.xz"; - sha256 = "1zcyc6nlsdh9ixl10n6xlnfj78z6j218a9aipj1vws0jx7zahl12"; - name = "kalarm-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kalarm-21.08.0.tar.xz"; + sha256 = "1mmjj3dyza9xq8c5aqivhryvd1vj4z74zw8nmdfscwnzb72gn9xh"; + name = "kalarm-21.08.0.tar.xz"; }; }; kalarmcal = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kalarmcal-21.04.0.tar.xz"; - sha256 = "0cp5mian3zkyb51l6h2j7dkdhhmhk9vh33yvfa9x5q998sknr1m3"; - name = "kalarmcal-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kalarmcal-21.08.0.tar.xz"; + sha256 = "1v4aqgs2387jnjj5lf7jb03if1p2clxk433jrsyzi2zici7qcd07"; + name = "kalarmcal-21.08.0.tar.xz"; }; }; kalgebra = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kalgebra-21.04.0.tar.xz"; - sha256 = "1w9vy3130kxw68fnpvzvq2k40dyain0ncsflf24fmn7dzjl4wpxn"; - name = "kalgebra-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kalgebra-21.08.0.tar.xz"; + sha256 = "0dl1yjh572mcnr71p2ivm2g5w785nq2frqskpydnng1bglrjcf4w"; + name = "kalgebra-21.08.0.tar.xz"; }; }; kalzium = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kalzium-21.04.0.tar.xz"; - sha256 = "0fnqj1xnlgkb5wfx7j2zzbypyyql44srd555bdb1w0q37w1zxxgm"; - name = "kalzium-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kalzium-21.08.0.tar.xz"; + sha256 = "130xcqa5kmwg369s22bp9nvzdz3gb553n5awj5rg5gm1fs1xkwnr"; + name = "kalzium-21.08.0.tar.xz"; }; }; kamera = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kamera-21.04.0.tar.xz"; - sha256 = "068ic1nf15x4h7h877q7by3hkd5dap9a2kdm7x2jwcqhwriiirw2"; - name = "kamera-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kamera-21.08.0.tar.xz"; + sha256 = "1zwwc1kaky7cnb4xmwh05w6n3yhqwz2blc1x7s427ismfxsjvsys"; + name = "kamera-21.08.0.tar.xz"; }; }; kamoso = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kamoso-21.04.0.tar.xz"; - sha256 = "0npabci0x04g7v56x3pb5ps560d0xdshaznlci05bn3czxdas93h"; - name = "kamoso-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kamoso-21.08.0.tar.xz"; + sha256 = "00l655hx15h1axxad4bk3v5smfv7zvg45w08hign6n30wb3jhz7f"; + name = "kamoso-21.08.0.tar.xz"; }; }; kanagram = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kanagram-21.04.0.tar.xz"; - sha256 = "0ccnzrra54hqx7acsaiz8fk5gnax9y4j195hsbix7mghgb5ylz8r"; - name = "kanagram-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kanagram-21.08.0.tar.xz"; + sha256 = "1ak7r1rsq1bxb9696a50dim5kicy4pi8rg199pwh0f7gy0b14wiz"; + name = "kanagram-21.08.0.tar.xz"; }; }; kapman = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kapman-21.04.0.tar.xz"; - sha256 = "1i7jr8xlh3v4wz9bbc335q79zx96nfp15hhqnhkgxsqc216zn8qm"; - name = "kapman-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kapman-21.08.0.tar.xz"; + sha256 = "11r4q66ii48g5mr9sa2c0ilas5441sdxlrd0053psksl3f0j8lv5"; + name = "kapman-21.08.0.tar.xz"; }; }; kapptemplate = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kapptemplate-21.04.0.tar.xz"; - sha256 = "0l2y562s7rk99zr5vbp03gbv0fwbd211j4n51g3yry7vbk433aiw"; - name = "kapptemplate-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kapptemplate-21.08.0.tar.xz"; + sha256 = "09pi0s09jiqmmp0gv017m18w0y8y06gqcp60j6gawlcsl4kppykx"; + name = "kapptemplate-21.08.0.tar.xz"; }; }; kate = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kate-21.04.0.tar.xz"; - sha256 = "1m11fh5c527d6b8a5wmglj9z0d2caak5bqh1g7fql1ygw06wr01p"; - name = "kate-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kate-21.08.0.tar.xz"; + sha256 = "1s37smn2pk3lglwm8xh0fmq81jd7j6w10pmxb32lm734igdjw9s9"; + name = "kate-21.08.0.tar.xz"; }; }; katomic = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/katomic-21.04.0.tar.xz"; - sha256 = "0hrlmzqnw03nv334q680zwk700c8pvnaw57gh1ixphzsbx871yrk"; - name = "katomic-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/katomic-21.08.0.tar.xz"; + sha256 = "0z5w4zibczkdr8qv45l094lq1xh398rmhhdbs5k7pglj8pkywyww"; + name = "katomic-21.08.0.tar.xz"; }; }; kbackup = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kbackup-21.04.0.tar.xz"; - sha256 = "1l3bk7dj2grbki41fhxawrwn4vpncf3m2b5bq5ivj4vj4jc6vlyz"; - name = "kbackup-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kbackup-21.08.0.tar.xz"; + sha256 = "1x8l0fw6p6ynsgp7fyzb1klmm2g78fyd06zn5b7jizm4wb7y47m0"; + name = "kbackup-21.08.0.tar.xz"; }; }; kblackbox = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kblackbox-21.04.0.tar.xz"; - sha256 = "17ba03qmyaiqda064dhxl0kwvncll7fznjvnfvby9lgdpzfjj8j9"; - name = "kblackbox-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kblackbox-21.08.0.tar.xz"; + sha256 = "0qrhc8zp6pggk103p19kkijz206l99dkdw5whrqa5awl9vi2661y"; + name = "kblackbox-21.08.0.tar.xz"; }; }; kblocks = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kblocks-21.04.0.tar.xz"; - sha256 = "01i24fizs8d6yvyldln905vnww8ajy3aswn55xhxinjwhx9dcy7n"; - name = "kblocks-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kblocks-21.08.0.tar.xz"; + sha256 = "1if3s2dgfd083ql5sgcijccxbdnab5gn6pqcdc8swwgpvvs98f08"; + name = "kblocks-21.08.0.tar.xz"; }; }; kbounce = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kbounce-21.04.0.tar.xz"; - sha256 = "05wy4my4hil72cmj3p2hf9bshpknyps8xmp0mrbigyrzg505zjj2"; - name = "kbounce-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kbounce-21.08.0.tar.xz"; + sha256 = "0b8242kf0z9b6bi2k07rvyhyh2r5pqpykxn8gchrklg1a39i2748"; + name = "kbounce-21.08.0.tar.xz"; }; }; kbreakout = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kbreakout-21.04.0.tar.xz"; - sha256 = "0084id4wwk31m7wjkl5grcpbyqyzqx6cxixhdy48v7djdnn43jfj"; - name = "kbreakout-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kbreakout-21.08.0.tar.xz"; + sha256 = "1ps8jdyjv5l7iifps0h8v9mfssqrq2wzk9l6ic5l2lri4i941svn"; + name = "kbreakout-21.08.0.tar.xz"; }; }; kbruch = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kbruch-21.04.0.tar.xz"; - sha256 = "0qygd4zx039qckv4zzkgvz70wm8hg156bmb70g9g0nv5bzh4y02g"; - name = "kbruch-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kbruch-21.08.0.tar.xz"; + sha256 = "08mafsyr0d2qrpv213rssz9h9qk58miyvlmjbk9p4ryf81qhcbxs"; + name = "kbruch-21.08.0.tar.xz"; }; }; kcachegrind = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcachegrind-21.04.0.tar.xz"; - sha256 = "1bdlzp35914nvbzcf4n6qrjmg7c0dc7c13kwq9gr5q6i4lvf275r"; - name = "kcachegrind-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kcachegrind-21.08.0.tar.xz"; + sha256 = "1br5f54ym1b2ra20lk2giqijir9q35al0vwm8m7fa7z9s9z002bx"; + name = "kcachegrind-21.08.0.tar.xz"; }; }; kcalc = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcalc-21.04.0.tar.xz"; - sha256 = "0x0b19yaif6mjh20lbvl87phna781ya3l9hpwj2941vgvffwwpsh"; - name = "kcalc-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kcalc-21.08.0.tar.xz"; + sha256 = "14f3p10sg41az5qiccdmdavqi62m9i7ijv27hibi6z162ly15nh3"; + name = "kcalc-21.08.0.tar.xz"; }; }; kcalutils = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcalutils-21.04.0.tar.xz"; - sha256 = "0kvl8ghwcamxayvwbsyjzib5b19v3k5hch17lj2pjsj20dgfl4qv"; - name = "kcalutils-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kcalutils-21.08.0.tar.xz"; + sha256 = "1yg8vdlcl79f42k2j100ikm8r1bhrrwmqdrzin7qnvsqyx8dhw1i"; + name = "kcalutils-21.08.0.tar.xz"; }; }; kcharselect = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcharselect-21.04.0.tar.xz"; - sha256 = "1gp75qkwphgxpjkc1fwqkrbkkmc45l55ck8mqvbpz4aq8bscc0nx"; - name = "kcharselect-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kcharselect-21.08.0.tar.xz"; + sha256 = "16z657is57yrag7ydc2cxzsb438kl7bxdnbn68qq2x14n011fzah"; + name = "kcharselect-21.08.0.tar.xz"; }; }; kcolorchooser = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcolorchooser-21.04.0.tar.xz"; - sha256 = "0cgzclfmcn7l98ycm313sp8fhmx46fbn88l9cykywi27idymmb9v"; - name = "kcolorchooser-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kcolorchooser-21.08.0.tar.xz"; + sha256 = "1lpskfa6nfw6ymbw8rqqi6gr1f4grdsgmxh2s5w4r2n9i9limb17"; + name = "kcolorchooser-21.08.0.tar.xz"; }; }; kcron = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcron-21.04.0.tar.xz"; - sha256 = "144y4cn8xpkmn1gsab8wpvhqrnfidcjrbp2cy9xhx18as5ckpjn3"; - name = "kcron-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kcron-21.08.0.tar.xz"; + sha256 = "1972l12291mzrcdndr5385qh8sx2alsxjfqpsk9lj1gkcqh13yyk"; + name = "kcron-21.08.0.tar.xz"; }; }; kdebugsettings = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdebugsettings-21.04.0.tar.xz"; - sha256 = "1xpbw9v9ws9i7a6ag5f6z7d15svyyx34p5vibm4p4j70vd7q5rwk"; - name = "kdebugsettings-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdebugsettings-21.08.0.tar.xz"; + sha256 = "0a1wp3hnxvzpa6mhf0p6yj144sv3pvhl1dffck9avaz543zrxy36"; + name = "kdebugsettings-21.08.0.tar.xz"; }; }; kdeconnect-kde = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdeconnect-kde-21.04.0.tar.xz"; - sha256 = "1zbn2hi245934ljxgrzc3s2rpyapwrrkzx5vcjhnf8ri9v6sxhgp"; - name = "kdeconnect-kde-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdeconnect-kde-21.08.0.tar.xz"; + sha256 = "1qmic0016ybldsfagbqj3yrvfhja3zhygkq6pgnkb1zq3bfk22ls"; + name = "kdeconnect-kde-21.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kde-dev-scripts-21.04.0.tar.xz"; - sha256 = "0plg145hp3bpxb2x3j8hja6fjn7yzmvx8j7zw123xnmqbzi25f6s"; - name = "kde-dev-scripts-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kde-dev-scripts-21.08.0.tar.xz"; + sha256 = "1v8h3fp8lv6d0qdwbwwwcz9ncj5r8b3l3dbc56r9x07i1pkxxmrr"; + name = "kde-dev-scripts-21.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kde-dev-utils-21.04.0.tar.xz"; - sha256 = "1cgzkhpb81s1zbx4rsfprmjn3cwqykyaaymg4bm7nqwnq97bbmc5"; - name = "kde-dev-utils-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kde-dev-utils-21.08.0.tar.xz"; + sha256 = "17ccgwifx7sq3dzhicclaxa9xlnxc4qic37kf5f391y99d7kj9cm"; + name = "kde-dev-utils-21.08.0.tar.xz"; }; }; kdeedu-data = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdeedu-data-21.04.0.tar.xz"; - sha256 = "0s4x0n8skwn117iiffi8rp4l5ddizfdqlc9lm49ijlvzkvhz3g3p"; - name = "kdeedu-data-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdeedu-data-21.08.0.tar.xz"; + sha256 = "1szkqcn64z4qrfrbfwnlzp4prv84nl361dnr6m0nr72nk0421w4g"; + name = "kdeedu-data-21.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdegraphics-mobipocket-21.04.0.tar.xz"; - sha256 = "00pxfffc2xb7mszzgq6b3kp1h3m870k81rqarsy2igxxpbr3dr2p"; - name = "kdegraphics-mobipocket-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdegraphics-mobipocket-21.08.0.tar.xz"; + sha256 = "0lg92zz122b0ia3qyg7c00ymqlh9pvpja9fyjqa0rvqy1ampb848"; + name = "kdegraphics-mobipocket-21.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdegraphics-thumbnailers-21.04.0.tar.xz"; - sha256 = "0yga4pa37zpgawq2hhc5w3scw40fwyp7901vbh6zspbdzya9lb50"; - name = "kdegraphics-thumbnailers-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdegraphics-thumbnailers-21.08.0.tar.xz"; + sha256 = "1asgh1zag5pv56zhbgjax6pba5vpywhxsd3lmpa2fd6yqvrnqflw"; + name = "kdegraphics-thumbnailers-21.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdenetwork-filesharing-21.04.0.tar.xz"; - sha256 = "07a9pflvjf7ffi9jqx43f43wykl7z92z3pr1ca9q36fxw7cdixad"; - name = "kdenetwork-filesharing-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdenetwork-filesharing-21.08.0.tar.xz"; + sha256 = "1pnn27cfkn209vp6mapfv8p2lbbyjrkha41qfza5cgbsmnbw8vag"; + name = "kdenetwork-filesharing-21.08.0.tar.xz"; }; }; kdenlive = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdenlive-21.04.0.tar.xz"; - sha256 = "1psb7mvffiqnv5n4b0wwa6s2ykcfkc4dxsvbxh2k67gmvq58zgmh"; - name = "kdenlive-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdenlive-21.08.0.tar.xz"; + sha256 = "08nfjslkm0xdfkq15nma9c6rajgi2d1qf6sb5wscnr5bvqkxyhg4"; + name = "kdenlive-21.08.0.tar.xz"; }; }; kdepim-addons = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdepim-addons-21.04.0.tar.xz"; - sha256 = "02xlp9xm15462y02wz05kn5vkg11lkiblz0cx43i8rcyiqnxbldz"; - name = "kdepim-addons-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdepim-addons-21.08.0.tar.xz"; + sha256 = "0fbf11zxn6zf6g9l1m3faiprbkppvi4ha1q8v6khxq92nkidq962"; + name = "kdepim-addons-21.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdepim-runtime-21.04.0.tar.xz"; - sha256 = "1m1fshyivm1mz4hj9qaq33wdjkqxpjjbr0rkscb2b56a6jg4glza"; - name = "kdepim-runtime-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdepim-runtime-21.08.0.tar.xz"; + sha256 = "1nzc8av8yai8pjbjwz0kx6jm9kl847ddx6v913xx4y58y9w2d3xs"; + name = "kdepim-runtime-21.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdesdk-kioslaves-21.04.0.tar.xz"; - sha256 = "068hqm1f2wllq3gcpmsib8cky6fhgpmqvmzvymcfc19ccyzwayhf"; - name = "kdesdk-kioslaves-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdesdk-kioslaves-21.08.0.tar.xz"; + sha256 = "08vvkcyzlaq4l4v8rwlxxpdqdmxv5ylkrf10cbg8bjkgrwqyalrc"; + name = "kdesdk-kioslaves-21.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdesdk-thumbnailers-21.04.0.tar.xz"; - sha256 = "0cj6xsazqv94l02bp1pr5kny5id0kr5kqv3xkwv4jvmq317vfi3i"; - name = "kdesdk-thumbnailers-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdesdk-thumbnailers-21.08.0.tar.xz"; + sha256 = "0n5nmixnw92mkx8vwzyixgvnjk941q6p43i6j5h272j3w98p10lg"; + name = "kdesdk-thumbnailers-21.08.0.tar.xz"; }; }; kdf = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdf-21.04.0.tar.xz"; - sha256 = "1vbc75z33gx8pvy0kbmrhcg209qxxnvw7ccw83wk9hhzqg7mj5gf"; - name = "kdf-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdf-21.08.0.tar.xz"; + sha256 = "0s3a4chj1hx3s4nw56ddcl8nvk1rannj14zzfq31r2yg3pahy1hm"; + name = "kdf-21.08.0.tar.xz"; }; }; kdialog = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdialog-21.04.0.tar.xz"; - sha256 = "0damdppa2hm18nd99nzx23nac3k5ps0f5kc04cgfip4cr34rpg5s"; - name = "kdialog-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdialog-21.08.0.tar.xz"; + sha256 = "1pki0hdwxrjlcfzyvhk2ag77050zg7wkhcpj7qzxr91l3ga3rbyl"; + name = "kdialog-21.08.0.tar.xz"; }; }; kdiamond = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdiamond-21.04.0.tar.xz"; - sha256 = "1lpwghy8v4242rm2vzm3wng43h5ys6r7spzlv53h329kpzd2259v"; - name = "kdiamond-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kdiamond-21.08.0.tar.xz"; + sha256 = "054kjwscdw8ap2123lrrhpaw2mvd1ly1cwf22zjz41k4hq533kmm"; + name = "kdiamond-21.08.0.tar.xz"; }; }; keditbookmarks = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/keditbookmarks-21.04.0.tar.xz"; - sha256 = "1adk2g9hg7mls2vrrslmmy0nfvpgri9jlmii4pqfwl9kilcnk7lc"; - name = "keditbookmarks-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/keditbookmarks-21.08.0.tar.xz"; + sha256 = "1z0n0d0wgvr4v97lkvkx7lkj3d1ncp2vi7chvvq9ja0kxyd67r8f"; + name = "keditbookmarks-21.08.0.tar.xz"; }; }; kfind = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kfind-21.04.0.tar.xz"; - sha256 = "1122h7jmsf49j7388py6pp72gfkqqzv971n7dkzpyqhfirqaigvj"; - name = "kfind-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kfind-21.08.0.tar.xz"; + sha256 = "0qa462fsfdzk1m8jasm5zcyhx2851r42gi5jkki35gnny84ic2lg"; + name = "kfind-21.08.0.tar.xz"; }; }; kfloppy = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kfloppy-21.04.0.tar.xz"; - sha256 = "19maj0a469wnyindbrmqby8qikxcz38czagfygpq16y9bnkbvp3s"; - name = "kfloppy-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kfloppy-21.08.0.tar.xz"; + sha256 = "03kgypngvalzzraf58g7l266naal0v7781lyh9ibi78frf6j7qw3"; + name = "kfloppy-21.08.0.tar.xz"; }; }; kfourinline = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kfourinline-21.04.0.tar.xz"; - sha256 = "0yna3lydp0gii1rasij5593gaf4w9pbv7y5l6hz5qddb5y6r82ds"; - name = "kfourinline-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kfourinline-21.08.0.tar.xz"; + sha256 = "1g663kkjhpfi0f6q23rmfqgwi976i46fs8qr4nqw55v7l09qrkwq"; + name = "kfourinline-21.08.0.tar.xz"; }; }; kgeography = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kgeography-21.04.0.tar.xz"; - sha256 = "1hcjp34jzz9qx8jp065gisnr9gn1v1ifnajfnaa3vc6sq1m1bvvi"; - name = "kgeography-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kgeography-21.08.0.tar.xz"; + sha256 = "01y0phdfymn8k14riiy15f58b0148rl2jidxnbl9if1jpn90dkai"; + name = "kgeography-21.08.0.tar.xz"; }; }; kget = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kget-21.04.0.tar.xz"; - sha256 = "0lws94g3780kdnxw2wf8vl41fq8ffxwaafma3r7p15rs05cyl1rv"; - name = "kget-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kget-21.08.0.tar.xz"; + sha256 = "0k406isgg3lgnbl4c6l9wqgwjiv0hp5pg07na94vm03j0qg015q5"; + name = "kget-21.08.0.tar.xz"; }; }; kgoldrunner = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kgoldrunner-21.04.0.tar.xz"; - sha256 = "02gldv7l8igzzmmyrkyixgzncsh0ysmfhx0lfc27pdj0mvfpm3m2"; - name = "kgoldrunner-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kgoldrunner-21.08.0.tar.xz"; + sha256 = "1d2z76xv3v7sg9bad6gwc5p9dbb00ljkhd9jq8bn3lrqiya5vn1l"; + name = "kgoldrunner-21.08.0.tar.xz"; }; }; kgpg = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kgpg-21.04.0.tar.xz"; - sha256 = "0a5xik5wb0b15p612lxzwqr5b58d4d7v3c7ghxmm8g27k36igqff"; - name = "kgpg-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kgpg-21.08.0.tar.xz"; + sha256 = "0hkhnf1n72w4ccnh3mrvzg22nfv6vpjkh8i9a5496yrzkch862g8"; + name = "kgpg-21.08.0.tar.xz"; }; }; khangman = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/khangman-21.04.0.tar.xz"; - sha256 = "0pkqhbvw375v3cwn7ilfn7x93nadnxl07swcj5dbxn84gs33aj7c"; - name = "khangman-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/khangman-21.08.0.tar.xz"; + sha256 = "03bazg4bd23q90pi8z5gab91j4md7ya9ahvyla5523r671pcfwhh"; + name = "khangman-21.08.0.tar.xz"; }; }; khelpcenter = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/khelpcenter-21.04.0.tar.xz"; - sha256 = "04fvipc3dzjl2fsgbla8w7kmv239ch86da8539gwg7l54bdmb5pv"; - name = "khelpcenter-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/khelpcenter-21.08.0.tar.xz"; + sha256 = "15if3awpx514prhsaznvw7acxy4zihgf36pxjgd1rzsg6f0gcj5i"; + name = "khelpcenter-21.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kidentitymanagement-21.04.0.tar.xz"; - sha256 = "1y83k7lzyzc5r6f7pqkbzqm1xnjv0z11vg8yazqwmfcv1whbzxda"; - name = "kidentitymanagement-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kidentitymanagement-21.08.0.tar.xz"; + sha256 = "1jqn973dccdynqinyi698wkm92nqvhyy8z6nihh82rcfzkj16xcf"; + name = "kidentitymanagement-21.08.0.tar.xz"; }; }; kig = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kig-21.04.0.tar.xz"; - sha256 = "0d4p7py3lf05dsfy9x98aq6fwk6fsvf97jwxsdz4z3r49qvcp3hp"; - name = "kig-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kig-21.08.0.tar.xz"; + sha256 = "1m2wx1cpv5821438hlzhpis88r8dspsrh8snr1a1sgnmpgpjjla9"; + name = "kig-21.08.0.tar.xz"; }; }; kigo = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kigo-21.04.0.tar.xz"; - sha256 = "0ans0mj9ql6vdmnc130sw0wkkm8rc1bpiww36a76nw8n28cfcyzi"; - name = "kigo-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kigo-21.08.0.tar.xz"; + sha256 = "1kym2bl0xh8mih13ykxw3g6xkl1lyh7vpyvyn2zprgnqjhs4699v"; + name = "kigo-21.08.0.tar.xz"; }; }; killbots = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/killbots-21.04.0.tar.xz"; - sha256 = "1qf2lahvi5g9cgvbgp6sj9vw1g8fcvcwaxgaqnc5akl03p51gz2k"; - name = "killbots-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/killbots-21.08.0.tar.xz"; + sha256 = "0agqd8ww6l5i1absv6wxzraavdjlwvdp831xk18vr7gfdqq5rqzw"; + name = "killbots-21.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kimagemapeditor-21.04.0.tar.xz"; - sha256 = "1f3y10bk5541sgi2qfww56mfq245a9wg38vpw2c8ygf4lc5rh67s"; - name = "kimagemapeditor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kimagemapeditor-21.08.0.tar.xz"; + sha256 = "0lpzf2wcn6ifbh3jin7z55bryb2gzq1yki2yl6v5fgabq0kg0pb9"; + name = "kimagemapeditor-21.08.0.tar.xz"; }; }; kimap = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kimap-21.04.0.tar.xz"; - sha256 = "0fbcwsiz1q5s9d70zn7y183p477ykyjpw27i3k2mxb9ggk0h8bnx"; - name = "kimap-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kimap-21.08.0.tar.xz"; + sha256 = "0qyixdxy0d56a9r8gw2asm4230bcmwmj88wlhcgzd6n5q198xh49"; + name = "kimap-21.08.0.tar.xz"; }; }; kio-extras = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kio-extras-21.04.0.tar.xz"; - sha256 = "1p5kd5c4p5yc9fmppa6sivgv5kn1l9krzzw5h5y8xmi9g896yjjg"; - name = "kio-extras-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kio-extras-21.08.0.tar.xz"; + sha256 = "0va8ankd2hp1c5c0fdmhnx6p8rhar6xicdalck6z8gw8q94dg4xx"; + name = "kio-extras-21.08.0.tar.xz"; }; }; kio-gdrive = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kio-gdrive-21.04.0.tar.xz"; - sha256 = "0p1y30syzbj7lg8hpxb5r255ba0v93gc219r1v7gb1ja5p7pjvsh"; - name = "kio-gdrive-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kio-gdrive-21.08.0.tar.xz"; + sha256 = "1akjmd9l4ydvrjh4r2rxrhfzngvbv487wmdgq2fvy9y926vzvvlz"; + name = "kio-gdrive-21.08.0.tar.xz"; }; }; kipi-plugins = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kipi-plugins-21.04.0.tar.xz"; - sha256 = "1x26yw1f47pylly2211kdld17m0p42a5miygwc7rnvasvh0dngwf"; - name = "kipi-plugins-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kipi-plugins-21.08.0.tar.xz"; + sha256 = "0xfn0sx9xxl2fasj89iyyhqn6b7czkmrqxssmahi67dfnazqdnvg"; + name = "kipi-plugins-21.08.0.tar.xz"; }; }; kirigami-gallery = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kirigami-gallery-21.04.0.tar.xz"; - sha256 = "04hq0hikx692glb83xs8fg97dv53ayzd8lp776zv4p3sd6dpaysf"; - name = "kirigami-gallery-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kirigami-gallery-21.08.0.tar.xz"; + sha256 = "1q64blarbm82pwpch9r16my3zidvifmbzx2hj1wm6nan57k56xs8"; + name = "kirigami-gallery-21.08.0.tar.xz"; }; }; kiriki = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kiriki-21.04.0.tar.xz"; - sha256 = "0dlimwhw6ii9x4m7166hbl3n6zi5pcvbsg303jm8pjc2bj83izis"; - name = "kiriki-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kiriki-21.08.0.tar.xz"; + sha256 = "0cvhc14syhzkgf7k04m1wpb9l8lrph2lk0mb47xyj2qlw4vyn31a"; + name = "kiriki-21.08.0.tar.xz"; }; }; kiten = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kiten-21.04.0.tar.xz"; - sha256 = "0vvq75q7j4j2hzzwnsr5zafphqvhwggb0mbs6y1ccb6yfm5vy3a4"; - name = "kiten-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kiten-21.08.0.tar.xz"; + sha256 = "1n961yhiiw6vsfqnfb9k1w8rdfdcrzawimvk4z6990bli6caj432"; + name = "kiten-21.08.0.tar.xz"; }; }; kitinerary = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kitinerary-21.04.0.tar.xz"; - sha256 = "0sxzc2c0i1qjn5302a3cg7inx020r3n1pzjif6bhw4phynbzxliy"; - name = "kitinerary-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kitinerary-21.08.0.tar.xz"; + sha256 = "0hd28l6a2p3q6rrdn80l46fznswwy645krfcfpyasaf917710kkm"; + name = "kitinerary-21.08.0.tar.xz"; }; }; kjumpingcube = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kjumpingcube-21.04.0.tar.xz"; - sha256 = "12khypxl87725zs5ykwcp1ag27v5q89n9cvn879d6lp7qqs7mjx8"; - name = "kjumpingcube-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kjumpingcube-21.08.0.tar.xz"; + sha256 = "0wvfn1a2wa6bwpsgk3b4i6jfza106f4j0mpqvqcck2bdyjpcqrc6"; + name = "kjumpingcube-21.08.0.tar.xz"; }; }; kldap = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kldap-21.04.0.tar.xz"; - sha256 = "1mqqpzqpz0hlldb0nz3dnm33d1hwpxcwj9hdqik5bzbfnr7ww04g"; - name = "kldap-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kldap-21.08.0.tar.xz"; + sha256 = "0ng64lrcp0av31i2rp0jpag4kvikfmmxap4z1wzb21br3wr6zfcr"; + name = "kldap-21.08.0.tar.xz"; }; }; kleopatra = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kleopatra-21.04.0.tar.xz"; - sha256 = "0w58nsklvc63ps0m92knf0n2wkmksq432ckx1959klimgqacffy0"; - name = "kleopatra-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kleopatra-21.08.0.tar.xz"; + sha256 = "0l83x3cpfi9b1pbf00fbbynk5g9ffryasmapxdr1qqsavk2wlybr"; + name = "kleopatra-21.08.0.tar.xz"; }; }; klettres = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/klettres-21.04.0.tar.xz"; - sha256 = "1kxyisvmpgf4m5qzi7w6lfmnnpp96f4v72pls5k68q01ygf7mlrg"; - name = "klettres-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/klettres-21.08.0.tar.xz"; + sha256 = "16fc71s9nksd47xhphqw4zdw8inb47m5zn5m6xpmvvf98bs42ia1"; + name = "klettres-21.08.0.tar.xz"; }; }; klickety = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/klickety-21.04.0.tar.xz"; - sha256 = "0jiaxfzvdbygmfd6d0bsakzsvzkjvlhhidjz1wmvxq0jla4qna6b"; - name = "klickety-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/klickety-21.08.0.tar.xz"; + sha256 = "172ajlmnw6hwg8lr7kdiixd43iv2ldg5bwnh1jaddrpn29zfdj9g"; + name = "klickety-21.08.0.tar.xz"; }; }; klines = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/klines-21.04.0.tar.xz"; - sha256 = "1ay26by2hwn7b0i48xgsxdysqpwzkvsz6g974c93103f5ygn8wjl"; - name = "klines-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/klines-21.08.0.tar.xz"; + sha256 = "0f4281cynn1zacfpq5i6n5vwps9d1k7i6mqpzwx8jrxmwka39r1y"; + name = "klines-21.08.0.tar.xz"; }; }; kmag = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmag-21.04.0.tar.xz"; - sha256 = "06yw7397v5wcdx4jxpyc2mxgbxr744wgnqm7w2xb4771izlwq3qy"; - name = "kmag-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmag-21.08.0.tar.xz"; + sha256 = "148frh2qq1yxixcpr0s8kvcviz8qh7vjvyp2w0v30m9lr01asm0s"; + name = "kmag-21.08.0.tar.xz"; }; }; kmahjongg = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmahjongg-21.04.0.tar.xz"; - sha256 = "0w4fpnafn9vir8c6ha6kl1x8vbmvmjax0p1qzxa7596hf3lvcncq"; - name = "kmahjongg-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmahjongg-21.08.0.tar.xz"; + sha256 = "04mr9i0dwy1rypr22wlv3lcg73zz1yy373pb1vv914b3spps9pip"; + name = "kmahjongg-21.08.0.tar.xz"; }; }; kmail = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmail-21.04.0.tar.xz"; - sha256 = "11ghi1bqc8ldsb04z7fs5ba9b9fvsmcxxjp8j837iv0qz5rwh0fw"; - name = "kmail-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmail-21.08.0.tar.xz"; + sha256 = "1jnlgl5hdw4dx36wd5642x484dka1094d9xq0wn7iqpzlyh8d519"; + name = "kmail-21.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmail-account-wizard-21.04.0.tar.xz"; - sha256 = "0jalwjk5jyih765i7cpa0qidw3di17cz1fygmzgdz1v6kasg3h0c"; - name = "kmail-account-wizard-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmail-account-wizard-21.08.0.tar.xz"; + sha256 = "14sxx25xijp9r53001kywbbaidsni1sslk4mi1pi71rwi4mvmm2w"; + name = "kmail-account-wizard-21.08.0.tar.xz"; }; }; kmailtransport = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmailtransport-21.04.0.tar.xz"; - sha256 = "1jgw93q8jpgkg8ms7pjral1wz1ycs12ikjnsw2fiybd67syd2dns"; - name = "kmailtransport-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmailtransport-21.08.0.tar.xz"; + sha256 = "1xijhf37djscjm86r3m1f64w97q24plpv06h55mqq4pgxkm6v0a9"; + name = "kmailtransport-21.08.0.tar.xz"; }; }; kmbox = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmbox-21.04.0.tar.xz"; - sha256 = "01p1ihr08dnmzsq22ipy06grnz59nxyc2vfqbh6hc949mhl3kwx4"; - name = "kmbox-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmbox-21.08.0.tar.xz"; + sha256 = "1xa4g2cj5chmmhsw6larbmwr0k0n07mj7953w1qm5wi1jfr2ivca"; + name = "kmbox-21.08.0.tar.xz"; }; }; kmime = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmime-21.04.0.tar.xz"; - sha256 = "096vbbr8qnwcws7c6llxwk0klbfrhh4k83384bkhw5m5xawnqaq4"; - name = "kmime-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmime-21.08.0.tar.xz"; + sha256 = "19g9l5bl6gm4rx133nlsv6p4kpa1pifk24rqx7f2rv5j7by8jmxh"; + name = "kmime-21.08.0.tar.xz"; }; }; kmines = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmines-21.04.0.tar.xz"; - sha256 = "08dynl219n0jd58i01ccmgphc03z2x143l0a8v11x0m5cfazvzpp"; - name = "kmines-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmines-21.08.0.tar.xz"; + sha256 = "1v4hl4kqwgrdkjj1lsa5z6bvlq8xhldp2pwldzvg05c1r7lbvnw1"; + name = "kmines-21.08.0.tar.xz"; }; }; kmix = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmix-21.04.0.tar.xz"; - sha256 = "1s2cnbmpkchp1wc5217r17ramj7a8xrm4l9hb74lyw4fc78455z2"; - name = "kmix-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmix-21.08.0.tar.xz"; + sha256 = "1bdp2vasbw2qrsajqlpd5w1403n291w43dfms46fgw8vw5wpi5qq"; + name = "kmix-21.08.0.tar.xz"; }; }; kmousetool = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmousetool-21.04.0.tar.xz"; - sha256 = "0iaqgflnyl62ynxcip8zbxm25hgr82yc9d3z5v36mv0q3lq4bi92"; - name = "kmousetool-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmousetool-21.08.0.tar.xz"; + sha256 = "1rz44gwjikckpjms4v4hsakll2dy0imrsgdvk2zsr9nr00lgbn0v"; + name = "kmousetool-21.08.0.tar.xz"; }; }; kmouth = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmouth-21.04.0.tar.xz"; - sha256 = "0sza7arw0nfga6g9fv7rbkgkxmn694awzhkjbklafdvcjyn3dw2v"; - name = "kmouth-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmouth-21.08.0.tar.xz"; + sha256 = "0i8bg49y4x9bwacmq0hk8az88r2q54bgnzxbd1rscd5nkqs21fr1"; + name = "kmouth-21.08.0.tar.xz"; }; }; kmplot = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmplot-21.04.0.tar.xz"; - sha256 = "1wpz5kb06ym920ghmrfb0jh6z4nadlb7d9z0l85vkm3y1rz0iisy"; - name = "kmplot-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kmplot-21.08.0.tar.xz"; + sha256 = "1szskpbql3s10b64na55rnys2gz05gssvydbsiqxkwyj4igs91yv"; + name = "kmplot-21.08.0.tar.xz"; }; }; knavalbattle = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/knavalbattle-21.04.0.tar.xz"; - sha256 = "0xn7mkmcr4p6c8kdcdxk7k9ifv12l0fflg2nkgmr1gbjxkpyy435"; - name = "knavalbattle-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/knavalbattle-21.08.0.tar.xz"; + sha256 = "1f8byp909306ksvbdjs662k7ahyf5sjg3gsv3qay0d36kzlp8274"; + name = "knavalbattle-21.08.0.tar.xz"; }; }; knetwalk = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/knetwalk-21.04.0.tar.xz"; - sha256 = "127s5fgjpcndgbg30wd9sv3jrskq7ib4rnrw5qdfsxv8c77kv74m"; - name = "knetwalk-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/knetwalk-21.08.0.tar.xz"; + sha256 = "0djdshqq35mpbdqn10acaxn3irwagh3q6zvc6sfsc2cs7nihaff2"; + name = "knetwalk-21.08.0.tar.xz"; }; }; knights = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/knights-21.04.0.tar.xz"; - sha256 = "09w3qqvp5k8z3bfwz6zlclagn11j1nar0bp2sgnjmi9cy2rs74n3"; - name = "knights-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/knights-21.08.0.tar.xz"; + sha256 = "1hq9vm67cgdjqmy41hk2hf6x0z4gqmrzyz8sfd1ja5j03yisjv4h"; + name = "knights-21.08.0.tar.xz"; }; }; knotes = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/knotes-21.04.0.tar.xz"; - sha256 = "0zy10amznrkbj663h0b5a410ry65kh1sw2k9ra43zx45bpamh62q"; - name = "knotes-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/knotes-21.08.0.tar.xz"; + sha256 = "0p2jvvm2i66aib0ajlr2jynsyf7gzqhn18rxpp4mg95lqzsmvdlf"; + name = "knotes-21.08.0.tar.xz"; }; }; kolf = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kolf-21.04.0.tar.xz"; - sha256 = "0220b4mbphb7c7p3szhi976dx8ln0f64ghika7b9x2cmdxcizfcq"; - name = "kolf-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kolf-21.08.0.tar.xz"; + sha256 = "1p2sgfkrlcm125y461kdf5rf5i6x89z3i3kad375agl6wnlnkvr7"; + name = "kolf-21.08.0.tar.xz"; }; }; kollision = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kollision-21.04.0.tar.xz"; - sha256 = "0cfn7l4ccl26rqm9i8rqp07yx6jc12xqhm16pgamrf8qv40vch9f"; - name = "kollision-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kollision-21.08.0.tar.xz"; + sha256 = "1vs298nigl6rnp14xrlsp50gmca77bah149k94mxqq86f0gfin7s"; + name = "kollision-21.08.0.tar.xz"; }; }; kolourpaint = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kolourpaint-21.04.0.tar.xz"; - sha256 = "0xp1kas6hk279aqm5g36qlsylpd43p9pv6vdk2dy4cilds4fc3vw"; - name = "kolourpaint-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kolourpaint-21.08.0.tar.xz"; + sha256 = "0n6fid327m864sp8sa7ms0l559fhxj7ikp5yn6pfm86xl6ks8bfz"; + name = "kolourpaint-21.08.0.tar.xz"; }; }; kompare = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kompare-21.04.0.tar.xz"; - sha256 = "17p1i4gfgzbps60zq3svicp6yz6w33wvcp145lq1iqkj80pf5qyf"; - name = "kompare-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kompare-21.08.0.tar.xz"; + sha256 = "1m079gqqzfsawixsq0spi7lyg0ad9vm3mhddzbmnbg2mn250nbkb"; + name = "kompare-21.08.0.tar.xz"; }; }; konqueror = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/konqueror-21.04.0.tar.xz"; - sha256 = "04mli5dv05v7fin58zrhm7jmddj8qa2qz7w3qdbjd3a4iz7y7z71"; - name = "konqueror-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/konqueror-21.08.0.tar.xz"; + sha256 = "0jlnw7j6p1svx3af95drdfrczqvikz4krq3gmmq3r62gp5bk3yyf"; + name = "konqueror-21.08.0.tar.xz"; }; }; konquest = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/konquest-21.04.0.tar.xz"; - sha256 = "1ryh7d3ndvrw8vjaraxyzyw08sx9w4yny7hdj1ss7319y041a07s"; - name = "konquest-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/konquest-21.08.0.tar.xz"; + sha256 = "0l128pr04qq6jdja6p0bbzc6y1233gd2h3wvbwh7hml4vxl8fsbh"; + name = "konquest-21.08.0.tar.xz"; }; }; konsole = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/konsole-21.04.0.tar.xz"; - sha256 = "1dlr0w77sccibhp37xi49bi6g4679fymgziznqxjvhk5l141f2i6"; - name = "konsole-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/konsole-21.08.0.tar.xz"; + sha256 = "1gxy98wg2qfylqslg3ga3prk54knrik1rhzs7lsmmr73vym1dpav"; + name = "konsole-21.08.0.tar.xz"; }; }; kontact = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kontact-21.04.0.tar.xz"; - sha256 = "08d1837kkcqc8gp9hmd351yymjdl31vg6nk1vcrlb7xsndqcsb79"; - name = "kontact-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kontact-21.08.0.tar.xz"; + sha256 = "1bdvji09nimgpdlz6nk7dbr22agnsrpra7r8jz81a0cjqspcmmsi"; + name = "kontact-21.08.0.tar.xz"; }; }; kontactinterface = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kontactinterface-21.04.0.tar.xz"; - sha256 = "1h4v7jz4d5nl23fyjz946qszmidvdkayhsb1ffzk53bv8wpjh76m"; - name = "kontactinterface-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kontactinterface-21.08.0.tar.xz"; + sha256 = "1gl99624yhafwc1nw5if0a2k2v25s3rl4ak35c8af8mba54niy5z"; + name = "kontactinterface-21.08.0.tar.xz"; }; }; kontrast = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kontrast-21.04.0.tar.xz"; - sha256 = "1bjkmhal9prizv1dlz8gdlki096a8d09bwksc0xxq3kml1r5gmfm"; - name = "kontrast-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kontrast-21.08.0.tar.xz"; + sha256 = "000bmbgp43znmqxxb33ik11lri1x44jcdyzd8cxlh8frwv96hd9x"; + name = "kontrast-21.08.0.tar.xz"; }; }; konversation = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/konversation-21.04.0.tar.xz"; - sha256 = "1fq4w0awg2xj6f7ivvpqrcch68ss01vnh0diwagryhrb0g0a37n7"; - name = "konversation-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/konversation-21.08.0.tar.xz"; + sha256 = "162rdh9cz417b6zc5217gp53vwsny3i7r0s14cpvrmfl141isrg8"; + name = "konversation-21.08.0.tar.xz"; }; }; kopeninghours = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kopeninghours-21.04.0.tar.xz"; - sha256 = "11gkri2sk1dz4hndpid4c84pxkdzc1fdpzw8h2x0141njl62421c"; - name = "kopeninghours-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kopeninghours-21.08.0.tar.xz"; + sha256 = "1abyq50pa8qzsvgawbas4mn64g3p8jz7cbz5fb6mzy8546sm11yv"; + name = "kopeninghours-21.08.0.tar.xz"; }; }; kopete = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kopete-21.04.0.tar.xz"; - sha256 = "14ypdl4xy4izg14nbdczif5i8q5kjly5gnyz032iy0cgnkarhi4q"; - name = "kopete-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kopete-21.08.0.tar.xz"; + sha256 = "11zngca7wyfzbv0bw1f3qw1gvi5234m2ybkh5sznhrd3w1jadqgl"; + name = "kopete-21.08.0.tar.xz"; }; }; korganizer = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/korganizer-21.04.0.tar.xz"; - sha256 = "0znbwnzn35q4fdlj9n7hdqvq9rz3g8dyan9v1z9rh11cmdn4pc6h"; - name = "korganizer-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/korganizer-21.08.0.tar.xz"; + sha256 = "1d5zilr1qsgfwvzc61pmbn8w8gv4a6i5i1slbdaps6wkr4bb0z7m"; + name = "korganizer-21.08.0.tar.xz"; }; }; kosmindoormap = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kosmindoormap-21.04.0.tar.xz"; - sha256 = "1c31f7b79xq9sxmfqxfs3082yrbqwkmw02brja8dg1h2avn0r3cy"; - name = "kosmindoormap-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kosmindoormap-21.08.0.tar.xz"; + sha256 = "1lbywi76mwvljxp7n6gyhgfl4772cdfa5sphxhbf1klyvhryl797"; + name = "kosmindoormap-21.08.0.tar.xz"; }; }; kpat = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpat-21.04.0.tar.xz"; - sha256 = "043apdv55kc8d2dih65vb4fkwmaqybz167z0g5nfrrg0ilnqhifn"; - name = "kpat-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kpat-21.08.0.tar.xz"; + sha256 = "1wpsxz2fwjl92yl4a0npksdbhd9b3gfvh9giyr2p0gwfxrwwdq3z"; + name = "kpat-21.08.0.tar.xz"; }; }; kpimtextedit = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpimtextedit-21.04.0.tar.xz"; - sha256 = "1acj6w164xg3v1svzlf4qa10kkzbhlnzrl4cp0brak81gal7bnrp"; - name = "kpimtextedit-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kpimtextedit-21.08.0.tar.xz"; + sha256 = "1s20s5njmrbn5sa4vx74aivrphnypzd133j6n58xqbjza7zm0sgj"; + name = "kpimtextedit-21.08.0.tar.xz"; }; }; kpkpass = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpkpass-21.04.0.tar.xz"; - sha256 = "0s1f9j3n3ki71kzi8zw95q4v8y3dcgi5cnpq5rk03qb69yqf45xi"; - name = "kpkpass-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kpkpass-21.08.0.tar.xz"; + sha256 = "058kk3rfklfmw949wix0rv10q8094xq30vxyrglll96pxk2rj22h"; + name = "kpkpass-21.08.0.tar.xz"; }; }; kpmcore = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpmcore-21.04.0.tar.xz"; - sha256 = "0cb71d0w2jhbpm0da9rzn484930c022gxn2m4y9bgimaz0cgzcp7"; - name = "kpmcore-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kpmcore-21.08.0.tar.xz"; + sha256 = "0l9aqm07203r2q74g6pnzhgwqhccr38qn89zb80p683bqi3chdd1"; + name = "kpmcore-21.08.0.tar.xz"; }; }; kpublictransport = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpublictransport-21.04.0.tar.xz"; - sha256 = "18zmsq9585d8sx6qvcfw6wb183nzga9l0b6mm06cl89bwpr2bdbb"; - name = "kpublictransport-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kpublictransport-21.08.0.tar.xz"; + sha256 = "1bfyr509z27gz59ykar0png1gghbna6minl987hxyiys76pchrd2"; + name = "kpublictransport-21.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kqtquickcharts-21.04.0.tar.xz"; - sha256 = "09lw31sx93gw3s6hmwi0xaxyjnfx2nhij8iayam1sg644vx9a7ws"; - name = "kqtquickcharts-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kqtquickcharts-21.08.0.tar.xz"; + sha256 = "1x4bxqpnmyq6cvg7j6dbk0y7nbhjkrrldw9spxa72lx914bpd6np"; + name = "kqtquickcharts-21.08.0.tar.xz"; }; }; krdc = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/krdc-21.04.0.tar.xz"; - sha256 = "08iqydss6lyc6823762fq1p5c1hs7hv2crwv609gw97cvxvc8ww1"; - name = "krdc-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/krdc-21.08.0.tar.xz"; + sha256 = "0ja1x3i91wiw0v8qfd6fig56bqhpbfg2hhhl1bh8bqxm77q3qq9h"; + name = "krdc-21.08.0.tar.xz"; }; }; kreversi = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kreversi-21.04.0.tar.xz"; - sha256 = "02zk0bwjmhgpk7fbvzwxap0xda2vxfyfjy38zagm5wgpgd4acsj4"; - name = "kreversi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kreversi-21.08.0.tar.xz"; + sha256 = "1122ybggnmkhb0lx934a2dka24gbfif0dmcg5qgzsbhvmc3am0cp"; + name = "kreversi-21.08.0.tar.xz"; }; }; krfb = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/krfb-21.04.0.tar.xz"; - sha256 = "0vjf10fg8nqbc7dr19i1hlqpgi1z2bcm1zrpf2rs85fi4pxrw7lg"; - name = "krfb-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/krfb-21.08.0.tar.xz"; + sha256 = "14l5h04g3k51jsphzl4yq4kd8d2s3wfh7dq4i099gw6r04divipb"; + name = "krfb-21.08.0.tar.xz"; }; }; kross-interpreters = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kross-interpreters-21.04.0.tar.xz"; - sha256 = "1203gmm6pcv37k2m3yah1qgazja8qxkn18dqxmnw7fj3903mqxjw"; - name = "kross-interpreters-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kross-interpreters-21.08.0.tar.xz"; + sha256 = "1vnfd96sjb20jifh5pvnd752ycq3m8p8kl7rmwv5s9lvmdiw14s2"; + name = "kross-interpreters-21.08.0.tar.xz"; }; }; kruler = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kruler-21.04.0.tar.xz"; - sha256 = "0yrpkb755g2xy329336dl9yarl6dhcj5cwgv1sy75w1k3gibsz5y"; - name = "kruler-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kruler-21.08.0.tar.xz"; + sha256 = "1bz7b3m46mlibf2gai6is68119w8gphal7idz4wi3rlwl2lfbmm4"; + name = "kruler-21.08.0.tar.xz"; }; }; kshisen = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kshisen-21.04.0.tar.xz"; - sha256 = "087vynb6gr3l2291nvxcdk27ib10063fyhhxa7ibvfw68j612fri"; - name = "kshisen-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kshisen-21.08.0.tar.xz"; + sha256 = "1m9fhd2hk9pi5297hj1a36m1sl8c959a3mx1fc36va7yi0m8vxly"; + name = "kshisen-21.08.0.tar.xz"; }; }; ksirk = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksirk-21.04.0.tar.xz"; - sha256 = "1qrgkzgm7vnjz6mk7gqkxkx6i7p1dfnlw8fhxa6h1ihvgfmxr6kr"; - name = "ksirk-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ksirk-21.08.0.tar.xz"; + sha256 = "0vqg4gz67p00p3rrrv7mw2aiy9lcahkzrhz69xki96vfzcbpxw4r"; + name = "ksirk-21.08.0.tar.xz"; }; }; ksmtp = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksmtp-21.04.0.tar.xz"; - sha256 = "0mn4ciyg0c8rxbcc3d99slm03jbca7b6gaplh8zz54p2krf86my5"; - name = "ksmtp-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ksmtp-21.08.0.tar.xz"; + sha256 = "1imm692nkgxa5bhhxqvd4mc6n8ajigjbmm6crpsciwi1gm84fx0b"; + name = "ksmtp-21.08.0.tar.xz"; }; }; ksnakeduel = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksnakeduel-21.04.0.tar.xz"; - sha256 = "1s3k4k2a27rfp300bgxm1qhsg0dnlz72ip3csdixkidwcig7v017"; - name = "ksnakeduel-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ksnakeduel-21.08.0.tar.xz"; + sha256 = "14hp1vqw9bk3lavv02y9xxmpgv1g9cvz113900j924c5xsjkp4mi"; + name = "ksnakeduel-21.08.0.tar.xz"; }; }; kspaceduel = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kspaceduel-21.04.0.tar.xz"; - sha256 = "0acgmh4blmp2vmzqnxvphixbjmfv12al99hxwv1iavdfyl88yfqz"; - name = "kspaceduel-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kspaceduel-21.08.0.tar.xz"; + sha256 = "1aa2cx06x5kq3ni5ikgjvar0rmz4csi231hvhgjhsnj18ilk0bxh"; + name = "kspaceduel-21.08.0.tar.xz"; }; }; ksquares = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksquares-21.04.0.tar.xz"; - sha256 = "1y23c86qz1qcmjzfsrj974c4ccai4rrp7ajmwxi7wgzgzwypflir"; - name = "ksquares-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ksquares-21.08.0.tar.xz"; + sha256 = "1715l0j79n6nrjgg0fib17yv8rhjbnivmcgs8fg4iw49c3k5s7nc"; + name = "ksquares-21.08.0.tar.xz"; }; }; ksudoku = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksudoku-21.04.0.tar.xz"; - sha256 = "0r6m6jpjpz759gq40bxh5n7lg89gn2kfmiik2i06d1slz9v54iv0"; - name = "ksudoku-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ksudoku-21.08.0.tar.xz"; + sha256 = "1p878yglczah0fdmmmcys46x07r2d78fx5f54z1yd8vhaf8bxmxj"; + name = "ksudoku-21.08.0.tar.xz"; }; }; ksystemlog = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksystemlog-21.04.0.tar.xz"; - sha256 = "06az8kfsp468hr3xzcfbra81xbfv12w2jzhd4n2cirsi6k8vhx14"; - name = "ksystemlog-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ksystemlog-21.08.0.tar.xz"; + sha256 = "18jlwmk9aynhcnkgflky20b6mphzaxxvcicmpv58sp4q92fgwgab"; + name = "ksystemlog-21.08.0.tar.xz"; }; }; kteatime = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kteatime-21.04.0.tar.xz"; - sha256 = "1zk7gbdsxyw59lfr0r2nnxm08jjls0zcp7wqkm4sq2gyczs73vy5"; - name = "kteatime-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kteatime-21.08.0.tar.xz"; + sha256 = "0imm902b19g2miyhwliryjyiyygsdsilk2b3biyvjlqp037sfrr4"; + name = "kteatime-21.08.0.tar.xz"; }; }; ktimer = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktimer-21.04.0.tar.xz"; - sha256 = "0czwbd0id7a9w8wwpfsv2s06xc9my996bcdj0bn37091yik1wqzr"; - name = "ktimer-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktimer-21.08.0.tar.xz"; + sha256 = "05pka16za7dbpbhsss0mcm2h6rxzd7sp7wlly2ds9azdkwqzdjkh"; + name = "ktimer-21.08.0.tar.xz"; }; }; ktnef = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktnef-21.04.0.tar.xz"; - sha256 = "0zs0bfb2g7rxcxc7ngjzszrcnj9qarpnig7b29xcrmnsxppa9z8y"; - name = "ktnef-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktnef-21.08.0.tar.xz"; + sha256 = "0zp03pbry6qkcanbjj5qscja9i97f7gsssmn40swnfbd45ja2z6l"; + name = "ktnef-21.08.0.tar.xz"; }; }; ktorrent = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktorrent-21.04.0.tar.xz"; - sha256 = "0f28iyb2mrin2n5f6msxib9lh38qxid1sz5p5dq1g703gyqgr345"; - name = "ktorrent-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktorrent-21.08.0.tar.xz"; + sha256 = "1wqf6vvl1wyw8b6xzl91pry1mzjj9lpflnp4rinr9jsxfrf88c4x"; + name = "ktorrent-21.08.0.tar.xz"; }; }; ktouch = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktouch-21.04.0.tar.xz"; - sha256 = "0f46dsjcgqqg1f24sl3za624h5kpynqdi480hnc0fc6yaf3nm2mm"; - name = "ktouch-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktouch-21.08.0.tar.xz"; + sha256 = "0zwf5q5h9qacygp9gzyj0s2y2sd3j2y5sm2rc6z3bn4jcv03bjxf"; + name = "ktouch-21.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-accounts-kcm-21.04.0.tar.xz"; - sha256 = "1vvnk9nfq4z3m73yr59y65v0nvqwn4xjx6lrm754dnqr6vldv01p"; - name = "ktp-accounts-kcm-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-accounts-kcm-21.08.0.tar.xz"; + sha256 = "0qs3izsffkjyafxxq7mrhcw487zrl9vvdv75gdahc8bq6hni60q9"; + name = "ktp-accounts-kcm-21.08.0.tar.xz"; }; }; ktp-approver = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-approver-21.04.0.tar.xz"; - sha256 = "0j407a3bfmi4gn5v3gfazfidyp1kxn4vbs40xm5pkgxr4ykvzqj5"; - name = "ktp-approver-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-approver-21.08.0.tar.xz"; + sha256 = "177hz0fwpqxg65cw5d51hzqsb5ipp3vm513zdc6ac1bxjb6pd725"; + name = "ktp-approver-21.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-auth-handler-21.04.0.tar.xz"; - sha256 = "1lqjb3mawdvwrx7b2q2f3kr132shbgs9lvlzdn450pn9cn1c4z7i"; - name = "ktp-auth-handler-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-auth-handler-21.08.0.tar.xz"; + sha256 = "1wg4vcix56ws1mq7611h1kqcxk8dfb5fw57m9wn2q0ikzs9ymav7"; + name = "ktp-auth-handler-21.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-call-ui-21.04.0.tar.xz"; - sha256 = "1f2rzm5jfw12b6v2yfzjs152sq2ak3k7zk3nwipyiy86n0f25yqp"; - name = "ktp-call-ui-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-call-ui-21.08.0.tar.xz"; + sha256 = "1mgbhkd9ph411h95xyajx6cqsjjf1m52frxw88agv5q6cymx2iz1"; + name = "ktp-call-ui-21.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-common-internals-21.04.0.tar.xz"; - sha256 = "0j3fnvyln6w7m3z416blpvrk1bpcbd5403h6pyjyq3dsvswzd21x"; - name = "ktp-common-internals-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-common-internals-21.08.0.tar.xz"; + sha256 = "16ivfv65q06gxf01zzswy77f8aqdnjm7jycz812xa07h5xqxj4az"; + name = "ktp-common-internals-21.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-contact-list-21.04.0.tar.xz"; - sha256 = "1bym3sf3szmgi3nbczlilcazkjd1jfy7v0p0c3844c33fid6ln4q"; - name = "ktp-contact-list-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-contact-list-21.08.0.tar.xz"; + sha256 = "1pwql0g5bz5h59wc4nay85c74vic3yk0vc7wx8z6namjcw5sl6n8"; + name = "ktp-contact-list-21.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-contact-runner-21.04.0.tar.xz"; - sha256 = "1afcsc8bfvyqy9y32a73x01xar50g48q9jbvnsggmjb20qbgk6fz"; - name = "ktp-contact-runner-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-contact-runner-21.08.0.tar.xz"; + sha256 = "1wv21ybzk0nvabjrbnvc6yg4mfdxw368x5zxhrffirv58lyqclxs"; + name = "ktp-contact-runner-21.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-desktop-applets-21.04.0.tar.xz"; - sha256 = "1achgl8prdl33hw73nfjcm0djxzf9xy76n365kqzfz757fvy025w"; - name = "ktp-desktop-applets-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-desktop-applets-21.08.0.tar.xz"; + sha256 = "1wzjxd4xndpcixlhv636m9gis1clqhf9cksapxgk6sn31mamqxia"; + name = "ktp-desktop-applets-21.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-filetransfer-handler-21.04.0.tar.xz"; - sha256 = "0mhvx3x4mf9b1mmn901995107ixz9qd80ydx468k30w13k8hwjpg"; - name = "ktp-filetransfer-handler-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-filetransfer-handler-21.08.0.tar.xz"; + sha256 = "0zvfhwa70jiiv9xf405263h9mr2zap1fpplgyfrz5r2lsidga5r8"; + name = "ktp-filetransfer-handler-21.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-kded-module-21.04.0.tar.xz"; - sha256 = "1d3rpbqks6x6bv12mzpd6g5x2h35hf4xfx871i23pq7p2n4nna8f"; - name = "ktp-kded-module-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-kded-module-21.08.0.tar.xz"; + sha256 = "17k94bwmv547xks6206x89h014r4gxkd2gj3wry3xm3g1z27w7bn"; + name = "ktp-kded-module-21.08.0.tar.xz"; }; }; ktp-send-file = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-send-file-21.04.0.tar.xz"; - sha256 = "1lyshgan77cia7cnirjfyg0hw0wgazjw9z21ig0czs3hr6qqf277"; - name = "ktp-send-file-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-send-file-21.08.0.tar.xz"; + sha256 = "0hk85ydzhlqfinj3ggy5kxvs242kkwbvlh5jz0hh3bi88rdw13px"; + name = "ktp-send-file-21.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-text-ui-21.04.0.tar.xz"; - sha256 = "04k2m4f873hz783szmkgpc0y6mjpwld5z3xcbdqippfzcdn4hg0v"; - name = "ktp-text-ui-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktp-text-ui-21.08.0.tar.xz"; + sha256 = "0zv736zrz5mkvbzgbkm9hq8sp6qnqkg58nyd76xfqq54svgcpi71"; + name = "ktp-text-ui-21.08.0.tar.xz"; }; }; ktuberling = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktuberling-21.04.0.tar.xz"; - sha256 = "14yg3pghm4l3qgpi1i5zicjyak62w2ci4b36914kn5b3yfxh132i"; - name = "ktuberling-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/ktuberling-21.08.0.tar.xz"; + sha256 = "15sjqskzni5jhvr77b794mia3v00rmzgxvzqaqbwkhy6ax1gihda"; + name = "ktuberling-21.08.0.tar.xz"; }; }; kturtle = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kturtle-21.04.0.tar.xz"; - sha256 = "1l8drllf7a1d3zra23ysyli8jl6xgl3xciqfkhc1fxhdkncx24cd"; - name = "kturtle-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kturtle-21.08.0.tar.xz"; + sha256 = "07japzwhfhb5gbm8ac4acvq4k2xqhlz6sl11qjb9j9scmz77y66f"; + name = "kturtle-21.08.0.tar.xz"; }; }; kubrick = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kubrick-21.04.0.tar.xz"; - sha256 = "0m8ps0yxqijshgx09cypzd3l1n0zlrqcrkjcd725zwxarpm0z0hk"; - name = "kubrick-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kubrick-21.08.0.tar.xz"; + sha256 = "0lk4qfg0fzfhs796csqvniinlyljd4iz9x1l884b1pz2savrfq05"; + name = "kubrick-21.08.0.tar.xz"; }; }; kwalletmanager = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kwalletmanager-21.04.0.tar.xz"; - sha256 = "1rh7xdwn0kdw8j936asxy8llar144144xgvp7sjlpi5y93ayf8vk"; - name = "kwalletmanager-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kwalletmanager-21.08.0.tar.xz"; + sha256 = "0qwrlm0ay04gn9k752pixykiz2dvqaxybfgahahlqf2j2l5w18kh"; + name = "kwalletmanager-21.08.0.tar.xz"; }; }; kwave = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kwave-21.04.0.tar.xz"; - sha256 = "1wy6sxmf9pk2677xdsbpgy01p284rzqwiyzm1hr971xbra5h4k6i"; - name = "kwave-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kwave-21.08.0.tar.xz"; + sha256 = "0pi7ycxnl5dacw5qmig1v3xy69a6c0x3hdk4bpw19avx9asgfjq7"; + name = "kwave-21.08.0.tar.xz"; }; }; kwordquiz = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kwordquiz-21.04.0.tar.xz"; - sha256 = "0wnihn75yvhz2j310vr806vkbfywhr26wny07fpbzcishyjb89vi"; - name = "kwordquiz-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/kwordquiz-21.08.0.tar.xz"; + sha256 = "1ms8scxg14s4s35xcgacryfwyadvfyzsv1alkipv87x75qsbjzjm"; + name = "kwordquiz-21.08.0.tar.xz"; }; }; libgravatar = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libgravatar-21.04.0.tar.xz"; - sha256 = "0li6p9df000bmkqgmwiix7ab4sah05r1n4gm109jjglh0a41bfvr"; - name = "libgravatar-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libgravatar-21.08.0.tar.xz"; + sha256 = "10nqv5f3hanhljld8rpkxaqvr892sj1v2vfx43i52xhg6pbxdd5n"; + name = "libgravatar-21.08.0.tar.xz"; }; }; libkcddb = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkcddb-21.04.0.tar.xz"; - sha256 = "1fzbhn0rnlmxdglfb48f4f3ddagkgny2665mgv8gdbcq3vg62zwr"; - name = "libkcddb-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkcddb-21.08.0.tar.xz"; + sha256 = "006z9m4lwgk0ick5blx00mndw5m04l6ayb9nmd7fswd4ql3qqcpv"; + name = "libkcddb-21.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkcompactdisc-21.04.0.tar.xz"; - sha256 = "1skaic0vfspdkv0q574ia4jszq1a5smf4s9ls4flfk5qxmkv6862"; - name = "libkcompactdisc-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkcompactdisc-21.08.0.tar.xz"; + sha256 = "0fgcr6gr4di5spw9dm6yz90s16jv2zmdpgpvhxbscirn7mf1b4is"; + name = "libkcompactdisc-21.08.0.tar.xz"; }; }; libkdcraw = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkdcraw-21.04.0.tar.xz"; - sha256 = "1ir6m61yb8f0ic39jxxnzjd9jjkb0ksln3fkls5v0af6g546bgab"; - name = "libkdcraw-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkdcraw-21.08.0.tar.xz"; + sha256 = "176wp24ij2kciggjnffcamgk4y6h59cwabwwxvli32i3l3ll8wlc"; + name = "libkdcraw-21.08.0.tar.xz"; }; }; libkdegames = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkdegames-21.04.0.tar.xz"; - sha256 = "1q0m4kq32gsllxz8vx0qj9qii5y2lbd6wclwlykhayx1fcncwrj7"; - name = "libkdegames-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkdegames-21.08.0.tar.xz"; + sha256 = "0nbimjv8sanwn3is9d357ic8zy0dpdr3g3qsipzapzlchpigjm9b"; + name = "libkdegames-21.08.0.tar.xz"; }; }; libkdepim = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkdepim-21.04.0.tar.xz"; - sha256 = "1ai5l9qcjnpwndvv744sx85b0yyg4wz01r0v9b0b62zwx8i35clb"; - name = "libkdepim-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkdepim-21.08.0.tar.xz"; + sha256 = "1gxyzq7lgswfrkxsfqf5y4vwx2ji3wz7vyzkg5gpygr1an6c2sp3"; + name = "libkdepim-21.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkeduvocdocument-21.04.0.tar.xz"; - sha256 = "0264i01w44fjdh14psmw8ynmb8vzkw94lqqff1ia8bw5n0ihr914"; - name = "libkeduvocdocument-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkeduvocdocument-21.08.0.tar.xz"; + sha256 = "1nm07fdaas7jn3yfds7k22n6xl9c8wdi6bjrf8blbycj6fflciwd"; + name = "libkeduvocdocument-21.08.0.tar.xz"; }; }; libkexiv2 = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkexiv2-21.04.0.tar.xz"; - sha256 = "0grhibpq47yba9mjdhr1p0sbw62vxsrwfydi5ybpa8fjgvbbbprr"; - name = "libkexiv2-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkexiv2-21.08.0.tar.xz"; + sha256 = "0mb5qj4n2fcwak36an4yslffvlhj6f2qfv5vdl2cid8c34ikvqll"; + name = "libkexiv2-21.08.0.tar.xz"; }; }; libkgapi = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkgapi-21.04.0.tar.xz"; - sha256 = "1x811g0mbgjz8spngdsqdxfhkyic9kqxkhx9nq592zihaqkl3ifz"; - name = "libkgapi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkgapi-21.08.0.tar.xz"; + sha256 = "0f2yk75a0gr7hah32fmn35lk0illviswfhlh0nw6ignfx56q7f3r"; + name = "libkgapi-21.08.0.tar.xz"; }; }; libkipi = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkipi-21.04.0.tar.xz"; - sha256 = "0gk8bfhq1z9f82mnjm2xjabgxn0qjrabw53bb67lwvrrgaliliqb"; - name = "libkipi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkipi-21.08.0.tar.xz"; + sha256 = "0831x76w413azciabm6l83nrwpiivq5pjqxcl3yzhs2hq1i1wd06"; + name = "libkipi-21.08.0.tar.xz"; }; }; libkleo = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkleo-21.04.0.tar.xz"; - sha256 = "073ghnw1s09fvai22ag37n20mmhkbl4gp4y58nbgw43gfy5gsv6z"; - name = "libkleo-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkleo-21.08.0.tar.xz"; + sha256 = "14i65vh0c39z0d65kgqn2apcfi5x3vxrxp2ybc4ccc4sxh033akp"; + name = "libkleo-21.08.0.tar.xz"; }; }; libkmahjongg = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkmahjongg-21.04.0.tar.xz"; - sha256 = "1n2jswdvpvc9jcqsvqf0nniaf893432v123my2q6msk2zvss6pcb"; - name = "libkmahjongg-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkmahjongg-21.08.0.tar.xz"; + sha256 = "18syxfszfvq1h0l5fbgy599ak2pgp4mj4i949kyv4v6qdwwv9mhi"; + name = "libkmahjongg-21.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkomparediff2-21.04.0.tar.xz"; - sha256 = "13kpaasyhrhhrgk8a5qg9qv65wdv6qvnz2gjbjv8qgp4k4jmwv7h"; - name = "libkomparediff2-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libkomparediff2-21.08.0.tar.xz"; + sha256 = "0b5yhhvnipbwzn2sylh45ispslrw3w68y9xnrxrjwb0ydmq5zqyb"; + name = "libkomparediff2-21.08.0.tar.xz"; }; }; libksane = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libksane-21.04.0.tar.xz"; - sha256 = "17a5i21h99qvv8sig7xh5n149ji8fqch5m0w6fqirrwf0iz66363"; - name = "libksane-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libksane-21.08.0.tar.xz"; + sha256 = "0i2vr95hi776rqljjjh14d3p5zhcbnjx0b3n94x7m4jq5k2wqpqs"; + name = "libksane-21.08.0.tar.xz"; }; }; libksieve = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libksieve-21.04.0.tar.xz"; - sha256 = "04zyiqmkr78rnilv5zmmbr09k1nycgpc3qw3a9qy4xzh5amkl8wl"; - name = "libksieve-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libksieve-21.08.0.tar.xz"; + sha256 = "0r35153l0kgmw5gvspvqlna6ramggz7p055rbpz60xz9hxfkz3d7"; + name = "libksieve-21.08.0.tar.xz"; }; }; libktorrent = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libktorrent-21.04.0.tar.xz"; - sha256 = "0c8hbsk2vjkmdvnws4kaa9bylzyzmx12fxm354qm65n4j6pdd59v"; - name = "libktorrent-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/libktorrent-21.08.0.tar.xz"; + sha256 = "12x7h0wrxdcpyd4mblbv64swxlcc8vc5k4nlzmag4nzdmgrb7c3x"; + name = "libktorrent-21.08.0.tar.xz"; }; }; lokalize = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/lokalize-21.04.0.tar.xz"; - sha256 = "1wb95y89qi4z7hsldyq75w69rgdca3m0ji85khfvsb4h3cgilana"; - name = "lokalize-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/lokalize-21.08.0.tar.xz"; + sha256 = "0mwyvfam5ybrhd67vq6dgw74106l7p0q16xvddxa9gi0sdxb9883"; + name = "lokalize-21.08.0.tar.xz"; }; }; lskat = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/lskat-21.04.0.tar.xz"; - sha256 = "1acxbsldcjk3d84ip5z15y8x6nngj2vnb40s5p3mv47r6vgbh0qd"; - name = "lskat-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/lskat-21.08.0.tar.xz"; + sha256 = "14ii7pcq6p0k1626x63nc49pvjb4lvc4d5sdsi47rp0ll0f03sa8"; + name = "lskat-21.08.0.tar.xz"; }; }; mailcommon = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/mailcommon-21.04.0.tar.xz"; - sha256 = "1ljchkfrnknlzgjrrpwszzyv8m066d29xwns1yp8smqzk723g0gx"; - name = "mailcommon-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/mailcommon-21.08.0.tar.xz"; + sha256 = "0braayvcpbyvmcxx82ic7fhmzfwf6dyanvikwcmb0p9y7bkr1vk1"; + name = "mailcommon-21.08.0.tar.xz"; }; }; mailimporter = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/mailimporter-21.04.0.tar.xz"; - sha256 = "06zvaq3ccrgsd6idnd9m201924bnm72nvcg66v1salcdk93a8sv5"; - name = "mailimporter-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/mailimporter-21.08.0.tar.xz"; + sha256 = "139akl53hfq3kc91qnca5f6i5vimr8djbxnw94xibpiwj22xq7rz"; + name = "mailimporter-21.08.0.tar.xz"; }; }; marble = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/marble-21.04.0.tar.xz"; - sha256 = "1c63x75fzhkqgvijd1pmpywq4dx7gkyw9x90aj54fzkgjzwzqzhq"; - name = "marble-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/marble-21.08.0.tar.xz"; + sha256 = "17sn26grpph8iw2kw498krvryyxy0qp6ala55bvh6a2hyn3562zl"; + name = "marble-21.08.0.tar.xz"; }; }; markdownpart = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/markdownpart-21.04.0.tar.xz"; - sha256 = "0xgnj2g0hqwflw550fj6jzq36pc8j9vwb6p9cbvfljd8yv8va9kq"; - name = "markdownpart-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/markdownpart-21.08.0.tar.xz"; + sha256 = "138pi82653mwxn18s541b95i1zj5nij08cm7zykpm7kpkr2ri167"; + name = "markdownpart-21.08.0.tar.xz"; }; }; mbox-importer = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/mbox-importer-21.04.0.tar.xz"; - sha256 = "0rxrf1sxb5pzrkr8m2n1f3xgpwsihn6b6d5nilxmmsl5c60ya8j8"; - name = "mbox-importer-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/mbox-importer-21.08.0.tar.xz"; + sha256 = "0whpz4vv27cibvb4q98dxkdrn3jpiywvbqdn5adzfmjvw9sdb4ym"; + name = "mbox-importer-21.08.0.tar.xz"; }; }; messagelib = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/messagelib-21.04.0.tar.xz"; - sha256 = "1qsvqrkh30vyfrsxkpriqkzizxg9mx6v2xx7j6gyhz7pmrskx8rg"; - name = "messagelib-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/messagelib-21.08.0.tar.xz"; + sha256 = "1l5af4bwgcgj2askfsvx11bzqsp4bl5jc84fnswxpzidrir4x8ig"; + name = "messagelib-21.08.0.tar.xz"; }; }; minuet = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/minuet-21.04.0.tar.xz"; - sha256 = "0djqp807g47fy163bp0pkrhb7j37ijqdfyafz74871j2frrmnc97"; - name = "minuet-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/minuet-21.08.0.tar.xz"; + sha256 = "06dk90qb2lvl01bc6d9wmjqm3xv4hqi092ljn1dh6h2711c7czca"; + name = "minuet-21.08.0.tar.xz"; }; }; okular = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/okular-21.04.0.tar.xz"; - sha256 = "0l0vrglxy9331sqn3lx76hvbh7b0znsafl5ia61srk48kb0w9rqy"; - name = "okular-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/okular-21.08.0.tar.xz"; + sha256 = "0sbaq7cqzardmdvbl8y7jqb8pi605kg8jq2daizrp2m73w8p7vfx"; + name = "okular-21.08.0.tar.xz"; }; }; palapeli = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/palapeli-21.04.0.tar.xz"; - sha256 = "0f7ylr46alafp2gz9sf7xgnjm9vgyx5r7nipbqjl4wi8w908rklw"; - name = "palapeli-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/palapeli-21.08.0.tar.xz"; + sha256 = "11mgsyk3mg9ic76grr1x0m8qihzrs8da40qxbx2v0syy5dgn7ssw"; + name = "palapeli-21.08.0.tar.xz"; }; }; parley = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/parley-21.04.0.tar.xz"; - sha256 = "0a186zqpi815apf2grlj11xp64kw80i43779z99r665jpp6189z3"; - name = "parley-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/parley-21.08.0.tar.xz"; + sha256 = "1qn9pqvha52ha80lpqcvsi34yssvgnnyhl50is9wgk7qfnj02g9b"; + name = "parley-21.08.0.tar.xz"; }; }; partitionmanager = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/partitionmanager-21.04.0.tar.xz"; - sha256 = "02dgbqx1a6wahds04jcjdjh56pyrm47165hwv98ccarakrvn8yqm"; - name = "partitionmanager-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/partitionmanager-21.08.0.tar.xz"; + sha256 = "1r5vis8dnpyl8jvv3r22jmlfwsscnqvfdkvpabkrfw6l7l33p3cj"; + name = "partitionmanager-21.08.0.tar.xz"; }; }; picmi = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/picmi-21.04.0.tar.xz"; - sha256 = "1pwswzc02blvf49v4i2grw9mlm9y1ydmms6mg50iyi6qrnzbv6r3"; - name = "picmi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/picmi-21.08.0.tar.xz"; + sha256 = "02jwsibpclp1a3nrzlkkq4qzm3y595cdf2pfd5933z8q3lk0zj85"; + name = "picmi-21.08.0.tar.xz"; }; }; pimcommon = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/pimcommon-21.04.0.tar.xz"; - sha256 = "0bprmk20pmngvxxxpygajnlr4yx9acrz7dw6bfnn6d8kig281qdn"; - name = "pimcommon-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/pimcommon-21.08.0.tar.xz"; + sha256 = "12ffffv149ggpycdpk3sxh152y67dnm460d5d7sdfx8ip78xl0lv"; + name = "pimcommon-21.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/pim-data-exporter-21.04.0.tar.xz"; - sha256 = "0rbkr1vgl14q4hi4byn20kfhkz3yzmrydhb3f1i2amp08ca4x71n"; - name = "pim-data-exporter-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/pim-data-exporter-21.08.0.tar.xz"; + sha256 = "0zdcldazg5dsi3npl63hsz8v99h8k0pvnfh9rnhf0lg0mpcl8psn"; + name = "pim-data-exporter-21.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/pim-sieve-editor-21.04.0.tar.xz"; - sha256 = "1yxc4i0bsgrj9wsn44k7w3z1zkcm4y9qd8zd7shsqpca9lb9n13y"; - name = "pim-sieve-editor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/pim-sieve-editor-21.08.0.tar.xz"; + sha256 = "008a8wq7n68fgh63gaz64q4qsxlk11zlg9v4mmln8238zgvwif1q"; + name = "pim-sieve-editor-21.08.0.tar.xz"; }; }; poxml = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/poxml-21.04.0.tar.xz"; - sha256 = "0yhygizd0i6az1pd34lh4ij2x8867svbh2bic9lgcpmqbza9054g"; - name = "poxml-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/poxml-21.08.0.tar.xz"; + sha256 = "0wb3nq09ki2nkcpl6nfl483cm919hx6qxd39g6d76ksa7q2q46m9"; + name = "poxml-21.08.0.tar.xz"; }; }; print-manager = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/print-manager-21.04.0.tar.xz"; - sha256 = "1k5pqh264jy698jdzsk7d6bhadnwvgx1g3rpji06pb0igr1zn820"; - name = "print-manager-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/print-manager-21.08.0.tar.xz"; + sha256 = "01pcrjfp40a9h466jsm3ymjqzavrzxvn74gcrvxasi68wwq8aqrf"; + name = "print-manager-21.08.0.tar.xz"; }; }; rocs = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/rocs-21.04.0.tar.xz"; - sha256 = "11yzgrmb15zv24pfr3096g9zgsvgdlw43vnbjgbr7s8xvnprlh5l"; - name = "rocs-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/rocs-21.08.0.tar.xz"; + sha256 = "1jqiaxxdbv1cc75awl5gfq1kv76qmgiw872s4g5bny27ki8dlk7w"; + name = "rocs-21.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/signon-kwallet-extension-21.04.0.tar.xz"; - sha256 = "05jaa74j6rd89cj8szfgw5izjlkakbjmz7qiwlswyjd4lafjz65n"; - name = "signon-kwallet-extension-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/signon-kwallet-extension-21.08.0.tar.xz"; + sha256 = "0wig4p13qjpmn3imjiz4l14haad8qkr4qccv1kdgkkijy2dr66dy"; + name = "signon-kwallet-extension-21.08.0.tar.xz"; + }; + }; + skanlite = { + version = "21.08.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/21.08.0/src/skanlite-21.08.0.tar.xz"; + sha256 = "1kkxxcaibxfvsaf9548vxspz6iyfhdl9xmmcdxrp85w9ymcr3mi5"; + name = "skanlite-21.08.0.tar.xz"; }; }; spectacle = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/spectacle-21.04.0.tar.xz"; - sha256 = "0cqf9p7mc5wyl5qy6866m7xhndwmgd3hmw7amkpzngmmz4h9i2p0"; - name = "spectacle-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/spectacle-21.08.0.tar.xz"; + sha256 = "18rhb92m102hdkirdcigbd5ixma3s86022af1h133h3fy33xciwc"; + name = "spectacle-21.08.0.tar.xz"; }; }; step = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/step-21.04.0.tar.xz"; - sha256 = "169ka33nkzrxdk874180v6yzmrngl98gzyql4p5ssmmdh0vrkg25"; - name = "step-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/step-21.08.0.tar.xz"; + sha256 = "0dayfkfh68ldg3ivh2nki78w07rscqphq04xazvqss8j296xjzgz"; + name = "step-21.08.0.tar.xz"; }; }; svgpart = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/svgpart-21.04.0.tar.xz"; - sha256 = "0chfyxl94kp5pif6lzhlm7q8rg9l4lg74x4y04wslrfqcn1gghdj"; - name = "svgpart-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/svgpart-21.08.0.tar.xz"; + sha256 = "00pigyf0bicgclbb1imz2w1ksp10zzdf385kdx9zphh2h438kagf"; + name = "svgpart-21.08.0.tar.xz"; }; }; sweeper = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/sweeper-21.04.0.tar.xz"; - sha256 = "1iysxrfdp8bv0vgssv062yllsq4w3jf9vdi66jm9ka8i9w8wqpsv"; - name = "sweeper-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/sweeper-21.08.0.tar.xz"; + sha256 = "1g6s7nvcxs93i8mwplwd6a42jjid73n4rywwar9z2y1293afzaci"; + name = "sweeper-21.08.0.tar.xz"; }; }; umbrello = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/umbrello-21.04.0.tar.xz"; - sha256 = "17xwsjc1ph2glscv41x4f5bagw1q5ackqpy1wcg8m9jrg9ipqpqx"; - name = "umbrello-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/umbrello-21.08.0.tar.xz"; + sha256 = "0nly325zb51n5l2hbc6m199vhqx3jsscbvp4bqhgplklwhd6c1c0"; + name = "umbrello-21.08.0.tar.xz"; }; }; yakuake = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/yakuake-21.04.0.tar.xz"; - sha256 = "1jkwcc4pdb06v4q7bnqppdkjf8n8qpfp9mk02l77brnxxf8i9r3b"; - name = "yakuake-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/yakuake-21.08.0.tar.xz"; + sha256 = "0gm2djqjf807h657br1hz9ds5w09lszyi8iy2n3my4h78cs9lw72"; + name = "yakuake-21.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.04.0"; + version = "21.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/zeroconf-ioslave-21.04.0.tar.xz"; - sha256 = "03cmz3y8f48y26aybyygwssqicp0kz4ry9xm30rvvc5hiv0n6hj7"; - name = "zeroconf-ioslave-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.0/src/zeroconf-ioslave-21.08.0.tar.xz"; + sha256 = "13nxmghb8h0p5qp69w095xwgdl6b7kv8c1zs1n63l0m028wa37bg"; + name = "zeroconf-ioslave-21.08.0.tar.xz"; }; }; } From 8b1140b72e7aca83a185f03b27d94e31af64fa02 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 13 Aug 2021 06:00:02 -0500 Subject: [PATCH 0116/1062] kdeconnect-kde: add wayland dependencies --- pkgs/applications/kde/kdeconnect-kde.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index 30bd0731a871..e21a85df0143 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -19,12 +19,15 @@ , makeWrapper , pulseaudio-qt , qca-qt5 +, qqc2-desktop-style , qtgraphicaleffects , qtmultimedia , qtquickcontrols2 , qtx11extras , breeze-icons , sshfs +, wayland +, wayland-scanner }: mkDerivation { @@ -46,10 +49,13 @@ mkDerivation { libfakekey pulseaudio-qt qca-qt5 + qqc2-desktop-style qtgraphicaleffects qtmultimedia qtquickcontrols2 qtx11extras + wayland + wayland-scanner # otherwise buttons are blank on non-kde breeze-icons ]; From 3428957839c087baa516a9895e1d9495b41a2f03 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 13 Aug 2021 08:44:10 -0500 Subject: [PATCH 0117/1062] akonadi-contacts: add kcmutils input --- pkgs/applications/kde/akonadi-contacts.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index ad94c79e0f3c..76c4f3f2c507 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -3,8 +3,8 @@ extra-cmake-modules, qtwebengine, grantlee, grantleetheme, - kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison, - akonadi, akonadi-mime, kcontacts, kmime, libkleo, + kcmutils, kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, + prison, akonadi, akonadi-mime, kcontacts, kmime, libkleo, }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ qtwebengine grantlee grantleetheme - kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison + kcmutils kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison akonadi-mime kcontacts kmime libkleo ]; propagatedBuildInputs = [ akonadi ]; From 6bc10e34bdd144cec0a30c8162b1b6b9852d2c9b Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 12 Aug 2021 18:44:15 -0700 Subject: [PATCH 0118/1062] openblas: 0.3.15 -> 0.3.17 --- .../science/math/openblas/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 5d3c3f40f1d4..bf7eb3d0d38c 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which +{ lib, stdenv, fetchFromGitHub, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.15"; + version = "0.3.17"; outputs = [ "out" "dev" ]; @@ -137,23 +137,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "1qjr02cqncv20abdp1yzr55n7smhx6h9chqvb0xbp18byynvj87w"; + sha256 = "11j103s851mml6kns781kha0asxjz6b6s1vbv80aq3b6g7p05pms"; }; - # remove both patches when updating to 0.3.16 - patches = [ - (fetchpatch { - name = "riscv64-imin-fix-wrong-comparison.patch"; - url = "https://github.com/xianyi/OpenBLAS/commit/1e0192a5ccac28fc0c749f49d36ec7eda9757428.patch"; - sha256 = "0kjkmrj8023vcjxhgin5dqs5w3gf93hzhwdhg0vsjhdra2ghkwzj"; - }) - (fetchpatch { - name = "riscv64-generic-use-generic-kernel-for-dsdot.patch"; - url = "https://github.com/xianyi/OpenBLAS/commit/3521cd48cbfb3d50f6ae9a10377382d37075c696.patch"; - sha256 = "0ljwbldff4db377s8rzmqxrszilqdivy656yqvfq46x5338v3gi0"; - }) - ]; - inherit blas64; # Some hardening features are disabled due to sporadic failures in From f2f811ccc347f22adbd2fd65bfe26244e1163944 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Fri, 13 Aug 2021 13:51:48 -0700 Subject: [PATCH 0119/1062] gtk3: replace bugzilla patch with local file. --- pkgs/development/libraries/gtk/3.x.nix | 7 +--- ...etting-fallback-compute-DPI-properly.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 01b98d06bf30..7999d62b9112 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -76,12 +76,7 @@ stdenv.mkDerivation rec { patches = [ ./patches/3.0-immodules.cache.patch - - (fetchpatch { - name = "Xft-setting-fallback-compute-DPI-properly.patch"; - url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; - sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; - }) + ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch ] ++ lib.optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it diff --git a/pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch b/pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch new file mode 100644 index 000000000000..247dd3ea8456 --- /dev/null +++ b/pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch @@ -0,0 +1,34 @@ +From 269f2d80ea41cde17612600841fbdc32e99010f5 Mon Sep 17 00:00:00 2001 +From: Giuseppe Bilotta +Date: Tue, 24 Jan 2017 12:30:08 +0100 +Subject: [PATCH] Xft setting fallback: compute DPI properly + +This is a partial revert of bdf0820c501437a2150d8ff0d5340246e713f73f. If +the Xft DPI settings are not explicitly set, use the values provided by +the X server rather than hard-coding the fallback value of 96. + +While an auto-configured Xorg already reports 96, this value can be +overriden by the user, and we should respect the user choice in this +case. There is no need to require them to set the same value in +different places (the Xorg DPI settings and Xft.dpi). +--- + gdk/x11/gdkxftdefaults.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c +index fa1cfde2ec..c462b78c4b 100644 +--- a/gdk/x11/gdkxftdefaults.c ++++ b/gdk/x11/gdkxftdefaults.c +@@ -174,7 +174,8 @@ init_xft_settings (GdkScreen *screen) + x11_screen->xft_rgba = FC_RGBA_UNKNOWN; + + if (!get_double_default (xdisplay, "dpi", &dpi_double)) +- dpi_double = 96.0; ++ dpi_double = (DisplayHeight(xdisplay, x11_screen->screen_num)*25.4)/ ++ DisplayHeightMM(xdisplay, x11_screen->screen_num); + + x11_screen->xft_dpi = (int)(0.5 + PANGO_SCALE * dpi_double); + } +-- +2.11.0.616.gd72966cf44.dirty + From c5ee55ef265689cc8c2dfa0367082f5318f631a5 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Fri, 13 Aug 2021 21:15:31 +1000 Subject: [PATCH 0120/1062] python39: fix tkinter and decimal on aarch64-darwin --- .../python/cpython/3.9/darwin-tcl-tk.patch | 15 +++++++++++++++ .../interpreters/python/cpython/default.nix | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch diff --git a/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch b/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch new file mode 100644 index 000000000000..a9b0c0677c5e --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch @@ -0,0 +1,15 @@ +diff --git a/setup.py b/setup.py +index 04eb6b2..2e1160d 100644 +--- a/setup.py ++++ b/setup.py +@@ -1981,8 +1981,8 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (MACOS and self.detect_tkinter_darwin()): +- return True ++ # if (MACOS and self.detect_tkinter_darwin()): ++ # return True + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d59d3cb44708..76a66a648d84 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -235,6 +235,9 @@ in with passthru; stdenv.mkDerivation { else ./3.5/profile-task.patch ) + ] ++ optionals (pythonAtLeast "3.9" && stdenv.isDarwin) [ + # Stop checking for TCL/TK in global macOS locations + ./3.9/darwin-tcl-tk.patch ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which @@ -335,6 +338,8 @@ in with passthru; stdenv.mkDerivation { '' + optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 + # Override the auto-detection in setup.py, which assumes a universal build + export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} '' + optionalString (isPy3k && pythonOlder "3.7") '' # Determinism: The interpreter is patched to write null timestamps when compiling Python files # so Python doesn't try to update the bytecode when seeing frozen timestamps in Nix's store. From 1dbb306b8755b06fb2b6c0c4cebcb4da59d6cfc2 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 13 Aug 2021 17:28:26 -0700 Subject: [PATCH 0121/1062] pkgsStatic.perl: Use `dontAddStaticConfigureFlags` instead of overriding Signed-off-by: Pamplemousse --- pkgs/development/interpreters/perl/default.nix | 2 ++ pkgs/top-level/static.nix | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3b39974c16b1..c1f1bfc0b4ad 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -86,6 +86,8 @@ let configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; + dontAddStaticConfigureFlags = true; + dontAddPrefix = !crossCompiling; enableParallelBuilding = !crossCompiling; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 0c9af250e876..55bba46c7622 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -121,11 +121,6 @@ in { if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; - perl = super.perl.override { - # Don’t use new stdenv zlib because - # it doesn’t like the --disable-shared flag - stdenv = super.stdenv; - }; zlib = super.zlib.override { # Don’t use new stdenv zlib because From 053acde056ecf84d968dd531a8559525aa238ea2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 10:06:34 +0000 Subject: [PATCH 0122/1062] gnome.yelp-xsl: 40.0 -> 40.2 --- pkgs/desktops/gnome/core/yelp-xsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 7c9b4eb839c0..32f3fbd61538 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "40.0"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Nh7NTTP8zbO7CKaH9g5cPpCdLp47Ai2ETgSYINDPYrA="; + sha256 = "sha256-kZxVL4RqrsdB/lHVr0FrRpvNslx37/w7WhWktLf/gU4="; }; nativeBuildInputs = [ From 2c7f371e12d3af360783c9d4c962d46fd0ac6d86 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 14 Aug 2021 11:21:22 +0000 Subject: [PATCH 0123/1062] cargo-c: 0.8.1 -> 0.9.2 This fixes a build error that was originally triggered by 1d1ef50501d0dd2d30394b5e0ca1d8aec8498988. --- pkgs/development/tools/rust/cargo-c/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 71394c098907..f2540f259f4d 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.8.1"; + version = "0.9.2"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0fd0xql5cbqgmir2z3ah91iasaq9133wmi5bnhiy3dv7drcqv4rc"; + sha256 = "0hvlrhmbplx4cj4l5fynihgr9cdh0rkpwvipizk1gpp6p1ksr5hz"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "1xlh3h77rxhqyr1nkqyanb120lwdks6fklh202camqpmznd763g5"; + sha256 = "0ckn31asz7013206j153ig96602dxvxm6skdz1plan0h05j5mgah"; }; installPhase = '' @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0b952xkg0l31laqlhsv3cqdag7v15k9na6xr6q9y8xwy1fjh9gzv"; + cargoSha256 = "0c0vn2pcy5px02mc0l4a3w7z9n8hc6br5w3ww6nrav5w6911jp52"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From b40c96c34050f642ef9d199405493e897a7d7335 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 17:27:51 +0000 Subject: [PATCH 0124/1062] vim: 8.2.2567 -> 8.2.3337 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 71e7be66b1eb..89d49f5e6285 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.2567"; + version = "8.2.3337"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-FS3TZX7FKnnNpGYKbng2LIfWA9z2jqg7d2HC6t3xYTU="; + sha256 = "sha256-iwSGcLeqXH0bVIXEI5OnotG88Uv8ntycisD9EcHjz/c="; }; enableParallelBuilding = true; From aa9a70b148f1498f3572ee7e1e63fc15f7139606 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 14:10:27 +0000 Subject: [PATCH 0125/1062] libwacom: 1.10 -> 1.11 --- pkgs/development/libraries/libwacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 5bb6445ac38f..0d7caf8ba5c4 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.10"; + version = "1.11"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-Q7b54AMAxdIzN7TUuhIdlrXaVtj2szV4n3y9bAE0LsU="; + sha256 = "sha256-HDBWycdZf/pUL7ZzCuF55tfby3GW0WW6Vq3htPWT1v4="; }; nativeBuildInputs = [ pkg-config meson ninja doxygen python3 ]; From 98b5749074323f1012fc802d9d57c1ebdc602115 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 09:55:40 +0000 Subject: [PATCH 0126/1062] mpd-mpris: 0.3.0 -> 0.3.1 --- pkgs/tools/audio/mpd-mpris/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index b90ab80befdc..71d823244fae 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mpd-mpris"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "natsukagami"; repo = pname; rev = "v${version}"; - sha256 = "1kzjbv04b2garb99l64wdq8yksnm4pbhkgyzh89j5j3gb9k55zal"; + sha256 = "sha256-eI7/E5rhNCZfURwGkfa0f+Yie1EU8zR9r+1eAqrlmVY="; }; - vendorSha256 = "1ggrqwd3h602rav1dc3amsf4wxsq8mdq4ijkdsg759sqhpzl6rqs"; + vendorSha256 = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0="; doCheck = false; From d5a540c52a07aa2ead33385770132df46e7d95c7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 15 Aug 2021 13:12:44 +0200 Subject: [PATCH 0127/1062] m2install: deprecate phases --- pkgs/development/java-modules/m2install.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index 3a289c9c9c4a..1e3b260b4453 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -17,5 +17,5 @@ in stdenv.mkDerivation { cp $src $out/m2/$m2Path/$m2File ''; - phases = "installPhase"; + dontUnpack = true; } From 29be3a3f0501b9c10af915be26cc5fd52c2311a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Aug 2021 15:08:46 +0200 Subject: [PATCH 0128/1062] binutils: try to fix plv8 build Backport patch from 2.36 so that gold can succeed in linking programs without complaining unknown program property type 0xc0008002 in .note.gnu.property section Should fix: https://github.com/NixOS/nixpkgs/issues/134190 --- .../tools/misc/binutils/default.nix | 5 + ...d-Update-GNU_PROPERTY_X86_XXX-macros.patch | 292 ++++++++++++++++++ 2 files changed, 297 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/gold-Update-GNU_PROPERTY_X86_XXX-macros.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 7a06e290a966..d2b5f6e7ea3a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -70,6 +70,11 @@ stdenv.mkDerivation { # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=956ea65cd707707c0f725930214cbc781367a831 ./bfd-elf-Dont-read-non-existing-secondary-relocs.patch + # Fix building plv8’s v8. + # https://github.com/NixOS/nixpkgs/issues/134190 + # Obtained from: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=586e30940e640f67bd55bd72e1d1355a4faf8079 + ./gold-Update-GNU_PROPERTY_X86_XXX-macros.patch + ./CVE-2020-35448.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch ++ # This patch was suggested by Nick Clifton to fix diff --git a/pkgs/development/tools/misc/binutils/gold-Update-GNU_PROPERTY_X86_XXX-macros.patch b/pkgs/development/tools/misc/binutils/gold-Update-GNU_PROPERTY_X86_XXX-macros.patch new file mode 100644 index 000000000000..c4eef87a0c8d --- /dev/null +++ b/pkgs/development/tools/misc/binutils/gold-Update-GNU_PROPERTY_X86_XXX-macros.patch @@ -0,0 +1,292 @@ +From 586e30940e640f67bd55bd72e1d1355a4faf8079 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Tue, 13 Oct 2020 05:20:49 -0700 +Subject: [PATCH] gold: Update GNU_PROPERTY_X86_XXX macros + +This patch updates GNU_PROPERTY_X86_XXX macros for gold: + +1. GNU_PROPERTY_X86_UINT32_AND_XXX: A 4-byte unsigned integer property. +A bit is set if it is set in all relocatable inputs: + + #define GNU_PROPERTY_X86_UINT32_AND_LO 0xc0000002 + #define GNU_PROPERTY_X86_UINT32_AND_HI 0xc0007fff + +2. GNU_PROPERTY_X86_UINT32_OR_XXX: A 4-byte unsigned integer property. +A bit is set if it is set in any relocatable inputs: + + #define GNU_PROPERTY_X86_UINT32_OR_LO 0xc0008000 + #define GNU_PROPERTY_X86_UINT32_OR_HI 0xc000ffff + +3. GNU_PROPERTY_X86_UINT32_OR_AND_XXX: A 4-byte unsigned integer property. +A bit is set if it is set in any relocatable inputs and the property is +present in all relocatable inputs: + + #define GNU_PROPERTY_X86_UINT32_OR_AND_LO 0xc0010000 + #define GNU_PROPERTY_X86_UINT32_OR_AND_HI 0xc0017fff + +4. GNU_PROPERTY_X86_FEATURE_2_NEEDED, GNU_PROPERTY_X86_FEATURE_2_USED +and GNU_PROPERTY_X86_FEATURE_2_XXX bits. + +GNU_PROPERTY_X86_FEATURE_1_AND is unchanged. GNU_PROPERTY_X86_ISA_1_USED +and GNU_PROPERTY_X86_ISA_1_NEEDED are updated to better support targeted +processors since GNU_PROPERTY_X86_ISA_1_?86 aren't isn't very useful. +A new set of GNU_PROPERTY_X86_ISA_1_XXX bits are defined. The previous +GNU_PROPERTY_X86_ISA_1_XXX macros are deprecated and renamed to +GNU_PROPERTY_X86_COMPAT_ISA_1_XXX and GNU_PROPERTY_X86_COMPAT_2_ISA_1_XXX. + +elfcpp/ + + * elfcpp.h (GNU_PROPERTY_X86_ISA_1_USED): Renamed to ... + (GNU_PROPERTY_X86_COMPAT_ISA_1_USED): This. + (GNU_PROPERTY_X86_ISA_1_NEEDED): Renamed to ... + (GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED): This. + (GNU_PROPERTY_X86_UINT32_AND_LO): New. + (GNU_PROPERTY_X86_UINT32_AND_HI): Likewise. + (GNU_PROPERTY_X86_UINT32_OR_LO): Likewise. + (GNU_PROPERTY_X86_UINT32_OR_HI): Likewise. + (GNU_PROPERTY_X86_UINT32_OR_AND_LO): Likewise. + (GNU_PROPERTY_X86_UINT32_OR_AND_HI): Likewise. + (GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED): New. + (GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED): Likewise. + (GNU_PROPERTY_X86_FEATURE_1_AND): Updated to + (GNU_PROPERTY_X86_UINT32_AND_LO + 0). + (GNU_PROPERTY_X86_ISA_1_NEEDED): New. Defined to + GNU_PROPERTY_X86_UINT32_OR_LO + 2. + (GNU_PROPERTY_X86_FEATURE_2_NEEDED): New. Defined to + (GNU_PROPERTY_X86_UINT32_OR_LO + 1). + (GNU_PROPERTY_X86_ISA_1_USED): New. Defined to + GNU_PROPERTY_X86_UINT32_OR_AND_LO + 2. + (GNU_PROPERTY_X86_FEATURE_2_USED): New. Defined to + (GNU_PROPERTY_X86_UINT32_OR_AND_LO + 1). + +gold/ + + * x86_64.cc (Target_x86_64::Target_x86_64): Initialize + feature_2_used_, feature_2_needed_ and object_feature_2_used_. + (Target_x86_64::feature_2_used_): New data member. + (Target_x86_64::feature_2_needed_): Likewise. + (Target_x86_64::object_isa_1_used_): Likewise. + (Target_x86_64::record_gnu_property): Support + GNU_PROPERTY_X86_COMPAT_ISA_1_USED, + GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED, + GNU_PROPERTY_X86_COMPAT_2_ISA_1_USED, + GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED, + GNU_PROPERTY_X86_FEATURE_2_USED and + GNU_PROPERTY_X86_FEATURE_2_NEEDED. + (Target_x86_64::merge_gnu_properties): Merge FEATURE_2_USED bits. + Initialize object_feature_2_used_. + (Target_x86_64::do_finalize_gnu_properties): Support + GNU_PROPERTY_X86_FEATURE_2_USED and + GNU_PROPERTY_X86_FEATURE_2_NEEDED. + * testsuite/gnu_property_a.S (GNU_PROPERTY_X86_ISA_1_USED): Set + to 0xc0010002. + (GNU_PROPERTY_X86_ISA_1_NEEDED): Set to 0xc0008002. + * testsuite/gnu_property_b.S (GNU_PROPERTY_X86_ISA_1_USED): Set + to 0xc0010002. + (GNU_PROPERTY_X86_ISA_1_NEEDED): Set to 0xc0008002. + * testsuite/gnu_property_c.S (GNU_PROPERTY_X86_ISA_1_USED): Set + to 0xc0010002. + (GNU_PROPERTY_X86_ISA_1_NEEDED): Set to 0xc0008002. + * testsuite/gnu_property_test.sh: Updated. +--- + elfcpp/ChangeLog | [omitted] + elfcpp/elfcpp.h | 18 ++++++++++++--- + gold/ChangeLog | [omitted] + gold/testsuite/gnu_property_a.S | 4 ++-- + gold/testsuite/gnu_property_b.S | 4 ++-- + gold/testsuite/gnu_property_c.S | 4 ++-- + gold/testsuite/gnu_property_test.sh | 4 ++-- + gold/x86_64.cc | 34 +++++++++++++++++++++++++++-- + 8 files changed, 110 insertions(+), 13 deletions(-) + +diff --git a/elfcpp/elfcpp.h b/elfcpp/elfcpp.h +index 65d803c00e2..4b6ff94a654 100644 +--- a/elfcpp/elfcpp.h ++++ b/elfcpp/elfcpp.h +@@ -1013,9 +1013,21 @@ enum + GNU_PROPERTY_STACK_SIZE = 1, + GNU_PROPERTY_NO_COPY_ON_PROTECTED = 2, + GNU_PROPERTY_LOPROC = 0xc0000000, +- GNU_PROPERTY_X86_ISA_1_USED = 0xc0000000, +- GNU_PROPERTY_X86_ISA_1_NEEDED = 0xc0000001, +- GNU_PROPERTY_X86_FEATURE_1_AND = 0xc0000002, ++ GNU_PROPERTY_X86_COMPAT_ISA_1_USED = 0xc0000000, ++ GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED = 0xc0000001, ++ GNU_PROPERTY_X86_UINT32_AND_LO = 0xc0000002, ++ GNU_PROPERTY_X86_UINT32_AND_HI = 0xc0007fff, ++ GNU_PROPERTY_X86_UINT32_OR_LO = 0xc0008000, ++ GNU_PROPERTY_X86_UINT32_OR_HI = 0xc000ffff, ++ GNU_PROPERTY_X86_UINT32_OR_AND_LO = 0xc0010000, ++ GNU_PROPERTY_X86_UINT32_OR_AND_HI = 0xc0017fff, ++ GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED = GNU_PROPERTY_X86_UINT32_OR_LO + 0, ++ GNU_PROPERTY_X86_COMPAT_2_ISA_1_USED = GNU_PROPERTY_X86_UINT32_OR_AND_LO + 0, ++ GNU_PROPERTY_X86_FEATURE_1_AND = GNU_PROPERTY_X86_UINT32_AND_LO + 0, ++ GNU_PROPERTY_X86_ISA_1_NEEDED = GNU_PROPERTY_X86_UINT32_OR_LO + 2, ++ GNU_PROPERTY_X86_FEATURE_2_NEEDED = GNU_PROPERTY_X86_UINT32_OR_LO + 1, ++ GNU_PROPERTY_X86_ISA_1_USED = GNU_PROPERTY_X86_UINT32_OR_AND_LO + 2, ++ GNU_PROPERTY_X86_FEATURE_2_USED = GNU_PROPERTY_X86_UINT32_OR_AND_LO + 1, + GNU_PROPERTY_HIPROC = 0xdfffffff, + GNU_PROPERTY_LOUSER = 0xe0000000, + GNU_PROPERTY_HIUSER = 0xffffffff +diff --git a/gold/testsuite/gnu_property_a.S b/gold/testsuite/gnu_property_a.S +index 463bc8e52fe..5fbbbc9c4bb 100644 +--- a/gold/testsuite/gnu_property_a.S ++++ b/gold/testsuite/gnu_property_a.S +@@ -1,8 +1,8 @@ + #define NT_GNU_PROPERTY_TYPE_0 5 + + #define GNU_PROPERTY_STACK_SIZE 1 +-#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 +-#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0010002 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0008002 + #define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 + + #if __SIZEOF_PTRDIFF_T__ == 8 +diff --git a/gold/testsuite/gnu_property_b.S b/gold/testsuite/gnu_property_b.S +index 0c0c038ead1..7028f73d7ab 100644 +--- a/gold/testsuite/gnu_property_b.S ++++ b/gold/testsuite/gnu_property_b.S +@@ -2,8 +2,8 @@ + + #define GNU_PROPERTY_STACK_SIZE 1 + #define GNU_PROPERTY_NO_COPY_ON_PROTECTED 2 +-#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 +-#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0010002 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0008002 + #define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 + + #if __SIZEOF_PTRDIFF_T__ == 8 +diff --git a/gold/testsuite/gnu_property_c.S b/gold/testsuite/gnu_property_c.S +index ace159a9a9d..c8cbd8bce28 100644 +--- a/gold/testsuite/gnu_property_c.S ++++ b/gold/testsuite/gnu_property_c.S +@@ -2,8 +2,8 @@ + + #define GNU_PROPERTY_STACK_SIZE 1 + #define GNU_PROPERTY_NO_COPY_ON_PROTECTED 2 +-#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 +-#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0010002 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0008002 + #define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 + + #if __SIZEOF_PTRDIFF_T__ == 8 +diff --git a/gold/testsuite/gnu_property_test.sh b/gold/testsuite/gnu_property_test.sh +index 1806d3474cc..a4096005b78 100755 +--- a/gold/testsuite/gnu_property_test.sh ++++ b/gold/testsuite/gnu_property_test.sh +@@ -77,8 +77,8 @@ check_count gnu_property_test.stdout "^ NOTE" 2 + + check gnu_property_test.stdout "stack size: 0x111100" + check gnu_property_test.stdout "no copy on protected" +-check gnu_property_test.stdout "x86 ISA used: i486, SSE2, SSE4_2, AVX512CD" +-check gnu_property_test.stdout "x86 ISA needed: i486, SSE2, SSE4_2, AVX512CD" ++check gnu_property_test.stdout "x86 ISA used: x86-64-v2, , , " ++check gnu_property_test.stdout "x86 ISA needed: x86-64-v2, , , " + check gnu_property_test.stdout "x86 feature: IBT" + + exit 0 +diff --git a/gold/x86_64.cc b/gold/x86_64.cc +index 9cb2cf0a322..378bac16f78 100644 +--- a/gold/x86_64.cc ++++ b/gold/x86_64.cc +@@ -706,8 +706,9 @@ class Target_x86_64 : public Sized_target + rela_irelative_(NULL), copy_relocs_(elfcpp::R_X86_64_COPY), + got_mod_index_offset_(-1U), tlsdesc_reloc_info_(), + tls_base_symbol_defined_(false), isa_1_used_(0), isa_1_needed_(0), +- feature_1_(0), object_isa_1_used_(0), object_feature_1_(0), +- seen_first_object_(false) ++ feature_1_(0), feature_2_used_(0), feature_2_needed_(0), ++ object_isa_1_used_(0), object_feature_1_(0), ++ object_feature_2_used_(0), seen_first_object_(false) + { } + + // Hook for a new output section. +@@ -1382,6 +1383,8 @@ class Target_x86_64 : public Sized_target + uint32_t isa_1_used_; + uint32_t isa_1_needed_; + uint32_t feature_1_; ++ uint32_t feature_2_used_; ++ uint32_t feature_2_needed_; + // Target-specific properties from the current object. + // These bits get ORed into ISA_1_USED_ after all properties for the object + // have been processed. But if either is all zeroes (as when the property +@@ -1391,6 +1394,7 @@ class Target_x86_64 : public Sized_target + // These bits get ANDed into FEATURE_1_ after all properties for the object + // have been processed. + uint32_t object_feature_1_; ++ uint32_t object_feature_2_used_; + // Whether we have seen our first object, for use in initializing FEATURE_1_. + bool seen_first_object_; + }; +@@ -1594,9 +1598,15 @@ Target_x86_64::record_gnu_property( + + switch (pr_type) + { ++ case elfcpp::GNU_PROPERTY_X86_COMPAT_ISA_1_USED: ++ case elfcpp::GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED: ++ case elfcpp::GNU_PROPERTY_X86_COMPAT_2_ISA_1_USED: ++ case elfcpp::GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED: + case elfcpp::GNU_PROPERTY_X86_ISA_1_USED: + case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED: + case elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND: ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED: ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED: + if (pr_datasz != 4) + { + gold_warning(_("%s: corrupt .note.gnu.property section " +@@ -1625,6 +1635,12 @@ Target_x86_64::record_gnu_property( + // If we see multiple feature props in one object, OR them together. + this->object_feature_1_ |= val; + break; ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED: ++ this->object_feature_2_used_ |= val; ++ break; ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED: ++ this->feature_2_needed_ |= val; ++ break; + } + } + +@@ -1642,15 +1658,23 @@ Target_x86_64::merge_gnu_properties(const Object*) + else if (this->isa_1_used_ != 0) + this->isa_1_used_ |= this->object_isa_1_used_; + this->feature_1_ &= this->object_feature_1_; ++ // If any object is missing the FEATURE_2_USED property, we must ++ // omit it from the output file. ++ if (this->object_feature_2_used_ == 0) ++ this->feature_2_used_ = 0; ++ else if (this->feature_2_used_ != 0) ++ this->feature_2_used_ |= this->object_feature_2_used_; + } + else + { + this->isa_1_used_ = this->object_isa_1_used_; + this->feature_1_ = this->object_feature_1_; ++ this->feature_2_used_ = this->object_feature_2_used_; + this->seen_first_object_ = true; + } + this->object_isa_1_used_ = 0; + this->object_feature_1_ = 0; ++ this->object_feature_2_used_ = 0; + } + + static inline void +@@ -1676,6 +1700,12 @@ Target_x86_64::do_finalize_gnu_properties(Layout* layout) const + if (this->feature_1_ != 0) + add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND, + this->feature_1_); ++ if (this->feature_2_used_ != 0) ++ add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED, ++ this->feature_2_used_); ++ if (this->feature_2_needed_ != 0) ++ add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED, ++ this->feature_2_needed_); + } + + // Write the first three reserved words of the .got.plt section. +-- +2.27.0 + From 0e274ced1b92eb5b1fbc4b7036bfe67f3bf16b7a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 15 Aug 2021 16:30:23 +0200 Subject: [PATCH 0129/1062] yasm: replace name with pname&version --- pkgs/development/compilers/yasm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 48c251d828a2..b770f3b7dfdb 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "yasm-1.3.0"; + pname = "yasm"; + version = "1.3.0"; src = fetchurl { - url = "https://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; + url = "https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz"; sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; From 36e9d30c985ac248f9530f88f19ec717a52fd4e7 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 18:54:29 +0300 Subject: [PATCH 0130/1062] unbound: 1.13.1 -> 1.13.2 --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a0c774fb7341..9a8bc52d44f4 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg="; + sha256 = "sha256-ChO1R/O5KgJrXr0EI/VMmR5XGAN/2fckRYF/agQOGoM="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB From 4d45fe2991ba6c55fc33ff929eaa0ad1c4554b69 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sun, 1 Aug 2021 03:50:21 -0600 Subject: [PATCH 0131/1062] bottles: 2021.7.14-treviso -> 2021.7.28-treviso-2 --- pkgs/applications/misc/bottles/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 21e63b8b29bb..7c2640da8549 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2021.7.14-treviso"; + version = "2021.7.28-treviso-2"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix"; + sha256 = "0kvwcajm9izvkwfg7ir7bks39bpc665idwa8mc8d536ajyjriysn"; }; postPatch = '' @@ -52,6 +52,7 @@ python3Packages.buildPythonApplication rec { dbus-python gst-python liblarch + patool ] ++ [ steam-run-native ]; format = "other"; From c599d0e175f9c8699aaa2dc4b26729e3f04331dd Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sun, 1 Aug 2021 03:56:48 -0600 Subject: [PATCH 0132/1062] bottles: Added `xdg-utils` to enable browsing wine prefix files --- pkgs/applications/misc/bottles/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 7c2640da8549..7fd6d6d584a2 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -3,7 +3,7 @@ , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 -, steam-run-native +, steam-run-native, xdg-utils }: python3Packages.buildPythonApplication rec { @@ -53,7 +53,10 @@ python3Packages.buildPythonApplication rec { gst-python liblarch patool - ] ++ [ steam-run-native ]; + ] ++ [ + steam-run-native + xdg-utils + ]; format = "other"; strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 From b14a4ca002601fd7433d15a5e1bfd859cf8f2df8 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sun, 1 Aug 2021 04:20:43 -0600 Subject: [PATCH 0133/1062] bottles: Add `pciutils` as `bottles` uses it to determine the graphics environment --- pkgs/applications/misc/bottles/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 7fd6d6d584a2..dfac5d149a97 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -3,7 +3,7 @@ , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 -, steam-run-native, xdg-utils +, steam-run-native, xdg-utils, pciutils }: python3Packages.buildPythonApplication rec { @@ -56,6 +56,7 @@ python3Packages.buildPythonApplication rec { ] ++ [ steam-run-native xdg-utils + pciutils ]; format = "other"; From ecb3c84196017d3ea37c6e7ec9c56a82d237b719 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sun, 1 Aug 2021 12:07:14 -0600 Subject: [PATCH 0134/1062] bottles: Ensure `wine` is run inside `steam-run` --- pkgs/applications/misc/bottles/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index dfac5d149a97..8f7bfc4520fb 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -69,6 +69,8 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/runner.py \ --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}" + substituteInPlace src/runner_utilities.py \ + --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ ''; preFixup = '' From 98d9348dbfb1449a7092263620531ee185ba37a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 10 Aug 2021 15:15:44 +0200 Subject: [PATCH 0135/1062] c-ares: 1.17.1 -> 1.17.2 --- pkgs/development/libraries/c-ares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 20bcf80d9e59..90e7a895746b 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -8,11 +8,11 @@ let self = stdenv.mkDerivation rec { pname = "c-ares"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz"; - sha256 = "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"; + sha256 = "sha256-SAPIRM4gzlEO8OuD+OpB+iTsqunSgMRoxYLSuyWzkT0="; }; meta = with lib; { From 47fd767531f60d5e8703597da62fd95df82924be Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Mon, 16 Aug 2021 17:52:13 -0700 Subject: [PATCH 0136/1062] zstd: Fix static build --- pkgs/tools/compression/zstd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index f87a144f7cc9..1f9b4a505ac4 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file +, fetchpatch , legacySupport ? false , static ? stdenv.hostPlatform.isStatic # these need to be ran on the host, thus disable when cross-compiling @@ -27,6 +28,12 @@ stdenv.mkDerivation rec { # This patches makes sure we do not attempt to use the MD5 implementation # of the host platform when running the tests ./playtests-darwin.patch + + # Fixes linking for static builds + (fetchpatch { + url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; + sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; + }) ]; postPatch = lib.optionalString (!static) '' From a83f82576b578531eb2894e0d7b279b59af23cd6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 17 Aug 2021 02:31:11 +0000 Subject: [PATCH 0137/1062] ffmpeg: patch CVE-2021-33815 and CVE-2021-38114 https://nvd.nist.gov/vuln/detail/CVE-2021-33815 https://nvd.nist.gov/vuln/detail/CVE-2021-38114 --- pkgs/development/libraries/ffmpeg-full/default.nix | 2 +- pkgs/development/libraries/ffmpeg/4.nix | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 3dca11008f72..2fe917876667 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -244,7 +244,7 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { pname = "ffmpeg-full"; - inherit (ffmpeg) src version; + inherit (ffmpeg) src version patches; prePatch = '' patchShebangs . diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index d557c87ebdf6..f3758ca53924 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -13,6 +13,16 @@ callPackage ./generic.nix (rec { darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; patches = [ + (fetchpatch { + name = "CVE-2021-33815.patch"; + url = "https://github.com/FFmpeg/FFmpeg/commit/26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777.patch"; + sha256 = "0l8dqga5845f7d3wdbvd05i23saldq4pm2cyfdgszbr0c18sxagf"; + }) + (fetchpatch { + name = "CVE-2021-38114.patch"; + url = "https://github.com/FFmpeg/FFmpeg/commit/7150f9575671f898382c370acae35f9087a30ba1.patch"; + sha256 = "0gwkc7v1wsh4j0am2nnskhsca1b5aqzhcfd41sd9mh2swsdyf27i"; + }) # Fix incorrect segment length in HLS child playlist with fmp4 segment format # FIXME remove in version 4.5 # https://trac.ffmpeg.org/ticket/9193 From cfc0b37a059c48952cba94d4ece2fe1cafb0c94d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 17 Aug 2021 10:29:39 +0200 Subject: [PATCH 0138/1062] git: 2.32.0 -> 2.33.0 --- .../git-and-tools/git/default.nix | 6 ++-- .../git/git-send-email-honor-PATH.patch | 33 ++++++++++--------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 775c4dd09cde..1d02adc6397e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.32.0"; + version = "2.33.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "08rnm3ipjqdd2n31dw7mxl3iv9g4nxgc409krmz892a37kd43a38"; + sha256 = "0kqcs8nj5h7rh3q86pw5777awq7gn77lgxk88ynjl1rfz2snlg5z"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -297,6 +297,8 @@ stdenv.mkDerivation { disable_test t0001-init 'shared overrides system' disable_test t0001-init 'init honors global core.sharedRepository' disable_test t1301-shared-repo + # git-completion.bash: line 405: compgen: command not found: + disable_test t9902-completion 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 9603d8e27c5c..c78400847418 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,28 +1,31 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index 1afe9fc858..05dd7c3a90 100644 +index 3db4eab4ba..39bc0e77c9 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'. - specify a full pathname of a sendmail-like program instead; - the program must support the `-i` option. Default value can - be specified by the `sendemail.smtpServer` configuration -- option; the built-in default is to search for `sendmail` in -- `/usr/sbin`, `/usr/lib` and $PATH if such program is -+ option; the built-in default is to search in $PATH if such program is - available, falling back to `localhost` otherwise. - - --smtp-server-port=:: +@@ -220,9 +220,9 @@ a password is obtained using 'git-credential'. + --smtp-server=:: + If set, specifies the outgoing SMTP server to use (e.g. + `smtp.example.com` or a raw IP address). If unspecified, and if +- `--sendmail-cmd` is also unspecified, the default is to search +- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a +- program is available, falling back to `localhost` otherwise. ++ `--sendmail-cmd` is also unspecified, the default is to search for ++ `sendmail` in $PATH if such a program is available, falling back to ++ `localhost` otherwise. + + + For backward compatibility, this option can also specify a full pathname + of a sendmail-like program instead; the program must support the `-i` diff --git a/git-send-email.perl b/git-send-email.perl -index 8eb63b5a2f..74a61d8213 100755 +index e65d969d0b..508d49483d 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -956,8 +956,7 @@ sub expand_one_alias { +@@ -1066,8 +1066,7 @@ sub expand_one_alias { } - if (!defined $smtp_server) { + if (!defined $sendmail_cmd && !defined $smtp_server) { - my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); - push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; + my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; foreach (@sendmail_paths) { if (-x $_) { - $smtp_server = $_; + $sendmail_cmd = $_; From f8be06a311b46fe8eefda3c1f0c19abed7df8bf7 Mon Sep 17 00:00:00 2001 From: Peter Ferenczy Date: Sun, 15 Aug 2021 16:30:49 +0200 Subject: [PATCH 0139/1062] buildEnv: better warning and error messages --- pkgs/build-support/buildenv/builder.pl | 38 ++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 411b147cc58e..350cb83f7315 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -10,6 +10,9 @@ use JSON::PP; STDOUT->autoflush(1); +$SIG{__WARN__} = sub { warn "warning: ", @_ }; +$SIG{__DIE__} = sub { die "error: ", @_ }; + my $out = $ENV{"out"}; my @pathsToLink = split ' ', $ENV{"pathsToLink"}; @@ -88,6 +91,10 @@ sub findFilesInDir { sub checkCollision { my ($path1, $path2) = @_; + if (! -e $path1 || ! -e $path2) { + return 0; + } + my $stat1 = (stat($path1))[2]; my $stat2 = (stat($path2))[2]; @@ -101,6 +108,11 @@ sub checkCollision { return compare($path1, $path2) == 0; } +sub prependDangling { + my $path = shift; + return (-l $path && ! -e $path ? "dangling symlink " : "") . "`$path'"; +} + sub findFiles { my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; @@ -125,12 +137,21 @@ sub findFiles { # symlink to a file (not a directory) in a lower-priority package, # overwrite it. if (!defined $oldTarget || ($priority < $oldPriority && ($oldTarget ne "" && ! -d $oldTarget))) { + # If target is a dangling symlink, emit a warning. + if (-l $target && ! -e $target) { + my $link = readlink $target; + warn "creating dangling symlink `$out$extraPrefix/$relName' -> `$target' -> `$link'\n"; + } $symlinks{$relName} = [$target, $priority]; return; } # If target already exists and both targets resolves to the same path, skip - if (defined $oldTarget && $oldTarget ne "" && abs_path($target) eq abs_path($oldTarget)) { + if ( + defined $oldTarget && $oldTarget ne "" && + defined abs_path($target) && defined abs_path($oldTarget) && + abs_path($target) eq abs_path($oldTarget) + ) { # Prefer the target that is not a symlink, if any if (-l $oldTarget && ! -l $target) { $symlinks{$relName} = [$target, $priority]; @@ -144,14 +165,25 @@ sub findFiles { return; } + # If target is supposed to be a directory but it isn't, die with an error message + # instead of attempting to recurse into it, only to fail then. + # This happens e.g. when pathsToLink contains a non-directory path. + if ($oldTarget eq "" && ! -d $target) { + die "not a directory: `$target'\n"; + } + unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) { + # Prepend "dangling symlink" to paths if applicable. + my $targetRef = prependDangling($target); + my $oldTargetRef = prependDangling($oldTarget); + if ($ignoreCollisions) { - warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1; + warn "collision between $targetRef and $oldTargetRef\n" if $ignoreCollisions == 1; return; } elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) { return; } else { - die "collision between `$target' and `$oldTarget'\n"; + die "collision between $targetRef and $oldTargetRef\n"; } } From aaac360ae6c25e1cb6a4371d0c01dd6d5cf65507 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 09:43:18 +0000 Subject: [PATCH 0140/1062] moosefs: 3.0.115 -> 3.0.116 --- pkgs/tools/filesystems/moosefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index e07ca270b5c8..5bb419ffab6a 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.115"; + version = "3.0.116"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq"; + sha256 = "sha256-/+l4BURvL1R6te6tlXRJx7YBDyYuMrGnzzhMc9XeXKc="; }; nativeBuildInputs = [ From 0532aa2c6cab207dd78534c906cefaa92ddada18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 09:39:24 +0000 Subject: [PATCH 0141/1062] moolticute: 0.45.0 -> 0.50.0 --- pkgs/applications/misc/moolticute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index eabc93492378..bd6173a0c525 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.45.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-azJ63NI0wzzv3acgoPaeF+lTM1WKpXg595FrK908k1U="; + sha256 = "sha256-/luba+qYRATP3EjNMB+GIRP6JQOlADsvpF8PzRFqFlM="; }; outputs = [ "out" "udev" ]; From 4c75874560d114032e3d3ee0e6ffe9dd880a3859 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 13:25:59 +0200 Subject: [PATCH 0142/1062] binutils-unwrapped: expose if built with ld.gold MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ld.gold is “A new, faster, ELF only linker”. Thus we only should pass the configure flag --with-gold if our target platform will actually support gold (in which case binutil's configure script silently disables it). With this change, not only will configureFlags represent the actual configuration more closely, but we can also expose if the binutils derivation contains ld.gold via a passthru attr. Specifically this means that: nix-repl> pkgsCross.mingwW64.stdenv.cc.bintools.bintools.hasGold false The intended way to use this is to check `stdenv.cc.bintools.bintools or false` which returns accurate results regardless of the actual linker derivation. TODO: maybe also add hasGold to binutils wrapper as it also symlinks ld.gold in? --- pkgs/development/tools/misc/binutils/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 7a06e290a966..0185677e0363 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,16 +1,24 @@ +let + execFormatIsELF = platform: platform.parsed.kernel.execFormat.name == "elf"; +in + { stdenv, lib, buildPackages , fetchFromGitHub, fetchurl, zlib, autoreconfHook, gettext # Enabling all targets increases output size to a multiple. , withAllTargets ? false, libbfd, libopcodes , enableShared ? !stdenv.hostPlatform.isStatic , noSysDirs -, gold ? true +, gold ? execFormatIsELF stdenv.targetPlatform , bison ? null , flex , texinfo , perl }: +# configure silently disables ld.gold if it's unsupported, +# so we need to make sure that intent matches result ourselves. +assert gold -> execFormatIsELF stdenv.targetPlatform; + # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as @@ -163,6 +171,7 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; + hasGold = gold; isGNU = true; }; From 0908812372ad7f983645530de1d32e1563adacd3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 13:33:12 +0200 Subject: [PATCH 0143/1062] haskell.compiler.*: check bintools.hasGold before enabling ld.gold --- pkgs/development/compilers/ghc/8.10.4.nix | 3 ++- pkgs/development/compilers/ghc/8.8.4.nix | 3 ++- pkgs/development/compilers/ghc/9.0.1.nix | 3 ++- pkgs/development/compilers/ghc/head.nix | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix index 07784c426479..b0fb726e9c6f 100644 --- a/pkgs/development/compilers/ghc/8.10.4.nix +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -122,7 +122,8 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); runtimeDeps = [ targetPackages.stdenv.cc.bintools diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index bb2267c930de..74260af7d31c 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -131,7 +131,8 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); runtimeDeps = [ targetPackages.stdenv.cc.bintools diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index 30a7f7a4f40a..37e03ccd4c9e 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -123,7 +123,8 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); runtimeDeps = [ targetPackages.stdenv.cc.bintools diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2ea14b78cc4a..7c4c419d4a1d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -133,7 +133,8 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); runtimeDeps = [ targetPackages.stdenv.cc.bintools From 6e1214d9da3d7551d3723593417c66ad8f41c657 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Tue, 17 Aug 2021 18:45:38 -0700 Subject: [PATCH 0144/1062] aliases: fix eval Due to master->staging semantic merge conflict Linux 5.12 was removed in master in e55554491df6e7b789d7f3d6a3b354df3575e1c6 but not from the staging aliases in c62f911507977ac67fd5e8547af2d1071c5e0891 --- pkgs/top-level/aliases.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bb50e4d42e85..4c68ee69fac6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -451,7 +451,6 @@ mapAliases ({ linuxPackages_4_19 = linuxKernel.packages.linux_4_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; - linuxPackages_5_12 = linuxKernel.packages.linux_5_12; linuxPackages_5_13 = linuxKernel.packages.linux_5_13; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; @@ -467,7 +466,6 @@ mapAliases ({ linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; - linux_5_12 = linuxKernel.kernels.linux_5_12; linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; # added 2020-04-04 From cb41c9c23e156274436ee336c6e69b93e0d73045 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Wed, 18 Aug 2021 00:36:35 -0600 Subject: [PATCH 0145/1062] bottles: added `cabextract` and `wineWowPacakge.minimal` > cabextract is needed to install wants using the dependencies menu. The wine packages are needed when switching dxvk or vkd3d in a bottle. Based on review by mschuwalow --- pkgs/applications/misc/bottles/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 8f7bfc4520fb..52f4e8def20e 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -3,7 +3,7 @@ , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 -, steam-run-native, xdg-utils, pciutils +, steam-run, xdg-utils, pciutils, cabextract, wineWowPackages }: python3Packages.buildPythonApplication rec { @@ -54,9 +54,11 @@ python3Packages.buildPythonApplication rec { liblarch patool ] ++ [ - steam-run-native + steam-run xdg-utils pciutils + cabextract + wineWowPackages.minimal ]; format = "other"; @@ -67,10 +69,10 @@ python3Packages.buildPythonApplication rec { substituteInPlace build-aux/meson/postinstall.py \ --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" substituteInPlace src/runner.py \ - --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ - --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}" + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ + --replace " {dxvk_setup}" " ${steam-run}/bin/steam-run {dxvk_setup}" substituteInPlace src/runner_utilities.py \ - --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ ''; preFixup = '' From 3af43aa8792e654f77f3e63749a6d0f5b948fb70 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Tue, 17 Aug 2021 23:42:23 -0700 Subject: [PATCH 0146/1062] linux-kernels: fix missing linux-hardened kernels due to merge conflict --- pkgs/top-level/linux-kernels.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 85929255b186..2bae5140b14e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -189,6 +189,13 @@ let linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel; + linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; + + linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { }; + linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; + linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; + linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; + }); /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -417,9 +424,9 @@ let }); # Hardened Linux - hardenedPackagesFor = kernel': overrides: + hardenedKernelFor = kernel': overrides: let kernel = kernel'.override overrides; - in packagesFor (kernel.override { + in kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit lib; inherit (kernel) version; @@ -429,7 +436,8 @@ let ]; modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; isHardened = true; - }); + }; + hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); vanillaPackages = { # recurse to build modules for the kernels From 8097f2e121262f03a8188feeef0e96d68d977f97 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Tue, 17 Aug 2021 23:43:21 -0700 Subject: [PATCH 0147/1062] all-packages: fix eval due to aliased hardened kernels --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4161e8ee25c3..36aa12b7eb69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21141,10 +21141,10 @@ with pkgs; linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened; linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; - linuxPackages_5_4_hardened = linuxKernel.linux_5_4_hardened.linux_latest_hardened; - linux_5_4_hardened = linuxPackages_5_4_hardened.kernel; + linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; + linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; - linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; + linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; From 34150f86c0a6b9d452bab09157896c3b85b103d1 Mon Sep 17 00:00:00 2001 From: roblabla Date: Tue, 22 Jun 2021 17:55:14 +0200 Subject: [PATCH 0148/1062] linux-kernel: Enable BTF BTF is a new, lightweight debug information format tailored specifically for the needs of eBPF, allowing eBPF programs to be portable across various kernel versions, configurations and distributions. This is used by bpftrace and lots of new eBPF-based tooling to avoid a dependency on LLVM on the host. BTF debug information is enabled on all major distributions: Fedora 31+, RHEL 8.2+, Ubuntu 20.10, Debian 11 and ArchLinux all have enabled it. Enabling BTF debug information requires adding two new dependencies to the kernel build: Python3 and pahole. Those will be used to generate the BTF debugging information. --- pkgs/os-specific/linux/kernel/common-config.nix | 7 ++++++- pkgs/os-specific/linux/kernel/manual-config.nix | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1ce4a21e2424..38bb2c4ebd07 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -35,7 +35,12 @@ let options = { debug = { - DEBUG_INFO = if (features.debug or false) then yes else no; + # Necessary for BTF + DEBUG_INFO = mkMerge [ + (whenOlder "5.2" (if (features.debug or false) then yes else no)) + (whenAtLeast "5.2" yes) + ]; + DEBUG_INFO_BTF = whenAtLeast "5.2" yes; DEBUG_KERNEL = yes; DEBUG_DEVRES = no; DYNAMIC_DEBUG = yes; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 77add0aef539..12eca63e2162 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, gawk, python3Minimal +, libelf, cpio, elfutils, zstd, gawk, python3Minimal, zlib, pahole , writeTextFile }: @@ -316,10 +316,12 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] - ++ optional (lib.versionAtLeast version "5.2") cpio + ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] ++ optional (lib.versionAtLeast version "5.8") elfutils ; + buildInputs = optional (lib.versionAtLeast version "5.2") zlib; + hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; # Absolute paths for compilers avoid any PATH-clobbering issues. From 65228574c19f1844fc528fbac6c9b3c53c7aac5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Aug 2021 12:14:31 +0200 Subject: [PATCH 0149/1062] python3Packages.trustme: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/trustme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 556ca3e2e6ed..2bcf9b58fa99 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3dcfbe186bf33d146347c6180b67564257f2708960027ab6d24fea2865daabca"; + sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; }; checkInputs = [ From 9c1be96143b821a34d2cbbfed6e35fefe6ba06b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Aug 2021 12:26:19 +0200 Subject: [PATCH 0150/1062] python3Packages.trustme: add pythonImportsCheck --- pkgs/development/python-modules/trustme/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 2bcf9b58fa99..103878ccac69 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -42,10 +42,12 @@ buildPythonPackage rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = { + pythonImportsCheck = [ "trustme" ]; + + meta = with lib; { description = "High quality TLS certs while you wait, for the discerning tester"; homepage = "https://github.com/python-trio/trustme"; - license = with lib.licenses; [ mit asl20 ]; - maintainers = with lib.maintainers; [ catern ]; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ catern ]; }; } From c521a5b95c056c24b59c0b9afa27a61e9f7c0289 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 18 Aug 2021 16:39:05 +0200 Subject: [PATCH 0151/1062] networkmanager: 1.32.8 -> 1.32.10 - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.32.10/NEWS --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 359c880c8531..8a1a6dd8fa1b 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.8"; + version = "1.32.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-5+Qq0FrXuQVPviJ5MPQCE/Lp169k3SVC5gMYoLGnbHU="; + sha256 = "sha256-PlzMZoBWWePxGnGOOlmflya3mgHW/xSBS+ati8Xai7g="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From b21740ed4852795541e250f4e86915c2365699e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Aug 2021 20:54:05 +0200 Subject: [PATCH 0152/1062] python3Packages.sqlalchemy: 1.4.22 -> 1.4.23 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 37e89abf8da9..819f29497246 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.22"; + version = "1.4.23"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7BvibNzNYNGANZpSfVmA2VmiYmmix7GzJ6HuoMqzftg="; + sha256 = "sha256-dv8kaIH1KAib8ZOFExuWYZe7SUZTmQOW0s4TjipEdYM="; }; propagatedBuildInputs = [ From 805d4ee7da13360d7e016ea67b1592016202c63f Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 18 Aug 2021 22:00:19 +0200 Subject: [PATCH 0153/1062] glew: support cross-compilation --- pkgs/development/libraries/glew/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 53c9b5a30dc9..ae32bbe95223 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { makeFlags = [ "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}" + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" ]; enableParallelBuilding = true; From 4a8dca9c3587bbfc71082c1f1fe0151a07318d36 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 18 Aug 2021 22:12:13 +0200 Subject: [PATCH 0154/1062] gstreamer-base: support cross-compilation This should also at least enable cross support for gstreamer-plugins-good --- pkgs/development/libraries/gstreamer/base/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 3e00050ada2f..1edadf0a51bc 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -107,6 +107,7 @@ stdenv.mkDerivation rec { "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dintrospection=disabled" + "-Dtests=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" # TODO How to disable Wayland? From 457c8a7f5b20791384b17c348c36b3f235b74927 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Wed, 18 Aug 2021 13:57:18 -0700 Subject: [PATCH 0155/1062] gpgme: move flaky patch URLs to local files. --- pkgs/development/libraries/gpgme/default.nix | 20 +-- .../libraries/gpgme/fix_gpg_list_keys.diff | 12 ++ .../libraries/gpgme/test_t-edit-sign.diff | 125 ++++++++++++++++++ 3 files changed, 141 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff create mode 100644 pkgs/development/libraries/gpgme/test_t-edit-sign.diff diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 9cbf5c39a7e7..c1c9460fad69 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -21,22 +21,10 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { # probably included in > 1.16.0 - name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test - urls = [ - "https://files.gnupg.net/file/data/w43xz2zf73pnyqk5mm5l/PHID-FILE-hm2x5mjntsdyxrxve5tb/file" - "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969" - ]; - sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h"; - }) - (fetchpatch { # gpg: Send --with-keygrip when listing keys - name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; - urls = [ - "https://files.gnupg.net/file/data/2ufcg7ny5jdnv7hmewb4/PHID-FILE-7iwvryn2btti6txr3bsz/file" - "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992" - ]; - sha256 = "0y0b0lb2nq5p9kx13b59b2jaz157mvflliw1qdvg1v1hynvgb8m4"; - }) + # probably included in > 1.16.0 + ./test_t-edit-sign.diff + # https://dev.gnupg.org/rMc4cf527ea227edb468a84bf9b8ce996807bd6992 + ./fix_gpg_list_keys.diff # https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html (fetchpatch { name = "0001-Fix-python-tests-on-non-Linux.patch"; diff --git a/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff b/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff new file mode 100644 index 000000000000..bd8da4edd6e0 --- /dev/null +++ b/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff @@ -0,0 +1,12 @@ +diff --git a/src/engine-gpg.c b/src/engine-gpg.c +index b51ea173..4e74665e 100644 +--- a/src/engine-gpg.c ++++ b/src/engine-gpg.c +@@ -3005,6 +3005,7 @@ gpg_keylist_build_options (engine_gpg_t gpg, int secret_only, + gpg_error_t err; + + err = add_arg (gpg, "--with-colons"); ++ err = add_arg (gpg, "--with-keygrip"); + + /* Since gpg 2.1.15 fingerprints are always printed, thus there is + * no more need to explicitly request them. */ \ No newline at end of file diff --git a/pkgs/development/libraries/gpgme/test_t-edit-sign.diff b/pkgs/development/libraries/gpgme/test_t-edit-sign.diff new file mode 100644 index 000000000000..55075b9eb126 --- /dev/null +++ b/pkgs/development/libraries/gpgme/test_t-edit-sign.diff @@ -0,0 +1,125 @@ +From 81a33ea5e1b86d586b956e893a5b25c4cd41c969 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= +Date: Sat, 26 Jun 2021 18:02:47 +0200 +Subject: [PATCH] core: Fix use-after-free issue in test + +* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New. +(main): Factored out signing and verifying the result. +-- + +Factoring the two steps of the test into different functions fixes the +use-after-free issue that was caused by accidentaly using a variable +of the first step in the second step. + +GnuPG-bug-id: 5509 +--- + tests/gpg/t-edit-sign.c | 54 ++++++++++++++++++++++++++++------------- + 1 file changed, 37 insertions(+), 17 deletions(-) + +diff --git a/tests/gpg/t-edit-sign.c b/tests/gpg/t-edit-sign.c +index 2f983622..e0494c54 100644 +--- a/tests/gpg/t-edit-sign.c ++++ b/tests/gpg/t-edit-sign.c +@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd) + } + + +-int +-main (int argc, char **argv) ++void ++sign_key (const char *key_fpr, const char *signer_fpr) + { + gpgme_ctx_t ctx; + gpgme_error_t err; + gpgme_data_t out = NULL; +- const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */ + gpgme_key_t signing_key = NULL; +- const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */ + gpgme_key_t key = NULL; +- gpgme_key_t signed_key = NULL; +- gpgme_user_id_t signed_uid = NULL; +- gpgme_key_sig_t key_sig = NULL; + char *agent_info; +- int mode; +- +- (void)argc; +- (void)argv; +- +- init_gpgme (GPGME_PROTOCOL_OpenPGP); + + err = gpgme_new (&ctx); + fail_if_err (err); + +- /* Sign the key */ + agent_info = getenv("GPG_AGENT_INFO"); + if (!(agent_info && strchr (agent_info, ':'))) + gpgme_set_passphrase_cb (ctx, passphrase_cb, 0); +@@ -159,8 +147,23 @@ main (int argc, char **argv) + gpgme_data_release (out); + gpgme_key_unref (key); + gpgme_key_unref (signing_key); ++ gpgme_release (ctx); ++} ++ ++ ++void ++verify_key_signature (const char *key_fpr, const char *signer_keyid) ++{ ++ gpgme_ctx_t ctx; ++ gpgme_error_t err; ++ gpgme_key_t signed_key = NULL; ++ gpgme_user_id_t signed_uid = NULL; ++ gpgme_key_sig_t key_sig = NULL; ++ int mode; ++ ++ err = gpgme_new (&ctx); ++ fail_if_err (err); + +- /* Verify the key signature */ + mode = gpgme_get_keylist_mode (ctx); + mode |= GPGME_KEYLIST_MODE_SIGS; + err = gpgme_set_keylist_mode (ctx, mode); +@@ -168,7 +171,7 @@ main (int argc, char **argv) + err = gpgme_get_key (ctx, key_fpr, &signed_key, 0); + fail_if_err (err); + +- signed_uid = key->uids; ++ signed_uid = signed_key->uids; + if (!signed_uid) + { + fprintf (stderr, "Signed key has no user IDs\n"); +@@ -180,7 +183,7 @@ main (int argc, char **argv) + exit (1); + } + key_sig = signed_uid->signatures->next; +- if (strcmp ("2D727CC768697734", key_sig->keyid)) ++ if (strcmp (signer_keyid, key_sig->keyid)) + { + fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n", + key_sig->keyid); +@@ -196,6 +199,23 @@ main (int argc, char **argv) + + gpgme_key_unref (signed_key); + gpgme_release (ctx); ++} ++ ++ ++int ++main (int argc, char **argv) ++{ ++ const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */ ++ const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16; ++ const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */ ++ ++ (void)argc; ++ (void)argv; ++ ++ init_gpgme (GPGME_PROTOCOL_OpenPGP); ++ ++ sign_key (key_fpr, signer_fpr); ++ verify_key_signature (key_fpr, signer_keyid); + + return 0; + } +-- +2.32.0 From cb2ed1c0abcfbc48c2e9f0824618cd6fb82b0863 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 6 Aug 2021 13:56:32 +0200 Subject: [PATCH 0156/1062] apparmor: 3.0.1 -> 3.0.3 --- pkgs/os-specific/linux/apparmor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 5acf8e560e3d..344913888d57 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -20,7 +20,7 @@ }: let - apparmor-version = "3.0.1"; + apparmor-version = "3.0.3"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -32,7 +32,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${lib.versions.majorMinor apparmor-version}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "096zbg3v7b51x7f1ly61mzd3iy9alad6sd4lam98j2d6v5ragbcg"; + sha256 = "0nasq8pdmzkrf856yg1v8z5hcs0nn6gw2qr60ab0a7j9ixfv0g8m"; }; aa-teardown = writeShellScript "aa-teardown" '' @@ -56,7 +56,7 @@ let name = "0003-Added-missing-typedef-definitions-on-parser.patch"; sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0"; }) - ]; + ]; # Set to `true` after the next FIXME gets fixed or this gets some # common derivation infra. Too much copy-paste to fix one by one. From 649f0ed1a88f6e4cf00705b1cb2f1fbdf1fb780c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 17 Aug 2021 22:55:39 +0100 Subject: [PATCH 0157/1062] ffmpeg: enable basic tests --- pkgs/development/libraries/ffmpeg/2.8.nix | 1 + pkgs/development/libraries/ffmpeg/generic.nix | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 6d94c2e9974b..0df810ff10b0 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -7,4 +7,5 @@ callPackage ./generic.nix (rec { knownVulnerabilities = [ "CVE-2021-30123" ]; + doCheck = false; } // args) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d52abd4ab09f..aa7de6944cf7 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -17,7 +17,8 @@ # Darwin frameworks , Cocoa, darwinFrameworks ? [ Cocoa ] # Inherit generics -, branch, sha256, version, patches ? [], knownVulnerabilities ? [], ... +, branch, sha256, version, patches ? [], knownVulnerabilities ? [] +, doCheck ? true, ... }: /* Maintainer notes: @@ -187,7 +188,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = false; # fails + inherit doCheck; + checkPhase = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ + make check -j$NIX_BUILD_CORES + ''; # ffmpeg 3+ generates pkg-config (.pc) files that don't have the # form automatically handled by the multiple-outputs hooks. From 4b658eda801752204f8be29a8f8db343d12572dc Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 17 Aug 2021 22:55:48 +0100 Subject: [PATCH 0158/1062] ffmpeg-full: enable basic tests --- pkgs/development/libraries/ffmpeg-full/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 2fe917876667..77bd473485b0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -447,6 +447,14 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ] ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable + doCheck = true; + checkPhase = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ + make check -j$NIX_BUILD_CORES + ''; + # Hacky framework patching technique borrowed from the phantomjs2 package postInstall = optionalString qtFaststartProgram '' cp -a tools/qt-faststart $out/bin/ From b2ae763c42df36baa6d84420cf3ae9234c72fd7f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 19 Aug 2021 02:16:24 +0000 Subject: [PATCH 0159/1062] c-ares: enable parallel building --- pkgs/development/libraries/c-ares/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 90e7a895746b..4f571b7f1dd9 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-SAPIRM4gzlEO8OuD+OpB+iTsqunSgMRoxYLSuyWzkT0="; }; + enableParallelBuilding = true; + meta = with lib; { description = "A C library for asynchronous DNS requests"; homepage = "https://c-ares.haxx.se"; From e78c29201090fee21ae31fc29d34a1b328cecc86 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 19 Aug 2021 03:33:29 +0000 Subject: [PATCH 0160/1062] glibc: 2.33-47 -> 2.33-49 https://sourceware.org/bugzilla/show_bug.cgi?id=28213 --- .../libraries/glibc/2.33-master.patch.gz | Bin 56984 -> 58508 bytes pkgs/development/libraries/glibc/common.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index 59230761cd432b3ae6e9a6bad5b7367b138426ab..95edf3cfedd57b7db9782c88de575a9a8a9f176c 100644 GIT binary patch delta 3264 zcmV;x3_tUjy#tKN1F-Mcf9+j+bKAxd|J(c&R}O8HHA&$Okhbh7l;o(5Esf}m-LWzl z5D%I)NvH&=NKyUWySsM>96(S~6T6d{X2vps!@VDSd$+s4CG72l1?zN{ThZqQ2oEH% z7RYSlVM=Ru5Jk`}iDOJ$*Yqq`N7x=M@=Vi#!?>3i(1oTQRCWh!V|+V0g^(akVx%-_mM7(LI3xW`G}8bx{N{e3XLwJU|F(n8pE& zVP>|jf)%h88vVN!peH9ID%p?@sE^4be=~uz&GEkQ21fXb?pp{jdA4qIpgO4mTA({}B!vuCF<1X6*D6K4 zsb7Flu=nSONB-gI>GAQHs64%i0 zm>>01BUdUL(5;{NB{<=$Y%|H$Ln$#NrvRviut1ITVnx1^f3BpYs@N=xX4sZCWbsk^ zxl={-##;h(mqE)CBNd|B+^Gz0BEqKzEoY1;J6YE{IdB3$+ArBl6d;p$GFVMRyc|HU zBiMl18d(@j*~gkn;y1BfUDphI66&TGYT>|&2HM2XbUU)$I0`Jyiel*FLS`5&r>o5j z*b}JQ3%v1Ne+4(+P1AG==ieHM;hcF)w}yr@Gz^Kv>q@eB?K!?<4cR%@s@*L4J*+gK zMy%s7_kUG@eEdQVuxG(^3A+GnygA8|+h|$RvPG_%X(Y~R( zp24D3dU;8DENsqoR*Jl-Y(K|liX5}Gm^L86-7!D_k* zCi5H8%_G4Ea0W_IB#R`)7l!*4`9DBLrNKR|tWaMT{n4Pbg!d4^7;q5*<_DcPhYF|d z$E(?8r^_D4!L>j#XmD`Q<>wyCNJyic3D53$=!rHV3Ua8F&E=Zkw_cXyd?!F1$=6T1 z5g?Vle_l*z90CZN+Df;≠bS+}098Bk$Zv4D8h`UG>@P(TI`h1}Uq)K7Gd!r)3ov z-mLjZ$KgC!2^`Brh-P~U%#J<$f5Z(*$@zy+eaiW+vr&)Kh&j6QT;N|zIah<@x=}AK zf;Ft-U2@GI`hV-QA2-0L{d3-5r|CRX!Kd%pe=T)bOon9uX^vvu_F`w?CCNlf27#T# zv8n4`JcvER-leOO2=mtS^`RzNpdqOt!y4j+s;X^-vx{AXla(ysGvUvR*M~aq9 ze<{X3L69di)VYzlG+TVC`7qU*9Hm^O?&1E^3Nk+qKcx^4o)+=2bql{R>*HnGYoT_? z+tV*YPEzD1Cg3&|iX+&?CVTnBZuDfH{t~#-2PH&2P)zJRN1u>T_0}y>%m!Yw8>feo<{YH{r_Ks@&j&#lpuf6gUg60?_hbDj`Gld%^sE{;x*8@)&Ub$q?X zU*RzlOIuL@EhHcfjUEq!!XC}z;9rkaa?yEdj5@dPwG=Xu3b)Z|GN!wU()$WtXhAe_bT& zrFlEm2J0|1Px+YNG8D=%KJ373@sYo1?il+Em>N`PV98*7_!z_LrA)-94l_hBymJZA ze(RMwI`>Sli`FZcoUJ@{Qx-$*D8eC<29=!U4G{0gh4w^{&= z%scI`jUEO*c#Uu=!LS&VQZbdae*t;zjK)_1W5p8Q5%n*X<&3U?{A4MlCeWizx#FZc zLt0vWoONhI0lX1SX3MU?zlPFsiEn*&;-lN`laYV$_R#;~#{Qe5@%Z5Nk^kfAYybGL^X)0t&z;{$H=wuP zj9+sotM=SHaEF5;6G9##OHaZ2XJpg6ehx=|7g9MemJ2^@U`(=n1T z7%1*iKF`(xJ4-LqEA*9erJK4|=PTt6)azg~Wdk^u4Rv>DTJm1Xe>TMd4V|~ZE`ZAz zkB+s9_u>x9&`sqIO2|cp782gBlWH2?`6_0W%ZjxWTR_hS(^xR(;{G+);5;3}(P_1e zQO@!cS|K7F;5we)bfp@v;&4Lv+ZBhWO367CJt3fEs^Yg4ol8V~)P)nK3~{iU&lHGy zY*xF&%gacI4?#ghe-};SgbZ{=NzxV~UR+A0HlZfSk9OH*$}uW)mE-R>>pE)>sXNFW zqtcTpB<$@vhI8ZuW(efH=iw@wC9eBilyVIavrtz||}z!HZlY zsBQ32{dB2k&)VEBnfwnhVL_?j|0@P-@{*oQA0kx`c1+hMf4wwG=+t)aO8BPws}oPN zgLo2IhUr)docf&Dg3V0x0$00_(Lv~y$TLU+2Qhq(lcmX~UD*eQLU2D4?Cm8wj@$ZEZd#;(ZyTo#iB ze6(3CZe;HkacGD#QtF#UBu2Tdh^ibmdLZaCc(5R$^$b z+3$y*8x3rCU{)*`)Kr{St0APZX`##u{#TUJhx=TA{L_N#hLa^w{$waP|FhJU51xD& z$Om03VsiUSU3oT?XH$8$s)=mn*-@Td<=Io7e+LEV{^VC88;Zs|Hoz<%t>V!xVuhER zaGr*r4f#e9^wL}Tn^FYy8XOW~G0nGzQ>hZ|*VUkh>g;HtHgG0(par!$J6qW*N;`H1UQFfC}@=;=K zK-Qg~1y-G4__HhVzU|n)jmZ!a8;F;fe=U#&8j~d59KHiyI$eor%Juw#MOVLaG5mJ+ z(pfxZ2Q@3_DLloC%5neIT8`biyFbeMSyhYYESAlM(h(P|{RD!#?CFK}v?w2fM6Kbe zuO75vSXB6;+Bkj=C$!J1LnR7F9RlDVnLaF7=O-$+%Q;3ApFXSMYQ-{^V^TQ}f0emS zp8n(>KDfJk^Ww*XtS=OCYsOKrIVXGYt77c#k54nFG}f|njA1=nUDrO9nZ^Td&PYGI zpO5Y`!Aa*#F^Rn8l>4d;rwU^1(tO8d*~Oz)r5oPE(Hn)IyaJbWIB8ecz;5Nl8qz`@ zQaN?mle3b@U-P-LT%e+Km|oCNe|5p|(CV7up<>zampkWDcu+b{Kk zEDM4m4p*h*mEP8nJoV2H-=DL8!@~#`<2!mf`Y`%&JF4br+IFaDi7XUv9~SHdfjN}$ zbMOO)Zh-MQdV4zl$GB5uMi|aNy&eB_c6NIH4%T10S#wn8rp<&PBTw9MHgvIU7CK5L yEa+oGP@uclou}_1d%RF`__B+PLq{UC!t%51%JMv`P|x2CW%?f!&=B*zNdo}kplR3u delta 1728 zcmV;x20!_X$pe_Z1F-Mcf6ZNcZ`(Ey|GWAWoS?4u8aa||J?u8g0zcAh%>zk+4yX%3 z*2DGYNSS1($&7sW-5p8Ec5F8&wqZaL#}ePXJ05w*-x2n9!h%^gDR0r26^IBVzzcM3 z<9SYNb`V7{EQw={T({}9ToYk?jL2&?9oUR}i3LO0w8QnIS?tRFf4=A}ZK7#;+w@r4 z7u(IiZaI+~!xkV)3@d`^X|8TpH)iKc+QwIOP9T68;KN-GQ3NS`w1WHmfiTiAg98`? zWomap4r+x#KMV2n5f-DtHGDixKU9aqbg1$yCT770>drhn%76W&Jqy!nwrt1s+Q#yK zkGmSF$NipWghe{54cFMNO*zN7ON0!*IFY87Z-!UHQC`7^b!>_{=RC}c1n3lBqe=}!cp9I;+BWlj!AQ5v=i4dchJXX z(kPwE+H~qCJ_%0vu9%OCSw~t7DJTHCA>5$HdBu@OGL)2be-)b)(FFTagCaf|pX=+0 z-gruY;WCIVF;QizErZI?A|hgH5IbW!Imo6_FM$*I);?v2Xh0_OWRQSjj%7(CURR2}d(ZKmR)<}2uiAOa&tc^SYQ#DY z%lKCn$j4U-fISJuDXapp@RlM=E~BfKrhO2Se}TRd?8EZ@)rW75a6CDhLNtW;%F%~$?!)KLGj+q6oI0rDA5*PF#Re*zMam(Y~)5+u6W9p~eDFq%G) zZyp&oKr>jXifobO_`-0#qWA}>s3<(rN{;@r7>@?6C47Vk#(e*y@b`bwv|g^V{=oz@aUBOlyR4C>V+%Ny*Z+hufhgPc`QE2Iu-CNPuLf3iR{N3m&pvD5aFWMm}mz)s@0X_{W# zjy=oX=BvZGWWU_xE;-7qzfv+7g5^yh?hNI3*S016dfT(@R^)nKqv6_N+ld?_T6foZ zQueBk&XdVsp2U1fxO1a3b5uEV;0}f@KZ#L#M*Lt zK#T;ULDBg$sO-fw4*qqDtuuUEC~Hs{&4V0 zTXeg67(OzMBjCfQ0MBQdfLCHViaDs7&QJI^j4Q{qH1mt%mT6C`WO`QibGgGNe@x9Q zKIaRDMj6JZ9h5CT^FwvZ+z){?sLh~~!Tj(!2JWRo#H%{9#AEo*EkFm_(emtkgTRK` z5fGpBr>28^dqUb8u=AsA#PX+FuFNen&DgE8a=-O8Cee6Pl}EYpUorO zO3v0iEn**>SNgL)2@Gf-t*s`_ImwuW!{Oz0F*-$39Vg{~JLIefn^P zw@uE@fKqG!y|g{P_Rsp)*T*M)|NX^@Kj_u}eTntC{+)6IM(gbQghN@?K0QZj@Tw|N zfrNTWASMC#s)Eg8K{4deHYmUY4vInud4z6y3e~@$JH06{M4sKCVoSO(`my4LTLoL$ W>kmLw)i#Nty7D)l;|z6PG6MiZgJwkl diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index e651a8effac9..d2d7b6cc064c 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.33"; - patchSuffix = "-47"; + patchSuffix = "-49"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-47-gb5711025bc + glibc-2.33-49-g22d37364ae $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. From 061f70f8f76249394cff90019ce36593d42a1bb8 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 5 Aug 2021 12:00:00 +0000 Subject: [PATCH 0161/1062] ocaml: fix static compilation on recent versions --- pkgs/development/compilers/ocaml/generic.nix | 12 +++++++++++- pkgs/top-level/static.nix | 15 +-------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 2dd959600eac..fb1eddc6a622 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -56,7 +56,15 @@ stdenv.mkDerivation (args // { ++ optional aflSupport (flags "--with-afl" "-afl-instrument") ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime") - ; + ++ optional (stdenv.hostPlatform.isStatic && (lib.versionOlder version "4.08")) "-no-shared-libs" + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && lib.versionOlder version "4.08") [ + "-host ${stdenv.hostPlatform.config}" + "-target ${stdenv.targetPlatform.config}" + ]; + dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; + configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08") [ "host" "target" ]; + # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together + hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses @@ -70,6 +78,8 @@ stdenv.mkDerivation (args // { # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" + '' + optionalString (lib.versionOlder version "4.08" && stdenv.hostPlatform.isStatic) '' + configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r") ''; postBuild = '' mkdir -p $out/include diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 73fe6dbc8363..344ce47fc2ae 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -61,20 +61,7 @@ self: super: let super // { lablgtk = null; # Currently xlibs cause infinite recursion - ocaml = ((super.ocaml.override { useX11 = false; }).overrideAttrs (o: { - configurePlatforms = [ ]; - dontUpdateAutotoolsGnuConfigScripts = true; - })).overrideDerivation (o: { - preConfigure = '' - configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r") - ''; - dontAddStaticConfigureFlags = true; - configureFlags = [ - "--no-shared-libs" - "-host ${o.stdenv.hostPlatform.config}" - "-target ${o.stdenv.targetPlatform.config}" - ]; - }); + ocaml = super.ocaml.override { useX11 = false; }; }; in { From ddd479fe7c2500f4d2582467ba54dee007e43a58 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH 0162/1062] ocamlPackages.mkDerivation: use nativeBuildInputs for build tools --- pkgs/build-support/ocaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 88ed3dfc2c2f..cd17eb688c2e 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: -{ name, version, buildInputs ? [], +{ name, version, nativeBuildInputs ? [], createFindlibDestdir ? true, dontStrip ? true, minimumSupportedOcamlVersion ? null, @@ -19,7 +19,7 @@ in stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ buildInputs; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ nativeBuildInputs; setupHook = if setupHook == null && hasSharedObjects then writeText "setupHook.sh" '' From 856fa067c58fab38c3c5c1d4a03a63548789285a Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH 0163/1062] buildDunePackage: use nativeBuildInputs for build tools --- pkgs/build-support/ocaml/dune.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index c049878d0131..6c136930d3fe 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,6 +1,6 @@ { lib, stdenv, ocaml, findlib, dune_1, dune_2 }: -{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: +{ pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune_1; in @@ -33,7 +33,7 @@ stdenv.mkDerivation ({ name = "ocaml${ocaml.version}-${pname}-${version}"; - buildInputs = [ ocaml Dune findlib ] ++ buildInputs; + nativeBuildInputs = [ ocaml Dune findlib ] ++ nativeBuildInputs; meta = (args.meta or {}) // { platforms = args.meta.platforms or ocaml.meta.platforms; }; From 37962fc5fb3c7cd39b18448b28ecc8d259062db5 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH 0164/1062] python27: fix static build --- .../interpreters/python/cpython/2.7/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index ad2b7fe68605..108dfc5514b6 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -26,8 +26,8 @@ , sourceVersion , sha256 , passthruFun -, static ? false -, stripBytecode ? true +, static ? stdenv.hostPlatform.isStatic +, stripBytecode ? reproducibleBuild , rebuildBytecode ? true , reproducibleBuild ? false , enableOptimizations ? false @@ -187,8 +187,9 @@ let configureFlags = optionals enableOptimizations [ "--enable-optimizations" - ] ++ [ + ] ++ optionals (!static) [ "--enable-shared" + ] ++ [ "--with-threads" "--enable-unicode=ucs${toString ucsEncoding}" ] ++ optionals (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) [ From 36acee382058fcdc0a7dd69c633357457f022f36 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH 0165/1062] python3: fix static build --- pkgs/development/interpreters/python/cpython/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 76a66a648d84..cb273155a58f 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -287,10 +287,11 @@ in with passthru; stdenv.mkDerivation { PYTHONHASHSEED=0; configureFlags = [ - "--enable-shared" "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (!static) [ + "--enable-shared" ] ++ optionals enableOptimizations [ "--enable-optimizations" ] ++ optionals enableLTO [ From a9e262063072f4220414868ce4a4812e6676e374 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH 0166/1062] libbfd: fix static build --- pkgs/development/libraries/libbfd/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 499f04349b5d..154e604e4976 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -37,9 +37,8 @@ stdenv.mkDerivation { configureFlags = [ "--enable-targets=all" "--enable-64-bit-bfd" "--enable-install-libbfd" - "--enable-shared" "--with-system-zlib" - ]; + ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared"; enableParallelBuilding = true; From 652f7fafd2f06605bd82eb06f0eab7e0608abfb8 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH 0167/1062] libxml2: fix static build --- pkgs/development/libraries/libxml2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 1b58b4539e46..9a8cea6955d9 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -2,7 +2,7 @@ , zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null -, enableShared ? stdenv.hostPlatform.libc != "msvcrt" +, enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic , enableStatic ? !enableShared }: From 2d4dd130c2c46c14af96a7aeb8185a776a25e74c Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH 0168/1062] lzo: fix static build --- pkgs/development/libraries/lzo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index f5b0111a1a78..ad1c5d2c21e0 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; }; - configureFlags = [ "--enable-shared" ]; + configureFlags = lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared" ; enableParallelBuilding = true; From cd97a3d62e61a72eae56cf62b5933d9ecd45692d Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH 0169/1062] curl: fix static build by disabling gssSupport --- pkgs/tools/networking/curl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 984a6ecaaef8..d14b1156670f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -7,7 +7,7 @@ , gnutlsSupport ? false, gnutls ? null , wolfsslSupport ? false, wolfssl ? null , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null -, gssSupport ? with stdenv.hostPlatform; !( +, gssSupport ? with stdenv.hostPlatform; ( !isWindows && # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 !isStatic && From a2c566265e5a0d1b414b1115ac6d7320296e3958 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 11 Aug 2021 12:00:00 +0000 Subject: [PATCH 0170/1062] ocaml: add strictDeps = true --- pkgs/development/compilers/ocaml/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index fb1eddc6a622..0f4f428c51f2 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation (args // { inherit src; + strictDeps = true; + prefixKey = "-prefix "; configureFlags = let flags = new: old: From 79b32fc42239cb0c24baec8fbf7b2cebf83e3e62 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 11 Aug 2021 12:00:00 +0000 Subject: [PATCH 0171/1062] python27: use strictDeps = true; --- pkgs/development/interpreters/python/cpython/2.7/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 108dfc5514b6..fd7e684113e7 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -227,6 +227,7 @@ let ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" ++ optional static "LDFLAGS=-static"; + strictDeps = true; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib ] From b1b230596f0fa29c4cf2432a2f8dbeed524c497c Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 11 Aug 2021 12:00:00 +0000 Subject: [PATCH 0172/1062] libbfd: add strictDeps = true --- pkgs/development/libraries/libbfd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 154e604e4976..1e2938d3a8e0 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { # We update these ourselves dontUpdateAutotoolsGnuConfigScripts = true; + strictDeps = true; nativeBuildInputs = [ autoreconfHook bison ]; buildInputs = [ libiberty zlib.dev ]; From bf74dfbc54b6c25397d1094a07c1e5a5a3d4d645 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 11 Aug 2021 12:00:00 +0000 Subject: [PATCH 0173/1062] libxml2: add strictDeps = true --- pkgs/development/libraries/libxml2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 9a8cea6955d9..c98a1cbce0e9 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; + strictDeps = true; + buildInputs = lib.optional pythonSupport python ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses From 842c163b4f1469a6a70325f475c9681dea873c0f Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 11 Aug 2021 12:00:00 +0000 Subject: [PATCH 0174/1062] lzo: add strictDeps = true; --- pkgs/development/libraries/lzo/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index ad1c5d2c21e0..480e2bb909cd 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; + strictDeps = true; + meta = with lib; { description = "Real-time data (de)compression library"; longDescription = '' From 73dee3ad4efc9429f611403b75c7f582d90d0e4d Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 11 Aug 2021 12:00:00 +0000 Subject: [PATCH 0175/1062] python3: add strictDeps = true --- pkgs/development/interpreters/python/cpython/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index cb273155a58f..8e340dd3b146 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -101,6 +101,8 @@ let version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; + strictDeps = true; + nativeBuildInputs = optionals (!stdenv.isDarwin) [ autoreconfHook ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [ From 81d185ad5de88f1eb2027024654b77a727866407 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 11 Aug 2021 12:00:00 +0000 Subject: [PATCH 0176/1062] curl: add strictDeps = true --- pkgs/tools/networking/curl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d14b1156670f..4fd754a3a6c7 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -63,6 +63,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + strictDeps = true; + nativeBuildInputs = [ pkg-config perl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains From c47609456e9ea6b73b1e602e7739767689f4163a Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0177/1062] pkgStatics.ocaml-ng: fix eval when there are no buildInputs --- pkgs/top-level/static.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 344ce47fc2ae..da66cbfbe2c3 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -51,7 +51,7 @@ self: super: let b.overrideAttrs (o: { configurePlatforms = [ ]; dontAddStaticConfigureFlags = true; - buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ]; + buildInputs = (o.buildInputs or [ ]) ++ o.nativeBuildInputs or [ ]; propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ]; }); From e6f82a9ec108a22faa9f95576f756ec865102139 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0178/1062] ocamlPackages.easy-format: fix nativeBuildInputs vs buildInputs --- pkgs/development/ocaml-modules/easy-format/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index 6a3566fda2b6..161e263e129b 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "00ga7mrlycjc99gzp3bgx6iwhf7i6j8856f8xzrf1yas7zwzgzm9"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; createFindlibDestdir = true; From 2c35af220559ee4bae7339d55cd25f87de5f835a Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0179/1062] dune: fix buildInputs vs nativeBuildInputs --- pkgs/development/tools/ocaml/dune/1.nix | 3 ++- pkgs/development/tools/ocaml/dune/2.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/1.nix b/pkgs/development/tools/ocaml/dune/1.nix index ad908787911b..1c74980eb951 100644 --- a/pkgs/development/tools/ocaml/dune/1.nix +++ b/pkgs/development/tools/ocaml/dune/1.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1rkc8lqw30ifjaz8d81la6i8j05ffd0whpxqsbg6dci16945zjvp"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; buildFlags = [ "release" ]; makeFlags = [ diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 3945389e8cd1..4dadba4e62e3 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; buildFlags = "release"; From 4c0020beabe366f5477935a6aed633a407425d08 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0180/1062] ocamlPackages.findlib: fix buildInputs vs nativeBuildInputs --- pkgs/development/tools/ocaml/findlib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 2286c0945fcf..86685493d4c6 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-K0K4vVRIjWTEvzy3BUtLN70wwdwSvUMeoeTXrYqYD+I="; }; - buildInputs = [m4 ncurses ocaml]; + nativeBuildInputs = [m4 ocaml]; + buildInputs = [ ncurses ]; patches = [ ./ldconf.patch ./install_topfind.patch ]; From fc3806b422edc0ec6709b1719c875941360f47cb Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0181/1062] ocamlPackages.gen: fix cross --- pkgs/development/ocaml-modules/gen/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 04d1a0816606..77fc0b63c55e 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation { sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h"; }; - buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ qtest ounit ]; + strictDeps = true; configureFlags = [ "--enable-tests" From 0631aa0cb302f5e953f2bdbc0326c22ca2d62799 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0182/1062] ocamlPackages.process: fix static cross --- pkgs/development/ocaml-modules/process/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix index 34ca51f07392..aecf03987ab1 100644 --- a/pkgs/development/ocaml-modules/process/default.nix +++ b/pkgs/development/ocaml-modules/process/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0m1ldah5r9gcq09d9jh8lhvr77910dygx5m309k1jm60ah9mdcab"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; createFindlibDestdir = true; From 0b134b0a9c0f8f12e4dbeca790e2bb8408ec2196 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0183/1062] ocamlPackages.seq: fix static cross --- pkgs/development/ocaml-modules/seq/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/pkgs/development/ocaml-modules/seq/default.nix index aa0546dd390b..44503668ff0a 100644 --- a/pkgs/development/ocaml-modules/seq/default.nix +++ b/pkgs/development/ocaml-modules/seq/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation ({ sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; createFindlibDestdir = true; From dd8a67479603f826c33d85a7fc45db1d59e27516 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0184/1062] ocamlPackages.wasm: fix static cross --- pkgs/development/ocaml-modules/wasm/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index c89449264889..4befff2721b9 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { sha256 = "1kp72yv4k176i94np0m09g10cviqp2pnpm7jmiq6ik7fmmbknk7c"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + + # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together + hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; makeFlags = [ "-C" "interpreter" ]; From a99983b48baa81a32ab1d7686e10cf9fe71474fa Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0185/1062] ocamlPackages.zarith: fix static cross --- pkgs/development/ocaml-modules/zarith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index eed6b158d4a6..12523b7bc7d1 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; propagatedBuildInputs = [ gmp ]; + strictDeps = true; dontAddPrefix = true; configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ]; From e98be5d5e09cd1c43789cba9d681cf0799d2e957 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0186/1062] ocamlPackages.findlib: refactor --- .../tools/ocaml/findlib/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 86685493d4c6..3d4c919bd835 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -16,19 +16,14 @@ stdenv.mkDerivation rec { dontAddPrefix=true; - preConfigure='' - configureFlagsArray=( - -bindir $out/bin - -mandir $out/share/man - -sitelib $out/lib/ocaml/${ocaml.version}/site-lib - -config $out/etc/findlib.conf - ) - ''; + configureFlags = [ + "-bindir" "${placeholder "out"}/bin" + "-mandir" "${placeholder "out"}/share/man" + "-sitelib" "${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" + "-config" "${placeholder "out"}/etc/findlib.conf" + ]; - buildPhase = '' - make all - make opt - ''; + buildFlags = [ "all" "opt" ]; setupHook = writeText "setupHook.sh" '' addOCamlPath () { From a3ab43d3a45338f845a0f8a12ed34e84c8b79dae Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0187/1062] ocamlPackages.findlib: create destdir even when there are no buildInputs --- pkgs/development/tools/ocaml/findlib/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 3d4c919bd835..4b02231b471f 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" fi + } + createOcamlDestDir () { export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "''${createFindlibDestdir-}"; then mkdir -p $OCAMLFIND_DESTDIR @@ -40,6 +42,7 @@ stdenv.mkDerivation rec { } addEnvHooks "$targetOffset" addOCamlPath + preConfigureHooks+=(createOcamlDestDir) ''; meta = { From ce31d529bccc12b28621f98d5d8875737946687a Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0188/1062] ocamlbuild: fix static cross --- pkgs/development/tools/ocaml/ocamlbuild/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 926838ede545..d4c7cfcac164 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; + + # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together + hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; configurePhase = '' make -f configure.make Makefile.config \ From fd60747cbded525bcc57e5f641a559d7ac6957bd Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0189/1062] ocamlPackages.syslog: fix static cross --- pkgs/development/ocaml-modules/syslog/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix index c97f1225663e..9614c404c5b9 100644 --- a/pkgs/development/ocaml-modules/syslog/default.nix +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1kqpc55ppzv9n555qgqpda49n7nvkqimzisyjx2a7338r7q4r5bw"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; buildFlags = [ "all" "opt" ]; From 9ae5ae736ae34a95785deec309e10ec29875d1cc Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0190/1062] opaline: fix static build --- pkgs/development/tools/ocaml/opaline/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix index 9cdacd289d49..d9ba33bb473e 100644 --- a/pkgs/development/tools/ocaml/opaline/default.nix +++ b/pkgs/development/tools/ocaml/opaline/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1aj1fdqymq3pnr39h47hn3kxk5v9pnwx0jap1z2jzh78x970z21m"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild opam-file-format ]; + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ]; + buildInputs = with ocamlPackages; [ opam-file-format ]; preInstall = "mkdir -p $out/bin"; From 6506d2ae4ddc7370c118f124f24d2db9932b8ce2 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0191/1062] pkgsStatic.ocaml: migrate some logic from static adapter to ocaml --- pkgs/development/compilers/ocaml/generic.nix | 4 ++-- pkgs/top-level/static.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 0f4f428c51f2..e4cec4cf52ed 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -3,7 +3,7 @@ let versionNoPatch = "${toString major_version}.${toString minor_version}"; version = "${versionNoPatch}.${toString patch_version}"; - safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); + safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic); in { lib, stdenv, fetchurl, ncurses, buildEnv, libunwind @@ -13,7 +13,7 @@ in , spaceTimeSupport ? false }: -assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; +assert useX11 -> safeX11 stdenv; assert aflSupport -> lib.versionAtLeast version "4.05"; assert flambdaSupport -> lib.versionAtLeast version "4.03"; assert spaceTimeSupport -> lib.versionAtLeast version "4.04"; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index da66cbfbe2c3..39923b0f59a7 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -61,7 +61,7 @@ self: super: let super // { lablgtk = null; # Currently xlibs cause infinite recursion - ocaml = super.ocaml.override { useX11 = false; }; + ocaml = super.ocaml; }; in { From 41e07ee477012daa36857027695a377046ba3369 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0192/1062] pkgsStatic.ocaml-ng: migrate more logic to derivations --- pkgs/development/tools/ocaml/dune/1.nix | 3 ++- pkgs/top-level/static.nix | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/1.nix b/pkgs/development/tools/ocaml/dune/1.nix index 1c74980eb951..79707a3c0090 100644 --- a/pkgs/development/tools/ocaml/dune/1.nix +++ b/pkgs/development/tools/ocaml/dune/1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib }: +{ stdenv, lib, fetchurl, ocaml, findlib, ncurses }: if !lib.versionAtLeast ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.12" @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ ncurses ]; strictDeps = true; buildFlags = [ "release" ]; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 39923b0f59a7..2ca24175cfa0 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -51,8 +51,6 @@ self: super: let b.overrideAttrs (o: { configurePlatforms = [ ]; dontAddStaticConfigureFlags = true; - buildInputs = (o.buildInputs or [ ]) ++ o.nativeBuildInputs or [ ]; - propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ]; }); ocamlStaticAdapter = _: super: From a17fc0337522b002166730d94e32f3b1517e0817 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH 0193/1062] pkgsStatic.ocaml-ng: migrate static adapter to derivations themselves --- pkgs/build-support/ocaml/dune.nix | 2 ++ .../ocaml-modules/bolt/default.nix | 2 ++ .../ocaml-modules/hacl-star/raw.nix | 2 ++ .../janestreet/buildOcamlJane.nix | 2 ++ .../janestreet/js-build-tools.nix | 2 ++ .../ocaml-modules/javalib/default.nix | 2 ++ .../ocaml-modules/labltk/default.nix | 2 ++ .../ocaml-modules/ocamlnet/default.nix | 2 ++ .../ocaml-modules/ocsigen-server/default.nix | 2 ++ .../ocaml-modules/sawja/default.nix | 2 ++ .../ocaml-modules/zarith/default.nix | 2 ++ pkgs/development/tools/ocaml/dune/1.nix | 2 ++ pkgs/development/tools/ocaml/dune/2.nix | 2 ++ .../tools/ocaml/findlib/default.nix | 2 ++ pkgs/top-level/static.nix | 20 ------------------- 15 files changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 6c136930d3fe..6bdec501630e 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -12,6 +12,8 @@ else stdenv.mkDerivation ({ inherit enableParallelBuilding; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; buildPhase = '' runHook preBuild diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 54bc28697ec4..ea32d659f646 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -42,6 +42,8 @@ EOF # The custom `configure` script does not expect the --prefix # option. Installation is handled by ocamlfind. dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index cd1217b97101..aa787c9a91a0 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { installTargets = "install-hacl-star-raw"; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; buildInputs = [ which diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix index fdb0d8034e69..62876e5eaf94 100644 --- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix +++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -17,6 +17,8 @@ buildOcaml (args // { buildInputs = [ ocaml_oasis js_build_tools opaline ] ++ buildInputs; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configurePhase = "./configure --prefix $out"; diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index ff03c209190d..2f68ee8230e7 100644 --- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -16,6 +16,8 @@ buildOcaml rec { buildInputs = [ ocaml_oasis opaline ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configurePhase = "./configure --prefix $prefix"; installPhase = "opaline -prefix $prefix -libdir $OCAMLFIND_DESTDIR ${name}.install"; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index d158e4216ab4..15678f89da3c 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { configureScript = "./configure.sh"; dontAddPrefix = "true"; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; propagatedBuildInputs = [ camlzip extlib ]; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 5a6daa54de39..3161b56239d0 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; buildFlags = [ "all" "opt" ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index bdbbf1d8c67f..5c3ca95bb0d8 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; preConfigure = '' configureFlagsArray=( diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 25d45d9aed9b..96a66874c759 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -40,6 +40,8 @@ buildDunePackage rec { configureFlags = [ "--root $(out)" "--prefix /" ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; postConfigure = '' make -C src confs diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 68a8731201d6..30ac2cfb22dd 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation { configureScript = "./configure.sh"; dontAddPrefix = "true"; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; propagatedBuildInputs = [ javalib ]; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 12523b7bc7d1..95351caee307 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { strictDeps = true; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ]; preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; diff --git a/pkgs/development/tools/ocaml/dune/1.nix b/pkgs/development/tools/ocaml/dune/1.nix index 79707a3c0090..74deb9d2fa55 100644 --- a/pkgs/development/tools/ocaml/dune/1.nix +++ b/pkgs/development/tools/ocaml/dune/1.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; meta = with lib; { homepage = "https://dune.build/"; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 4dadba4e62e3..16f33268cf1e 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildFlags = "release"; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 4b02231b471f..497a8ce91c1d 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./ldconf.patch ./install_topfind.patch ]; dontAddPrefix=true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configureFlags = [ "-bindir" "${placeholder "out"}/bin" diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 2ca24175cfa0..38f6a8fad424 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -47,21 +47,6 @@ self: super: let # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) ; - ocamlFixPackage = b: - b.overrideAttrs (o: { - configurePlatforms = [ ]; - dontAddStaticConfigureFlags = true; - }); - - ocamlStaticAdapter = _: super: - self.lib.mapAttrs - (_: p: if p ? overrideAttrs then ocamlFixPackage p else p) - super - // { - lablgtk = null; # Currently xlibs cause infinite recursion - ocaml = super.ocaml; - }; - in { stdenv = foldl (flip id) super.stdenv staticAdapters; @@ -78,11 +63,6 @@ in { gssSupport = false; }; - ocaml-ng = self.lib.mapAttrs (_: set: - if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set - ) super.ocaml-ng; - - zlib = super.zlib.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag From a5c133a4b4fec615c31de82f5235709ecbcab6c0 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 19 Aug 2021 12:00:00 +0000 Subject: [PATCH 0194/1062] ocamlbuild: fix build findlib's setup hook is now a preConfigure setup hook, so make sure to run it --- pkgs/development/tools/ocaml/ocamlbuild/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index d4c7cfcac164..e3043d46ee5e 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -19,11 +19,15 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; configurePhase = '' + runHook preConfigure + make -f configure.make Makefile.config \ "OCAMLBUILD_PREFIX=$out" \ "OCAMLBUILD_BINDIR=$out/bin" \ "OCAMLBUILD_MANDIR=$out/share/man" \ "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR" + + runHook postConfigure ''; meta = with lib; { From 82571f3636140a1c4a7d91138d8cf451bd0a2ced Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 19 Aug 2021 17:10:35 +0100 Subject: [PATCH 0195/1062] re2c: 2.1.1 -> 2.2 Pull in new python3 tests-only dependency. --- .../development/tools/parsing/re2c/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index a945f3bdde03..c3b09b71d173 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, python3 +}: stdenv.mkDerivation rec { pname = "re2c"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "06nvk5sf4vrc2bvpj4vi2xwy3ggv548sn530drz5fi67nhzgga26"; + sha256 = "0snfxk1cf2f4dy4hcxd1fx1grav3di0qjgqqn97k85zsf9f6ys78"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + python3 + ]; doCheck = true; enableParallelBuilding = true; preCheck = '' - patchShebangs run_tests.sh + patchShebangs run_tests.py ''; meta = with lib; { From 8761186f0a69b8aa90a034d66386ae3eb21f3886 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Jul 2021 11:44:16 +0200 Subject: [PATCH 0196/1062] mesa: 21.1.7 -> 21.2.1 --- pkgs/development/libraries/mesa/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 876a3c015a0d..62e95dc8e993 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.1.7"; + version = "21.2.1"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,11 +45,9 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1fx7nfvh1drfa6vv34j7ma944qbs014b0jwlbgqlnbjgcl87rrp9"; + sha256 = "11qpq16xbxymcgiy0wk787dk4yw2pv8fzgj8d92ng6s11dqycr9c"; }; - prePatch = "patchShebangs ."; - # TODO: # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog @@ -64,12 +62,6 @@ self = stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - # For RISC-V support: - (fetchpatch { - name = "add-riscv-default-selections.patch"; - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/9908da1b7a5eaf0156d458e0e24b694c070ba345.patch"; - sha256 = "036gv95m5gzzs6qpgkydf5fwgdlm7kpbdfalg8vmayghd260rw1w"; - }) ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020 @@ -77,6 +69,8 @@ self = stdenv.mkDerivation { ]; postPatch = '' + patchShebangs . + substituteInPlace meson.build --replace \ "find_program('pkg-config')" \ "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" From 904625852d535bbe53cadb006c9e1137ab481818 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 19 Aug 2021 17:56:53 +0000 Subject: [PATCH 0197/1062] pkgsStatic: Inline more of static overlay --- pkgs/development/libraries/boost/generic.nix | 2 + pkgs/development/libraries/zlib/default.nix | 10 +++-- pkgs/stdenv/adapters.nix | 18 ++++++++ pkgs/tools/networking/curl/default.nix | 17 ++++---- pkgs/top-level/static.nix | 45 +++----------------- 5 files changed, 41 insertions(+), 51 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 7ea7902e0873..2d8d13482eac 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -189,6 +189,8 @@ stdenv.mkDerivation { configureScript = "./bootstrap.sh"; configurePlatforms = []; + dontDisableStatic = true; + dontAddStaticConfigureFlags = true; configureFlags = [ "--includedir=$(dev)/include" "--libdir=$(out)/lib" diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index a9fadf46c4b2..8d7cb3a48c88 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -57,11 +57,13 @@ stdenv.mkDerivation (rec { # and giving nothing builds both. # So we have 3 possible ways to build both: # `--static --shared`, `--shared` and giving nothing. - # Of these, we choose `--shared`, only because that's - # what we did in the past and we can avoid mass rebuilds this way. - # As a result, we pass `--static` only when we want just static. - configureFlags = lib.optional (static && !shared) "--static" + # Of these, we choose `--static --shared`, for clarity and simpler + # conditions. + configureFlags = lib.optional static "--static" ++ lib.optional shared "--shared"; + # We do the right thing manually, above, so don't need these. + dontDisableStatic = true; + dontAddStaticConfigureFlags = true; # Note we don't need to set `dontDisableStatic`, because static-disabling # works by grepping for `enable-static` in the `./configure` script diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 719f67998266..9e1c73a57db1 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -90,6 +90,24 @@ rec { }); }); + # Best effort static binaries. Will still be linked to libSystem, + # but more portable than Nix store binaries. + makeStaticDarwin = stdenv: stdenv.override (old: { + # extraBuildInputs are dropped in cross.nix, but darwin still needs them + extraBuildInputs = [ pkgs.buildPackages.darwin.CF ]; + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + + lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc"; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ + (pkgs.buildPackages.makeSetupHook { + substitutions = { + libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; + }; + } ./darwin/portable-libsystem.sh) + ]; + }); + }); + /* Modify a stdenv so that all buildInputs are implicitly propagated to consuming derivations diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4fd754a3a6c7..5dba94abe35b 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -9,6 +9,7 @@ , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null , gssSupport ? with stdenv.hostPlatform; ( !isWindows && + # disable gss becuase of: undefined reference to `k5_bcmp' # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 !isStatic && # the "mig" tool does not configure its compiler correctly. This could be @@ -95,15 +96,15 @@ stdenv.mkDerivation rec { "--without-ca-bundle" "--without-ca-path" # The build fails when using wolfssl with --with-ca-fallback - ( if wolfsslSupport then "--without-ca-fallback" else "--with-ca-fallback") + (lib.withFeature wolfsslSupport "ca-fallback") "--disable-manual" - ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) - ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" ) - ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) - ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) - ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) - ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) - ( if brotliSupport then "--with-brotli" else "--without-brotli" ) + (lib.withFeatureAs sslSupport "ssl" openssl.dev) + (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) + (lib.withFeatureAs scpSupport "libssh2" libssh2.dev) + (lib.enableFeature ldapSupport "ldap") + (lib.enableFeature ldapSupport "ldaps") + (lib.withFeatureAs idnSupport "libidn" libidn.dev) + (lib.withFeature brotliSupport "brotli") ] ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 38f6a8fad424..3cc3f6b79f4b 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -13,26 +13,9 @@ self: super: let inherit (super.stdenvAdapters) makeStaticBinaries makeStaticLibraries - propagateBuildInputs; - inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs optionalString; - inherit (super) makeSetupHook; - - # Best effort static binaries. Will still be linked to libSystem, - # but more portable than Nix store binaries. - makeStaticDarwin = stdenv_: let stdenv = stdenv_.override { - # extraBuildInputs are dropped in cross.nix, but darwin still needs them - extraBuildInputs = [ self.buildPackages.darwin.CF ]; - }; in stdenv // { - mkDerivation = args: stdenv.mkDerivation (args // { - NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") - + optionalString (stdenv_.cc.isGNU or false) " -static-libgcc"; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook { - substitutions = { - libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; - }; - } ../stdenv/darwin/portable-libsystem.sh) ]; - }); - }; + propagateBuildInputs + makeStaticDarwin; + inherit (super.lib) foldl optional flip id composeExtensions; staticAdapters = optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin @@ -48,24 +31,8 @@ self: super: let ; in { + # Do not add new packages here! Instead use `stdenv.hostPlatform.isStatic` to + # write conditional code in the original package. + stdenv = foldl (flip id) super.stdenv staticAdapters; - - boost = super.boost.override { - # Don’t use new stdenv for boost because it doesn’t like the - # --disable-shared flag - stdenv = super.stdenv; - }; - - curl = super.curl.override { - # brotli doesn't build static (Mar. 2021) - brotliSupport = false; - # disable gss becuase of: undefined reference to `k5_bcmp' - gssSupport = false; - }; - - zlib = super.zlib.override { - # Don’t use new stdenv zlib because - # it doesn’t like the --disable-shared flag - stdenv = super.stdenv; - }; } From 3edba5edfceef20c613c37967685f5eb04d1877d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 20 Aug 2021 06:03:45 +0000 Subject: [PATCH 0198/1062] pkgsStatic: Finally obviate overlay! --- pkgs/stdenv/adapters.nix | 14 +++++++++++++ pkgs/stdenv/cross/default.nix | 14 ++++++++----- pkgs/top-level/stage.nix | 1 - pkgs/top-level/static.nix | 38 ----------------------------------- 4 files changed, 23 insertions(+), 44 deletions(-) delete mode 100644 pkgs/top-level/static.nix diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 9e1c73a57db1..971be95e935d 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -108,6 +108,20 @@ rec { }); }); + # Puts all the other ones together + makeStatic = stdenv: lib.foldl (lib.flip lib.id) stdenv ( + lib.optional stdenv.hostPlatform.isDarwin makeStaticDarwin + + ++ [ makeStaticLibraries propagateBuildInputs ] + + # Apple does not provide a static version of libSystem or crt0.o + # So we can’t build static binaries without extensive hacks. + ++ lib.optional (!stdenv.hostPlatform.isDarwin) makeStaticBinaries + + # Glibc doesn’t come with static runtimes by default. + # ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ((lib.flip overrideInStdenv) [ self.stdenv.glibc.static ]) + ); + /* Modify a stdenv so that all buildInputs are implicitly propagated to consuming derivations diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 18a6e2a47372..613b8d5304c0 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -35,12 +35,16 @@ in lib.init bootStages ++ [ }) # Run Packages - (buildPackages: { + (buildPackages: let + adaptStdenv = + if crossSystem.isStatic + then buildPackages.stdenvAdapters.makeStatic + else lib.id; + in { inherit config; - overlays = overlays ++ crossOverlays - ++ (if (with crossSystem; isWasm || isRedox) then [(import ../../top-level/static.nix)] else []); + overlays = overlays ++ crossOverlays; selfBuild = false; - stdenv = buildPackages.stdenv.override (old: rec { + stdenv = adaptStdenv (buildPackages.stdenv.override (old: rec { buildPlatform = localSystem; hostPlatform = crossSystem; targetPlatform = crossSystem; @@ -83,7 +87,7 @@ in lib.init bootStages ++ [ # to recognize 64-bit DLLs ++ lib.optional (hostPlatform.config == "x86_64-w64-mingw32") buildPackages.file ; - }); + })); }) ] diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index b01ef584d206..eef337ea40c7 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -235,7 +235,6 @@ let overlays = [ (self': super': { pkgsStatic = super'; })] ++ overlays; - crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { isStatic = true; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix deleted file mode 100644 index 3cc3f6b79f4b..000000000000 --- a/pkgs/top-level/static.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Overlay that builds static packages. - -# Not all packages will build but support is done on a -# best effort basic. -# -# Note on Darwin/macOS: Apple does not provide a static libc -# so any attempts at static binaries are going to be very -# unsupported. -# -# Basic things like pkgsStatic.hello should work out of the box. More -# complicated things will need to be fixed with overrides. - -self: super: let - inherit (super.stdenvAdapters) makeStaticBinaries - makeStaticLibraries - propagateBuildInputs - makeStaticDarwin; - inherit (super.lib) foldl optional flip id composeExtensions; - - staticAdapters = - optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin - - ++ [ makeStaticLibraries propagateBuildInputs ] - - # Apple does not provide a static version of libSystem or crt0.o - # So we can’t build static binaries without extensive hacks. - ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries - - # Glibc doesn’t come with static runtimes by default. - # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) - ; - -in { - # Do not add new packages here! Instead use `stdenv.hostPlatform.isStatic` to - # write conditional code in the original package. - - stdenv = foldl (flip id) super.stdenv staticAdapters; -} From 1ec54d2fba03ae4bb4accb419fb09f1ecfd53c32 Mon Sep 17 00:00:00 2001 From: Peter Ferenczy Date: Fri, 20 Aug 2021 15:47:47 +0300 Subject: [PATCH 0199/1062] buildenv: fix regression introduced by #134215 --- pkgs/build-support/buildenv/builder.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 350cb83f7315..ebd6026b2597 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -14,6 +14,7 @@ $SIG{__WARN__} = sub { warn "warning: ", @_ }; $SIG{__DIE__} = sub { die "error: ", @_ }; my $out = $ENV{"out"}; +my $extraPrefix = $ENV{"extraPrefix"}; my @pathsToLink = split ' ', $ENV{"pathsToLink"}; @@ -256,7 +257,6 @@ while (scalar(keys %postponed) > 0) { # Create the symlinks. -my $extraPrefix = $ENV{"extraPrefix"}; my $nrLinks = 0; foreach my $relName (sort keys %symlinks) { my ($target, $priority) = @{$symlinks{$relName}}; From 64c79459626946b50e09b46c8ec507d500ce6b57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Aug 2021 22:56:43 +0200 Subject: [PATCH 0200/1062] python3Packages.simplejson: 3.17.3 -> 3.17.4 --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 0d4d45cce5d6..3fdf43262da1 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.17.3"; + version = "3.17.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ev1vKyxexPvTT+esf9ngUcHu70Brl27P3qbS5fK2HxU="; + sha256 = "sha256-JfVTY2D0WBR89dbF+hOS9kcs/v7Dql/p0cXyLQyXGEc="; }; checkInputs = [ From 406d8cbf687514b2992bce0f3bec7ace6b29515a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 21 Aug 2021 01:42:49 -0400 Subject: [PATCH 0201/1062] python3Packages.sphinx: drop imagemagick dependency --- pkgs/development/python-modules/sphinx/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index d37ccd3e4489..f4b5c60fb1e1 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -22,7 +22,6 @@ , sphinxcontrib-websupport # check phase , html5lib -, imagemagick , pytestCheckHook , typed-ast }: @@ -61,7 +60,6 @@ buildPythonPackage rec { ]; checkInputs = [ - imagemagick html5lib pytestCheckHook ] ++ lib.optionals (pythonOlder "3.8") [ @@ -74,6 +72,10 @@ buildPythonPackage rec { "test_defaults" "test_defaults_json" "test_latex_images" + + # requires imagemagick (increases build closure size), doesn't + # test anything substantial + "test_ext_imgconverter" ]; meta = with lib; { From 3d2a8f38c97628480a1793900d2f0c8242f3a9a1 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 21 Aug 2021 17:00:51 +0200 Subject: [PATCH 0202/1062] openal: 1.19.1 -> 1.21.1 --- .../libraries/openal-soft/default.nix | 8 ++++---- .../libraries/openal-soft/search-out.patch | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 2d469a406dec..01251f0b3ac9 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -10,21 +10,21 @@ assert alsaSupport -> alsa-lib != null; assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { - version = "1.19.1"; + version = "1.21.1"; pname = "openal-soft"; src = fetchFromGitHub { owner = "kcat"; repo = "openal-soft"; - rev = "${pname}-${version}"; - sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi"; + rev = version; + sha256 = "sha256-rgc6kjXaZb6sCR+e9Gu7BEEHIiCHMygpLIeSqgWkuAg="; }; # this will make it find its own data files (e.g. HRTF profiles) # without any other configuration patches = [ ./search-out.patch ]; postPatch = '' - substituteInPlace Alc/helpers.c \ + substituteInPlace alc/helpers.cpp \ --replace "@OUT@" $out ''; diff --git a/pkgs/development/libraries/openal-soft/search-out.patch b/pkgs/development/libraries/openal-soft/search-out.patch index 0f9c2abad3c3..796642aa3c89 100644 --- a/pkgs/development/libraries/openal-soft/search-out.patch +++ b/pkgs/development/libraries/openal-soft/search-out.patch @@ -1,12 +1,12 @@ -diff -Nuar a/Alc/helpers.c b/Alc/helpers.c ---- a/Alc/helpers.c 1970-01-01 00:00:01.000000000 +0000 -+++ b/Alc/helpers.c 1970-01-01 00:00:02.000000000 +0000 -@@ -951,6 +951,8 @@ - } - } +diff --git a/alc/helpers.cpp b/alc/helpers.cpp +index 8c1c856..19bbc0f 100644 +--- a/alc/helpers.cpp ++++ b/alc/helpers.cpp +@@ -402,6 +402,7 @@ al::vector SearchDataFiles(const char *ext, const char *subdir) -+ DirectorySearch("@OUT@/share", ext, &results); -+ - alstr_reset(&path); + DirectorySearch(path.c_str(), ext, &results); } ++ DirectorySearch("@OUT@/share/", ext, &results); + return results; + } From 37fc5e1094846703ef84c8dc4be708909b732ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 21 Aug 2021 17:29:03 +0200 Subject: [PATCH 0203/1062] zoxide: 0.7.3 -> 0.7.4 --- pkgs/tools/misc/zoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 7a66c7f92c58..2f38f6d2beb0 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-vw/3pWqb1Qtat+17tzhBvpS+Z2DRe69HGmgzhMQPUw8="; + sha256 = "sha256-ERCzZM5WeyvBdiEklzmHrLWzMyfVhM+JPI76WXbKPco="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-xybP9A2QfhuSSjsBVsJgSfDC/1/OahtF5xfsXAlmpjs="; + cargoSha256 = "sha256-sxE8bZ5VnholrL60JWgyeJHwguTrYol5Hc6MjtOIKcE="; postInstall = '' installManPage man/* From 27a3cea90b8035d0505f266a3d665ecc341a7540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 21 Aug 2021 17:42:07 +0200 Subject: [PATCH 0204/1062] openal-soft: cleanup, remove ? null from inputs --- .../libraries/openal-soft/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 01251f0b3ac9..d28f7b25792e 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,17 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake -, alsaSupport ? !stdenv.isDarwin, alsa-lib ? null -, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null +, alsaSupport ? !stdenv.isDarwin, alsa-lib +, pulseSupport ? !stdenv.isDarwin, libpulseaudio , CoreServices, AudioUnit, AudioToolbox }: -with lib; - -assert alsaSupport -> alsa-lib != null; -assert pulseSupport -> libpulseaudio != null; - stdenv.mkDerivation rec { - version = "1.21.1"; pname = "openal-soft"; + version = "1.21.1"; src = fetchFromGitHub { owner = "kcat"; @@ -30,16 +25,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [] - ++ optional alsaSupport alsa-lib - ++ optional pulseSupport libpulseaudio - ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + buildInputs = lib.optional alsaSupport alsa-lib + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; - NIX_LDFLAGS = toString ([] - ++ optional alsaSupport "-lasound" - ++ optional pulseSupport "-lpulse"); + NIX_LDFLAGS = toString ( + lib.optional alsaSupport "-lasound" + ++ lib.optional pulseSupport "-lpulse"); - meta = { + meta = with lib; { description = "OpenAL alternative"; homepage = "https://kcat.strangesoft.net/openal.html"; license = licenses.lgpl2; From d95c1e9516c4761524227636cca98aa0af736c68 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sat, 21 Aug 2021 12:30:13 -0700 Subject: [PATCH 0205/1062] python3Packages.matplotlib: 3.4.2 -> 3.4.3 (#134906) --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index beddaf6810dd..0e874d25f679 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -17,14 +17,14 @@ let in buildPythonPackage rec { - version = "3.4.2"; + version = "3.4.3"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d8d994cefdff9aaba45166eb3de4f5211adb4accac85cbf97137e98f26ea0219"; + sha256 = "06032j0ccjxldx4z9kf97qps2g36mfgvy1nap3b9n75kzmnm4kzw"; }; XDG_RUNTIME_DIR = "/tmp"; From 488395c0f80e2863e9cf83ffb029a330c8e19573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <238528+smancill@users.noreply.github.com> Date: Sat, 21 Aug 2021 15:33:03 -0400 Subject: [PATCH 0206/1062] stdenv: add isMachO helper function (#133808) Detect if a binary is a Mach-O file. --- pkgs/stdenv/generic/setup.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ec5a5e6dcb9d..4431936e3d40 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -199,6 +199,29 @@ isELF() { if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi } +# Return success if the specified file is a Mach-O object. +isMachO() { + local fn="$1" + local fd + local magic + exec {fd}< "$fn" + read -r -n 4 -u "$fd" magic + exec {fd}<&- + # https://opensource.apple.com/source/lldb/lldb-310.2.36/examples/python/mach_o.py.auto.html + if [[ "$magic" = $'\xfe\xed\xfa\xcf' || "$magic" = $'\xcf\xfa\xed\xfe' ]]; then + # MH_MAGIC_64 || MH_CIGAM_64 + return 0; + elif [[ "$magic" = $'\xfe\xed\xfa\xce' || "$magic" = $'\xce\xfa\xed\xfe' ]]; then + # MH_MAGIC || MH_CIGAM + return 0; + elif [[ "$magic" = $'\xca\xfe\xba\xbe' || "$magic" = $'\xbe\xba\xfe\xca' ]]; then + # FAT_MAGIC || FAT_CIGAM + return 0; + else + return 1; + fi +} + # Return success if the specified file is a script (i.e. starts with # "#!"). isScript() { From 25c03d1effae4dd07037124336c9691dc5e3b86c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Aug 2021 22:47:35 +0200 Subject: [PATCH 0207/1062] python3Packages.pymongo: 3.11.4 -> 3.12.0 --- .../python-modules/pymongo/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index b81edaac6688..0d18175d7e6d 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -1,20 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "pymongo"; - version = "3.11.4"; + version = "3.12.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "539d4cb1b16b57026999c53e5aab857fe706e70ae5310cc8c232479923f932e6"; + sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I="; }; # Tests call a running mongodb instance doCheck = false; + pythonImportsCheck = [ "pymongo" ]; + meta = with lib; { + description = "Python driver for MongoDB"; homepage = "https://github.com/mongodb/mongo-python-driver"; license = licenses.asl20; - description = "Python driver for MongoDB"; + maintainers = with maintainers; [ ]; }; } From 01909ece3040674367f68f6b67d67321f61d6274 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Aug 2021 01:40:17 +0200 Subject: [PATCH 0208/1062] python3Packages.motor: 2.4.0 -> 2.5.1 --- .../development/python-modules/motor/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 318d519e57ce..b75936817426 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -1,23 +1,29 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pymongo, mockupdb +{ lib +, buildPythonPackage +, fetchFromGitHub +, mockupdb +, pymongo +, pythonOlder }: buildPythonPackage rec { pname = "motor"; - version = "2.4.0"; + version = "2.5.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = version; - sha256 = "1sgaqg98h35lazzdi015q1i60ig7krid8b10a5rm6lf755y8yj2c"; + sha256 = "sha256-r+HyIEC+Jafn7eMqkAldsZ5hbem+n+P76RJGAymmBks="; }; propagatedBuildInputs = [ pymongo ]; + checkInputs = [ mockupdb ]; + # network connections doCheck = false; - checkInputs = [ mockupdb ]; pythonImportsCheck = [ "motor" ]; From ef870b8f3448d5b035ba31df44ffebb34d95618e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Aug 2021 13:35:03 +0200 Subject: [PATCH 0209/1062] python3Packages.importlib-metadata: 4.0.1 -> 4.6.4 --- .../development/python-modules/importlib-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index d430c4cf29c2..d67a6c947517 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.0.1"; + version = "4.6.4"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "sha256-jFARluSfud9d9DgzvbHkMo9khHdj7IpQcDFItzeE1YE="; + sha256 = "sha256-ezCnjbKSLXim9H+zBoMVahTzxqpcwj93zIln6astAC8="; }; nativeBuildInputs = [ setuptools-scm ]; From 62c6f8b5585c8b60b25496811717aae0cd783e67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Aug 2021 13:58:38 +0200 Subject: [PATCH 0210/1062] python3Packages.importlib-resources: 5.1.2 -> 5.2.2 --- .../python-modules/importlib-resources/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 2388fb1b26df..ca361f5b1191 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.1.2"; + version = "5.2.2"; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "642586fc4740bd1cad7690f836b3321309402b20b332529f25617ff18e8e1370"; + sha256 = "sha256-pliCpND+X79wInNFa6LOdP5EiSwl5C4FespSa3AqbUs="; }; nativeBuildInputs = [ setuptools-scm ]; From 042229148d725151a89727bf70cd117250945f9f Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 22 Aug 2021 17:05:26 +0200 Subject: [PATCH 0211/1062] imagemagick: 7.1.0-4 -> 7.1.0-5 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 316110633891..e49427d8e71b 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-4"; + version = "7.1.0-5"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-CvrSeoKaTigR+4egelwLRr2++CQ5OWUePwX9e1/G1GM="; + sha256 = "sha256-iXE3kVpJHMuZ+H6aaZ1GuOUHnP0lO/Q1F5yK8sPPS3M="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From b2c07a1a290a22ab202b7f140122b9382edf0f27 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 22 Aug 2021 17:37:13 +0100 Subject: [PATCH 0212/1062] cpio: add patch for CVE-2021-38185 --- pkgs/tools/archivers/cpio/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 5b88e10b1c37..c172edd1fd98 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: let version = "2.13"; @@ -11,6 +11,14 @@ in stdenv.mkDerivation { sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-38185.patch"; + url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=dd96882877721703e19272fe25034560b794061b"; + sha256 = "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32"; + }) + ]; + preConfigure = if stdenv.isCygwin then '' sed -i gnu/fpending.h -e 's,include ,,' '' else null; From 7feefdc31c1c1d5bc28c7bdc4095a4cb14d411eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 22 Aug 2021 22:56:55 +0200 Subject: [PATCH 0213/1062] shared-mime-info: split outputs --- pkgs/data/misc/shared-mime-info/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 416bf0095188..4c60895897fe 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; version = "2.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; From 438dbf312701a5b627fd344dcad80cd3ef7c7de1 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 23 Aug 2021 10:07:15 +0200 Subject: [PATCH 0214/1062] imlib2: 1.7.2 -> 1.7.3 --- pkgs/development/libraries/imlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 6be73c8da4b3..b61f4e442bf2 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE="; + sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; }; buildInputs = [ From 8cb4bf629d93c32b5e2ba0927c594386add7635a Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 11 Aug 2021 22:56:38 +0200 Subject: [PATCH 0215/1062] gnu-efi: 3.0.11 -> 3.0.13 --- pkgs/development/libraries/gnu-efi/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index ef8ef7648ebd..c8c974556336 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pciutils }: +{ lib, stdenv, buildPackages, fetchurl, pciutils }: with lib; stdenv.mkDerivation rec { pname = "gnu-efi"; - version = "3.0.11"; + version = "3.0.13"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; - sha256 = "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj"; + sha256 = "sha256-L8z3FSecRu5pxIWRhq+BUNB6E/TRmHblRZzWW+gtO30="; }; - patches = [ - # Fix build on armv6l - (fetchpatch { - url = "https://sourceforge.net/p/gnu-efi/patches/_discuss/thread/25bb273a18/9c4d/attachment/0001-Fix-ARCH-on-armv6-and-other-32-bit-ARM-platforms.patch"; - sha256 = "0pj03h20g2bbz6fr753bj1scry6919h57l1h86z3b6q7hqfj0b4r"; - }) - ]; - buildInputs = [ pciutils ]; hardeningDisable = [ "stackprotector" ]; From 9a58eb6fc6e91fc498e789a80226f6efff45c5d3 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Sun, 15 Aug 2021 13:27:06 -0500 Subject: [PATCH 0216/1062] pythonPackages.pyroma: fix tests phase - The package was not building due to an infinite recursion error in pytest - After looking how they the package owners test it I discover they use unittest module instead of pytest - Rewrite so it uses unittest --- .../python-modules/pyroma/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 03eea0b8b5e9..9d2c220c472f 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -2,10 +2,10 @@ , buildPythonPackage , fetchFromGitHub , docutils +, python , pygments , setuptools , requests -, pytestCheckHook }: buildPythonPackage rec { @@ -26,16 +26,11 @@ buildPythonPackage rec { requests ]; - checkInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ "pyroma/tests.py" ]; - - disabledTests = [ - # PyPI tests require network access - "PyPITest" - ]; + # https://github.com/regebro/pyroma/blob/3.2/Makefile#L23 + # PyPITest requires network access + checkPhase = '' + ${python.interpreter} -m unittest -k 'not PyPITest' pyroma.tests + ''; pythonImportsCheck = [ "pyroma" ]; @@ -43,6 +38,6 @@ buildPythonPackage rec { description = "Test your project's packaging friendliness"; homepage = "https://github.com/regebro/pyroma"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kamadorueda ]; }; } From b1a891bbd392acbca48c45de1c2edb0ee1973e5d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 18 May 2021 21:38:42 +0200 Subject: [PATCH 0217/1062] pythonPackages.pytest-randomly: 3.6.0 -> 3.10.1 https://github.com/pytest-dev/pytest-randomly/blob/main/HISTORY.rst#380-2021-05-10 https://github.com/pytest-dev/pytest-randomly/blob/main/HISTORY.rst#390-2021-08-12 https://github.com/pytest-dev/pytest-randomly/blob/main/HISTORY.rst#3100-2021-08-13 https://github.com/pytest-dev/pytest-randomly/blob/main/HISTORY.rst#3101-2021-08-13 --- .../python-modules/pytest-randomly/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index 0020a4bf433f..734e0e64b31d 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, factory_boy, faker, numpy, backports-entry-points-selectable +, factory_boy, faker, numpy, importlib-metadata , pytestCheckHook, pytest-xdist }: buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.6.0"; + version = "3.10.1"; disabled = pythonOlder "3.6"; @@ -14,11 +14,11 @@ buildPythonPackage rec { repo = pname; owner = "pytest-dev"; rev = version; - sha256 = "17s7gx8b7sl7mp77f5dxzwbb32qliz9awrp6xz58bhjqp7pcsa5h"; + sha256 = "10z7hsr8yd80sf5113i61p0g1c0nqkx7p4xi19v3d133f6vjbh3k"; }; - propagatedBuildInputs = [ - backports-entry-points-selectable + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; checkInputs = [ From 29bcfeb59c8913234705b011a581e7344d56f34c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 30 Jun 2021 21:42:31 +0200 Subject: [PATCH 0218/1062] pythonPackages.backports-entry-points-selectable: remove at 1.0.4 See * https://github.com/NixOS/nixpkgs/pull/128762#issuecomment-871618625 * https://github.com/NixOS/nixpkgs/pull/128762#issuecomment-871642070 --- .../default.nix | 36 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/python-modules/backports-entry-points-selectable/default.nix diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix deleted file mode 100644 index 02117f7282e3..000000000000 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, importlib-metadata -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "backports.entry-points-selectable"; - version = "1.0.4"; - - src = fetchPypi { - inherit version; - # pypi project name and tarball name differ - pname = builtins.replaceStrings [ "-" ] [ "_" ] pname; - sha256 = "4acda84d96855beece3bf9aad9a1030aceb5f744b8ce9af7d5ee6dd672cdd3bd"; - }; - - format = "pyproject"; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - checkInputs = [ - pytestCheckHook - ]; - - meta = with lib; { - description = "Compatibility shim providing selectable entry points for older implementations"; - license = licenses.mit; - maintainers = [ maintainers.sternenseemann ]; - homepage = "https://github.com/jaraco/backports.entry_points_selectable"; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3f60f90e0804..b2c31b4daf1b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + backports-entry-points-selectable = throw "backports-entry-points-selectable has been removed"; # added 2021-07-01 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..7cf536d4cf8f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -977,8 +977,6 @@ in { backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; - backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; - backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; From de4c61a51501de52937b5299dbd598cbe0b97aac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 23 Aug 2021 21:05:28 -0400 Subject: [PATCH 0219/1062] blas: fix library id on darwin dyld: lazy symbol binding failed: Symbol not found: _dsyevd_ Referenced from: /nix/store/lr8grz1knmh6vc7j830gni0ka68qf1lk-xfitter-2.0.1/bin/xfitter Expected in: /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib --- pkgs/build-support/alternatives/blas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index cf880677fddc..b771e182fe5a 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ - -id libblas${canonicalExtension} \ + -id $out/lib/libblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider}/lib \ $out/lib/libblas${canonicalExtension} '' else "") + '' From 43271969ef1b1724aa62755f6b0227b369527b5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Aug 2021 11:56:30 +0200 Subject: [PATCH 0220/1062] python3Packages.watchdog: 2.1.3 -> 2.1.4 --- pkgs/development/python-modules/watchdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 921ed5af4aa1..01185017c600 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5SNqjoYCq220uHNmTC01bDZas8rJb73sSXCtYWQV3UU="; + sha256 = "sha256-Q477vZKbZDat186J80ZsqDbzFYgiBDPv63V7WUepyXk="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 36daf5cf4a3e1ab0e3ba6bbb8d1a45fa60919d51 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 24 Aug 2021 22:15:14 +0200 Subject: [PATCH 0221/1062] libglvnd: 1.3.3 -> 1.3.4 --- pkgs/development/libraries/libglvnd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 65d0651ed415..b4d8657359f1 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "0gjk6m3gkdm12bmih2jflp0v5s1ibkixk7mrzrk0cj884m3hy1z6"; + sha256 = "0phvgg2h3pcz3x39gaymwb37bnw1s26clq9wsj0zx398zmp3dwpk"; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; From de7d826233b638d184c5e4ba04cba720fb850291 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 24 Aug 2021 22:28:05 +0200 Subject: [PATCH 0222/1062] python3Packages.cryptography: 3.4.7 -> 3.4.8 --- pkgs/development/python-modules/cryptography/default.nix | 6 +++--- pkgs/development/python-modules/cryptography/vectors.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 9b35b5654e26..2fea6e89494d 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -23,18 +23,18 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.4.7"; # Also update the hash in vectors.nix + version = "3.4.8"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "04x7bhjkglxpllad10821vxddlmxdkd3gjvp35iljmnj2s0xw41x"; + sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62"; + sha256 = "01h511h6l4qvjxbaw662m1l84pb4wrhwxmnb3qj6ik13mx2m477m"; }; cargoRoot = "src/rust"; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 0cb23d53c03c..7602582f8306 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1hh4j88ywil3jf62ppj1blygmdirbqz86pynd9lqfijiaym3mb57"; + sha256 = "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c"; }; # No tests included From 66679f0e52e8092b1b8afd18d3e57ee767d7a3d0 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 24 Aug 2021 23:35:35 +0200 Subject: [PATCH 0223/1062] harfbuzz: switch to pname + version (#135529) Co-authored-by: Bobby Rong <931189261@qq.com> --- pkgs/development/libraries/harfbuzz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 4a12c5bcc225..e94fcc5ece9d 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -32,7 +32,8 @@ let in stdenv.mkDerivation { - name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; + pname = "harfbuzz${optionalString withIcu "-icu"}"; + inherit version; src = fetchFromGitHub { owner = "harfbuzz"; @@ -42,8 +43,7 @@ stdenv.mkDerivation { }; postPatch = '' - patchShebangs src/*.py - patchShebangs test + patchShebangs src/*.py test '' + lib.optionalString stdenv.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ From ca806fe789da5219dabca7a0853df519cec80575 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 00:26:18 +0200 Subject: [PATCH 0224/1062] python3Packages.regex: 2021.4.4 -> 2021.8.21 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 0445b02c1f33..dbb86f25a031 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2021.4.4"; + version = "2021.8.21"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uro9P5uULEnX5LwQW7KFUcRAZfE5plBiq3kSvvEMmvs="; + sha256 = "sha256-+vCLA0GCj2opuPfdlNXPjMfDm/w+Z7eFFMVLSUtmkVo="; }; # Sources for different Python releases are located in same folder From a3c3bb0de9009b037c4b132855a166740f08aae9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 21 Aug 2021 10:13:08 +0000 Subject: [PATCH 0225/1062] xorg.libXft: 2.3.3 -> 2.3.4 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 14 +++++++++++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0acf8b099891..1223b0a50739 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1017,11 +1017,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { pname = "libXft"; - version = "2.3.3"; + version = "2.3.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; - sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; + url = "mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2"; + sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ec43ae9d59d4..9eaa910169a5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -200,11 +200,19 @@ self: super: ++ malloc0ReturnsNullCrossFlag; patches = [ - # Adds color emoji rendering support. + # The following three patches add color emoji rendering support. # https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1 (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/fe41537b5714a2301808eed2d76b2e7631176573.patch"; - sha256 = "045lp1q50i2wlwvpsq6ycxdc6p3asm2r3bk2nbad1dwkqw2xf9jc"; + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/723092ece088559f1af299236305911f4ee4d450.patch"; + sha256 = "1y5s6x5b7n2rqxapdx65zlcz35s7i7075qxkfnj859hx7k5ybx53"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/e0fc4ce7e87ab9c4b47e5c8e693f070dfd0d2f7b.patch"; + sha256 = "1x7cbhdrprrmngyy3l3b45bz6717dzp881687h5hxa4g2bg5c764"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/d385aa3e5320d18918413df0e8aef3a713a47e0b.patch"; + sha256 = "1acnks2g88hari2708x93ywa9m2f4lm60yhn9va45151ma2qb5n0"; }) ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 9b36ca362599..b24dc504288e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -188,7 +188,7 @@ mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2 -mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 From 96af2a867fe85feaf61a445eac5867ddde9a411e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 25 Aug 2021 13:15:57 +0200 Subject: [PATCH 0226/1062] python39Packages.herepy: fix requests depedency pin --- pkgs/development/python-modules/herepy/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 13454e4e1966..9b1a50a532fa 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "sha256-05x3EQoyv38j4UcixN0sf5BI2oTjfasAIQyZqQSjdPM="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "requests==2.25.1" "requests>=2.25.1" + ''; + propagatedBuildInputs = [ requests ]; From f19cb76938be94bda1beb15548015ac95253258d Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 25 Aug 2021 14:03:50 +0900 Subject: [PATCH 0227/1062] liblqr-1: darwin add missing carbon framework --- pkgs/development/libraries/liblqr-1/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index aa6cd0fd57d8..914cc0c2ab69 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, Carbon }: stdenv.mkDerivation rec { pname = "liblqr-1"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ Carbon ]; propagatedBuildInputs = [ glib ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15dbe202eb19..73caac198a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16923,7 +16923,9 @@ with pkgs; libliftoff = callPackage ../development/libraries/libliftoff { }; - liblqr1 = callPackage ../development/libraries/liblqr-1 { }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; liblockfile = callPackage ../development/libraries/liblockfile { }; From b8e97a29cbf75dc0f0fac664a74489ad1fd7f61f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 21 Aug 2021 01:15:51 -0400 Subject: [PATCH 0228/1062] cargo-c: unvendor curl dependency --- pkgs/development/tools/rust/cargo-c/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index f2540f259f4d..8b4780d7ea08 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -1,5 +1,5 @@ { rustPlatform, stdenv, lib, fetchFromGitHub, fetchurl -, pkg-config, openssl +, pkg-config, curl, openssl , CoreFoundation, libiconv, Security }: @@ -31,10 +31,20 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0c0vn2pcy5px02mc0l4a3w7z9n8hc6br5w3ww6nrav5w6911jp52"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] + nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; + buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + # Ensure that we are avoiding build of the curl vendored in curl-sys + doInstallCheck = stdenv.hostPlatform.libc == "glibc"; + installCheckPhase = '' + runHook preInstallCheck + + ldd "$out/bin/cargo-cbuild" | grep libcurl.so + + runHook postInstallCheck + ''; + meta = with lib; { description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"; longDescription = '' From 22b6677be526f943320a6a0be7e56eaeb1278ad7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 26 Aug 2021 05:15:49 +0000 Subject: [PATCH 0229/1062] glibc: 2.33-49 -> 2.33-50 --- .../libraries/glibc/2.33-master.patch.gz | Bin 58508 -> 59430 bytes pkgs/development/libraries/glibc/common.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index 95edf3cfedd57b7db9782c88de575a9a8a9f176c..4a287d5c9ca148a2e852930b3437e94bbd7751dc 100644 GIT binary patch delta 4193 zcmV-n5T5Uh$pfa)1F-Mcf9zd*bJIu?{~LdbIhS{_kJ!;$vLUcpCt-63B$b4MJF=zH z)A+C@uVsgX9N+!AduF7uY$v(h|jf;q4i8vVT$sb66;Iy#4+_4hBEmzUXPlYgS)Cz#N@^P4;Jf3jAeTiq}%+i|_V zre1x$tC9^Ffcl6ce=?JEwh77$Z(xM4NZvvYlgEoTcT^`4pp|z=?n$A5Rm|ZZtF_9} z-_&Oy6ztvE!J&U}a&mNZPI|aodWeh}e_qvU`%GD%B<1`FqcG_^iRGbh$J7k9e(D3|F_0QV3JQQQgefAIvoE`ydOzEr7d%b+r}iHMjQw4Cuh*~z-rDIF*9qkYDnqXL=Klfirxp>P1B zj$i}E3uIyN%O2KL62H)PbzL*;Fw#vg(xSc<_qEW_bUU`)Bn~XiiWBJLN@o~kqxo_S z>4x3>q@eB?K!?<4cHk+)h;tGhm{7@ z=<7Ht<6l)yK0Z?b>~S#4U>AUmwGygqR)IS}XM(JaKFr!($e_H$?ARY3OH)S+}M3~+Fe6$S0 z$qixiNU;H&fl?IdA_@4yaKEDX2gs;2c%+p%;$<-&4Qfkx50M)Kt|Gwvpc5xh;k^Cb zd_3#yuNWOqFD#LEa3IaJDWw&3#C*@~X;7^ow~`pK8V zNoBX2e~>p0;Ru`BN>bfI#v7}owdA3ZcW#&fdo|AIJ@#@qWMsNQVAYo=7YzNh%#$jb zH6Q6Dngny<$1)YF*=`E6V;BD)azj!I{vn`GCEs;A>=KNadsm(a|JPE_)!=^Js28Wf z0#@-hz2;B7zxCLwB`|9Ln)DWVJ}Fe^)A#I_e>yBC!!m$0$BAxxiPQJeG}O|5V5do9 z>bjTo6VI@>VRiT_*)0#b3Q(s0sF6b#sE0s28OnRtwx#>^zGvH3?0R0W=h{)zdTaO#XPufbSWpsWR;YqF zL%y>5IP1`a0(c{u%$8k&{~AimrGM+wV;{qA9}oTgHwXSt#|H<8ZYUl-Qdglbdq6n+)R{NQrF|e}!~UC_2XP zMu+2UA}r$}zt!O=)Uhb{Uknt5J2rmFKmS!Mn)v=f+ra+NAMOu-I`rY+@bB$AN%hX= zRkXuCPAhr9lWs-@tT? zGz$7kxRg)hMZiw;S$>7FQm%AU*EYpUc@6d2UyfKG&SeAL9hjDse@oe>IG|zh7T5)F z8ROA$Bk*3xpbXtqWKcpcDo{u$T_2+ospI6BR< z1obR$(FzgW0WOls&5nfeDgh@%yj^j4s+C;2q9+e1g$n$Zs&nZPAF*)4lpzV`ldf6+x@l9GY0C`sBvB-5D$wF#IYKiURRr;?pJ0p0&AMGQ}TY!h%xq|F0OVNg+MgKEx^x_MF5ff89Jy>C|@bO8BPu)zH)I zAPHm3FdZv}Q=gMqu$gII;A&bLhkXxG+KKnAO*AUAj9yQ7bt}=M$WFh#eWt-BX~KKy zedd|mZxh*KF0;jWf-4&JP$)?xc492-2!4Y#XZN>Tb3Xa4S!^=~cyvoG`#o$q*@J93 z%l*ZOO&4Zpe~<*JoqCBC*}CRAt{VnHs(G;C=#dF?<-gxwD10644Z6W}XQ1^5wzh49 z31Z>!YvX1@q=p`sfc!#%Vo&nXIO3psy~BnSB88ovoFBiJ`w1h9u%48ao+Tro`alJ1 zCf_vA6q}S~MK=|TnlhUU3b8PqCh?edA(*&xnKPNde{9dY%wu(*ByS*B%L$6akdjIr zFN`+&DEL?j)s$xde-rmuhs_2|XSK<7|hmRGAzjtM#rLJE!n-MM4(v z@p3x7k-b~JLqk*$sBavT8lhMcx0Eg?BJlUhm!>f8}&P{6b_yLA+xF%<9srF74{AXtsB!mDlG7+#OloPsV;76KmdFWTJyRa7bIpS*Fb!*o2LPt z9<*UtRQE+2-|5~mytyso#Ols$$e^qXi ze}8-rAH1`D^Ww*Xq9=g38^%$wIVXGYt7`1-f1hT~%2>P_uanQ1)WmW=e1 z`}yb{COGMmDJGS-oN~Ww!>NM!_R4(6Wx0b#ty(v{gQGVpKY0aabU10(*T8mg;s(+} z5mGsI*_E@B$Y1lRvRt5|beNvfe@}hE@YMR6;i+QT@S7gwGYzhxbx@vOe^89@Q?|F# z3$iRohIcrWl2>{iA$j7T9lSeZ|AvbpEXE7EI($ETwf?H+Xxe(JXo)Nor4Li~jGQ^F z_|L%y+;szt&*7Vs^M9Oos?5lT^V>J)Z%Jjlose|HjJX3Ywt zwBif;h&(8e>~-tud%(V%Dmi@JM#iBd(X~SMNp|JxJgZU9U+v0Nia#PJ3gR&J%)qgr z+hfa0gVak6H+ACB(zU*o^c~L#D)c8D4B-@jTh~8>4EDT$JqyaT-WQ&RXwYDu*W4K{ zfqzUwW-t_n*rhx~iA_$zf3y-11?LNxkrD$%VsJcl+!R-M@}PHBDM|T(biyq{>7evv z4u{p7N;)n@*j%2@qDe5FA+)U_1aZf2F8tT~?}^*|oRec9?gvl;&h#Dz&z%APDb*gt zULBtfea8YC)dR-YG`b-QLa{5xFsJ6rETd5C8FMUr)F>x6uSd~Se~U1B>_E8E6R0Z5 zx$;t2TOzN3ZO5dOR|oV8RQeV6O-K43NHmbM>bS6w+bnYv;}$0P5e>!)6n7uUa4KS0Vf%${LkI+w zQNW?5NIsv%mixk?A0RR83UE6MgKoI>E zVqY{MxLkxj(4=YFrfI89f56xU8xljCSo!|WWp|Z}$OBJ`f6K1Snc1_qVWwCn%hOLT z;j88ic=%+J0XNNG$3Q%^p&sVSd@BNfAr^5GVTRaX2Mh5q$iCnr$#*i3vN#HoSo%YE z>03|OyIbFJx5-I`S*S!FZe3T1#Wt2A4B}zC_Fb*^@7{OSpj~|5cLau6gioKsEH;L2 zHQqqIB14{@e=A4y`uG6F-?Wk!Z;tla}mJY02)VB@M)Ati;WY!%N)ORc2CacoPMWJ^#^+%iRy)`YZ7Z zWxrD%+eetWE<;!gSCr&+n_X}S6O|{i> zv(N!vSyC9Z_l3kM2^l&H%!W=b3#ro$V^;oo4^~^-GQe9WgXEz&odV0O) zh`S}YkUm=(*Im*9ikbOKJkhGGJ1v$es4OEYg21n#Q<;X>RZ^u^MMzUfvGYRI?Le^M z)(Hp6SE{vM7K61_7R*YVxRXyWqln$7+N{^baq@3};+mJ$)4IiYyu8CX@5B2296(S~6T6d{X2vps!@VDSd$+s4CG72l1?zN{ThZqQ2oEH% z7RYSlVM=Ru5Jk`}iDOJ$*Yqq`N7x=M@=Vi#!?>3i(1oTQRCWh!V|+V0g^(akVx%-_mM7(LI3xW`G}8bx{N{e3XLwJU|F(n8pE& zVP>|jf)%h88vVN!peH9ID%p?@sE^4be=~uz&GEkQ21fXb?pp{jdA4qIpgO4mTA({}B!vuCF<1X6*D6K4 zsb7Flu=nSONB-gI>GAQHs64%i0 zm>>01BUdUL(5;{NB{<=$Y%|H$Ln$#NrvRviut1ITVnx1^f3BpYs@N=xX4sZCWbsk^ zxl={-##;h(mqE)CBNd|B+^Gz0BEqKzEoY1;J6YE{IdB3$+ArBl6d;p$GFVMRyc|HU zBiMl18d(@j*~gkn;y1BfUDphI66&TGYT>|&2HM2XbUU)$I0`Jyiel*FLS`5&r>o5j z*b}JQ3%v1Ne+4(+P1AG==ieHM;hcF)w}yr@Gz^Kv>q@eB?K!?<4cR%@s@*L4J*+gK zMy%s7_kUG@eEdQVuxG(^3A+GnygA8|+h|$RvPG_%X(Y~R( zp24D3dU;8DENsqoR*Jl-Y(K|liX5}Gm^L86-7!D_k* zCi5H8%_G4Ea0W_IB#R`)7l!*4`9DBLrNKR|tWaMT{n4Pbg!d4^7;q5*<_DcPhYF|d z$E(?8r^_D4!L>j#XmD`Q<>wyCNJyic3D53$=!rHV3Ua8F&E=Zkw_cXyd?!F1$=6T1 z5g?Vle_l*z90CZN+Df;≠bS+}098Bk$Zv4D8h`UG>@P(TI`h1}Uq)K7Gd!r)3ov z-mLjZ$KgC!2^`Brh-P~U%#J<$f5Z(*$@zy+eaiW+vr&)Kh&j6QT;N|zIah<@x=}AK zf;Ft-U2@GI`hV-QA2-0L{d3-5r|CRX!Kd%pe=T)bOon9uX^vvu_F`w?CCNlf27#T# zv8n4`JcvER-leOO2=mtS^`RzNpdqOt!y4j+s;X^-vx{AXla(ysGvUvR*M~aq9 ze<{X3L69di)VYzlG+TVC`7qU*9Hm^O?&1E^3Nk+qKcx^4o)+=2bql{R>*HnGYoT_? z+tV*YPEzD1Cg3&|iX+&?CVTnBZuDfH{t~#-2PH&2P)zJRN1u>T_0}y>%m!Yw8>feo<{YH{r_Ks@&j&#lpuf6gUg60?_hbDj`Gld%^sE{;x*8@)&Ub$q?X zU*RzlOIuL@EhHcfjUEq!!XC}z;9rkaa?yEdj5@dPwG=Xu3b)Z|GN!wU()$WtXhAe_bT& zrFlEm2J0|1Px+YNG8D=%KJ373@sYo1?il+Em>N`PV98*7_!z_LrA)-94l_hBymJZA ze(RMwI`>Sli`FZcoUJ@{Qx-$*D8eC<29=!U4G{0gh4w^{&= z%scI`jUEO*c#Uu=!LS&VQZbdae*t;zjK)_1W5p8Q5%n*X<&3U?{A4MlCeWizx#FZc zLt0vWoONhI0lX1SX3MU?zlPFsiEn*&;-lN`laYV$_R#;~#{Qe5@%Z5Nk^kfAYybGL^X)0t&z;{$H=wuP zj9+sotM=SHaEF5;6G9##OHaZ2XJpg6ehx=|7g9MemJ2^@U`(=n1T z7%1*iKF`(xJ4-LqEA*9erJK4|=PTt6)azg~Wdk^u4Rv>DTJm1Xe>TMd4V|~ZE`ZAz zkB+s9_u>x9&`sqIO2|cp782gBlWH2?`6_0W%ZjxWTR_hS(^xR(;{G+);5;3}(P_1e zQO@!cS|K7F;5we)bfp@v;&4Lv+ZBhWO367CJt3fEs^Yg4ol8V~)P)nK3~{iU&lHGy zY*xF&%gacI4?#ghe-};SgbZ{=NzxV~UR+A0HlZfSk9OH*$}uW)mE-R>>pE)>sXNFW zqtcTpB<$@vhI8ZuW(efH=iw@wC9eBilyVIavrtz||}z!HZlY zsBQ32{dB2k&)VEBnfwnhVL_?j|0@P-@{*oQA0kx`c1+hMf4wwG=+t)aO8BPws}oPN zgLo2IhUr)docf&Dg3V0x0$00_(Lv~y$TLU+2Qhq(lcmX~UD*eQLU2D4?Cm8wj@$ZEZd#;(ZyTo#iB ze6(3CZe;HkacGD#QtF#UBu2Tdh^ibmdLZaCc(5R$^$b z+3$y*8x3rCU{)*`)Kr{St0APZX`##u{#TUJhx=TA{L_N#hLa^w{$waP|FhJU51xD& z$Om03VsiUSU3oT?XH$8$s)=mn*-@Td<=Io7e+LEV{^VC88;Zs|Hoz<%t>V!xVuhER zaGr*r4f#e9^wL}Tn^FYy8XOW~G0nGzQ>hZ|*VUkh>g;HtHgG0(par!$J6qW*N;`H1UQFfC}@=;=K zK-Qg~1y-G4__HhVzU|n)jmZ!a8;F;fe=U#&8j~d59KHiyI$eor%Juw#MOVLaG5mJ+ z(pfxZ2Q@3_DLloC%5neIT8`biyFbeMSyhYYESAlM(h(P|{RD!#?CFK}v?w2fM6Kbe zuO75vSXB6;+Bkj=C$!J1LnR7F9RlDVnLaF7=O-$+%Q;3ApFXSMYQ-{^V^TQ}f0emS zp8n(>KDfJk^Ww*XtS=OCYsOKrIVXGYt77c#k54nFG}f|njA1=nUDrO9nZ^Td&PYGI zpO5Y`!Aa*#F^Rn8l>4d;rwU^1(tO8d*~Oz)r5oPE(Hn)IyaJbWIB8ecz;5Nl8qz`@ zQaN?mle3b@U-P-LT%e+Km|oCNe|5p|(CV7up<>zampkWDcu+b{Kk zEDM4m4p*h*mEP8nJoV2H-=DL8!@~#`<2!mf`Y`%&JF4br+IFaDi7XUv9~SHdfjN}$ zbMOO)Zh-MQdV4zl$GB5uMi|aNy&eB_c6NIH4%T10S#wn8rp<&PBTw9MHgvIU7CK5L yEa+oGP@uclou}_1d%RF`__B+PLq{UC!t%51%JMv`P|x2CW%?f!&=B*zNdo|eYiaoa diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d2d7b6cc064c..fe8fd6d80c6d 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.33"; - patchSuffix = "-49"; + patchSuffix = "-50"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-49-g22d37364ae + glibc-2.33-50-gc6cadbf83a $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. From f418d1d6ef0e6763f7c6b4ebdadd4a902abda3cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 08:38:13 +0000 Subject: [PATCH 0230/1062] libfabric: 1.13.0 -> 1.13.1 --- pkgs/os-specific/linux/libfabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index 2abe07b0964e..5500076940d5 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.13.0"; + version = "1.13.1"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-felGKpdihOi4TCp95T1ti7fErQVphP0vYGRKEwlQt4Q="; + sha256 = "sha256-0USQMBXZrbz4GtXLNsSti9ohUOqqo0OCtVz+0Uk9ndI="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ; From 128baa26940ca42c909ab56782f5062e4e8a73ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 17:19:22 +0000 Subject: [PATCH 0231/1062] zef: 0.11.10 -> 0.11.11 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index c5b622d2761f..acc42c9d2d3c 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.11.10"; + version = "0.11.11"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-snnvREM2RLssmE55Ea0Imcw12pmyD6+/11ZXmmUY36U="; + sha256 = "sha256-IOConYPH+t84INXaHw8OVp0mLNucSDS2RT2AlZOUoEs="; }; nativeBuildInputs = [ makeWrapper ]; From 04f579d4428b67d738cc4390b71a66c0a85d1723 Mon Sep 17 00:00:00 2001 From: davidak Date: Thu, 26 Aug 2021 19:41:17 +0200 Subject: [PATCH 0232/1062] Revert "gnu-efi: 3.0.11 -> 3.0.13" --- pkgs/development/libraries/gnu-efi/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index c8c974556336..ef8ef7648ebd 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, buildPackages, fetchurl, pciutils }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pciutils }: with lib; stdenv.mkDerivation rec { pname = "gnu-efi"; - version = "3.0.13"; + version = "3.0.11"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-L8z3FSecRu5pxIWRhq+BUNB6E/TRmHblRZzWW+gtO30="; + sha256 = "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj"; }; + patches = [ + # Fix build on armv6l + (fetchpatch { + url = "https://sourceforge.net/p/gnu-efi/patches/_discuss/thread/25bb273a18/9c4d/attachment/0001-Fix-ARCH-on-armv6-and-other-32-bit-ARM-platforms.patch"; + sha256 = "0pj03h20g2bbz6fr753bj1scry6919h57l1h86z3b6q7hqfj0b4r"; + }) + ]; + buildInputs = [ pciutils ]; hardeningDisable = [ "stackprotector" ]; From fe2ae59b167fd9d5cb56bdc887a95e6d8e5aa870 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 19:37:15 +0200 Subject: [PATCH 0233/1062] libssh: 0.8.9 -> 0.9.6 --- pkgs/development/libraries/libssh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c613cfab777b..c5cd5c353960 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.8.9"; + version = "0.9.6"; src = fetchurl { - url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; - sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5"; + url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-hrz4hb2bgEZv4OBUU8WLh332GvqLqUeljDVtfw+rgps="; }; postPatch = '' From 3aaf52603cdb4e5a559ff8986c35952e80279444 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 26 Aug 2021 22:48:23 +0200 Subject: [PATCH 0234/1062] python39Packages.pandas: disable failing test (#135814) --- pkgs/development/python-modules/pandas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index b7e237a3e3ba..6c99a0e4f9d6 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -105,6 +105,8 @@ buildPythonPackage rec { "test_missing_required_dependency" # AssertionError with 1.2.3 "test_from_coo" + # AssertionError: No common DType exists for the given inputs + "test_comparison_invalid" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" From 053e6bf85522fc621493ae20aaa6df19465e42ae Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Aug 2021 21:02:48 -0400 Subject: [PATCH 0235/1062] Revert "srtp: support cross, switch to cmake, enable tests" Breaks gstreamer-bad as discussed in #131986. This reverts commit e4ade0952aed4ab76a40a4c9265d6e25e3ea93a2. --- pkgs/development/libraries/srtp/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 8bf6c6d11d5a..0dbfef2c6394 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config -, openssl, libpcap, cmake +, openssl ? null, libpcap ? null }: with lib; @@ -16,26 +16,21 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ pkg-config ]; # libsrtp.pc references -lcrypto -lpcap without -L propagatedBuildInputs = [ openssl libpcap ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DENABLE_OPENSSL=ON" - "-DBUILD_TESTING=ON" - ]; + configureFlags = [ + "--disable-debug" + ] ++ optional (openssl != null) "--enable-openssl"; + + buildFlags = [ "shared_library" ]; postInstall = '' rm -rf $out/bin ''; - doCheck = true; - preCheck = '' - export LD_PRELOAD=./libsrtp2.so - ''; - meta = { homepage = "https://github.com/cisco/libsrtp"; description = "Secure RTP (SRTP) Reference Implementation"; From c65ec0c87d9334164df399bb133658fc44bfe696 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 28 Aug 2021 00:36:12 +0900 Subject: [PATCH 0236/1062] aws-cpp-sdk: disable flaky test --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index fa081ab3f24f..2af3ec29367b 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { # fix build with gcc9, can be removed after bumping to current version NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; - preConfigure = - '' - rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp - ''; + preConfigure = '' + rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp + rm aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp + ''; postFixupHooks = [ # This bodge is necessary so that the file that the generated -config.cmake file From 354470d0f9b8f87847839c88b3e962fb4b34bc30 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 28 Aug 2021 00:52:27 -0400 Subject: [PATCH 0237/1062] Revert "Revert "openssl: 1.1.1k -> 1.1.1l" (#135999)" This reverts commit b2b0115e70003e0070a50a1e0217a43c7e081588. --- .../openssl/1.1/macos-yosemite-compat.patch | 56 +++++++++++++++++++ .../development/libraries/openssl/default.nix | 6 +- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch diff --git a/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch b/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch new file mode 100644 index 000000000000..b0e37e325611 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch @@ -0,0 +1,56 @@ +From cef404f1e7a598166cbc2fd2e0048f7e2d752ad5 Mon Sep 17 00:00:00 2001 +From: David Carlier +Date: Tue, 24 Aug 2021 22:40:14 +0100 +Subject: [PATCH] Darwin platform allows to build on releases before + Yosemite/ios 8. + +issue #16407 #16408 +--- + crypto/rand/rand_unix.c | 5 +---- + include/crypto/rand.h | 10 ++++++++++ + 2 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c +index 43f1069d151d..0f4525106af7 100644 +--- a/crypto/rand/rand_unix.c ++++ b/crypto/rand/rand_unix.c +@@ -34,9 +34,6 @@ + #if defined(__OpenBSD__) + # include + #endif +-#if defined(__APPLE__) +-# include +-#endif + + #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) + # include +@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf, size_t buflen) + if (errno != ENOSYS) + return -1; + } +-# elif defined(__APPLE__) ++# elif defined(OPENSSL_APPLE_CRYPTO_RANDOM) + if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess) + return (ssize_t)buflen; + +diff --git a/include/crypto/rand.h b/include/crypto/rand.h +index 5350d3a93119..674f840fd13c 100644 +--- a/include/crypto/rand.h ++++ b/include/crypto/rand.h +@@ -20,6 +20,16 @@ + + # include + ++# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM) ++# include ++# if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \ ++ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) ++# define OPENSSL_APPLE_CRYPTO_RANDOM 1 ++# include ++# include ++# endif ++# endif ++ + /* forward declaration */ + typedef struct rand_pool_st RAND_POOL; + diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index fc2c2fad1959..2d3f1c313caa 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -192,14 +192,16 @@ in { }; openssl_1_1 = common { - version = "1.1.1k"; - sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"; + version = "1.1.1l"; + sha256 = "sha256-C3o+XlnDSCf+DDp0t+yLrvMCuY+oAIjX+RU6oW+na9E="; patches = [ ./1.1/nix-ssl-cert-file.patch (if stdenv.hostPlatform.isDarwin then ./1.1/use-etc-ssl-certs-darwin.patch else ./1.1/use-etc-ssl-certs.patch) + ] ++ lib.optionals (stdenv.isDarwin) [ + ./1.1/macos-yosemite-compat.patch ]; withDocs = true; }; From 88d416b334857ca0b48a35e229c6dfe76d76227c Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 29 Aug 2021 15:37:12 +1000 Subject: [PATCH 0238/1062] orc: disable failing test suite on armv7l --- pkgs/development/compilers/orc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 40c89d0cc59b..2d56d461627a 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -12,6 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "1w0qmyj3v9sb2g7ff39pp38b9850y9hyy0bag26ifrby5f7ksvm6"; }; + postPatch = lib.optionalString stdenv.isAarch32 '' + # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/20 + sed -i '/exec_opcodes_sys/d' testsuite/meson.build + ''; + outputs = [ "out" "dev" ] ++ optional buildDevDoc "devdoc" ; From 4fdee57420b9f0ab21c3ff83c408caee6b74182c Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 29 Aug 2021 20:06:51 -0400 Subject: [PATCH 0239/1062] gnum4: 1.4.18 -> 1.4.19 (#136037) Co-authored-by: Dmitry Bogatov --- pkgs/development/tools/misc/gnum4/default.nix | 15 +++------------ pkgs/development/tools/misc/gnum4/s_isdir.patch | 14 -------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/tools/misc/gnum4/s_isdir.patch diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index d0b5911b71d9..50e05e4829a8 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -7,27 +7,18 @@ stdenv.mkDerivation rec { pname = "gnum4"; - version = "1.4.18"; + version = "1.4.19"; src = fetchurl { url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; + sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; }; doCheck = false; configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; - # Upstream is aware of it; it may be in the next release. - patches = - [ - ./s_isdir.patch - (fetchurl { - url = "https://sources.debian.org/data/main/m/m4/1.4.18-2/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch"; - sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; - }) - ] - ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; + patches = lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { homepage = "https://www.gnu.org/software/m4/"; diff --git a/pkgs/development/tools/misc/gnum4/s_isdir.patch b/pkgs/development/tools/misc/gnum4/s_isdir.patch deleted file mode 100644 index a009a4ba4465..000000000000 --- a/pkgs/development/tools/misc/gnum4/s_isdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fails to build with glibc 2.12.1 without this patch. - -http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html - ---- a/src/path.c -+++ b/src/path.c -@@ -22,6 +22,7 @@ - /* Handling of path search of included files via the builtins "include" - and "sinclude". */ - - #include "m4.h" -+#include "sys/stat.h" - - struct includes From 54475daa2792576cf122293c65a687acc0f42984 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 19 Jul 2021 14:55:56 +0900 Subject: [PATCH 0240/1062] stdenv: declare missing variables --- pkgs/stdenv/generic/setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4431936e3d40..1feefb65b1fc 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -329,6 +329,10 @@ declare -a pkgTargetHookVars=(envTargetTargetHook) declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) +# those variables are declared here, since where and if they are used varies +# shellcheck disable=SC2034 +declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks + # Add env hooks for all sorts of deps with the specified host offset. addEnvHooks() { local depHostOffset="$1" From 1200c8175c1d4fae641a93e5d863cc0a0db83fbc Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 19 Jul 2021 15:19:43 +0900 Subject: [PATCH 0241/1062] stdenv: reduce io --- pkgs/stdenv/generic/builder.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 79bf21ab4730..2d8d784982a8 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -6,12 +6,14 @@ done mkdir $out -echo "export SHELL=$shell" > $out/setup -echo "initialPath=\"$initialPath\"" >> $out/setup -echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup -echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup -echo "$preHook" >> $out/setup -cat "$setup" >> $out/setup +{ + echo "export SHELL=$shell" + echo "initialPath=\"$initialPath\"" + echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" + echo "defaultBuildInputs=\"$defaultBuildInputs\"" + echo "$preHook" + cat "$setup" +} > "$out/setup" # Allow the user to install stdenv using nix-env and get the packages # in stdenv. From 2fa9facc49cd08870e01d1011cf5f8e9b931aed3 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 17 Aug 2021 23:02:11 +0900 Subject: [PATCH 0242/1062] stdenv: arithmetic fixes --- pkgs/stdenv/generic/setup.sh | 46 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 1feefb65b1fc..e90fc96ba50d 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -374,14 +374,14 @@ declare -a allPlatOffsets=(-1 0 1) # implements. findInputs() { local -r pkg="$1" - local -ri hostOffset="$2" - local -ri targetOffset="$3" + local -r hostOffset="$2" + local -r targetOffset="$3" # Sanity check - (( "$hostOffset" <= "$targetOffset" )) || exit -1 + (( hostOffset <= targetOffset )) || exit -1 - local varVar="${pkgAccumVarVars[$hostOffset + 1]}" - local varRef="$varVar[\$targetOffset - \$hostOffset]" + local varVar="${pkgAccumVarVars[hostOffset + 1]}" + local varRef="$varVar[$((targetOffset - hostOffset))]" local var="${!varRef}" unset -v varVar varRef @@ -408,21 +408,21 @@ findInputs() { # offsets to current offset local -i mapOffsetResult function mapOffset() { - local -ri inputOffset="$1" - if (( "$inputOffset" <= 0 )); then - local -ri outputOffset="$inputOffset + $hostOffset" + local -r inputOffset="$1" + if (( inputOffset <= 0 )); then + local -r outputOffset=$((inputOffset + hostOffset)) else - local -ri outputOffset="$inputOffset - 1 + $targetOffset" + local -r outputOffset=$((inputOffset - 1 + targetOffset)) fi mapOffsetResult="$outputOffset" } # Host offset relative to that of the package whose immediate # dependencies we are currently exploring. - local -i relHostOffset + local relHostOffset for relHostOffset in "${allPlatOffsets[@]}"; do # `+ 1` so we start at 0 for valid index - local files="${propagatedDepFilesVars[$relHostOffset + 1]}" + local files="${propagatedDepFilesVars[relHostOffset + 1]}" # Host offset relative to the package currently being # built---as absolute an offset as will be used. @@ -500,11 +500,11 @@ done # Add package to the future PATH and run setup hooks activatePackage() { local pkg="$1" - local -ri hostOffset="$2" - local -ri targetOffset="$3" + local -r hostOffset="$2" + local -r targetOffset="$3" # Sanity check - (( "$hostOffset" <= "$targetOffset" )) || exit -1 + (( hostOffset <= targetOffset )) || exit -1 if [ -f "$pkg" ]; then source "$pkg" @@ -521,7 +521,7 @@ activatePackage() { addToSearchPath _PATH "$pkg/bin" fi - if [[ "$hostOffset" -le -1 ]]; then + if (( hostOffset <= -1 )); then addToSearchPath _XDG_DATA_DIRS "$pkg/share" fi @@ -535,13 +535,13 @@ activatePackage() { } _activatePkgs() { - local -i hostOffset targetOffset + local hostOffset targetOffset local pkg for hostOffset in "${allPlatOffsets[@]}"; do - local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[hostOffset + 1]}" for targetOffset in "${allPlatOffsets[@]}"; do - (( "$hostOffset" <= "$targetOffset" )) || continue + (( hostOffset <= targetOffset )) || continue local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]" local pkgsSlice="${!pkgsRef}[@]" for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do @@ -563,14 +563,14 @@ _activatePkgs # with this information to the relevant env hook array, but bash # doesn't have closures, so it's easier to just pass this in. _addToEnv() { - local -i depHostOffset depTargetOffset + local depHostOffset depTargetOffset local pkg for depHostOffset in "${allPlatOffsets[@]}"; do - local hookVar="${pkgHookVarVars[$depHostOffset + 1]}" - local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}" + local hookVar="${pkgHookVarVars[depHostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[depHostOffset + 1]}" for depTargetOffset in "${allPlatOffsets[@]}"; do - (( "$depHostOffset" <= "$depTargetOffset" )) || continue + (( depHostOffset <= depTargetOffset )) || continue local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" if [[ -z "${strictDeps-}" ]]; then @@ -662,7 +662,7 @@ export NIX_INDENT_MAKE=1 if [ -z "${NIX_BUILD_CORES:-}" ]; then NIX_BUILD_CORES="1" -elif [ "$NIX_BUILD_CORES" -le 0 ]; then +elif (( NIX_BUILD_CORES <= 0 )); then NIX_BUILD_CORES=$(nproc 2>/dev/null || true) if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then : From 13049cd33e5e3a9356e98b9c562717a66045cfe3 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 19 Jul 2021 15:24:39 +0900 Subject: [PATCH 0243/1062] stdenv: remove combined command conditional --- pkgs/stdenv/generic/setup.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index e90fc96ba50d..9f3a126d39ee 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1014,17 +1014,19 @@ configurePhase() { configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi - # Add --disable-dependency-tracking to speed up some builds. - if [ -z "${dontAddDisableDepTrack:-}" ]; then - if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then - configureFlags="--disable-dependency-tracking $configureFlags" + if [[ -f "$configureScript" ]]; then + # Add --disable-dependency-tracking to speed up some builds. + if [ -z "${dontAddDisableDepTrack:-}" ]; then + if grep -q dependency-tracking "$configureScript"; then + configureFlags="--disable-dependency-tracking $configureFlags" + fi fi - fi - # By default, disable static builds. - if [ -z "${dontDisableStatic:-}" ]; then - if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then - configureFlags="--disable-static $configureFlags" + # By default, disable static builds. + if [ -z "${dontDisableStatic:-}" ]; then + if grep -q enable-static "$configureScript"; then + configureFlags="--disable-static $configureFlags" + fi fi fi From fd89fb6248347e1ad6e88b7d7979794de46e85a6 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 19 Jul 2021 12:11:05 +0900 Subject: [PATCH 0244/1062] stdenv: remove bash version compatibility hack --- pkgs/stdenv/generic/setup.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 9f3a126d39ee..6042fa9d0320 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -582,12 +582,12 @@ _addToEnv() { # # TODO(@Ericson2314): Don't special-case native compilation for pkg in \ - ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \ - ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \ - ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \ - ${pkgsHostHost+"${pkgsHostHost[@]}"} \ - ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ - ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} + "${pkgsBuildBuild[@]}" \ + "${pkgsBuildHost[@]}" \ + "${pkgsBuildTarget[@]}" \ + "${pkgsHostHost[@]}" \ + "${pkgsHostTarget[@]}" \ + "${pkgsTargetTarget[@]}" do if [[ "$visitedPkgs" = *"$pkg"* ]]; then continue @@ -1034,7 +1034,7 @@ configurePhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"} + $configureFlags "${configureFlagsArray[@]}" ) echoCmd 'configure flags' "${flagsArray[@]}" # shellcheck disable=SC2086 @@ -1064,8 +1064,8 @@ buildPhase() { local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $buildFlags "${buildFlagsArray[@]}" ) echoCmd 'build flags' "${flagsArray[@]}" @@ -1103,8 +1103,8 @@ checkPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget} ) @@ -1129,8 +1129,8 @@ installPhase() { # shellcheck disable=SC2086 local flagsArray=( SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $installFlags "${installFlagsArray[@]}" ${installTargets:-install} ) @@ -1237,8 +1237,8 @@ installCheckPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck} ) @@ -1257,7 +1257,7 @@ distPhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} + $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} ) echo 'dist flags: %q' "${flagsArray[@]}" From 5b86e637d72adc1838735b85237553c354bd2dda Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 19 Aug 2021 23:22:40 +0900 Subject: [PATCH 0245/1062] move-docs.sh: simplify redundant conditional remove impossible check for empty variable after it's been set twice --- pkgs/build-support/setup-hooks/move-docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh index ef31dcdce274..e4460f98816d 100644 --- a/pkgs/build-support/setup-hooks/move-docs.sh +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare) _moveToShare() { forceShare=${forceShare:=man doc info} - if [ -z "$forceShare" -o -z "$out" ]; then return; fi + if [[ -z "$out" ]]; then return; fi for d in $forceShare; do if [ -d "$out/$d" ]; then From e32bf6f4f2df1bbe690c5eda194c611407b21b06 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 19 Aug 2021 23:23:58 +0900 Subject: [PATCH 0246/1062] stdenv setup.sh: remove combined [ in favor of [[ [ ... ] && [ ...] -> [[ ... && ... ]] --- pkgs/stdenv/generic/setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 6042fa9d0320..e52ea8bdd66c 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,7 +1,7 @@ set -eu set -o pipefail -if [ -n "${BASH_VERSINFO-}" ] && [ "${BASH_VERSINFO-}" -lt 4 ]; then +if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})" echo "Please install Bash 4 or greater to continue." exit 1 @@ -675,11 +675,11 @@ export NIX_BUILD_CORES # Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly. # Leave it in impure shells for convenience. -if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then +if [[ -z "${NIX_SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then export NIX_SSL_CERT_FILE=/no-cert-file.crt fi # Another variant left for compatibility. -if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then +if [[ -z "${SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then export SSL_CERT_FILE=/no-cert-file.crt fi From 5c3a01ad51bf3fb97c9690c65ff238a63c9b2302 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 16:14:01 +0200 Subject: [PATCH 0247/1062] cpython: fix duplicate function arguments Merging gone bad, sorry. --- pkgs/development/interpreters/python/cpython/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 0adf0a2af634..abfff8009afe 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -45,8 +45,6 @@ # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility. # enabling LTO on 32bit arch causes downstream packages to fail when linking # enabling LTO on *-darwin causes python3 to fail when linking. -, enableLTO ? stdenv.is64bit && stdenv.isLinux -, reproducibleBuild ? false # enabling LTO with musl and dynamic linking fails with a linker error although it should # be possible as alpine is doing it: https://github.com/alpinelinux/aports/blob/a8ccb04668c7729e0f0db6c6ff5f25d7519e779b/main/python3/APKBUILD#L82 , enableLTO ? stdenv.is64bit && stdenv.isLinux && !(stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isStatic) From 76d0f2038e9dc0b341b6f74515b79dca009bb887 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:24:32 +0200 Subject: [PATCH 0248/1062] vala_0_48: 0.48.18 -> 0.48.19 - https://gitlab.gnome.org/GNOME/vala/raw/0.48.19/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 8f93a6746ea2..cdf272d30c62 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -116,8 +116,8 @@ in rec { }; vala_0_48 = generic { - version = "0.48.18"; - sha256 = "1pbz4nyrrf9wp8rp953sczx545s4g0h5mars9ynkn788dzs2h3wy"; + version = "0.48.19"; + sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE="; }; vala_0_50 = generic { From 520562cc47fdb5b973cc959f8721bf950038fbdd Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:25:25 +0200 Subject: [PATCH 0249/1062] vala_0_50: 0.50.9 -> 0.50.10 - https://gitlab.gnome.org/GNOME/vala/raw/0.50.10/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index cdf272d30c62..169038dd277c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -121,8 +121,8 @@ in rec { }; vala_0_50 = generic { - version = "0.50.9"; - sha256 = "0w5ngs90rq7vy21nqfq8drqyb33kxm17j161qvakwpsbjsidv1mn"; + version = "0.50.10"; + sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU="; }; vala_0_52 = generic { From a57b4c7c4db2fdd0452e86d5ce4b738e93684889 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:25:55 +0200 Subject: [PATCH 0250/1062] vala_0_52: 0.52.4 -> 0.52.5 - https://gitlab.gnome.org/GNOME/vala/raw/0.52.5/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 169038dd277c..809e81ae548b 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -126,8 +126,8 @@ in rec { }; vala_0_52 = generic { - version = "0.52.4"; - sha256 = "0cfz3xshc9azxx4fn25x9gadnph6jvf1r2wzd7p5krk0a4755ppc"; + version = "0.52.5"; + sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; }; vala = vala_0_52; From 0074a8fb8f54b1ae43ee5309b29d07af16b75e76 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:26:52 +0200 Subject: [PATCH 0251/1062] glib: 2.68.3 -> 2.68.4 - https://gitlab.gnome.org/GNOME/glib/-/releases/2.68.4 --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 3c8fe4d569fa..edb37d2ddd32 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.3"; + version = "2.68.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; + sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; }; patches = optionals stdenv.isDarwin [ From 3ba32e04a7e8fd164684e1b79a8a172f07d631d4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 1 Sep 2021 07:44:51 +0000 Subject: [PATCH 0252/1062] linux_5_13: add missing alias --- 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 0421939e901c..b78502116a49 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -477,6 +477,7 @@ mapAliases ({ linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; + linux_5_13 = linuxKernel.kernels.linux_5_13; # added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; From 3722f0d96f5137830a98f30e4dedd9f9aaefbb10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0253/1062] python3Packages.acme-tiny: 4.1.0 -> 4.1.1 --- pkgs/development/python-modules/acme-tiny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 76e8a8401fd4..7d17af3ae787 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "acme-tiny"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0jmg525n4n98hwy3hf303jbnq23z79sqwgliji9j7qcnph47gkgq"; + sha256 = "b7050b9428d45319e14ab9ea77f0ff4eb40451e5a68325d4c5358a87cff0e793"; }; patchPhase = '' From 29fa00b99e905f6d052492a2b9d6b56c246e0c71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0254/1062] python3Packages.agate-excel: 0.2.3 -> 0.2.5 --- pkgs/development/python-modules/agate-excel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index 752c905ee8e6..cbf49d8477c3 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "agate-excel"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "8f255ef2c87c436b7132049e1dd86c8e08bf82d8c773aea86f3069b461a17d52"; + sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; }; propagatedBuildInputs = [ agate openpyxl xlrd ]; From bf4e6c720e49969afde0783395356ae9663530a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0255/1062] python3Packages.aiobotocore: 1.3.1 -> 1.4.1 --- pkgs/development/python-modules/aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index e07b56d3f266..591fd8c17874 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.3.1"; + version = "1.4.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "8ecee55346651e0f4cbda883e3e16cfe11460b8d7adcc08d0017cbb867636ae1"; + sha256 = "09f06723d1d69c6d407d9a356ca65ab42a5b7b73a45be4b1ed0ed1a6b6057a9f"; }; # relax version constraints: aiobotocore works with newer botocore versions From f1252e26fdd17f10fe7d0517e42146b37e321c1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0256/1062] python3Packages.ajsonrpc: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/ajsonrpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix index e5a81d9cfa6e..b3482cd74679 100644 --- a/pkgs/development/python-modules/ajsonrpc/default.nix +++ b/pkgs/development/python-modules/ajsonrpc/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ajsonrpc"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1b5r8975wdnk3qnc1qjnn4lkxmqcir3brbwnxml9ii90dnsw408a"; + sha256 = "791bac18f0bf0dee109194644f151cf8b7ff529c4b8d6239ac48104a3251a19f"; }; checkInputs = [ pytestCheckHook ]; From f498682e438f60e12a7f137fcb49d6963e43f402 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0257/1062] python3Packages.arrow: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/arrow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index d47dd61c3d47..956dd5f40f2d 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1n2vzyrirfj7fp0zn6iipm3i8bch0g4m14z02nrvlyjiyfmi7zmq"; + sha256 = "dee7602f6c60e3ec510095b5e301441bc56288cb8f51def14dcb3079f623823a"; }; postPatch = '' From f9ea532088871513b40c57d0684b9d136d1365c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0258/1062] python3Packages.astroid: 2.5.6 -> 2.7.2 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 59bd0bc7c369..3b23ee2438ec 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.5.6"; # Check whether the version is compatible with pylint + version = "2.7.2"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/nWXzuWkerUDvFT/tJTZuhfju46MAM0cwosVH9BXoY8="; + sha256 = "1vlibff93z9fvkniviwzizsfffw1j0ywkh4rragnlps797143iv4"; }; SETUPTOOLS_SCM_PRETEND_VERSION=version; From 93ad85e7f831c4fb4cab7cd9d9fb0b05ff1b9547 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0259/1062] python3Packages.auth0-python: 3.16.2 -> 3.17.0 --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 67701afc0eb0..6d47f95e7564 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.16.2"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Slpwml1GDdxAZ4P6Vn2brrupRofiOHvmQF26l0gtTJM="; + sha256 = "7b21bf91859ea56ac3b665efe5e73340c65dfd30de01081ff334a18a35a188a6"; }; propagatedBuildInputs = [ From 029f84c37fdd41cd0abb569d62272ae0943c75d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0260/1062] python3Packages.authcaptureproxy: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/authcaptureproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index a780ae59be70..c03b423932df 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "1fbrmh6qa3dm3q3zdxaa0fls94wardbcvnjgwxk686wpjgs1xrs4"; + sha256 = "1cg63qhf823nf785kyl96r7vyxfl6dlbwsmhcpny8vb65pl9gng5"; }; postPatch = '' From cef0008ba61caa414354e97bba62419515b5b6a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0261/1062] python3Packages.awscrt: 0.11.24 -> 0.12.0 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 08e0563b966b..fa29e9f636e3 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.11.24"; + version = "0.12.0"; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b8aa68bca404bf0085be0570eff5b542d01f7e8e3c0f9b0859abfe5e070162ff"; + sha256 = "65fa09ce78902319392bbb62991ddd3b33cebc0e3bbc81ad2c176072ab40de52"; }; meta = with lib; { From 4f4f0339e6e960c6759c99c1624176b52a76dd5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0262/1062] python3Packages.azure-core: 1.16.0 -> 1.17.0 --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 8dce5b8feb75..cd0a816815cd 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.16.0"; + version = "1.17.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4"; + sha256 = "25407390dde142d3e41ecf78bb18cedda9b7f7a0af558d082dec711c4a334f46"; }; propagatedBuildInputs = [ From 78fc0b2af6808fb4a801f2bdf0dcd46f356ed83f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:30 +0200 Subject: [PATCH 0263/1062] python3Packages.azure-mgmt-iothubprovisioningservices: 0.2.0 -> 0.3.0 --- .../azure-mgmt-iothubprovisioningservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 3401ed898c8f..dcf97249e7f9 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d"; + sha256 = "d01b7725f3f68c5a6ff02184a9bdda8c775888af66378dd8314903d0a46e32b9"; }; propagatedBuildInputs = [ From 75677b1f1e00cafb89de2dc380e4f9b8cbe74ec9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0264/1062] python3Packages.beniget: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/beniget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix index f8733eeed626..51f641c51eb4 100644 --- a/pkgs/development/python-modules/beniget/default.nix +++ b/pkgs/development/python-modules/beniget/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "beniget"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749"; + sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c"; }; propagatedBuildInputs = [ From fce4b0ed1608628be201638fb44c3597d7a2ee47 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0265/1062] python3Packages.bokeh: 2.3.2 -> 2.3.3 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 6677d9ceacb9..925eb9c8f39d 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "fcc0d0a3129ae457cdb0a4f503843a4d13d1f5d07af7748424ea8c7ddfc321f1"; + sha256 = "a5fdcc181835561447fcc5a371300973fce4114692d5853addec284d1cdeb677"; }; patches = [ From 3c694114fb6483728ce10d428880e5c30c7c4f9d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0266/1062] python3Packages.braintree: 4.10.0 -> 4.12.0 --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 6d64def54ab6..17681f053337 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.10.0"; + version = "4.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f934a329c7a2b3f7058d5c733cc95da694f66afb5a789162ec701ba4d26a0d90"; + sha256 = "946abd50fe2843eec586ac3cec285d27dfae0cc5a43a64b505e8a2800b8a74a6"; }; propagatedBuildInputs = [ requests ]; From 0d19ece1165088d410c56b653316bdd96752b2e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0267/1062] python3Packages.cffi: 1.14.5 -> 1.14.6 --- pkgs/development/python-modules/cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 92899ed85e58..94aecdcc4ec4 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.5"; + version = "1.14.6"; src = fetchPypi { inherit pname version; - sha256 = "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"; + sha256 = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"; }; outputs = [ "out" "dev" ]; From baaba1c5e0af7c4107b6160f56c53416a53276c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0268/1062] python3Packages.cliff: 3.8.0 -> 3.9.0 --- pkgs/development/python-modules/cliff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index bb856736d92b..7eee574dad48 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "8dd215d0a84c9a3ab2fa2aa700849f4e7b786639f66caa0ad4108c85dca95a7c"; + sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3"; }; propagatedBuildInputs = [ From 904c48e6c18ffb9f0ce119406f131433e8feb30d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0269/1062] python3Packages.commoncode: 21.6.11 -> 21.7.23 --- pkgs/development/python-modules/commoncode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 16d529b17f53..7c9528c06e52 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,11 +14,11 @@ }: buildPythonPackage rec { pname = "commoncode"; - version = "21.6.11"; + version = "21.7.23"; src = fetchPypi { inherit pname version; - sha256 = "d6c8c985746a541913d5bb534c770f2422e5b4ac7a4ef765abc05c287a40ff4b"; + sha256 = "38511dcd7c518bf7fec4944c78e1118304f2f2582a7e6792cc5773aebe95a086"; }; dontConfigure = true; From e5d2fe1e478f9db88bae4059203030fe72fdb40a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0270/1062] python3Packages.configargparse: 1.4.1 -> 1.5.2 --- pkgs/development/python-modules/configargparse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 45ec7364a59a..1bb036b97df5 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.4.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; - rev = "v${version}"; - sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA="; + rev = version; + sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2"; }; checkInputs = [ From 329c43a1ab54713b4632c474c2d776d2a6a107bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0271/1062] python3Packages.cryptacular: 1.5.5 -> 1.6.2 --- pkgs/development/python-modules/cryptacular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index dccfddaea1ae..31c0ebace475 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cryptacular"; - version = "1.5.5"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "fb4d48716e88e4d050255ff0f065f6d437caa358ceef16ba5840c95cece224f9"; + sha256 = "7b529cb2b8a3c7e5be77921bf1ebc653d4d3a8f791375cc6f971b20db2404176"; }; buildInputs = [ coverage nose ]; From 702a3ab8a62299f7231b1f00f7e0e849cf650bda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0272/1062] python3Packages.cx_Freeze: 6.6 -> 6.7 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index b6edb2ced1f2..42fa8fd8ddca 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.6"; + version = "6.7"; src = fetchPypi { inherit pname version; - sha256 = "c4af8ad3f7e7d71e291c1dec5d0fb26bbe92df834b098ed35434c901fbd6762f"; + sha256 = "050f1dd133a04810bd7f38ac7ae3b290054acb2ff4f6e73f7a286266d153495d"; }; disabled = pythonOlder "3.5"; From 9494168465f9abeb92b16ec45c821caa5115c39e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0273/1062] python3Packages.cxxfilt: 0.2.2 -> 0.3.0 --- pkgs/development/python-modules/cxxfilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 1cc5ad19bda2..117b12145764 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cxxfilt"; - version = "0.2.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b"; + sha256 = "7df6464ba5e8efbf0d8974c0b2c78b32546676f06059a83515dbdfa559b34214"; }; postPatch = let From 09e7686e9618387cfd27f610d2c2361c84880dce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0274/1062] python3Packages.dask-jobqueue: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/dask-jobqueue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 7719842fbad6..5e43a8f16648 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.7.3"; pname = "dask-jobqueue"; src = fetchPypi { inherit pname version; - sha256 = "1767f4146b2663d9d2eaef62b882a86e1df0bccdb8ae68ae3e5e546aa6796d35"; + sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79"; }; checkInputs = [ pytest ]; From cd2a058c68bea3fcf191dd2257548304c6e0c2d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0275/1062] python3Packages.dask-xgboost: 0.1.11 -> 0.2.0 --- pkgs/development/python-modules/dask-xgboost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index eb18ac31fd03..1f9be870c975 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.1.11"; + version = "0.2.0"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; + sha256 = "6d9c491dc4099f74a0df66c4d439d296c0f1fba97009fe93e21b2350f295b4ca"; }; propagatedBuildInputs = [ xgboost dask distributed ]; From 277da1f88f2eeaea2118c3db0ca961bdc1815575 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0276/1062] python3Packages.databricks-connect: 8.1.6 -> 8.1.11 From 78ac621303a3de2937eb3b95acb6463030d7bf15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0277/1062] python3Packages.distributed: 2021.6.2 -> 2021.8.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index ce0cf13e9a92..38c977f3ffa5 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.6.2"; + version = "2021.8.1"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug="; + sha256 = "c13ac10ecd9ee5f0ff67f5697149062d6e483f23a079918df1ab2e19b11fa77d"; }; propagatedBuildInputs = [ From 1186f6463a2c19d367e5e4fb196655e40f16eb4d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0278/1062] python3Packages.distro: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/distro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 885538de65ce..bf8675af941d 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distro"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92"; + sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"; }; # tests are very targeted at individual linux distributions From 1c3be12d4a976f0a518e141b639f7119548ee135 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0279/1062] python3Packages.djangorestframework_simplejwt: 4.7.1 -> 4.8.0 --- .../python-modules/djangorestframework-simplejwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 82ff51fd3821..ad9afabadf2c 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "djangorestframework_simplejwt"; - version = "4.7.1"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "c0e9b617da337becb55e67935eb992fad84f861418e7ab5fb3e77a3fd18d4137"; + sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a"; }; propagatedBuildInputs = [ django djangorestframework pyjwt ]; From 1063ec28370d9ab9005b7b883975fa5a4fad928d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0280/1062] python3Packages.django-taggit: 1.4.0 -> 1.5.1 --- pkgs/development/python-modules/django_taggit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index cbfcc103c5c1..ab908c639a00 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "1.4.0"; + version = "1.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b9ed6e94bad0bed3bf062a6be7ee3db117fda02c6419c680d614197364ea018b"; + sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a"; }; propagatedBuildInputs = [ isort django ]; From b50cbae7ab03ca744297ceaae035255c772cf861 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0281/1062] python3Packages.extractcode: 21.6.2 -> 21.7.23 --- pkgs/development/python-modules/extractcode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 28dece127b12..a39205f5aeea 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -11,11 +11,11 @@ }: buildPythonPackage rec { pname = "extractcode"; - version = "21.6.2"; + version = "21.7.23"; src = fetchPypi { inherit pname version; - sha256 = "e665501438fedeb6e75335d880c8913a8cd894fd8adcf9c243eb6d48fad2d01c"; + sha256 = "58aa16d60cfcbd3695d7ea84a1e30d5ba9fa6f614b2ef4a6d0565b2ac5d4f757"; }; dontConfigure = true; From 18865874a13de1599936e8ae6ec4ea1c2d6d664b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0282/1062] python3Packages.fakeredis: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index bd4c85a3bb65..e38b78c0acab 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.5.2"; + version = "1.6.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "18fc1808d2ce72169d3f11acdb524a00ef96bd29970c6d34cfeb2edb3fc0c020"; + sha256 = "11ccfc9769d718d37e45b382e64a6ba02586b622afa0371a6bd85766d72255f3"; }; propagatedBuildInputs = [ From 4e6fa0b8eb7b637caefc6f8ca15af533567253c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0283/1062] python3Packages.fastdiff: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/fastdiff/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index b3e27d7a5e81..6d37e6884b69 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -1,25 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-benchmark, wasmer }: +{ lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: buildPythonPackage rec { pname = "fastdiff"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1ai95vjchl4396zjl1b69xfqvn9kn1y7c40d9l0qxdss0pcx6fk2"; + sha256 = "4dfa09c47832a8c040acda3f1f55fc0ab4d666f0e14e6951e6da78d59acd945a"; }; postPatch = '' substituteInPlace setup.py \ --replace 'pytest-runner' "" + substituteInPlace setup.cfg \ + --replace "collect_ignore = ['setup.py']" "" ''; - propagatedBuildInputs = [ wasmer ]; + propagatedBuildInputs = [ wasmer wasmer-compiler-cranelift ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; pythonImportsCheck = [ "fastdiff" ]; - disabledTests = [ "test_native" ]; meta = with lib; { description = "A fast native implementation of diff algorithm with a pure Python fallback"; From 777ad925da66662b3fc0bcff59639a5ea441eb72 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0284/1062] python3Packages.fastimport: 0.9.13 -> 0.9.14 --- pkgs/development/python-modules/fastimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index fe46405eb3f1..bd5c270d686c 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "fastimport"; - version = "0.9.13"; + version = "0.9.14"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "486135a39edb85808fdbbe2c8009197978800a4544fca56cc2074df32e1304f3"; + sha256 = "6ac99dda4e7b0b3ae831507b6d0094802e6dd95891feafde8cc5c405b6c149ca"; }; checkPhase = '' From 6c7e68245f1dbb006bb6acca843a2b5644972f24 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0285/1062] python3Packages.ffmpeg-progress-yield: 0.0.4 -> 0.1.2 --- .../python-modules/ffmpeg-progress-yield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 5d2641970721..4b4d6bdd7fc2 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.0.4"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "e944093e2c1b213da8fa4f0c276c1bad44e0b8ba8be7e4fd001f5132d16baef5"; + sha256 = "92ae36ff5cf38428bd3695629b5065d161c658fb0de0faf2c20cd7a99dac3820"; }; propagatedBuildInputs = [ colorama tqdm ]; From a463c5ba58b2a0ddc931e2089872250df1e7199f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0286/1062] python3Packages.Flask-JWT-Extended: 4.2.3 -> 4.3.0 --- .../development/python-modules/flask-jwt-extended/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d9eae8ffa585..22be871f745f 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "4.2.3"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "22b8ffa7587d50aaf65f3009f1d55ef7287da8260eaf4655a5837e33479216c3"; + sha256 = "6e2b40d548b9dfc6051740c4552c097ac38e514e500c16c682d9a533d17ca418"; }; propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; From 6ec7b884bd0e3759dd93ee4bbed5e43a392c9cf7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0287/1062] python3Packages.Flask-Migrate: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/flask-migrate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 26f2ab4aea18..010e79ecbf2c 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Migrate"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "00m76kgdkk0w5bfq8hbqszpyaqk0yxdvmz4s67lvd36pc7wfhhjd"; + sha256 = "57d6060839e3a7f150eaab6fe4e726d9e3e7cffe2150fb223d73f92421c6d1d9"; }; checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales; From 2df3023d28767d4e13eb0e0e3589192f42374f96 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0288/1062] python3Packages.flexmock: 0.10.4 -> 0.10.7 --- pkgs/development/python-modules/flexmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 48a2f931f6b4..5c561b93f6d9 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.10.5"; + version = "0.10.7"; src = fetchPypi { inherit pname version; - sha256 = "003422fdbcf5d6570e60a0eafeb54c0af624c6cddab5fc3bfe026e52dd0f9c5a"; + sha256 = "0abedcc894a817452ae3902e8e00f0a8d2c66497f63caaaab03cbd464ea63d04"; }; checkInputs = [ pytest ]; From c197291a57747313d2daa054821147a4234c008f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0289/1062] python3Packages.GeoAlchemy2: 0.9.3 -> 0.9.4 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index c4c0f41d8d17..94b27d6f1270 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "56f969cf4ad6629ebcde73e807f7dac0a9375c79991b4f93efab191f37737a00"; + sha256 = "b0e56d4a945bdc0f8fa9edd50ecc912889ea68e0e3558a19160dcb0d5b1b65fc"; }; nativeBuildInputs = [ setuptools-scm ]; From e5715e4ed592c2f078e2c80b8e4eccc1dd191a94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0290/1062] python3Packages.geventhttpclient: 1.4.5 -> 1.5.1 --- .../geventhttpclient/default.nix | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 5563ff94baf5..fd759a0bd723 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,32 +1,49 @@ { lib , buildPythonPackage -, fetchPypi -, pytest -, gevent -, certifi -, six -, backports_ssl_match_hostname , pythonOlder +, fetchPypi +, backports_ssl_match_hostname +, brotli +, certifi +, gevent +, six +, dpkt +, pytestCheckHook }: buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.4.5"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3f0ab18d84ef26ba0c9df73ae2a41ba30a46072b447f2e36c740400de4a63d44"; + sha256 = "4aead64253d2769a6528544f7812ce8d71ae13551d079f2d9a3533d72818f2e0"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ gevent certifi six ] - ++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ]; + propagatedBuildInputs = [ + brotli + certifi + gevent + six + ] ++ lib.optionals (pythonOlder "3.7") [ + backports_ssl_match_hostname + ]; - # Several tests fail that require network - doCheck = false; - checkPhase = '' - py.test $out - ''; + checkInputs = [ + dpkt + pytestCheckHook + ]; + + disabledTests = [ + # socket.gaierror: [Errno -2] Name or service not known + "test_client_simple" + "test_client_without_leading_slas" + "test_request_with_headers" + "test_response_context_manager" + "test_client_ssl" + "test_ssl_fail_invalid_certificate" + "test_multi_queries_greenlet_safe" + ]; meta = with lib; { homepage = "https://github.com/gwik/geventhttpclient"; From d792845645a27a7c3bbac2288c1e48a8c1d23eb1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0291/1062] python3Packages.google-api-python-client: 2.15.0 -> 2.18.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 2fd9247c8825..45d6044b8ea7 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.15.0"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g3VIkjKCP0TGARlqlgUF4D7FjJXdtkFcax0ddrRo+Lo="; + sha256 = "a25661ec6cf4c159f41fe9c061c2bee31b2dddaf2ad787e23617048a25b53842"; }; # No tests included in archive From 55f75a94e90a91cc9286eb35b5985c99dc005e40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0292/1062] python3Packages.gradient: 1.5.5 -> 1.7.2 --- pkgs/development/python-modules/gradient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 57b58699ec38..4303101ed929 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.5.5"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "fee5016afe5e61a640bb9d7e234a10926c17c9e83c876b617438ff5f5ce039ad"; + sha256 = "108dc01d2f9f9d4fa2c080d12f14b77b4ec6329f239a0b2bc89e09360ae6757d"; }; postPatch = '' From 3c9c65e1cabaae4b6a4299775ee01bf5dfe16e01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0293/1062] python3Packages.graphql-core: 3.1.5 -> 3.1.6 --- pkgs/development/python-modules/graphql-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 7ac25424616a..1909dd99fe0f 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "055gfvyax781f4zk4pl60y8yd90bnn4rkqh5i48pczaff0lwlfj1"; + sha256 = "1ip0yrqmnqncgpwvba18x020gkwr7csiw4zdy6mrdnvwf5qyam4x"; }; checkInputs = [ From 1a4c4b800e6aacada73da4dcd364e67d4a3d6411 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0294/1062] python3Packages.green: 3.2.6 -> 3.3.0 --- pkgs/development/python-modules/green/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 934c363245d7..0320a3858be1 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "green"; - version = "3.2.6"; + version = "3.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e51d4ff6e6885942d944304fedc7440a8f87917aa09526beeecb31a0dae655b8"; + sha256 = "a4d86f2dfa4ccbc86f24bcb9c9ab8bf34219c876c24e9f0603aab4dfe73bb575"; }; propagatedBuildInputs = [ From e0f8ef2fa9106284e529ff5dd53614e6e307f99d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0295/1062] python3Packages.greenlet: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/greenlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 4d829f3d6473..e997c7da3987 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "1.1.0"; + version = "1.1.1"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee"; + sha256 = "c0f22774cd8294078bdf7392ac73cf00bfa1e5e0ed644bd064fdabc5f2a2f481"; }; checkPhase = '' From 7c1310f206f22a73434d0407ce4e0722f260a9e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0296/1062] python3Packages.h5py: 3.2.1 -> 3.4.0 --- pkgs/development/python-modules/h5py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 9e5921bb412d..dfa4288e54fc 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.2.1"; + version = "3.4.0"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-iUdL6RG/zbNMvw2YuOxItXjCeon9sa5O51E/HvjZJJ4="; + sha256 = "ee1c683d91ab010d5e85cb61e8f9e7ee0d8eab545bf3dd50a9618f1d0e8f615e"; }; # avoid strict pinning of numpy From b919b3eae4bc69034169826d6dd71b9faf04aa5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0297/1062] python3Packages.httpretty: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/httpretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index f0c0b9b2ee99..78a529666139 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "httpretty"; - version = "1.1.3"; + version = "1.1.4"; # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "229ade39175ea4324e767f29dc24e5f846fbc72bf80e1a919b2547a6574ff601"; + sha256 = "20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"; }; propagatedBuildInputs = [ six ]; From 8585fcd1aa833bff45119553b9624881f80b0be4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0298/1062] python3Packages.httptools: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/httptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index 54b512be1fd4..0a5b510b0ad9 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.2.0"; + version = "0.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"; + sha256 = "3f9b4856d46ba1f0c850f4e84b264a9a8b4460acb20e865ec00978ad9fbaa4cf"; }; # tests are not included in pypi tarball From e8dcdc16a669308df476745c4448f9e3c66e1d2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0299/1062] python3Packages.humanize: 3.9.0 -> 3.11.0 --- pkgs/development/python-modules/humanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 4c5bd0e3af25..85ec6257ea5d 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "3.9.0"; + version = "3.11.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "892a5b7b87763c4c6997a58382c2b1f4614048a2e01c23ef1bb0456e6f9d4d5d"; + sha256 = "4160cdc63fcd0daac27d2e1e218a31bb396fc3fe5712d153675d89432a03778f"; }; nativeBuildInputs = [ setuptools-scm ]; From 368e7ab14e3fb2dcd99f1a40e130e4703e51fb49 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0300/1062] python3Packages.hypothesis: 6.14.0 -> 6.15.0 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 35f53864eb9d..bc832f5f1ad5 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.14.0"; + version = "6.15.0"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "0yns81j3fnpdfaphk722xcnidqhgy0kmd7ik6aw7l795l0wivhxj"; + sha256 = "0kjnd593wz90gbjwzn4gc9514w4pxg77hpisp9v6m7bj1w7a7x5q"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From be4a0de384018752d0989b4b04945c2fcf3fdff0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0301/1062] python3Packages.hypothesmith: 0.1.8 -> 0.1.9 --- pkgs/development/python-modules/hypothesmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 4bf1ca8d02f7..0d175989271c 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+f8EexXE7TEs49pX6idXD4bWtTzhKvnyXlnmV2oAQQo="; + sha256 = "039fd6aa0102f89df9df7ad4cff70aa8068678c13c3be2713c92568917317a04"; }; propagatedBuildInputs = [ hypothesis lark-parser libcst ]; From 5670b1a33e2c1f08bdce4be3c2a343198a84325c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0302/1062] python3Packages.ibm-cloud-sdk-core: 3.10.0 -> 3.11.3 --- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 8e7f4832c254..51e4008ae512 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.10.0"; + version = "3.11.3"; src = fetchPypi { inherit pname version; - sha256 = "ab9520be99066ec41a24e31ac653c28953adc8fc349f0fa53a598e1802a79cd6"; + sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; }; checkInputs = [ From 5329eb41420b7d288427de653b9f118d8e22f906 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0303/1062] python3Packages.ibm-watson: 5.2.2 -> 5.2.3 --- pkgs/development/python-modules/ibm-watson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 49e4541143e9..9e5198a1cb30 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "sha256-bK6lcTKAVwAJDb5LqKRWR/4wcOKx7bRwWYC+WB5qJE4="; + sha256 = "0i0zs38hqgh2510b3690nrq2pvx7wcdlv9iyjgsrfl7gid8qi3ng"; }; checkInputs = [ From 6e15120f7158c454d7a57df3ab0c1ec3f0d32ee6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0304/1062] python3Packages.imageio-ffmpeg: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/imageio-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 9d1755d81b97..a249b2dbfe19 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.4"; + version = "0.4.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "73640a7a54f95e607addd637c766d56be31d975a64ddb97d14df012575ef1a5d"; + sha256 = "f2ea4245a2adad25dedf98d343159579167e549ac8c4691cef5eff980e20c139"; }; patches = [ From 4cc24578913b5cc4d76598cb0b4b053496f134ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0305/1062] python3Packages.imap-tools: 0.44.0 -> 0.46.0 --- pkgs/development/python-modules/imap-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index d1cecdda42d9..ef13bf471e16 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.44.0"; + version = "0.46.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-C9396yRSowaLe3E1s+rw8bah77znjfoIhLwJpcqhN6Y="; + sha256 = "08a4p4q96zz6qp3cy7hs5jn9h2gf68d8zchw4w0kk83sm1r8rpxw"; }; checkInputs = [ From 91d6cf0c5e10e24d339e7c55a04f19f0954e2471 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0306/1062] python3Packages.iminuit: 2.6.1 -> 2.8.2 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 42a1d7c4ffdb..cd598d602a29 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.6.1"; + version = "2.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5fb8786bcad53762648ddacb008d18b49704ba5c011ade240004bfc5a628b4f6"; + sha256 = "ffba627a638fe233bbef03e91af6063c1e5d62405327219b03f0abf50196a95b"; }; nativeBuildInputs = [ cmake ]; From 4dac31144a0a4d88d3f479bbb2d84337d9fec422 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0307/1062] python3Packages.inform: 1.24 -> 1.25 --- pkgs/development/python-modules/inform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 2397c0bc4db6..9ef6fd1e0a1d 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "inform"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "KenKundert"; repo = "inform"; rev = "v${version}"; - sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; + sha256 = "1r56wmn21c7ggy33548l6dfjswhadkp2iaalfb7xgsxmq7qfcnax"; }; postPatch = '' From 0e6dacc70f26f9ad2b9fd89e8357abbff5bf44a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0308/1062] python3Packages.intake: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/intake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index fff6d74b56a1..3a959b897216 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.2"; + version = "0.6.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b0cab1d185a703acb38eecb9cff3edd5cc7004fe18a36d5e42a8f7fffc9cca1c"; + sha256 = "f64543353f30d9440b953984f78b7a0954e5756d70c64243609d307ba488014f"; }; propagatedBuildInputs = [ From dc8c8857775c3085f95b235150528b45cb66da5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0309/1062] python3Packages.invoke: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/invoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 08d72cec4961..45c341c209cf 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "f0c560075b5fb29ba14dad44a7185514e94970d1b9d57dcd3723bec5fed92650"; + sha256 = "374d1e2ecf78981da94bfaf95366216aaec27c2d6a7b7d5818d92da55aa258d3"; }; patchPhase = '' From c8192a02b76950a68ae465c137b1410179c906b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0310/1062] python3Packages.ipython: 7.24.1 -> 7.26.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e036a3378643..f03db08bc49b 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.24.1"; + version = "7.26.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9bc24a99f5d19721fb8a2d1408908e9c0520a17fff2233ffe82620847f17f1b6"; + sha256 = "0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e"; }; prePatch = lib.optionalString stdenv.isDarwin '' From 43185f70b46cea6132e1c5e50d88b97dd1c780e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0311/1062] python3Packages.iterm2: 1.21 -> 1.27 --- pkgs/development/python-modules/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 3b98f25c566f..a1b777c1bb76 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.21"; + version = "1.27"; src = fetchPypi { inherit pname version; - sha256 = "06be59e0314a2f0f32753eb2d44eb563e85253875bc8da64df5b4eeba7fc05bd"; + sha256 = "dcbd89d0502e72a9a41b055f5cf10b5a991f60fb12df29918d9c2183d1389abd"; }; propagatedBuildInputs = [ protobuf websockets ]; From 271c8c36ebfc5c95e787cfcd9c4fa909a74d8bc6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0312/1062] python3Packages.jaraco.collections: 3.3.0 -> 3.4.0 --- .../development/python-modules/jaraco_collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 060d45938118..46f2bfdff3fc 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "3662267424b55f10bf15b6f5dee6a6e48a2865c0ec50cc7a16040c81c55a98dc"; + sha256 = "344d14769d716e7496af879ac71b3c6ebdd46abc64bd9ec21d15248365aa3ac9"; }; pythonNamespaces = [ "jaraco" ]; From 0e8c863527cb868b52a5ebe177bef43e281c1815 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0313/1062] python3Packages.jaraco.text: 3.5.0 -> 3.5.1 --- pkgs/development/python-modules/jaraco_text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 3126ab999674..32e8aa23aeb4 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.5.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "f07f1076814a17a98eb915948b9a0dc71b1891c833588066ec1feb04ea4389b1"; + sha256 = "ede4e9103443b62b3d1d193257dfb85aab7c69a6cef78a0887d64bb307a03bc3"; }; pythonNamespaces = [ "jaraco" ]; From ba901ff8204eaa7c9afe8124f09f4434ec1c88ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0314/1062] python3Packages.jeepney: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/jeepney/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 2acf0361bcbc..3079f152e444 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, async-timeout , dbus , pytest , pytest-trio @@ -12,16 +13,17 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1237cd64c8f7ac3aa4b3f332c4d0fb4a8216f39eaa662ec904302d4d77de5a54"; + sha256 = "fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"; }; checkInputs = [ + async-timeout dbus pytest pytest-trio From 2fbc5b6e5986a0b7a9d1a97404a4b2c3dd472c21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0315/1062] python3Packages.jupyter_client: 6.1.12 -> 6.2.0 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index fbc37c3f581b..2c0a6c398864 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.12"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c4bca1d0846186ca8be97f4d2fa6d2bae889cce4892a167ffa1ba6bd1f73e782"; + sha256 = "e2ab61d79fbf8b56734a4c2499f19830fbd7f6fefb3e87868ef0545cb3c17eb9"; }; propagatedBuildInputs = [ From 60e32d07e06c3dd7119b91469bb066f3d1f8005f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0316/1062] python3Packages.jupyterlab: 3.0.16 -> 3.1.9 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 6264bbb5c44e..21255bba94f2 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.1.6"; + version = "3.1.9"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6d2ada6a333861f33a1b555d3cb7b07aa9d1ab80f07997b3d0c43878a98c1174"; + sha256 = "007e42f833e59fd36872d459e45be243d899edbd0e4a98d21388632e4e0d8af7"; }; nativeBuildInputs = [ jupyter-packaging ]; From 9bb8a7e5678ce5ea3611bc75d19ff071e418a3c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0317/1062] python3Packages.jupyterlab_git: 0.30.1 -> 0.32.2 --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 67769e24b328..dbff1660b1cc 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.30.1"; + version = "0.32.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f44a33cf59b424e0b5ff984b18eae33e45dab1ef9dc1901b1dd23f9adff15df2"; + sha256 = "4c5743a05150ed7736e028aac15787a66735f160e9ae198dacc5a4bd1a727ce2"; }; propagatedBuildInputs = [ notebook nbdime git ]; From 13565d4183e48268662f9de4c3d6b95ec44a157d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0318/1062] python3Packages.jupyterlab_server: 2.6.0 -> 2.7.2 --- pkgs/development/python-modules/jupyterlab_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index cca40463b024..2c54fa9da7f7 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.7.0"; + version = "2.7.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "31457ef564febc42043bc539356c804f6f9144f602e2852150bf0820ed6d7e18"; + sha256 = "c6c9ae5796ed60c65bccd84503cbd44b9e35b046b8265f24db3cc4d61631fc0d"; }; postPatch = '' From b111ceef182ec735a5a5a7363d9ae4ec7af28192 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0319/1062] python3Packages.jupyter-repo2docker: 2021.3.0 -> 2021.8.0 --- .../python-modules/jupyter-repo2docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 1b352f1e24c9..f4eb9190aa4b 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "2021.3.0"; + version = "2021.8.0"; pname = "jupyter-repo2docker"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "42e0cf67181bdd03b54dabde695befec0586ed68a4ec1240104e209997d776c4"; + sha256 = "9d1b3c3ec7944ea6b0a234d6fa77293a2d1ed1c080eba8466aba94f811b3465d"; }; propagatedBuildInputs = [ From 15c7725057b7045f79dce979d6b10b6723be626e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0320/1062] python3Packages.jupyter_server: 1.8.0 -> 1.10.2 --- pkgs/development/python-modules/jupyter_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 72e1540e0781..3150235fcc7a 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "jupyter_server"; - version = "1.8.0"; + version = "1.10.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237"; + sha256 = "d3a3b68ebc6d7bfee1097f1712cf7709ee39c92379da2cc08724515bb85e72bf"; }; propagatedBuildInputs = [ From 0e38e3b93e350174cee169d389207a0a7eca0cca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0321/1062] python3Packages.k5test: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/k5test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 80b62f1e4483..9a9c20e6de15 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "k5test"; - version = "0.9.2"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1lqp3jgfngyhaxjgj3n230hn90wsylwilh120yjf62h7b1s02mh8"; + sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c"; }; patches = [ From 143766d2c7e7d394c56e465f750b02b05636f7df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0322/1062] python3Packages.keyring: 23.0.1 -> 23.1.0 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index cea38abee395..522c836f4357 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.0.1"; + version = "23.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8"; + sha256 = "b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4"; }; nativeBuildInputs = [ From 110d1b350ef44efaadf797e0cea7e21f1f68b2c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0323/1062] python3Packages.keyrings.alt: 4.0.2 -> 4.1.0 --- pkgs/development/python-modules/keyrings-alt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index abcd04a1d307..7bc88bf6cbad 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "keyrings.alt"; - version = "4.0.2"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cc475635099d6edd7e475c5a479e5b4da5e811a3af04495a1e9ada488d16fe25"; + sha256 = "52ccb61d6f16c10f32f30d38cceef7811ed48e086d73e3bae86f0854352c4ab2"; }; postPatch = '' From 34dd57ac5ca923d22c45052fc6e76c04833a051b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0324/1062] python3Packages.labelbox: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 423185b6f226..cb098cd7ef10 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.6.0"; + version = "2.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "V${version}"; - sha256 = "1lkvc926i3c7isqhaja6k013qgla44cdhvkx76gpdyywq53i9mcb"; + sha256 = "0bvfxs4g9cxj9npy7qckxsgxwgfg0cdmyywdw5lrfs926iq4ydq1"; }; propagatedBuildInputs = [ From a85765d6ae8987c219ccb21f1b8bd84b7d7d3223 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0325/1062] python3Packages.ldap3: 2.9 -> 2.9.1 --- pkgs/development/python-modules/ldap3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 3c613d74e272..cf82b166ec6d 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.9"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "18c3ee656a6775b9b0d60f7c6c5b094d878d1d90fc03d56731039f0a4b546a91"; + sha256 = "f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f"; }; propagatedBuildInputs = [ pyasn1 ]; From 196340d8b14ce9ea9a41a7720afd4f7870fd163c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0326/1062] python3Packages.libcst: 0.3.19 -> 0.3.20 --- pkgs/development/python-modules/libcst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 5a1ef3b7f737..5b950ab57397 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.19"; + version = "0.3.20"; disabled = pythonOlder "3.6"; # Some files for tests missing from PyPi @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "012g1hyaj015k2sf38a7jnpzjic0f8j97ar84d0f00w2ifzwx4ma"; + sha256 = "063bl21gyyd25i2v0j6kz29cxxdfhng2nins4i2qblmac90f2nqy"; }; propagatedBuildInputs = [ From adf1c7785494a60b879e82253419f7846c80ba70 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0327/1062] python3Packages.llvmlite: 0.36.0 -> 0.37.0 --- pkgs/development/python-modules/llvmlite/default.nix | 8 +++++--- pkgs/top-level/python-packages.nix | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index c7d2221a22e2..e3b9e3bb7c8a 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.36.0"; + version = "0.37.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "765128fdf5f149ed0b889ffbe2b05eb1717f8e20a5c87fa2b4018fbcce0fcfc9"; + sha256 = "6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15"; }; nativeBuildInputs = [ llvm ]; - propagatedBuildInputs = [ ] ++ lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -31,10 +31,12 @@ buildPythonPackage rec { substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" ''; + # Set directory containing llvm-config binary preConfigure = '' export LLVM_CONFIG=${llvm.dev}/bin/llvm-config ''; + checkPhase = '' ${python.executable} runtests.py ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a88825466c4..7403b1ba4083 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4252,8 +4252,9 @@ in { }; llvmlite = callPackage ../development/python-modules/llvmlite { - llvm = pkgs.llvm_9; - }; # llvmlite always requires a specific version of llvm. + # llvmlite always requires a specific version of llvm. + llvm = pkgs.llvm_11; + }; lmdb = callPackage ../development/python-modules/lmdb { inherit (pkgs) lmdb; From 1fd6bf9effa82a25abf05aa58095d61c8ceb8103 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0328/1062] python3Packages.Mako: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 533e1317a091..cf3028612698 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.4"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab"; + sha256 = "169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"; }; propagatedBuildInputs = [ markupsafe ]; From faaf966263040b69ca9093263e9b68c51433c5f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0329/1062] python3Packages.marisa-trie: 0.7.5 -> 0.7.7 --- pkgs/development/python-modules/marisa-trie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index ade031409b41..4daa619acc4f 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "marisa-trie"; - version = "0.7.5"; + version = "0.7.7"; src = fetchPypi { inherit pname version; - sha256 = "c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf"; + sha256 = "bbeafb7d92839dc221365340e79d012cb50ee48a1f3f30dd916eb35a8b93db00"; }; postPatch = '' From c13a54eda3cc6cd4b1bedcf5382c310641fba25e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0330/1062] python3Packages.markdown-it-py: 1.0.0 -> 1.1.0 --- .../python-modules/markdown-it-py/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index dc8866350b1f..6f58c4c8ae9f 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder , attrs @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,18 +22,9 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "v${version}"; - hash = "sha256-GA7P2I8N+i2ISsVgx58zyhrfKMcZ7pL4X9T/trbsr1Y="; + sha256 = "0h7rn3rcqfwmnqs97qczwkw9w5g4df8bgn6sw7k149svfqgrkf56"; }; - patches = [ - (fetchpatch { - # :arrow_up: UPGRADE: attrs -> v21 (#165) - # https://github.com/executablebooks/markdown-it-py/pull/165 - url = "https://github.com/executablebooks/markdown-it-py/commit/78381ffe1a651741594dc93e693b761422512fa2.patch"; - sha256 = "1kxhblpi4sycrs3rv50achr8g0wlgq33abg2acra26l736hlsya1"; - }) - ]; - propagatedBuildInputs = [ attrs linkify-it-py ] ++ lib.optional (pythonOlder "3.8") typing-extensions; From f499d468ea17c80eb6bd39b33fda879299fd5ae7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0331/1062] python3Packages.mattermostdriver: 7.3.0 -> 7.3.1 --- pkgs/development/python-modules/mattermostdriver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix index 7d9421b5d949..6a0be0696063 100644 --- a/pkgs/development/python-modules/mattermostdriver/default.nix +++ b/pkgs/development/python-modules/mattermostdriver/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mattermostdriver"; - version = "7.3.0"; + version = "7.3.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17jqcpa1xd9n7bf4d5l7wmscls34kymv27gi17pyyfjxbwk5gsga"; + sha256 = "bf629c4b8f825bd7196208aa93995ac5077bd60939ba67cca314a7f13c1dbcea"; }; propagatedBuildInputs = [ websockets requests ]; From fe972862683c570cf0d690f704f8a09db439a550 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0332/1062] python3Packages.mkl-service: 2.4.0 -> 2.4.0.post1 --- pkgs/development/python-modules/mkl-service/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index c54da3055e7c..be0ac454ee98 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.0"; + version = "2.4.0.post1"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "v${version}"; - sha256 = "1x8j0ij582dyhay0gaqq45a2jz1m4fr8xw0v65ngviajj3cxmcpb"; + sha256 = "0ysjn8z1hkscb4cycbrvcb93r04w5793yylsy40h5dvjd04ns5jc"; }; MKLROOT = mkl; From 4faf727c1450d6a84633b6f5f809bc4128e0ac03 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0333/1062] python3Packages.mlflow: 1.18.0 -> 1.20.1 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 2940c111e5dc..b50d98513a2f 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.18.0"; + version = "1.20.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8942089589d08c05c8a7fc66828c02a9233be462c421881b50bc2a0b183dfdbe"; + sha256 = "71764443c4942f181fee2d5bf44dd74a0507bcc5b62a1f1e08079d1f40a15fc0"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config From 190cb289da552f054971b7284b832941818216ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0334/1062] python3Packages.mne-python: 0.23.0 -> 0.23.2 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 2dfe06d51770..2f97cac131ec 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.23.0"; + version = "0.23.2"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "02fcnfsrc6sccv6x2rnx86g0zw0ivk5s8gx230g6pxfg3lap6knv"; + sha256 = "1y6xypfzq7a3ffzwlbqspyzvijr6ihgfzgvhajs16d74pxhdkg74"; }; propagatedBuildInputs = [ numpy scipy ]; From a4d0538a669f14fa25e3bf9dfb4d693a0163bad4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0335/1062] python3Packages.monotonic: 1.5 -> 1.6 --- pkgs/development/python-modules/monotonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index e93bf206edaa..d775d5157191 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "monotonic"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0"; + sha256 = "3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7"; }; __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; From 6fa13709723c87742f11c7f80bdb82d19cdc889c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0336/1062] python3Packages.monty: 2021.6.10 -> 2021.8.17 --- .../python-modules/monty/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index ff236d9becc4..73325c24d94c 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -5,6 +5,7 @@ , msgpack , pytestCheckHook , numpy +, pandas , pydantic , pymongo , ruamel_yaml @@ -13,17 +14,21 @@ buildPythonPackage rec { pname = "monty"; - version = "2021.6.10"; + version = "2021.8.17"; disabled = pythonOlder "3.5"; # uses type annotations - # No tests in Pypi src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "01fhl4pl5gj4ahph4lxcm0fmglh0bjw6jz9ckmgzviasg4l1j6h4"; + sha256 = "0lg6d0qk6iv476rcn45p5f50kips5g9s709cxddwnk5yrz57c4d0"; }; + postPatch = '' + substituteInPlace tests/test_os.py \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' + ''; + propagatedBuildInputs = [ ruamel_yaml tqdm @@ -33,15 +38,11 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook numpy + pandas pydantic pymongo ]; - preCheck = '' - substituteInPlace tests/test_os.py \ - --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' - ''; - meta = with lib; { description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; longDescription = " From c864da1a20400f8b6419c0aced0f3d78070a0db4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0337/1062] python3Packages.mypy-boto3-s3: 1.17.97 -> 1.18.29 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index b25e838c96ff..d16d858c22f5 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.17.97"; + version = "1.18.29"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cc12897498213e6aa1530d9f75dadb3916fcd3ce376639560c2fede2c93c51b9"; + sha256 = "efee8defd50c441f1daec39fe415a81ded16b828678b4606ee8f9dd677bfe53e"; }; propagatedBuildInputs = [ From bdac5778f700276f4f413602e8b1b46eac7e177b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0338/1062] python3Packages.mypy-protobuf: 2.4 -> 2.9 --- pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 6c6ea7b7b1c9..17b0d068c981 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "2.4"; + version = "2.9"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f"; + sha256 = "278172935d7121c2f8c7c0a05518dd565a2b76d9e9c4a0a3fcd08a21fa685d43"; }; propagatedBuildInputs = [ protobuf ]; From b9dd4fb4b302c39b274856929fabec568045c556 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0339/1062] python3Packages.nbclient: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 169b89f7b892..3b9986bae048 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c"; + sha256 = "6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce"; }; inherit doCheck; From 0ab1680d6ac0f76b155d53a647b9e66bb718c148 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0340/1062] python3Packages.nbconvert: 6.0.7 -> 6.1.0 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 02eda2beb195..67d08f9e50ff 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.0.7"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"; + sha256 = "d22a8ff202644d31db254d24d52c3a96c82156623fcd7c7f987bba2612303ec9"; }; # Add $out/share/jupyter to the list of paths that are used to search for From 3d982a7ed5195eea28165ad30da785bf7cc8e7d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0341/1062] python3Packages.numba: 0.53.1 -> 0.54.0 --- .../python-modules/numba/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 74f7d4003dcd..287737900b89 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,28 +12,39 @@ }: buildPythonPackage rec { - version = "0.53.1"; + version = "0.54.0"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "9cd4e5216acdc66c4e9dab2dfd22ddb5bef151185c070d4a3cd8e78638aff5b0"; + sha256 = "bad6bd98ab2e41c34aa9c80b8d9737e07d92a53df4f74d3ada1458b0b516ccff"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "1.21" "1.22" + + substituteInPlace numba/__init__.py \ + --replace "(1, 20)" "(1, 21)" + ''; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ numpy llvmlite setuptools ]; - pythonImportsCheck = [ "numba" ]; + # Copy test script into $out and run the test suite. checkPhase = '' ${python.interpreter} -m numba.runtests ''; + # ImportError: cannot import name '_typeconv' doCheck = false; + pythonImportsCheck = [ "numba" ]; + meta = with lib; { - homepage = "http://numba.pydata.org/"; + homepage = "https://numba.pydata.org/"; license = licenses.bsd2; description = "Compiling Python code using LLVM"; maintainers = with maintainers; [ fridh ]; From 5c5d77116098b9a3441043ff6809e0d9b4f0fdda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0342/1062] python3Packages.numpy: 1.21.1 -> 1.21.2 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 9071cec1b03d..60f3bf1091ec 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.21.1"; + version = "1.21.2"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1za22ggjxzm7drs2vd15s81ad9rlshk4p7pv7mxcbz4acdiszx6z"; + sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From d2a87228ea2c103552ee249b058d72483669108e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0343/1062] python3Packages.nunavut: 1.2.2 -> 1.4.2 --- pkgs/development/python-modules/nunavut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index e8d032e16aba..c628abad8691 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.2.2"; + version = "1.4.2"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "78ab56951172ecd92f9b66dbf9b0ea986dcc6899d462eeef74563ddf33a5a9a5"; + sha256 = "7238780e42a8d6b7fd3296273c76d35dbebb4520d6778472d556b68b77e2aade"; }; propagatedBuildInputs = [ From 932fb8fffe795c66f3892d6f51d868a3067e35f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0344/1062] python3Packages.openshift: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/openshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index 052d364982b3..cf604ea38181 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aggRnD4goiZJPp4cngp8AIrJC/V46378cwUSfq8Xml4="; + sha256 = "a38957684b17ad0e140a87226249bf26de7267db0c83a6d512b48be258052e1a"; }; propagatedBuildInputs = [ From 1af0d788730a4ff634d06fc8ed13792ba81640c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0345/1062] python3Packages.optuna: 2.8.0 -> 2.9.1 --- pkgs/development/python-modules/optuna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 0b496b5ef0f8..457d796d0b78 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.8.0"; + version = "2.9.1"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "v${version}"; - sha256 = "1w5vyl36mbk78a5028qa7dlzhavrs1dkx3q8m50ij37pa5cnyksz"; + sha256 = "1fx80qjrkmnvn2mg9fx26qn3sjlwnwqlmkaf6sqhdw79pn6khlpi"; }; checkInputs = [ From cfa9d1c84cc9ed9bf04218bdd94a8cf24b1905de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0346/1062] python3Packages.pandas: 1.2.4 -> 1.3.2 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 6c99a0e4f9d6..52a77826f2d6 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.2.4"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "649ecab692fade3cbfcf967ff936496b0cfba0af00a55dfaacd82bdda5cb2279"; + sha256 = "cbcb84d63867af3411fa063af3de64902665bb5b3d40b25b2059e40603594e87"; }; nativeBuildInputs = [ cython ]; From ba95438039679955cbc6b1938459fe2624c2165c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0347/1062] python3Packages.panel: 0.11.3 -> 0.12.1 --- .../python-modules/panel/default.nix | 11 +- .../python-modules/panel/node/node-env.nix | 10 +- .../panel/node/node-packages.nix | 172 +++++++++--------- .../python-modules/panel/node/package.json | 4 +- 4 files changed, 98 insertions(+), 99 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 58ae09af14b9..3f6875f4986f 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, bleach , bokeh , param , pyviz-comms @@ -12,10 +13,11 @@ }: let - node = callPackage ./node {}; -in buildPythonPackage rec { + node = callPackage ./node { }; +in +buildPythonPackage rec { pname = "panel"; - version = "0.11.3"; + version = "0.12.1"; # Don't forget to also update the node packages # 1. retrieve the package.json file @@ -23,7 +25,7 @@ in buildPythonPackage rec { # 3. node2nix src = fetchPypi { inherit pname version; - sha256 = "sha256-HpHYHysPE6MRxR0kek5C7sunHMfBsUGdZfxamz2jcLc="; + sha256 = "e4898d60abdb82f8a429df7f59dbf8bcaf7e19b3e633555512ceb4ce06678458"; }; # Since 0.10.0 panel attempts to fetch from the web. @@ -42,6 +44,7 @@ in buildPythonPackage rec { ''; propagatedBuildInputs = [ + bleach bokeh param pyviz-comms diff --git a/pkgs/development/python-modules/panel/node/node-env.nix b/pkgs/development/python-modules/panel/node/node-env.nix index c2b723195b77..21089c4d5459 100644 --- a/pkgs/development/python-modules/panel/node/node-env.nix +++ b/pkgs/development/python-modules/panel/node/node-env.nix @@ -391,13 +391,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -446,6 +447,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) diff --git a/pkgs/development/python-modules/panel/node/node-packages.nix b/pkgs/development/python-modules/panel/node/node-packages.nix index 6e45b64d5c6f..78c7c4ac37d1 100644 --- a/pkgs/development/python-modules/panel/node/node-packages.nix +++ b/pkgs/development/python-modules/panel/node/node-packages.nix @@ -4,13 +4,22 @@ let sources = { - "@bokeh/bokehjs-2.3.1" = { + "@babel/runtime-7.15.3" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; + sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; + }; + }; + "@bokeh/bokehjs-2.3.3" = { name = "_at_bokeh_slash_bokehjs"; packageName = "@bokeh/bokehjs"; - version = "2.3.1"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.1.tgz"; - sha512 = "DlNZaqAJFUw38IuSk2TUOcfyiK8Ya3kDRpYt/RgVUftIDW2CWLbBo47kbug9+ykEF49rcnlxcCXhNXzpg4V7gw=="; + url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.3.tgz"; + sha512 = "Zev3p5xnS47YsZo5hcGGNUdISH3mkVLKSc6LMVqEIRlnc7Ay79TD9bnApeYh90k0JU1pcMh0gEqHgwVOGPTZ/w=="; }; }; "@bokeh/numbro-1.6.2" = { @@ -31,13 +40,13 @@ let sha512 = "W9tm8Qdw5BrylbZbaVWaQMgLfW/klesnj6J3FnyWpo18hCCOFApccUD8iOnRv7bF6PHlgWk84mW3JT5RSzYKjA=="; }; }; - "@luma.gl/constants-8.4.4" = { + "@luma.gl/constants-8.5.5" = { name = "_at_luma.gl_slash_constants"; packageName = "@luma.gl/constants"; - version = "8.4.4"; + version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.4.4.tgz"; - sha512 = "4e58QW6UKXkxiIvWSLoAnTc4cT8nvb0PhLzu1h8KiCuaDT5Vq8csOymcNOy/jhpfcIhHlmT1KwowF5m/DcOlKg=="; + url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.5.tgz"; + sha512 = "3pDC7jFaXliDP7Gvr6pPkorLFBXDnuakNeN87aEYcIM+p3XrkF0rPnDQJEzwScWS9RIopXT858xmL3vG7IYsDw=="; }; }; "@types/debounce-1.2.0" = { @@ -58,31 +67,31 @@ let sha512 = "0L8Mq1+oaIW0oVzGUDbSW+HnTjCNb4CmoIQE5BkoHt/A7x20z0MJ1PnwfH3atty/vbWLGgvJwVu2Mz3SKFiEFw=="; }; }; - "@types/jquery-3.5.5" = { + "@types/jquery-3.5.6" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz"; - sha512 = "6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz"; + sha512 = "SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg=="; }; }; - "@types/sizzle-2.3.2" = { + "@types/sizzle-2.3.3" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz"; - sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; + sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@types/slickgrid-2.1.30" = { + "@types/slickgrid-2.1.31" = { name = "_at_types_slash_slickgrid"; packageName = "@types/slickgrid"; - version = "2.1.30"; + version = "2.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.30.tgz"; - sha512 = "9nTqNWD3BtEVK0CP+G+mBtvSrKTfQy3Dg5/al+GdTSVMHFm37UxsHJ1eURwPg7rYu6vc7xU95fGTCKMZbxsD5w=="; + url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.31.tgz"; + sha512 = "t/LodOkh8yP+o2jKcHsC0hAjDh1kl4RSFXKWmR9+U5FwXE7VpipqiAkE1W3NnGNA3ni5xnKQJt/CNXurJWTQ6w=="; }; }; "choices.js-9.0.1" = { @@ -202,13 +211,13 @@ let sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; - "ext-1.4.0" = { + "ext-1.5.0" = { name = "ext"; packageName = "ext"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; - sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; + sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; }; }; "fast-deep-equal-2.0.1" = { @@ -283,13 +292,13 @@ let sha1 = "04ef77862cff2bb79d30f7692095930222bf60f1"; }; }; - "htm-3.0.4" = { + "htm-3.1.0" = { name = "htm"; packageName = "htm"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/htm/-/htm-3.0.4.tgz"; - sha512 = "VRdvxX3tmrXuT/Ovt59NMp/ORMFi4bceFMDjos1PV4E0mV+5votuID8R60egR9A4U8nLt238R/snlJGz3UYiTQ=="; + url = "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz"; + sha512 = "L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q=="; }; }; "jquery-3.6.0" = { @@ -310,15 +319,6 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "js-tokens-4.0.0" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - }; "json-formatter-js-2.3.4" = { name = "json-formatter-js"; packageName = "json-formatter-js"; @@ -328,15 +328,6 @@ let sha512 = "gmAzYRtPRmYzeAT4T7+t3NhTF89JOAIioCVDddl9YDb3ls3kWcskirafw/MZGJaRhEU6fRimGJHl7CC7gaAI2Q=="; }; }; - "loose-envify-1.4.0" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - }; "mgrs-1.0.0" = { name = "mgrs"; packageName = "mgrs"; @@ -364,31 +355,40 @@ let sha512 = "4RtQ1+LHJKesDCNJrXkQcwXAWCrC2aggdLYMstS/G5fEWL+fXZbUA9pwVNHFghMGuFGRATlDLNInRaPeRKzpFQ=="; }; }; - "preact-10.5.13" = { + "preact-10.5.14" = { name = "preact"; packageName = "preact"; - version = "10.5.13"; + version = "10.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/preact/-/preact-10.5.13.tgz"; - sha512 = "q/vlKIGNwzTLu+jCcvywgGrt+H/1P/oIRSD6mV4ln3hmlC+Aa34C7yfPI4+5bzW8pONyVXYS7SvXosy2dKKtWQ=="; + url = "https://registry.npmjs.org/preact/-/preact-10.5.14.tgz"; + sha512 = "KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ=="; }; }; - "proj4-2.7.2" = { + "proj4-2.7.5" = { name = "proj4"; packageName = "proj4"; - version = "2.7.2"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/proj4/-/proj4-2.7.2.tgz"; - sha512 = "x/EboBmIq48a9FED0Z9zWCXkd8VIpXHLsyEXljGtsnzeztC41bFjPjJ0S//wBbNLDnDYRe0e6c3FSSiqMCebDA=="; + url = "https://registry.npmjs.org/proj4/-/proj4-2.7.5.tgz"; + sha512 = "5ecXUXbHAfvdhfBQpU7EhUfPCQGUCPmVup/4gnZA3bJY3JcK/xxzm4QQDz1xiXokN6ux65VDczlCtBtKrTSpAQ=="; }; }; - "redux-4.0.5" = { + "redux-4.1.1" = { name = "redux"; packageName = "redux"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz"; - sha512 = "VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w=="; + url = "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz"; + sha512 = "hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw=="; + }; + }; + "regenerator-runtime-0.13.9" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.9"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "sprintf-js-1.1.2" = { @@ -400,15 +400,6 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "symbol-observable-1.2.0" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; - }; - }; "timezone-1.0.23" = { name = "timezone"; packageName = "timezone"; @@ -427,13 +418,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.2.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz"; - sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "type-1.2.0" = { @@ -463,35 +454,36 @@ let sha1 = "3013e0ea181756306f1609e959cafbc722adb3e9"; }; }; - "wkt-parser-1.2.4" = { + "wkt-parser-1.3.1" = { name = "wkt-parser"; packageName = "wkt-parser"; - version = "1.2.4"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.2.4.tgz"; - sha512 = "ZzKnc7ml/91fOPh5bANBL4vUlWPIYYv11waCtWTkl2TRN+LEmBg60Q1MA8gqV4hEp4MGfSj9JiHz91zw/gTDXg=="; + url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.1.tgz"; + sha512 = "XK5qV+Y5gsygQfHx2/cS5a7Zxsgleaw8iX5UPC5eOXPc0TgJAu1JB9lr0iYYX3zAnN3p0aNiaN5c+1Bdblxwrg=="; }; }; }; args = { name = "_at_holoviz_slash_panel"; packageName = "@holoviz/panel"; - version = "0.11.3"; + version = "0.12.1"; src = ./.; dependencies = [ - sources."@bokeh/bokehjs-2.3.1" + sources."@babel/runtime-7.15.3" + sources."@bokeh/bokehjs-2.3.3" sources."@bokeh/numbro-1.6.2" (sources."@bokeh/slickgrid-2.4.2702" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@luma.gl/constants-8.4.4" + sources."@luma.gl/constants-8.5.5" sources."@types/debounce-1.2.0" sources."@types/gl-matrix-2.4.5" - sources."@types/jquery-3.5.5" - sources."@types/sizzle-2.3.2" - sources."@types/slickgrid-2.1.30" + sources."@types/jquery-3.5.6" + sources."@types/sizzle-2.3.3" + sources."@types/slickgrid-2.1.31" sources."choices.js-9.0.1" sources."d-1.0.1" sources."debounce-1.2.1" @@ -508,7 +500,7 @@ let sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."event-emitter-0.3.5" - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -521,25 +513,23 @@ let sources."fuse.js-3.6.1" sources."gl-matrix-3.3.0" sources."hammerjs-2.0.8" - sources."htm-3.0.4" + sources."htm-3.1.0" sources."jquery-3.6.0" sources."jquery-ui-1.12.1" - sources."js-tokens-4.0.0" sources."json-formatter-js-2.3.4" - sources."loose-envify-1.4.0" sources."mgrs-1.0.0" sources."next-tick-1.0.0" sources."nouislider-14.7.0" - sources."preact-10.5.13" - sources."proj4-2.7.2" - sources."redux-4.0.5" + sources."preact-10.5.14" + sources."proj4-2.7.5" + sources."redux-4.1.1" + sources."regenerator-runtime-0.13.9" sources."sprintf-js-1.1.2" - sources."symbol-observable-1.2.0" sources."timezone-1.0.23" - sources."tslib-2.2.0" + sources."tslib-2.3.1" sources."type-1.2.0" sources."underscore.template-0.1.7" - sources."wkt-parser-1.2.4" + sources."wkt-parser-1.3.1" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/python-modules/panel/node/package.json b/pkgs/development/python-modules/panel/node/package.json index f40e3773e23b..dc1d13ab4875 100644 --- a/pkgs/development/python-modules/panel/node/package.json +++ b/pkgs/development/python-modules/panel/node/package.json @@ -1,6 +1,6 @@ { "name": "@holoviz/panel", - "version": "0.11.1", + "version": "0.12.1", "description": "A high level dashboarding library for python visualization libraries.", "license": "BSD-3-Clause", "repository": { @@ -8,7 +8,7 @@ "url": "https://github.com/holoviz/panel.git" }, "dependencies": { - "@bokeh/bokehjs": "^2.3.0", + "@bokeh/bokehjs": "^2.3.3", "@luma.gl/constants": "^8.0.3", "@types/debounce": "^1.2.0", "@types/gl-matrix": "^2.4.5", From 7e2190c044a76959ec8b0640a01266ce651f5c95 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0348/1062] python3Packages.pathlib2: 2.3.5 -> 2.3.6 --- pkgs/development/python-modules/pathlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index b21536060d3a..757ddc7d9746 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.5"; + version = "2.3.6"; src = fetchPypi { inherit pname version; - sha256 = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"; + sha256 = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; From 0c3bcf979586566c1b252f653cc366aea6465e6e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0349/1062] python3Packages.pathspec: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/pathspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index cd51747d5678..6a0281b756ec 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd"; + sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"; }; meta = { From 049a3d7ff1abad7386acb1b4132b352733bc8ba6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0350/1062] python3Packages.pathy: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/pathy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index d656a752cf55..9108c3656dbd 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M="; + sha256 = "f83f1eddf77dd86e824143eef8d9adbe0785c3cdd5ec0ed6c0edea3227385048"; }; propagatedBuildInputs = [ smart-open typer google-cloud-storage ]; From 3599b835e909658cb4fa73cc56d58ae41091772d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0351/1062] python3Packages.pdoc3: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/pdoc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index 66bed253cb86..1a3996311570 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pdoc3"; - version = "0.9.2"; + version = "0.10.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1"; + sha256 = "5f22e7bcb969006738e1aa4219c75a32f34c2d62d46dc9d2fb2d3e0b0287e4b7"; }; nativeBuildInputs = [ setuptools-git setuptools-scm ]; From db3466ee34e60cc1e6d3f17c28254c61084963b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0352/1062] python3Packages.phik: 0.10.0 -> 0.12.0 --- pkgs/development/python-modules/phik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index b309fb287d80..09a240f4c4a6 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "phik"; - version = "0.10.0"; + version = "0.12.0"; format = "wheel"; disabled = !isPy3k; src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "b745313c5ff9d6a3092eefa97f83fa4dbed178c9ce69161b655e95497cb2f38b"; + sha256 = "57db39d1c74c84a24d0270b63d1c629a5cb975462919895b96a8522ae0678408"; }; checkInputs = [ From e46d9a454790066598fe2919da6630599d4924ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0353/1062] python3Packages.pkgconfig: 1.5.4 -> 1.5.5 --- pkgs/development/python-modules/pkgconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index d51a83a05478..fc593e6a48fb 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pkgconfig"; - version = "1.5.4"; + version = "1.5.5"; inherit (pkg-config) setupHooks @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c34503829fd226822fd93c902b1cf275516908a023a24be0a02ba687f3a00399"; + sha256 = "deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899"; }; From 3de476c84d6ddb69494fb582d202fd4bdbb273ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0354/1062] python3Packages.pkginfo: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/pkginfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 1b1834e324bb..6bfed6305a8a 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"; + sha256 = "e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. From e8a57d6ff282b623d52a802696009e4590f45f8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0355/1062] python3Packages.plaid-python: 7.4.0 -> 7.5.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 567fdd42d0d3..86a80c8fa6f8 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.4.0"; + version = "7.5.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "ab70467116adc110b56eb5a1fdeed726307cc216e04dda46a782aa1a1468ce0e"; + sha256 = "f4781a54d18c8a70bf0b9206004574c524e63e6a07e3fa480964a489e2d759e1"; }; checkInputs = [ pytest ]; From e830a117d9d73222fe9f92beb84d0a3e19665e30 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0356/1062] python3Packages.prance: 0.21.2 -> 0.21.8.0 --- .../python-modules/prance/default.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 0f18a6ad2072..105fa9e180b7 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -1,51 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , chardet -, pyyaml , requests +, ruamel_yaml , six , semver , pytestCheckHook -, pytest-cov -, pytest-runner , openapi-spec-validator }: buildPythonPackage rec { pname = "prance"; - version = "0.21.2"; + version = "0.21.8.0"; - src = fetchPypi { - inherit pname version; - sha256 = "43ebe3a5b38f0c65c428427004c4d8ce8d7155ddad50610276c89c192680f138"; + src = fetchFromGitHub { + owner = "RonnyPfannschmidt"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; - buildInputs = [ - pytest-runner - ]; - propagatedBuildInputs = [ chardet - pyyaml requests + ruamel_yaml six semver ]; checkInputs = [ pytestCheckHook - pytest-cov openapi-spec-validator ]; postPatch = '' - substituteInPlace setup.py \ - --replace "tests_require = dev_require," "tests_require = None," \ - --replace "chardet~=4.0" "" \ - --replace "semver~=2.13" "" substituteInPlace setup.cfg \ - --replace "--cov-fail-under=90" "" + --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" ''; # Disable tests that require network From c12a50ebb46023d7f9082e43b4783910b30a4510 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0357/1062] python3Packages.psd-tools: 1.9.17 -> 1.9.18 --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 92810ec6a5fb..a642d6ba10d1 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.17"; + version = "1.9.18"; src = fetchPypi { inherit pname version; - sha256 = "d01e11581442dfcc1bd73ac3278bdf1f98e9df8f083a11e5989632ff97322b65"; + sha256 = "d7e510790512f0bb8150c508531c8681c3d9d0ea63b3ba9b11bbf0952cbd69a8"; }; propagatedBuildInputs = [ From e1098430a36db3b70e03dc441df71cb5ec0f1c2f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0358/1062] python3Packages.pybids: 0.13.1 -> 0.13.2 --- pkgs/development/python-modules/pybids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 97187abd7591..daa879a58a0d 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.13.1"; + version = "0.13.2"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o="; + sha256 = "9692013af3b86b096b5423b88179c6c9b604baff5a6b6f89ba5f40429feb7a3e"; }; propagatedBuildInputs = [ From a194840ea103da9dfdb00931d7947a2c185c87f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0359/1062] python3Packages.pybind11: 2.7.0 -> 2.7.1 --- pkgs/development/python-modules/pybind11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 3f825a06cd3c..e6be3f063fef 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iEXoNTsfsDq79bKV7A4aOCHr11rT/cqnyLghEtGsaks="; + sha256 = "13nq16pxz4vck7jn936ymhm0y0q82hd7kkw0ip7k85cx7wywzbql"; }; nativeBuildInputs = [ cmake ]; From 47271a685524c595c15eb0002923d13ac1859d21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0360/1062] python3Packages.Pygments: 2.9.0 -> 2.10.0 --- pkgs/development/python-modules/Pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 640c95bfcf9f..bb17af144cbe 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f"; + sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"; }; propagatedBuildInputs = [ docutils ]; From 6f3ffc57fe7e9d018cd21b72e3ba85967f726b0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0361/1062] python3Packages.pylint: 2.7.4 -> 2.10.2 --- .../python-modules/pylint/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index ef42bd43239a..2e4953ec7b9b 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,12 +1,13 @@ { stdenv , lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , installShellFiles , astroid , isort , mccabe +, platformdirs , toml , pytest-benchmark , pytest-xdist @@ -15,13 +16,15 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.7.4"; + version = "2.10.2"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee"; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hkrkgUdC5LO1oSPFL6gvIk0zFpMw45gCmnoRbdPZuRs="; }; nativeBuildInputs = [ @@ -32,6 +35,7 @@ buildPythonPackage rec { astroid isort mccabe + platformdirs toml ]; @@ -58,6 +62,12 @@ buildPythonPackage rec { "-n auto" ]; + disabledTestPaths = [ + # tests miss multiple input files + # FileNotFoundError: [Errno 2] No such file or directory + "tests/pyreverse/test_writer.py" + ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" From 34d2f02cf5c152426575f4cf0c0a37e354ec5b5f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0362/1062] python3Packages.pymatgen: 2022.0.11 -> 2022.0.12 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 364514b6b5d0..56e436e96d2c 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.11"; + version = "2022.0.12"; src = fetchPypi { inherit pname version; - sha256 = "901d00105142c9added48275188e289e91b3098251ec107aef90acaef3ea6d0d"; + sha256 = "bad712c883a12d774a8a58c35abc5d582c5e5eafdbb5351dc06ebe98c28bd135"; }; nativeBuildInputs = [ glibcLocales ]; From d2788bc2aa9fd5e79f6935eaef4236df1bc7ed51 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0363/1062] python3Packages.pymc3: 3.11.2 -> 3.11.4 --- pkgs/development/python-modules/pymc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index e322bb14f7ba..095f3baf97ae 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.11.2"; + version = "3.11.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d3b93c8923ae8c8107c5adfd22f7c37fa0849a00a9723e0e0a0ca6afb582d6c3"; + sha256 = "3b88d1e6c85f7fb8a9b99d6f136ac860672170370ec4146338fdd160c3b3fd3f"; }; # No need for coverage stats in Nix builds From 959ca1fd4b6c65824ab445dcf8fba2f1886a2ca9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0364/1062] python3Packages.pynndescent: 0.5.2 -> 0.5.4 --- .../python-modules/pynndescent/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index fa9db26b5e39..7256749f8dec 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -1,43 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, nose +, joblib +, llvmlite +, numba , scikit-learn , scipy -, numba -, llvmlite -, joblib +, pytestCheckHook }: buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.2"; + version = "0.5.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0w87c2v0li2rdbx6qfc2lb6y6bxpdy3jwfgzfs1kcr4d1chj5zfr"; + sha256 = "221124cbad8e3cf3ed421a4089d80ac5a29d3215e76cb49effc1df887533d2a8"; }; propagatedBuildInputs = [ + joblib + llvmlite + numba scikit-learn scipy - numba - llvmlite - joblib ]; checkInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { description = "Nearest Neighbor Descent"; homepage = "https://github.com/lmcinnes/pynndescent"; license = licenses.bsd2; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } From 4da98882e46d2603fa720d576a378ab53f4202e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0365/1062] python3Packages.pyosmium: 3.1.3 -> 3.2.0 --- pkgs/development/python-modules/pyosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 6bd360036000..161fa9d24dc1 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.1.3"; + version = "3.2.0"; disabled = pythonOlder "3.4" || isPyPy; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "11ma8nr7k2ixwwb55fiqvrj5qbmpgkyfk0canz4l0m8b7rcw3qsc"; + sha256 = "0s9h1blz4vrgcvdiikbpi2d4cy69kg2s8ki4dzampm1s0pa92if5"; }; nativeBuildInputs = [ cmake ]; From e51ced4f4e83b04602a1948bed8b749a21f52f99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0366/1062] python3Packages.Pyphen: 0.10.0 -> 0.11.0 --- .../python-modules/pyphen/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 2f573b67838b..74581ba7e33c 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,14 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { - pname = "Pyphen"; - version = "0.10.0"; + pname = "pyphen"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128"; + sha256 = "e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8"; }; + preCheck = '' + sed -i '/addopts/d' pyproject.toml + ''; + + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Pure Python module to hyphenate text"; homepage = "https://github.com/Kozea/Pyphen"; From 82a7140e898621386fbc544bea38a0e985ed0ca9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0367/1062] python3Packages.pyrsistent: 0.17.3 -> 0.18.0 --- pkgs/development/python-modules/pyrsistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 8a6eb47a46c7..75cecc7d7091 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.17.3"; + version = "0.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"; + sha256 = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"; }; propagatedBuildInputs = [ six ]; From b5bc15baf5835dac400a2b438fa8add9edf2daa9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0368/1062] python3Packages.pysatochip: 0.11.4 -> 0.12.3 --- .../python-modules/pysatochip/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix index f24571a78cf1..a2e726903554 100644 --- a/pkgs/development/python-modules/pysatochip/default.nix +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -1,17 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pyscard, ecdsa, pyaes -, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, certifi +, cryptography +, ecdsa +, pyaes +, pyopenssl +, pyscard +, pythonOlder +}: buildPythonPackage rec { pname = "pysatochip"; - version = "0.11.4"; + version = "0.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Jj/zZIS9aXmZ2xdi29Eun7iRIrIk9oBlrtN9+6opIMo="; + sha256 = "24db358a65c0402c299c0c62efcfbbfc98e494181cd30d3996949ac667d5b4d4"; }; - propagatedBuildInputs = [ pyscard ecdsa pyaes ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "cryptography==3.3.2" "cryptography" \ + --replace "ecdsa==0.15" "ecdsa" \ + --replace "pyopenssl==20.0.0" "pyopenssl" + ''; + + propagatedBuildInputs = [ cryptography ecdsa pyaes pyopenssl pyscard ]; + + checkInputs = [ certifi ]; pythonImportsCheck = [ "pysatochip" ]; From 042f70251387407c8718709f6df93201a4294fd1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0369/1062] python3Packages.PySDL2: 0.9.7 -> 0.9.8 --- pkgs/development/python-modules/pysdl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index be9663245bb5..26aece1afb21 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.7"; + version = "0.9.8"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e4fcc8aa1108e4917cb56794575ee08c2a3d9c2c52620474e3ecc8538dadf209"; + sha256 = "4dfa3168e4e4e9301a2cd5904bdcea15e2bf62a1c9abb5d3f92d9122ea22c26e"; }; # Deliberately not in propagated build inputs; users can decide From 11442fe2b5f359133ff3e14c6309bb7ac106639f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0370/1062] python3Packages.pytest-doctestplus: 0.9.0 -> 0.10.1 --- .../development/python-modules/pytest-doctestplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 01ec38458c9f..34bf587fa533 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.9.0"; + version = "0.10.1"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; + sha256 = "7e9e0912c206c53cd6ee996265aa99d5c99c9334e37d025ce6114bc0416ffc14"; }; nativeBuildInputs = [ From ba92c9d052458f232f86a4ae444679fa9e6bb481 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0371/1062] python3Packages.pytest-httpx: 0.12.1 -> 0.13.0 --- pkgs/development/python-modules/pytest-httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 6e7fd37b915e..b0bc07b6c162 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "sha256-eyR0h0fW5a+L6QslTnM0TPvQCto06aMcKCE+b8LqHcQ="; + sha256 = "0lh7df3ysxmjzvx6242xb6qiwpfxrnj70kjmw5sndvzmy5dfpxfc"; }; buildInputs = [ pytest ]; From d95cba5edf42eb5a6d9234e553ed22f28b17930e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0372/1062] python3Packages.pytest-xprocess: 0.17.1 -> 0.18.1 --- pkgs/development/python-modules/pytest-xprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 0695b49191b4..fcd72ce9b976 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.17.1"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6"; + sha256 = "fd9f30ed1584b5833bc34494748adf0fb9de3ca7bacc4e88ad71989c21cba266"; }; nativeBuildInputs = [ setuptools-scm ]; From 34b3090dc01b88d46078ca3961bf4abd0ba5fa8f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0373/1062] python3Packages.python-dotenv: 0.17.1 -> 0.19.0 --- pkgs/development/python-modules/python-dotenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 6fbda114d338..22bf7ea7ece4 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.17.1"; + version = "0.19.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"; + sha256 = "f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"; }; propagatedBuildInputs = [ click ]; From 3c9fef89a84b5bec993cd91dc649a66b8696721f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0374/1062] python3Packages.python-ethtool: 0.14 -> 0.15 --- pkgs/development/python-modules/python-ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/python-ethtool/default.nix index 03c147397068..e758f4a1ef71 100644 --- a/pkgs/development/python-modules/python-ethtool/default.nix +++ b/pkgs/development/python-modules/python-ethtool/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-ethtool"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "fedora-python"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Sp7ssfLZ/1FEKrvX257pKcaureZ5mdpJ7jCEh/ft1l0="; + sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i"; }; postPatch = '' From c4ecd472cd8fac465b53146ca11c468ce51f749e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0375/1062] python3Packages.python-rapidjson: 1.0 -> 1.4 --- pkgs/development/python-modules/python-rapidjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 63dc4018b27d..a939caf49703 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.0"; + version = "1.4"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "a61fa61e41b0b85ba9e78444242fddcb3be724de1df79314e6b4766b66e4e11c"; + sha256 = "018c20d3983cccfdc9cfed64407d4ba861ef3d64fe324a486f7130431afdefa7"; }; LC_ALL="en_US.utf-8"; From 687027748305bf408ec585c2e89571ecd423ae08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0376/1062] python3Packages.pyusb: 1.1.1 -> 1.2.1 --- pkgs/development/python-modules/pyusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 43ae18741e1d..05fb6b682716 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyusb"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38"; + sha256 = "a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"; }; nativeBuildInputs = [ From 3671eb68f73b0c9cba36c76e56b7c9b8a1101ea8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0377/1062] python3Packages.pyvips: 2.1.14 -> 2.1.15 --- pkgs/development/python-modules/pyvips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index ea40fc573b63..c3eb750783fd 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.14"; + version = "2.1.15"; src = fetchPypi { inherit pname version; - sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; + sha256 = "8bca4077dbdc1434dcbc6759407367b6561e3505aa9555b1bc0b45989dcf50b2"; }; nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; From 2f3297ba4237148e382dbc949fe9d7b9cd3f83f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0378/1062] python3Packages.pyzmq: 22.1.0 -> 22.2.1 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 5aca8d6d66c6..816c46204f88 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "22.1.0"; + version = "22.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d"; + sha256 = "6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242"; }; checkInputs = [ From 7ced289c3912b87fb74a97610f70932ea002180c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0379/1062] python3Packages.QtPy: 1.9.0 -> 1.10.0 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 17e1d9dbe83b..7ee51449ed90 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"; + sha256 = "3d20f010caa3b2c04835d6a2f66f8873b041bdaf7a76085c2a0d7890cdd65ea9"; }; # no concrete propagatedBuildInputs as multiple backends are supposed From 4b6062f36d7c9223fb63e2e00500dba45530a9b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0380/1062] python3Packages.queuelib: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/queuelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 7534974237a9..cd83914669e5 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "queuelib"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "631d067c9be57e395c382d680d3653ca1452cd29e8da25c5e8d94b5c0c528c31"; + sha256 = "4b207267f2642a8699a1f806045c56eb7ad1a85a10c0e249884580d139c2fcd2"; }; buildInputs = [ pytest ]; From f2fbcb65eb76b9a8eb919b19e4ff112fce378fd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0381/1062] python3Packages.r2pipe: 1.5.3 -> 1.6.0 --- pkgs/development/python-modules/r2pipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 3fbb0fb4042c..ffe784ad1995 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.5.3"; + version = "1.6.0"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8f3708195c8a6e91c5753940fd348cd821df1389d23b889b01b3e88acf407485"; + sha256 = "f7d1f629130fac597dc444df57168cf011a18abb1be2f690c8993fc5fb4c78a0"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't From 6472b76134484957a80ad104d2fa313abfc75b76 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0382/1062] python3Packages.reportlab: 3.5.67 -> 3.6.1 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index c9f2600efe1e..71d4cd7425d1 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.67"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0cf2206c73fbca752c8bd39e12bb9ad7f2d01e6fcb2b25b9eaf94ea042fe86c9"; + sha256 = "68f9324000cfc5570b5a59a92306691b5d655078a399f20bc72c2581fe903261"; }; checkInputs = [ glibcLocales ]; From 5c8f52307e2f554fced60ecf98d9578eeecb8427 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0383/1062] python3Packages.robotframework-sshlibrary: 3.6.0 -> 3.7.0 --- .../python-modules/robotframework-sshlibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 4d72a2b3b0a1..82a5fd3fed67 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.6.0"; + version = "3.7.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "169c343f4db71e1969169fa6f383ca7fff549aa8f83bdd3d9cbd03cea928b688"; + sha256 = "55bd5a11bb1fe60a5a83446e6a3e1e81b13fc671e3b660aa55912a263c1f63aa"; }; # unit tests are impure From d4d18c58fe3b885d6f6438d5989cb9b53efdef46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0384/1062] python3Packages.ruamel.yaml: 0.17.9 -> 0.17.14 --- pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 863b62c1bcce..f424310bfa74 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.17.9"; + version = "0.17.14"; src = fetchPypi { inherit pname version; - sha256 = "374373b4743aee9f6d9f40bea600fe020a7ac7ae36b838b4a6a93f72b584a14c"; + sha256 = "4185fcfa9e037fea9ffd0bb6172354a03ec98c21e462355d72e068c74e493512"; }; # Tests use relative paths From 8fec620214902e67a37ca93ca2dd396247188894 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0385/1062] python3Packages.sagemaker: 2.54.0 -> 2.56.0 --- 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 2b16b99bea73..0dae21c7f0e1 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.54.0"; + version = "2.56.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uLsBHqzpcuTugRXBihdbib64l396m+os39OhP+tLLCM="; + sha256 = "049699dce6a5c5bab9cd9597985d8a722cb1495ef8af63553cd988c5cce58a1d"; }; pythonImportsCheck = [ From 3965e194ed2f6323441b17dc6db8c21152a6c93e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0386/1062] python3Packages.scancode-toolkit: 21.6.7 -> 21.8.4 --- pkgs/development/python-modules/scancode-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index fa7dabc27293..177032aea7f3 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -37,12 +37,12 @@ }: buildPythonPackage rec { pname = "scancode-toolkit"; - version = "21.6.7"; + version = "21.8.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "056923ce556cd6d402e5cc98567cb0331a1b6349d03ec565f8ce1c9c37f3a783"; + sha256 = "c18340067244274c67e166f701c60e747e1d0bccb17efc99f277a4bc0a5a13c6"; }; dontConfigure = true; From 3b41f305c7fcc399521b7442157308493306ec88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0387/1062] python3Packages.schema-salad: 8.1.20210716111910 -> 8.1.20210721123742 --- pkgs/development/python-modules/schema-salad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 007cca251436..e6342b90bba4 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.1.20210716111910"; + version = "8.1.20210721123742"; src = fetchPypi { inherit pname version; - sha256 = "3f851b385d044c58d359285ba471298b6199478a4978f892a83b15cbfb282f25"; + sha256 = "1549555b9b5656cfc690716f04fb76b9fa002feb278638c446522f030632b450"; }; propagatedBuildInputs = [ From e411a685521921001e4f1e901eb03c10f3f65fa8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0388/1062] python3Packages.scikit-image: 0.18.1 -> 0.18.3 --- pkgs/development/python-modules/scikit-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index f7d3fd63b17b..b34d3ff7b8de 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.18.1"; + version = "0.18.3"; src = fetchPypi { inherit pname version; - sha256 = "fbb618ca911867bce45574c1639618cdfb5d94e207432b19bc19563d80d2f171"; + sha256 = "ecae99f93f4c5e9b1bf34959f4dc596c41f2f6b2fc407d9d9ddf85aebd3137ca"; }; nativeBuildInputs = [ cython ]; From 79081f0e5f2afc355e2444788682970a5213f885 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0389/1062] python3Packages.scipy: 1.6.3 -> 1.7.1 --- pkgs/development/python-modules/scipy/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 7a9643aa7d24..2e19d2d42042 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -3,7 +3,9 @@ , fetchPypi , python , buildPythonPackage +, cython , gfortran +, pythran , nose , pytest , pytest-xdist @@ -13,18 +15,21 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.6.3"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "a75b014d3294fce26852a9d04ea27b5671d86736beb34acdfc05859246260707"; + sha256 = "6b47d5fa7ea651054362561a28b1ccc8da9368a39514c1bbf6c0977a1c376764"; }; - checkInputs = [ nose pytest pytest-xdist ]; - nativeBuildInputs = [ gfortran ]; + nativeBuildInputs = [ cython gfortran pythran ]; + buildInputs = [ numpy.blas pybind11 ]; + propagatedBuildInputs = [ numpy ]; + checkInputs = [ nose pytest pytest-xdist ]; + # Remove tests because of broken wrapper prePatch = '' rm scipy/linalg/tests/test_lapack.py @@ -41,7 +46,6 @@ buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; - # disable stackprotector on aarch64-darwin for now # # build error: From dae87e8da12bc694465ea7dc40044272593efb2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0390/1062] python3Packages.screeninfo: 0.6.7 -> 0.7 --- pkgs/development/python-modules/screeninfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 80933043b3b9..887542130969 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -2,12 +2,12 @@ buildPythonApplication rec { pname = "screeninfo"; - version = "0.6.7"; + version = "0.7"; disabled = isPy27; # dataclasses isn't available for python2 src = fetchPypi { inherit pname version; - sha256 = "1c4bac1ca329da3f68cbc4d2fbc92256aa9bb8ff8583ee3e14f91f0a7baa69cb"; + sha256 = "12a97c3527e3544ac5dbd7c1204283e2653d655cbd15844c990a83b1b13ef500"; }; # dataclasses is a compatibility shim for python 3.6 ONLY From e21576da68e13b676a2880ac2aba1e1853e80a38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0391/1062] python3Packages.setuptools_scm: add regression note Updating to 6.1.0 and 6.2.0 causes regressions. --- .../python-modules/setuptools-scm/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index a4cff6d056b0..bb0d82dab965 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -1,12 +1,15 @@ { lib, buildPythonPackage, fetchPypi, toml }: buildPythonPackage rec { - pname = "setuptools_scm"; + pname = "setuptools-scm"; + # don't update to 6.1.0 or 6.2.0, releases were pulled because of regression + # https://github.com/pypa/setuptools_scm/issues/615 version = "6.0.1"; src = fetchPypi { - inherit pname version; - sha256 = "d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92"; + pname = "setuptools_scm"; + inherit version; + sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; }; propagatedBuildInputs = [ toml ]; From 3f375deca7c2b399a9462000b8202954fc5acb3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0392/1062] python3Packages.simplejson: 3.17.4 -> 3.17.5 --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 3fdf43262da1..52e55c71aff0 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.17.4"; + version = "3.17.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-JfVTY2D0WBR89dbF+hOS9kcs/v7Dql/p0cXyLQyXGEc="; + sha256 = "1vljsd5bk12gasadkxcddwhmp38fj64x1aqi4frk3frq9lp8h3a1"; }; checkInputs = [ From 1b6a1e4563c9cfaf4236b7f72b69541e981a7e99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0393/1062] python3Packages.simple-salesforce: 1.11.2 -> 1.11.3 --- pkgs/development/python-modules/simple-salesforce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 592e23578095..7a0cebc44f92 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1xysym0b1qnxck4hbj5d0l5wapwfahmkr280f6iskz2hi5j2j1yb"; + sha256 = "16bd40n0xy0vmsgi2499vc6mx57ksyjrm6v88bwxp49p9qrm4a23"; }; propagatedBuildInputs = [ From b4d8d33d923c1e11238b7b676f5464712f5b5378 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0394/1062] python3Packages.singledispatch: 3.6.2 -> 3.7.0 --- pkgs/development/python-modules/singledispatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index 8fa62e835f22..837271b4d57c 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "singledispatch"; - version = "3.6.2"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "d5bb9405a4b8de48e36709238e8b91b4f6f300f81a5132ba2531a9a738eca391"; + sha256 = "c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092"; }; nativeBuildInputs = [ From c2cc885cf864962d6682f1aec7dd015a8b5bf327 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0395/1062] python3Packages.slack-sdk: 3.10.0 -> 3.10.1 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 6183ee7b0cba..92712b2ce41f 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.10.0"; + version = "3.10.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-FOpUO9bXrEOgYGmRmAhHnovzBafu6D2ZSLcgw0+0uzs="; + sha256 = "1m9jbn5wn892f22lxkxgahlbnwflak50hfjrydblp4agsag94nsg"; }; propagatedBuildInputs = [ From d3588a6b878fca6b6212eb7535621d14e249a3c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 17:02:01 +0200 Subject: [PATCH 0396/1062] python3Packages.asn1: init at 2.4.1 --- .../python-modules/asn1/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/asn1/default.nix diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix new file mode 100644 index 000000000000..7a83703f862c --- /dev/null +++ b/pkgs/development/python-modules/asn1/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "asn1"; + version = "2.4.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "andrivet"; + repo = "python-asn1"; + rev = "v${version}"; + sha256 = "0g2d5cr1pxsm5ackba7padf7gvlgrgv807kh0312s5axjd2cww2l"; + }; + + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "enum-compat" "" + ''; + + pytestFlagsArray = [ "tests/test_asn1.py" ]; + + pythonImportsCheck = [ "asn1" ]; + + meta = with lib; { + description = "Python ASN.1 encoder and decoder"; + homepage = "https://github.com/andrivet/python-asn1"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7403b1ba4083..9311abfde349 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -565,6 +565,8 @@ in { asgiref = callPackage ../development/python-modules/asgiref { }; + asn1 = callPackage ../development/python-modules/asn1 { }; + asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; From 952f21eb6052ee3fd0031f88ccde56ad00407dd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 17:03:02 +0200 Subject: [PATCH 0397/1062] python3Packages.smart-meter-texas: 0.4.4 -> 0.4.6 --- .../python-modules/smart-meter-texas/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index f8bd6825673c..762e9534148a 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -3,13 +3,14 @@ , pythonOlder , fetchFromGitHub , aiohttp +, asn1 , python-dateutil , tenacity }: buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.4.4"; + version = "0.4.6"; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "sha256-jewibcsqWnl0OQ2oEEOSOcyyDCIGZiG4EZQfuFUbxK4="; + sha256 = "sha256-BZb02eIFYCrTDDqeo6FlGpm8LCN/GxcdKGTR5L2/DpE="; }; postPatch = '' @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + asn1 python-dateutil tenacity ]; From de748db448a14d6101d8353ee959daabb4b8af66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0398/1062] python3Packages.smart-meter-texas: 0.4.4 -> 0.4.7 --- pkgs/development/python-modules/smart-meter-texas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index 762e9534148a..a9364ad0d1f2 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.4.6"; + version = "0.4.7"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "sha256-BZb02eIFYCrTDDqeo6FlGpm8LCN/GxcdKGTR5L2/DpE="; + sha256 = "1hfvv3kpkc7i9mn58bjgvwjj0mi2syr8fv4r8bwbhq5sailma27j"; }; postPatch = '' From fa03b72cd29b763edf58bd9a976c46070ea3edc5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0399/1062] python3Packages.sphinx-autoapi: 1.8.1 -> 1.8.4 --- .../python-modules/sphinxcontrib-autoapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 484b692f69f8..9f72e6f3d64f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.8.1"; + version = "1.8.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "842c0a8f49c824803f7edee31cb1cabd5001a987553bec7b4681283ec9e47d4a"; + sha256 = "8c4ec5fbedc1e6e8f4692bcc4fcd1abcfb9e8dfca8a4ded60ad811a743c22ccc"; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; From bd0efa6e7a60828c4572c86c0cf54e18639346bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0400/1062] python3Packages.sphinxcontrib-tikz: 0.4.13 -> 0.4.14 --- .../development/python-modules/sphinxcontrib-tikz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 19f386d7d278..7409791efc45 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.13"; + version = "0.4.14"; src = fetchPypi { inherit pname version; - sha256 = "882e3ccfa202559bf77b90c93ee5eb13ec50cdd7714b3673dc6580dea7236740"; + sha256 = "1614a45c960b80009dd42f96689122c9c0781018a0c5ec5828f4cdc5e35b11ad"; }; patches = [ From b328024ef141af7737e8250af3bca7d24607ae9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0401/1062] python3Packages.sqlite-utils: 3.9.1 -> 3.17 --- .../python-modules/sqlite-utils/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 35f7d7c07c98..8f5f7fd619c5 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -4,36 +4,38 @@ , pythonOlder , click , click-default-group +, dateutils , sqlite-fts4 , tabulate , pytestCheckHook -, pytest-runner -, black , hypothesis -, sqlite }: buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.9.1"; + version = "3.17"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a08ed62eb269e26ae9c35b9be9cd3d395b0522157e6543128a40cc5302d8aa81"; + sha256 = "77acd202aa568a1f6888c5d8879f306bb3f8acedc82df0df98eb615caa491abb"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; + propagatedBuildInputs = [ click click-default-group + dateutils sqlite-fts4 tabulate ]; checkInputs = [ pytestCheckHook - pytest-runner - black hypothesis ]; @@ -43,5 +45,4 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ meatcar ]; }; - } From 14638bc474b0be4ed563e1a8e78e439d614c66d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0402/1062] python3Packages.ssdp: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/ssdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index ac39cffa393e..810106a656e8 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ssdp"; - version = "1.0.1"; + version = "1.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0yhjqs9jyvwmba8fi72xfi9k8pxy11wkz4iywayrg71ka3la49bk"; + sha256 = "d33575a7360aaead5341cc2ceaf47cc80b2309a7dd167c2ea45d5a5b00851665"; }; buildInputs = [ pbr ]; From 8ed0272322545b68691f5694d00a5a272b19d06f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0403/1062] python3Packages.tableaudocumentapi: 0.6 -> 0.7 --- .../development/python-modules/tableaudocumentapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index 5260a678e8c7..56a3b27e7b96 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tableaudocumentapi"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "fc6d44b62cf6ea29916c073686e2f9f35c9902eccd57b8493f8d44a59a2f60d9"; + sha256 = "5b1d04817a0fba43d58e1ce23c64ad8dfe54dc029ba5ccae3908944555bb13e0"; }; # tests not inclued with release From 0f72fc790da0ddb15642ad0ef9717853adcb3ca7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0404/1062] python3Packages.tempora: 4.0.2 -> 4.1.1 --- pkgs/development/python-modules/tempora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 8da8d622a7b3..7bd7605fc3ff 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "4.0.2"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "10fdc29bf85fa0df39a230a225bb6d093982fc0825b648a414bbc06bddd79909"; + sha256 = "c54da0f05405f04eb67abbb1dff4448fd91428b58cb00f0f645ea36f6a927950"; }; disabled = pythonOlder "3.2"; From aa84a9206efc57b1c4ff8bd884e0192742b45818 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0405/1062] python3Packages.tensorboard_plugin_profile: 2.4.0 -> 2.5.0 --- .../python-modules/tensorboard-plugin-profile/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 1ae1aa471be5..843b9d6c3199 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -6,14 +6,15 @@ buildPythonPackage rec { pname = "tensorboard_plugin_profile"; - version = "2.4.0"; + version = "2.5.0"; format = "wheel"; src = fetchPypi { inherit pname version; format = "wheel"; + dist = "py3"; python = "py3"; - sha256 = "0z6dcjvkk3pzmmmjxi2ybawnfshz5qa3ga92kqj69ld1g9k3i9bj"; + sha256 = "16jch9py98h7wrffdiz6j0i3kdykxdp5m0kfxr1fxy2phqanpjqk"; }; propagatedBuildInputs = [ From 5ff3bc7302583d72447441aa96a2e1fc496c561c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0406/1062] python3Packages.terminado: 0.10.1 -> 0.11.1 --- pkgs/development/python-modules/terminado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 27c159349b0a..aff355d963ce 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.10.1"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "89d5dac2f4e2b39758a0ff9a3b643707c95a020a6df36e70583b88297cd59cbe"; + sha256 = "962b402edbb480718054dc37027bada293972ecadfb587b89f01e2b8660a2132"; }; propagatedBuildInputs = [ ptyprocess tornado ]; From c9a4248e7f9d4494dd8db257fa22c9eb629bb0a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0407/1062] python3Packages.termplotlib: 0.3.5 -> 0.3.8 --- pkgs/development/python-modules/termplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index dae40dcb993a..492d51dcb2ca 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "termplotlib"; - version = "0.3.5"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "1z6bw6lkbrgjyq3ndsx20gwpai4scm1q9rjh4rdz0rvja4jdcv3z"; + sha256 = "10k70pb7554cc2zwkcgxfak8nb7iqqw6njbnaqfdz07l4v9f6smm"; }; format = "pyproject"; From c65ffa71379a4cb53bdb4c4144b07d10af033e10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0408/1062] python3Packages.tern: 2.6.1 -> 2.7.0 --- pkgs/development/python-modules/tern/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 0468ee6f84b1..b8aee5ab9315 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "tern"; - version = "2.6.1"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "749c18ef493ebe3ac28624b2b26c6e38f77de2afd6a6579d2c92393d8fbdbd46"; + sha256 = "cfd59431cafd6adf05ccb94be964098d9301f83a03bf715def7861811e4a4b74"; }; preBuild = '' From bb04be0756924d2906e5525351e1484431e2eff8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0409/1062] python3Packages.teslajsonpy: 0.18.3 -> 0.19.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 750b070804c3..6fefda407f90 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.18.3"; + version = "0.19.0"; format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "1hdc5gm6dg1vw6qfs3z6mg2m94scrvjphj0lin6pi8n3zqj1h26k"; + sha256 = "04ihjxysfmppwa7rnz86nd89wrqks2gwvcza8707yddzfp5hh8id"; }; nativeBuildInputs = [ From 2e687492dbb0585eb2afde90cfd08a7e6554506b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0410/1062] python3Packages.testtools: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/testtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 8ef3d9c4320f..a07117a1e46d 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8"; + sha256 = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f"; }; propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ]; From 5817ae92ea6ef394dc89f03b8f5fb06a5f555bf7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0411/1062] python3Packages.texttable: 1.6.3 -> 1.6.4 --- pkgs/development/python-modules/texttable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index a8c6d9dcfda8..b104bd845962 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.3"; + version = "1.6.4"; src = fetchPypi { inherit pname version; - sha256 = "ce0faf21aa77d806bbff22b107cc22cce68dc9438f97a2df32c93e9afa4ce436"; + sha256 = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9"; }; meta = with lib; { From d27d6a1378b409b3d45448d30da630bec95897f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0412/1062] python3Packages.tifffile: 2021.6.14 -> 2021.8.8 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 40654366ea21..236f3443ca6b 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.6.14"; + version = "2021.8.8"; src = fetchPypi { inherit pname version; - sha256 = "a2f83d82800a8d83cbd04340f9d65a6873a970874947a6b823b1b1238e84cba6"; + sha256 = "8260f31c4700143e8374ff6cde5cef7fe54fc9b7313afe88329f407881901dc5"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; From 487afed8ed937055acde7891c64215dfca9bd61d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0413/1062] python3Packages.tox: 3.23.1 -> 3.24.3 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 035bb9701bb5..c660327ad72e 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.23.1"; + version = "3.24.3"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "307a81ddb82bd463971a273f33e9533a24ed22185f27db8ce3386bff27d324e3"; + sha256 = "c6c4e77705ada004283610fd6d9ba4f77bc85d235447f875df9f0ba1bc23b634"; }; meta = with lib; { From 5f58ad32a8b1205d7b75b71b030c91ba4fa5cdb7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0414/1062] python3Packages.tqdm: 4.61.1 -> 4.62.2 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index fe2eb35d4df7..babea4357a79 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.61.1"; + version = "4.62.2"; src = fetchPypi { inherit pname version; - sha256 = "24be966933e942be5f074c29755a95b315c69a91f839a29139bf26ffffe2d3fd"; + sha256 = "a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5"; }; nativeBuildInputs = [ From 7adf02c6475efd4e4edbc34687b329228eaf76c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0415/1062] python3Packages.trytond: 5.8.9 -> 5.8.11 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index d5ddf8f58802..ca8485d2f40f 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "5.8.9"; + version = "5.8.11"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5f14e9615ff91e18c146c74eb4c1cd56112662361a52c73389f15baced0bef18"; + sha256 = "6e9ad12ea0c6274a047ff925dffd33109b25919d4d40a90482e888077f6f9c71"; }; # Tells the tests which database to use From d9047c52a99346b28bd6aef48efedd9569f44536 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0416/1062] python3Packages.twine: 3.4.1 -> 3.4.2 --- pkgs/development/python-modules/twine/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index da5c4a9c3f51..f5809b0a9b90 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,12 +14,13 @@ buildPythonPackage rec { pname = "twine"; - version = "3.4.1"; + version = "3.4.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"; + sha256 = "4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936"; }; nativeBuildInputs = [ setuptools-scm ]; From bf80cd42921c0fd8c9a444ed6ebf89a9ce166d80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0417/1062] python3Packages.types-pytz: 2021.1.0 -> 2021.1.2 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 2fc5cc0d4503..4b3f9c1726c8 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.1.0"; + version = "2021.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0hzjz6wgzfyybcfli4rpmfxk49cn6x3slbs2xdmlnckvlahs5pxd"; + sha256 = "448828a06f2aaa840e57364d866c661645a045e532f817e4f10c8c3ab2b66651"; }; # Modules doesn't have tests From 334cfee6124d9bbb98b584b8cea10648315cc9df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0418/1062] python3Packages.uvloop: 0.15.2 -> 0.16.0 --- pkgs/development/python-modules/uvloop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index a762ec55ee36..c7e11ab6c258 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.15.2"; + version = "0.16.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"; + sha256 = "f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"; }; buildInputs = [ From d9674e2c038b3cef594f5fdef917870d4ca08fc5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0419/1062] python3Packages.virtualenv: 20.4.7 -> 20.7.2 --- .../python-modules/virtualenv/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 2bcfa88b6ae4..10e1ebbc87bc 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,6 +1,9 @@ -{ buildPythonPackage -, appdirs -, contextlib2 +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, isPy27 +, backports-entry-points-selectable , cython , distlib , fetchPypi @@ -8,26 +11,23 @@ , flaky , importlib-metadata , importlib-resources -, isPy27 -, lib , pathlib2 +, platformdirs , pytest-freezegun , pytest-mock , pytest-timeout , pytestCheckHook -, pythonOlder , setuptools-scm , six -, stdenv }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.4.7"; + version = "20.7.2"; src = fetchPypi { inherit pname version; - sha256 = "14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467"; + sha256 = "9ef4e8ee4710826e98ff3075c9a4739e2cb1040de6a2a8d35db0055840dc96a0"; }; nativeBuildInputs = [ @@ -35,13 +35,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs + backports-entry-points-selectable distlib filelock + platformdirs six - ] ++ lib.optionals isPy27 [ - contextlib2 - ] ++ lib.optionals (isPy27 && !stdenv.hostPlatform.isWindows) [ + ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [ pathlib2 ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources From 7b884bc91244791cc426d8f27cd3cce9a9fce020 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0420/1062] python3Packages.vispy: 0.6.6 -> 0.8.0 --- pkgs/development/python-modules/vispy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 849f25ef0df3..e29729a702ef 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.6.6"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "6f3c4d00be9e6761c046d520a86693d78a0925d47eeb2fc095e95dac776f74ee"; + sha256 = "89533514ffe05b16dca142a0ca455a96d14de209a1620615b1d251fa28d54b9b"; }; patches = [ From b1fbb2f3d09135a288e815066480bdc71cde9a2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0421/1062] python3Packages.vowpalwabbit: 8.10.2 -> 8.11.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 0a75600bb0f0..1a1c6a33acb3 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.10.2"; + version = "8.11.0"; src = fetchPypi{ inherit pname version; - sha256 = "e9f7d525a6e88ebff41406409a5c31f79bb008f524fc63a61dc74bac6a1ac887"; + sha256 = "cfde0515a3fa4d224aad5461135372f3441ae1a64717ae6bff5e23509d70b0bd"; }; nativeBuildInputs = [ From 090d14fd2d0f67dcba6966c972b478d5e70fc7a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0422/1062] python3Packages.watchdog: 2.1.4 -> 2.1.5 --- pkgs/development/python-modules/watchdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 01185017c600..7dab01b3ca09 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.4"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Q477vZKbZDat186J80ZsqDbzFYgiBDPv63V7WUepyXk="; + sha256 = "5563b005907613430ef3d4aaac9c78600dd5704e84764cb6deda4b3d72807f09"; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 38a1b49534cda46fb99d9fae9ddbd85c11af8ff7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0423/1062] python3Packages.webargs: 8.0.0 -> 8.0.1 --- pkgs/development/python-modules/webargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index 6db909992f48..63ad60c9f084 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.0.0"; + version = "8.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0xy6na8axc5wnp2wg3kvqbpl2iv0hx0rsnlrmrgkgp88znx6cmjn"; + sha256 = "bcce022250ee97cfbb0ad07b02388ac90a226ef4b479ec84317152345a565614"; }; pythonImportsCheck = [ From 08b7c453f237da663b6e8abbd213d4b429236d6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0424/1062] python3Packages.xarray: 0.18.2 -> 0.19.0 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 675461a63cc6..ee07adeb9d5b 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.18.2"; + version = "0.19.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5d2e72a228286fcf60f66e16876bd27629a1a70bf64822c565f16515c4d10284"; + sha256 = "3a365ce09127fc841ba88baa63f37ca61376ffe389a6c5e66d52f2c88c23a62b"; }; nativeBuildInputs = [ setuptools-scm ]; From 96b30f91f710904c5ec0cd5b604a290d679f98bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0425/1062] python3Packages.xml2rfc: 3.8.0 -> 3.9.1 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index c975218e5b1d..b623fc37c224 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.8.0"; + version = "3.9.1"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "8e25a9d73acf57ade798fc67841277dbbdb81ced390e6f84362370305b127426"; + sha256 = "76cee167e81fc3cc0e0cc696fe58cadd039e19a774c8f4d2e5c0fea724c7aaca"; }; propagatedBuildInputs = [ From 8a91a9a850ff75ae61ee97226eb52179bcab9112 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0426/1062] python3Packages.yamlloader: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/yamlloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index d2b66cb073d7..97da02102c7f 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "yamlloader"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e96dc3dc6895d814c330c054c966d993fc81ef1dbf5a30a4bdafeb256359e058"; + sha256 = "8a297c7a197683ba02e5e2b882ffd6c6180d01bdefb534b69cd3962df020bfe6"; }; propagatedBuildInputs = [ From d5de6aeaaae7ca3459a78b8920141f4f98e32509 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0427/1062] python3Packages.ytmusicapi: 0.18.0 -> 0.19.1 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 6ec5fda2ca58..77a579eba9c7 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.18.0"; + version = "0.19.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-RH0ballPSZQvesdUEsulnBkbbzVA2YrGWhMzRFvuwW0="; + sha256 = "1b8a050e2208b3d05359106d8c44c3d62e60edf6753529bd8a207788a6caeb95"; }; propagatedBuildInputs = [ From f07a2363c4cd55ae3ffa6ff3021415c0584e966a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0428/1062] python3Packages.zarr: 2.9.1 -> 2.9.3 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 9fc5589d281d..3bcfaece12a6 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.9.1"; + version = "2.9.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "688afec069e0f85b87c1ef4572766f998309c64ab7bea1884cec60e92d109544"; + sha256 = "274d2c1642fab6b4ddd4e465df3cdd456a5f821ed9a425a075436b1d2110bf36"; }; nativeBuildInputs = [ From f2b7e0192a4283c3f1da704a991803f04666df6e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0429/1062] python3Packages.zigpy-znp: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 474e7f309e34..f8413d9aa17f 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nnA/gVXBpCZFkspcO6kF3ZkEDu0vV0d9p1WNGVrN0u8="; + sha256 = "0jki9qmjazh0by02c0w17dyaz0nl3gzjiy064mj6pi502d175831"; }; propagatedBuildInputs = [ From 9e6051cbdc247c06dbb202a9853cbda5f064a88d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0430/1062] python3Packages.zipp: 3.4.1 -> 3.5.0 --- pkgs/development/python-modules/zipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 7ef26dbd7606..21cb9e6269f1 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zipp"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"; + sha256 = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"; }; nativeBuildInputs = [ setuptools-scm toml ]; From d5f47656fb7cd844b6a677a47b540dc26156b411 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0431/1062] python3Packages.zope.component: 5.0.0 -> 5.0.1 --- pkgs/development/python-modules/zope_component/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index 41c15fcd1307..a5cbcffe4336 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "5.0.0"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "df541a0501c79123f9ac30c6686a9e45c2690c5c3ae4f2b7f4c6fd1a3aaaf614"; + sha256 = "32cbe426ba8fa7b62ce5b211f80f0718a0c749cc7ff09e3f4b43a57f7ccdf5e5"; }; propagatedBuildInputs = [ From 788ee974a0f87c59fe291b51ac3f0c8e429c7229 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0432/1062] python3Packages.zope.proxy: 4.3.5 -> 4.4.0 --- pkgs/development/python-modules/zope_proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 67e8a191d97a..2d1a5880d0de 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.3.5"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a66a0d94e5b081d5d695e66d6667e91e74d79e273eee95c1747717ba9cb70792"; + sha256 = "b244904c5148067c3f1899d29a2c1a28faca747b143192c0f825e6bf3170a347"; }; propagatedBuildInputs = [ zope_interface ]; From f538ffd3071830f2f791e1326aa0bf04244de75b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:04 +0200 Subject: [PATCH 0433/1062] python3Packages.aioprocessing: 1.1.0 -> 2.0.0 --- pkgs/development/python-modules/aioprocessing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index 2f6b39678489..a4571a79b05d 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; From 7252c7a997addc4965e98f86588d4ccd139da6d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0434/1062] python3Packages.aioredis: 1.3.1 -> 2.0.0 --- .../python-modules/aioredis/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index fe48ba0e1e18..807b112772cf 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -1,20 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi -, pkgs, async-timeout, hiredis, isPyPy, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, async-timeout +, typing-extensions +, hiredis +, isPyPy +, pythonOlder }: buildPythonPackage rec { pname = "aioredis"; - version = "1.3.1"; + version = "2.0.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; + sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db"; }; propagatedBuildInputs = [ async-timeout + typing-extensions ] ++ lib.optional (!isPyPy) hiredis; # Wants to run redis-server, hardcoded FHS paths, too much trouble. From f258e6f671a1969aa1f707ff9f4171515c20bc50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0435/1062] python3Packages.ansible-runner: 1.4.7 -> 2.0.2 --- pkgs/development/python-modules/ansible-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index ba11ef11e3b8..9dc8eadb7775 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.4.7"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1bb56f9061c3238d89ec8871bc842f5b8d0e868f892347e8455c98d5b6fa58a1"; + sha256 = "c02b690803ec0be4453411c53743cd3fdca1dfc66dfa075794e14e717c5b61b3"; }; checkInputs = [ pytest mock ]; From f7ac1be1474847ea5e29466ebd64539d08f6da59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0436/1062] python3Packages.apispec: 4.7.1 -> 5.1.0 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 2753864fed81..c5777d7c5173 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.7.1"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1yf71c9nq1rfb5pkgmfw486fvywi1bjnmgwxcly7y3basf3980kr"; + sha256 = "9ac7a7a6000339a02d05404ef561e013375f170de01d8b238782f8fb83082b5b"; }; propagatedBuildInputs = [ From d395b776881165754db59a60bd2291b52e1721d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0437/1062] python3Packages.azure-mgmt-iothubprovisioningservices: 0.3.0 -> 1.0.0 --- .../azure-mgmt-iothubprovisioningservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index dcf97249e7f9..f8a48243571b 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "0.3.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d01b7725f3f68c5a6ff02184a9bdda8c775888af66378dd8314903d0a46e32b9"; + sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; }; propagatedBuildInputs = [ From e0c57cfdbb774a6429f3d1a269fef19ec951f34e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0438/1062] python3Packages.azure-mgmt-apimanagement: 0.3.0 -> 2.1.0 --- .../azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 6cf775c2118e..4c7233203bb9 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "2.1.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ec363581ef950945447e45d259441cb690a4b790057c7b8470ad8a6eeca04feb"; + sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; extension = "zip"; }; From 79d51341df910be84fdb0517ffc92dd7cfaa0711 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0439/1062] python3Packages.azure-mgmt-recoveryservices: 1.0.0 -> 2.0.0 --- .../python-modules/azure-mgmt-recoveryservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index d1f49355f8b9..29b0dd2eb1ca 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ab87108c0d5ce27d80583b4bfad966ad07049dcbc0e9ac28c64aa6bbdae64e22"; + sha256 = "a7d3137d5c460f50ac2d44061d60a70b4f2779d4ca844b77419b5725e65e09be"; }; propagatedBuildInputs = [ From d933ad1415ad141dda8cd38b91befb379585e604 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0440/1062] python3Packages.block-io: 1.1.15 -> 2.0.4 --- pkgs/development/python-modules/block-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index b823b8711a53..a76132e3e211 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.15"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "97ea037a67af72037cb08cec7e0a9f7866ecdfaa1a8c8ebcc0f4b9359a1516d7"; + sha256 = "817c9cd2ff76659caca4bb3d6758d5782a85f8c0ea13b08c4e14f0c2a8b7586d"; }; propagatedBuildInputs = [ From 00f9e617c90cd23c779167db00d7d80c8c3b558d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0441/1062] python3Packages.casbin: 0.20.0 -> 1.5.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 3f2b26e9c5f9..0cadf449ea88 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.20.0"; + version = "1.5.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1j7kd4rvf4myg4x4sm4njlhzkxm2m3cva9wmp9vx0nnpfdlyb67f"; + sha256 = "0sxv9kyzi7kzpljv1mrglz5szfxmqjmmnbcdn8mr0vwx3xibjb9j"; }; propagatedBuildInputs = [ From 68cf44976833727aa64da18b2f2d46900df28e22 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0442/1062] python3Packages.chart-studio: 4.14.3 -> 5.2.2 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index e059725cad24..a373246d49f7 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "4.14.3"; + version = "5.2.2"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "1yrrcn9032r3l8y2cc1wvpydg4rkqvgkpyv1s7znby5mrxa1rjma"; + sha256 = "14msi6i2caca5riirfv81nskh8w3avnflyr2phm62kygk125h1v7"; }; sourceRoot = "source/packages/python/chart-studio"; From 2c1d6c4781d505e411d9f7a28775c64b541d2830 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0443/1062] python3Packages.cmd2: 1.5.0 -> 2.1.2 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index b5bbc88c341f..f330a309ebf6 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.5.0"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62"; + sha256 = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41"; }; LC_ALL="en_US.UTF-8"; From a22f63120d93d7028a77b786f627fe98bf1753a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0444/1062] python3Packages.colorlog: 5.0.1 -> 6.4.1 --- pkgs/development/python-modules/colorlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 39b64e4faf3e..6abb6ff023ad 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "5.0.1"; + version = "6.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8XwBOgaWKwL0RJ7gfP2+ayh98p78LJoVFbSjdvTliOo="; + sha256 = "af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8"; }; checkInputs = [ pytestCheckHook ]; From 83b54559932dfc8439b8458fafb997bd5332ab50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0445/1062] python3Packages.contextlib2: 0.6.0.post1 -> 21.6.0 --- pkgs/development/python-modules/contextlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 38d9fb696e28..1387e786e7b7 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "contextlib2"; - version = "0.6.0.post1"; + version = "21.6.0"; src = fetchPypi { inherit pname version; - sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; + sha256 = "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"; }; checkInputs = [ unittest2 ]; From bd1ef322eaa3b54fa40669567c1f8d7703a8b8fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0446/1062] python3Packages.cupy: 8.6.0 -> 9.4.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 6a072ab8e1a7..c165c9af7a20 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "8.6.0"; + version = "9.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f3ed02ba18e38b4f3ed2c324fa08967e6714f59357ccb0b28badd9572e77500b"; + sha256 = "4402bd33a051e82f6888dab088a8d657714ca6d1e945b513dcc513a95a435bd5"; }; preConfigure = '' From 7be3bdd87c769c605610192bdf8dbc4ad892703b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0447/1062] python3Packages.decorator: 4.4.2 -> 5.0.9 --- pkgs/development/python-modules/decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 8e8fd28f0b54..f8d3f5c9ac61 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.4.2"; + version = "5.0.9"; src = fetchPypi { inherit pname version; - sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; + sha256 = "72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5"; }; meta = with lib; { From 08347ce13ce920ee547c279d320ca38d7cc8d5b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0448/1062] python3Packages.django-cacheops: 5.1 -> 6.0 --- pkgs/development/python-modules/django-cacheops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index c9344d3bd010..58900ac2cbf4 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "django-cacheops"; - version = "5.1"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0="; + sha256 = "78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841"; }; propagatedBuildInputs = [ From 6692f793113c71068229e2e0e27a9b4464613bf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0449/1062] python3Packages.frozendict: 1.2 -> 2.0.5 --- .../python-modules/frozendict/default.nix | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index e172f3815b7e..4acf53563ded 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -1,16 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytestCheckHook +, setuptoolsBuildHook +, python +}: buildPythonPackage rec { pname = "frozendict"; - version = "1.2"; + version = "2.0.5"; # 2.0.6 breaks canonicaljson + format = "setuptools"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + sha256 = "sha256-wb7hwHDY2fZA4SjluHV2pEAAhgCfeGLRPAv4YA5iE9M="; }; - # frozendict does not come with tests - doCheck = false; + pythonImportsCheck = [ + "frozendict" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -r frozendict + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + + disabledTests = [ + # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' + "test_union" + ]; + + disabledTestPaths = [ + # unpackaged test dependency: coold + "test/test_coold.py" + "test/test_coold_subclass.py" + ]; meta = with lib; { homepage = "https://github.com/slezica/python-frozendict"; From ea4de9ee8c58efff8621f82123f2b9e9bb29aa81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0450/1062] python3Packages.gcovr: 4.2 -> 5.0 --- pkgs/development/python-modules/gcovr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 1332777189b1..71480ab21131 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gcovr"; - version = "4.2"; + version = "5.0"; src = fetchPypi { inherit pname version; - sha256 = "0gyady7x3v3l9fm1zan0idaggqqcm31y7g5vxk7h05p5h7f39bjs"; + sha256 = "1d80264cbaadff356b3dda71b8c62b3aa803e5b3eb6d526a24932cd6660a2576"; }; propagatedBuildInputs = [ From 9e65cb287bc1401f64c10bc8120166d2a3de6c90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0451/1062] python3Packages.IMDbPY: 2020.9.25 -> 2021.4.18 --- pkgs/development/python-modules/imdbpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imdbpy/default.nix b/pkgs/development/python-modules/imdbpy/default.nix index dea62f080093..ab7575f99be8 100644 --- a/pkgs/development/python-modules/imdbpy/default.nix +++ b/pkgs/development/python-modules/imdbpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "IMDbPY"; - version = "2020.9.25"; + version = "2021.4.18"; src = fetchPypi { inherit pname version; - sha256 = "1p3j9j1jcgbw4626cvgpryhvczy9gzlg0laz6lflgq17m129gin2"; + sha256 = "af57f03638ba3b8ab3d696bfef0eeaf6414385c85f09260aba0a16b32174853f"; }; patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update From 00faf731766da6e160b50cc0aa03a5db8101174d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0452/1062] python3Packages.ipykernel: 5.5.5 -> 6.2.0 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 0d44c406349d..db87d371e3f2 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.5.5"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e976751336b51082a89fc2099fb7f96ef20f535837c398df6eab1283c2070884"; + sha256 = "4439459f171d77f35b7f7e72dace5d7c2dd10a5c9e2c22b173ad9048fbfe7656"; }; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; From 7b021c80bfa3fddf7558f99346fc00cb412aa5d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0453/1062] python3Packages.islpy: 2020.2.2 -> 2021.1 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 736588aa4504..918d8be8e9f1 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2020.2.2"; + version = "2021.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7eb7dfa41d6a67d9ee4ea4bb9f08bdbcbee42b364502136b7882cfd80ff427e0"; + sha256 = "b3f49de925149dbf2482e648016507cd66d0dce6668a1bc4de5e7a937e9c576d"; }; postConfigure = '' From 05fbcc4397ad364ff5a425eab3df9cf45e1465f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0454/1062] python3Packages.jira: 2.0.0 -> 3.0.1 --- .../python-modules/jira/default.nix | 58 +++++++++++++------ .../python-modules/jira/sphinx-fix.patch | 11 ---- 2 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/jira/sphinx-fix.patch diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index a3f790abfc51..c7d8207aa3d9 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,34 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytest-runner, pbr, glibcLocales , pytest-cov -, requests, requests_oauthlib, requests-toolbelt, defusedxml -, ipython +{ lib +, buildPythonPackage +, fetchFromGitHub +, defusedxml +, flaky +, keyring +, requests-mock +, requests_oauthlib +, requests-toolbelt +, setuptools-scm +, setuptools-scm-git-archive +, pytestCheckHook }: buildPythonPackage rec { pname = "jira"; - version = "2.0.0"; + version = "3.0.1"; - PBR_VERSION = version; - - src = fetchPypi { - inherit pname version; - sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; + src = fetchFromGitHub { + owner = "pycontribs"; + repo = pname; + rev = version; + sha256 = "sha256-hAUAzkHPXFDlKEom+dkzr8GQ+sqK2Ci1/k+QuSNvifE="; }; - buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; - propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report=xml --cov jira" "" + ''; + + nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + defusedxml + keyring + requests_oauthlib + requests-toolbelt + ]; + + checkInputs = [ + flaky + pytestCheckHook + requests-mock + ]; # impure tests because of connectivity attempts to jira servers doCheck = false; - patches = [ ./sphinx-fix.patch ]; - - LC_ALL = "en_US.utf8"; - - disabled = !isPy3k; - meta = with lib; { description = "This library eases the use of the JIRA REST API from Python."; + homepage = "https://github.com/pycontribs/jira"; license = licenses.bsd2; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/jira/sphinx-fix.patch b/pkgs/development/python-modules/jira/sphinx-fix.patch deleted file mode 100644 index ccc47ac4b9cf..000000000000 --- a/pkgs/development/python-modules/jira/sphinx-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/setup.py b/setup.py -index c49a24d..31aeec2 100644 ---- a/setup.py -+++ b/setup.py -@@ -11,5 +11,5 @@ except ImportError: - - - setuptools.setup( -- setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner', 'sphinx>=1.6.5'], -+ setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner'], - pbr=True) From 4788d195709aac25321bddfc85abd08bd97965e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0455/1062] python3Packages.jupyter_client: 6.2.0 -> 7.0.1 --- .../python-modules/jupyter_client/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 2c0a6c398864..35faf676f378 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,30 +1,34 @@ { lib , buildPythonPackage , fetchPypi -, traitlets +, entrypoints , jupyter_core -, pyzmq +, nest-asyncio , python-dateutil +, pyzmq +, tornado +, traitlets , isPyPy , py -, tornado }: buildPythonPackage rec { pname = "jupyter_client"; - version = "6.2.0"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "e2ab61d79fbf8b56734a4c2499f19830fbd7f6fefb3e87868ef0545cb3c17eb9"; + sha256 = "48822a93d9d75daa5fde235c35cf7a92fc979384735962501d4eb60b197fb43a"; }; propagatedBuildInputs = [ - traitlets + entrypoints jupyter_core - pyzmq + nest-asyncio python-dateutil + pyzmq tornado + traitlets ] ++ lib.optional isPyPy py; # Circular dependency with ipykernel From 01dc0712a7b407acc32c8158701fdc41de1aa972 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0456/1062] python3Packages.kubernetes: 12.0.1 -> 18.20.0 --- pkgs/development/python-modules/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 952527d5cab7..e90f72b0fd25 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "12.0.1"; + version = "18.20.0"; prePatch = '' sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ec52ea01d52e2ec3da255992f7e859f3a76f2bdb51cf65ba8cd71dfc309d8daa"; + sha256 = "0c72d00e7883375bd39ae99758425f5e6cb86388417cf7cc84305c211b2192cf"; }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; From 04a0156ce6aa98841b58b89f4b58ffe0b0da0c7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0457/1062] python3Packages.labelbox: 2.7.0 -> 3.1.0 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index cb098cd7ef10..97417b663652 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.7.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "V${version}"; - sha256 = "0bvfxs4g9cxj9npy7qckxsgxwgfg0cdmyywdw5lrfs926iq4ydq1"; + sha256 = "0hqjwilz1d5jidgsambr2zrp4czy53rq01p2ib6mndzsdh86nv7w"; }; propagatedBuildInputs = [ From aa5fac4fa9bbd051501835cfacca6a751f181082 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0458/1062] python3Packages.lexid: 2020.1005 -> 2021.1006 --- pkgs/development/python-modules/lexid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 4307d52d8913..400643383773 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "lexid"; - version = "2020.1005"; + version = "2021.1006"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "52333a2b9ebd14aa0dfeb33de72bd159c2dc31adb9c59cddfc486e2b69bfdcd1"; + sha256 = "509a3a4cc926d3dbf22b203b18a4c66c25e6473fb7c0e0d30374533ac28bafe5"; }; propagatedBuildInputs = [ click ]; From ff14f078a9c402dc3e9634d766fdd76f39a80ed3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0459/1062] python3Packages.libarchive-c: 2.9 -> 3.1 --- .../python-modules/libarchive-c/default.nix | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 73d99afda674..48262398fcbf 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -1,23 +1,26 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage -, fetchPypi -, pytest -, glibcLocales +, pythonAtLeast +, fetchFromGitHub , libarchive +, glibcLocales , mock +, pytestCheckHook }: buildPythonPackage rec { pname = "libarchive-c"; - version = "2.9"; + version = "3.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9919344cec203f5db6596a29b5bc26b07ba9662925a05e24980b84709232ef60"; + src = fetchFromGitHub { + owner = "Changaco"; + repo = "python-${pname}"; + rev = version; + sha256 = "1z4lqy9zlzymshzrcldsc9ipys2l7grqg4yff6ndl6dgbfb0g4jb"; }; - checkInputs = [ mock pytest glibcLocales ]; - LC_ALL="en_US.UTF-8"; postPatch = '' @@ -25,9 +28,20 @@ buildPythonPackage rec { "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - checkPhase = '' - py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar' - ''; + pythonImportsCheck = [ + "libarchive" + ]; + + checkInputs = [ + glibcLocales + mock + pytestCheckHook + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.9") [ + # causes python3.9 to segfault + "test_custom_writer_and_stream_reader" + ]; meta = with lib; { homepage = "https://github.com/Changaco/python-libarchive-c"; From 893dd0188cc1de9051d6b1e1fd04424547069c1b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0460/1062] python3Packages.marshmallow-oneofschema: 2.1.0 -> 3.0.1 --- .../python-modules/marshmallow-oneofschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index 343c5952a434..a4b15ce9a544 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "2.1.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0s0yr7nv06sfgxglghl2vq74g3m49j60k1hi2qzfsv4bj8hvs35k"; + sha256 = "62cd2099b29188c92493c2940ee79d1bf2f2619a71721664e5a98ec2faa58237"; }; propagatedBuildInputs = [ marshmallow setuptools ]; From 6bfb015f7edd053c7b1f41570b1d95ad4a099c00 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0461/1062] python3Packages.mitmproxy: 6.0.2 -> 7.0.2 --- pkgs/development/python-modules/mitmproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index e9c12548269f..a6638fc6ff49 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "6.0.2"; + version = "7.0.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-FyIZKFQtf6qvwo4+NzPa/KOmBCcdGJ3jCqxz26+S2e4="; + sha256 = "0y5zsay9b6xgibs6m4gckw63jip35vsdfajsh1nw2zcb2xs1a7qs"; }; propagatedBuildInputs = [ From 5f4d8054a5df68a5d5c5e78641c06b028eee5030 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0462/1062] python3Packages.nbdime: 2.1.0 -> 3.1.0 --- pkgs/development/python-modules/nbdime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 96fc94d43e85..a4cbe11fbe7a 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "2.1.0"; + version = "3.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4e3efdcfda31c3074cb565cd8e76e2e5421b1c4560c3a00c56f8679dd15590e5"; + sha256 = "12dc4390b355b26d07ac8d11d50efbcb54bae0ad5842b817131babd2f4567963"; }; checkInputs = [ From deb032733779ffce484508d79a8ddaaa3e7633ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0463/1062] python3Packages.plaid-python: 7.5.0 -> 8.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 86a80c8fa6f8..72b507a470b4 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.5.0"; + version = "8.0.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "f4781a54d18c8a70bf0b9206004574c524e63e6a07e3fa480964a489e2d759e1"; + sha256 = "ce11a832e04889972809b257e0351e4cc70fd3b5d31de2b97cc9df732a3dcc9b"; }; checkInputs = [ pytest ]; From 97712f7537e809a0e3f8d82d89f46ba0411e5556 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0464/1062] python3Packages.plotly: 4.14.3 -> 5.2.2 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index e2496d6097d9..aef078143b07 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.14.3"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "14cxlfl79i9bh3awsf4xgwr14ywm7lnrz2a81s7gp0if77nsx2kx"; + sha256 = "809f0674a7991daaf4f287964d617d24e9fa44463acd5a5352ebd874cfd98b07"; }; propagatedBuildInputs = [ From d9733b999244c17ed1fc0d632cb5ac05b6a0276c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0465/1062] python3Packages.pluggy: 0.13.1 -> 1.0.0 --- pkgs/development/python-modules/pluggy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 30fa2e1945b2..1a1c23f22d0a 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pluggy"; - version = "0.13.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; + sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"; }; checkPhase = '' From f617ab435c4617be4e4361f86fc60e9e2beedec6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0466/1062] python3Packages.priority: 1.3.0 -> 2.0.0 --- pkgs/development/python-modules/priority/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index a699f6ff812f..0f11347a74b8 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "priority"; - version = "1.3.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb"; + sha256 = "c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"; }; patches = [ From 41fc7ddc9768bd8051f63a6226f74df15d2a15b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0467/1062] python3Packages.pudb: 2020.1 -> 2021.1 --- pkgs/development/python-modules/pudb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index af653f260cd3..6df85ca5f089 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2020.1"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "2ef23d3371439f13fffbe7f8b9fc180a19d4183dc9cab204d878d7c7766464bf"; + sha256 = "309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e"; }; propagatedBuildInputs = [ pygments urwid ]; From cd6850f5fcdc9691489b081bdcfce2ed7f308986 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0468/1062] python3Packages.Pykka: 2.0.3 -> 3.0.1 --- pkgs/development/python-modules/pykka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 075b607c772e..f219375f93ef 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Pykka"; - version = "2.0.3"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4b9d2363365b3455a0204bf163f09bd351d24b938c618c79d975a9510e128e95"; + sha256 = "da59f77bc6a70e01996259da806d09b0dbc00dabe874ca9558fd5eb1698709c9"; }; checkInputs = [ pytestCheckHook pytest-mock ]; From e3bdb6fea2fa15bf571fa3efcad6425b63f5faa1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0469/1062] python3Packages.pyramid: 1.10.8 -> 2.0 --- pkgs/development/python-modules/pyramid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 95333f746d0c..da9569b7fb73 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.8"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "b7cd66595bef92f81764b976ddde2b2fa8e4f5f325e02f65f6ec7f3708b29cf6"; + sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; }; checkInputs = [ webtest zope_component ]; From 3a6b0446e71c46e5325719c8a142ce8782c8bf2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0470/1062] python3Packages.pytest-isort: 1.3.0 -> 2.0.0 --- pkgs/development/python-modules/pytest-isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index fe74f692df5e..e628e6a158c5 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "1.3.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "46a12331a701e2f21d48548b2828c8b0a7956dbf1cd5347163f537deb24332dd"; + sha256 = "821a8c5c9c4f3a3c52cfa9c541fbe89ac9e28728125125af53724c4c3f129117"; }; propagatedBuildInputs = [ isort ]; From 3b96b29a1862b980800f554d1598907271ecb428 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0471/1062] python3Packages.pytube: 10.9.3 -> 11.0.0 --- pkgs/development/python-modules/pytube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index 93ff39360830..c71043b71b2a 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.9.3"; + version = "11.0.0"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-x4u68O9dNhDZ+1Q+S4ou6zPqoR2/Yn5lcKgR2kyM/uo="; + sha256 = "1n5zl1x1izyzbrsgf76lk1av6h5m6a69plmhrcjynl880dji2na9"; }; checkInputs = [ From 2f06ac2fb1ef9c6e13d3e79b2ae1532b9f7ae9bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0472/1062] python3Packages.rdflib: 5.0.0 -> 6.0.0 --- pkgs/development/python-modules/rdflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 261ba794e70a..5b16e2f744e2 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rdflib"; - version = "5.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q"; + sha256 = "7ce4d757eb26f4dd43205ec340d8c097f29e5adfe45d6ea20238c731dc679879"; }; propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; From 1597a00f2742a9be5a28989505869183d2525298 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0473/1062] python3Packages.sphinxcontrib-htmlhelp: 1.0.3 -> 2.0.0 --- .../python-modules/sphinxcontrib-htmlhelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 8ca631a2b3c9..4efdb2633f28 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "1.0.3"; + version = "2.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"; + sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; }; From 8f98c60f3c78840be13c3bf6923d9c16746de829 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0474/1062] python3Packages.spyder: 4.2.5 -> 5.1.1 --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 5aaf4cb4a757..dbe54d52e3a9 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.2.5"; + version = "5.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "03159003f6ea51458e10000091e65e77888b095dba48e64ca2b36c75a648580c"; + sha256 = "6551acfd6fedfebd1f938ef67d3db415b33540f8377e7de3f4d4a2a11dd1b915"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From 25f103c35b18fff51978f4f3ad4ea069f954e60c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0475/1062] python3Packages.spyder-kernels: 1.10.3 -> 2.1.0 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index fa29236563e4..5ce41d8d7575 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.10.3"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "cecb0ca0115a42bab864c199a737c859a8534a510fc7edfa33dc42abcbb5287f"; + sha256 = "6c287207c7855bb581eae66ef8d990407382d5f9caccb1e0cabf909aaaf10c9b"; }; propagatedBuildInputs = [ From cb28f8c4603851a53987a3adf6ad0e7f1792b605 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0476/1062] python3Packages.sure: 1.4.11 -> 2.0.0 --- pkgs/development/python-modules/sure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index ee21e9c45168..b8bb9a36586a 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "sure"; - version = "1.4.11"; + version = "2.0.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "3c8d5271fb18e2c69e2613af1ad400d8df090f1456081635bd3171847303cdaa"; + sha256 = "34ae88c846046742ef074036bf311dc90ab152b7bc09c342b281cebf676727a2"; }; buildInputs = [ rednose ]; From 6aa82b04a6fcb43176ab29cbac2a85e9de1b5868 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0477/1062] python3Packages.towncrier: 19.9.0 -> 21.3.0 --- .../development/python-modules/towncrier/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 6b699a2fbc24..83215f5e0af3 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -3,6 +3,7 @@ , click-default-group , incremental , jinja2 +, mock , pytestCheckHook , toml , twisted @@ -11,11 +12,11 @@ buildPythonPackage rec { pname = "towncrier"; - version = "19.9.0"; + version = "21.3.0"; src = fetchPypi { inherit pname version; - sha256 = "19916889879353a8863f3de8cb1ef19b305a0b5cfd9d36159d76ca2fef08e9aa"; + sha256 = "6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe"; }; propagatedBuildInputs = [ @@ -28,7 +29,12 @@ buildPythonPackage rec { # zope.interface collision doCheck = !isPy27; - checkInputs = [ git twisted pytestCheckHook ]; + checkInputs = [ + git + mock + twisted + pytestCheckHook + ]; pythonImportsCheck = [ "towncrier" ]; meta = with lib; { From 1c339adf926bd186881806aa710322cb02b4fd2d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0478/1062] python3Packages.trytond: 5.8.11 -> 6.0.5 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index ca8485d2f40f..75e1ee68e4b3 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "5.8.11"; + version = "6.0.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6e9ad12ea0c6274a047ff925dffd33109b25919d4d40a90482e888077f6f9c71"; + sha256 = "3ccb98dbf905d99991ed0151e13c91cd9267e4aa104fa40097df4e02580dadfc"; }; # Tells the tests which database to use From 62c76c19ee2478ea2adeea288468db08207aa867 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0479/1062] python3Packages.vivisect: 0.2.1 -> 1.0.4 --- pkgs/development/python-modules/vivisect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index 43e54bda9d6c..5dc8bc2254d4 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "vivisect"; - version = "0.2.1"; + version = "1.0.4"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8fc4d2097a1d0d8d97aa8c540984cb52432df759f04f2281a21a4e1b7d1a95a7"; + sha256 = "bd47b2cf5874cd2f74e6c36b8a97bf301785bacf9ac0297bbe78ec1b8c86c755"; }; propagatedBuildInputs = [ From 28a7e0c803fc5d2ca54228557c4895edcbc7d62c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0480/1062] python3Packages.yt: 3.6.1 -> 4.0.1 --- pkgs/development/python-modules/yt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index 42bde9909b8c..9611b2722295 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "yt"; - version = "3.6.1"; + version = "4.0.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "be454f9d05dcbe0623328b4df43a1bfd1f0925e516be97399710452931a19bb0"; + sha256 = "6219cbf971871320a13679a57722c0363e50db5e6d4d64ea9d197461b2a7f70f"; }; buildInputs = [ From 65931335b676dd59dc416d859970ab3f7a9f4a75 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 23:07:15 +0200 Subject: [PATCH 0481/1062] python3Packages.pytest: relax pluggy constraints Apparently possible without further changes: https://github.com/pytest-dev/pytest/pull/9040 --- pkgs/development/python-modules/pytest/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 19289426d71a..d5b1d14937a0 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { sha256 = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pluggy>=0.12,<1.0.0a1" "pluggy>=0.23,<2.0" + ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ From e7ee7f4e00a54ed585370213fbd796404dfa7380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 00:54:28 +0200 Subject: [PATCH 0482/1062] python39Packages.backports-entry-points-selectable: init at 1.1.0 --- .../default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 - pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/backports-entry-points-selectable/default.nix diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix new file mode 100644 index 000000000000..2c1fa41f469b --- /dev/null +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, importlib-metadata }: + +buildPythonPackage rec { + pname = "backports-entry-points-selectable"; + version = "1.1.0"; + + src = fetchPypi { + pname = "backports.entry_points_selectable"; + inherit version; + sha256 = "988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "backports.entry_points_selectable" ]; + + meta = with lib; { + description = "Compatibility shim providing selectable entry points for older implementations"; + homepage = "https://github.com/jaraco/backports.entry_points_selectable"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index cd35fb250390..27b467cbb2a4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,7 +33,6 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ - backports-entry-points-selectable = throw "backports-entry-points-selectable has been removed"; # added 2021-07-01 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9311abfde349..95438436b076 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -981,6 +981,8 @@ in { backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; + backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; From 95227235657804d92413e1e842c3be537154164e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 23:30:22 +0200 Subject: [PATCH 0483/1062] python2Packages.contextlib2: reinit at 0.6.0.post1 --- .../python-modules/contextlib2/0.nix | 23 +++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/contextlib2/0.nix diff --git a/pkgs/development/python-modules/contextlib2/0.nix b/pkgs/development/python-modules/contextlib2/0.nix new file mode 100644 index 000000000000..38d9fb696e28 --- /dev/null +++ b/pkgs/development/python-modules/contextlib2/0.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +, unittest2 +}: + +buildPythonPackage rec { + pname = "contextlib2"; + version = "0.6.0.post1"; + + src = fetchPypi { + inherit pname version; + sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; + }; + + checkInputs = [ unittest2 ]; + + meta = { + description = "Backports and enhancements for the contextlib module"; + homepage = "https://contextlib2.readthedocs.org/"; + license = lib.licenses.psfl; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index caa44e5947e1..0b4fd6d242da 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -70,6 +70,8 @@ with self; with super; { construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; + contextlib2 = callPackage ../development/python-modules/contextlib2/0.nix { }; + convertdate = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; From 97ca5289be135b03b1176fa2b543046d4b0472f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 23:31:41 +0200 Subject: [PATCH 0484/1062] python2Packages.pluggy: reinit at 0.13.1 --- pkgs/development/python-modules/pluggy/0.nix | 34 ++++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pluggy/0.nix diff --git a/pkgs/development/python-modules/pluggy/0.nix b/pkgs/development/python-modules/pluggy/0.nix new file mode 100644 index 000000000000..30fa2e1945b2 --- /dev/null +++ b/pkgs/development/python-modules/pluggy/0.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, lib +, fetchPypi +, setuptools-scm +, importlib-metadata +}: + +buildPythonPackage rec { + pname = "pluggy"; + version = "0.13.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; + }; + + checkPhase = '' + py.test + ''; + + # To prevent infinite recursion with pytest + doCheck = false; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ importlib-metadata ]; + + meta = { + description = "Plugin and hook calling mechanisms for Python"; + homepage = "https://github.com/pytest-dev/pluggy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 0b4fd6d242da..de4e68c02475 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -395,6 +395,8 @@ with self; with super; { pip = callPackage ../development/python-modules/pip/20.nix { }; + pluggy = callPackage ../development/python-modules/pluggy/0.nix { }; + postorius = disabled super.postorius; praw = callPackage ../development/python-modules/praw/6.3.nix { }; From 635fefca233471bce0d11b42eee4a38c0331bdb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 02:03:19 +0200 Subject: [PATCH 0485/1062] python3Packages.brotli: convert to pytestCheckHook --- .../python-modules/brotli/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 1edc62317a64..0556c5b4e2a2 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "brotli"; @@ -16,15 +19,18 @@ buildPythonPackage rec { dontConfigure = true; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest python/tests - ''; + pytestFlagsArray = [ + "python/tests" + ]; - meta = { + meta = with lib; { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From b1e9c9c4e0d92df6b5ac87f98fa2af5ac29106cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 02:04:16 +0200 Subject: [PATCH 0486/1062] python3Packages.requests: restore python2 compatibility --- pkgs/development/python-modules/requests/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 876046066895..4b3442657ff8 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,4 +1,5 @@ { lib +, brotli , brotlicffi , buildPythonPackage , certifi @@ -11,6 +12,7 @@ , pytestCheckHook , urllib3 , isPy27 +, isPy3k , trustme }: @@ -34,12 +36,15 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - brotlicffi certifi - charset-normalizer chardet idna urllib3 + ] ++ lib.optionals (isPy3k) [ + brotlicffi + charset-normalizer + ] ++ lib.optionals (isPy27) [ + brotli ]; checkInputs = [ From 684acec3e9c964716fd5146476066118057da06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 01:28:43 +0200 Subject: [PATCH 0487/1062] python3Packages.pytest_4: relax pluggy constraints Following 7e27631e46c8121e5b906083e1de74ec53de2730 --- pkgs/development/python-modules/pytest/4.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index c764b55d1f10..fd6d3507afb8 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -11,6 +11,11 @@ buildPythonPackage rec { sha256 = "50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; + checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] From 2016ebd1fd0074865ef63623ed97821ebf2f36a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:25:52 +0200 Subject: [PATCH 0488/1062] python3Packages: provide setuptools-scm with toml[i] by default and remove duplicated toml packages Some packages seem to still require toml despite setuptools-scm having switched to tomli. If it is missing the version number in dist.into is set to 0.0.0 and silently all version pins break. --- pkgs/development/python-modules/ansi2html/default.nix | 4 ++-- pkgs/development/python-modules/asttokens/default.nix | 4 ++-- pkgs/development/python-modules/configparser/default.nix | 6 ++---- pkgs/development/python-modules/inflect/default.nix | 3 +-- pkgs/development/python-modules/irc/default.nix | 3 +-- pkgs/development/python-modules/jaraco_classes/default.nix | 4 ++-- .../development/python-modules/jaraco_functools/default.nix | 4 ++-- pkgs/development/python-modules/keyrings-alt/default.nix | 4 ++-- pkgs/development/python-modules/setuptools-scm/default.nix | 6 ++++-- pkgs/development/python-modules/xmlsec/default.nix | 3 +-- pkgs/development/python-modules/zipp/default.nix | 3 +-- 11 files changed, 20 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 4abcec541a04..50188fe0e4a3 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm }: buildPythonPackage rec { pname = "ansi2html"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six setuptools ]; preCheck = "export PATH=$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index bb4cf989cddf..acd44d55e16f 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, fetchpatch, buildPythonPackage, - setuptools-scm, toml, six, astroid, pytest + setuptools-scm, six, astroid, pytest }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ setuptools-scm toml six astroid ]; + propagatedBuildInputs = [ setuptools-scm six astroid ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index a939f6623c9c..3eeae353d115 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm -, toml -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "configparser"; @@ -14,7 +12,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 9081a30ac6be..ca454d432317 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -3,7 +3,6 @@ , fetchPypi , isPy27 , setuptools-scm -, toml , pytestCheckHook }: @@ -17,7 +16,7 @@ buildPythonPackage rec { sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 60a960a204c4..423ec4ecf292 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools-scm, jaraco_collections, importlib-metadata, toml +, setuptools-scm, jaraco_collections, importlib-metadata }: buildPythonPackage rec { @@ -28,7 +28,6 @@ buildPythonPackage rec { pytz jaraco_itertools jaraco_collections - toml ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index a727e774ec30..aadb9f9028f1 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 -, setuptools-scm, toml +, setuptools-scm , more-itertools , pytestCheckHook }: @@ -20,7 +20,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 1fca58ebf733..3ad652af7643 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools-scm, toml +, setuptools-scm , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 7bc88bf6cbad..a45be02b55b2 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six -, pytest, backports_unittest-mock, keyring, setuptools-scm, toml +, pytest, backports_unittest-mock, keyring, setuptools-scm }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock; diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index bb0d82dab965..e80a153ae66f 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, toml }: +{ lib, buildPythonPackage, fetchPypi, toml, tomli }: buildPythonPackage rec { pname = "setuptools-scm"; @@ -12,7 +12,9 @@ buildPythonPackage rec { sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; }; - propagatedBuildInputs = [ toml ]; + # TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm + # if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages + propagatedBuildInputs = [ toml tomli ]; # Requires pytest, circular dependency doCheck = false; diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index b8c60f1b6425..c94f018382a6 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -9,7 +9,6 @@ , xmlsec , pkgconfig , setuptools-scm -, toml , lxml , hypothesis }: @@ -28,7 +27,7 @@ buildPythonPackage rec { ./reset-lxml-in-tests.patch ]; - nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm toml ]; + nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ]; buildInputs = [ xmlsec libxslt libxml2 libtool ]; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 21cb9e6269f1..a857acf683f1 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -5,7 +5,6 @@ , pytest , pytest-flake8 , more-itertools -, toml }: buildPythonPackage rec { @@ -17,7 +16,7 @@ buildPythonPackage rec { sha256 = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; From 88252edcb11c93434ba54325e616d0b9ad3b5b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:28:05 +0200 Subject: [PATCH 0489/1062] python39Packages.zipp: update meta, remove unused checkInputs tests are not run anyway --- pkgs/development/python-modules/zipp/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index a857acf683f1..c070e2327772 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , setuptools-scm -, pytest -, pytest-flake8 , more-itertools }: @@ -20,12 +18,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ more-itertools ]; - checkInputs = [ pytest pytest-flake8 ]; - - checkPhase = '' - pytest - ''; - # Prevent infinite recursion with pytest doCheck = false; @@ -33,5 +25,6 @@ buildPythonPackage rec { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From e0620c63a71e26ff26e5b6eab6565b4ff02b287b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:32:58 +0200 Subject: [PATCH 0490/1062] python39Packages.setuptools-scm: relax tomli ping --- pkgs/development/python-modules/setuptools-scm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index e80a153ae66f..87f8c3d13ae4 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -12,6 +12,11 @@ buildPythonPackage rec { sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "tomli~=1.0.0" "tomli>=1.0.0" + ''; + # TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm # if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages propagatedBuildInputs = [ toml tomli ]; From ce240f5ca1d599f88037fd0d73e6c43a938cbd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:34:32 +0200 Subject: [PATCH 0491/1062] python39Packages.tomli: break infinite recursion with setuptools-scm by splitting tests, add SuperSandro2000 as maintainer --- .../python-modules/tomli/default.nix | 25 +++++++++++++------ .../python-modules/tomli/tests.nix | 21 ++++++++++++++++ 2 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/python-modules/tomli/tests.nix diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index c658339dcd9c..79cd5a4f500c 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage +, callPackage , fetchFromGitHub , flit-core -, pytestCheckHook -, python-dateutil }: buildPythonPackage rec { @@ -11,6 +10,11 @@ buildPythonPackage rec { version = "1.1.0"; format = "pyproject"; + outputs = [ + "out" + "testsout" + ]; + src = fetchFromGitHub { owner = "hukkin"; repo = pname; @@ -20,17 +24,24 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - checkInputs = [ - pytestCheckHook - python-dateutil - ]; + postInstall = '' + mkdir $testsout + cp -R benchmark/ pyproject.toml tests/ $testsout/ + ''; pythonImportsCheck = [ "tomli" ]; + # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + meta = with lib; { description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; homepage = "https://github.com/hukkin/tomli"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch ]; + maintainers = with maintainers; [ veehaitch SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/tomli/tests.nix b/pkgs/development/python-modules/tomli/tests.nix new file mode 100644 index 000000000000..5d3d67dbd128 --- /dev/null +++ b/pkgs/development/python-modules/tomli/tests.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, tomli +, pytestCheckHook +, python-dateutil +}: + +buildPythonPackage rec { + pname = "tomli-tests"; + inherit (tomli) version; + + src = tomli.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytestCheckHook + python-dateutil + tomli + ]; +} From 9409588dd6517626420ada379b4e29550974891b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:35:00 +0200 Subject: [PATCH 0492/1062] python39Packages.flit-core: break infinite recursion with setuptools-scm by splitting tests, add SuperSandro2000 as maintainer --- .../python-modules/flit-core/default.nix | 25 +++++++++++++------ .../python-modules/flit-core/tests.nix | 22 ++++++++++++++++ 2 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/python-modules/flit-core/tests.nix diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index a4c6b99b07f4..7b2731595629 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage +, callPackage , flit -, isPy3k , toml , pytestCheckHook , testpath @@ -12,6 +12,11 @@ buildPythonPackage rec { version = "3.2.0"; format = "pyproject"; + outputs = [ + "out" + "testsout" + ]; + inherit (flit) src patches; preConfigure = '' @@ -22,19 +27,23 @@ buildPythonPackage rec { toml ]; - checkInputs = [ - pytestCheckHook - testpath - ]; + postInstall = '' + mkdir $testsout + cp -R ../tests $testsout/tests + ''; + + # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm + doCheck = false; passthru.tests = { inherit flit; + pytest = callPackage ./tests.nix { }; }; - meta = { + meta = with lib; { description = "Distribution-building parts of Flit. See flit package for more information"; homepage = "https://github.com/takluyver/flit"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.fridh ]; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/flit-core/tests.nix b/pkgs/development/python-modules/flit-core/tests.nix new file mode 100644 index 000000000000..0fd13e80cb12 --- /dev/null +++ b/pkgs/development/python-modules/flit-core/tests.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, flit +, flit-core +, pytestCheckHook +, testpath +}: + +buildPythonPackage rec { + pname = "flit-core"; + inherit (flit-core) version; + + src = flit-core.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + flit + pytestCheckHook + testpath + ]; +} From e0ef8da1283fa551fb6fce76aff0f8cbc47df3bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 03:33:18 +0200 Subject: [PATCH 0493/1062] python3Packages.pytest_5: relax pluggy constraints --- pkgs/development/python-modules/pytest/5.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index b3e69578d7eb..b38c1a759fe3 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; + checkInputs = [ hypothesis pygments ]; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ From 8db4f98c8b5291ebf5f36aeed16355a953cf7aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:50:53 +0200 Subject: [PATCH 0494/1062] python39Packages.Cython: 0.29.22 -> 0.29.24 Required to build numpy RuntimeError: Building NumPy requires Cython >= 0.29.24, found 0.29.22 at /nix/store/7qrl7hhzvbmd966b61w3n0dkamn863gn-python3.9-Cython-0.29.22/lib/python3.9/site-packages/Cython/init.py --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index dcede9506e32..7c27f370bd14 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.22"; + version = "0.29.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY="; + sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM="; }; nativeBuildInputs = [ From 658f9946d3273c33b6458f5411ed0f494a458412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:58:26 +0200 Subject: [PATCH 0495/1062] python39Packages.Cython: minor formatting cleanups --- pkgs/development/python-modules/Cython/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 7c27f370bd14..e22037cbbb9f 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -12,8 +12,7 @@ }: let - excludedTests = [] - ++ [ "reimport_from_subinterpreter" ] + excludedTests = [ "reimport_from_subinterpreter" ] # cython's testsuite is not working very well with libc++ # We are however optimistic about things outside of testsuite still working ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] @@ -36,9 +35,11 @@ in buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; + checkInputs = [ gdb numpy ncurses ]; + buildInputs = [ glibcLocales ]; LC_ALL = "en_US.UTF-8"; @@ -71,9 +72,7 @@ in buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - -# doCheck = !stdenv.isDarwin; - + # doCheck = !stdenv.isDarwin; meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; From a1f8000e3a836171044dd751876303b918ecb83e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 04:27:08 +0200 Subject: [PATCH 0496/1062] python3Packages.sphinx: fix build with Pygments>=2.10 --- pkgs/development/python-modules/sphinx/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index f4b5c60fb1e1..a04a0585019f 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch # propagatedBuildInputs , Babel , alabaster @@ -38,6 +39,14 @@ buildPythonPackage rec { sha256 = "sha256-0QdgHFX4r40BDHjpi9R40lXqT4n5ZgrIny+w070LZPE="; }; + patches = [ + (fetchpatch { + # Fix tests with pygments 2.10 + url = "https://github.com/sphinx-doc/sphinx/commit/bde6c8d2effc56dc8b9098abee796167f972c306.patch"; + sha256 = "0d0ddhgrrh7z9ix0f3zrc2gjb4d73f6ffm98zl62fzv5l4fd00lr"; + }) + ]; + propagatedBuildInputs = [ Babel alabaster From 7da13218b906af89f9fa412e8c1fcccf04605b12 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Tue, 24 Aug 2021 19:47:23 -0700 Subject: [PATCH 0497/1062] python3Packages.poetry-core: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/poetry-core/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 4d8c444dcd20..d5262ee22c47 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , importlib-metadata , intreehooks -, isort , pathlib2 , pep517 , pytest-mock @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "07x0zagf9cfr7g3132jjd5byywkbnzpfbxjfjzpzpj70fqw70qrc"; + sha256 = "0jgd4d7m5y8ly8n0l9lcq7cjab2y3hifk90f343ksmjzssfd5lg3"; }; postPatch = lib.optionalString (pythonOlder "3.8") '' From ae433cd4c646f7c9c3a2d858cef4ccd11db9d691 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Tue, 24 Aug 2021 19:47:34 -0700 Subject: [PATCH 0498/1062] python3Packages.poetry: 1.1.7 -> 1.1.8 --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 7287797ef331..4b7d35093662 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.7"; + version = "1.1.8"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "03cbzjw0sb8rs85iq191ndk9523d6qpymh2nhw5bvcxfvsf9042d"; + sha256 = "0qcgjb78nj69sppd8146519q9422xxg1bi34gyxy51sjkvd5lxhz"; }; postPatch = '' From 8c4144c932c764569e1a4191848bfda75d7e3224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:14:57 +0200 Subject: [PATCH 0499/1062] python3Packages.pytest_6_1: relax pluggy constraints --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95438436b076..174a37fadf30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6867,6 +6867,11 @@ in { inherit version; sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; }); pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; From d65d2ef1b756c29d67578c45073e80fce0327d4d Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 2 Aug 2021 23:08:05 -0700 Subject: [PATCH 0500/1062] =?UTF-8?q?python3Packages.isort:=205.6.4=20?= =?UTF-8?q?=E2=86=92=205.9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/development/python-modules/isort/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 1195f0f6b097..b55fb9156814 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -6,17 +6,16 @@ , pytestCheckHook }: -let -in buildPythonPackage rec { +buildPythonPackage rec { pname = "isort"; - version = "5.6.4"; + version = "5.9.3"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = version; - sha256 = "1m7jpqssnbsn1ydrw1dn7nrcrggqcvj9v6mk5ampxmvk94xd2r2q"; + sha256 = "sha256-JbRZ/3Xz35tGoCNnQesR08Sjoz3yimxZyxhhOXGvmXw="; }; nativeBuildInputs = [ @@ -46,6 +45,7 @@ in buildPythonPackage rec { ''; pytestFlagsArray = [ + "--ignore=tests/benchmark/" # requires pytest-benchmark "--ignore=tests/integration/" # pulls in 10 other packages "--ignore=tests/unit/profiles/test_black.py" # causes infinite recursion to include black ]; @@ -63,6 +63,7 @@ in buildPythonPackage rec { # plugin not available "test_isort_literals_issue_1358" "test_isort_supports_formatting_plugins_issue_1353" + "test_sort_configurable_sort_issue_1732" "test_value_assignment_list" # profiles not available "test_isort_supports_shared_profiles_issue_970" From 29b13f618cf7e1b031358201d96bcd8f7e6c308c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:32:23 +0200 Subject: [PATCH 0501/1062] python3Packages.async-upnp-client: use latest pytest again --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 174a37fadf30..4e310cf84aab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -625,9 +625,7 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; asyncwhois = callPackage ../development/python-modules/asyncwhois { }; From ac9f1519c5c9138f6dffecdc131b3a4e6e36c6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:41:31 +0200 Subject: [PATCH 0502/1062] python3Packages.trio: use latest pytest again --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e310cf84aab..79f54c8a7d25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8938,9 +8938,7 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; - trio = callPackage ../development/python-modules/trio { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + trio = callPackage ../development/python-modules/trio { }; trueskill = callPackage ../development/python-modules/trueskill { }; From ffcd829e7b8f9249c2b9e0c9e6a98d39a2c8d0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:42:23 +0200 Subject: [PATCH 0503/1062] python3Packages.urrllib3: use latest pytest again --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79f54c8a7d25..7b3be4cc7c4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9156,9 +9156,7 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - urllib3 = callPackage ../development/python-modules/urllib3 { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + urllib3 = callPackage ../development/python-modules/urllib3 { }; urlpy = callPackage ../development/python-modules/urlpy { }; From f55ce683ce611d0fef434add789ac6a624f547d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:45:06 +0200 Subject: [PATCH 0504/1062] python3Packages.werkzeug: use latest pytest again --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b3be4cc7c4c..df1af88fa513 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9369,9 +9369,7 @@ in { webthing = callPackage ../development/python-modules/webthing { }; - werkzeug = callPackage ../development/python-modules/werkzeug { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; From 741ee2ac7c9b4eb957ea1a6b01b39f793e47339b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:55:23 +0200 Subject: [PATCH 0505/1062] python39Packages.fakeredis: disable failing tests --- pkgs/development/python-modules/fakeredis/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index e38b78c0acab..e76eb8903d60 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -40,6 +40,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # AttributeError: 'AsyncGenerator' object has no attribute XXXX + "test/test_aioredis2.py" + ]; + pythonImportsCheck = [ "fakeredis" ]; meta = with lib; { From 0b0d4cc1efacfa669ed82282fd1976243b5dc404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 06:32:40 +0200 Subject: [PATCH 0506/1062] python39Packages.gevent-websocket: update meta, disable checkPhase, add import check --- .../development/python-modules/gevent-websocket/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 7ff62a378ca9..24af4416ab3c 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -17,10 +17,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent gunicorn ]; + # zero tests run + doCheck = false; + + pythonImportsCheck = [ "geventwebsocket" ]; + meta = with lib; { homepage = "https://www.gitlab.com/noppo/gevent-websocket"; description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From c59e9b223bd648045d34312c7a52a08794845c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 07:37:29 +0200 Subject: [PATCH 0507/1062] python39Packages.zigpy: 0.36.1 -> 0.37.1 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 7dab5cda6cc5..af498c59cf06 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.36.1"; + version = "0.37.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "0rfif8ds6m9ndxnc0f02fivc2pwidf476ylyx9y2b1sa2qz36z5w"; + sha256 = "sha256-tDpu6tv8qwIPB3G5GKURtDi6QOYxF5jEVbzmJ2Px5W4="; }; propagatedBuildInputs = [ From 922fd9119db31f69574f5a68f35bea1e76858bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 08:06:53 +0200 Subject: [PATCH 0508/1062] python39Packages.httpx: 0.18.2 -> 0.19.0 --- pkgs/development/python-modules/httpx/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 6a9300566d59..014272bcc107 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , brotlicffi , certifi +, charset-normalizer , h2 , httpcore , rfc3986 @@ -18,19 +19,20 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.18.2"; + version = "0.19.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0rr5b6z96yipvp4riqmmbkbcy0sdyzykcdwf5y9ryh27pxr8q8x4"; + sha256 = "sha256-bUxxeUYqOHBmSL2gPQG5cIq6k5QY4Kyhj9ToA5yZXPA="; }; propagatedBuildInputs = [ brotlicffi certifi + charset-normalizer h2 httpcore rfc3986 From 756d8f1d3fd8a915e3f7f94f1c519f97116237f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 11:40:30 +0200 Subject: [PATCH 0509/1062] python39Packages.Fabric: format, use pytestCheckHook, update disable test comment --- .../python-modules/Fabric/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index 2e70d3aa121e..de53512d0b47 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , cryptography , invoke , mock , paramiko -, pytest +, pytestCheckHook , pytest-relaxed }: @@ -23,20 +25,21 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ invoke paramiko cryptography ]; - checkInputs = [ pytest mock pytest-relaxed ]; - # requires pytest_relaxed, which doesnt have official support for pytest>=5 - # https://github.com/bitprophet/pytest-relaxed/issues/12 + checkInputs = [ pytestCheckHook pytest-relaxed mock ]; + + # ==================================== ERRORS ==================================== + # ________________________ ERROR collecting test session _________________________ + # Direct construction of SpecModule has been deprecated, please use SpecModule.from_parent + # See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent for more details. doCheck = false; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ "fabric" ]; meta = with lib; { description = "Pythonic remote execution"; - homepage = "https://www.fabfile.org/"; - license = licenses.bsd2; + homepage = "https://www.fabfile.org/"; + license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; } From 027d986f3d2d62aba3093dc9d63c3e024e5bf064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 11:40:53 +0200 Subject: [PATCH 0510/1062] python39Packages.paramiko: use pytestCheckHook, cleanup --- .../python-modules/paramiko/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index c2237f68524f..88d63f0de93f 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -6,7 +6,7 @@ , invoke , pynacl , pyasn1 -, pytest +, pytestCheckHook , pytest-relaxed , mock }: @@ -20,25 +20,21 @@ buildPythonPackage rec { sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"; }; - checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; - __darwinAllowLocalNetworking = true; + checkInputs = [ invoke pytestCheckHook pytest-relaxed mock ]; - # 2 sftp tests fail (skip for now) - # test_config relies on artifacts to be to downloaded - # RSA tests don't have valid keys - checkPhase = '' - pytest tests \ - --ignore=tests/test_sftp.py \ - --ignore=tests/test_config.py - ''; + disabledTestPaths = [ + "tests/test_sftp.py" + "tests/test_config.py" + ]; + + __darwinAllowLocalNetworking = true; meta = with pkgs.lib; { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; license = licenses.lgpl21Plus; - longDescription = '' This is a library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure From 3c9c1a8ce2b155a2e78ffdc739bcb2426eca1465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 11:44:12 +0200 Subject: [PATCH 0511/1062] python39Packages.pytest-relaxed: switch to pytestCheckHook, relax decorator dependency, comment partial breakage --- .../python-modules/pytest-relaxed/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 19d031b6a2b1..1030f76050ca 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -4,6 +4,7 @@ , pytest , six , decorator +, pytestCheckHook }: buildPythonPackage rec { @@ -15,22 +16,23 @@ buildPythonPackage rec { sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; }; + # newer decorator versions are incompatible and cause the test suite to fail + # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric + postPatch = '' + substituteInPlace setup.py \ + --replace "decorator>=4,<5" "decorator>=4" \ + --replace "pytest>=3,<5" "pytest>=3" + ''; + buildInputs = [ pytest ]; - checkInputs = [ pytest ]; propagatedBuildInputs = [ six decorator ]; - patchPhase = '' - sed -i "s/pytest>=3,<5/pytest/g" setup.py - ''; + checkInputs = [ pytestCheckHook ]; - # skip tests due to dir requirements + # lots of assertion errors mainly around decorator doCheck = false; - checkPhase = '' - pytest tests - ''; - meta = with lib; { homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; From e2b137d3f6fc0cf7204fc03d9d264e4ba797e7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:01:40 +0200 Subject: [PATCH 0512/1062] python39Packages.tzlocal: add a comment to be compatible with APScheduler --- pkgs/development/python-modules/tzlocal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index c5514cfa53a4..363e1d12a55e 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "2.1"; + version = "2.1"; # version needs to be compatible with APScheduler propagatedBuildInputs = [ pytz ]; From 5252fe5f7f195cf0e888de3422f7034af6f7e075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:13:17 +0200 Subject: [PATCH 0513/1062] python39Packages.zigpy-xbee: 0.13.0 -> 0.14.0 --- .../python-modules/zigpy-xbee/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 1279bb804de6..be522214164b 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -7,11 +7,12 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, zigpy }: +, zigpy +}: buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.13.0"; + version = "0.14.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = version; - sha256 = "Krdqb9bYKwUC2cdNppB2+tLwWjzmzIHhXnQ1KRduofU="; + sha256 = "sha256-veAkaBHPYgVd3iwvnH/A2upYX4T/qXXNRcaysbRQvNI="; }; buildInputs = [ @@ -36,6 +37,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # assertion failure + # E assert ff:ff:ff:ff:ff:ff:ff:ff is None + "test_startup_api_mode_config_fails" + ]; + meta = with lib; { description = "A library which communicates with XBee radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-xbee"; From 987296a1e174a8ad615b91a06d426efa015ba74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:15:39 +0200 Subject: [PATCH 0514/1062] python3Packages.wasmer*: package entire wasmer-compiler family --- .../python-modules/wasmer/default.nix | 116 +++++++++++++----- .../python-modules/wasmer/tests.nix | 25 ++++ pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 112 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/wasmer/tests.nix diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index d3881032af13..dff14d15b901 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -1,45 +1,99 @@ -{ lib -, stdenv +{ stdenv +, lib , rustPlatform +, callPackage , fetchFromGitHub , buildPythonPackage , libiconv +, llvm_11 +, libffi +, libxml2 +, ncurses +, zlib }: -buildPythonPackage rec { - pname = "wasmer"; - version = "1.0.0"; +let + common = + { pname + , buildAndTestSubdir + , cargoHash + , extraNativeBuildInputs ? [ ] + , extraBuildInputs ? [ ] + }: buildPythonPackage rec { + inherit pname; + version = "1.0.0"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "wasmerio"; - repo = "wasmer-python"; - rev = version; - hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; + + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wasmer-python"; + rev = version; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = cargoHash; + }; + + nativeBuildInputs = (with rustPlatform; [ cargoSetupHook maturinBuildHook ]) + ++ extraNativeBuildInputs; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] + ++ extraBuildInputs; + + inherit buildAndTestSubdir; + + postInstall = lib.optionalString (pname == "wasmer") '' + mkdir $testsout + cp -R tests $testsout/tests + ''; + + # check in passthru.tests.pytest because all packages are required to run the tests + doCheck = false; + + passthru.tests = lib.optionalAttrs (pname == "wasmer") { + pytest = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "${lib.replaceStrings ["-"] ["_"] pname}" ]; + + meta = with lib; { + description = "Python extension to run WebAssembly binaries"; + homepage = "https://github.com/wasmerio/wasmer-python"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + }; +in +rec { + wasmer = common { + pname = "wasmer"; + buildAndTestSubdir = "packages/api"; + cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; + wasmer-compiler-cranelift = common { + pname = "wasmer-compiler-cranelift"; + buildAndTestSubdir = "packages/compiler-cranelift"; + cargoHash = "sha256-cHgAUwqnbQV3E5nUYGYQ48ntbIFfq4JXfU5IrSFZ3zI="; }; - format = "pyproject"; + wasmer-compiler-llvm = common { + pname = "wasmer-compiler-llvm"; + buildAndTestSubdir = "packages/compiler-llvm"; + cargoHash = "sha256-Jm22CC5S3pN/vdVvsGZdvtoAgPzWVLto8wavSJdxY3A="; + extraNativeBuildInputs = [ llvm_11 ]; + extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; + }; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - - buildAndTestSubdir = "packages/api"; - - doCheck = false; - - pythonImportsCheck = [ "wasmer" ]; - - meta = with lib; { - description = "Python extension to run WebAssembly binaries"; - homepage = "https://github.com/wasmerio/wasmer-python"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + wasmer-compiler-singlepass = common { + pname = "wasmer-compiler-singlepass"; + buildAndTestSubdir = "packages/compiler-singlepass"; + cargoHash = "sha256-lmqEo3+jYoN+4EEYphcoE4b84jdFcvYVycjrJ956Bh8="; }; } diff --git a/pkgs/development/python-modules/wasmer/tests.nix b/pkgs/development/python-modules/wasmer/tests.nix new file mode 100644 index 000000000000..bdb3adfe93ce --- /dev/null +++ b/pkgs/development/python-modules/wasmer/tests.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, wasmer +, pytestCheckHook +, wasmer-compiler-cranelift +, wasmer-compiler-llvm +, wasmer-compiler-singlepass +}: + +buildPythonPackage rec { + pname = "wasmer-tests"; + inherit (wasmer) version; + + src = wasmer.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytestCheckHook + wasmer + wasmer-compiler-cranelift + wasmer-compiler-llvm + wasmer-compiler-singlepass + ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df1af88fa513..642976c383a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9311,7 +9311,8 @@ in { wasm = callPackage ../development/python-modules/wasm { }; - wasmer = callPackage ../development/python-modules/wasmer { }; + wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { }); + inherit (self.wasmerPackages) wasmer wasmer-compiler-cranelift wasmer-compiler-llvm wasmer-compiler-singlepass; watchdog = callPackage ../development/python-modules/watchdog { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; From fc43f9d78b9b7792327c18514f9da93bde3c1382 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 15:46:56 +0200 Subject: [PATCH 0515/1062] python3Packages.starlette: 0.14.2 -> 0.16.0 --- .../python-modules/starlette/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 3079b60564f1..e8c130692125 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -4,6 +4,8 @@ , fetchFromGitHub , isPy27 , aiofiles +, anyio +, contextlib2 , graphene , itsdangerous , jinja2 @@ -12,22 +14,24 @@ , requests , aiosqlite , databases -, pytestCheckHook , pytest-asyncio +, pytestCheckHook +, pythonOlder +, trio , typing-extensions , ApplicationServices }: buildPythonPackage rec { pname = "starlette"; - version = "0.14.2"; - disabled = isPy27; + version = "0.16.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0fz28czvwiww693ig9vwdja59xxs7m0yp1df32ms1hzr99666bia"; + sha256 = "sha256-/NYhRRZdi6I7CtLCohAqK4prsSUayOxa6sBKIJhPv+w="; }; postPatch = '' @@ -37,19 +41,27 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiofiles + anyio graphene itsdangerous jinja2 python-multipart pyyaml requests - ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ] ++ lib.optionals (pythonOlder "3.7") [ + contextlib2 + ] ++ lib.optional stdenv.isDarwin [ + ApplicationServices + ]; checkInputs = [ aiosqlite databases pytest-asyncio pytestCheckHook + trio typing-extensions ]; @@ -57,8 +69,12 @@ buildPythonPackage rec { # fails to import graphql, but integrated graphql support is about to # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. "tests/test_graphql.py" - # contextfunction was removed in Jinja 3.1 - "tests/test_templates.py" + ]; + + disabledTests = [ + # asserts fail due to inclusion of br in Accept-Encoding + "test_websocket_headers" + "test_request_headers" ]; pythonImportsCheck = [ "starlette" ]; From 8e6c0720634f7034072b9632604d47da4dcb7ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:44:49 +0200 Subject: [PATCH 0516/1062] python39Packages.fastapi: format, disable failing test --- .../development/python-modules/fastapi/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 62aedf1f2117..f068c4cb735e 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -55,8 +55,18 @@ buildPythonPackage rec { # ignoring deprecation warnings to avoid test failure from # tests/test_tutorial/test_testing/test_tutorial001.py - pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" "-W ignore::DeprecationWarning"]; - disabledTests = [ "test_get_custom_response" ]; + pytestFlagsArray = [ + "--ignore=tests/test_default_response_class.py" + "-W ignore::DeprecationWarning" + ]; + + disabledTests = [ + "test_get_custom_response" + + # Failed: DID NOT RAISE + "test_websocket_invalid_data" + "test_websocket_no_credentials" + ]; meta = with lib; { homepage = "https://github.com/tiangolo/fastapi"; From b444da8872ceb87940d97e3bc8dd44ed2e490308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:45:18 +0200 Subject: [PATCH 0517/1062] python39Packages.keyring: disable failing test --- pkgs/development/python-modules/keyring/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 522c836f4357..cf765c06d869 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { disabledTests = lib.optionals (stdenv.isDarwin) [ "test_multiprocess_get" "test_multiprocess_get_after_native_get" + ] ++ [ + # E ValueError: too many values to unpack (expected 1) + "test_entry_point" ]; disabledTestPaths = [ From 896ebb7e2abc4066c25b3fe0ea31e41520d711ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:45:30 +0200 Subject: [PATCH 0518/1062] python39Packages.plotly: update meta, add tenacity hard depedency, removed no longer mentioned optional depedencies --- pkgs/development/python-modules/plotly/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index aef078143b07..8db9466e0fb2 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -1,12 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, decorator -, nbformat , pytz , requests -, retrying , six +, tenacity }: buildPythonPackage rec { @@ -19,20 +17,19 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - decorator - nbformat pytz requests - retrying six + tenacity ]; # No tests in archive doCheck = false; - meta = { + meta = with lib; { description = "Python plotting library for collaborative, interactive, publication-quality graphs"; homepage = "https://plot.ly/python/"; - license = with lib.licenses; [ mit ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ]; }; } From 3e0ed53776e15f022564c2eb4c52f0dbad99aa1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:45:53 +0200 Subject: [PATCH 0519/1062] wapiti: disable failing test --- pkgs/tools/security/wapiti/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index cd89d4039e5f..38ba47a51223 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -104,6 +104,8 @@ python3.pkgs.buildPythonApplication rec { # Requires a PHP installation "test_timesql" "test_cookies" + # E TypeError: Expected bytes or bytes-like object got: + "test_persister_upload" ]; pythonImportsCheck = [ "wapitiCore" ]; From 22f892b69a9419185e01e56dc9edb2425b9e7e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 17:18:37 +0200 Subject: [PATCH 0520/1062] python39Packages.sanic-testing: loose httpx constraint --- .../python-modules/sanic-testing/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index b59781e5c459..5e7deb51362e 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -19,6 +19,13 @@ buildPythonPackage rec { sha256 = "1pf619cd3dckn3d8gh18vbn7dflvb0mzpf6frx4y950x2j3rdplk"; }; + postPatch = '' + # https://github.com/sanic-org/sanic-testing/issues/19 + substituteInPlace setup.py \ + --replace '"websockets==8.1",' '"websockets>=9.1",' \ + --replace "httpx==0.18.*" "httpx" + ''; + propagatedBuildInputs = [ httpx sanic @@ -30,12 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/sanic-org/sanic-testing/issues/19 - substituteInPlace setup.py \ - --replace '"websockets==8.1",' '"websockets>=9.1",' - ''; - # `sanic` is explicitly set to null when building `sanic` itself # to prevent infinite recursion. In that case we skip running # the package at all. From 5940aa3c8b3789ecb15b86af9d5682d453aa8b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 17:18:48 +0200 Subject: [PATCH 0521/1062] python39Packages.slowapi: disable failing tests --- pkgs/development/python-modules/slowapi/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix index 921a191d5fa1..a1e54a6c5f93 100644 --- a/pkgs/development/python-modules/slowapi/default.nix +++ b/pkgs/development/python-modules/slowapi/default.nix @@ -43,6 +43,12 @@ buildPythonPackage rec { starlette ]; + disabledTests = [ + # E AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. + "test_endpoint_request_param_invalid" + "test_endpoint_response_param_invalid" + ]; + patches = [ # Switch to poetry-core, https://github.com/laurentS/slowapi/pull/54 (fetchpatch { From 1321eff0e5f70d27cf32c17d0088ad4b5fc78c01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 21:04:16 +0200 Subject: [PATCH 0522/1062] python3Packages.botocore: 1.20.97 -> 1.20.106 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index d05c2decf497..fc275edcc9de 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.106"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; + sha256 = "sha256-bVyYOAix0AQ39W0MCEEr2C2fgBL9t35VX5cneh/U1d8="; }; propagatedBuildInputs = [ From fa61f06216c366c6cba9634069c3bff74e234625 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 21:09:40 +0200 Subject: [PATCH 0523/1062] python3Packages.boto3: 1.17.97 -> 1.17.106 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index c8b8210f6503..07a79a6a886b 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.106"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; + sha256 = "sha256-wHQDeLkTylP1/A26kemadSxaMK57WKDF5U4+KmjfJsU="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From a9a4b5ff358dc1927670a6d5c2df784381ee4f8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 21:14:29 +0200 Subject: [PATCH 0524/1062] awscli: 1.19.97 -> 1.19.106 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 0d0d2ec80ffe..556539eddd2b 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.97"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.106"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-kecuyQMk4GWH9G0/f4Gi/hWtW4Zme9Q4i7XclcZTlNc="; + sha256 = "sha256-6o24GUcT3efgK5+Wa7n4+EeA5qXmAGhybzed7ybdT9Q="; }; # https://github.com/aws/aws-cli/issues/4837 From b956ecd1848cf40ad1a5ff2c455cc661bb251a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 21:39:43 +0200 Subject: [PATCH 0525/1062] platformio: pin ajsonrpc dependency --- pkgs/development/embedded/platformio/core.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index a3dcbdd35fdf..169ff4cd5a86 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -1,5 +1,6 @@ { stdenv, lib, python3 , fetchFromGitHub +, fetchPypi , git , spdx-license-list-data , version, src @@ -20,6 +21,15 @@ let doCheck = false; }); + ajsonrpc = super.ajsonrpc.overridePythonAttrs (oldAttrs: rec { + pname = "ajsonrpc"; + version = "1.1.0"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-CgHCtW0gxZho7ZavvEaODNc+KbFW4sAsHtM2Xk5Cuaw="; + }; + }); + click = super.click.overridePythonAttrs (oldAttrs: rec { version = "7.1.2"; src = oldAttrs.src.override { @@ -28,6 +38,18 @@ let }; }); + starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { + pname = "starlette"; + version = "0.14.2"; + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "sha256-Ki5jTEr5w6CrGK6F60E9uvdUlGx8pxdHMpxHvj9D4js="; + }; + doCheck = false; + }); + uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { version = "0.13.2"; src = fetchFromGitHub { From 0a04c1047364cde26467543671f001cedf80cbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 21:40:54 +0200 Subject: [PATCH 0526/1062] maturin: 0.10.6 -> 0.11.3 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 5ab47c8aa8de..9e7e39f3b721 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.10.6"; + version = "0.11.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-qWDrdS1zxe5woQSKLHhDSGJ1KF4SHk1mhaQApJXCCO4="; + hash = "sha256-jWkrjFQg0EqM+e/IT2n2E4lGL2kT/Wz7r5BLlzvWSO0="; }; - cargoHash = "sha256-NEXgb7yWQkqbbofd3oYQ5n+CmfaM2cWj8HwufrcRKkc="; + cargoHash = "sha256-+kXwMGeE2HD59EU0Dzvg8I6LcHiPV7SKSFqnCTfkKwY="; nativeBuildInputs = [ pkg-config ]; From 548accbcfdd76c57650c0075f240358a380bd4c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 22:39:59 +0200 Subject: [PATCH 0527/1062] python3Packages.pylitterbot: 2021.8.0 -> 2021.8.1 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 08924d515732..a305a8309a93 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.8.0"; + version = "2021.8.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-Z7/j5ZZd8cOJhY/GfKUcDSJZvmU/TR/KDK60j1eYsik="; + sha256 = "sha256-ULaybf2uV8lY9J9EHlszbnLWZJ0QO7y6BQxvdQX+nMU="; }; propagatedBuildInputs = [ From b258054501ef7b9151b76c64d669a7b17c1ea032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 Aug 2021 03:06:59 +0200 Subject: [PATCH 0528/1062] python39Packages.bellows: disable failing tests --- pkgs/development/python-modules/bellows/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e52e07627dbb..a95bf6054fd8 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -46,10 +46,9 @@ buildPythonPackage rec { ]; disabledTests = [ - # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited - #"test_remigrate_forcibly_downgraded_v4" - # RuntimeError: Event loop is closed - "test_thread_already_stopped" + # AssertionError: assert 65534 is None + # https://github.com/zigpy/bellows/issues/436 + "test_startup_nwk_params" ]; pythonImportsCheck = [ From c12c51062d35379a5c2c600a133b547ea6a02407 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 03:48:01 +0200 Subject: [PATCH 0529/1062] python2Packages.decorator: reinit at 4.4.2 --- .../python-modules/decorator/4.nix | 21 +++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/decorator/4.nix diff --git a/pkgs/development/python-modules/decorator/4.nix b/pkgs/development/python-modules/decorator/4.nix new file mode 100644 index 000000000000..8e8fd28f0b54 --- /dev/null +++ b/pkgs/development/python-modules/decorator/4.nix @@ -0,0 +1,21 @@ +{ 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 de4e68c02475..57e6987e6703 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -82,6 +82,8 @@ with self; with super; { dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { }; + decorator = callPackage ../development/python-modules/decorator/4.nix { }; + deskcon = callPackage ../development/python-modules/deskcon { }; django_evolution = callPackage ../development/python-modules/django_evolution { }; From 4da257c02604e26f172c96ff2869e9b426ab1324 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 03:50:05 +0200 Subject: [PATCH 0530/1062] home-assistant: relax httpx, requests constraints --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7bf04b65c723..3a9f7c7480d0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -172,7 +172,9 @@ in with py.pkgs; buildPythonApplication rec { --replace "awesomeversion==21.4.0" "awesomeversion" \ --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ + --replace "httpx==0.18.2" "httpx>=0.18.2" \ --replace "pip>=8.0.3,<20.3" "pip" \ + --replace "requests==2.25.1" "requests>=2.25.1" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; From 90daf7e879cef0b98ceabf86c87784b4677fe538 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 27 Aug 2021 22:53:47 -0700 Subject: [PATCH 0531/1062] python3Packages.azure-mgmt-iothubprovisioningservices: fix build --- .../azure-mgmt-iothubprovisioningservices/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index f8a48243571b..fe1d5096cd34 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -6,6 +6,7 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: @@ -23,6 +24,7 @@ buildPythonPackage rec { msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From c80e8a28425a42ad7e2ee1b2e0db38d64a9dae77 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 27 Aug 2021 22:53:59 -0700 Subject: [PATCH 0532/1062] azure-cli: fix build --- pkgs/tools/admin/azure-cli/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 2cde5a1da579..1cae7c1cc1fb 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -87,6 +87,7 @@ let postPatch = '' substituteInPlace setup.py \ --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ + --replace "requests~=2.25.1" "requests~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; @@ -98,7 +99,7 @@ let PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \ --ignore=azure/cli/core/tests/test_profile.py \ --ignore=azure/cli/core/tests/test_generic_update.py \ - -k 'not metadata_url' + -k 'not metadata_url and not test_send_raw_requests' ''; pythonImportsCheck = [ @@ -157,7 +158,7 @@ let "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs="; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "1.0.0" "zip" - "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rza"; + "sha256-q4cQjA1c4n2AWDtL+tlmrQcEncvA6awoxkqmu9rmTiI="; azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.12.0" "zip" "sha256-mrw1Gs3LMOPFiL5mSSrm+g1/dxihplA6ItYHbwljJbM="; @@ -201,6 +202,9 @@ let azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.0.0" "zip" "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "0.2.0" "zip" + "sha256-jDes/Rwzq6hF8uAwLvcmbK0xy6UDzJkKSGhGWay3uR0="; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip" "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; From adf63efaf8b4f10db05809006440f151fdaac9eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 18:47:01 +0200 Subject: [PATCH 0533/1062] python3Packages.immutabledict: 2.1.0 -> 2.2.0 --- .../python-modules/immutabledict/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 54fef8720ca5..b45b852f85fc 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -7,22 +7,16 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - sha256 = "1n71154nfb6vr41iv00xcwkxmwnn1vwzbr3s23bjvlhvmnjb48a8"; + sha256 = "sha256-Jf7ad3ImPfEvCBrUZ1NVXMCBqwLmd0hwpKfe9rVsehc="; }; - # https://github.com/corenting/immutabledict/issues/56 - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; - nativeBuildInputs = [ poetry-core ]; From fd41b892b1442076f1189ded16b26151d5fdda0f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 22:33:29 +0200 Subject: [PATCH 0534/1062] python3Packages.pykka: fix build, tests and refactor Tests were not available in the PyPi package anymore. --- .../python-modules/pykka/default.nix | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index f219375f93ef..dfd84fe066d0 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -1,21 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-mock }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pytest-mock +}: buildPythonPackage rec { - pname = "Pykka"; + pname = "pykka"; version = "3.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "da59f77bc6a70e01996259da806d09b0dbc00dabe874ca9558fd5eb1698709c9"; + src = fetchFromGitHub { + owner = "jodal"; + repo = pname; + rev = "v${version}"; + sha256 = "1h3brgm8y4a9s991y0drkp0vvmxix9f2b49f9w6ibhkhr37gc0lh"; }; - checkInputs = [ pytestCheckHook pytest-mock ]; + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; meta = with lib; { homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst"; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; license = licenses.asl20; }; } From fb8d837711a8315364b4577e0c8237e069769f8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 29 Aug 2021 16:43:10 +0200 Subject: [PATCH 0535/1062] python3Packages.ipykernel: add missing deps and split off tests The package now requires debugpy and the tests require ipyparallel. The latter causes an infinite recursion, which is why I split out the tests into `passthru.tests.pytest`. There is not dedicated tests output, because the tests require relative imports. --- .../python-modules/ipykernel/default.nix | 47 +++++---------- .../python-modules/ipykernel/tests.nix | 57 +++++++++++++++++++ 2 files changed, 72 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/ipykernel/tests.nix diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index db87d371e3f2..a34af6eca28f 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -1,15 +1,14 @@ { lib , stdenv , buildPythonPackage +, callPackage , fetchPypi -, flaky +, debugpy , ipython , jupyter_client -, traitlets , tornado +, traitlets , pythonOlder -, pytestCheckHook -, nose }: buildPythonPackage rec { @@ -21,36 +20,20 @@ buildPythonPackage rec { sha256 = "4439459f171d77f35b7f7e72dace5d7c2dd10a5c9e2c22b173ad9048fbfe7656"; }; - propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; + propagatedBuildInputs = [ + debugpy + ipython + jupyter_client + tornado + traitlets + ]; - checkInputs = [ pytestCheckHook nose flaky ]; - dontUseSetuptoolsCheck = true; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTests = lib.optionals stdenv.isDarwin ([ - # see https://github.com/NixOS/nixpkgs/issues/76197 - "test_subprocess_print" - "test_subprocess_error" - "test_ipython_start_kernel_no_userns" + # check in passthru.tests.pytest to escape infinite recursion with ipyparallel + doCheck = false; - # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" - ] ++ lib.optionals (pythonOlder "3.8") [ - # flaky test https://github.com/ipython/ipykernel/issues/485 - "test_shutdown" - - # test regression https://github.com/ipython/ipykernel/issues/486 - "test_sys_path_profile_dir" - "test_save_history" - "test_help_output" - "test_write_kernel_spec" - "test_ipython_start_kernel_userns" - "ZMQDisplayPublisherTests" - ]); - - # Some of the tests use localhost networking. - __darwinAllowLocalNetworking = true; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = { description = "IPython Kernel for Jupyter"; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix new file mode 100644 index 000000000000..9375dbc2bfdc --- /dev/null +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, flaky +, ipykernel +, ipyparallel +, nose +, pytestCheckHook + +}: + +buildPythonPackage rec { + pname = "ipykernel-tests"; + inherit (ipykernel) version; + + src = ipykernel.src; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + flaky + ipykernel + ipyparallel + nose + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = lib.optionals stdenv.isDarwin ([ + # see https://github.com/NixOS/nixpkgs/issues/76197 + "test_subprocess_print" + "test_subprocess_error" + "test_ipython_start_kernel_no_userns" + + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" + ] ++ lib.optionals (pythonOlder "3.8") [ + # flaky test https://github.com/ipython/ipykernel/issues/485 + "test_shutdown" + + # test regression https://github.com/ipython/ipykernel/issues/486 + "test_sys_path_profile_dir" + "test_save_history" + "test_help_output" + "test_write_kernel_spec" + "test_ipython_start_kernel_userns" + "ZMQDisplayPublisherTests" + ]); + + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; +} From 5bc89d6e89945343a74fede93d41727a6db3645f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 29 Aug 2021 20:50:08 +0200 Subject: [PATCH 0536/1062] python39Packages.fastdiff: mark broken on 32bit --- pkgs/development/python-modules/fastdiff/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index 6d37e6884b69..a790f1623817 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: +{ stdenv, lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: buildPythonPackage rec { pname = "fastdiff"; @@ -27,5 +27,7 @@ buildPythonPackage rec { homepage = "https://github.com/syrusakbary/fastdiff"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + # resulting compiled object panics at import + broken = stdenv.is32bit; }; } From 59a013b6eadd4cbf1d8b09bea2638d1633fd8aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 29 Aug 2021 20:50:23 +0200 Subject: [PATCH 0537/1062] platformio: remove 32bit packages to unbreak --- pkgs/development/embedded/platformio/chrootenv.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 72384c0994a2..138e7186624a 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -23,7 +23,8 @@ in buildFHSUserEnv { name = "platformio"; targetPkgs = pio-pkgs; - multiPkgs = pio-pkgs; + # disabled temporarily because fastdiff no longer support 32bit + # multiPkgs = pio-pkgs; meta = with lib; { description = "An open source ecosystem for IoT development"; From a90a30a23eadbbe0b335955137c87e668debd9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 29 Aug 2021 22:07:44 +0200 Subject: [PATCH 0538/1062] python39Packages.xdis: 5.0.10 -> 5.0.11 --- pkgs/development/python-modules/xdis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index aec8b13a122c..81b8e146d9bb 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "5.0.10"; + version = "5.0.11"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "sha256-/3qyMgliua7W4Va1HdRbHyiR/eBQzHK+GrZVAMvMhLA="; + sha256 = "sha256-KTPu0+bERLRCVESqJgBPtcftlniWl2+C9GDcf84ssiA="; }; checkInputs = [ pytest ]; From 359d8035f39ab5c6928b9958f5da5fe47803083e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 29 Aug 2021 22:32:19 +0200 Subject: [PATCH 0539/1062] python39Packages.debugpy: throw on unsupported system this fixes failures for example in nixpkgs-review on aarch64-linux --- pkgs/development/python-modules/debugpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 35ac416d5992..0bdfe35514d4 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; - }.${stdenv.hostPlatform.system}} + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; checkInputs = [ From f0292c3c25fb0bd53508e3b1b3451ff9e58e85d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:18:44 +0200 Subject: [PATCH 0540/1062] python39Packages.sphinxcontrib-tikz: replace patch by substituteInPlace to prevent apply errors --- .../sphinxcontrib-tikz/binary-paths.patch | 22 ------------------- .../sphinxcontrib-tikz/default.nix | 11 +++++----- 2 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch deleted file mode 100644 index 847a6e076918..000000000000 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sphinxcontrib/tikz.py b/sphinxcontrib/tikz.py -index ee21113..a4f4589 100644 ---- a/sphinxcontrib/tikz.py -+++ b/sphinxcontrib/tikz.py -@@ -242,7 +242,7 @@ def render_tikz(self, node, libs='', stringsubst=False): - tf.write(latex) - tf.close() - -- system([self.builder.config.latex_engine, '--interaction=nonstopmode', -+ system(['@texLive@/bin/pdflatex', '--interaction=nonstopmode', - 'tikz-%s.tex' % shasum], - self.builder) - -@@ -281,7 +281,7 @@ def render_tikz(self, node, libs='', stringsubst=False): - '-sOutputFile=%s' % outfn, '-r' + resolution + 'x' + resolution, - '-f', 'tikz-%s.pdf' % shasum], self.builder) - elif self.builder.config.tikz_proc_suite == "pdf2svg": -- system(['pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) -+ system(['@pdf2svg@/bin/pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) - else: - self.builder._tikz_warned = True - raise TikzExtError('Error (tikz extension): Invalid configuration ' diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 7409791efc45..cc5412fe42ff 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -16,12 +16,11 @@ buildPythonPackage rec { sha256 = "1614a45c960b80009dd42f96689122c9c0781018a0c5ec5828f4cdc5e35b11ad"; }; - patches = [ - (substituteAll { - src = ./binary-paths.patch; - inherit texLive pdf2svg; - }) - ]; + postPatch = '' + substituteInPlace sphinxcontrib/tikz.py \ + --replace "config.latex_engine" "${texLive}/bin/pdflatex" \ + --replace "system(['pdf2svg'" "system(['${pdf2svg}/bin/pdf2svg'" + ''; propagatedBuildInputs = [ sphinx ]; From 254299509951ac9b84d998072797354498fbd5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:49:39 +0200 Subject: [PATCH 0541/1062] python39Packages.zodb: remove outdated disabled --- .../python-modules/zodb/default.nix | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index aa7cc6c97ebd..e4f1e403cd97 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -2,7 +2,6 @@ , fetchPypi , buildPythonPackage , python -, pythonAtLeast , zope_testrunner , transaction , six @@ -16,46 +15,43 @@ }: buildPythonPackage rec { - pname = "ZODB"; - version = "5.6.0"; + pname = "ZODB"; + version = "5.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; + }; - # remove broken test - postPatch = '' - rm -vf src/ZODB/tests/testdocumentation.py - ''; + # remove broken test + postPatch = '' + rm -vf src/ZODB/tests/testdocumentation.py + ''; - # ZConfig 3.5.0 is not compatible with Python 3.8 - disabled = pythonAtLeast "3.8"; + propagatedBuildInputs = [ + transaction + six + zope_interface + zodbpickle + zconfig + persistent + zc_lockfile + BTrees + ]; - propagatedBuildInputs = [ - transaction - six - zope_interface - zodbpickle - zconfig - persistent - zc_lockfile - BTrees - ]; + checkInputs = [ + manuel + zope_testrunner + ]; - checkInputs = [ - manuel - zope_testrunner - ]; + checkPhase = '' + ${python.interpreter} -m zope.testrunner --test-path=src [] + ''; - checkPhase = '' - ${python.interpreter} -m zope.testrunner --test-path=src [] - ''; - - meta = with lib; { - description = "Zope Object Database: object database and persistence"; - homepage = "https://pypi.python.org/pypi/ZODB"; - license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; - }; + meta = with lib; { + description = "Zope Object Database: object database and persistence"; + homepage = "https://pypi.python.org/pypi/ZODB"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; } From 6768268c210e6cccc0b76741a521415f0b489649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:50:03 +0200 Subject: [PATCH 0542/1062] vulnix: disable python3Packages overwrite --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d2fe13c1249..64b516fcfba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14712,9 +14712,7 @@ with pkgs; vultr-cli = callPackage ../development/tools/vultr-cli { }; - vulnix = callPackage ../tools/security/vulnix { - python3Packages = python37Packages; - }; + vulnix = callPackage ../tools/security/vulnix { }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; From ca8a59801edd1e46035a8ad0692ad43010b4b674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:52:38 +0200 Subject: [PATCH 0543/1062] python39Packages.zconfig: 3.5.0 -> 3.6.0 --- .../python-modules/zconfig/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index a6a00ad821b8..521bca4ece8c 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -1,32 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchPypi -, fetchpatch , buildPythonPackage , zope_testrunner , manuel , docutils -, pythonAtLeast +, pygments }: buildPythonPackage rec { pname = "ZConfig"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550"; + sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU="; }; - patches = [ - # fixes 3.8+ logger validation issues, has been merged into master, remove next bump - (fetchpatch { - url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch"; - sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij"; - }) - ] ++ lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; + checkInputs = [ pygments ]; meta = with lib; { description = "Structured Configuration Library"; From 490c55a2703fa92f59fa4f8b53dcc4218d36f20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:58:51 +0200 Subject: [PATCH 0544/1062] top-level: use python3Packages instead of python37Packages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64b516fcfba3..4984ce6f4cf1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3593,7 +3593,7 @@ with pkgs; bud = callPackage ../tools/networking/bud { }; - bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; + bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; bumpver = callPackage ../applications/version-management/bumpver { }; From 912f0cd749331204915c9136a327c1507b5f332d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:59:11 +0200 Subject: [PATCH 0545/1062] variety: use python3Packages instead of python37Packages --- pkgs/applications/misc/variety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 9b40c4c44f1f..948719aae762 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, python37Packages +, python3Packages , fehSupport ? false, feh , imagemagickSupport ? true, imagemagick , intltool @@ -13,7 +13,7 @@ , makeWrapper }: -with python37Packages; +with python3Packages; buildPythonApplication rec { pname = "variety"; From 4432f11bd397e94b765fbb57b0ccd45d124f20e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:59:43 +0200 Subject: [PATCH 0546/1062] boxfort: use python3Packages instead of python37Packages --- pkgs/development/libraries/boxfort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 740e43216984..93176fb230f1 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, python3Packages }: stdenv.mkDerivation rec { version = "unstable-2019-10-09"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs ci/isdir.py ''; - checkInputs = with python37Packages; [ cram ]; + checkInputs = with python3Packages; [ cram ]; doCheck = true; From 95dd42567425e01f851df875bc02f1f8e3d54b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 01:00:01 +0200 Subject: [PATCH 0547/1062] criterion: use python3Packages instead of python37Packages --- pkgs/development/libraries/criterion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index ba436fec0a26..a1e7137d92ab 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext -, dyncall , nanomsg, python37Packages }: +, dyncall , nanomsg, python3Packages }: stdenv.mkDerivation rec { version = "2.3.3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nanomsg ]; - checkInputs = with python37Packages; [ cram ]; + checkInputs = with python3Packages; [ cram ]; cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; From af122f692921a8da56f46574cb5d2e1ffec0ff36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 01:00:25 +0200 Subject: [PATCH 0548/1062] appgate-sdp: use python3Packages instead of python37Packages --- pkgs/applications/networking/appgate-sdp/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index e894572dd78c..397c64141ac9 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -32,8 +32,7 @@ , openssl , pango , procps -, python37 -, python37Packages +, python3 , stdenv , systemd , xdg-utils @@ -101,8 +100,8 @@ stdenv.mkDerivation rec { dontBuild = true; buildInputs = [ - python37 - python37Packages.dbus-python + python3 + python3.pkgs.dbus-python ]; nativeBuildInputs = [ From 4c79661bb20f3abfb2c10875a140b59d0b3ac495 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 01:22:38 +0200 Subject: [PATCH 0549/1062] plover.dev: 4.0.0.dev8 -> 4.0.0.dev10 Also unpins the aging python36Packages. --- pkgs/applications/misc/plover/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index ac4811b30c41..68721c846f74 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python27Packages, python36Packages, wmctrl, +{ lib, fetchurl, python27Packages, python3Packages, wmctrl, qtbase, mkDerivationWith }: { @@ -24,9 +24,9 @@ ]; }; - dev = with python36Packages; mkDerivationWith buildPythonPackage rec { + dev = with python3Packages; mkDerivationWith buildPythonPackage rec { pname = "plover"; - version = "4.0.0.dev8"; + version = "4.0.0.dev10"; meta = with lib; { description = "OpenSteno Plover stenography software"; @@ -36,7 +36,7 @@ src = fetchurl { url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp"; + sha256 = "sha256-Eun+ZgmOIjYw6FS/2OGoBvYh52U/Ue0+NtIqrvV2Tqc="; }; # I'm not sure why we don't find PyQt5 here but there's a similar From 6d8b7d40e7f1966481e2137401cb65ae6760f06e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 14:23:24 +0200 Subject: [PATCH 0550/1062] python3Packages.mocket: relax decorator constraint Disables a failing test case, because of the relaxed constraint. The geoip2 package, the only consumer of this package, does not exhibit any problems resulting from this change. --- pkgs/development/python-modules/mocket/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 73a3b07a64c3..ff400c6ed20b 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "decorator>=4.0.0,<5" "decorator>=4.0.0,<6" + ''; + propagatedBuildInputs = [ decorator http-parser @@ -54,6 +59,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # incompatible with decorator>=5 + "test_patch" # tests that require network access (like DNS lookups) "test_truesendall" "test_truesendall_with_chunk_recording" From 348bd6d1f8a7b08be344d95b14398e943442a81c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 14:47:24 +0200 Subject: [PATCH 0551/1062] python3Packages.geoalchemy2: fix build, enable tests, refactor --- .../python-modules/geoalchemy2/default.nix | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 94b27d6f1270..077523bdb482 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,31 +1,53 @@ { lib , buildPythonPackage , fetchPypi -, sqlalchemy -, shapely +, packaging , setuptools-scm -, pytest +, shapely +, sqlalchemy +, psycopg2 +, pytestCheckHook }: buildPythonPackage rec { pname = "GeoAlchemy2"; version = "0.9.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "b0e56d4a945bdc0f8fa9edd50ecc912889ea68e0e3558a19160dcb0d5b1b65fc"; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ sqlalchemy shapely ]; + nativeBuildInputs = [ + setuptools-scm + ]; - # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst - doCheck = false; + propagatedBuildInputs = [ + packaging + shapely + sqlalchemy + ]; + + checkInputs = [ + psycopg2 + pytestCheckHook + ]; + + disabledTestPaths = [ + # tests require live postgis database + "tests/gallery/test_decipher_raster.py" + "tests/gallery/test_length_at_insert.py" + "tests/gallery/test_summarystatsagg.py" + "tests/gallery/test_type_decorator.py" + "tests/test_functional.py" + ]; meta = with lib; { + description = "Toolkit for working with spatial databases"; homepage = "http://geoalchemy.org/"; license = licenses.mit; - description = "Toolkit for working with spatial databases"; + maintainers = with maintainers; [ ]; }; } From 70abdfac1e1ece07fec84c43bd397b18b38e2a83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 16:09:41 +0200 Subject: [PATCH 0552/1062] python3Packages.pytest-doctestplus: disable failing tests, update deps --- .../pytest-doctestplus/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 34bf587fa533..8cd73f483fa8 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,18 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, six +, pythonOlder +, packaging , pytest , pytestCheckHook -, numpy , setuptools-scm }: buildPythonPackage rec { pname = "pytest-doctestplus"; version = "0.10.1"; - disabled = isPy27; # abandoned upstream + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -22,19 +21,30 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ - six - numpy + packaging ]; checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # ERROR: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...] + # __main__.py: error: unrecognized arguments: --remote-data + "test_remote_data_url" + "test_remote_data_float_cmp" + "test_remote_data_ignore_whitespace" + "test_remote_data_ellipsis" + "test_remote_data_requires" + "test_remote_data_ignore_warnings" + ]; + meta = with lib; { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; From 297f3c6d2187f3b754fa3aea5e156e6c1a9bd126 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 30 Aug 2021 17:14:52 +0100 Subject: [PATCH 0553/1062] python3Packages.pyosmium: add requests dependency --- pkgs/development/python-modules/pyosmium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 161fa9d24dc1..bd6b5d701dda 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, cmake, python , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, nose, shapely, pythonOlder, isPyPy, lz4 }: +, nose, shapely, pythonOlder, isPyPy, lz4, requests }: buildPythonPackage rec { pname = "pyosmium"; @@ -17,6 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; + propagatedBuildInputs = [ requests ]; preBuild = "cd .."; From 35f4817c7a91222556693d84c834389fce3f7efd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0554/1062] python3Packages.alembic: 1.6.5 -> 1.7.1 --- .../python-modules/alembic/default.nix | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 9c7244b3c066..af8b1fc37215 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,26 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, pytest-cov, mock, coverage, setuptools -, Mako, sqlalchemy, python-editor, python-dateutil +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, Mako +, python-dateutil +, sqlalchemy +, importlib-metadata +, importlib-resources +, pytest-xdist +, pytestCheckHook + }: buildPythonPackage rec { pname = "alembic"; - version = "1.6.5"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; + sha256 = "aea964d3dcc9c205b8759e4e9c1c3935ea3afeee259bffd7ed8414f8085140fb"; }; - buildInputs = [ pytest pytest-cov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; + propagatedBuildInputs = [ + Mako + python-dateutil + sqlalchemy + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; - # no traditional test suite - doCheck = false; + pythonImportsCheck = [ + "alembic" + ]; + + checkInputs = [ + pytestCheckHook + pytest-xdist + ]; + + pytestFlagsArray = [ + "--numprocesses" "auto" + ]; meta = with lib; { homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From cec333d6bdae42863954422340c6496630061908 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0555/1062] python3Packages.astroid: 2.7.2 -> 2.7.3 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 3b23ee2438ec..a4694663bb6b 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.7.2"; # Check whether the version is compatible with pylint + version = "2.7.3"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1vlibff93z9fvkniviwzizsfffw1j0ywkh4rragnlps797143iv4"; + sha256 = "08qxw58cdyglkni6ahyil4cmnb48zz0wr4v05gzqk4r5ifs4gl2m"; }; SETUPTOOLS_SCM_PRETEND_VERSION=version; From 8886d7b8abb377abd98c16f685986611669fb809 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0556/1062] python3Packages.casbin: 1.5.0 -> 1.7.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 0cadf449ea88..47a6a48eaca7 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.5.0"; + version = "1.7.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0sxv9kyzi7kzpljv1mrglz5szfxmqjmmnbcdn8mr0vwx3xibjb9j"; + sha256 = "1qwns8ph8w5bb26hzkk1dadm2bjq74g65wm6g971llb5jdq9a8z9"; }; propagatedBuildInputs = [ From 9e230736f891730f841b52447e84c142620eb12b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0557/1062] python3Packages.cfn-lint: 0.53.0 -> 0.53.1 --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index d8e0af78e1cd..6f6d55502958 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.53.0"; + version = "0.53.1"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "sha256-UHcbbBoByoxW7+AUxu5mQmcvC3irHPQvBv4CbBXPTNo="; + sha256 = "1wj2pzrrmrdf3mkhnz1qx41rshvfpgwlrxrb80d63r098pnq6df8"; }; postPatch = '' From b8f162a26c557a59d915545e89566addb183dfbc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0558/1062] python3Packages.chart-studio: 5.2.2 -> 5.3.0 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index a373246d49f7..9d8c6ecb84d5 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.2.2"; + version = "5.3.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "14msi6i2caca5riirfv81nskh8w3avnflyr2phm62kygk125h1v7"; + sha256 = "059rq278r5zb2sngby7jzh8kd9c48sd82b6b7s5bbrmzj42sds3n"; }; sourceRoot = "source/packages/python/chart-studio"; From 14dbe64e1daae754e8eef534c3263fdbb5f230fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0559/1062] python3Packages.commoncode: 21.7.23 -> 21.8.27 --- pkgs/development/python-modules/commoncode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 7c9528c06e52..e7dfb65e7946 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,11 +14,11 @@ }: buildPythonPackage rec { pname = "commoncode"; - version = "21.7.23"; + version = "21.8.27"; src = fetchPypi { inherit pname version; - sha256 = "38511dcd7c518bf7fec4944c78e1118304f2f2582a7e6792cc5773aebe95a086"; + sha256 = "789ee1798cd74ab4516d2e547473d69717d3b2ed7ee180ab2746e0bdfd0d88a4"; }; dontConfigure = true; From b56df2817c9c32e35ad4b7e320da8d8602e4377c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0560/1062] python3Packages.django-environ: 0.4.5 -> 0.5.0 --- pkgs/development/python-modules/django_environ/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index 3f01a2b294a1..6baaf58e7d09 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.4.5"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "6c9d87660142608f63ec7d5ce5564c49b603ea8ff25da595fd6098f6dc82afde"; + sha256 = "a8726675c1ebefa4706b36398c4d3c5c790d335ffe55c4a10378f6bfd57ad8d0"; }; # The testsuite fails to modify the base environment From f0de7a5bbffc843ca900478d5591c846e1c2122e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0561/1062] python3Packages.dpkt: 1.9.7.1 -> 1.9.7.2 --- pkgs/development/python-modules/dpkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index 74817e60cbcf..a1036e099ea8 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.7.1"; + version = "1.9.7.2"; src = fetchPypi { inherit pname version; - sha256 = "74899d557ec4e337db29cecc80548b23a1205384d30ee407397cfb9ab178e3d4"; + sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b"; }; # Project has no tests From 7aaf79baa93c8b0e0e16a05c18b880b340503c6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0562/1062] python3Packages.flexmock: 0.10.7 -> 0.10.8 --- pkgs/development/python-modules/flexmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 5c561b93f6d9..a5382c04b006 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.10.7"; + version = "0.10.8"; src = fetchPypi { inherit pname version; - sha256 = "0abedcc894a817452ae3902e8e00f0a8d2c66497f63caaaab03cbd464ea63d04"; + sha256 = "6820031c39b298646194a3f0b2b693322bb7f44b39dbaf1c54b0ae68b3d768fa"; }; checkInputs = [ pytest ]; From 078b98a190377c7864c74a1c10ab3834c728b5c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0563/1062] python3Packages.google-cloud-bigquery-datatransfer: 3.3.1 -> 3.3.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 f6a62c544cf4..62956e1e46de 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.3.1"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oCktt8wAYKewz6Ga4mIGVy0IWonXTqQvaO5MT4MkHMY="; + sha256 = "fcb71ebe5c5b232d24fe7d666b65709e4fc8db43263c8182e5ed8e5a52abefec"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 44cfd7aebf7806d9d48a608e2500e242e4d60122 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0564/1062] python3Packages.google-cloud-firestore: 2.3.0 -> 2.3.1 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 8c4b964b2b83..00276d581761 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8="; + sha256 = "8f8e513cae105ba17c4d3949091bd816cbf6075c6ac91b1f7acb4d40359f8a5a"; }; propagatedBuildInputs = [ From 9e8e5a749f1a80e91671214179a07169bbf0a7a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0565/1062] python3Packages.google-cloud-kms: 2.5.0 -> 2.6.0 --- 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 9992dc7bc76f..98c4fc55044d 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.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OuvpnIJeG+O+2Teopq8FYJOHIyi1V3RdlmJEq/fFSxM="; + sha256 = "44be4673ad0a327ea6447967216e124fcd4c7487ca886f000446f6db209988af"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From 6ea6d83dc0506f782aca33f0b6fdc74f3c001d7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0566/1062] python3Packages.google-cloud-monitoring: 2.4.2 -> 2.5.0 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index c2a08fd7bee5..9a5469d9891a 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PQjTAqSzjCBPH58nZHAc6Oa12NSDVvt2E0ZHewTFZfY="; + sha256 = "d3d436fab7f50f69bdd47655871ac923e4dcbaf8538808bbe31cf0a3cbdf3514"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From b4b04e86e6220274feb50f2ab956c9491187048d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0567/1062] python3Packages.google-cloud-os-config: 1.3.2 -> 1.4.0 --- .../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 d86a40d57b6a..33bbb00c306e 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.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sC80RGY4lDVebpoz2hDGH5WfyrAjaOKTSDp/BhGmZS0="; + sha256 = "d12622901fb2ef5b736606fd00e77900105944c35d737ff794a59fd9a3d71325"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 93981740bbfdae1ab8e6f48bbfb747778ce678b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0568/1062] python3Packages.google-cloud-spanner: 3.8.0 -> 3.9.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index c6e1021f3430..e84e7cc06dbf 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ="; + sha256 = "53fe3d903363fb17db155fd05f5356d9b310a519fbebd53903aa426a31cad706"; }; propagatedBuildInputs = [ From 6ad336c64ff6f456cbc47eb2b2a96f160cb40890 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0569/1062] python3Packages.google-cloud-speech: 2.7.0 -> 2.8.0 --- .../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 80f53182843b..7c414cc1321f 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "3c2d533a524d35c036d0387e8b2e0c7ce6aa7cdaa80392ec7fe68bce6cd2f152"; + sha256 = "3750fd988082b880ed1ec6f3d59c4f29f4cd0df3804a58d6c151d4bf15d3a597"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From ee887e0e57836689572acb38237652a2ebec14e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0570/1062] python3Packages.google-cloud-testutils: 1.0.0 -> 1.1.0 --- .../python-modules/google-cloud-testutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 05a66406ce02..2c208511ee3f 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2RaRhRvgnmr/trjAE+RBlVO5AZ54YEFcoRwcPCKCTKs="; + sha256 = "3d79051b6ca170c2a4f159bf56ac3f66c1e5360486121e72c06fdaa3911154bf"; }; propagatedBuildInputs = [ click google-auth six ]; From 338fd2ef50d64978ea736da6dd8c105e8c4cf2e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0571/1062] python3Packages.google-cloud-translate: 3.3.2 -> 3.4.0 --- .../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 f750e7bd54ef..697489602daf 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.3.2"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XkHNIu7KWPUpgBceIBqzWgYPCay+Ud1/nM0KbeRnHk0="; + sha256 = "7da158734db646867deb125c144a7a1692a48a134692c4dc54ba420f89db64ae"; }; propagatedBuildInputs = [ From 0bb7a56c499bf54f5f306355d515b40b295b7f89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0572/1062] python3Packages.google-crc32c: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/google-crc32c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index b36635654a9d..41b23321af98 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "google-crc32c"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "058g69yp7x41mv0d84yp31jv64fpm4r25b86rvvqgc6n74w6jj7k"; + sha256 = "1m2hafyfagvyabizr4fhcp2s2s3x56k006fhvl1qzk994qjhyzqk"; }; buildInputs = [ crc32c ]; From a1022a9b8a8e1685b3c3d0002903af4df9a5e752 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0573/1062] python3Packages.gradient: 1.7.2 -> 1.7.4 --- pkgs/development/python-modules/gradient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 4303101ed929..7e47faadc0e2 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.7.2"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "108dc01d2f9f9d4fa2c080d12f14b77b4ec6329f239a0b2bc89e09360ae6757d"; + sha256 = "de1d33672f13d4de37a66ba9aebfd503a098d0ca26e5eb8b071e1c0dacd557ea"; }; postPatch = '' From cba907a450e7104e972eddd567d58f93924dfbe8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0574/1062] python3Packages.hypothesis: 6.15.0 -> 6.17.3 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index bc832f5f1ad5..4d0a1713d954 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.15.0"; + version = "6.17.3"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "0kjnd593wz90gbjwzn4gc9514w4pxg77hpisp9v6m7bj1w7a7x5q"; + sha256 = "1g96q3l97lq3xps36cv147dvj44nh1b0k67z817x7zfwyw844sgn"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From 2171b094483b2e53177f20d51783505fc12d29c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0575/1062] python3Packages.ipykernel: 6.2.0 -> 6.3.0 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index a34af6eca28f..041818900978 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.2.0"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - sha256 = "4439459f171d77f35b7f7e72dace5d7c2dd10a5c9e2c22b173ad9048fbfe7656"; + sha256 = "5314690a638f893e2cc3bf3d25042920e9fbb873f7d8263033390264caeb95f4"; }; propagatedBuildInputs = [ From 88116155e1859c64cabd433fb03fe4e2515caf8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0576/1062] python3Packages.ipython: 7.26.0 -> 7.27.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index f03db08bc49b..548ba874cd70 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.26.0"; + version = "7.27.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e"; + sha256 = "58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13"; }; prePatch = lib.optionalString stdenv.isDarwin '' From a9d6d92362205e9f1a1f2bff82102df01d402f15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0577/1062] python3Packages.jupyter_client: 7.0.1 -> 7.0.2 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 35faf676f378..e30b3cb63a71 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.0.1"; + version = "7.0.2"; src = fetchPypi { inherit pname version; - sha256 = "48822a93d9d75daa5fde235c35cf7a92fc979384735962501d4eb60b197fb43a"; + sha256 = "0c6cabd07e003a2e9692394bf1ae794188ad17d2e250ed747232d7a473aa772c"; }; propagatedBuildInputs = [ From 120e7818a4dcef2a842d7d2ace32812fd916208a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0578/1062] python3Packages.kiwisolver: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/kiwisolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 2b157494f919..e5649c58e465 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"; + sha256 = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; From 7437fb5fd3a9ff6789abd17362c07bc88b7e97f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0579/1062] python3Packages.labelbox: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 97417b663652..5f8057df849d 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.1.0"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "V${version}"; - sha256 = "0hqjwilz1d5jidgsambr2zrp4czy53rq01p2ib6mndzsdh86nv7w"; + sha256 = "0vp1lk7hipa4ixa1zcy99r9b5xb1gv54h4i0izx6fv4zf9m0gmw1"; }; propagatedBuildInputs = [ From 7802005d5ba3212054f0df5720d4f42962f12d6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0580/1062] python3Packages.mautrix: 0.10.5 -> 0.10.6 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index f0005eef61bf..1b8bcb293892 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.10.5"; + version = "0.10.6"; src = fetchPypi { inherit pname version; - sha256 = "b7d52d72a9739963b6d39d5e58ef367c00490a90cf7795f23c8b2e2c140c8882"; + sha256 = "2738370469f8ce27efc37aa6e17319a4149246c9a0da822c8d81d948f0c7e1a7"; }; propagatedBuildInputs = [ From 05821cb951d5d3602e8ff06863733316fb62fa6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0581/1062] python3Packages.minidump: 0.0.18 -> 0.0.19 --- pkgs/development/python-modules/minidump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix index 6c00ad650bb5..589b7e351c1e 100644 --- a/pkgs/development/python-modules/minidump/default.nix +++ b/pkgs/development/python-modules/minidump/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.18"; + version = "0.0.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uf4KZc9C1gWRgHu4ttk1fpL2pG8oUb79uvCIlHItB/8="; + sha256 = "67b3327cb96e319633653a353c6281703772335dc84797d6fdce7daf0b3be077"; }; # Upstream doesn't have tests From 0a8548061b091cd2dd6e0ed4d535c2544edcaaa2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0582/1062] python3Packages.mne-python: 0.23.2 -> 0.23.3 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 2f97cac131ec..912c2c52ea8e 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.23.2"; + version = "0.23.3"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "1y6xypfzq7a3ffzwlbqspyzvijr6ihgfzgvhajs16d74pxhdkg74"; + sha256 = "1pil4vy4grg49i5xcrqmi43vf40lk5p4sbj5bl0fjixkklavwmhj"; }; propagatedBuildInputs = [ numpy scipy ]; From 50d63af050034655c184fbb804ce15d67606581c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0583/1062] python3Packages.plaid-python: 8.0.0 -> 8.1.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 72b507a470b4..b864dedecfe7 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "8.0.0"; + version = "8.1.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "ce11a832e04889972809b257e0351e4cc70fd3b5d31de2b97cc9df732a3dcc9b"; + sha256 = "b1f7b5b58ba3c171bb795352119d54797c8c50877bc376d26cd756de2453e9fd"; }; checkInputs = [ pytest ]; From 40cc8a430dda56da0c5440d0dea19d4761b41a2d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0584/1062] python3Packages.plotly: 5.2.2 -> 5.3.0 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 8db9466e0fb2..4b849dd016b8 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.2.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "809f0674a7991daaf4f287964d617d24e9fa44463acd5a5352ebd874cfd98b07"; + sha256 = "b6dc306c56e7d5fa7d017718894099b27290b427abf4acad8e5b77fdc3bd32ec"; }; propagatedBuildInputs = [ From a3cb2b20dd9d212981a3ca804a2c556490106370 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0585/1062] python3Packages.prettytable: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/prettytable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 23702f8e8cfb..5b3253b31b39 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0"; + sha256 = "bd81678c108e6c73d4f1e47cd4283de301faaa6ff6220bcd1d4022038c56b416"; }; nativeBuildInputs = [ setuptools-scm ]; From 0295502aae4364b3f226ede7211ccb04e5dfdbc0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0586/1062] python3Packages.py3status: 3.38 -> 3.39 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index c8d5068e4e73..e027aaeb294b 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.38"; + version = "3.39"; src = fetchPypi { inherit pname version; - sha256 = "5660163a91590f320685263a738ab910c7a86346d9c85a68639a19ab83433ce6"; + sha256 = "d2a11dde0cc82d0eb5e938fe624f223d852ed848c57299ff562827bc4557375f"; }; doCheck = false; From f3aa36276f2335f5b91d57533916be94267cb32d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0587/1062] python3Packages.pyfaidx: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/pyfaidx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index c179688a8a5b..317691066f47 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "fae5d2264f62f40e6f37090422a764197de610df36afb5ae827b167d34b8621a"; + sha256 = "d1258f8d053cba0c90fe329254e8ec59eb28b535b48d9d06e8c7f1d74b8e4531"; }; propagatedBuildInputs = [ six ]; From 590ffa1f3ceb94fc822df8bf9665d0ce74a1e4b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0588/1062] python3Packages.pyfakefs: 4.5.0 -> 4.5.1 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index ab4c2f360760..217e552aa0e1 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.0"; + version = "4.5.1"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "58b017b3437bbe97803a23755876c6d6aeb5aea37e52cec15e5d86b59c4c7295"; + sha256 = "002a065dcbf59c2caa039e4fc4ba01d1d636aa63ee9c794d4c9fc01f0e2d6dc0"; }; postPatch = '' From 5995e32fe178c2d92738c08042fb447a7ebb5e86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0589/1062] python3Packages.pytest: 6.2.4 -> 6.2.5 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index d5b1d14937a0..f2438622f6a6 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "6.2.4"; + version = "6.2.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"; + sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"; }; postPatch = '' From dece89c35505defd1c38e1132282f8d4fa9dc44b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0590/1062] python3Packages.python-gitlab: 2.10.0 -> 2.10.1 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 831ae6e39668..a5c40533c169 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.10.0"; + version = "2.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N2s+mCOBzsc0RxxQKz2ixueFio300DyZNJnmp1k5UOY="; + sha256 = "7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f"; }; propagatedBuildInputs = [ From a0e4988ee4c38b401cf04b168817a7cc7d84de55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:10 +0200 Subject: [PATCH 0591/1062] python3Packages.pytube: 11.0.0 -> 11.0.1 --- pkgs/development/python-modules/pytube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index c71043b71b2a..bd5b9e374f16 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "11.0.0"; + version = "11.0.1"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "1n5zl1x1izyzbrsgf76lk1av6h5m6a69plmhrcjynl880dji2na9"; + sha256 = "04s4hganb6x0dlfyyg9gjah5z0vxd7bxzqwgvd28hqnf0iwc2byb"; }; checkInputs = [ From 19fb3ce87db55f21ca02d7e839508dc74528f576 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:10 +0200 Subject: [PATCH 0592/1062] python3Packages.qcelemental: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/qcelemental/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index b6e0684a2d48..57b50f820f7d 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.21.0"; + version = "0.22.0"; checkInputs = [ pytest-runner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { inherit pname version; - sha256 = "1b3c78fxbpnddrm1fnbvv4x2840jcfjg2l5cb5w4p38vzksiv238"; + sha256 = "1d7fc613fbe30189cfa970a863a5955865b1116ff651d20325c721b6f0ef1f52"; }; doCheck = true; From 77fcc55eb64a0d64e7f0f8eef91b656ed6e94313 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:10 +0200 Subject: [PATCH 0593/1062] python3Packages.regex: 2021.8.21 -> 2021.8.28 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index dbb86f25a031..92ce64d186db 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2021.8.21"; + version = "2021.8.28"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+vCLA0GCj2opuPfdlNXPjMfDm/w+Z7eFFMVLSUtmkVo="; + sha256 = "f585cbbeecb35f35609edccb95efd95a3e35824cd7752b586503f7e6087303f1"; }; # Sources for different Python releases are located in same folder From 32c0c646a2835b4733d2ddce3e7ecdb83b1490eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:10 +0200 Subject: [PATCH 0594/1062] python3Packages.rich: 10.7.0 -> 10.9.0 --- pkgs/development/python-modules/rich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 323bd8ba8685..6c953a4579ea 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.7.0"; + version = "10.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "1drh08cmcn8dqi0mpfwscz3ljsv2s60kyhxy6iiw5si7rf717j4p"; + sha256 = "0lf2s7n9b31aavwl5xjl3x1pjc756s8pbk0whh5kag80z5v6qc32"; }; nativeBuildInputs = [ poetry-core ]; From ba72a3eb0c1f0e07dcc158bc98cdd58fe1939a0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0595/1062] python3Packages.ROPGadget: 6.5 -> 6.6 --- pkgs/development/python-modules/ROPGadget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index 8c34e75139f6..6be0ed48e289 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "6.5"; + version = "6.6"; src = fetchPypi { inherit pname version; - sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c"; + sha256 = "dc61186e0114ec67ec7ce374df8fd2ddc2a7cba129a1242338e900a7483fba22"; }; propagatedBuildInputs = [ capstone ]; From d99d8db0488ab3e6c4ba49d1a362fe8348076e0a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0596/1062] python3Packages.ruamel.yaml: 0.17.14 -> 0.17.16 --- pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index f424310bfa74..efd418e454d4 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.17.14"; + version = "0.17.16"; src = fetchPypi { inherit pname version; - sha256 = "4185fcfa9e037fea9ffd0bb6172354a03ec98c21e462355d72e068c74e493512"; + sha256 = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33"; }; # Tests use relative paths From 5bf25e4c759ef9ffe1c52543815296c82efa8a7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0597/1062] python3Packages.sagemaker: 2.56.0 -> 2.57.0 --- 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 0dae21c7f0e1..23fa728a78a0 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.56.0"; + version = "2.57.0"; src = fetchPypi { inherit pname version; - sha256 = "049699dce6a5c5bab9cd9597985d8a722cb1495ef8af63553cd988c5cce58a1d"; + sha256 = "b03b340fe54f91b0533d3ce19d5b7fdf403da21b5befab70a9915466e48f6e75"; }; pythonImportsCheck = [ From 1bc0202f6b346a123af92af522f43c2684695a28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0598/1062] python3Packages.smart-open: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/smart-open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 5e86281642af..bbe8b1b468ee 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "5.2.0"; + version = "5.2.1"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "v${version}"; - sha256 = "sha256-eC9BYHeACzGp382QBNgLcNMYDkHi0WXyEj/Re9ShXuA="; + sha256 = "13a1qsb4vwrhx45hz4qcl0d7bgv20ai5vsy7cq0q6qbj212nff19"; }; propagatedBuildInputs = [ From d72453c0f9d0d8a6c502fe42a94e96002147566a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0599/1062] python3Packages.snowflake-connector-python: 2.5.1 -> 2.6.0 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0b0c961e7d09..81d939db66be 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.5.1"; + version = "2.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8af2a51ac890d9e0ffe0cd509ba83198076e2564fb8fdc63c6814b773e70b33a"; + sha256 = "0198d9c1934540ae9c7276d98f1048f3432160613d9d0e49398112bb21b0f0bb"; }; propagatedBuildInputs = [ From a014e90bb528c0c1c15087c84c166d16d8fc877f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0600/1062] python3Packages.sparse: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/sparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index d958fd2ed703..c081ab5e3a1e 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.12.0"; + version = "0.13.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2c95c3b8ee00211a5aa4ef5e46006d25bf35009a66e406b7ea9b25b327fb9516"; + sha256 = "685dc994aa770ee1b23f2d5392819c8429f27958771f8dceb2c4fb80210d5915"; }; propagatedBuildInputs = [ From 0d47a3cc411a2ee72ab1937b4492eb19e2bc6b78 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0601/1062] python3Packages.traitlets: 5.0.5 -> 5.1.0 --- pkgs/development/python-modules/traitlets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 3bc05897af66..23412d0a6940 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.0.5"; + version = "5.1.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396"; + sha256 = "bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d"; }; checkInputs = [ glibcLocales pytest mock ]; From 609818fc53ebcb9b0ca67f1888138558972a52b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0602/1062] python3Packages.typing_extensions: 3.10.0.0 -> 3.10.0.2 --- pkgs/development/python-modules/typing-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index fd8a25a485b9..939ca25eb1a3 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.10.0.0"; + version = "3.10.0.2"; src = fetchPypi { inherit pname version; - sha256 = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342"; + sha256 = "49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; From 439b0c2307a6d7d993a5796e5dde0f0d14817a9c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0603/1062] python3Packages.vispy: 0.8.0 -> 0.8.1 --- .../python-modules/vispy/default.nix | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index e29729a702ef..9ebbfcd77e87 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -1,15 +1,26 @@ -{ lib, buildPythonPackage, substituteAll, stdenv, - fetchPypi, numpy, cython, freetype-py, fontconfig, libGL, - setuptools-scm, setuptools-scm-git-archive - }: +{ lib +, stdenv +, buildPythonPackage +, substituteAll +, fetchPypi +, cython +, fontconfig +, freetype-py +, hsluv +, kiwisolver +, libGL +, numpy +, setuptools-scm +, setuptools-scm-git-archive +}: buildPythonPackage rec { pname = "vispy"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "89533514ffe05b16dca142a0ca455a96d14de209a1620615b1d251fa28d54b9b"; + sha256 = "6e482e68487f5384205d349f288580d6287fd690df4cdc3ad4c573afc39990f1"; }; patches = [ @@ -21,15 +32,37 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython setuptools-scm setuptools-scm-git-archive + cython + setuptools-scm + setuptools-scm-git-archive + ]; + + buildInputs = [ + libGL ]; propagatedBuildInputs = [ - numpy freetype-py fontconfig libGL + fontconfig + freetype-py + hsluv + kiwisolver + numpy ]; doCheck = false; # otherwise runs OSX code on linux. - pythonImportsCheck = [ "vispy" ]; + + pythonImportsCheck = [ + "vispy" + "vispy.color" + "vispy.geometry" + "vispy.gloo" + "vispy.glsl" + "vispy.io" + "vispy.plot" + "vispy.scene" + "vispy.util" + "vispy.visuals" + ]; meta = with lib; { homepage = "https://vispy.org/index.html"; From e55857b39ba15fb1653faf93e976b27fd0f6030e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0604/1062] python3Packages.zarr: 2.9.3 -> 2.9.4 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 3bcfaece12a6..a26fa1dfef3c 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.9.3"; + version = "2.9.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "274d2c1642fab6b4ddd4e465df3cdd456a5f821ed9a425a075436b1d2110bf36"; + sha256 = "5544c47bc2a35f8e8af58bee92378518018b484ba550e997759d18f40fa75719"; }; nativeBuildInputs = [ From 0b70f984b458b239079f462872bcd5ce52327904 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:29:30 +0200 Subject: [PATCH 0605/1062] python3Packages.pydeconz: 82 -> 83 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index fb0852e2bf11..07fe662f6ec0 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "82"; + version = "83"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-DdZ6bf+2rMjgjm5aRxcSRI/hN0zfP7uV8PaM40c9IJo="; + sha256 = "0azpdgmfby8plsp22hy1ip9vzbnmvf9brmah7hcwkpypg31rb61y"; }; propagatedBuildInputs = [ From 2eb3efdba20d5057463583e8a4a53741c65a71a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:29:31 +0200 Subject: [PATCH 0606/1062] python3Packages.pyTelegramBotAPI: 3.8.3 -> 4.0.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 58d1d0c694a7..f53038b2e1f6 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.8.3"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "afdd887fff42a963f13d09a1f4f5fd24aef08f4b8a594f2ac11e0a29022f1518"; + sha256 = "6accc4af505ee5b312689eaee1a9bc93cb6ea31a2d905a877c6b47f0888c3dcc"; }; propagatedBuildInputs = [ requests ]; From c36f3a1ec4f1786234438ae127f283e79834bd5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 03:11:19 +0200 Subject: [PATCH 0607/1062] python3Packages.freetype-py: enable tests --- .../python-modules/freetype-py/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index b0035e838447..13e033e8bc36 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools-scm, freetype }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, setuptools-scm +, freetype +, pytestCheckHook +}: buildPythonPackage rec { pname = "freetype-py"; @@ -20,6 +28,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ freetype ]; + preCheck = '' + cd tests + ''; + + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "freetype" ]; meta = with lib; { From d0673cf5e6c43a03d61a068b60c52cc7ef23cc7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 14:16:38 +0200 Subject: [PATCH 0608/1062] python3Packages.mocket: 3.9.42 -> 3.9.44 --- pkgs/development/python-modules/mocket/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index ff400c6ed20b..f8ff484046bb 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,19 +19,14 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.42"; + version = "3.9.44"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah"; + sha256 = "sha256-oeDYzhSzUXxtYhcLjXAmsi1v9vY5qCE/U9YOYxdQxrg="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "decorator>=4.0.0,<5" "decorator>=4.0.0,<6" - ''; - propagatedBuildInputs = [ decorator http-parser @@ -59,8 +54,6 @@ buildPythonPackage rec { ]; disabledTests = [ - # incompatible with decorator>=5 - "test_patch" # tests that require network access (like DNS lookups) "test_truesendall" "test_truesendall_with_chunk_recording" From 7eee03c355ce4751b15657216bb8ef1ddb5203eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 16:21:11 +0200 Subject: [PATCH 0609/1062] kupfer: no longer use python36Packages --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4984ce6f4cf1..a55bc6d3f19c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25229,11 +25229,7 @@ with pkgs; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; - kupfer = callPackage ../applications/misc/kupfer { - # using python36 as there appears to be a waf issue with python37 - # see https://github.com/NixOS/nixpkgs/issues/60498 - python3Packages = python36Packages; - }; + kupfer = callPackage ../applications/misc/kupfer { }; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; From 825752cefa70d922a6cb297f43381faf37451cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 18:15:37 +0200 Subject: [PATCH 0610/1062] python39Packages.canonicaljson: execute tests with pytestCheckHook, disable failing test --- .../python-modules/canonicaljson/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 4a4f56f5abf5..ca64d599534e 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, frozendict, simplejson, six, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, frozendict +, simplejson +, six +, isPy27 +, pytestCheckHook }: buildPythonPackage rec { @@ -13,7 +19,15 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - frozendict simplejson six + frozendict + simplejson + six + ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_frozen_dict" ]; meta = with lib; { From 5269d2bca524f772e02012ab46b5c1aa425a44d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 18:27:13 +0200 Subject: [PATCH 0611/1062] python39Packages.ibm-cloud-sdk-core: disable failing tests, remove linting and not required checkInputs --- .../ibm-cloud-sdk-core/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 51e4008ae512..cc7572499da1 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -1,11 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, codecov , pyjwt -, pylint , pytestCheckHook -, pytest-cov , python-dateutil , requests , responses @@ -21,23 +18,20 @@ buildPythonPackage rec { sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; }; - checkInputs = [ - codecov - pylint - pytestCheckHook - pytest-cov - responses - tox - ]; - propagatedBuildInputs = [ pyjwt python-dateutil requests ]; - # Various tests try to access credential files which are not included with the source distribution + checkInputs = [ + pytestCheckHook + responses + tox + ]; + disabledTests = [ + # Various tests try to access credential files which are not included with the source distribution "test_configure_service" "test_cp4d_authenticator" "test_cwd" @@ -49,6 +43,12 @@ buildPythonPackage rec { "test_iam" "test_read_external_sources_2" "test_retry_config_external" + # assertion error due to requests brotli support + "test_http_client" + ]; + + disabledTestPaths = [ + "test/test_container_token_manager.py" ]; meta = with lib; { From c57856a0bbe96d660083eb2792c769e11074dfbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 19:02:47 +0200 Subject: [PATCH 0612/1062] python39Packages.dateutils: init at 0.6.12 --- .../python-modules/dateutils/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/dateutils/default.nix diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix new file mode 100644 index 000000000000..faa3b1155483 --- /dev/null +++ b/pkgs/development/python-modules/dateutils/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytz }: + +buildPythonPackage rec { + pname = "dateutils"; + version = "0.6.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E="; + }; + + propagatedBuildInputs = [ + python-dateutil + pytz + ]; + + pythonImportsCheck = [ "dateutils" ]; + + meta = with lib; { + description = "Utilities for working with datetime objects."; + homepage = "https://github.com/jmcantrell/python-dateutils"; + license = licenses.bsd0; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 642976c383a1..0230a00f1362 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1858,6 +1858,8 @@ in { dateparser = callPackage ../development/python-modules/dateparser { }; + dateutils = callPackage ../development/python-modules/dateutils { }; + datrie = callPackage ../development/python-modules/datrie { }; dawg-python = callPackage ../development/python-modules/dawg-python { }; From 5693f495c5fb016f7b4685f44302ee365cfee2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 20:14:46 +0200 Subject: [PATCH 0613/1062] python39Packages.rdflib-jsonld: mark broken --- pkgs/development/python-modules/rdflib-jsonld/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/rdflib-jsonld/default.nix b/pkgs/development/python-modules/rdflib-jsonld/default.nix index 6e038dd33433..9a0b02c329f7 100644 --- a/pkgs/development/python-modules/rdflib-jsonld/default.nix +++ b/pkgs/development/python-modules/rdflib-jsonld/default.nix @@ -17,5 +17,7 @@ buildPythonPackage rec { license = licenses.bsdOriginal; description = "rdflib extension adding JSON-LD parser and serializer"; maintainers = [ maintainers.koslambrou ]; + # incomptiable with rdflib 6.0.0, half of the test suite fails with import and atrribute errors + broken = true; }; } From 19bad30a3536051977016a1893ace75fa984026b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 20:20:53 +0200 Subject: [PATCH 0614/1062] python39Packages.python-lsp-server: disable failing test after pylint update, format, move postPatch after src --- .../python-lsp-server/default.nix | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 5d13a50a11fd..60215fa0b4cd 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -45,6 +45,12 @@ buildPythonPackage rec { sha256 = "sha256-TyXKlXeXMyq+bQq9ngDm0SuW+rAhDlOVlC3mDI1THwk="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp --cov test" "" + ''; + propagatedBuildInputs = [ jedi pluggy @@ -52,14 +58,14 @@ buildPythonPackage rec { setuptools ujson ] ++ lib.optional withAutopep8 autopep8 - ++ lib.optional withFlake8 flake8 - ++ lib.optional withMccabe mccabe - ++ lib.optional withPycodestyle pycodestyle - ++ lib.optional withPydocstyle pydocstyle - ++ lib.optional withPyflakes pyflakes - ++ lib.optional withPylint pylint - ++ lib.optional withRope rope - ++ lib.optional withYapf yapf; + ++ lib.optional withFlake8 flake8 + ++ lib.optional withMccabe mccabe + ++ lib.optional withPycodestyle pycodestyle + ++ lib.optional withPydocstyle pydocstyle + ++ lib.optional withPyflakes pyflakes + ++ lib.optional withPylint pylint + ++ lib.optional withRope rope + ++ lib.optional withYapf yapf; checkInputs = [ flaky @@ -70,7 +76,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; + disabledTests = [ + # pytlint output changed + "test_lint_free_pylint" + ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py" ++ lib.optional (!withRope) "test/plugins/test_completion.py" @@ -83,12 +92,6 @@ buildPythonPackage rec { ++ lib.optional (!withRope) "test/plugins/test_rope_rename.py" ++ lib.optional (!withYapf) "test/plugins/test_yapf_format.py"; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp --cov test" "" - ''; - preCheck = '' export HOME=$(mktemp -d); ''; From b869a4836c19b8119ecae294f5be3b3bb157f80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 20:21:41 +0200 Subject: [PATCH 0615/1062] python39Packages.pyocr: switch to pytestCheckHook, format, fix setuptools not finding version --- .../python-modules/pyocr/default.nix | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 099c9e237111..df20d3bb6c47 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,6 +1,16 @@ -{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools-scm, -setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll, -pytest, tox }: +{ lib +, fetchFromGitLab +, buildPythonPackage +, pillow +, setuptools-scm +, setuptools-scm-git-archive +, tesseract +, cuneiform +, isPy3k +, substituteAll +, pytestCheckHook +, tox +}: buildPythonPackage rec { pname = "pyocr"; @@ -17,20 +27,25 @@ buildPythonPackage rec { sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il"; }; - patches = [ (substituteAll { - src = ./paths.patch; - inherit cuneiform tesseract; - }) + patches = [ + (substituteAll { + src = ./paths.patch; + inherit cuneiform tesseract; + }) ]; - buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ pillow ]; - checkInputs = [ pytest tox ]; - checkPhase = "pytest"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - meta = { + buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + + propagatedBuildInputs = [ pillow ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { inherit (src.meta) homepage; description = "A Python wrapper for Tesseract and Cuneiform"; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; } From d471c5ccc0be533d83dd13a26faf452fbfe83ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 20:50:14 +0200 Subject: [PATCH 0616/1062] pylode: 2.8.6 -> 2.12.0 --- pkgs/misc/pylode/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix index 33e78bc15231..18e112346912 100644 --- a/pkgs/misc/pylode/default.nix +++ b/pkgs/misc/pylode/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pyLODE"; - version = "2.8.6"; + version = "2.12.0"; src = fetchFromGitHub { owner = "RDFLib"; repo = pname; rev = version; - sha256 = "0zbk5lj9vlg32rmvw1himlw63kxd7sim7nzglrjs5zm6vpi4x5ch"; + sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8="; }; propagatedBuildInputs = with python3Packages; [ @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { jinja2 markdown rdflib - rdflib-jsonld requests six beautifulsoup4 From 585a0c18cd033cf2e71a6e8ae18392760018552a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 22:02:13 +0200 Subject: [PATCH 0617/1062] python39Packages.moviepy: relax decorator dependency, forma, remove ? null from inputs --- .../python-modules/moviepy/default.nix | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index c3acdbe71ec2..a353816d252e 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pythonAtLeast +, pythonOlder , numpy , decorator , imageio @@ -9,44 +9,56 @@ , proglog , requests , tqdm -# Advanced image processing (triples size of output) + # Advanced image processing (triples size of output) , advancedProcessing ? false -, opencv3 ? null -, scikitimage ? null -, scikit-learn ? null -, scipy ? null -, matplotlib ? null -, youtube-dl ? null +, opencv3 +, scikitimage +, scikit-learn +, scipy +, matplotlib +, youtube-dl }: -assert advancedProcessing -> ( - opencv3 != null && scikitimage != null && scikit-learn != null - && scipy != null && matplotlib != null && youtube-dl != null); - buildPythonPackage rec { pname = "moviepy"; version = "1.0.3"; - disabled = !(pythonAtLeast "3.4"); + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0" + ''; + # No tests, require network connection doCheck = false; propagatedBuildInputs = [ - numpy decorator imageio imageio-ffmpeg tqdm requests proglog - ] ++ (lib.optionals advancedProcessing [ - opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl - ]); + numpy + decorator + imageio + imageio-ffmpeg + tqdm + requests + proglog + ] ++ lib.optionals advancedProcessing [ + opencv3 + scikitimage + scikit-learn + scipy + matplotlib + youtube-dl + ]; meta = with lib; { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From 93556239fb1bc76b4c76127a4a0aafc2c11ed7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 22:03:12 +0200 Subject: [PATCH 0618/1062] python39Packages.fiona: fix tests, format, normalise pname --- pkgs/development/python-modules/fiona/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index a71e6fbaa7e0..987a8ca6209e 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder , attrs, click, cligj, click-plugins, six, munch, enum34 , pytestCheckHook, boto3, mock, giflib, pytz -, gdal -, certifi +, gdal, certifi }: buildPythonPackage rec { - pname = "Fiona"; + pname = "fiona"; version = "1.8.20"; src = fetchPypi { - inherit pname version; + pname = "Fiona"; + inherit version; sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b"; }; @@ -42,11 +42,15 @@ buildPythonPackage rec { preCheck = '' rm -r fiona # prevent importing local fiona + # disable gdal deprecation warnings + export GDAL_ENABLE_DEPRECATED_DRIVER_GTM=YES ''; disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" + # Assert not true + "test_no_append_driver_cannot_append" ]; meta = with lib; { From 5f20bcab4ba44d142d0158fc855df9e9e9067418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 22:04:50 +0200 Subject: [PATCH 0619/1062] python39Packages.werkzeug: normalise pname --- pkgs/development/python-modules/werkzeug/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index d3dce5018d97..898fa4556ec3 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -8,15 +8,16 @@ , pytest-timeout , pytest-xprocess , pytestCheckHook - }: +}: buildPythonPackage rec { - pname = "Werkzeug"; + pname = "werkzeug"; version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "Werkzeug"; + inherit version; sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; }; From 0c68cfdec8487771a8376a1627dd765680ba5941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 22:34:15 +0200 Subject: [PATCH 0620/1062] caffe2: mark broken --- pkgs/development/libraries/science/math/caffe2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index fe9a8b671459..202903b9aa18 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -139,5 +139,9 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ yuriaisaka ]; + # fails to compile with + # error: invalid conversion from 'const char*' to 'char*' + # TODO: Remove usage of python2, protobuf overwrite + broken = true; }; } From 559ebd54671135e49c438d776879dea93bb8f958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Sep 2021 00:50:55 +0200 Subject: [PATCH 0621/1062] python39Packages.fastparquet: 0.7.0 -> 0.7.1 --- .../python-modules/fastparquet/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 756d08726c11..56fb6a53e14a 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -5,7 +5,6 @@ , numba , numpy , pandas -, pytest-runner , cramjam , fsspec , thrift @@ -14,26 +13,32 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-08hanzRnt6WuMriNNtOd+ZHycr2XBeIRav+5sgvT7Do="; + hash = "sha256-xV0AXNZSy4LSrHf11OP/+KDbeDQu8yF1ugX+W4mie1E="; }; - nativeBuildInputs = [ pytest-runner ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" \ + --replace "oldest-supported-numpy" "numpy" + ''; + propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; checkInputs = [ pytestCheckHook ]; # Workaround https://github.com/NixOS/nixpkgs/issues/123561 preCheck = '' mv fastparquet/test . - rm -rf fastparquet + rm -r fastparquet fastparquet_test="$out"/${python.sitePackages}/fastparquet/test ln -s `pwd`/test "$fastparquet_test" ''; + postCheck = '' rm "$fastparquet_test" ''; From f3e850d48cf5ad7fb5c34de9f6da0a9b0223bedf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:07:51 +0200 Subject: [PATCH 0622/1062] python3Packages.elmax: 0.1.2 -> 0.1.3 --- pkgs/development/python-modules/elmax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index 775050acb0c9..db1ff91ee0eb 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ="; + sha256 = "sha256-OiVPjWqQw1u0OL6/uYlT+FP2XDh7l3OZyVtQfycHICI="; }; nativeBuildInputs = [ poetry-core ]; From 311ae432d33816a2f7345f530b8a80e6093fa6f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:07:58 +0200 Subject: [PATCH 0623/1062] python3Packages.hstspreload: 2021.8.1 -> 2021.9.1 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 7b92aeb269df..ecdfb790ebca 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.8.1"; + version = "2021.9.1"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "0si22p461qydh874gkidiar89hrfx7lm7r7g6d1qi7lz8wlwcplv"; + sha256 = "sha256-CZlXnRe4yA6VJF48t73m2PbBRFzg0XTgT7J1N83Ojc4="; }; # tests require network connection From 0cc41a4d6fc8d530fdfd89cfbee42d2fe0044661 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:08:05 +0200 Subject: [PATCH 0624/1062] python3Packages.platformdirs: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/platformdirs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 90eb35f993a3..f49b8716211e 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "15f08czqfmxy1y947rlrsjs20jgsy2vc1wqhv4b08b3ijxj0jpqh"; + sha256 = "sha256-g2DPNN7VxK3EjOXOpSWA4a+PghZ7v2jmjw9+VQyCTBI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 56e5e74bc758d1c4160db75d113610ebb76ce69e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:41:18 +0200 Subject: [PATCH 0625/1062] python3Packages.ssdp: fix build --- .../python-modules/ssdp/default.nix | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 810106a656e8..bd73a6abaead 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,31 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub , pbr -, pytest -, isPy3k +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "ssdp"; version = "1.1.0"; - disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "d33575a7360aaead5341cc2ceaf47cc80b2309a7dd167c2ea45d5a5b00851665"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "codingjoe"; + repo = pname; + rev = version; + sha256 = "19d2b5frpq2qkfkpz173wpjk5jwhkjpk75p8q92nm8iv41nrzljy"; }; - buildInputs = [ pbr ]; - checkInputs = [ pytest ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # test suite uses new async primitives - doCheck = !isPy27; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pbr + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" \ + --replace "--cov=ssdp" "" + ''; + + pythonImportsCheck = [ "ssdp" ]; meta = with lib; { + description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)"; homepage = "https://github.com/codingjoe/ssdp"; - description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } From 167a7d9e23386c58b93bb554b83293b201082597 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:50:24 +0200 Subject: [PATCH 0626/1062] bump2version: 1.0.0 -> 1.0.1 --- .../git-and-tools/bump2version/default.nix | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 47d31d6c18f6..ffb9455bd19f 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -1,22 +1,37 @@ -{ buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, testfixtures +}: buildPythonApplication rec { pname = "bump2version"; - version = "1.0.0"; - disabled = isPy27; + version = "1.0.1"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "c4urself"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; + rev = "v${version}"; + sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; }; - checkInputs = [ pytest testfixtures ]; - # X's in pytest are git tests which won't run in sandbox - checkPhase = '' - pytest tests/ -k 'not usage_string_fork' - ''; + checkInputs = [ + pytestCheckHook + testfixtures + ]; + + disabledTests = [ + # X's in pytest are git tests which won't run in sandbox + "usage_string_fork" + "test_usage_string" + "test_defaults_in_usage_with_config" + ]; + + pythonImportsCheck = [ "bumpversion" ]; meta = with lib; { description = "Version-bump your software with a single command"; From 6256ef474fd2f37e65f807b8ba1559c3f0019267 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 14:11:09 +0200 Subject: [PATCH 0627/1062] python3Packages.cmd2: fix build --- .../python-modules/cmd2/default.nix | 79 +++++++++++-------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index f330a309ebf6..7d979d1f0216 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,21 +1,58 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k -, pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs -, contextlib2 ? null, typing ? null, setuptools-scm -, pytest, mock ? null, pytest-mock -, which, glibcLocales +{ lib +, stdenv +, attrs +, buildPythonPackage +, colorama +, fetchPypi +, glibcLocales +, importlib-metadata +, pyperclip +, pytest-mock +, pytestCheckHook +, pythonOlder +, setuptools-scm +, typing-extensions +, vim +, wcwidth }: + buildPythonPackage rec { pname = "cmd2"; version = "2.1.2"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41"; }; - LC_ALL="en_US.UTF-8"; + LC_ALL = "en_US.UTF-8"; - postPatch = lib.optionalString stdenv.isDarwin '' + buildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + colorama + pyperclip + wcwidth + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + glibcLocales + pytest-mock + vim + ]; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + '' + lib.optionalString stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste @@ -24,33 +61,9 @@ buildPythonPackage rec { export PATH=$(realpath bin):$PATH ''; - disabled = !isPy3k; - - buildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - colorama - pyperclip - six - pyparsing - wcwidth - attrs - ] - ++ lib.optionals (pythonOlder "3.5") [contextlib2 typing] - ; - - doCheck = !stdenv.isDarwin; - # pytest-cov - # argcomplete will generate errors - checkInputs= [ pytest mock which vim glibcLocales pytest-mock ] - ++ lib.optional (pythonOlder "3.6") [ mock ]; - checkPhase = '' - # test_path_completion_user_expansion might be fixed in the next release - py.test -k 'not test_path_completion_user_expansion' - ''; + + pythonImportsCheck = [ "cmd2" ]; meta = with lib; { description = "Enhancements for standard library's cmd module"; From 2198099f5cf0425860aa0babf50a8a1fd19f7193 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 14:23:18 +0200 Subject: [PATCH 0628/1062] python3Packages.dask: 2021.06.2 -> 2021.08.1 --- .../python-modules/dask/default.nix | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 208856490b86..120c98febce2 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -2,44 +2,51 @@ , stdenv , bokeh , buildPythonPackage +, cloudpickle +, distributed , fetchFromGitHub , fsspec -, pytestCheckHook -, pytest-rerunfailures -, pythonOlder -, cloudpickle +, jinja2 , numpy -, toolz -, dill +, packaging , pandas , partd +, pytest-rerunfailures , pytest-xdist +, pytestCheckHook +, pythonOlder +, pyyaml +, toolz , withExtraComplete ? false -, distributed }: buildPythonPackage rec { pname = "dask"; - version = "2021.06.2"; - disabled = pythonOlder "3.5"; + version = "2021.08.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg="; + sha256 = "sha256-HnrHOp3Y/iLYaK3KVp6NJrK68BMqX8lTl/wLosiGc7k="; }; propagatedBuildInputs = [ - bokeh cloudpickle - dill fsspec - numpy - pandas + packaging partd + pyyaml toolz - ] ++ lib.optionals withExtraComplete [ + pandas + jinja2 + bokeh + numpy + ] ++ lib.optionals (withExtraComplete) [ + # infinite recursion between distributed and dask distributed ]; @@ -63,7 +70,11 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" + # parallelize + "--numprocesses auto" + # rerun failed tests up to three times + "--reruns 3" + # don't run tests that require network access "-m 'not network'" ]; @@ -81,7 +92,16 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ]; + pythonImportsCheck = [ + "dask" + "dask.array" + "dask.bag" + "dask.bytes" + "dask.dataframe" + "dask.dataframe.io" + "dask.dataframe.tseries" + "dask.diagnostics" + ]; meta = with lib; { description = "Minimal task scheduling abstraction"; From 7655f4d2f54a8f1ab4219be6c1a991f2cbe9f0d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 14:29:39 +0200 Subject: [PATCH 0629/1062] python3Packages.acme-tiny: fix build --- .../python-modules/acme-tiny/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 7d17af3ae787..dcbb9a688f57 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, fusepy, fuse -, openssl }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, fusepy +, fuse +, openssl +}: buildPythonPackage rec { pname = "acme-tiny"; @@ -12,16 +18,18 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/monkey.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf + substituteInPlace tests/utils.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; buildInputs = [ setuptools-scm ]; + checkInputs = [ fusepy fuse ]; doCheck = false; # seems to hang, not sure + pythonImportsCheck = [ "acme_tiny" ]; + meta = with lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; homepage = "https://github.com/diafygi/acme-tiny"; From 861874099074d06b6417123ec0e2dbfb52183485 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 14:57:25 +0200 Subject: [PATCH 0630/1062] python3Packages.acoustics: fix build --- .../python-modules/acoustics/default.nix | 47 ++++++++++++++----- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 9047910a2138..e888d1241a50 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -1,32 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, numpy, scipy, matplotlib, pandas, tabulate, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, matplotlib +, numpy +, pandas +, pytestCheckHook +, pythonOlder +, scipy +, tabulate +}: buildPythonPackage rec { pname = "acoustics"; version = "0.2.4.post0"; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d"; }; - checkPhase = '' + propagatedBuildInputs = [ + matplotlib + numpy + pandas + scipy + tabulate + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' export HOME=$TMPDIR mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - - pushd tests - py.test -Wignore::DeprecationWarning ./. - popd ''; - disabled = pythonOlder "3.6"; + pytestFlagsArray = [ + "-Wignore::DeprecationWarning" + ]; + + disabledTestPaths = [ + # All tests fail with TypeError + "tests/test_aio.py" + ]; + + pythonImportsCheck = [ "acoustics" ]; meta = with lib; { - description = "A package for acousticians"; + description = "Python package for acousticians"; maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = "https://github.com/python-acoustics/python-acoustics"; From ef916c17107d2b7fd2cba1b07641e33212301298 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 15:05:46 +0200 Subject: [PATCH 0631/1062] python3Packages.asttokens: 2.0.4 -> 2.0.5 --- .../python-modules/asttokens/default.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index acd44d55e16f..251205419fe4 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,29 +1,35 @@ -{ lib, fetchPypi, fetchpatch, buildPythonPackage, - setuptools-scm, six, astroid, pytest +{ lib +, fetchPypi +, buildPythonPackage +, setuptools-scm +, six +, astroid +, pytestCheckHook }: buildPythonPackage rec { pname = "asttokens"; - version = "2.0.4"; + version = "2.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; + sha256 = "sha256-mlTBFPAsepSA1WVQkyVGo/H+cdigLxvHzNDuPuNc9NU="; }; - patches = [ - # Fixes compatibility with python 3.9, will be included in the next release - # after 2.0.4 - (fetchpatch { - url = "https://github.com/gristlabs/asttokens/commit/d8ff80ee7d2e64c5e1daf50cc38eb99663f1b1ac.patch"; - sha256 = "19y8n8vpzr2ijldbq5rh19sf0vz5azqqpkb9bx0ljjg98h6k7kjj"; - excludes = [ "setup.cfg" ]; - }) + nativeBuildInputs = [ + setuptools-scm ]; - propagatedBuildInputs = [ setuptools-scm six astroid ]; + propagatedBuildInputs = [ + six + astroid + ]; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "asttokens" ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; From 94de88463218ab629ad6842c4497ce38e34c9912 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 15:49:12 +0200 Subject: [PATCH 0632/1062] python3Packages.k5test: fix build --- .../python-modules/k5test/default.nix | 12 +-- .../python-modules/k5test/fix-paths.patch | 88 +++++++++++++------ 2 files changed, 66 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 9a9c20e6de15..0079194f4fa7 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , fetchPypi , substituteAll -, six , krb5Full , findutils , which +, pythonOlder }: buildPythonPackage rec { pname = "k5test"; version = "0.10.0"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c"; @@ -27,17 +29,15 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ - six - ]; - # No tests doCheck = false; + pythonImportsCheck = [ "k5test" ]; + meta = with lib; { description = "Library for setting up self-contained Kerberos 5 environment"; homepage = "https://github.com/pythongssapi/k5test"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch index f99835b5f2a3..dc6caf815809 100644 --- a/pkgs/development/python-modules/k5test/fix-paths.patch +++ b/pkgs/development/python-modules/k5test/fix-paths.patch @@ -45,42 +45,74 @@ index e289fac..e2f486a 100644 if options_raw: return options_raw.split('\n') diff --git a/k5test/realm.py b/k5test/realm.py -index f57946b..ad78579 100644 +index 161e5ad..9f50049 100644 --- a/k5test/realm.py +++ b/k5test/realm.py -@@ -181,19 +181,13 @@ class K5Realm(object): - return path +@@ -90,7 +90,7 @@ class K5Realm(metaclass=abc.ABCMeta): - def _init_paths(self, **paths): -- self.kdb5_util = self._discover_path('kdb5_util', -- '/usr/sbin/kdb5_util', paths) -- self.krb5kdc = self._discover_path('krb5kdc', -- '/usr/sbin/krb5kdc', paths) -- self.kadmin_local = self._discover_path('kadmin_local', -- '/usr/sbin/kadmin.local', -- paths) -- self.kprop = self._discover_path('kprop', '/usr/sbin/kprop', paths) -- self.kadmind = self._discover_path('kadmind', -- '/usr/sbin/kadmind', paths) -- -- self._kinit = self._discover_path('kinit', '/usr/bin/kinit', paths) -- self._klist = self._discover_path('klist', '/usr/bin/klist', paths) -+ self.kdb5_util = '@krb5Full@/bin/kdb5_util' -+ self.krb5kdc = '@krb5Full@/bin/krb5kdc' -+ self.kadmin_local = '@krb5Full@/bin/kadmin.local' -+ self.kprop = '@krb5Full@/bin/kprop' -+ self.kadmind = '@krb5Full@/bin/kadmind' -+ self._kinit = '@krb5Full@/bin/kinit' -+ self._klist = '@krb5Full@/bin/klist' + if provider_cls == K5Realm: + krb5_config = _discover_path('krb5-config', +- '/usr/bin/krb5-config', kwargs) ++ '@krb5Full@/bin/krb5-config', kwargs) - def _create_conf(self, profile, filename): - with open(filename, 'w') as conf_file: + try: + krb5_version = subprocess.check_output( +@@ -101,7 +101,7 @@ class K5Realm(metaclass=abc.ABCMeta): + # macOS output doesn't contain Heimdal + if 'heimdal' in krb5_version.lower() or ( + sys.platform == 'darwin' and +- krb5_config == '/usr/bin/krb5-config'): ++ krb5_config == '@krb5Full@/bin/krb5-config'): + provider_cls = HeimdalRealm + else: + provider_cls = MITRealm +@@ -434,14 +434,14 @@ class MITRealm(K5Realm): + @property + def _default_paths(self): + return [ +- ('kdb5_util', 'kdb5_util', '/usr/sbin/kdb5_util'), +- ('krb5kdc', 'krb5kdc', '/usr/sbin/kdb5kdc'), +- ('kadmin', 'kadmin', '/usr/bin/admin'), +- ('kadmin_local', 'kadmin.local', '/usr/sbin/kadmin.local'), +- ('kadmind', 'kadmind', '/usr/sbin/kadmind'), +- ('kprop', 'kprop', '/usr/sbin/kprop'), +- ('_kinit', 'kinit', '/usr/bin/kinit'), +- ('_klist', 'klist', '/usr/bin/klist'), ++ ('kdb5_util', 'kdb5_util', '@krb5Full@/bin/kdb5_util'), ++ ('krb5kdc', 'krb5kdc', '@krb5Full@/bin/kdb5kdc'), ++ ('kadmin', 'kadmin', '@krb5Full@/bin/admin'), ++ ('kadmin_local', 'kadmin.local', '@krb5Full@/bin/kadmin.local'), ++ ('kadmind', 'kadmind', '@krb5Full@/bin/kadmind'), ++ ('kprop', 'kprop', '@krb5Full@/bin/kprop'), ++ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), ++ ('_klist', 'klist', '@krb5Full@/bin/klist'), + ] + + @property +@@ -585,12 +585,12 @@ class HeimdalRealm(K5Realm): + + return [ + ('krb5kdc', 'kdc', os.path.join(base, 'kdc')), +- ('kadmin', 'kadmin', '/usr/bin/kadmin'), +- ('kadmin_local', 'kadmin', '/usr/bin/kadmin'), ++ ('kadmin', 'kadmin', '@krb5Full@/bin/kadmin'), ++ ('kadmin_local', 'kadmin', '@krb5Full@/bin/kadmin'), + ('kadmind', 'kadmind', os.path.join(base, 'kadmind')), +- ('_kinit', 'kinit', '/usr/bin/kinit'), +- ('_klist', 'klist', '/usr/bin/klist'), +- ('_ktutil', 'ktutil', '/usr/bin/ktutil'), ++ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), ++ ('_klist', 'klist', '@krb5Full@/bin/klist'), ++ ('_ktutil', 'ktutil', '@krb5Full@/bin/ktutil'), + ] + + @property diff --git a/k5test/unit.py b/k5test/unit.py -index 4ee7f98..543d662 100644 +index 3c64b9e..59da1ab 100644 --- a/k5test/unit.py +++ b/k5test/unit.py @@ -38,7 +38,7 @@ _KRB_VERSION = None - def krb_minversion_test(target_version, problem): + def krb_minversion_test(target_version, problem, provider=None): global _KRB_VERSION if _KRB_VERSION is None: - _KRB_VERSION = _utils.get_output("krb5-config --version") From 2c9158cec254286ed2eb9e33ddb1ba10416f54aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 16:32:53 +0200 Subject: [PATCH 0633/1062] python3Packages.executing: fix build Adds missing setuptools-scm dependency. --- pkgs/development/python-modules/executing/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index f0c67f3ae591..8ab6994ac415 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools-scm , asttokens }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; From af21888d74b6d6ff0903edb2e101fa10f9208f70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 16:36:31 +0200 Subject: [PATCH 0634/1062] python3Packages.screeninfo: fix build --- .../python-modules/screeninfo/default.nix | 48 ++++++++++++------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 887542130969..21b3f30e1323 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -1,36 +1,50 @@ -{ lib, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: +{ lib +, buildPythonApplication +, dataclasses +, fetchPypi +, libX11 +, libXinerama +, libXrandr +, pytestCheckHook +, pythonOlder +}: buildPythonApplication rec { pname = "screeninfo"; version = "0.7"; - disabled = isPy27; # dataclasses isn't available for python2 + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "12a97c3527e3544ac5dbd7c1204283e2653d655cbd15844c990a83b1b13ef500"; }; - # dataclasses is a compatibility shim for python 3.6 ONLY - patchPhase = if isPy36 then "" else '' - substituteInPlace setup.py \ - --replace "\"dataclasses\"," "" - '' + '' - substituteInPlace screeninfo/enumerators/xinerama.py \ - --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ - --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" - substituteInPlace screeninfo/enumerators/xrandr.py \ - --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ - --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" - ''; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; - propagatedBuildInputs = lib.optional isPy36 dataclasses; + buildInputs = [ + libX11 + libXinerama + libXrandr + ]; - buildInputs = [ libX11 libXinerama libXrandr]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # We don't have a screen + "screeninfo/test_screeninfo.py" + ]; + + pythonImportsCheck = [ "screeninfo" ]; meta = with lib; { description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = licenses.mit; - maintainers = [ maintainers.nickhu ]; + maintainers = with maintainers; [ nickhu ]; }; } From 873649f6390b26e5938ec8f23909c1eb34a9aa4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 18:01:35 +0200 Subject: [PATCH 0635/1062] python3Packages.quantities: fix build --- .../python-modules/quantities/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 233eb8a44b32..28e08eade43d 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , numpy -, python +, pytestCheckHook }: buildPythonPackage rec { @@ -14,15 +14,27 @@ buildPythonPackage rec { sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0"; }; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; - checkPhase = '' - ${python.interpreter} setup.py test -V 1 - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = { - description = "Quantities is designed to handle arithmetic and"; + disabledTests = [ + # Tests don't work with current numpy + # https://github.com/python-quantities/python-quantities/pull/195 + "test_arctan2" + "test_fix" + ]; + + pythonImportsCheck = [ "quantities" ]; + + meta = with lib; { + description = "Quantities is designed to handle arithmetic and conversions of physical quantities"; homepage = "https://python-quantities.readthedocs.io/"; - license = lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } From aa389a7ddfd309ebca46d5766b1673a2b6a408b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 18:33:56 +0200 Subject: [PATCH 0636/1062] snscrape: 0.3.4 -> unstable-2021-08-30 --- .../python-modules/snscrape/default.nix | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index a8f565aa3533..98933759f0bb 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -1,33 +1,48 @@ { lib -, buildPythonPackage -, isPy3k -, fetchPypi -, setuptools-scm -, setuptools -, requests -, lxml , beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, lxml +, pythonOlder +, pytz +, requests +, setuptools-scm }: buildPythonPackage rec { pname = "snscrape"; - version = "0.3.4"; + version = "unstable-2021-08-30"; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "36ba7f95c8bf5202749189f760e591952f19c849379c35ff598aafafe5d0cfef"; + src = fetchFromGitHub { + owner = "JustAnotherArchivist"; + repo = pname; + rev = "c76f1637ce1d7a154af83495b67ead2559cd5715"; + sha256 = "01x4961fxj1p98y6fcyxw5sv8fa87x41fdx9p31is12bdkmqxi6v"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + lxml + requests + ] ++ lib.optionals (pythonOlder "3.9") [ + pytz + ]; + # There are no tests; make sure the executable works. checkPhase = '' export PATH=$PATH:$out/bin snscrape --help ''; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; + pythonImportsCheck = [ "snscrape" ]; meta = with lib; { homepage = "https://github.com/JustAnotherArchivist/snscrape"; From 79889c506d44ee2cf7b39c4a079285b21eaecbe8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 20:58:49 +0200 Subject: [PATCH 0637/1062] python3Packages.python-daemon: fix build & refactor --- .../python-modules/python-daemon/default.nix | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 246e253e191d..9df9bf8a593b 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -1,9 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , docutils , lockfile , mock , pytest_4 , testscenarios +, testtools , twine }: @@ -16,13 +19,31 @@ buildPythonPackage rec { sha256 = "bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf"; }; - nativeBuildInputs = [ twine ]; - propagatedBuildInputs = [ docutils lockfile ]; + nativeBuildInputs = [ + twine + ]; - checkInputs = [ pytest_4 mock testscenarios ]; + propagatedBuildInputs = [ + docutils + lockfile + ]; + + checkInputs = [ + pytest_4 + mock + testscenarios + testtools + ]; + + # tests disabled due to incompatibilities with testtools>=2.5.0 checkPhase = '' - pytest -k 'not detaches_process_context \ - and not standard_stream_file_descriptors' + runHook preCheck + pytest -k ' \ + not detaches_process_context and \ + not standard_stream_file_descriptors and \ + not test_module_has_attribute and \ + not test_module_attribute_has_duck_type' + runHook postCheck ''; pythonImportsCheck = [ @@ -35,6 +56,10 @@ buildPythonPackage rec { meta = with lib; { description = "Library to implement a well-behaved Unix daemon process"; homepage = "https://pagure.io/python-daemon/"; - license = [ licenses.gpl3Plus licenses.asl20 ]; + license = with licenses; [ + gpl3Plus + asl20 + ]; + maintainers = with maintainers; [ ]; }; } From 4eafb64b9bc2f41dc413af6c294f205a9e2d1860 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 21:16:52 +0200 Subject: [PATCH 0638/1062] calibre-web: relax requests constraints --- pkgs/servers/calibre-web/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index ef322524ca92..b6dd0b987201 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -18,9 +18,9 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace setup.cfg \ - --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \ - --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ - --replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" + --replace "requests>=2.11.1,<2.25.0" "requests" \ + --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ + --replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" ''; patches = [ From 3b3629a35baa1064adf4057ac5d6c2b99962b877 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 21:24:07 +0200 Subject: [PATCH 0639/1062] python3Packages.hdbscan: add imports check --- pkgs/development/python-modules/hdbscan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index bf48d6cf5e76..9fa932c7e418 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { "test_hdbscan_boruvka_balltree_matches" ]; + pythonImportsCheck = [ "hdbscan" ]; + meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; From d9087aab1b2192edd7e6fc20dfed124fb1e87d50 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 4 Sep 2021 09:35:25 +0900 Subject: [PATCH 0640/1062] aws-sdk-cpp: disabale parallel checking data races suspected in aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp and aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 2af3ec29367b..69cb1cc22ae9 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { # fix build with gcc9, can be removed after bumping to current version NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; - preConfigure = '' - rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp - rm aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp - ''; + # aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp + # aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp + # seem to have a datarace + enableParallelChecking = false; postFixupHooks = [ # This bodge is necessary so that the file that the generated -config.cmake file From cc1d5e359c026903750252bde94e2bd23ecc0cb9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0641/1062] python3Packages.acme-tiny: 4.1.0 -> 4.1.1 --- pkgs/development/python-modules/acme-tiny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 76e8a8401fd4..7d17af3ae787 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "acme-tiny"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0jmg525n4n98hwy3hf303jbnq23z79sqwgliji9j7qcnph47gkgq"; + sha256 = "b7050b9428d45319e14ab9ea77f0ff4eb40451e5a68325d4c5358a87cff0e793"; }; patchPhase = '' From 48a9e9d7706addc74a52a479ba6266bd9f33edef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0642/1062] python3Packages.agate-excel: 0.2.3 -> 0.2.5 --- pkgs/development/python-modules/agate-excel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index 752c905ee8e6..cbf49d8477c3 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "agate-excel"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "8f255ef2c87c436b7132049e1dd86c8e08bf82d8c773aea86f3069b461a17d52"; + sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; }; propagatedBuildInputs = [ agate openpyxl xlrd ]; From c3c54fde8e53f1094d92680e8dd1aa24f842ee31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0643/1062] python3Packages.aiobotocore: 1.3.1 -> 1.4.1 --- pkgs/development/python-modules/aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index e07b56d3f266..591fd8c17874 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.3.1"; + version = "1.4.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "8ecee55346651e0f4cbda883e3e16cfe11460b8d7adcc08d0017cbb867636ae1"; + sha256 = "09f06723d1d69c6d407d9a356ca65ab42a5b7b73a45be4b1ed0ed1a6b6057a9f"; }; # relax version constraints: aiobotocore works with newer botocore versions From fadded200863f5ca7425ea4a1672a338c758b35c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0644/1062] python3Packages.ajsonrpc: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/ajsonrpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix index e5a81d9cfa6e..b3482cd74679 100644 --- a/pkgs/development/python-modules/ajsonrpc/default.nix +++ b/pkgs/development/python-modules/ajsonrpc/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ajsonrpc"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1b5r8975wdnk3qnc1qjnn4lkxmqcir3brbwnxml9ii90dnsw408a"; + sha256 = "791bac18f0bf0dee109194644f151cf8b7ff529c4b8d6239ac48104a3251a19f"; }; checkInputs = [ pytestCheckHook ]; From 3951dc10fd657c735df172271bbc5102eb60b37a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0645/1062] python3Packages.arrow: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/arrow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index d47dd61c3d47..956dd5f40f2d 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1n2vzyrirfj7fp0zn6iipm3i8bch0g4m14z02nrvlyjiyfmi7zmq"; + sha256 = "dee7602f6c60e3ec510095b5e301441bc56288cb8f51def14dcb3079f623823a"; }; postPatch = '' From b8ae2a26b19064eb41c6c13f8b18397e0dd83e14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0646/1062] python3Packages.astroid: 2.5.6 -> 2.7.2 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 59bd0bc7c369..3b23ee2438ec 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.5.6"; # Check whether the version is compatible with pylint + version = "2.7.2"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/nWXzuWkerUDvFT/tJTZuhfju46MAM0cwosVH9BXoY8="; + sha256 = "1vlibff93z9fvkniviwzizsfffw1j0ywkh4rragnlps797143iv4"; }; SETUPTOOLS_SCM_PRETEND_VERSION=version; From 1f141cfedd9af7d7b0c6489adf565371083276e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0647/1062] python3Packages.auth0-python: 3.16.2 -> 3.17.0 --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 67701afc0eb0..6d47f95e7564 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.16.2"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Slpwml1GDdxAZ4P6Vn2brrupRofiOHvmQF26l0gtTJM="; + sha256 = "7b21bf91859ea56ac3b665efe5e73340c65dfd30de01081ff334a18a35a188a6"; }; propagatedBuildInputs = [ From f5ca02cdc863ea2d40b3c11e7a2096beaad3e9e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0648/1062] python3Packages.authcaptureproxy: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/authcaptureproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index a780ae59be70..c03b423932df 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "1fbrmh6qa3dm3q3zdxaa0fls94wardbcvnjgwxk686wpjgs1xrs4"; + sha256 = "1cg63qhf823nf785kyl96r7vyxfl6dlbwsmhcpny8vb65pl9gng5"; }; postPatch = '' From 1c2743d0cde82b1f110304b89cf2bd7ab5e9fd8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0649/1062] python3Packages.awscrt: 0.11.24 -> 0.12.0 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 08e0563b966b..fa29e9f636e3 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.11.24"; + version = "0.12.0"; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b8aa68bca404bf0085be0570eff5b542d01f7e8e3c0f9b0859abfe5e070162ff"; + sha256 = "65fa09ce78902319392bbb62991ddd3b33cebc0e3bbc81ad2c176072ab40de52"; }; meta = with lib; { From 06577c0da673509942e348f6561c0d4d5b3267fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:29 +0200 Subject: [PATCH 0650/1062] python3Packages.azure-core: 1.16.0 -> 1.17.0 --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 8dce5b8feb75..cd0a816815cd 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.16.0"; + version = "1.17.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4"; + sha256 = "25407390dde142d3e41ecf78bb18cedda9b7f7a0af558d082dec711c4a334f46"; }; propagatedBuildInputs = [ From 6d085b2ba67ee1d9f6f1ec52c69b802350862279 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:30 +0200 Subject: [PATCH 0651/1062] python3Packages.azure-mgmt-iothubprovisioningservices: 0.2.0 -> 0.3.0 --- .../azure-mgmt-iothubprovisioningservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 3401ed898c8f..dcf97249e7f9 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d"; + sha256 = "d01b7725f3f68c5a6ff02184a9bdda8c775888af66378dd8314903d0a46e32b9"; }; propagatedBuildInputs = [ From 38177ed063718715037f956d087d7cb2711ef6c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0652/1062] python3Packages.beniget: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/beniget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix index f8733eeed626..51f641c51eb4 100644 --- a/pkgs/development/python-modules/beniget/default.nix +++ b/pkgs/development/python-modules/beniget/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "beniget"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749"; + sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c"; }; propagatedBuildInputs = [ From a6fb6455456fd98e2dfc4fde483d7bcb221afe19 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0653/1062] python3Packages.bokeh: 2.3.2 -> 2.3.3 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 6677d9ceacb9..925eb9c8f39d 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "fcc0d0a3129ae457cdb0a4f503843a4d13d1f5d07af7748424ea8c7ddfc321f1"; + sha256 = "a5fdcc181835561447fcc5a371300973fce4114692d5853addec284d1cdeb677"; }; patches = [ From 92fbd76ab12c65fae6f2a129c1266c29955ddfbe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0654/1062] python3Packages.braintree: 4.10.0 -> 4.12.0 --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 6d64def54ab6..17681f053337 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.10.0"; + version = "4.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f934a329c7a2b3f7058d5c733cc95da694f66afb5a789162ec701ba4d26a0d90"; + sha256 = "946abd50fe2843eec586ac3cec285d27dfae0cc5a43a64b505e8a2800b8a74a6"; }; propagatedBuildInputs = [ requests ]; From eefb7248f40cb476985e3f2e8a650e3e34154b43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0655/1062] python3Packages.cffi: 1.14.5 -> 1.14.6 --- pkgs/development/python-modules/cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 92899ed85e58..94aecdcc4ec4 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.5"; + version = "1.14.6"; src = fetchPypi { inherit pname version; - sha256 = "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"; + sha256 = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"; }; outputs = [ "out" "dev" ]; From ab4a8fab67b3290d8136306153412428a09b993e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:31 +0200 Subject: [PATCH 0656/1062] python3Packages.cliff: 3.8.0 -> 3.9.0 --- pkgs/development/python-modules/cliff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index bb856736d92b..7eee574dad48 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "8dd215d0a84c9a3ab2fa2aa700849f4e7b786639f66caa0ad4108c85dca95a7c"; + sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3"; }; propagatedBuildInputs = [ From e219aa8ed3bd399b143a40f6dbe7e25449ed09ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0657/1062] python3Packages.commoncode: 21.6.11 -> 21.7.23 --- pkgs/development/python-modules/commoncode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 16d529b17f53..7c9528c06e52 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,11 +14,11 @@ }: buildPythonPackage rec { pname = "commoncode"; - version = "21.6.11"; + version = "21.7.23"; src = fetchPypi { inherit pname version; - sha256 = "d6c8c985746a541913d5bb534c770f2422e5b4ac7a4ef765abc05c287a40ff4b"; + sha256 = "38511dcd7c518bf7fec4944c78e1118304f2f2582a7e6792cc5773aebe95a086"; }; dontConfigure = true; From 11f21cabeb22dc4ddd0de3caf5685b9438b247a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0658/1062] python3Packages.configargparse: 1.4.1 -> 1.5.2 --- pkgs/development/python-modules/configargparse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 45ec7364a59a..1bb036b97df5 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.4.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; - rev = "v${version}"; - sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA="; + rev = version; + sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2"; }; checkInputs = [ From 2e7cdbd0180d6214dccbe8771970cc896520b991 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0659/1062] python3Packages.cryptacular: 1.5.5 -> 1.6.2 --- pkgs/development/python-modules/cryptacular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index dccfddaea1ae..31c0ebace475 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cryptacular"; - version = "1.5.5"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "fb4d48716e88e4d050255ff0f065f6d437caa358ceef16ba5840c95cece224f9"; + sha256 = "7b529cb2b8a3c7e5be77921bf1ebc653d4d3a8f791375cc6f971b20db2404176"; }; buildInputs = [ coverage nose ]; From 3755d54defd39f8b6ea8c8e221f4797e69f32923 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0660/1062] python3Packages.cx_Freeze: 6.6 -> 6.7 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index b6edb2ced1f2..42fa8fd8ddca 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.6"; + version = "6.7"; src = fetchPypi { inherit pname version; - sha256 = "c4af8ad3f7e7d71e291c1dec5d0fb26bbe92df834b098ed35434c901fbd6762f"; + sha256 = "050f1dd133a04810bd7f38ac7ae3b290054acb2ff4f6e73f7a286266d153495d"; }; disabled = pythonOlder "3.5"; From 0771461dbaace819bbd694181319cce47a6c3355 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0661/1062] python3Packages.cxxfilt: 0.2.2 -> 0.3.0 --- pkgs/development/python-modules/cxxfilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 1cc5ad19bda2..117b12145764 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cxxfilt"; - version = "0.2.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b"; + sha256 = "7df6464ba5e8efbf0d8974c0b2c78b32546676f06059a83515dbdfa559b34214"; }; postPatch = let From 3f71015ef8865479fd85d4d9662975e2e67c5fb2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0662/1062] python3Packages.dask-jobqueue: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/dask-jobqueue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 7719842fbad6..5e43a8f16648 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.7.3"; pname = "dask-jobqueue"; src = fetchPypi { inherit pname version; - sha256 = "1767f4146b2663d9d2eaef62b882a86e1df0bccdb8ae68ae3e5e546aa6796d35"; + sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79"; }; checkInputs = [ pytest ]; From 35ecf01191f1ccb68fe98d485562ff86b2294b33 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:32 +0200 Subject: [PATCH 0663/1062] python3Packages.dask-xgboost: 0.1.11 -> 0.2.0 --- pkgs/development/python-modules/dask-xgboost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index eb18ac31fd03..1f9be870c975 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.1.11"; + version = "0.2.0"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; + sha256 = "6d9c491dc4099f74a0df66c4d439d296c0f1fba97009fe93e21b2350f295b4ca"; }; propagatedBuildInputs = [ xgboost dask distributed ]; From aaa56aea741890be4f3fd4edb7c8da8b09c2cbf7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0664/1062] python3Packages.databricks-connect: 8.1.6 -> 8.1.11 From 36c7f95c78ffa695b3a2f072a1d40538b430b33e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0665/1062] python3Packages.distributed: 2021.6.2 -> 2021.8.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index ce0cf13e9a92..38c977f3ffa5 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.6.2"; + version = "2021.8.1"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug="; + sha256 = "c13ac10ecd9ee5f0ff67f5697149062d6e483f23a079918df1ab2e19b11fa77d"; }; propagatedBuildInputs = [ From 60f73baf676d976ce039770ba39b71806c8647b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0666/1062] python3Packages.distro: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/distro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 885538de65ce..bf8675af941d 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distro"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92"; + sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"; }; # tests are very targeted at individual linux distributions From 8230f39b9d3eff2b3de9c3a08100b1c16159a693 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0667/1062] python3Packages.djangorestframework_simplejwt: 4.7.1 -> 4.8.0 --- .../python-modules/djangorestframework-simplejwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 82ff51fd3821..ad9afabadf2c 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "djangorestframework_simplejwt"; - version = "4.7.1"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "c0e9b617da337becb55e67935eb992fad84f861418e7ab5fb3e77a3fd18d4137"; + sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a"; }; propagatedBuildInputs = [ django djangorestframework pyjwt ]; From 7e405e57d34de9c8d0a17d20294017ed0cc23d80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0668/1062] python3Packages.django-taggit: 1.4.0 -> 1.5.1 --- pkgs/development/python-modules/django_taggit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index cbfcc103c5c1..ab908c639a00 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "1.4.0"; + version = "1.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b9ed6e94bad0bed3bf062a6be7ee3db117fda02c6419c680d614197364ea018b"; + sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a"; }; propagatedBuildInputs = [ isort django ]; From ab1b022fccc0a154ec405b59737ee510ac5dd873 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0669/1062] python3Packages.extractcode: 21.6.2 -> 21.7.23 --- pkgs/development/python-modules/extractcode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 28dece127b12..a39205f5aeea 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -11,11 +11,11 @@ }: buildPythonPackage rec { pname = "extractcode"; - version = "21.6.2"; + version = "21.7.23"; src = fetchPypi { inherit pname version; - sha256 = "e665501438fedeb6e75335d880c8913a8cd894fd8adcf9c243eb6d48fad2d01c"; + sha256 = "58aa16d60cfcbd3695d7ea84a1e30d5ba9fa6f614b2ef4a6d0565b2ac5d4f757"; }; dontConfigure = true; From 3bcb9d8b9b56eecf140791c56520b8df33dfcbaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0670/1062] python3Packages.fakeredis: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/fakeredis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 2e0e5c65d06b..e4e060aefc5e 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Ecz8l2nXGNN+RbOC5kproCWGtiKvoDcaa9hXZtciVfM="; + sha256 = "11ccfc9769d718d37e45b382e64a6ba02586b622afa0371a6bd85766d72255f3"; }; propagatedBuildInputs = [ From 843a0ab6ebaa1c0de45bf59c311b3827013d7ecb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:33 +0200 Subject: [PATCH 0671/1062] python3Packages.fastdiff: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/fastdiff/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index b3e27d7a5e81..6d37e6884b69 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -1,25 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-benchmark, wasmer }: +{ lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: buildPythonPackage rec { pname = "fastdiff"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1ai95vjchl4396zjl1b69xfqvn9kn1y7c40d9l0qxdss0pcx6fk2"; + sha256 = "4dfa09c47832a8c040acda3f1f55fc0ab4d666f0e14e6951e6da78d59acd945a"; }; postPatch = '' substituteInPlace setup.py \ --replace 'pytest-runner' "" + substituteInPlace setup.cfg \ + --replace "collect_ignore = ['setup.py']" "" ''; - propagatedBuildInputs = [ wasmer ]; + propagatedBuildInputs = [ wasmer wasmer-compiler-cranelift ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; pythonImportsCheck = [ "fastdiff" ]; - disabledTests = [ "test_native" ]; meta = with lib; { description = "A fast native implementation of diff algorithm with a pure Python fallback"; From 44905eb05c70652fe236f8b1eb141b66155eefa5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0672/1062] python3Packages.fastimport: 0.9.13 -> 0.9.14 --- pkgs/development/python-modules/fastimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index fe46405eb3f1..bd5c270d686c 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "fastimport"; - version = "0.9.13"; + version = "0.9.14"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "486135a39edb85808fdbbe2c8009197978800a4544fca56cc2074df32e1304f3"; + sha256 = "6ac99dda4e7b0b3ae831507b6d0094802e6dd95891feafde8cc5c405b6c149ca"; }; checkPhase = '' From 7154c0b787e112304dd7d973efbe125301eee120 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0673/1062] python3Packages.ffmpeg-progress-yield: 0.0.4 -> 0.1.2 --- .../python-modules/ffmpeg-progress-yield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 5d2641970721..4b4d6bdd7fc2 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.0.4"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "e944093e2c1b213da8fa4f0c276c1bad44e0b8ba8be7e4fd001f5132d16baef5"; + sha256 = "92ae36ff5cf38428bd3695629b5065d161c658fb0de0faf2c20cd7a99dac3820"; }; propagatedBuildInputs = [ colorama tqdm ]; From 94b31a0dfbe75d47eeeebab072a2c0f87c8d63f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0674/1062] python3Packages.Flask-JWT-Extended: 4.2.3 -> 4.3.0 --- .../development/python-modules/flask-jwt-extended/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d9eae8ffa585..22be871f745f 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "4.2.3"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "22b8ffa7587d50aaf65f3009f1d55ef7287da8260eaf4655a5837e33479216c3"; + sha256 = "6e2b40d548b9dfc6051740c4552c097ac38e514e500c16c682d9a533d17ca418"; }; propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; From c2337a840b6c6b626ce2dfccf00173593a57fd8f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0675/1062] python3Packages.Flask-Migrate: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/flask-migrate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 26f2ab4aea18..010e79ecbf2c 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Migrate"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "00m76kgdkk0w5bfq8hbqszpyaqk0yxdvmz4s67lvd36pc7wfhhjd"; + sha256 = "57d6060839e3a7f150eaab6fe4e726d9e3e7cffe2150fb223d73f92421c6d1d9"; }; checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales; From 9707b168d85f63f2ede59a7476c63fab55182841 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0676/1062] python3Packages.GeoAlchemy2: 0.9.3 -> 0.9.4 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index c4c0f41d8d17..94b27d6f1270 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "56f969cf4ad6629ebcde73e807f7dac0a9375c79991b4f93efab191f37737a00"; + sha256 = "b0e56d4a945bdc0f8fa9edd50ecc912889ea68e0e3558a19160dcb0d5b1b65fc"; }; nativeBuildInputs = [ setuptools-scm ]; From 43d19bffb41e75b9cf0b7a776cfb8b0819141d9c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0677/1062] python3Packages.geventhttpclient: 1.4.5 -> 1.5.1 --- .../geventhttpclient/default.nix | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 5563ff94baf5..fd759a0bd723 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,32 +1,49 @@ { lib , buildPythonPackage -, fetchPypi -, pytest -, gevent -, certifi -, six -, backports_ssl_match_hostname , pythonOlder +, fetchPypi +, backports_ssl_match_hostname +, brotli +, certifi +, gevent +, six +, dpkt +, pytestCheckHook }: buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.4.5"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3f0ab18d84ef26ba0c9df73ae2a41ba30a46072b447f2e36c740400de4a63d44"; + sha256 = "4aead64253d2769a6528544f7812ce8d71ae13551d079f2d9a3533d72818f2e0"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ gevent certifi six ] - ++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ]; + propagatedBuildInputs = [ + brotli + certifi + gevent + six + ] ++ lib.optionals (pythonOlder "3.7") [ + backports_ssl_match_hostname + ]; - # Several tests fail that require network - doCheck = false; - checkPhase = '' - py.test $out - ''; + checkInputs = [ + dpkt + pytestCheckHook + ]; + + disabledTests = [ + # socket.gaierror: [Errno -2] Name or service not known + "test_client_simple" + "test_client_without_leading_slas" + "test_request_with_headers" + "test_response_context_manager" + "test_client_ssl" + "test_ssl_fail_invalid_certificate" + "test_multi_queries_greenlet_safe" + ]; meta = with lib; { homepage = "https://github.com/gwik/geventhttpclient"; From 65ed3b64a675abe4be5f61fd29d1dff28230bbf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0678/1062] python3Packages.google-api-python-client: 2.15.0 -> 2.18.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 2fd9247c8825..45d6044b8ea7 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.15.0"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g3VIkjKCP0TGARlqlgUF4D7FjJXdtkFcax0ddrRo+Lo="; + sha256 = "a25661ec6cf4c159f41fe9c061c2bee31b2dddaf2ad787e23617048a25b53842"; }; # No tests included in archive From fc9c8e9d564c1b032140f26856a73e36c3a84a24 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0679/1062] python3Packages.gradient: 1.5.5 -> 1.7.2 --- pkgs/development/python-modules/gradient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 57b58699ec38..4303101ed929 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.5.5"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "fee5016afe5e61a640bb9d7e234a10926c17c9e83c876b617438ff5f5ce039ad"; + sha256 = "108dc01d2f9f9d4fa2c080d12f14b77b4ec6329f239a0b2bc89e09360ae6757d"; }; postPatch = '' From 1d764c7c76e478d83e6ee19a3a81518ea3690448 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:34 +0200 Subject: [PATCH 0680/1062] python3Packages.graphql-core: 3.1.5 -> 3.1.6 --- pkgs/development/python-modules/graphql-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 7ac25424616a..1909dd99fe0f 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "055gfvyax781f4zk4pl60y8yd90bnn4rkqh5i48pczaff0lwlfj1"; + sha256 = "1ip0yrqmnqncgpwvba18x020gkwr7csiw4zdy6mrdnvwf5qyam4x"; }; checkInputs = [ From a86bf0ddd13605ab72df31ee2638396fa15e1e0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0681/1062] python3Packages.green: 3.2.6 -> 3.3.0 --- pkgs/development/python-modules/green/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 934c363245d7..0320a3858be1 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "green"; - version = "3.2.6"; + version = "3.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e51d4ff6e6885942d944304fedc7440a8f87917aa09526beeecb31a0dae655b8"; + sha256 = "a4d86f2dfa4ccbc86f24bcb9c9ab8bf34219c876c24e9f0603aab4dfe73bb575"; }; propagatedBuildInputs = [ From 01a0004b80c2c35292bd65f74f47ec411fe1055a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0682/1062] python3Packages.greenlet: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/greenlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 4d829f3d6473..e997c7da3987 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "1.1.0"; + version = "1.1.1"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee"; + sha256 = "c0f22774cd8294078bdf7392ac73cf00bfa1e5e0ed644bd064fdabc5f2a2f481"; }; checkPhase = '' From bb31e6c19a19a00eb2cc5c39b465b704c00ec010 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0683/1062] python3Packages.h5py: 3.2.1 -> 3.4.0 --- pkgs/development/python-modules/h5py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 9e5921bb412d..dfa4288e54fc 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.2.1"; + version = "3.4.0"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-iUdL6RG/zbNMvw2YuOxItXjCeon9sa5O51E/HvjZJJ4="; + sha256 = "ee1c683d91ab010d5e85cb61e8f9e7ee0d8eab545bf3dd50a9618f1d0e8f615e"; }; # avoid strict pinning of numpy From 4f36e433a62f2d24c7374bc72c3640c624ea1ef6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0684/1062] python3Packages.httpretty: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/httpretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index f0c0b9b2ee99..78a529666139 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "httpretty"; - version = "1.1.3"; + version = "1.1.4"; # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "229ade39175ea4324e767f29dc24e5f846fbc72bf80e1a919b2547a6574ff601"; + sha256 = "20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"; }; propagatedBuildInputs = [ six ]; From b513db6ae14b4f0fd41696d1b61925c6fb4a916e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0685/1062] python3Packages.httptools: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/httptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index 54b512be1fd4..0a5b510b0ad9 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.2.0"; + version = "0.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"; + sha256 = "3f9b4856d46ba1f0c850f4e84b264a9a8b4460acb20e865ec00978ad9fbaa4cf"; }; # tests are not included in pypi tarball From 600e9e01fe38e918ed8286651f8b54a11b07917e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0686/1062] python3Packages.humanize: 3.9.0 -> 3.11.0 --- pkgs/development/python-modules/humanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 4c5bd0e3af25..85ec6257ea5d 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "3.9.0"; + version = "3.11.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "892a5b7b87763c4c6997a58382c2b1f4614048a2e01c23ef1bb0456e6f9d4d5d"; + sha256 = "4160cdc63fcd0daac27d2e1e218a31bb396fc3fe5712d153675d89432a03778f"; }; nativeBuildInputs = [ setuptools-scm ]; From 8c09c161e4be68352741b7d1222f38b4466e840e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0687/1062] python3Packages.hypothesis: 6.14.0 -> 6.15.0 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 35f53864eb9d..bc832f5f1ad5 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.14.0"; + version = "6.15.0"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "0yns81j3fnpdfaphk722xcnidqhgy0kmd7ik6aw7l795l0wivhxj"; + sha256 = "0kjnd593wz90gbjwzn4gc9514w4pxg77hpisp9v6m7bj1w7a7x5q"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From eabd6c99fb3160902664e2be4a402b133dd24149 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0688/1062] python3Packages.hypothesmith: 0.1.8 -> 0.1.9 --- pkgs/development/python-modules/hypothesmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 4bf1ca8d02f7..0d175989271c 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+f8EexXE7TEs49pX6idXD4bWtTzhKvnyXlnmV2oAQQo="; + sha256 = "039fd6aa0102f89df9df7ad4cff70aa8068678c13c3be2713c92568917317a04"; }; propagatedBuildInputs = [ hypothesis lark-parser libcst ]; From c393ea6a386695f64a74140e4e4e6afcf912b7fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:35 +0200 Subject: [PATCH 0689/1062] python3Packages.ibm-cloud-sdk-core: 3.10.0 -> 3.11.3 --- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 8e7f4832c254..51e4008ae512 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.10.0"; + version = "3.11.3"; src = fetchPypi { inherit pname version; - sha256 = "ab9520be99066ec41a24e31ac653c28953adc8fc349f0fa53a598e1802a79cd6"; + sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; }; checkInputs = [ From c6ecfee1c6abc38789e6321dbb8039901d607822 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0690/1062] python3Packages.ibm-watson: 5.2.2 -> 5.2.3 --- pkgs/development/python-modules/ibm-watson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 49e4541143e9..9e5198a1cb30 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "sha256-bK6lcTKAVwAJDb5LqKRWR/4wcOKx7bRwWYC+WB5qJE4="; + sha256 = "0i0zs38hqgh2510b3690nrq2pvx7wcdlv9iyjgsrfl7gid8qi3ng"; }; checkInputs = [ From 9c472454334130d07aaeb7918f645a88c7cc5bf2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0691/1062] python3Packages.imageio-ffmpeg: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/imageio-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 9d1755d81b97..a249b2dbfe19 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.4"; + version = "0.4.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "73640a7a54f95e607addd637c766d56be31d975a64ddb97d14df012575ef1a5d"; + sha256 = "f2ea4245a2adad25dedf98d343159579167e549ac8c4691cef5eff980e20c139"; }; patches = [ From 6e4a0b1c5a5f1ddbfcb440f2e83a3eb69d45e96e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0692/1062] python3Packages.imap-tools: 0.44.0 -> 0.46.0 --- pkgs/development/python-modules/imap-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index d1cecdda42d9..ef13bf471e16 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.44.0"; + version = "0.46.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-C9396yRSowaLe3E1s+rw8bah77znjfoIhLwJpcqhN6Y="; + sha256 = "08a4p4q96zz6qp3cy7hs5jn9h2gf68d8zchw4w0kk83sm1r8rpxw"; }; checkInputs = [ From e99290e01b7f732f9f39d910bff6ad5a7368d51c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0693/1062] python3Packages.iminuit: 2.6.1 -> 2.8.2 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 42a1d7c4ffdb..cd598d602a29 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.6.1"; + version = "2.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5fb8786bcad53762648ddacb008d18b49704ba5c011ade240004bfc5a628b4f6"; + sha256 = "ffba627a638fe233bbef03e91af6063c1e5d62405327219b03f0abf50196a95b"; }; nativeBuildInputs = [ cmake ]; From 6f463501f14c06e332ac42f45cd9d992f3d5a75d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0694/1062] python3Packages.inform: 1.24 -> 1.25 --- pkgs/development/python-modules/inform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 2397c0bc4db6..9ef6fd1e0a1d 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "inform"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "KenKundert"; repo = "inform"; rev = "v${version}"; - sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; + sha256 = "1r56wmn21c7ggy33548l6dfjswhadkp2iaalfb7xgsxmq7qfcnax"; }; postPatch = '' From 409924dc80c8535b40073329bd4a171b7de8f878 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0695/1062] python3Packages.intake: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/intake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index fff6d74b56a1..3a959b897216 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.2"; + version = "0.6.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b0cab1d185a703acb38eecb9cff3edd5cc7004fe18a36d5e42a8f7fffc9cca1c"; + sha256 = "f64543353f30d9440b953984f78b7a0954e5756d70c64243609d307ba488014f"; }; propagatedBuildInputs = [ From 5b55941382ef76a4dcf613277e0b875791229f31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0696/1062] python3Packages.invoke: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/invoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 08d72cec4961..45c341c209cf 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "f0c560075b5fb29ba14dad44a7185514e94970d1b9d57dcd3723bec5fed92650"; + sha256 = "374d1e2ecf78981da94bfaf95366216aaec27c2d6a7b7d5818d92da55aa258d3"; }; patchPhase = '' From 344b1d8ff2d91ecaa0f020c476c5ab1598088452 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0697/1062] python3Packages.ipython: 7.24.1 -> 7.26.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e036a3378643..f03db08bc49b 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.24.1"; + version = "7.26.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9bc24a99f5d19721fb8a2d1408908e9c0520a17fff2233ffe82620847f17f1b6"; + sha256 = "0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e"; }; prePatch = lib.optionalString stdenv.isDarwin '' From 4d5197ba039aff199f6ea9aae7054d1afb96b381 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0698/1062] python3Packages.iterm2: 1.21 -> 1.27 --- pkgs/development/python-modules/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 3b98f25c566f..a1b777c1bb76 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.21"; + version = "1.27"; src = fetchPypi { inherit pname version; - sha256 = "06be59e0314a2f0f32753eb2d44eb563e85253875bc8da64df5b4eeba7fc05bd"; + sha256 = "dcbd89d0502e72a9a41b055f5cf10b5a991f60fb12df29918d9c2183d1389abd"; }; propagatedBuildInputs = [ protobuf websockets ]; From 63c4f25c10e1e2b9252dc20e57e5356f446670a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0699/1062] python3Packages.jaraco.collections: 3.3.0 -> 3.4.0 --- .../development/python-modules/jaraco_collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 060d45938118..46f2bfdff3fc 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "3662267424b55f10bf15b6f5dee6a6e48a2865c0ec50cc7a16040c81c55a98dc"; + sha256 = "344d14769d716e7496af879ac71b3c6ebdd46abc64bd9ec21d15248365aa3ac9"; }; pythonNamespaces = [ "jaraco" ]; From bb1109807fc183e0db03fb447fd0601f1c5f27df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0700/1062] python3Packages.jaraco.text: 3.5.0 -> 3.5.1 --- pkgs/development/python-modules/jaraco_text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 3126ab999674..32e8aa23aeb4 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.5.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "f07f1076814a17a98eb915948b9a0dc71b1891c833588066ec1feb04ea4389b1"; + sha256 = "ede4e9103443b62b3d1d193257dfb85aab7c69a6cef78a0887d64bb307a03bc3"; }; pythonNamespaces = [ "jaraco" ]; From 742667ac4f4026de5c02a990d71607db8abe6d4e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:36 +0200 Subject: [PATCH 0701/1062] python3Packages.jeepney: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/jeepney/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 2acf0361bcbc..3079f152e444 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, async-timeout , dbus , pytest , pytest-trio @@ -12,16 +13,17 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1237cd64c8f7ac3aa4b3f332c4d0fb4a8216f39eaa662ec904302d4d77de5a54"; + sha256 = "fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"; }; checkInputs = [ + async-timeout dbus pytest pytest-trio From 681dff764ea8c0428dcf2148edc628e7da6a44ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0702/1062] python3Packages.jupyter_client: 6.1.12 -> 6.2.0 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index fbc37c3f581b..2c0a6c398864 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.12"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c4bca1d0846186ca8be97f4d2fa6d2bae889cce4892a167ffa1ba6bd1f73e782"; + sha256 = "e2ab61d79fbf8b56734a4c2499f19830fbd7f6fefb3e87868ef0545cb3c17eb9"; }; propagatedBuildInputs = [ From be82df1e6e074f004bc5d4bb336e363cf9619cda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0703/1062] python3Packages.jupyterlab: 3.0.16 -> 3.1.9 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 6264bbb5c44e..21255bba94f2 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.1.6"; + version = "3.1.9"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6d2ada6a333861f33a1b555d3cb7b07aa9d1ab80f07997b3d0c43878a98c1174"; + sha256 = "007e42f833e59fd36872d459e45be243d899edbd0e4a98d21388632e4e0d8af7"; }; nativeBuildInputs = [ jupyter-packaging ]; From 6126d9ff100155ea6e54e9b3438fe3bd3631a0fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0704/1062] python3Packages.jupyterlab_git: 0.30.1 -> 0.32.2 --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 67769e24b328..dbff1660b1cc 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.30.1"; + version = "0.32.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f44a33cf59b424e0b5ff984b18eae33e45dab1ef9dc1901b1dd23f9adff15df2"; + sha256 = "4c5743a05150ed7736e028aac15787a66735f160e9ae198dacc5a4bd1a727ce2"; }; propagatedBuildInputs = [ notebook nbdime git ]; From d1fd6b99214153582a8172e5138f3e3d69000d4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0705/1062] python3Packages.jupyterlab_server: 2.6.0 -> 2.7.2 --- pkgs/development/python-modules/jupyterlab_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index cca40463b024..2c54fa9da7f7 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.7.0"; + version = "2.7.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "31457ef564febc42043bc539356c804f6f9144f602e2852150bf0820ed6d7e18"; + sha256 = "c6c9ae5796ed60c65bccd84503cbd44b9e35b046b8265f24db3cc4d61631fc0d"; }; postPatch = '' From 659292fdfe80d960656ead29e5f0e6be51c77626 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0706/1062] python3Packages.jupyter-repo2docker: 2021.3.0 -> 2021.8.0 --- .../python-modules/jupyter-repo2docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 1b352f1e24c9..f4eb9190aa4b 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "2021.3.0"; + version = "2021.8.0"; pname = "jupyter-repo2docker"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "42e0cf67181bdd03b54dabde695befec0586ed68a4ec1240104e209997d776c4"; + sha256 = "9d1b3c3ec7944ea6b0a234d6fa77293a2d1ed1c080eba8466aba94f811b3465d"; }; propagatedBuildInputs = [ From 2ac1379d64f6175d4068b76cc8111cf211d34887 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0707/1062] python3Packages.jupyter_server: 1.8.0 -> 1.10.2 --- pkgs/development/python-modules/jupyter_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 72e1540e0781..3150235fcc7a 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "jupyter_server"; - version = "1.8.0"; + version = "1.10.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237"; + sha256 = "d3a3b68ebc6d7bfee1097f1712cf7709ee39c92379da2cc08724515bb85e72bf"; }; propagatedBuildInputs = [ From 23977c172547a24b9963303f2cd110794714c08a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0708/1062] python3Packages.k5test: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/k5test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 80b62f1e4483..9a9c20e6de15 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "k5test"; - version = "0.9.2"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1lqp3jgfngyhaxjgj3n230hn90wsylwilh120yjf62h7b1s02mh8"; + sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c"; }; patches = [ From df3331910316a7260e591f6513bf01634f6176cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0709/1062] python3Packages.keyring: 23.0.1 -> 23.1.0 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index cea38abee395..522c836f4357 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.0.1"; + version = "23.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8"; + sha256 = "b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4"; }; nativeBuildInputs = [ From 0c9a39adfbbcab21bb13fc78649de3ebd1ddffb7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0710/1062] python3Packages.keyrings.alt: 4.0.2 -> 4.1.0 --- pkgs/development/python-modules/keyrings-alt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index abcd04a1d307..7bc88bf6cbad 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "keyrings.alt"; - version = "4.0.2"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cc475635099d6edd7e475c5a479e5b4da5e811a3af04495a1e9ada488d16fe25"; + sha256 = "52ccb61d6f16c10f32f30d38cceef7811ed48e086d73e3bae86f0854352c4ab2"; }; postPatch = '' From 2640cfc115a3708702cdedeed12af6d09c5fd900 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:37 +0200 Subject: [PATCH 0711/1062] python3Packages.labelbox: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 423185b6f226..cb098cd7ef10 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.6.0"; + version = "2.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "V${version}"; - sha256 = "1lkvc926i3c7isqhaja6k013qgla44cdhvkx76gpdyywq53i9mcb"; + sha256 = "0bvfxs4g9cxj9npy7qckxsgxwgfg0cdmyywdw5lrfs926iq4ydq1"; }; propagatedBuildInputs = [ From fbdcaba0c125ab77dbf7ae7ef1657768e34c8a8a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0712/1062] python3Packages.ldap3: 2.9 -> 2.9.1 --- pkgs/development/python-modules/ldap3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 3c613d74e272..cf82b166ec6d 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.9"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "18c3ee656a6775b9b0d60f7c6c5b094d878d1d90fc03d56731039f0a4b546a91"; + sha256 = "f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f"; }; propagatedBuildInputs = [ pyasn1 ]; From 43df947ae09bfcd7a8e93a4b7ee1b891aab49ce8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0713/1062] python3Packages.libcst: 0.3.19 -> 0.3.20 --- pkgs/development/python-modules/libcst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 5a1ef3b7f737..5b950ab57397 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.19"; + version = "0.3.20"; disabled = pythonOlder "3.6"; # Some files for tests missing from PyPi @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "012g1hyaj015k2sf38a7jnpzjic0f8j97ar84d0f00w2ifzwx4ma"; + sha256 = "063bl21gyyd25i2v0j6kz29cxxdfhng2nins4i2qblmac90f2nqy"; }; propagatedBuildInputs = [ From 4b62c6ea6b6fe0913f47bf7e702b43dd01e6cb35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0714/1062] python3Packages.llvmlite: 0.36.0 -> 0.37.0 --- pkgs/development/python-modules/llvmlite/default.nix | 8 +++++--- pkgs/top-level/python-packages.nix | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index c7d2221a22e2..e3b9e3bb7c8a 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.36.0"; + version = "0.37.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "765128fdf5f149ed0b889ffbe2b05eb1717f8e20a5c87fa2b4018fbcce0fcfc9"; + sha256 = "6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15"; }; nativeBuildInputs = [ llvm ]; - propagatedBuildInputs = [ ] ++ lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -31,10 +31,12 @@ buildPythonPackage rec { substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" ''; + # Set directory containing llvm-config binary preConfigure = '' export LLVM_CONFIG=${llvm.dev}/bin/llvm-config ''; + checkPhase = '' ${python.executable} runtests.py ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d581ad1fa00f..f99110084352 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4254,8 +4254,9 @@ in { }; llvmlite = callPackage ../development/python-modules/llvmlite { - llvm = pkgs.llvm_9; - }; # llvmlite always requires a specific version of llvm. + # llvmlite always requires a specific version of llvm. + llvm = pkgs.llvm_11; + }; lmdb = callPackage ../development/python-modules/lmdb { inherit (pkgs) lmdb; From 6e079e117a9b62c2cf322179e1ffe04e50b70333 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0715/1062] python3Packages.Mako: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 533e1317a091..cf3028612698 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.4"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab"; + sha256 = "169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"; }; propagatedBuildInputs = [ markupsafe ]; From a1ed3a951483ff94aa4219c365d33b3503a78a42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0716/1062] python3Packages.marisa-trie: 0.7.5 -> 0.7.7 --- pkgs/development/python-modules/marisa-trie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index ade031409b41..4daa619acc4f 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "marisa-trie"; - version = "0.7.5"; + version = "0.7.7"; src = fetchPypi { inherit pname version; - sha256 = "c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf"; + sha256 = "bbeafb7d92839dc221365340e79d012cb50ee48a1f3f30dd916eb35a8b93db00"; }; postPatch = '' From 02c1c4d3b1ebaec282a0f2291f92d2d94785172f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0717/1062] python3Packages.markdown-it-py: 1.0.0 -> 1.1.0 --- .../python-modules/markdown-it-py/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 8d75139dddcb..8ed57f3ff031 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder , attrs @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,18 +22,9 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "v${version}"; - hash = "sha256-GA7P2I8N+i2ISsVgx58zyhrfKMcZ7pL4X9T/trbsr1Y="; + sha256 = "0h7rn3rcqfwmnqs97qczwkw9w5g4df8bgn6sw7k149svfqgrkf56"; }; - patches = [ - (fetchpatch { - # :arrow_up: UPGRADE: attrs -> v21 (#165) - # https://github.com/executablebooks/markdown-it-py/pull/165 - url = "https://github.com/executablebooks/markdown-it-py/commit/78381ffe1a651741594dc93e693b761422512fa2.patch"; - sha256 = "1kxhblpi4sycrs3rv50achr8g0wlgq33abg2acra26l736hlsya1"; - }) - ]; - propagatedBuildInputs = [ attrs linkify-it-py ] ++ lib.optional (pythonOlder "3.8") typing-extensions; From 1ee44a8a447c2e0dfa6897a624fea5a4072c2eb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0718/1062] python3Packages.mattermostdriver: 7.3.0 -> 7.3.1 --- pkgs/development/python-modules/mattermostdriver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix index 7d9421b5d949..6a0be0696063 100644 --- a/pkgs/development/python-modules/mattermostdriver/default.nix +++ b/pkgs/development/python-modules/mattermostdriver/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mattermostdriver"; - version = "7.3.0"; + version = "7.3.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17jqcpa1xd9n7bf4d5l7wmscls34kymv27gi17pyyfjxbwk5gsga"; + sha256 = "bf629c4b8f825bd7196208aa93995ac5077bd60939ba67cca314a7f13c1dbcea"; }; propagatedBuildInputs = [ websockets requests ]; From 6f30ae9a67a2024e93fc67bc8e892851cf1a4310 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0719/1062] python3Packages.mkl-service: 2.4.0 -> 2.4.0.post1 --- pkgs/development/python-modules/mkl-service/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index c54da3055e7c..be0ac454ee98 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.0"; + version = "2.4.0.post1"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "v${version}"; - sha256 = "1x8j0ij582dyhay0gaqq45a2jz1m4fr8xw0v65ngviajj3cxmcpb"; + sha256 = "0ysjn8z1hkscb4cycbrvcb93r04w5793yylsy40h5dvjd04ns5jc"; }; MKLROOT = mkl; From 87a36f7ce64cb587799a3ac7de736d6c3699edc7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:38 +0200 Subject: [PATCH 0720/1062] python3Packages.mlflow: 1.18.0 -> 1.20.1 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 2940c111e5dc..b50d98513a2f 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.18.0"; + version = "1.20.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8942089589d08c05c8a7fc66828c02a9233be462c421881b50bc2a0b183dfdbe"; + sha256 = "71764443c4942f181fee2d5bf44dd74a0507bcc5b62a1f1e08079d1f40a15fc0"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config From 0e56858edc4493ababa031963bf51fd2b2327fd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0721/1062] python3Packages.mne-python: 0.23.0 -> 0.23.2 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 2dfe06d51770..2f97cac131ec 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.23.0"; + version = "0.23.2"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "02fcnfsrc6sccv6x2rnx86g0zw0ivk5s8gx230g6pxfg3lap6knv"; + sha256 = "1y6xypfzq7a3ffzwlbqspyzvijr6ihgfzgvhajs16d74pxhdkg74"; }; propagatedBuildInputs = [ numpy scipy ]; From 4fe4e8c859ab3f10002643b48e6f7a04b4d405fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0722/1062] python3Packages.monotonic: 1.5 -> 1.6 --- pkgs/development/python-modules/monotonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index e93bf206edaa..d775d5157191 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "monotonic"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0"; + sha256 = "3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7"; }; __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; From 0c052fc8ba25698be635572d38c50231b113ca7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0723/1062] python3Packages.monty: 2021.6.10 -> 2021.8.17 --- .../python-modules/monty/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index ff236d9becc4..73325c24d94c 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -5,6 +5,7 @@ , msgpack , pytestCheckHook , numpy +, pandas , pydantic , pymongo , ruamel_yaml @@ -13,17 +14,21 @@ buildPythonPackage rec { pname = "monty"; - version = "2021.6.10"; + version = "2021.8.17"; disabled = pythonOlder "3.5"; # uses type annotations - # No tests in Pypi src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "01fhl4pl5gj4ahph4lxcm0fmglh0bjw6jz9ckmgzviasg4l1j6h4"; + sha256 = "0lg6d0qk6iv476rcn45p5f50kips5g9s709cxddwnk5yrz57c4d0"; }; + postPatch = '' + substituteInPlace tests/test_os.py \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' + ''; + propagatedBuildInputs = [ ruamel_yaml tqdm @@ -33,15 +38,11 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook numpy + pandas pydantic pymongo ]; - preCheck = '' - substituteInPlace tests/test_os.py \ - --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' - ''; - meta = with lib; { description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; longDescription = " From fdbce68607d48ba178956e5b174b50da5dba395c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0724/1062] python3Packages.mypy-boto3-s3: 1.17.97 -> 1.18.29 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index b25e838c96ff..d16d858c22f5 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.17.97"; + version = "1.18.29"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cc12897498213e6aa1530d9f75dadb3916fcd3ce376639560c2fede2c93c51b9"; + sha256 = "efee8defd50c441f1daec39fe415a81ded16b828678b4606ee8f9dd677bfe53e"; }; propagatedBuildInputs = [ From 96e5573a3e5175d63aa0deeb756f6bcc50373697 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0725/1062] python3Packages.mypy-protobuf: 2.4 -> 2.9 --- pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 6c6ea7b7b1c9..17b0d068c981 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "2.4"; + version = "2.9"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f"; + sha256 = "278172935d7121c2f8c7c0a05518dd565a2b76d9e9c4a0a3fcd08a21fa685d43"; }; propagatedBuildInputs = [ protobuf ]; From 7fe1d29097680314ccc7180699e9003e374e148c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0726/1062] python3Packages.nbclient: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 169b89f7b892..3b9986bae048 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c"; + sha256 = "6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce"; }; inherit doCheck; From 4278d6059997f552be15d4e0aa29a34f3cbe21d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0727/1062] python3Packages.nbconvert: 6.0.7 -> 6.1.0 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 02eda2beb195..67d08f9e50ff 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.0.7"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"; + sha256 = "d22a8ff202644d31db254d24d52c3a96c82156623fcd7c7f987bba2612303ec9"; }; # Add $out/share/jupyter to the list of paths that are used to search for From 7e2cd60b59b61151e02faa63fdbcdc85732079da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:39 +0200 Subject: [PATCH 0728/1062] python3Packages.numba: 0.53.1 -> 0.54.0 --- .../python-modules/numba/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 74f7d4003dcd..287737900b89 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,28 +12,39 @@ }: buildPythonPackage rec { - version = "0.53.1"; + version = "0.54.0"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "9cd4e5216acdc66c4e9dab2dfd22ddb5bef151185c070d4a3cd8e78638aff5b0"; + sha256 = "bad6bd98ab2e41c34aa9c80b8d9737e07d92a53df4f74d3ada1458b0b516ccff"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "1.21" "1.22" + + substituteInPlace numba/__init__.py \ + --replace "(1, 20)" "(1, 21)" + ''; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ numpy llvmlite setuptools ]; - pythonImportsCheck = [ "numba" ]; + # Copy test script into $out and run the test suite. checkPhase = '' ${python.interpreter} -m numba.runtests ''; + # ImportError: cannot import name '_typeconv' doCheck = false; + pythonImportsCheck = [ "numba" ]; + meta = with lib; { - homepage = "http://numba.pydata.org/"; + homepage = "https://numba.pydata.org/"; license = licenses.bsd2; description = "Compiling Python code using LLVM"; maintainers = with maintainers; [ fridh ]; From 288755b72546fa28bdf1dcb2228c430699085f53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0729/1062] python3Packages.numpy: 1.21.1 -> 1.21.2 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 9071cec1b03d..60f3bf1091ec 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.21.1"; + version = "1.21.2"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1za22ggjxzm7drs2vd15s81ad9rlshk4p7pv7mxcbz4acdiszx6z"; + sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From a638fbb2217c1baf607c4fd9c27d5982d6e55684 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0730/1062] python3Packages.nunavut: 1.2.2 -> 1.4.2 --- pkgs/development/python-modules/nunavut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index e8d032e16aba..c628abad8691 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.2.2"; + version = "1.4.2"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "78ab56951172ecd92f9b66dbf9b0ea986dcc6899d462eeef74563ddf33a5a9a5"; + sha256 = "7238780e42a8d6b7fd3296273c76d35dbebb4520d6778472d556b68b77e2aade"; }; propagatedBuildInputs = [ From 5e34c46d6e91882c11b7ab67f7c891d5a2751776 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0731/1062] python3Packages.openshift: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/openshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index 052d364982b3..cf604ea38181 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aggRnD4goiZJPp4cngp8AIrJC/V46378cwUSfq8Xml4="; + sha256 = "a38957684b17ad0e140a87226249bf26de7267db0c83a6d512b48be258052e1a"; }; propagatedBuildInputs = [ From b34430a8539dd8e19561e910713e3c323acbc4aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0732/1062] python3Packages.optuna: 2.8.0 -> 2.9.1 --- pkgs/development/python-modules/optuna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 0b496b5ef0f8..457d796d0b78 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.8.0"; + version = "2.9.1"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "v${version}"; - sha256 = "1w5vyl36mbk78a5028qa7dlzhavrs1dkx3q8m50ij37pa5cnyksz"; + sha256 = "1fx80qjrkmnvn2mg9fx26qn3sjlwnwqlmkaf6sqhdw79pn6khlpi"; }; checkInputs = [ From 439e0a34a72cb214512e67d597c94c6be9169c86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0733/1062] python3Packages.pandas: 1.2.4 -> 1.3.2 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index b7e237a3e3ba..54ce6b3747bf 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.2.4"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "649ecab692fade3cbfcf967ff936496b0cfba0af00a55dfaacd82bdda5cb2279"; + sha256 = "cbcb84d63867af3411fa063af3de64902665bb5b3d40b25b2059e40603594e87"; }; nativeBuildInputs = [ cython ]; From e28b5ebf732b75c4c2c39d7e3ad59145f18ebc40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0734/1062] python3Packages.panel: 0.11.3 -> 0.12.1 --- .../python-modules/panel/default.nix | 11 +- .../python-modules/panel/node/node-env.nix | 10 +- .../panel/node/node-packages.nix | 172 +++++++++--------- .../python-modules/panel/node/package.json | 4 +- 4 files changed, 98 insertions(+), 99 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 58ae09af14b9..3f6875f4986f 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, bleach , bokeh , param , pyviz-comms @@ -12,10 +13,11 @@ }: let - node = callPackage ./node {}; -in buildPythonPackage rec { + node = callPackage ./node { }; +in +buildPythonPackage rec { pname = "panel"; - version = "0.11.3"; + version = "0.12.1"; # Don't forget to also update the node packages # 1. retrieve the package.json file @@ -23,7 +25,7 @@ in buildPythonPackage rec { # 3. node2nix src = fetchPypi { inherit pname version; - sha256 = "sha256-HpHYHysPE6MRxR0kek5C7sunHMfBsUGdZfxamz2jcLc="; + sha256 = "e4898d60abdb82f8a429df7f59dbf8bcaf7e19b3e633555512ceb4ce06678458"; }; # Since 0.10.0 panel attempts to fetch from the web. @@ -42,6 +44,7 @@ in buildPythonPackage rec { ''; propagatedBuildInputs = [ + bleach bokeh param pyviz-comms diff --git a/pkgs/development/python-modules/panel/node/node-env.nix b/pkgs/development/python-modules/panel/node/node-env.nix index c2b723195b77..21089c4d5459 100644 --- a/pkgs/development/python-modules/panel/node/node-env.nix +++ b/pkgs/development/python-modules/panel/node/node-env.nix @@ -391,13 +391,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -446,6 +447,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) diff --git a/pkgs/development/python-modules/panel/node/node-packages.nix b/pkgs/development/python-modules/panel/node/node-packages.nix index 6e45b64d5c6f..78c7c4ac37d1 100644 --- a/pkgs/development/python-modules/panel/node/node-packages.nix +++ b/pkgs/development/python-modules/panel/node/node-packages.nix @@ -4,13 +4,22 @@ let sources = { - "@bokeh/bokehjs-2.3.1" = { + "@babel/runtime-7.15.3" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; + sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; + }; + }; + "@bokeh/bokehjs-2.3.3" = { name = "_at_bokeh_slash_bokehjs"; packageName = "@bokeh/bokehjs"; - version = "2.3.1"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.1.tgz"; - sha512 = "DlNZaqAJFUw38IuSk2TUOcfyiK8Ya3kDRpYt/RgVUftIDW2CWLbBo47kbug9+ykEF49rcnlxcCXhNXzpg4V7gw=="; + url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.3.tgz"; + sha512 = "Zev3p5xnS47YsZo5hcGGNUdISH3mkVLKSc6LMVqEIRlnc7Ay79TD9bnApeYh90k0JU1pcMh0gEqHgwVOGPTZ/w=="; }; }; "@bokeh/numbro-1.6.2" = { @@ -31,13 +40,13 @@ let sha512 = "W9tm8Qdw5BrylbZbaVWaQMgLfW/klesnj6J3FnyWpo18hCCOFApccUD8iOnRv7bF6PHlgWk84mW3JT5RSzYKjA=="; }; }; - "@luma.gl/constants-8.4.4" = { + "@luma.gl/constants-8.5.5" = { name = "_at_luma.gl_slash_constants"; packageName = "@luma.gl/constants"; - version = "8.4.4"; + version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.4.4.tgz"; - sha512 = "4e58QW6UKXkxiIvWSLoAnTc4cT8nvb0PhLzu1h8KiCuaDT5Vq8csOymcNOy/jhpfcIhHlmT1KwowF5m/DcOlKg=="; + url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.5.tgz"; + sha512 = "3pDC7jFaXliDP7Gvr6pPkorLFBXDnuakNeN87aEYcIM+p3XrkF0rPnDQJEzwScWS9RIopXT858xmL3vG7IYsDw=="; }; }; "@types/debounce-1.2.0" = { @@ -58,31 +67,31 @@ let sha512 = "0L8Mq1+oaIW0oVzGUDbSW+HnTjCNb4CmoIQE5BkoHt/A7x20z0MJ1PnwfH3atty/vbWLGgvJwVu2Mz3SKFiEFw=="; }; }; - "@types/jquery-3.5.5" = { + "@types/jquery-3.5.6" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz"; - sha512 = "6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz"; + sha512 = "SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg=="; }; }; - "@types/sizzle-2.3.2" = { + "@types/sizzle-2.3.3" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz"; - sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; + sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@types/slickgrid-2.1.30" = { + "@types/slickgrid-2.1.31" = { name = "_at_types_slash_slickgrid"; packageName = "@types/slickgrid"; - version = "2.1.30"; + version = "2.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.30.tgz"; - sha512 = "9nTqNWD3BtEVK0CP+G+mBtvSrKTfQy3Dg5/al+GdTSVMHFm37UxsHJ1eURwPg7rYu6vc7xU95fGTCKMZbxsD5w=="; + url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.31.tgz"; + sha512 = "t/LodOkh8yP+o2jKcHsC0hAjDh1kl4RSFXKWmR9+U5FwXE7VpipqiAkE1W3NnGNA3ni5xnKQJt/CNXurJWTQ6w=="; }; }; "choices.js-9.0.1" = { @@ -202,13 +211,13 @@ let sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; - "ext-1.4.0" = { + "ext-1.5.0" = { name = "ext"; packageName = "ext"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; - sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; + sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; }; }; "fast-deep-equal-2.0.1" = { @@ -283,13 +292,13 @@ let sha1 = "04ef77862cff2bb79d30f7692095930222bf60f1"; }; }; - "htm-3.0.4" = { + "htm-3.1.0" = { name = "htm"; packageName = "htm"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/htm/-/htm-3.0.4.tgz"; - sha512 = "VRdvxX3tmrXuT/Ovt59NMp/ORMFi4bceFMDjos1PV4E0mV+5votuID8R60egR9A4U8nLt238R/snlJGz3UYiTQ=="; + url = "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz"; + sha512 = "L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q=="; }; }; "jquery-3.6.0" = { @@ -310,15 +319,6 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "js-tokens-4.0.0" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - }; "json-formatter-js-2.3.4" = { name = "json-formatter-js"; packageName = "json-formatter-js"; @@ -328,15 +328,6 @@ let sha512 = "gmAzYRtPRmYzeAT4T7+t3NhTF89JOAIioCVDddl9YDb3ls3kWcskirafw/MZGJaRhEU6fRimGJHl7CC7gaAI2Q=="; }; }; - "loose-envify-1.4.0" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - }; "mgrs-1.0.0" = { name = "mgrs"; packageName = "mgrs"; @@ -364,31 +355,40 @@ let sha512 = "4RtQ1+LHJKesDCNJrXkQcwXAWCrC2aggdLYMstS/G5fEWL+fXZbUA9pwVNHFghMGuFGRATlDLNInRaPeRKzpFQ=="; }; }; - "preact-10.5.13" = { + "preact-10.5.14" = { name = "preact"; packageName = "preact"; - version = "10.5.13"; + version = "10.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/preact/-/preact-10.5.13.tgz"; - sha512 = "q/vlKIGNwzTLu+jCcvywgGrt+H/1P/oIRSD6mV4ln3hmlC+Aa34C7yfPI4+5bzW8pONyVXYS7SvXosy2dKKtWQ=="; + url = "https://registry.npmjs.org/preact/-/preact-10.5.14.tgz"; + sha512 = "KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ=="; }; }; - "proj4-2.7.2" = { + "proj4-2.7.5" = { name = "proj4"; packageName = "proj4"; - version = "2.7.2"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/proj4/-/proj4-2.7.2.tgz"; - sha512 = "x/EboBmIq48a9FED0Z9zWCXkd8VIpXHLsyEXljGtsnzeztC41bFjPjJ0S//wBbNLDnDYRe0e6c3FSSiqMCebDA=="; + url = "https://registry.npmjs.org/proj4/-/proj4-2.7.5.tgz"; + sha512 = "5ecXUXbHAfvdhfBQpU7EhUfPCQGUCPmVup/4gnZA3bJY3JcK/xxzm4QQDz1xiXokN6ux65VDczlCtBtKrTSpAQ=="; }; }; - "redux-4.0.5" = { + "redux-4.1.1" = { name = "redux"; packageName = "redux"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz"; - sha512 = "VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w=="; + url = "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz"; + sha512 = "hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw=="; + }; + }; + "regenerator-runtime-0.13.9" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.9"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "sprintf-js-1.1.2" = { @@ -400,15 +400,6 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "symbol-observable-1.2.0" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; - }; - }; "timezone-1.0.23" = { name = "timezone"; packageName = "timezone"; @@ -427,13 +418,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.2.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz"; - sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "type-1.2.0" = { @@ -463,35 +454,36 @@ let sha1 = "3013e0ea181756306f1609e959cafbc722adb3e9"; }; }; - "wkt-parser-1.2.4" = { + "wkt-parser-1.3.1" = { name = "wkt-parser"; packageName = "wkt-parser"; - version = "1.2.4"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.2.4.tgz"; - sha512 = "ZzKnc7ml/91fOPh5bANBL4vUlWPIYYv11waCtWTkl2TRN+LEmBg60Q1MA8gqV4hEp4MGfSj9JiHz91zw/gTDXg=="; + url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.1.tgz"; + sha512 = "XK5qV+Y5gsygQfHx2/cS5a7Zxsgleaw8iX5UPC5eOXPc0TgJAu1JB9lr0iYYX3zAnN3p0aNiaN5c+1Bdblxwrg=="; }; }; }; args = { name = "_at_holoviz_slash_panel"; packageName = "@holoviz/panel"; - version = "0.11.3"; + version = "0.12.1"; src = ./.; dependencies = [ - sources."@bokeh/bokehjs-2.3.1" + sources."@babel/runtime-7.15.3" + sources."@bokeh/bokehjs-2.3.3" sources."@bokeh/numbro-1.6.2" (sources."@bokeh/slickgrid-2.4.2702" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@luma.gl/constants-8.4.4" + sources."@luma.gl/constants-8.5.5" sources."@types/debounce-1.2.0" sources."@types/gl-matrix-2.4.5" - sources."@types/jquery-3.5.5" - sources."@types/sizzle-2.3.2" - sources."@types/slickgrid-2.1.30" + sources."@types/jquery-3.5.6" + sources."@types/sizzle-2.3.3" + sources."@types/slickgrid-2.1.31" sources."choices.js-9.0.1" sources."d-1.0.1" sources."debounce-1.2.1" @@ -508,7 +500,7 @@ let sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."event-emitter-0.3.5" - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -521,25 +513,23 @@ let sources."fuse.js-3.6.1" sources."gl-matrix-3.3.0" sources."hammerjs-2.0.8" - sources."htm-3.0.4" + sources."htm-3.1.0" sources."jquery-3.6.0" sources."jquery-ui-1.12.1" - sources."js-tokens-4.0.0" sources."json-formatter-js-2.3.4" - sources."loose-envify-1.4.0" sources."mgrs-1.0.0" sources."next-tick-1.0.0" sources."nouislider-14.7.0" - sources."preact-10.5.13" - sources."proj4-2.7.2" - sources."redux-4.0.5" + sources."preact-10.5.14" + sources."proj4-2.7.5" + sources."redux-4.1.1" + sources."regenerator-runtime-0.13.9" sources."sprintf-js-1.1.2" - sources."symbol-observable-1.2.0" sources."timezone-1.0.23" - sources."tslib-2.2.0" + sources."tslib-2.3.1" sources."type-1.2.0" sources."underscore.template-0.1.7" - sources."wkt-parser-1.2.4" + sources."wkt-parser-1.3.1" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/python-modules/panel/node/package.json b/pkgs/development/python-modules/panel/node/package.json index f40e3773e23b..dc1d13ab4875 100644 --- a/pkgs/development/python-modules/panel/node/package.json +++ b/pkgs/development/python-modules/panel/node/package.json @@ -1,6 +1,6 @@ { "name": "@holoviz/panel", - "version": "0.11.1", + "version": "0.12.1", "description": "A high level dashboarding library for python visualization libraries.", "license": "BSD-3-Clause", "repository": { @@ -8,7 +8,7 @@ "url": "https://github.com/holoviz/panel.git" }, "dependencies": { - "@bokeh/bokehjs": "^2.3.0", + "@bokeh/bokehjs": "^2.3.3", "@luma.gl/constants": "^8.0.3", "@types/debounce": "^1.2.0", "@types/gl-matrix": "^2.4.5", From 64a1390af9a1ce6e229101c8eeea758f8444bf84 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0735/1062] python3Packages.pathlib2: 2.3.5 -> 2.3.6 --- pkgs/development/python-modules/pathlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index b21536060d3a..757ddc7d9746 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.5"; + version = "2.3.6"; src = fetchPypi { inherit pname version; - sha256 = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"; + sha256 = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; From cc2c419d38a777cdc1794169adec7f8bf27b5248 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0736/1062] python3Packages.pathspec: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/pathspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index cd51747d5678..6a0281b756ec 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd"; + sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"; }; meta = { From 381b479519e2cd4eed98144e69d01af55162930e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0737/1062] python3Packages.pathy: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/pathy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index d656a752cf55..9108c3656dbd 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M="; + sha256 = "f83f1eddf77dd86e824143eef8d9adbe0785c3cdd5ec0ed6c0edea3227385048"; }; propagatedBuildInputs = [ smart-open typer google-cloud-storage ]; From 31472e5b25542ddac087692fba5830497bf64d36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0738/1062] python3Packages.pdoc3: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/pdoc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index 66bed253cb86..1a3996311570 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pdoc3"; - version = "0.9.2"; + version = "0.10.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1"; + sha256 = "5f22e7bcb969006738e1aa4219c75a32f34c2d62d46dc9d2fb2d3e0b0287e4b7"; }; nativeBuildInputs = [ setuptools-git setuptools-scm ]; From db9277679cd262d85a6d912b859473345ef9b0f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:40 +0200 Subject: [PATCH 0739/1062] python3Packages.phik: 0.10.0 -> 0.12.0 --- pkgs/development/python-modules/phik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index b309fb287d80..09a240f4c4a6 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "phik"; - version = "0.10.0"; + version = "0.12.0"; format = "wheel"; disabled = !isPy3k; src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "b745313c5ff9d6a3092eefa97f83fa4dbed178c9ce69161b655e95497cb2f38b"; + sha256 = "57db39d1c74c84a24d0270b63d1c629a5cb975462919895b96a8522ae0678408"; }; checkInputs = [ From 20c03afaee0ebe842c72ce0aaaa1cfc42e39aaf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0740/1062] python3Packages.pkgconfig: 1.5.4 -> 1.5.5 --- pkgs/development/python-modules/pkgconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index d51a83a05478..fc593e6a48fb 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pkgconfig"; - version = "1.5.4"; + version = "1.5.5"; inherit (pkg-config) setupHooks @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c34503829fd226822fd93c902b1cf275516908a023a24be0a02ba687f3a00399"; + sha256 = "deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899"; }; From 44335e5164af984c20a96fc4a4ccf2603bac5e83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0741/1062] python3Packages.pkginfo: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/pkginfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 1b1834e324bb..6bfed6305a8a 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"; + sha256 = "e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. From 64bc1842259ed4def55d9104ed77e927a5d6d8f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0742/1062] python3Packages.plaid-python: 7.4.0 -> 7.5.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 567fdd42d0d3..86a80c8fa6f8 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.4.0"; + version = "7.5.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "ab70467116adc110b56eb5a1fdeed726307cc216e04dda46a782aa1a1468ce0e"; + sha256 = "f4781a54d18c8a70bf0b9206004574c524e63e6a07e3fa480964a489e2d759e1"; }; checkInputs = [ pytest ]; From 41f6580d85ec064fa47f1a6dcdb87d456667ce07 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0743/1062] python3Packages.prance: 0.21.2 -> 0.21.8.0 --- .../python-modules/prance/default.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 0f18a6ad2072..105fa9e180b7 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -1,51 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , chardet -, pyyaml , requests +, ruamel_yaml , six , semver , pytestCheckHook -, pytest-cov -, pytest-runner , openapi-spec-validator }: buildPythonPackage rec { pname = "prance"; - version = "0.21.2"; + version = "0.21.8.0"; - src = fetchPypi { - inherit pname version; - sha256 = "43ebe3a5b38f0c65c428427004c4d8ce8d7155ddad50610276c89c192680f138"; + src = fetchFromGitHub { + owner = "RonnyPfannschmidt"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; - buildInputs = [ - pytest-runner - ]; - propagatedBuildInputs = [ chardet - pyyaml requests + ruamel_yaml six semver ]; checkInputs = [ pytestCheckHook - pytest-cov openapi-spec-validator ]; postPatch = '' - substituteInPlace setup.py \ - --replace "tests_require = dev_require," "tests_require = None," \ - --replace "chardet~=4.0" "" \ - --replace "semver~=2.13" "" substituteInPlace setup.cfg \ - --replace "--cov-fail-under=90" "" + --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" ''; # Disable tests that require network From 3714949e2c8530e5c7d17763af9ee70fecfd2ca5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0744/1062] python3Packages.psd-tools: 1.9.17 -> 1.9.18 --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 92810ec6a5fb..a642d6ba10d1 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.17"; + version = "1.9.18"; src = fetchPypi { inherit pname version; - sha256 = "d01e11581442dfcc1bd73ac3278bdf1f98e9df8f083a11e5989632ff97322b65"; + sha256 = "d7e510790512f0bb8150c508531c8681c3d9d0ea63b3ba9b11bbf0952cbd69a8"; }; propagatedBuildInputs = [ From a0c3cc5e50b4adb6785b59328139bf0fe968e80a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0745/1062] python3Packages.pybids: 0.13.1 -> 0.13.2 --- pkgs/development/python-modules/pybids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 97187abd7591..daa879a58a0d 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.13.1"; + version = "0.13.2"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o="; + sha256 = "9692013af3b86b096b5423b88179c6c9b604baff5a6b6f89ba5f40429feb7a3e"; }; propagatedBuildInputs = [ From 241a92b8bc9f86d37a6d075009f600d1e9aa6a2f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0746/1062] python3Packages.pybind11: 2.7.0 -> 2.7.1 --- pkgs/development/python-modules/pybind11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 3f825a06cd3c..e6be3f063fef 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iEXoNTsfsDq79bKV7A4aOCHr11rT/cqnyLghEtGsaks="; + sha256 = "13nq16pxz4vck7jn936ymhm0y0q82hd7kkw0ip7k85cx7wywzbql"; }; nativeBuildInputs = [ cmake ]; From 35acf3026b749ab20b20b4910e08710892dc0e84 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0747/1062] python3Packages.Pygments: 2.9.0 -> 2.10.0 --- pkgs/development/python-modules/Pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 640c95bfcf9f..bb17af144cbe 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f"; + sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"; }; propagatedBuildInputs = [ docutils ]; From c29f6c9a6f237db92029d56794800fc9abfd376c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0748/1062] python3Packages.pylint: 2.7.4 -> 2.10.2 --- .../python-modules/pylint/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index ef42bd43239a..2e4953ec7b9b 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,12 +1,13 @@ { stdenv , lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , installShellFiles , astroid , isort , mccabe +, platformdirs , toml , pytest-benchmark , pytest-xdist @@ -15,13 +16,15 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.7.4"; + version = "2.10.2"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee"; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hkrkgUdC5LO1oSPFL6gvIk0zFpMw45gCmnoRbdPZuRs="; }; nativeBuildInputs = [ @@ -32,6 +35,7 @@ buildPythonPackage rec { astroid isort mccabe + platformdirs toml ]; @@ -58,6 +62,12 @@ buildPythonPackage rec { "-n auto" ]; + disabledTestPaths = [ + # tests miss multiple input files + # FileNotFoundError: [Errno 2] No such file or directory + "tests/pyreverse/test_writer.py" + ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" From 989b91b786f5b932c72562285dc6b77ae14de527 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0749/1062] python3Packages.pymatgen: 2022.0.11 -> 2022.0.12 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 364514b6b5d0..56e436e96d2c 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.11"; + version = "2022.0.12"; src = fetchPypi { inherit pname version; - sha256 = "901d00105142c9added48275188e289e91b3098251ec107aef90acaef3ea6d0d"; + sha256 = "bad712c883a12d774a8a58c35abc5d582c5e5eafdbb5351dc06ebe98c28bd135"; }; nativeBuildInputs = [ glibcLocales ]; From bc0f51824a395c07db3901d3dc428190a02be0ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:41 +0200 Subject: [PATCH 0750/1062] python3Packages.pymc3: 3.11.2 -> 3.11.4 --- pkgs/development/python-modules/pymc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index e322bb14f7ba..095f3baf97ae 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.11.2"; + version = "3.11.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d3b93c8923ae8c8107c5adfd22f7c37fa0849a00a9723e0e0a0ca6afb582d6c3"; + sha256 = "3b88d1e6c85f7fb8a9b99d6f136ac860672170370ec4146338fdd160c3b3fd3f"; }; # No need for coverage stats in Nix builds From 56f0bb1063040f2a144948132dd532b574da6ab3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0751/1062] python3Packages.pynndescent: 0.5.2 -> 0.5.4 --- .../python-modules/pynndescent/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index fa9db26b5e39..7256749f8dec 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -1,43 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, nose +, joblib +, llvmlite +, numba , scikit-learn , scipy -, numba -, llvmlite -, joblib +, pytestCheckHook }: buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.2"; + version = "0.5.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0w87c2v0li2rdbx6qfc2lb6y6bxpdy3jwfgzfs1kcr4d1chj5zfr"; + sha256 = "221124cbad8e3cf3ed421a4089d80ac5a29d3215e76cb49effc1df887533d2a8"; }; propagatedBuildInputs = [ + joblib + llvmlite + numba scikit-learn scipy - numba - llvmlite - joblib ]; checkInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { description = "Nearest Neighbor Descent"; homepage = "https://github.com/lmcinnes/pynndescent"; license = licenses.bsd2; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } From d07a1995d84e6a890ae5682a651bbea3273e5c68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0752/1062] python3Packages.pyosmium: 3.1.3 -> 3.2.0 --- pkgs/development/python-modules/pyosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 6bd360036000..161fa9d24dc1 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.1.3"; + version = "3.2.0"; disabled = pythonOlder "3.4" || isPyPy; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "11ma8nr7k2ixwwb55fiqvrj5qbmpgkyfk0canz4l0m8b7rcw3qsc"; + sha256 = "0s9h1blz4vrgcvdiikbpi2d4cy69kg2s8ki4dzampm1s0pa92if5"; }; nativeBuildInputs = [ cmake ]; From ffac9d2fdeab5f19855b57707061fa386e7baee7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0753/1062] python3Packages.Pyphen: 0.10.0 -> 0.11.0 --- .../python-modules/pyphen/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 2f573b67838b..74581ba7e33c 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,14 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { - pname = "Pyphen"; - version = "0.10.0"; + pname = "pyphen"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128"; + sha256 = "e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8"; }; + preCheck = '' + sed -i '/addopts/d' pyproject.toml + ''; + + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Pure Python module to hyphenate text"; homepage = "https://github.com/Kozea/Pyphen"; From 6cecf8b0fb6d5ed7b72766a982908417adeff500 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0754/1062] python3Packages.pyrsistent: 0.17.3 -> 0.18.0 --- pkgs/development/python-modules/pyrsistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 8a6eb47a46c7..75cecc7d7091 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.17.3"; + version = "0.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"; + sha256 = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"; }; propagatedBuildInputs = [ six ]; From 32be4db17e069ab438ccee33174d6895413cd1e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0755/1062] python3Packages.pysatochip: 0.11.4 -> 0.12.3 --- .../python-modules/pysatochip/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix index f24571a78cf1..a2e726903554 100644 --- a/pkgs/development/python-modules/pysatochip/default.nix +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -1,17 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pyscard, ecdsa, pyaes -, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, certifi +, cryptography +, ecdsa +, pyaes +, pyopenssl +, pyscard +, pythonOlder +}: buildPythonPackage rec { pname = "pysatochip"; - version = "0.11.4"; + version = "0.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Jj/zZIS9aXmZ2xdi29Eun7iRIrIk9oBlrtN9+6opIMo="; + sha256 = "24db358a65c0402c299c0c62efcfbbfc98e494181cd30d3996949ac667d5b4d4"; }; - propagatedBuildInputs = [ pyscard ecdsa pyaes ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "cryptography==3.3.2" "cryptography" \ + --replace "ecdsa==0.15" "ecdsa" \ + --replace "pyopenssl==20.0.0" "pyopenssl" + ''; + + propagatedBuildInputs = [ cryptography ecdsa pyaes pyopenssl pyscard ]; + + checkInputs = [ certifi ]; pythonImportsCheck = [ "pysatochip" ]; From fea99aa83c7d0d18b83ddcd05bd6cce57ebe75d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0756/1062] python3Packages.PySDL2: 0.9.7 -> 0.9.8 --- pkgs/development/python-modules/pysdl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index be9663245bb5..26aece1afb21 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.7"; + version = "0.9.8"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e4fcc8aa1108e4917cb56794575ee08c2a3d9c2c52620474e3ecc8538dadf209"; + sha256 = "4dfa3168e4e4e9301a2cd5904bdcea15e2bf62a1c9abb5d3f92d9122ea22c26e"; }; # Deliberately not in propagated build inputs; users can decide From af7b30f846085099c0a26540564c429663db1711 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0757/1062] python3Packages.pytest-doctestplus: 0.9.0 -> 0.10.1 --- .../development/python-modules/pytest-doctestplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 01ec38458c9f..34bf587fa533 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.9.0"; + version = "0.10.1"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; + sha256 = "7e9e0912c206c53cd6ee996265aa99d5c99c9334e37d025ce6114bc0416ffc14"; }; nativeBuildInputs = [ From 09f04b71bb52399477281d9b943d1922c02dbfde Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0758/1062] python3Packages.pytest-httpx: 0.12.1 -> 0.13.0 --- pkgs/development/python-modules/pytest-httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 6e7fd37b915e..b0bc07b6c162 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "sha256-eyR0h0fW5a+L6QslTnM0TPvQCto06aMcKCE+b8LqHcQ="; + sha256 = "0lh7df3ysxmjzvx6242xb6qiwpfxrnj70kjmw5sndvzmy5dfpxfc"; }; buildInputs = [ pytest ]; From d5562b915d4464ad7c20dd7b22fee96382a08b59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0759/1062] python3Packages.pytest-xprocess: 0.17.1 -> 0.18.1 --- pkgs/development/python-modules/pytest-xprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 0695b49191b4..fcd72ce9b976 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.17.1"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6"; + sha256 = "fd9f30ed1584b5833bc34494748adf0fb9de3ca7bacc4e88ad71989c21cba266"; }; nativeBuildInputs = [ setuptools-scm ]; From f993568c8de2422508119d481d2abd3849ad4069 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0760/1062] python3Packages.python-dotenv: 0.17.1 -> 0.19.0 --- pkgs/development/python-modules/python-dotenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 6fbda114d338..22bf7ea7ece4 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.17.1"; + version = "0.19.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"; + sha256 = "f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"; }; propagatedBuildInputs = [ click ]; From 0062e76acd9eee1c277766f6d16b257c9081c4f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:42 +0200 Subject: [PATCH 0761/1062] python3Packages.python-ethtool: 0.14 -> 0.15 --- pkgs/development/python-modules/python-ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/python-ethtool/default.nix index 03c147397068..e758f4a1ef71 100644 --- a/pkgs/development/python-modules/python-ethtool/default.nix +++ b/pkgs/development/python-modules/python-ethtool/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-ethtool"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "fedora-python"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Sp7ssfLZ/1FEKrvX257pKcaureZ5mdpJ7jCEh/ft1l0="; + sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i"; }; postPatch = '' From 47d045936944f0d0bd1d081afb826fd1bd490802 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0762/1062] python3Packages.python-rapidjson: 1.0 -> 1.4 --- pkgs/development/python-modules/python-rapidjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 63dc4018b27d..a939caf49703 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.0"; + version = "1.4"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "a61fa61e41b0b85ba9e78444242fddcb3be724de1df79314e6b4766b66e4e11c"; + sha256 = "018c20d3983cccfdc9cfed64407d4ba861ef3d64fe324a486f7130431afdefa7"; }; LC_ALL="en_US.utf-8"; From ca5f966a0a52a99ee6b1881b5cfa72a31c19af34 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0763/1062] python3Packages.pyusb: 1.1.1 -> 1.2.1 --- pkgs/development/python-modules/pyusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 43ae18741e1d..05fb6b682716 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyusb"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38"; + sha256 = "a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"; }; nativeBuildInputs = [ From 765c2bc8ccb839b40c382d65ae630ac8d4c0bf2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0764/1062] python3Packages.pyvips: 2.1.14 -> 2.1.15 --- pkgs/development/python-modules/pyvips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index ea40fc573b63..c3eb750783fd 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.14"; + version = "2.1.15"; src = fetchPypi { inherit pname version; - sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; + sha256 = "8bca4077dbdc1434dcbc6759407367b6561e3505aa9555b1bc0b45989dcf50b2"; }; nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; From 38c5d622cd1db7cb5a660361a86f6bff5baa25c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0765/1062] python3Packages.pyzmq: 22.1.0 -> 22.2.1 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 5aca8d6d66c6..816c46204f88 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "22.1.0"; + version = "22.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d"; + sha256 = "6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242"; }; checkInputs = [ From 282f2f4762cb30f80ffc78c37a40367f96dcb098 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0766/1062] python3Packages.QtPy: 1.9.0 -> 1.10.0 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 17e1d9dbe83b..7ee51449ed90 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"; + sha256 = "3d20f010caa3b2c04835d6a2f66f8873b041bdaf7a76085c2a0d7890cdd65ea9"; }; # no concrete propagatedBuildInputs as multiple backends are supposed From 9f95a6274590c816c48b3b12eca624b1e356e4ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0767/1062] python3Packages.queuelib: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/queuelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 7534974237a9..cd83914669e5 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "queuelib"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "631d067c9be57e395c382d680d3653ca1452cd29e8da25c5e8d94b5c0c528c31"; + sha256 = "4b207267f2642a8699a1f806045c56eb7ad1a85a10c0e249884580d139c2fcd2"; }; buildInputs = [ pytest ]; From 04d30bfb221c2a928f57c854cba1725843063bf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0768/1062] python3Packages.r2pipe: 1.5.3 -> 1.6.0 --- pkgs/development/python-modules/r2pipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 3fbb0fb4042c..ffe784ad1995 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.5.3"; + version = "1.6.0"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8f3708195c8a6e91c5753940fd348cd821df1389d23b889b01b3e88acf407485"; + sha256 = "f7d1f629130fac597dc444df57168cf011a18abb1be2f690c8993fc5fb4c78a0"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't From 092e44148bd17c9aed6c78daf5c597b79711ae5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0769/1062] python3Packages.reportlab: 3.5.67 -> 3.6.1 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index c9f2600efe1e..71d4cd7425d1 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.67"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0cf2206c73fbca752c8bd39e12bb9ad7f2d01e6fcb2b25b9eaf94ea042fe86c9"; + sha256 = "68f9324000cfc5570b5a59a92306691b5d655078a399f20bc72c2581fe903261"; }; checkInputs = [ glibcLocales ]; From 4adbe20cfb085718f44e7c4c8acf34abb77512f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0770/1062] python3Packages.robotframework-sshlibrary: 3.6.0 -> 3.7.0 --- .../python-modules/robotframework-sshlibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 4d72a2b3b0a1..82a5fd3fed67 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.6.0"; + version = "3.7.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "169c343f4db71e1969169fa6f383ca7fff549aa8f83bdd3d9cbd03cea928b688"; + sha256 = "55bd5a11bb1fe60a5a83446e6a3e1e81b13fc671e3b660aa55912a263c1f63aa"; }; # unit tests are impure From bd29f2a7208fc08ccf720dab0157dcaebfcbbf9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:43 +0200 Subject: [PATCH 0771/1062] python3Packages.ruamel.yaml: 0.17.9 -> 0.17.14 --- pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 863b62c1bcce..f424310bfa74 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.17.9"; + version = "0.17.14"; src = fetchPypi { inherit pname version; - sha256 = "374373b4743aee9f6d9f40bea600fe020a7ac7ae36b838b4a6a93f72b584a14c"; + sha256 = "4185fcfa9e037fea9ffd0bb6172354a03ec98c21e462355d72e068c74e493512"; }; # Tests use relative paths From 2ef2b806736bbbb213b40db67aa489745164ed6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0772/1062] python3Packages.sagemaker: 2.54.0 -> 2.56.0 --- 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 2b16b99bea73..0dae21c7f0e1 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.54.0"; + version = "2.56.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uLsBHqzpcuTugRXBihdbib64l396m+os39OhP+tLLCM="; + sha256 = "049699dce6a5c5bab9cd9597985d8a722cb1495ef8af63553cd988c5cce58a1d"; }; pythonImportsCheck = [ From 63c183e1d00607cd0884dc5ae6f628239d4bd338 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0773/1062] python3Packages.scancode-toolkit: 21.6.7 -> 21.8.4 --- pkgs/development/python-modules/scancode-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index fa7dabc27293..177032aea7f3 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -37,12 +37,12 @@ }: buildPythonPackage rec { pname = "scancode-toolkit"; - version = "21.6.7"; + version = "21.8.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "056923ce556cd6d402e5cc98567cb0331a1b6349d03ec565f8ce1c9c37f3a783"; + sha256 = "c18340067244274c67e166f701c60e747e1d0bccb17efc99f277a4bc0a5a13c6"; }; dontConfigure = true; From f70342d3adcc39d91ece43e016735b3fdb72edd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0774/1062] python3Packages.schema-salad: 8.1.20210716111910 -> 8.1.20210721123742 --- pkgs/development/python-modules/schema-salad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 007cca251436..e6342b90bba4 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.1.20210716111910"; + version = "8.1.20210721123742"; src = fetchPypi { inherit pname version; - sha256 = "3f851b385d044c58d359285ba471298b6199478a4978f892a83b15cbfb282f25"; + sha256 = "1549555b9b5656cfc690716f04fb76b9fa002feb278638c446522f030632b450"; }; propagatedBuildInputs = [ From 6d559c40b93cc73408c15af54475beba57acfa93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0775/1062] python3Packages.scikit-image: 0.18.1 -> 0.18.3 --- pkgs/development/python-modules/scikit-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index f7d3fd63b17b..b34d3ff7b8de 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.18.1"; + version = "0.18.3"; src = fetchPypi { inherit pname version; - sha256 = "fbb618ca911867bce45574c1639618cdfb5d94e207432b19bc19563d80d2f171"; + sha256 = "ecae99f93f4c5e9b1bf34959f4dc596c41f2f6b2fc407d9d9ddf85aebd3137ca"; }; nativeBuildInputs = [ cython ]; From 43fb207fcd49de283d6872d3f76385763621abb5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0776/1062] python3Packages.scipy: 1.6.3 -> 1.7.1 --- pkgs/development/python-modules/scipy/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 7a9643aa7d24..2e19d2d42042 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -3,7 +3,9 @@ , fetchPypi , python , buildPythonPackage +, cython , gfortran +, pythran , nose , pytest , pytest-xdist @@ -13,18 +15,21 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.6.3"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "a75b014d3294fce26852a9d04ea27b5671d86736beb34acdfc05859246260707"; + sha256 = "6b47d5fa7ea651054362561a28b1ccc8da9368a39514c1bbf6c0977a1c376764"; }; - checkInputs = [ nose pytest pytest-xdist ]; - nativeBuildInputs = [ gfortran ]; + nativeBuildInputs = [ cython gfortran pythran ]; + buildInputs = [ numpy.blas pybind11 ]; + propagatedBuildInputs = [ numpy ]; + checkInputs = [ nose pytest pytest-xdist ]; + # Remove tests because of broken wrapper prePatch = '' rm scipy/linalg/tests/test_lapack.py @@ -41,7 +46,6 @@ buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; - # disable stackprotector on aarch64-darwin for now # # build error: From ce009e888664addbdcb84b0a814420f30e455b26 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0777/1062] python3Packages.screeninfo: 0.6.7 -> 0.7 --- pkgs/development/python-modules/screeninfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 80933043b3b9..887542130969 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -2,12 +2,12 @@ buildPythonApplication rec { pname = "screeninfo"; - version = "0.6.7"; + version = "0.7"; disabled = isPy27; # dataclasses isn't available for python2 src = fetchPypi { inherit pname version; - sha256 = "1c4bac1ca329da3f68cbc4d2fbc92256aa9bb8ff8583ee3e14f91f0a7baa69cb"; + sha256 = "12a97c3527e3544ac5dbd7c1204283e2653d655cbd15844c990a83b1b13ef500"; }; # dataclasses is a compatibility shim for python 3.6 ONLY From 534f83b126484f0cb9117f0095c4f30377bb27f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0778/1062] python3Packages.setuptools_scm: add regression note Updating to 6.1.0 and 6.2.0 causes regressions. --- .../python-modules/setuptools-scm/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index a4cff6d056b0..bb0d82dab965 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -1,12 +1,15 @@ { lib, buildPythonPackage, fetchPypi, toml }: buildPythonPackage rec { - pname = "setuptools_scm"; + pname = "setuptools-scm"; + # don't update to 6.1.0 or 6.2.0, releases were pulled because of regression + # https://github.com/pypa/setuptools_scm/issues/615 version = "6.0.1"; src = fetchPypi { - inherit pname version; - sha256 = "d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92"; + pname = "setuptools_scm"; + inherit version; + sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; }; propagatedBuildInputs = [ toml ]; From 6d4e5edb52845dba7497406bb77a98188aa1d08a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0779/1062] python3Packages.simplejson: 3.17.4 -> 3.17.5 --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 0d4d45cce5d6..52e55c71aff0 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.17.3"; + version = "3.17.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ev1vKyxexPvTT+esf9ngUcHu70Brl27P3qbS5fK2HxU="; + sha256 = "1vljsd5bk12gasadkxcddwhmp38fj64x1aqi4frk3frq9lp8h3a1"; }; checkInputs = [ From f67c04c9be25a49a153f57db54c9c12fc2ce9317 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0780/1062] python3Packages.simple-salesforce: 1.11.2 -> 1.11.3 --- pkgs/development/python-modules/simple-salesforce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 592e23578095..7a0cebc44f92 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1xysym0b1qnxck4hbj5d0l5wapwfahmkr280f6iskz2hi5j2j1yb"; + sha256 = "16bd40n0xy0vmsgi2499vc6mx57ksyjrm6v88bwxp49p9qrm4a23"; }; propagatedBuildInputs = [ From 9a98d67e476f444a0e7ed8b7a01cf81bc7acde03 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:44 +0200 Subject: [PATCH 0781/1062] python3Packages.singledispatch: 3.6.2 -> 3.7.0 --- pkgs/development/python-modules/singledispatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index 8fa62e835f22..837271b4d57c 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "singledispatch"; - version = "3.6.2"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "d5bb9405a4b8de48e36709238e8b91b4f6f300f81a5132ba2531a9a738eca391"; + sha256 = "c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092"; }; nativeBuildInputs = [ From e0a2c1b3543dcd33313cacc84d0a41fd829b20a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0782/1062] python3Packages.slack-sdk: 3.10.0 -> 3.10.1 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 6183ee7b0cba..92712b2ce41f 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.10.0"; + version = "3.10.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-FOpUO9bXrEOgYGmRmAhHnovzBafu6D2ZSLcgw0+0uzs="; + sha256 = "1m9jbn5wn892f22lxkxgahlbnwflak50hfjrydblp4agsag94nsg"; }; propagatedBuildInputs = [ From 136e531d7da6fbd91359caf4034982c1b6cddf38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 17:02:01 +0200 Subject: [PATCH 0783/1062] python3Packages.asn1: init at 2.4.1 --- .../python-modules/asn1/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/asn1/default.nix diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix new file mode 100644 index 000000000000..7a83703f862c --- /dev/null +++ b/pkgs/development/python-modules/asn1/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "asn1"; + version = "2.4.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "andrivet"; + repo = "python-asn1"; + rev = "v${version}"; + sha256 = "0g2d5cr1pxsm5ackba7padf7gvlgrgv807kh0312s5axjd2cww2l"; + }; + + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "enum-compat" "" + ''; + + pytestFlagsArray = [ "tests/test_asn1.py" ]; + + pythonImportsCheck = [ "asn1" ]; + + meta = with lib; { + description = "Python ASN.1 encoder and decoder"; + homepage = "https://github.com/andrivet/python-asn1"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f99110084352..a70e3910ae14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -565,6 +565,8 @@ in { asgiref = callPackage ../development/python-modules/asgiref { }; + asn1 = callPackage ../development/python-modules/asn1 { }; + asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; From 3ff51dc247774bd5db96f37a81ac96a54f32672d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 17:03:02 +0200 Subject: [PATCH 0784/1062] python3Packages.smart-meter-texas: 0.4.4 -> 0.4.6 --- .../python-modules/smart-meter-texas/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index f8bd6825673c..762e9534148a 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -3,13 +3,14 @@ , pythonOlder , fetchFromGitHub , aiohttp +, asn1 , python-dateutil , tenacity }: buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.4.4"; + version = "0.4.6"; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "sha256-jewibcsqWnl0OQ2oEEOSOcyyDCIGZiG4EZQfuFUbxK4="; + sha256 = "sha256-BZb02eIFYCrTDDqeo6FlGpm8LCN/GxcdKGTR5L2/DpE="; }; postPatch = '' @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + asn1 python-dateutil tenacity ]; From 1b74c8ef8b0b066671ab4e8149e576662fd8f0a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0785/1062] python3Packages.smart-meter-texas: 0.4.4 -> 0.4.7 --- pkgs/development/python-modules/smart-meter-texas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index 762e9534148a..a9364ad0d1f2 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.4.6"; + version = "0.4.7"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "sha256-BZb02eIFYCrTDDqeo6FlGpm8LCN/GxcdKGTR5L2/DpE="; + sha256 = "1hfvv3kpkc7i9mn58bjgvwjj0mi2syr8fv4r8bwbhq5sailma27j"; }; postPatch = '' From 1198d299fc6711b0cb466111d3cf7a8e989ec551 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0786/1062] python3Packages.sphinx-autoapi: 1.8.1 -> 1.8.4 --- .../python-modules/sphinxcontrib-autoapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 484b692f69f8..9f72e6f3d64f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.8.1"; + version = "1.8.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "842c0a8f49c824803f7edee31cb1cabd5001a987553bec7b4681283ec9e47d4a"; + sha256 = "8c4ec5fbedc1e6e8f4692bcc4fcd1abcfb9e8dfca8a4ded60ad811a743c22ccc"; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; From 31237d9261a5f4628170647227fc8935a46c121b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0787/1062] python3Packages.sphinxcontrib-tikz: 0.4.13 -> 0.4.14 --- .../development/python-modules/sphinxcontrib-tikz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 19f386d7d278..7409791efc45 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.13"; + version = "0.4.14"; src = fetchPypi { inherit pname version; - sha256 = "882e3ccfa202559bf77b90c93ee5eb13ec50cdd7714b3673dc6580dea7236740"; + sha256 = "1614a45c960b80009dd42f96689122c9c0781018a0c5ec5828f4cdc5e35b11ad"; }; patches = [ From 1c2d347d637114b1f71d5500331b73c2b1186704 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0788/1062] python3Packages.sqlite-utils: 3.9.1 -> 3.17 --- .../python-modules/sqlite-utils/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 35f7d7c07c98..8f5f7fd619c5 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -4,36 +4,38 @@ , pythonOlder , click , click-default-group +, dateutils , sqlite-fts4 , tabulate , pytestCheckHook -, pytest-runner -, black , hypothesis -, sqlite }: buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.9.1"; + version = "3.17"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a08ed62eb269e26ae9c35b9be9cd3d395b0522157e6543128a40cc5302d8aa81"; + sha256 = "77acd202aa568a1f6888c5d8879f306bb3f8acedc82df0df98eb615caa491abb"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; + propagatedBuildInputs = [ click click-default-group + dateutils sqlite-fts4 tabulate ]; checkInputs = [ pytestCheckHook - pytest-runner - black hypothesis ]; @@ -43,5 +45,4 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ meatcar ]; }; - } From 9fd839d25b49d619342f6963620f29066e7f1830 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0789/1062] python3Packages.ssdp: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/ssdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index ac39cffa393e..810106a656e8 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ssdp"; - version = "1.0.1"; + version = "1.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0yhjqs9jyvwmba8fi72xfi9k8pxy11wkz4iywayrg71ka3la49bk"; + sha256 = "d33575a7360aaead5341cc2ceaf47cc80b2309a7dd167c2ea45d5a5b00851665"; }; buildInputs = [ pbr ]; From 7044c68cab1d654fa59c42310b430ee0b8733e48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0790/1062] python3Packages.tableaudocumentapi: 0.6 -> 0.7 --- .../development/python-modules/tableaudocumentapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index 5260a678e8c7..56a3b27e7b96 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tableaudocumentapi"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "fc6d44b62cf6ea29916c073686e2f9f35c9902eccd57b8493f8d44a59a2f60d9"; + sha256 = "5b1d04817a0fba43d58e1ce23c64ad8dfe54dc029ba5ccae3908944555bb13e0"; }; # tests not inclued with release From f9028420ef98317fc84777d7a37bc8528a634241 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0791/1062] python3Packages.tempora: 4.0.2 -> 4.1.1 --- pkgs/development/python-modules/tempora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 8da8d622a7b3..7bd7605fc3ff 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "4.0.2"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "10fdc29bf85fa0df39a230a225bb6d093982fc0825b648a414bbc06bddd79909"; + sha256 = "c54da0f05405f04eb67abbb1dff4448fd91428b58cb00f0f645ea36f6a927950"; }; disabled = pythonOlder "3.2"; From 35f667404b5e3c4a8b466a3b3182fcd84a465b4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0792/1062] python3Packages.tensorboard_plugin_profile: 2.4.0 -> 2.5.0 --- .../python-modules/tensorboard-plugin-profile/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 1ae1aa471be5..843b9d6c3199 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -6,14 +6,15 @@ buildPythonPackage rec { pname = "tensorboard_plugin_profile"; - version = "2.4.0"; + version = "2.5.0"; format = "wheel"; src = fetchPypi { inherit pname version; format = "wheel"; + dist = "py3"; python = "py3"; - sha256 = "0z6dcjvkk3pzmmmjxi2ybawnfshz5qa3ga92kqj69ld1g9k3i9bj"; + sha256 = "16jch9py98h7wrffdiz6j0i3kdykxdp5m0kfxr1fxy2phqanpjqk"; }; propagatedBuildInputs = [ From 5185e4f2737d300d5170a75ee9b1e097e670edc0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:45 +0200 Subject: [PATCH 0793/1062] python3Packages.terminado: 0.10.1 -> 0.11.1 --- pkgs/development/python-modules/terminado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 27c159349b0a..aff355d963ce 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.10.1"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "89d5dac2f4e2b39758a0ff9a3b643707c95a020a6df36e70583b88297cd59cbe"; + sha256 = "962b402edbb480718054dc37027bada293972ecadfb587b89f01e2b8660a2132"; }; propagatedBuildInputs = [ ptyprocess tornado ]; From 401a21482d8bdd9cb2ffbe76d83eb4fb2804f94f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0794/1062] python3Packages.termplotlib: 0.3.5 -> 0.3.8 --- pkgs/development/python-modules/termplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index dae40dcb993a..492d51dcb2ca 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "termplotlib"; - version = "0.3.5"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "1z6bw6lkbrgjyq3ndsx20gwpai4scm1q9rjh4rdz0rvja4jdcv3z"; + sha256 = "10k70pb7554cc2zwkcgxfak8nb7iqqw6njbnaqfdz07l4v9f6smm"; }; format = "pyproject"; From ad1aade60837e0b3aadd38e0a2f89ea50be60ee5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0795/1062] python3Packages.tern: 2.6.1 -> 2.7.0 --- pkgs/development/python-modules/tern/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 0468ee6f84b1..b8aee5ab9315 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "tern"; - version = "2.6.1"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "749c18ef493ebe3ac28624b2b26c6e38f77de2afd6a6579d2c92393d8fbdbd46"; + sha256 = "cfd59431cafd6adf05ccb94be964098d9301f83a03bf715def7861811e4a4b74"; }; preBuild = '' From 1cb38ab16e230788b59ea3f11fb39ea8e6085428 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0796/1062] python3Packages.teslajsonpy: 0.18.3 -> 0.19.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 750b070804c3..6fefda407f90 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.18.3"; + version = "0.19.0"; format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "1hdc5gm6dg1vw6qfs3z6mg2m94scrvjphj0lin6pi8n3zqj1h26k"; + sha256 = "04ihjxysfmppwa7rnz86nd89wrqks2gwvcza8707yddzfp5hh8id"; }; nativeBuildInputs = [ From de5c47f0aa6a77ba79c68f66e589158829d8f48f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0797/1062] python3Packages.testtools: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/testtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 8ef3d9c4320f..a07117a1e46d 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8"; + sha256 = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f"; }; propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ]; From 391159b8528b7ac544f034ae2b5322d24f334bbe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0798/1062] python3Packages.texttable: 1.6.3 -> 1.6.4 --- pkgs/development/python-modules/texttable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index a8c6d9dcfda8..b104bd845962 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.3"; + version = "1.6.4"; src = fetchPypi { inherit pname version; - sha256 = "ce0faf21aa77d806bbff22b107cc22cce68dc9438f97a2df32c93e9afa4ce436"; + sha256 = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9"; }; meta = with lib; { From 442a382e36efc10f9215c070f3530ca36f071f90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0799/1062] python3Packages.tifffile: 2021.6.14 -> 2021.8.8 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 40654366ea21..236f3443ca6b 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.6.14"; + version = "2021.8.8"; src = fetchPypi { inherit pname version; - sha256 = "a2f83d82800a8d83cbd04340f9d65a6873a970874947a6b823b1b1238e84cba6"; + sha256 = "8260f31c4700143e8374ff6cde5cef7fe54fc9b7313afe88329f407881901dc5"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; From ceb6023f5e3ba78237a5a6d114603f194680743c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0800/1062] python3Packages.tox: 3.23.1 -> 3.24.3 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 035bb9701bb5..c660327ad72e 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.23.1"; + version = "3.24.3"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "307a81ddb82bd463971a273f33e9533a24ed22185f27db8ce3386bff27d324e3"; + sha256 = "c6c4e77705ada004283610fd6d9ba4f77bc85d235447f875df9f0ba1bc23b634"; }; meta = with lib; { From f73935915a38a2304d78fdc7a368972e991052b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0801/1062] python3Packages.tqdm: 4.61.1 -> 4.62.2 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index fe2eb35d4df7..babea4357a79 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.61.1"; + version = "4.62.2"; src = fetchPypi { inherit pname version; - sha256 = "24be966933e942be5f074c29755a95b315c69a91f839a29139bf26ffffe2d3fd"; + sha256 = "a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5"; }; nativeBuildInputs = [ From 9fb2f355c24a95c0f989c6a3edeeb61889843492 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0802/1062] python3Packages.trytond: 5.8.9 -> 5.8.11 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index d5ddf8f58802..ca8485d2f40f 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "5.8.9"; + version = "5.8.11"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5f14e9615ff91e18c146c74eb4c1cd56112662361a52c73389f15baced0bef18"; + sha256 = "6e9ad12ea0c6274a047ff925dffd33109b25919d4d40a90482e888077f6f9c71"; }; # Tells the tests which database to use From c6e947384026cd2db3735548fd4bf6e26faa306c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0803/1062] python3Packages.twine: 3.4.1 -> 3.4.2 --- pkgs/development/python-modules/twine/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index da5c4a9c3f51..f5809b0a9b90 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,12 +14,13 @@ buildPythonPackage rec { pname = "twine"; - version = "3.4.1"; + version = "3.4.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"; + sha256 = "4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936"; }; nativeBuildInputs = [ setuptools-scm ]; From 117ca990fff9db58270b7120c76eaa2b92e42653 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:46 +0200 Subject: [PATCH 0804/1062] python3Packages.types-pytz: 2021.1.0 -> 2021.1.2 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 2fc5cc0d4503..4b3f9c1726c8 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.1.0"; + version = "2021.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0hzjz6wgzfyybcfli4rpmfxk49cn6x3slbs2xdmlnckvlahs5pxd"; + sha256 = "448828a06f2aaa840e57364d866c661645a045e532f817e4f10c8c3ab2b66651"; }; # Modules doesn't have tests From e37a1bc679273b431ff5a21afc0553cc6545b81c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0805/1062] python3Packages.uvloop: 0.15.2 -> 0.16.0 --- pkgs/development/python-modules/uvloop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index a762ec55ee36..c7e11ab6c258 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.15.2"; + version = "0.16.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"; + sha256 = "f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"; }; buildInputs = [ From 85f10d689ba106650964d46eeb06846021d80ffb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0806/1062] python3Packages.virtualenv: 20.4.7 -> 20.7.2 --- .../python-modules/virtualenv/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 2bcfa88b6ae4..10e1ebbc87bc 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,6 +1,9 @@ -{ buildPythonPackage -, appdirs -, contextlib2 +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, isPy27 +, backports-entry-points-selectable , cython , distlib , fetchPypi @@ -8,26 +11,23 @@ , flaky , importlib-metadata , importlib-resources -, isPy27 -, lib , pathlib2 +, platformdirs , pytest-freezegun , pytest-mock , pytest-timeout , pytestCheckHook -, pythonOlder , setuptools-scm , six -, stdenv }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.4.7"; + version = "20.7.2"; src = fetchPypi { inherit pname version; - sha256 = "14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467"; + sha256 = "9ef4e8ee4710826e98ff3075c9a4739e2cb1040de6a2a8d35db0055840dc96a0"; }; nativeBuildInputs = [ @@ -35,13 +35,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs + backports-entry-points-selectable distlib filelock + platformdirs six - ] ++ lib.optionals isPy27 [ - contextlib2 - ] ++ lib.optionals (isPy27 && !stdenv.hostPlatform.isWindows) [ + ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [ pathlib2 ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources From 5604ed1ba59696d19b33118d2d2d79038df31543 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0807/1062] python3Packages.vispy: 0.6.6 -> 0.8.0 --- pkgs/development/python-modules/vispy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 849f25ef0df3..e29729a702ef 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.6.6"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "6f3c4d00be9e6761c046d520a86693d78a0925d47eeb2fc095e95dac776f74ee"; + sha256 = "89533514ffe05b16dca142a0ca455a96d14de209a1620615b1d251fa28d54b9b"; }; patches = [ From c9e68f436c59cd8374d86fa8c25345424d6f1700 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0808/1062] python3Packages.vowpalwabbit: 8.10.2 -> 8.11.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 0a75600bb0f0..1a1c6a33acb3 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.10.2"; + version = "8.11.0"; src = fetchPypi{ inherit pname version; - sha256 = "e9f7d525a6e88ebff41406409a5c31f79bb008f524fc63a61dc74bac6a1ac887"; + sha256 = "cfde0515a3fa4d224aad5461135372f3441ae1a64717ae6bff5e23509d70b0bd"; }; nativeBuildInputs = [ From 3185a19579d51b0348cc2c9b9cff99b11d97da01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0809/1062] python3Packages.watchdog: 2.1.4 -> 2.1.5 --- pkgs/development/python-modules/watchdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 921ed5af4aa1..7dab01b3ca09 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.3"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5SNqjoYCq220uHNmTC01bDZas8rJb73sSXCtYWQV3UU="; + sha256 = "5563b005907613430ef3d4aaac9c78600dd5704e84764cb6deda4b3d72807f09"; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 4f7e5261d2c0eb6105b03ac944326c40391b85f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0810/1062] python3Packages.webargs: 8.0.0 -> 8.0.1 --- pkgs/development/python-modules/webargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index 6db909992f48..63ad60c9f084 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.0.0"; + version = "8.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0xy6na8axc5wnp2wg3kvqbpl2iv0hx0rsnlrmrgkgp88znx6cmjn"; + sha256 = "bcce022250ee97cfbb0ad07b02388ac90a226ef4b479ec84317152345a565614"; }; pythonImportsCheck = [ From 43419be12869542001901db1006ab374ffd0afa8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0811/1062] python3Packages.xarray: 0.18.2 -> 0.19.0 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 675461a63cc6..ee07adeb9d5b 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.18.2"; + version = "0.19.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5d2e72a228286fcf60f66e16876bd27629a1a70bf64822c565f16515c4d10284"; + sha256 = "3a365ce09127fc841ba88baa63f37ca61376ffe389a6c5e66d52f2c88c23a62b"; }; nativeBuildInputs = [ setuptools-scm ]; From c0919a1defe884060d9688abcda1fbc72809714f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0812/1062] python3Packages.xml2rfc: 3.8.0 -> 3.9.1 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index c975218e5b1d..b623fc37c224 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.8.0"; + version = "3.9.1"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "8e25a9d73acf57ade798fc67841277dbbdb81ced390e6f84362370305b127426"; + sha256 = "76cee167e81fc3cc0e0cc696fe58cadd039e19a774c8f4d2e5c0fea724c7aaca"; }; propagatedBuildInputs = [ From a0892d65644b3c0dec79799ab4d60aecfbef4ef8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0813/1062] python3Packages.yamlloader: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/yamlloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index d2b66cb073d7..97da02102c7f 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "yamlloader"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e96dc3dc6895d814c330c054c966d993fc81ef1dbf5a30a4bdafeb256359e058"; + sha256 = "8a297c7a197683ba02e5e2b882ffd6c6180d01bdefb534b69cd3962df020bfe6"; }; propagatedBuildInputs = [ From c0eb736b43289ace0d46fcfa74c702fdb7969027 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:47 +0200 Subject: [PATCH 0814/1062] python3Packages.ytmusicapi: 0.18.0 -> 0.19.1 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 6ec5fda2ca58..77a579eba9c7 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.18.0"; + version = "0.19.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-RH0ballPSZQvesdUEsulnBkbbzVA2YrGWhMzRFvuwW0="; + sha256 = "1b8a050e2208b3d05359106d8c44c3d62e60edf6753529bd8a207788a6caeb95"; }; propagatedBuildInputs = [ From 0f3b165f74d64f40eb9885709a5e1e93f504c25c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0815/1062] python3Packages.zarr: 2.9.1 -> 2.9.3 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 9fc5589d281d..3bcfaece12a6 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.9.1"; + version = "2.9.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "688afec069e0f85b87c1ef4572766f998309c64ab7bea1884cec60e92d109544"; + sha256 = "274d2c1642fab6b4ddd4e465df3cdd456a5f821ed9a425a075436b1d2110bf36"; }; nativeBuildInputs = [ From 8e2a023b19b77c6d4bc472603fb3af7ad63683de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0816/1062] python3Packages.zigpy-znp: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 474e7f309e34..f8413d9aa17f 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nnA/gVXBpCZFkspcO6kF3ZkEDu0vV0d9p1WNGVrN0u8="; + sha256 = "0jki9qmjazh0by02c0w17dyaz0nl3gzjiy064mj6pi502d175831"; }; propagatedBuildInputs = [ From 0fabceffed4e479f1f7344102dcc84f9408695c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0817/1062] python3Packages.zipp: 3.4.1 -> 3.5.0 --- pkgs/development/python-modules/zipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 7ef26dbd7606..21cb9e6269f1 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zipp"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"; + sha256 = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"; }; nativeBuildInputs = [ setuptools-scm toml ]; From 2caba5a6e70b7a19bed9f6ce35385ab49aa9adf9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0818/1062] python3Packages.zope.component: 5.0.0 -> 5.0.1 --- pkgs/development/python-modules/zope_component/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index 41c15fcd1307..a5cbcffe4336 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "5.0.0"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "df541a0501c79123f9ac30c6686a9e45c2690c5c3ae4f2b7f4c6fd1a3aaaf614"; + sha256 = "32cbe426ba8fa7b62ce5b211f80f0718a0c749cc7ff09e3f4b43a57f7ccdf5e5"; }; propagatedBuildInputs = [ From 44a8527028d22a9443cabb0dbbb2bd036e6762a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:32:48 +0200 Subject: [PATCH 0819/1062] python3Packages.zope.proxy: 4.3.5 -> 4.4.0 --- pkgs/development/python-modules/zope_proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 67e8a191d97a..2d1a5880d0de 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.3.5"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a66a0d94e5b081d5d695e66d6667e91e74d79e273eee95c1747717ba9cb70792"; + sha256 = "b244904c5148067c3f1899d29a2c1a28faca747b143192c0f825e6bf3170a347"; }; propagatedBuildInputs = [ zope_interface ]; From ce96fdb511c1e86845ace5ed98adde1a89d09e7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:04 +0200 Subject: [PATCH 0820/1062] python3Packages.aioprocessing: 1.1.0 -> 2.0.0 --- pkgs/development/python-modules/aioprocessing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index 2f6b39678489..a4571a79b05d 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; From 33abd7b5a93c0cbb71d08a44fbfc3d4238e4f110 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0821/1062] python3Packages.aioredis: 1.3.1 -> 2.0.0 --- .../python-modules/aioredis/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index fe48ba0e1e18..807b112772cf 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -1,20 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi -, pkgs, async-timeout, hiredis, isPyPy, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, async-timeout +, typing-extensions +, hiredis +, isPyPy +, pythonOlder }: buildPythonPackage rec { pname = "aioredis"; - version = "1.3.1"; + version = "2.0.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; + sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db"; }; propagatedBuildInputs = [ async-timeout + typing-extensions ] ++ lib.optional (!isPyPy) hiredis; # Wants to run redis-server, hardcoded FHS paths, too much trouble. From d2553921eb14a7587963715423c1d5435cadd8d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0822/1062] python3Packages.ansible-runner: 1.4.7 -> 2.0.2 --- pkgs/development/python-modules/ansible-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index ba11ef11e3b8..9dc8eadb7775 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.4.7"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1bb56f9061c3238d89ec8871bc842f5b8d0e868f892347e8455c98d5b6fa58a1"; + sha256 = "c02b690803ec0be4453411c53743cd3fdca1dfc66dfa075794e14e717c5b61b3"; }; checkInputs = [ pytest mock ]; From 4950f707d13df5c415e7e261742bc52f6ce484f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0823/1062] python3Packages.apispec: 4.7.1 -> 5.1.0 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 2753864fed81..c5777d7c5173 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.7.1"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1yf71c9nq1rfb5pkgmfw486fvywi1bjnmgwxcly7y3basf3980kr"; + sha256 = "9ac7a7a6000339a02d05404ef561e013375f170de01d8b238782f8fb83082b5b"; }; propagatedBuildInputs = [ From 8eb0df5f4c9202eebf221d15955f413b989a36d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0824/1062] python3Packages.azure-mgmt-iothubprovisioningservices: 0.3.0 -> 1.0.0 --- .../azure-mgmt-iothubprovisioningservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index dcf97249e7f9..f8a48243571b 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "0.3.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d01b7725f3f68c5a6ff02184a9bdda8c775888af66378dd8314903d0a46e32b9"; + sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; }; propagatedBuildInputs = [ From 35cd9fcaec1c5fd3c78b62a2b81d81340147e028 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0825/1062] python3Packages.azure-mgmt-apimanagement: 0.3.0 -> 2.1.0 --- .../azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 6cf775c2118e..4c7233203bb9 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "2.1.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ec363581ef950945447e45d259441cb690a4b790057c7b8470ad8a6eeca04feb"; + sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; extension = "zip"; }; From 5bb500696962b4228b736c2f93fefe9104420c68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:05 +0200 Subject: [PATCH 0826/1062] python3Packages.azure-mgmt-recoveryservices: 1.0.0 -> 2.0.0 --- .../python-modules/azure-mgmt-recoveryservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index d1f49355f8b9..29b0dd2eb1ca 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ab87108c0d5ce27d80583b4bfad966ad07049dcbc0e9ac28c64aa6bbdae64e22"; + sha256 = "a7d3137d5c460f50ac2d44061d60a70b4f2779d4ca844b77419b5725e65e09be"; }; propagatedBuildInputs = [ From 71172c045e039e9b28ee2d5aed0519e6ee1d7290 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0827/1062] python3Packages.block-io: 1.1.15 -> 2.0.4 --- pkgs/development/python-modules/block-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index b823b8711a53..a76132e3e211 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.15"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "97ea037a67af72037cb08cec7e0a9f7866ecdfaa1a8c8ebcc0f4b9359a1516d7"; + sha256 = "817c9cd2ff76659caca4bb3d6758d5782a85f8c0ea13b08c4e14f0c2a8b7586d"; }; propagatedBuildInputs = [ From 9e7c3e60eb714c5efeee46600d23d055a3c8f6a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0828/1062] python3Packages.casbin: 0.20.0 -> 1.5.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 3f2b26e9c5f9..0cadf449ea88 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.20.0"; + version = "1.5.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1j7kd4rvf4myg4x4sm4njlhzkxm2m3cva9wmp9vx0nnpfdlyb67f"; + sha256 = "0sxv9kyzi7kzpljv1mrglz5szfxmqjmmnbcdn8mr0vwx3xibjb9j"; }; propagatedBuildInputs = [ From e5099b5f44f1c3301048b6fb2c724d252ffcfc4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0829/1062] python3Packages.chart-studio: 4.14.3 -> 5.2.2 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index e059725cad24..a373246d49f7 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "4.14.3"; + version = "5.2.2"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "1yrrcn9032r3l8y2cc1wvpydg4rkqvgkpyv1s7znby5mrxa1rjma"; + sha256 = "14msi6i2caca5riirfv81nskh8w3avnflyr2phm62kygk125h1v7"; }; sourceRoot = "source/packages/python/chart-studio"; From d079713eb80f0aea94d058186ff9d898512a6e7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0830/1062] python3Packages.cmd2: 1.5.0 -> 2.1.2 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index b5bbc88c341f..f330a309ebf6 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.5.0"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62"; + sha256 = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41"; }; LC_ALL="en_US.UTF-8"; From 77921fe49e5a3510e441457e17bc5bbe5e025454 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0831/1062] python3Packages.colorlog: 5.0.1 -> 6.4.1 --- pkgs/development/python-modules/colorlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 39b64e4faf3e..6abb6ff023ad 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "5.0.1"; + version = "6.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8XwBOgaWKwL0RJ7gfP2+ayh98p78LJoVFbSjdvTliOo="; + sha256 = "af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8"; }; checkInputs = [ pytestCheckHook ]; From 2e4d6b13573ff9f4c92c46c9f277469e8d8e21f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0832/1062] python3Packages.contextlib2: 0.6.0.post1 -> 21.6.0 --- pkgs/development/python-modules/contextlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 38d9fb696e28..1387e786e7b7 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "contextlib2"; - version = "0.6.0.post1"; + version = "21.6.0"; src = fetchPypi { inherit pname version; - sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; + sha256 = "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"; }; checkInputs = [ unittest2 ]; From 9c4a68a2519842d78543ef5cdb2ffb236d8a80e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0833/1062] python3Packages.cupy: 8.6.0 -> 9.4.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 6a072ab8e1a7..c165c9af7a20 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "8.6.0"; + version = "9.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f3ed02ba18e38b4f3ed2c324fa08967e6714f59357ccb0b28badd9572e77500b"; + sha256 = "4402bd33a051e82f6888dab088a8d657714ca6d1e945b513dcc513a95a435bd5"; }; preConfigure = '' From 6ca29e635d75f827ae3328b9e96ef938b4e4aca3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0834/1062] python3Packages.decorator: 4.4.2 -> 5.0.9 --- pkgs/development/python-modules/decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 8e8fd28f0b54..f8d3f5c9ac61 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.4.2"; + version = "5.0.9"; src = fetchPypi { inherit pname version; - sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; + sha256 = "72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5"; }; meta = with lib; { From 3b8c638b4f95ebf0bafc78d6585cfe72eee22c9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:06 +0200 Subject: [PATCH 0835/1062] python3Packages.django-cacheops: 5.1 -> 6.0 --- pkgs/development/python-modules/django-cacheops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index c9344d3bd010..58900ac2cbf4 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "django-cacheops"; - version = "5.1"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0="; + sha256 = "78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841"; }; propagatedBuildInputs = [ From a7d01b6c8451db1651796ceb962728436f80d88d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0836/1062] python3Packages.frozendict: 1.2 -> 2.0.5 --- .../python-modules/frozendict/default.nix | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index e172f3815b7e..4acf53563ded 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -1,16 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytestCheckHook +, setuptoolsBuildHook +, python +}: buildPythonPackage rec { pname = "frozendict"; - version = "1.2"; + version = "2.0.5"; # 2.0.6 breaks canonicaljson + format = "setuptools"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + sha256 = "sha256-wb7hwHDY2fZA4SjluHV2pEAAhgCfeGLRPAv4YA5iE9M="; }; - # frozendict does not come with tests - doCheck = false; + pythonImportsCheck = [ + "frozendict" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -r frozendict + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + + disabledTests = [ + # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' + "test_union" + ]; + + disabledTestPaths = [ + # unpackaged test dependency: coold + "test/test_coold.py" + "test/test_coold_subclass.py" + ]; meta = with lib; { homepage = "https://github.com/slezica/python-frozendict"; From 7013c192136ad3fcd07d0a4bc5471ec23653009c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0837/1062] python3Packages.gcovr: 4.2 -> 5.0 --- pkgs/development/python-modules/gcovr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 1332777189b1..71480ab21131 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gcovr"; - version = "4.2"; + version = "5.0"; src = fetchPypi { inherit pname version; - sha256 = "0gyady7x3v3l9fm1zan0idaggqqcm31y7g5vxk7h05p5h7f39bjs"; + sha256 = "1d80264cbaadff356b3dda71b8c62b3aa803e5b3eb6d526a24932cd6660a2576"; }; propagatedBuildInputs = [ From aaf0f6695930797ea0a57d7a28414618abdec3b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0838/1062] python3Packages.IMDbPY: 2020.9.25 -> 2021.4.18 --- pkgs/development/python-modules/imdbpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imdbpy/default.nix b/pkgs/development/python-modules/imdbpy/default.nix index dea62f080093..ab7575f99be8 100644 --- a/pkgs/development/python-modules/imdbpy/default.nix +++ b/pkgs/development/python-modules/imdbpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "IMDbPY"; - version = "2020.9.25"; + version = "2021.4.18"; src = fetchPypi { inherit pname version; - sha256 = "1p3j9j1jcgbw4626cvgpryhvczy9gzlg0laz6lflgq17m129gin2"; + sha256 = "af57f03638ba3b8ab3d696bfef0eeaf6414385c85f09260aba0a16b32174853f"; }; patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update From fb10215d3bed3c6fd0aa2a2aa966823f2849abb4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0839/1062] python3Packages.ipykernel: 5.5.5 -> 6.2.0 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 0d44c406349d..db87d371e3f2 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.5.5"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e976751336b51082a89fc2099fb7f96ef20f535837c398df6eab1283c2070884"; + sha256 = "4439459f171d77f35b7f7e72dace5d7c2dd10a5c9e2c22b173ad9048fbfe7656"; }; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; From afbe19aee55e07c04f37d9debacb623d6f840b5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0840/1062] python3Packages.islpy: 2020.2.2 -> 2021.1 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 736588aa4504..918d8be8e9f1 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2020.2.2"; + version = "2021.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7eb7dfa41d6a67d9ee4ea4bb9f08bdbcbee42b364502136b7882cfd80ff427e0"; + sha256 = "b3f49de925149dbf2482e648016507cd66d0dce6668a1bc4de5e7a937e9c576d"; }; postConfigure = '' From 6bff5e71cd181f1ea2673f09651144f1acd7c0ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:07 +0200 Subject: [PATCH 0841/1062] python3Packages.jira: 2.0.0 -> 3.0.1 --- .../python-modules/jira/default.nix | 58 +++++++++++++------ .../python-modules/jira/sphinx-fix.patch | 11 ---- 2 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/jira/sphinx-fix.patch diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index a3f790abfc51..c7d8207aa3d9 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,34 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytest-runner, pbr, glibcLocales , pytest-cov -, requests, requests_oauthlib, requests-toolbelt, defusedxml -, ipython +{ lib +, buildPythonPackage +, fetchFromGitHub +, defusedxml +, flaky +, keyring +, requests-mock +, requests_oauthlib +, requests-toolbelt +, setuptools-scm +, setuptools-scm-git-archive +, pytestCheckHook }: buildPythonPackage rec { pname = "jira"; - version = "2.0.0"; + version = "3.0.1"; - PBR_VERSION = version; - - src = fetchPypi { - inherit pname version; - sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; + src = fetchFromGitHub { + owner = "pycontribs"; + repo = pname; + rev = version; + sha256 = "sha256-hAUAzkHPXFDlKEom+dkzr8GQ+sqK2Ci1/k+QuSNvifE="; }; - buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; - propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report=xml --cov jira" "" + ''; + + nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + defusedxml + keyring + requests_oauthlib + requests-toolbelt + ]; + + checkInputs = [ + flaky + pytestCheckHook + requests-mock + ]; # impure tests because of connectivity attempts to jira servers doCheck = false; - patches = [ ./sphinx-fix.patch ]; - - LC_ALL = "en_US.utf8"; - - disabled = !isPy3k; - meta = with lib; { description = "This library eases the use of the JIRA REST API from Python."; + homepage = "https://github.com/pycontribs/jira"; license = licenses.bsd2; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/jira/sphinx-fix.patch b/pkgs/development/python-modules/jira/sphinx-fix.patch deleted file mode 100644 index ccc47ac4b9cf..000000000000 --- a/pkgs/development/python-modules/jira/sphinx-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/setup.py b/setup.py -index c49a24d..31aeec2 100644 ---- a/setup.py -+++ b/setup.py -@@ -11,5 +11,5 @@ except ImportError: - - - setuptools.setup( -- setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner', 'sphinx>=1.6.5'], -+ setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner'], - pbr=True) From ef43699055aeced124191fc48d390248f0c17c9d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0842/1062] python3Packages.jupyter_client: 6.2.0 -> 7.0.1 --- .../python-modules/jupyter_client/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 2c0a6c398864..35faf676f378 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,30 +1,34 @@ { lib , buildPythonPackage , fetchPypi -, traitlets +, entrypoints , jupyter_core -, pyzmq +, nest-asyncio , python-dateutil +, pyzmq +, tornado +, traitlets , isPyPy , py -, tornado }: buildPythonPackage rec { pname = "jupyter_client"; - version = "6.2.0"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "e2ab61d79fbf8b56734a4c2499f19830fbd7f6fefb3e87868ef0545cb3c17eb9"; + sha256 = "48822a93d9d75daa5fde235c35cf7a92fc979384735962501d4eb60b197fb43a"; }; propagatedBuildInputs = [ - traitlets + entrypoints jupyter_core - pyzmq + nest-asyncio python-dateutil + pyzmq tornado + traitlets ] ++ lib.optional isPyPy py; # Circular dependency with ipykernel From d033a39ca86c199849fb9cead03013f8a0866b6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0843/1062] python3Packages.kubernetes: 12.0.1 -> 18.20.0 --- pkgs/development/python-modules/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 952527d5cab7..e90f72b0fd25 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "12.0.1"; + version = "18.20.0"; prePatch = '' sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ec52ea01d52e2ec3da255992f7e859f3a76f2bdb51cf65ba8cd71dfc309d8daa"; + sha256 = "0c72d00e7883375bd39ae99758425f5e6cb86388417cf7cc84305c211b2192cf"; }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; From 1ab7960a342b2218225de12d9f805b967a0e7ef1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0844/1062] python3Packages.labelbox: 2.7.0 -> 3.1.0 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index cb098cd7ef10..97417b663652 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.7.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "V${version}"; - sha256 = "0bvfxs4g9cxj9npy7qckxsgxwgfg0cdmyywdw5lrfs926iq4ydq1"; + sha256 = "0hqjwilz1d5jidgsambr2zrp4czy53rq01p2ib6mndzsdh86nv7w"; }; propagatedBuildInputs = [ From 27a98c666986cb6dd760652c33643238a51af6cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0845/1062] python3Packages.lexid: 2020.1005 -> 2021.1006 --- pkgs/development/python-modules/lexid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 4307d52d8913..400643383773 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "lexid"; - version = "2020.1005"; + version = "2021.1006"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "52333a2b9ebd14aa0dfeb33de72bd159c2dc31adb9c59cddfc486e2b69bfdcd1"; + sha256 = "509a3a4cc926d3dbf22b203b18a4c66c25e6473fb7c0e0d30374533ac28bafe5"; }; propagatedBuildInputs = [ click ]; From e43c239ea694fbfd3c9b12424f73f614099aa426 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0846/1062] python3Packages.libarchive-c: 2.9 -> 3.1 --- .../python-modules/libarchive-c/default.nix | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 73d99afda674..48262398fcbf 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -1,23 +1,26 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage -, fetchPypi -, pytest -, glibcLocales +, pythonAtLeast +, fetchFromGitHub , libarchive +, glibcLocales , mock +, pytestCheckHook }: buildPythonPackage rec { pname = "libarchive-c"; - version = "2.9"; + version = "3.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9919344cec203f5db6596a29b5bc26b07ba9662925a05e24980b84709232ef60"; + src = fetchFromGitHub { + owner = "Changaco"; + repo = "python-${pname}"; + rev = version; + sha256 = "1z4lqy9zlzymshzrcldsc9ipys2l7grqg4yff6ndl6dgbfb0g4jb"; }; - checkInputs = [ mock pytest glibcLocales ]; - LC_ALL="en_US.UTF-8"; postPatch = '' @@ -25,9 +28,20 @@ buildPythonPackage rec { "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - checkPhase = '' - py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar' - ''; + pythonImportsCheck = [ + "libarchive" + ]; + + checkInputs = [ + glibcLocales + mock + pytestCheckHook + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.9") [ + # causes python3.9 to segfault + "test_custom_writer_and_stream_reader" + ]; meta = with lib; { homepage = "https://github.com/Changaco/python-libarchive-c"; From 1c5b0d70486a632a57f76801121db451b20e16bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0847/1062] python3Packages.marshmallow-oneofschema: 2.1.0 -> 3.0.1 --- .../python-modules/marshmallow-oneofschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index 343c5952a434..a4b15ce9a544 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "2.1.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0s0yr7nv06sfgxglghl2vq74g3m49j60k1hi2qzfsv4bj8hvs35k"; + sha256 = "62cd2099b29188c92493c2940ee79d1bf2f2619a71721664e5a98ec2faa58237"; }; propagatedBuildInputs = [ marshmallow setuptools ]; From c1340d92b2052b524e39f8add83a7c1186d3a29a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0848/1062] python3Packages.mitmproxy: 6.0.2 -> 7.0.2 --- pkgs/development/python-modules/mitmproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index e9c12548269f..a6638fc6ff49 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "6.0.2"; + version = "7.0.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-FyIZKFQtf6qvwo4+NzPa/KOmBCcdGJ3jCqxz26+S2e4="; + sha256 = "0y5zsay9b6xgibs6m4gckw63jip35vsdfajsh1nw2zcb2xs1a7qs"; }; propagatedBuildInputs = [ From 3b6ec95728cd8e06089fbd4519a32299431939f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0849/1062] python3Packages.nbdime: 2.1.0 -> 3.1.0 --- pkgs/development/python-modules/nbdime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 96fc94d43e85..a4cbe11fbe7a 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "2.1.0"; + version = "3.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4e3efdcfda31c3074cb565cd8e76e2e5421b1c4560c3a00c56f8679dd15590e5"; + sha256 = "12dc4390b355b26d07ac8d11d50efbcb54bae0ad5842b817131babd2f4567963"; }; checkInputs = [ From 2a5f007e94292bb3b61b2844bd18cbe767abf422 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0850/1062] python3Packages.plaid-python: 7.5.0 -> 8.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 86a80c8fa6f8..72b507a470b4 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.5.0"; + version = "8.0.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "f4781a54d18c8a70bf0b9206004574c524e63e6a07e3fa480964a489e2d759e1"; + sha256 = "ce11a832e04889972809b257e0351e4cc70fd3b5d31de2b97cc9df732a3dcc9b"; }; checkInputs = [ pytest ]; From ceb9142c20446e36b517557c8ca1e06454c6452a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0851/1062] python3Packages.plotly: 4.14.3 -> 5.2.2 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index e2496d6097d9..aef078143b07 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.14.3"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "14cxlfl79i9bh3awsf4xgwr14ywm7lnrz2a81s7gp0if77nsx2kx"; + sha256 = "809f0674a7991daaf4f287964d617d24e9fa44463acd5a5352ebd874cfd98b07"; }; propagatedBuildInputs = [ From 3f44f9d6c5d1e6b111c059be271fa99ccd54d904 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:08 +0200 Subject: [PATCH 0852/1062] python3Packages.pluggy: 0.13.1 -> 1.0.0 --- pkgs/development/python-modules/pluggy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 30fa2e1945b2..1a1c23f22d0a 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pluggy"; - version = "0.13.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; + sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"; }; checkPhase = '' From 1a5c4d7cbf0d36888348077f048994973257a090 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0853/1062] python3Packages.priority: 1.3.0 -> 2.0.0 --- pkgs/development/python-modules/priority/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index a699f6ff812f..0f11347a74b8 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "priority"; - version = "1.3.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb"; + sha256 = "c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"; }; patches = [ From 741e169039315e8c2802563920edb9b724dc9112 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0854/1062] python3Packages.pudb: 2020.1 -> 2021.1 --- pkgs/development/python-modules/pudb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index af653f260cd3..6df85ca5f089 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2020.1"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "2ef23d3371439f13fffbe7f8b9fc180a19d4183dc9cab204d878d7c7766464bf"; + sha256 = "309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e"; }; propagatedBuildInputs = [ pygments urwid ]; From d3bdb2801c4fe07efaaa2eb3df5d88ac41bb27c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0855/1062] python3Packages.Pykka: 2.0.3 -> 3.0.1 --- pkgs/development/python-modules/pykka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 075b607c772e..f219375f93ef 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Pykka"; - version = "2.0.3"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4b9d2363365b3455a0204bf163f09bd351d24b938c618c79d975a9510e128e95"; + sha256 = "da59f77bc6a70e01996259da806d09b0dbc00dabe874ca9558fd5eb1698709c9"; }; checkInputs = [ pytestCheckHook pytest-mock ]; From a033310082d96052088255e2866981abea54ebe7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0856/1062] python3Packages.pyramid: 1.10.8 -> 2.0 --- pkgs/development/python-modules/pyramid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 95333f746d0c..da9569b7fb73 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.8"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "b7cd66595bef92f81764b976ddde2b2fa8e4f5f325e02f65f6ec7f3708b29cf6"; + sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; }; checkInputs = [ webtest zope_component ]; From c9200d3cc5d7bc7a0da85402e8ba673dfd4f8c42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0857/1062] python3Packages.pytest-isort: 1.3.0 -> 2.0.0 --- pkgs/development/python-modules/pytest-isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index fe74f692df5e..e628e6a158c5 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "1.3.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "46a12331a701e2f21d48548b2828c8b0a7956dbf1cd5347163f537deb24332dd"; + sha256 = "821a8c5c9c4f3a3c52cfa9c541fbe89ac9e28728125125af53724c4c3f129117"; }; propagatedBuildInputs = [ isort ]; From 586bdc4ec888aee92f4acc10eaf1b8619883a89d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0858/1062] python3Packages.pytube: 10.9.3 -> 11.0.0 --- pkgs/development/python-modules/pytube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index 93ff39360830..c71043b71b2a 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.9.3"; + version = "11.0.0"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-x4u68O9dNhDZ+1Q+S4ou6zPqoR2/Yn5lcKgR2kyM/uo="; + sha256 = "1n5zl1x1izyzbrsgf76lk1av6h5m6a69plmhrcjynl880dji2na9"; }; checkInputs = [ From 3a3604f2904da8374437a0562aa08c8546fa1cbb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0859/1062] python3Packages.rdflib: 5.0.0 -> 6.0.0 --- pkgs/development/python-modules/rdflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 261ba794e70a..5b16e2f744e2 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rdflib"; - version = "5.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q"; + sha256 = "7ce4d757eb26f4dd43205ec340d8c097f29e5adfe45d6ea20238c731dc679879"; }; propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; From 4f04b63d4c17deba06dbebe0f28d15e14d517ea2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0860/1062] python3Packages.sphinxcontrib-htmlhelp: 1.0.3 -> 2.0.0 --- .../python-modules/sphinxcontrib-htmlhelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 8ca631a2b3c9..4efdb2633f28 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "1.0.3"; + version = "2.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"; + sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; }; From ecf4cf51262718c965a23a49a628fa18607fe251 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:09 +0200 Subject: [PATCH 0861/1062] python3Packages.spyder: 4.2.5 -> 5.1.1 --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 5aaf4cb4a757..dbe54d52e3a9 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.2.5"; + version = "5.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "03159003f6ea51458e10000091e65e77888b095dba48e64ca2b36c75a648580c"; + sha256 = "6551acfd6fedfebd1f938ef67d3db415b33540f8377e7de3f4d4a2a11dd1b915"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From eee07e2fa07ed1b81ebca5bf68c0cb436d8c08ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0862/1062] python3Packages.spyder-kernels: 1.10.3 -> 2.1.0 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index fa29236563e4..5ce41d8d7575 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.10.3"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "cecb0ca0115a42bab864c199a737c859a8534a510fc7edfa33dc42abcbb5287f"; + sha256 = "6c287207c7855bb581eae66ef8d990407382d5f9caccb1e0cabf909aaaf10c9b"; }; propagatedBuildInputs = [ From 7a157c2cce93195efa6bd07a66b56ca3e276d395 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0863/1062] python3Packages.sure: 1.4.11 -> 2.0.0 --- pkgs/development/python-modules/sure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index ee21e9c45168..b8bb9a36586a 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "sure"; - version = "1.4.11"; + version = "2.0.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "3c8d5271fb18e2c69e2613af1ad400d8df090f1456081635bd3171847303cdaa"; + sha256 = "34ae88c846046742ef074036bf311dc90ab152b7bc09c342b281cebf676727a2"; }; buildInputs = [ rednose ]; From a277bb28a635d3d052a94fb1dbc8405f3eb26883 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0864/1062] python3Packages.towncrier: 19.9.0 -> 21.3.0 --- .../development/python-modules/towncrier/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 6b699a2fbc24..83215f5e0af3 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -3,6 +3,7 @@ , click-default-group , incremental , jinja2 +, mock , pytestCheckHook , toml , twisted @@ -11,11 +12,11 @@ buildPythonPackage rec { pname = "towncrier"; - version = "19.9.0"; + version = "21.3.0"; src = fetchPypi { inherit pname version; - sha256 = "19916889879353a8863f3de8cb1ef19b305a0b5cfd9d36159d76ca2fef08e9aa"; + sha256 = "6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe"; }; propagatedBuildInputs = [ @@ -28,7 +29,12 @@ buildPythonPackage rec { # zope.interface collision doCheck = !isPy27; - checkInputs = [ git twisted pytestCheckHook ]; + checkInputs = [ + git + mock + twisted + pytestCheckHook + ]; pythonImportsCheck = [ "towncrier" ]; meta = with lib; { From 8f0b61ca9f6e11918fa5a0d9f39ba47397301cd0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0865/1062] python3Packages.trytond: 5.8.11 -> 6.0.5 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index ca8485d2f40f..75e1ee68e4b3 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "5.8.11"; + version = "6.0.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6e9ad12ea0c6274a047ff925dffd33109b25919d4d40a90482e888077f6f9c71"; + sha256 = "3ccb98dbf905d99991ed0151e13c91cd9267e4aa104fa40097df4e02580dadfc"; }; # Tells the tests which database to use From 5794e6b0efb2e6a51bfa707d80f7ac415b8d356b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0866/1062] python3Packages.vivisect: 0.2.1 -> 1.0.4 --- pkgs/development/python-modules/vivisect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index 43e54bda9d6c..5dc8bc2254d4 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "vivisect"; - version = "0.2.1"; + version = "1.0.4"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8fc4d2097a1d0d8d97aa8c540984cb52432df759f04f2281a21a4e1b7d1a95a7"; + sha256 = "bd47b2cf5874cd2f74e6c36b8a97bf301785bacf9ac0297bbe78ec1b8c86c755"; }; propagatedBuildInputs = [ From 56654ecaf10aa4b5e4becd5f59e1c129d04cfb3e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 21:38:10 +0200 Subject: [PATCH 0867/1062] python3Packages.yt: 3.6.1 -> 4.0.1 --- pkgs/development/python-modules/yt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index 42bde9909b8c..9611b2722295 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "yt"; - version = "3.6.1"; + version = "4.0.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "be454f9d05dcbe0623328b4df43a1bfd1f0925e516be97399710452931a19bb0"; + sha256 = "6219cbf971871320a13679a57722c0363e50db5e6d4d64ea9d197461b2a7f70f"; }; buildInputs = [ From 95f169c6cfbdb9c4a2fa759756a5fd2cfa59bac9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 23:07:15 +0200 Subject: [PATCH 0868/1062] python3Packages.pytest: relax pluggy constraints Apparently possible without further changes: https://github.com/pytest-dev/pytest/pull/9040 --- pkgs/development/python-modules/pytest/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 19289426d71a..d5b1d14937a0 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { sha256 = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pluggy>=0.12,<1.0.0a1" "pluggy>=0.23,<2.0" + ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ From 88fdb63615042300b8f3d670492a70fbdbb888d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 00:54:28 +0200 Subject: [PATCH 0869/1062] python39Packages.backports-entry-points-selectable: init at 1.1.0 --- .../default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 - pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/backports-entry-points-selectable/default.nix diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix new file mode 100644 index 000000000000..2c1fa41f469b --- /dev/null +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, importlib-metadata }: + +buildPythonPackage rec { + pname = "backports-entry-points-selectable"; + version = "1.1.0"; + + src = fetchPypi { + pname = "backports.entry_points_selectable"; + inherit version; + sha256 = "988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "backports.entry_points_selectable" ]; + + meta = with lib; { + description = "Compatibility shim providing selectable entry points for older implementations"; + homepage = "https://github.com/jaraco/backports.entry_points_selectable"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index cd35fb250390..27b467cbb2a4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,7 +33,6 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ - backports-entry-points-selectable = throw "backports-entry-points-selectable has been removed"; # added 2021-07-01 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a70e3910ae14..b87e79955ee2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -981,6 +981,8 @@ in { backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; + backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; From dcba1d01dbaef1c64d2ff3fe39a170eefe74ae14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 23:30:22 +0200 Subject: [PATCH 0870/1062] python2Packages.contextlib2: reinit at 0.6.0.post1 --- .../python-modules/contextlib2/0.nix | 23 +++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/contextlib2/0.nix diff --git a/pkgs/development/python-modules/contextlib2/0.nix b/pkgs/development/python-modules/contextlib2/0.nix new file mode 100644 index 000000000000..38d9fb696e28 --- /dev/null +++ b/pkgs/development/python-modules/contextlib2/0.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +, unittest2 +}: + +buildPythonPackage rec { + pname = "contextlib2"; + version = "0.6.0.post1"; + + src = fetchPypi { + inherit pname version; + sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; + }; + + checkInputs = [ unittest2 ]; + + meta = { + description = "Backports and enhancements for the contextlib module"; + homepage = "https://contextlib2.readthedocs.org/"; + license = lib.licenses.psfl; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index caa44e5947e1..0b4fd6d242da 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -70,6 +70,8 @@ with self; with super; { construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; + contextlib2 = callPackage ../development/python-modules/contextlib2/0.nix { }; + convertdate = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; From 2522f92483e98129061a281be4966ddf8025dc87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 23:31:41 +0200 Subject: [PATCH 0871/1062] python2Packages.pluggy: reinit at 0.13.1 --- pkgs/development/python-modules/pluggy/0.nix | 34 ++++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pluggy/0.nix diff --git a/pkgs/development/python-modules/pluggy/0.nix b/pkgs/development/python-modules/pluggy/0.nix new file mode 100644 index 000000000000..30fa2e1945b2 --- /dev/null +++ b/pkgs/development/python-modules/pluggy/0.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, lib +, fetchPypi +, setuptools-scm +, importlib-metadata +}: + +buildPythonPackage rec { + pname = "pluggy"; + version = "0.13.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; + }; + + checkPhase = '' + py.test + ''; + + # To prevent infinite recursion with pytest + doCheck = false; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ importlib-metadata ]; + + meta = { + description = "Plugin and hook calling mechanisms for Python"; + homepage = "https://github.com/pytest-dev/pluggy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 0b4fd6d242da..de4e68c02475 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -395,6 +395,8 @@ with self; with super; { pip = callPackage ../development/python-modules/pip/20.nix { }; + pluggy = callPackage ../development/python-modules/pluggy/0.nix { }; + postorius = disabled super.postorius; praw = callPackage ../development/python-modules/praw/6.3.nix { }; From 56024b4bbe9344d3cbe4772af490022554d0b8ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 02:03:19 +0200 Subject: [PATCH 0872/1062] python3Packages.brotli: convert to pytestCheckHook --- .../python-modules/brotli/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 1edc62317a64..0556c5b4e2a2 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "brotli"; @@ -16,15 +19,18 @@ buildPythonPackage rec { dontConfigure = true; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest python/tests - ''; + pytestFlagsArray = [ + "python/tests" + ]; - meta = { + meta = with lib; { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 2a7260989f343573cc6c29815d4ed6cb6fe6d195 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 02:04:16 +0200 Subject: [PATCH 0873/1062] python3Packages.requests: restore python2 compatibility --- pkgs/development/python-modules/requests/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 8b5514f63936..4dfd4fd623d4 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,4 +1,6 @@ { lib +, brotli +, brotlicffi , buildPythonPackage , certifi , chardet @@ -9,6 +11,8 @@ , pytestCheckHook , urllib3 , isPy27 +, isPy3k +, trustme }: buildPythonPackage rec { @@ -32,6 +36,11 @@ buildPythonPackage rec { chardet idna urllib3 + ] ++ lib.optionals (isPy3k) [ + brotlicffi + charset-normalizer + ] ++ lib.optionals (isPy27) [ + brotli ]; checkInputs = [ From 26f55ce2b756bfb6a8c3c53bb984e5ff9ea64ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 01:28:43 +0200 Subject: [PATCH 0874/1062] python3Packages.pytest_4: relax pluggy constraints Following 7e27631e46c8121e5b906083e1de74ec53de2730 --- pkgs/development/python-modules/pytest/4.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index c764b55d1f10..fd6d3507afb8 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -11,6 +11,11 @@ buildPythonPackage rec { sha256 = "50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; + checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] From ab126c9a62ca414a933ac19e91d27ddd68cedcd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:25:52 +0200 Subject: [PATCH 0875/1062] python3Packages: provide setuptools-scm with toml[i] by default and remove duplicated toml packages Some packages seem to still require toml despite setuptools-scm having switched to tomli. If it is missing the version number in dist.into is set to 0.0.0 and silently all version pins break. --- pkgs/development/python-modules/ansi2html/default.nix | 4 ++-- pkgs/development/python-modules/asttokens/default.nix | 4 ++-- pkgs/development/python-modules/configparser/default.nix | 6 ++---- pkgs/development/python-modules/inflect/default.nix | 3 +-- pkgs/development/python-modules/irc/default.nix | 3 +-- pkgs/development/python-modules/jaraco_classes/default.nix | 4 ++-- .../development/python-modules/jaraco_functools/default.nix | 4 ++-- pkgs/development/python-modules/keyrings-alt/default.nix | 4 ++-- pkgs/development/python-modules/setuptools-scm/default.nix | 6 ++++-- pkgs/development/python-modules/xmlsec/default.nix | 3 +-- pkgs/development/python-modules/zipp/default.nix | 3 +-- 11 files changed, 20 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 4abcec541a04..50188fe0e4a3 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm }: buildPythonPackage rec { pname = "ansi2html"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six setuptools ]; preCheck = "export PATH=$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index bb4cf989cddf..acd44d55e16f 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, fetchpatch, buildPythonPackage, - setuptools-scm, toml, six, astroid, pytest + setuptools-scm, six, astroid, pytest }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ setuptools-scm toml six astroid ]; + propagatedBuildInputs = [ setuptools-scm six astroid ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index a939f6623c9c..3eeae353d115 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm -, toml -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "configparser"; @@ -14,7 +12,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 9081a30ac6be..ca454d432317 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -3,7 +3,6 @@ , fetchPypi , isPy27 , setuptools-scm -, toml , pytestCheckHook }: @@ -17,7 +16,7 @@ buildPythonPackage rec { sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 60a960a204c4..423ec4ecf292 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools-scm, jaraco_collections, importlib-metadata, toml +, setuptools-scm, jaraco_collections, importlib-metadata }: buildPythonPackage rec { @@ -28,7 +28,6 @@ buildPythonPackage rec { pytz jaraco_itertools jaraco_collections - toml ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index a727e774ec30..aadb9f9028f1 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 -, setuptools-scm, toml +, setuptools-scm , more-itertools , pytestCheckHook }: @@ -20,7 +20,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 1fca58ebf733..3ad652af7643 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools-scm, toml +, setuptools-scm , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 7bc88bf6cbad..a45be02b55b2 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six -, pytest, backports_unittest-mock, keyring, setuptools-scm, toml +, pytest, backports_unittest-mock, keyring, setuptools-scm }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock; diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index bb0d82dab965..e80a153ae66f 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, toml }: +{ lib, buildPythonPackage, fetchPypi, toml, tomli }: buildPythonPackage rec { pname = "setuptools-scm"; @@ -12,7 +12,9 @@ buildPythonPackage rec { sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; }; - propagatedBuildInputs = [ toml ]; + # TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm + # if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages + propagatedBuildInputs = [ toml tomli ]; # Requires pytest, circular dependency doCheck = false; diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index b8c60f1b6425..c94f018382a6 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -9,7 +9,6 @@ , xmlsec , pkgconfig , setuptools-scm -, toml , lxml , hypothesis }: @@ -28,7 +27,7 @@ buildPythonPackage rec { ./reset-lxml-in-tests.patch ]; - nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm toml ]; + nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ]; buildInputs = [ xmlsec libxslt libxml2 libtool ]; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 21cb9e6269f1..a857acf683f1 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -5,7 +5,6 @@ , pytest , pytest-flake8 , more-itertools -, toml }: buildPythonPackage rec { @@ -17,7 +16,7 @@ buildPythonPackage rec { sha256 = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; From 899b703f197dd986184f61646e89077353db1b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:28:05 +0200 Subject: [PATCH 0876/1062] python39Packages.zipp: update meta, remove unused checkInputs tests are not run anyway --- pkgs/development/python-modules/zipp/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index a857acf683f1..c070e2327772 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , setuptools-scm -, pytest -, pytest-flake8 , more-itertools }: @@ -20,12 +18,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ more-itertools ]; - checkInputs = [ pytest pytest-flake8 ]; - - checkPhase = '' - pytest - ''; - # Prevent infinite recursion with pytest doCheck = false; @@ -33,5 +25,6 @@ buildPythonPackage rec { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 2839e854660c67447f571da7c3d97ab1054d02df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:32:58 +0200 Subject: [PATCH 0877/1062] python39Packages.setuptools-scm: relax tomli ping --- pkgs/development/python-modules/setuptools-scm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index e80a153ae66f..87f8c3d13ae4 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -12,6 +12,11 @@ buildPythonPackage rec { sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "tomli~=1.0.0" "tomli>=1.0.0" + ''; + # TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm # if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages propagatedBuildInputs = [ toml tomli ]; From 96b33e5997eb165d7ff9ea6f6c21b530288e3622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:34:32 +0200 Subject: [PATCH 0878/1062] python39Packages.tomli: break infinite recursion with setuptools-scm by splitting tests, add SuperSandro2000 as maintainer --- .../python-modules/tomli/default.nix | 25 +++++++++++++------ .../python-modules/tomli/tests.nix | 21 ++++++++++++++++ 2 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/python-modules/tomli/tests.nix diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index c658339dcd9c..79cd5a4f500c 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage +, callPackage , fetchFromGitHub , flit-core -, pytestCheckHook -, python-dateutil }: buildPythonPackage rec { @@ -11,6 +10,11 @@ buildPythonPackage rec { version = "1.1.0"; format = "pyproject"; + outputs = [ + "out" + "testsout" + ]; + src = fetchFromGitHub { owner = "hukkin"; repo = pname; @@ -20,17 +24,24 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - checkInputs = [ - pytestCheckHook - python-dateutil - ]; + postInstall = '' + mkdir $testsout + cp -R benchmark/ pyproject.toml tests/ $testsout/ + ''; pythonImportsCheck = [ "tomli" ]; + # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + meta = with lib; { description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; homepage = "https://github.com/hukkin/tomli"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch ]; + maintainers = with maintainers; [ veehaitch SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/tomli/tests.nix b/pkgs/development/python-modules/tomli/tests.nix new file mode 100644 index 000000000000..5d3d67dbd128 --- /dev/null +++ b/pkgs/development/python-modules/tomli/tests.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, tomli +, pytestCheckHook +, python-dateutil +}: + +buildPythonPackage rec { + pname = "tomli-tests"; + inherit (tomli) version; + + src = tomli.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytestCheckHook + python-dateutil + tomli + ]; +} From 8d1439ee85543491cadf00452fce738b0e7d43d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 02:35:00 +0200 Subject: [PATCH 0879/1062] python39Packages.flit-core: break infinite recursion with setuptools-scm by splitting tests, add SuperSandro2000 as maintainer --- .../python-modules/flit-core/default.nix | 25 +++++++++++++------ .../python-modules/flit-core/tests.nix | 22 ++++++++++++++++ 2 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/python-modules/flit-core/tests.nix diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index a4c6b99b07f4..7b2731595629 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage +, callPackage , flit -, isPy3k , toml , pytestCheckHook , testpath @@ -12,6 +12,11 @@ buildPythonPackage rec { version = "3.2.0"; format = "pyproject"; + outputs = [ + "out" + "testsout" + ]; + inherit (flit) src patches; preConfigure = '' @@ -22,19 +27,23 @@ buildPythonPackage rec { toml ]; - checkInputs = [ - pytestCheckHook - testpath - ]; + postInstall = '' + mkdir $testsout + cp -R ../tests $testsout/tests + ''; + + # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm + doCheck = false; passthru.tests = { inherit flit; + pytest = callPackage ./tests.nix { }; }; - meta = { + meta = with lib; { description = "Distribution-building parts of Flit. See flit package for more information"; homepage = "https://github.com/takluyver/flit"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.fridh ]; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/flit-core/tests.nix b/pkgs/development/python-modules/flit-core/tests.nix new file mode 100644 index 000000000000..0fd13e80cb12 --- /dev/null +++ b/pkgs/development/python-modules/flit-core/tests.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, flit +, flit-core +, pytestCheckHook +, testpath +}: + +buildPythonPackage rec { + pname = "flit-core"; + inherit (flit-core) version; + + src = flit-core.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + flit + pytestCheckHook + testpath + ]; +} From aebdfe2abe9b19e6adceca411318d9d82695b76c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 03:33:18 +0200 Subject: [PATCH 0880/1062] python3Packages.pytest_5: relax pluggy constraints --- pkgs/development/python-modules/pytest/5.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index b3e69578d7eb..b38c1a759fe3 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; + checkInputs = [ hypothesis pygments ]; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ From feef2fca168068cafb0a32de846723dec952c1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:50:53 +0200 Subject: [PATCH 0881/1062] python39Packages.Cython: 0.29.22 -> 0.29.24 Required to build numpy RuntimeError: Building NumPy requires Cython >= 0.29.24, found 0.29.22 at /nix/store/7qrl7hhzvbmd966b61w3n0dkamn863gn-python3.9-Cython-0.29.22/lib/python3.9/site-packages/Cython/init.py --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index dcede9506e32..7c27f370bd14 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.22"; + version = "0.29.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY="; + sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM="; }; nativeBuildInputs = [ From 88b309b76f4f892996f0a596d99ed42a026c5d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:58:26 +0200 Subject: [PATCH 0882/1062] python39Packages.Cython: minor formatting cleanups --- pkgs/development/python-modules/Cython/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 7c27f370bd14..e22037cbbb9f 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -12,8 +12,7 @@ }: let - excludedTests = [] - ++ [ "reimport_from_subinterpreter" ] + excludedTests = [ "reimport_from_subinterpreter" ] # cython's testsuite is not working very well with libc++ # We are however optimistic about things outside of testsuite still working ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] @@ -36,9 +35,11 @@ in buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; + checkInputs = [ gdb numpy ncurses ]; + buildInputs = [ glibcLocales ]; LC_ALL = "en_US.UTF-8"; @@ -71,9 +72,7 @@ in buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - -# doCheck = !stdenv.isDarwin; - + # doCheck = !stdenv.isDarwin; meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; From d9a79f57bc27c386a73d8a22d5eb580bc33649f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 04:27:08 +0200 Subject: [PATCH 0883/1062] python3Packages.sphinx: fix build with Pygments>=2.10 --- pkgs/development/python-modules/sphinx/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index d37ccd3e4489..cf792da1249e 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch # propagatedBuildInputs , Babel , alabaster @@ -39,6 +40,14 @@ buildPythonPackage rec { sha256 = "sha256-0QdgHFX4r40BDHjpi9R40lXqT4n5ZgrIny+w070LZPE="; }; + patches = [ + (fetchpatch { + # Fix tests with pygments 2.10 + url = "https://github.com/sphinx-doc/sphinx/commit/bde6c8d2effc56dc8b9098abee796167f972c306.patch"; + sha256 = "0d0ddhgrrh7z9ix0f3zrc2gjb4d73f6ffm98zl62fzv5l4fd00lr"; + }) + ]; + propagatedBuildInputs = [ Babel alabaster From 54c946ffda4cdcfcd786fbb8cdf9304c3c3d3edf Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Tue, 24 Aug 2021 19:47:23 -0700 Subject: [PATCH 0884/1062] python3Packages.poetry-core: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/poetry-core/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 4d8c444dcd20..d5262ee22c47 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , importlib-metadata , intreehooks -, isort , pathlib2 , pep517 , pytest-mock @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "07x0zagf9cfr7g3132jjd5byywkbnzpfbxjfjzpzpj70fqw70qrc"; + sha256 = "0jgd4d7m5y8ly8n0l9lcq7cjab2y3hifk90f343ksmjzssfd5lg3"; }; postPatch = lib.optionalString (pythonOlder "3.8") '' From 1d0ac9b56277bd9ddca3d994703d90ff81cdb6ce Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Tue, 24 Aug 2021 19:47:34 -0700 Subject: [PATCH 0885/1062] python3Packages.poetry: 1.1.7 -> 1.1.8 --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 7287797ef331..4b7d35093662 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.7"; + version = "1.1.8"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "03cbzjw0sb8rs85iq191ndk9523d6qpymh2nhw5bvcxfvsf9042d"; + sha256 = "0qcgjb78nj69sppd8146519q9422xxg1bi34gyxy51sjkvd5lxhz"; }; postPatch = '' From 7fcb39704b325e20a041b3bccd7552b409e060d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:14:57 +0200 Subject: [PATCH 0886/1062] python3Packages.pytest_6_1: relax pluggy constraints --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b87e79955ee2..73275412b5da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6871,6 +6871,11 @@ in { inherit version; sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; }); pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; From 1ff1034e25691a8908ffa7d8203bd72ea5b0dad7 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 2 Aug 2021 23:08:05 -0700 Subject: [PATCH 0887/1062] =?UTF-8?q?python3Packages.isort:=205.6.4=20?= =?UTF-8?q?=E2=86=92=205.9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/development/python-modules/isort/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 1195f0f6b097..b55fb9156814 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -6,17 +6,16 @@ , pytestCheckHook }: -let -in buildPythonPackage rec { +buildPythonPackage rec { pname = "isort"; - version = "5.6.4"; + version = "5.9.3"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = version; - sha256 = "1m7jpqssnbsn1ydrw1dn7nrcrggqcvj9v6mk5ampxmvk94xd2r2q"; + sha256 = "sha256-JbRZ/3Xz35tGoCNnQesR08Sjoz3yimxZyxhhOXGvmXw="; }; nativeBuildInputs = [ @@ -46,6 +45,7 @@ in buildPythonPackage rec { ''; pytestFlagsArray = [ + "--ignore=tests/benchmark/" # requires pytest-benchmark "--ignore=tests/integration/" # pulls in 10 other packages "--ignore=tests/unit/profiles/test_black.py" # causes infinite recursion to include black ]; @@ -63,6 +63,7 @@ in buildPythonPackage rec { # plugin not available "test_isort_literals_issue_1358" "test_isort_supports_formatting_plugins_issue_1353" + "test_sort_configurable_sort_issue_1732" "test_value_assignment_list" # profiles not available "test_isort_supports_shared_profiles_issue_970" From 24999b947703fb99d42af44f58c5aa7a2159473b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:32:23 +0200 Subject: [PATCH 0888/1062] python3Packages.async-upnp-client: use latest pytest again --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73275412b5da..0787347b45af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -625,9 +625,7 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; asyncwhois = callPackage ../development/python-modules/asyncwhois { }; From 4cf9e9b65e9287318b9d62e656d976656d856a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:41:31 +0200 Subject: [PATCH 0889/1062] python3Packages.trio: use latest pytest again --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0787347b45af..fce1d8e58957 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8944,9 +8944,7 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; - trio = callPackage ../development/python-modules/trio { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + trio = callPackage ../development/python-modules/trio { }; trueskill = callPackage ../development/python-modules/trueskill { }; From abc3f93185f2f6f6415f5e7d17a24ad08ba52837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:42:23 +0200 Subject: [PATCH 0890/1062] python3Packages.urrllib3: use latest pytest again --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fce1d8e58957..d463aaa3263a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9162,9 +9162,7 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - urllib3 = callPackage ../development/python-modules/urllib3 { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + urllib3 = callPackage ../development/python-modules/urllib3 { }; urlpy = callPackage ../development/python-modules/urlpy { }; From 150e14c0136ba6c7ca33a4268ffc190077833055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:45:06 +0200 Subject: [PATCH 0891/1062] python3Packages.werkzeug: use latest pytest again --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d463aaa3263a..9eb531ff8028 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9377,9 +9377,7 @@ in { webthing = callPackage ../development/python-modules/webthing { }; - werkzeug = callPackage ../development/python-modules/werkzeug { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; From 6d94cef7888f529bbe6fc049806169f863bd9334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:55:23 +0200 Subject: [PATCH 0892/1062] python39Packages.fakeredis: disable failing tests --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index e4e060aefc5e..e76eb8903d60 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -41,8 +41,8 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # Missing support for later pytest-asyncio, https://github.com/jamesls/fakeredis/issues/307 - "test/test_aioredis1.py" + # AttributeError: 'AsyncGenerator' object has no attribute XXXX + "test/test_aioredis2.py" ]; pythonImportsCheck = [ "fakeredis" ]; From 9f11787853d0e8e890def15e4a55f3f859456f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 06:32:40 +0200 Subject: [PATCH 0893/1062] python39Packages.gevent-websocket: update meta, disable checkPhase, add import check --- .../development/python-modules/gevent-websocket/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 7ff62a378ca9..24af4416ab3c 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -17,10 +17,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent gunicorn ]; + # zero tests run + doCheck = false; + + pythonImportsCheck = [ "geventwebsocket" ]; + meta = with lib; { homepage = "https://www.gitlab.com/noppo/gevent-websocket"; description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From ef5d117e4502ad3fb65136c5c7f662728cc10551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 07:37:29 +0200 Subject: [PATCH 0894/1062] python39Packages.zigpy: 0.36.1 -> 0.37.1 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 7dab5cda6cc5..af498c59cf06 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.36.1"; + version = "0.37.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "0rfif8ds6m9ndxnc0f02fivc2pwidf476ylyx9y2b1sa2qz36z5w"; + sha256 = "sha256-tDpu6tv8qwIPB3G5GKURtDi6QOYxF5jEVbzmJ2Px5W4="; }; propagatedBuildInputs = [ From 5c5556f5bc95da51728bfdc0e699920e0f0825ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 08:06:53 +0200 Subject: [PATCH 0895/1062] python39Packages.httpx: 0.18.2 -> 0.19.0 --- pkgs/development/python-modules/httpx/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 6a9300566d59..014272bcc107 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , brotlicffi , certifi +, charset-normalizer , h2 , httpcore , rfc3986 @@ -18,19 +19,20 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.18.2"; + version = "0.19.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0rr5b6z96yipvp4riqmmbkbcy0sdyzykcdwf5y9ryh27pxr8q8x4"; + sha256 = "sha256-bUxxeUYqOHBmSL2gPQG5cIq6k5QY4Kyhj9ToA5yZXPA="; }; propagatedBuildInputs = [ brotlicffi certifi + charset-normalizer h2 httpcore rfc3986 From 06df8a097cb59a37d50a2ef1073cb4ef34f2ac1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 11:40:30 +0200 Subject: [PATCH 0896/1062] python39Packages.Fabric: format, use pytestCheckHook, update disable test comment --- .../python-modules/Fabric/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index 2e70d3aa121e..de53512d0b47 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , cryptography , invoke , mock , paramiko -, pytest +, pytestCheckHook , pytest-relaxed }: @@ -23,20 +25,21 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ invoke paramiko cryptography ]; - checkInputs = [ pytest mock pytest-relaxed ]; - # requires pytest_relaxed, which doesnt have official support for pytest>=5 - # https://github.com/bitprophet/pytest-relaxed/issues/12 + checkInputs = [ pytestCheckHook pytest-relaxed mock ]; + + # ==================================== ERRORS ==================================== + # ________________________ ERROR collecting test session _________________________ + # Direct construction of SpecModule has been deprecated, please use SpecModule.from_parent + # See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent for more details. doCheck = false; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ "fabric" ]; meta = with lib; { description = "Pythonic remote execution"; - homepage = "https://www.fabfile.org/"; - license = licenses.bsd2; + homepage = "https://www.fabfile.org/"; + license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; } From 8c67da8babc2f23c1005c13c29098961a943f092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 11:40:53 +0200 Subject: [PATCH 0897/1062] python39Packages.paramiko: use pytestCheckHook, cleanup --- .../python-modules/paramiko/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index c2237f68524f..88d63f0de93f 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -6,7 +6,7 @@ , invoke , pynacl , pyasn1 -, pytest +, pytestCheckHook , pytest-relaxed , mock }: @@ -20,25 +20,21 @@ buildPythonPackage rec { sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"; }; - checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; - __darwinAllowLocalNetworking = true; + checkInputs = [ invoke pytestCheckHook pytest-relaxed mock ]; - # 2 sftp tests fail (skip for now) - # test_config relies on artifacts to be to downloaded - # RSA tests don't have valid keys - checkPhase = '' - pytest tests \ - --ignore=tests/test_sftp.py \ - --ignore=tests/test_config.py - ''; + disabledTestPaths = [ + "tests/test_sftp.py" + "tests/test_config.py" + ]; + + __darwinAllowLocalNetworking = true; meta = with pkgs.lib; { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; license = licenses.lgpl21Plus; - longDescription = '' This is a library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure From af0b93c3ce7b9b99f8b56489df0e570b42226bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 11:44:12 +0200 Subject: [PATCH 0898/1062] python39Packages.pytest-relaxed: switch to pytestCheckHook, relax decorator dependency, comment partial breakage --- .../python-modules/pytest-relaxed/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 19d031b6a2b1..1030f76050ca 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -4,6 +4,7 @@ , pytest , six , decorator +, pytestCheckHook }: buildPythonPackage rec { @@ -15,22 +16,23 @@ buildPythonPackage rec { sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; }; + # newer decorator versions are incompatible and cause the test suite to fail + # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric + postPatch = '' + substituteInPlace setup.py \ + --replace "decorator>=4,<5" "decorator>=4" \ + --replace "pytest>=3,<5" "pytest>=3" + ''; + buildInputs = [ pytest ]; - checkInputs = [ pytest ]; propagatedBuildInputs = [ six decorator ]; - patchPhase = '' - sed -i "s/pytest>=3,<5/pytest/g" setup.py - ''; + checkInputs = [ pytestCheckHook ]; - # skip tests due to dir requirements + # lots of assertion errors mainly around decorator doCheck = false; - checkPhase = '' - pytest tests - ''; - meta = with lib; { homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; From 914fff808e7a01fdd42e530262460e957723c9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:01:40 +0200 Subject: [PATCH 0899/1062] python39Packages.tzlocal: add a comment to be compatible with APScheduler --- pkgs/development/python-modules/tzlocal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index c5514cfa53a4..363e1d12a55e 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "2.1"; + version = "2.1"; # version needs to be compatible with APScheduler propagatedBuildInputs = [ pytz ]; From 5218e374fa2d66dfa92326bb3759333512998de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:13:17 +0200 Subject: [PATCH 0900/1062] python39Packages.zigpy-xbee: 0.13.0 -> 0.14.0 --- .../python-modules/zigpy-xbee/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 1279bb804de6..be522214164b 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -7,11 +7,12 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, zigpy }: +, zigpy +}: buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.13.0"; + version = "0.14.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = version; - sha256 = "Krdqb9bYKwUC2cdNppB2+tLwWjzmzIHhXnQ1KRduofU="; + sha256 = "sha256-veAkaBHPYgVd3iwvnH/A2upYX4T/qXXNRcaysbRQvNI="; }; buildInputs = [ @@ -36,6 +37,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # assertion failure + # E assert ff:ff:ff:ff:ff:ff:ff:ff is None + "test_startup_api_mode_config_fails" + ]; + meta = with lib; { description = "A library which communicates with XBee radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-xbee"; From 20208cf5c35e079c1b6101fd71cb7de1f47fc729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:15:39 +0200 Subject: [PATCH 0901/1062] python3Packages.wasmer*: package entire wasmer-compiler family --- .../python-modules/wasmer/default.nix | 116 +++++++++++++----- .../python-modules/wasmer/tests.nix | 25 ++++ pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 112 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/wasmer/tests.nix diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index d3881032af13..dff14d15b901 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -1,45 +1,99 @@ -{ lib -, stdenv +{ stdenv +, lib , rustPlatform +, callPackage , fetchFromGitHub , buildPythonPackage , libiconv +, llvm_11 +, libffi +, libxml2 +, ncurses +, zlib }: -buildPythonPackage rec { - pname = "wasmer"; - version = "1.0.0"; +let + common = + { pname + , buildAndTestSubdir + , cargoHash + , extraNativeBuildInputs ? [ ] + , extraBuildInputs ? [ ] + }: buildPythonPackage rec { + inherit pname; + version = "1.0.0"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "wasmerio"; - repo = "wasmer-python"; - rev = version; - hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; + + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wasmer-python"; + rev = version; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = cargoHash; + }; + + nativeBuildInputs = (with rustPlatform; [ cargoSetupHook maturinBuildHook ]) + ++ extraNativeBuildInputs; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] + ++ extraBuildInputs; + + inherit buildAndTestSubdir; + + postInstall = lib.optionalString (pname == "wasmer") '' + mkdir $testsout + cp -R tests $testsout/tests + ''; + + # check in passthru.tests.pytest because all packages are required to run the tests + doCheck = false; + + passthru.tests = lib.optionalAttrs (pname == "wasmer") { + pytest = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "${lib.replaceStrings ["-"] ["_"] pname}" ]; + + meta = with lib; { + description = "Python extension to run WebAssembly binaries"; + homepage = "https://github.com/wasmerio/wasmer-python"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + }; +in +rec { + wasmer = common { + pname = "wasmer"; + buildAndTestSubdir = "packages/api"; + cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; + wasmer-compiler-cranelift = common { + pname = "wasmer-compiler-cranelift"; + buildAndTestSubdir = "packages/compiler-cranelift"; + cargoHash = "sha256-cHgAUwqnbQV3E5nUYGYQ48ntbIFfq4JXfU5IrSFZ3zI="; }; - format = "pyproject"; + wasmer-compiler-llvm = common { + pname = "wasmer-compiler-llvm"; + buildAndTestSubdir = "packages/compiler-llvm"; + cargoHash = "sha256-Jm22CC5S3pN/vdVvsGZdvtoAgPzWVLto8wavSJdxY3A="; + extraNativeBuildInputs = [ llvm_11 ]; + extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; + }; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - - buildAndTestSubdir = "packages/api"; - - doCheck = false; - - pythonImportsCheck = [ "wasmer" ]; - - meta = with lib; { - description = "Python extension to run WebAssembly binaries"; - homepage = "https://github.com/wasmerio/wasmer-python"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + wasmer-compiler-singlepass = common { + pname = "wasmer-compiler-singlepass"; + buildAndTestSubdir = "packages/compiler-singlepass"; + cargoHash = "sha256-lmqEo3+jYoN+4EEYphcoE4b84jdFcvYVycjrJ956Bh8="; }; } diff --git a/pkgs/development/python-modules/wasmer/tests.nix b/pkgs/development/python-modules/wasmer/tests.nix new file mode 100644 index 000000000000..bdb3adfe93ce --- /dev/null +++ b/pkgs/development/python-modules/wasmer/tests.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, wasmer +, pytestCheckHook +, wasmer-compiler-cranelift +, wasmer-compiler-llvm +, wasmer-compiler-singlepass +}: + +buildPythonPackage rec { + pname = "wasmer-tests"; + inherit (wasmer) version; + + src = wasmer.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytestCheckHook + wasmer + wasmer-compiler-cranelift + wasmer-compiler-llvm + wasmer-compiler-singlepass + ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9eb531ff8028..14950372494c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9319,7 +9319,8 @@ in { wasm = callPackage ../development/python-modules/wasm { }; - wasmer = callPackage ../development/python-modules/wasmer { }; + wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { }); + inherit (self.wasmerPackages) wasmer wasmer-compiler-cranelift wasmer-compiler-llvm wasmer-compiler-singlepass; watchdog = callPackage ../development/python-modules/watchdog { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; From 7f7b22835c3ab13c4551fcfa4ac4a2866867f530 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 15:46:56 +0200 Subject: [PATCH 0902/1062] python3Packages.starlette: 0.14.2 -> 0.16.0 --- .../python-modules/starlette/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 3079b60564f1..e8c130692125 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -4,6 +4,8 @@ , fetchFromGitHub , isPy27 , aiofiles +, anyio +, contextlib2 , graphene , itsdangerous , jinja2 @@ -12,22 +14,24 @@ , requests , aiosqlite , databases -, pytestCheckHook , pytest-asyncio +, pytestCheckHook +, pythonOlder +, trio , typing-extensions , ApplicationServices }: buildPythonPackage rec { pname = "starlette"; - version = "0.14.2"; - disabled = isPy27; + version = "0.16.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0fz28czvwiww693ig9vwdja59xxs7m0yp1df32ms1hzr99666bia"; + sha256 = "sha256-/NYhRRZdi6I7CtLCohAqK4prsSUayOxa6sBKIJhPv+w="; }; postPatch = '' @@ -37,19 +41,27 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiofiles + anyio graphene itsdangerous jinja2 python-multipart pyyaml requests - ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ] ++ lib.optionals (pythonOlder "3.7") [ + contextlib2 + ] ++ lib.optional stdenv.isDarwin [ + ApplicationServices + ]; checkInputs = [ aiosqlite databases pytest-asyncio pytestCheckHook + trio typing-extensions ]; @@ -57,8 +69,12 @@ buildPythonPackage rec { # fails to import graphql, but integrated graphql support is about to # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. "tests/test_graphql.py" - # contextfunction was removed in Jinja 3.1 - "tests/test_templates.py" + ]; + + disabledTests = [ + # asserts fail due to inclusion of br in Accept-Encoding + "test_websocket_headers" + "test_request_headers" ]; pythonImportsCheck = [ "starlette" ]; From 99ba0c047950e18731dab16bb2026cfe4dbab96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:44:49 +0200 Subject: [PATCH 0903/1062] python39Packages.fastapi: format, disable failing test --- .../development/python-modules/fastapi/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 62aedf1f2117..f068c4cb735e 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -55,8 +55,18 @@ buildPythonPackage rec { # ignoring deprecation warnings to avoid test failure from # tests/test_tutorial/test_testing/test_tutorial001.py - pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" "-W ignore::DeprecationWarning"]; - disabledTests = [ "test_get_custom_response" ]; + pytestFlagsArray = [ + "--ignore=tests/test_default_response_class.py" + "-W ignore::DeprecationWarning" + ]; + + disabledTests = [ + "test_get_custom_response" + + # Failed: DID NOT RAISE + "test_websocket_invalid_data" + "test_websocket_no_credentials" + ]; meta = with lib; { homepage = "https://github.com/tiangolo/fastapi"; From f0bd879fdb29fbe24321e2e1ed86b84a3c3e192d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:45:18 +0200 Subject: [PATCH 0904/1062] python39Packages.keyring: disable failing test --- pkgs/development/python-modules/keyring/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 522c836f4357..cf765c06d869 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { disabledTests = lib.optionals (stdenv.isDarwin) [ "test_multiprocess_get" "test_multiprocess_get_after_native_get" + ] ++ [ + # E ValueError: too many values to unpack (expected 1) + "test_entry_point" ]; disabledTestPaths = [ From adc29d968471c2167759da96be208fd566983138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:45:30 +0200 Subject: [PATCH 0905/1062] python39Packages.plotly: update meta, add tenacity hard depedency, removed no longer mentioned optional depedencies --- pkgs/development/python-modules/plotly/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index aef078143b07..8db9466e0fb2 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -1,12 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, decorator -, nbformat , pytz , requests -, retrying , six +, tenacity }: buildPythonPackage rec { @@ -19,20 +17,19 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - decorator - nbformat pytz requests - retrying six + tenacity ]; # No tests in archive doCheck = false; - meta = { + meta = with lib; { description = "Python plotting library for collaborative, interactive, publication-quality graphs"; homepage = "https://plot.ly/python/"; - license = with lib.licenses; [ mit ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ]; }; } From 5b7bb40a3cc9efd6dbc87dc7231a4bade363e18c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 12:45:53 +0200 Subject: [PATCH 0906/1062] wapiti: disable failing test --- pkgs/tools/security/wapiti/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index cd89d4039e5f..38ba47a51223 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -104,6 +104,8 @@ python3.pkgs.buildPythonApplication rec { # Requires a PHP installation "test_timesql" "test_cookies" + # E TypeError: Expected bytes or bytes-like object got: + "test_persister_upload" ]; pythonImportsCheck = [ "wapitiCore" ]; From 308c47e656cd15254ba573224ddff2ff31994f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 17:18:37 +0200 Subject: [PATCH 0907/1062] python39Packages.sanic-testing: loose httpx constraint --- .../python-modules/sanic-testing/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index b59781e5c459..5e7deb51362e 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -19,6 +19,13 @@ buildPythonPackage rec { sha256 = "1pf619cd3dckn3d8gh18vbn7dflvb0mzpf6frx4y950x2j3rdplk"; }; + postPatch = '' + # https://github.com/sanic-org/sanic-testing/issues/19 + substituteInPlace setup.py \ + --replace '"websockets==8.1",' '"websockets>=9.1",' \ + --replace "httpx==0.18.*" "httpx" + ''; + propagatedBuildInputs = [ httpx sanic @@ -30,12 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/sanic-org/sanic-testing/issues/19 - substituteInPlace setup.py \ - --replace '"websockets==8.1",' '"websockets>=9.1",' - ''; - # `sanic` is explicitly set to null when building `sanic` itself # to prevent infinite recursion. In that case we skip running # the package at all. From 0c2053760fca84ba13a9b597eef0b94314a2b059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 17:18:48 +0200 Subject: [PATCH 0908/1062] python39Packages.slowapi: disable failing tests --- pkgs/development/python-modules/slowapi/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix index 921a191d5fa1..a1e54a6c5f93 100644 --- a/pkgs/development/python-modules/slowapi/default.nix +++ b/pkgs/development/python-modules/slowapi/default.nix @@ -43,6 +43,12 @@ buildPythonPackage rec { starlette ]; + disabledTests = [ + # E AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. + "test_endpoint_request_param_invalid" + "test_endpoint_response_param_invalid" + ]; + patches = [ # Switch to poetry-core, https://github.com/laurentS/slowapi/pull/54 (fetchpatch { From 48713fb7c0446a4ab4e15fd870c05a4a7fe10f84 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 21:04:16 +0200 Subject: [PATCH 0909/1062] python3Packages.botocore: 1.20.97 -> 1.20.106 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index d05c2decf497..fc275edcc9de 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.106"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; + sha256 = "sha256-bVyYOAix0AQ39W0MCEEr2C2fgBL9t35VX5cneh/U1d8="; }; propagatedBuildInputs = [ From dc4ba4d4bf591d4494304c471233ed13917c01f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 21:09:40 +0200 Subject: [PATCH 0910/1062] python3Packages.boto3: 1.17.97 -> 1.17.106 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index c8b8210f6503..07a79a6a886b 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.106"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; + sha256 = "sha256-wHQDeLkTylP1/A26kemadSxaMK57WKDF5U4+KmjfJsU="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 083c666d20e9c497b76b9cef096b62c3db7d9de1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 21:14:29 +0200 Subject: [PATCH 0911/1062] awscli: 1.19.97 -> 1.19.106 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 0d0d2ec80ffe..556539eddd2b 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.97"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.106"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-kecuyQMk4GWH9G0/f4Gi/hWtW4Zme9Q4i7XclcZTlNc="; + sha256 = "sha256-6o24GUcT3efgK5+Wa7n4+EeA5qXmAGhybzed7ybdT9Q="; }; # https://github.com/aws/aws-cli/issues/4837 From 6f7e7622027438a994811a56b10f98c0fd222223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 21:39:43 +0200 Subject: [PATCH 0912/1062] platformio: pin ajsonrpc dependency --- pkgs/development/embedded/platformio/core.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index a3dcbdd35fdf..169ff4cd5a86 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -1,5 +1,6 @@ { stdenv, lib, python3 , fetchFromGitHub +, fetchPypi , git , spdx-license-list-data , version, src @@ -20,6 +21,15 @@ let doCheck = false; }); + ajsonrpc = super.ajsonrpc.overridePythonAttrs (oldAttrs: rec { + pname = "ajsonrpc"; + version = "1.1.0"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-CgHCtW0gxZho7ZavvEaODNc+KbFW4sAsHtM2Xk5Cuaw="; + }; + }); + click = super.click.overridePythonAttrs (oldAttrs: rec { version = "7.1.2"; src = oldAttrs.src.override { @@ -28,6 +38,18 @@ let }; }); + starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { + pname = "starlette"; + version = "0.14.2"; + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "sha256-Ki5jTEr5w6CrGK6F60E9uvdUlGx8pxdHMpxHvj9D4js="; + }; + doCheck = false; + }); + uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { version = "0.13.2"; src = fetchFromGitHub { From 76c4d7bdc4c447d16597d453760088e1727ec82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 21:40:54 +0200 Subject: [PATCH 0913/1062] maturin: 0.10.6 -> 0.11.3 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 5ab47c8aa8de..9e7e39f3b721 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.10.6"; + version = "0.11.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-qWDrdS1zxe5woQSKLHhDSGJ1KF4SHk1mhaQApJXCCO4="; + hash = "sha256-jWkrjFQg0EqM+e/IT2n2E4lGL2kT/Wz7r5BLlzvWSO0="; }; - cargoHash = "sha256-NEXgb7yWQkqbbofd3oYQ5n+CmfaM2cWj8HwufrcRKkc="; + cargoHash = "sha256-+kXwMGeE2HD59EU0Dzvg8I6LcHiPV7SKSFqnCTfkKwY="; nativeBuildInputs = [ pkg-config ]; From bae58aed5adfdac724e711eeaf9e5839fc3bc845 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Aug 2021 22:39:59 +0200 Subject: [PATCH 0914/1062] python3Packages.pylitterbot: 2021.8.0 -> 2021.8.1 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 08924d515732..a305a8309a93 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.8.0"; + version = "2021.8.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-Z7/j5ZZd8cOJhY/GfKUcDSJZvmU/TR/KDK60j1eYsik="; + sha256 = "sha256-ULaybf2uV8lY9J9EHlszbnLWZJ0QO7y6BQxvdQX+nMU="; }; propagatedBuildInputs = [ From f107f026404e04052e729699a2a2776b4850f5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 Aug 2021 03:06:59 +0200 Subject: [PATCH 0915/1062] python39Packages.bellows: disable failing tests --- pkgs/development/python-modules/bellows/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e52e07627dbb..a95bf6054fd8 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -46,10 +46,9 @@ buildPythonPackage rec { ]; disabledTests = [ - # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited - #"test_remigrate_forcibly_downgraded_v4" - # RuntimeError: Event loop is closed - "test_thread_already_stopped" + # AssertionError: assert 65534 is None + # https://github.com/zigpy/bellows/issues/436 + "test_startup_nwk_params" ]; pythonImportsCheck = [ From c16fb103bae6f56428d44ff07720472e0bb4fb0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 03:48:01 +0200 Subject: [PATCH 0916/1062] python2Packages.decorator: reinit at 4.4.2 --- .../python-modules/decorator/4.nix | 21 +++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/decorator/4.nix diff --git a/pkgs/development/python-modules/decorator/4.nix b/pkgs/development/python-modules/decorator/4.nix new file mode 100644 index 000000000000..8e8fd28f0b54 --- /dev/null +++ b/pkgs/development/python-modules/decorator/4.nix @@ -0,0 +1,21 @@ +{ 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 de4e68c02475..57e6987e6703 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -82,6 +82,8 @@ with self; with super; { dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { }; + decorator = callPackage ../development/python-modules/decorator/4.nix { }; + deskcon = callPackage ../development/python-modules/deskcon { }; django_evolution = callPackage ../development/python-modules/django_evolution { }; From 7d130e3fbd2a0eb24d7e5bceb16428cf2283e38d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 03:50:05 +0200 Subject: [PATCH 0917/1062] home-assistant: relax httpx, requests constraints --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7bf04b65c723..3a9f7c7480d0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -172,7 +172,9 @@ in with py.pkgs; buildPythonApplication rec { --replace "awesomeversion==21.4.0" "awesomeversion" \ --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ + --replace "httpx==0.18.2" "httpx>=0.18.2" \ --replace "pip>=8.0.3,<20.3" "pip" \ + --replace "requests==2.25.1" "requests>=2.25.1" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; From cce484c6c478c720d519c0d6804c57062128bacd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 27 Aug 2021 22:53:47 -0700 Subject: [PATCH 0918/1062] python3Packages.azure-mgmt-iothubprovisioningservices: fix build --- .../azure-mgmt-iothubprovisioningservices/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index f8a48243571b..fe1d5096cd34 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -6,6 +6,7 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: @@ -23,6 +24,7 @@ buildPythonPackage rec { msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From 754c7ed6e08ee0d7fb554127a73facf1bc238edc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 27 Aug 2021 22:53:59 -0700 Subject: [PATCH 0919/1062] azure-cli: fix build --- pkgs/tools/admin/azure-cli/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 2cde5a1da579..1cae7c1cc1fb 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -87,6 +87,7 @@ let postPatch = '' substituteInPlace setup.py \ --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ + --replace "requests~=2.25.1" "requests~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; @@ -98,7 +99,7 @@ let PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \ --ignore=azure/cli/core/tests/test_profile.py \ --ignore=azure/cli/core/tests/test_generic_update.py \ - -k 'not metadata_url' + -k 'not metadata_url and not test_send_raw_requests' ''; pythonImportsCheck = [ @@ -157,7 +158,7 @@ let "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs="; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "1.0.0" "zip" - "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rza"; + "sha256-q4cQjA1c4n2AWDtL+tlmrQcEncvA6awoxkqmu9rmTiI="; azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.12.0" "zip" "sha256-mrw1Gs3LMOPFiL5mSSrm+g1/dxihplA6ItYHbwljJbM="; @@ -201,6 +202,9 @@ let azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.0.0" "zip" "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "0.2.0" "zip" + "sha256-jDes/Rwzq6hF8uAwLvcmbK0xy6UDzJkKSGhGWay3uR0="; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip" "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; From 6914f2a363492bdeaca570698daea82f77ee7baa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 18:47:01 +0200 Subject: [PATCH 0920/1062] python3Packages.immutabledict: 2.1.0 -> 2.2.0 --- .../python-modules/immutabledict/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 54fef8720ca5..b45b852f85fc 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -7,22 +7,16 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - sha256 = "1n71154nfb6vr41iv00xcwkxmwnn1vwzbr3s23bjvlhvmnjb48a8"; + sha256 = "sha256-Jf7ad3ImPfEvCBrUZ1NVXMCBqwLmd0hwpKfe9rVsehc="; }; - # https://github.com/corenting/immutabledict/issues/56 - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; - nativeBuildInputs = [ poetry-core ]; From ebe4ea3be238597bc974b98014b13d7048c3bf15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 22:33:29 +0200 Subject: [PATCH 0921/1062] python3Packages.pykka: fix build, tests and refactor Tests were not available in the PyPi package anymore. --- .../python-modules/pykka/default.nix | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index f219375f93ef..dfd84fe066d0 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -1,21 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-mock }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pytest-mock +}: buildPythonPackage rec { - pname = "Pykka"; + pname = "pykka"; version = "3.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "da59f77bc6a70e01996259da806d09b0dbc00dabe874ca9558fd5eb1698709c9"; + src = fetchFromGitHub { + owner = "jodal"; + repo = pname; + rev = "v${version}"; + sha256 = "1h3brgm8y4a9s991y0drkp0vvmxix9f2b49f9w6ibhkhr37gc0lh"; }; - checkInputs = [ pytestCheckHook pytest-mock ]; + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; meta = with lib; { homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst"; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; license = licenses.asl20; }; } From 9e3b985316169038739ce85227ead27e828c0aea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 29 Aug 2021 16:43:10 +0200 Subject: [PATCH 0922/1062] python3Packages.ipykernel: add missing deps and split off tests The package now requires debugpy and the tests require ipyparallel. The latter causes an infinite recursion, which is why I split out the tests into `passthru.tests.pytest`. There is not dedicated tests output, because the tests require relative imports. --- .../python-modules/ipykernel/default.nix | 47 +++++---------- .../python-modules/ipykernel/tests.nix | 57 +++++++++++++++++++ 2 files changed, 72 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/ipykernel/tests.nix diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index db87d371e3f2..a34af6eca28f 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -1,15 +1,14 @@ { lib , stdenv , buildPythonPackage +, callPackage , fetchPypi -, flaky +, debugpy , ipython , jupyter_client -, traitlets , tornado +, traitlets , pythonOlder -, pytestCheckHook -, nose }: buildPythonPackage rec { @@ -21,36 +20,20 @@ buildPythonPackage rec { sha256 = "4439459f171d77f35b7f7e72dace5d7c2dd10a5c9e2c22b173ad9048fbfe7656"; }; - propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; + propagatedBuildInputs = [ + debugpy + ipython + jupyter_client + tornado + traitlets + ]; - checkInputs = [ pytestCheckHook nose flaky ]; - dontUseSetuptoolsCheck = true; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTests = lib.optionals stdenv.isDarwin ([ - # see https://github.com/NixOS/nixpkgs/issues/76197 - "test_subprocess_print" - "test_subprocess_error" - "test_ipython_start_kernel_no_userns" + # check in passthru.tests.pytest to escape infinite recursion with ipyparallel + doCheck = false; - # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" - ] ++ lib.optionals (pythonOlder "3.8") [ - # flaky test https://github.com/ipython/ipykernel/issues/485 - "test_shutdown" - - # test regression https://github.com/ipython/ipykernel/issues/486 - "test_sys_path_profile_dir" - "test_save_history" - "test_help_output" - "test_write_kernel_spec" - "test_ipython_start_kernel_userns" - "ZMQDisplayPublisherTests" - ]); - - # Some of the tests use localhost networking. - __darwinAllowLocalNetworking = true; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = { description = "IPython Kernel for Jupyter"; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix new file mode 100644 index 000000000000..9375dbc2bfdc --- /dev/null +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, flaky +, ipykernel +, ipyparallel +, nose +, pytestCheckHook + +}: + +buildPythonPackage rec { + pname = "ipykernel-tests"; + inherit (ipykernel) version; + + src = ipykernel.src; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + flaky + ipykernel + ipyparallel + nose + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = lib.optionals stdenv.isDarwin ([ + # see https://github.com/NixOS/nixpkgs/issues/76197 + "test_subprocess_print" + "test_subprocess_error" + "test_ipython_start_kernel_no_userns" + + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" + ] ++ lib.optionals (pythonOlder "3.8") [ + # flaky test https://github.com/ipython/ipykernel/issues/485 + "test_shutdown" + + # test regression https://github.com/ipython/ipykernel/issues/486 + "test_sys_path_profile_dir" + "test_save_history" + "test_help_output" + "test_write_kernel_spec" + "test_ipython_start_kernel_userns" + "ZMQDisplayPublisherTests" + ]); + + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; +} From 3166c7c29adcec9dbc8d985f7058d58d9b02beea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 29 Aug 2021 20:50:08 +0200 Subject: [PATCH 0923/1062] python39Packages.fastdiff: mark broken on 32bit --- pkgs/development/python-modules/fastdiff/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index 6d37e6884b69..a790f1623817 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: +{ stdenv, lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: buildPythonPackage rec { pname = "fastdiff"; @@ -27,5 +27,7 @@ buildPythonPackage rec { homepage = "https://github.com/syrusakbary/fastdiff"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + # resulting compiled object panics at import + broken = stdenv.is32bit; }; } From 4e285168fe0e2ec9184b24c27bafdafc0e0548fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 29 Aug 2021 20:50:23 +0200 Subject: [PATCH 0924/1062] platformio: remove 32bit packages to unbreak --- pkgs/development/embedded/platformio/chrootenv.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 72384c0994a2..138e7186624a 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -23,7 +23,8 @@ in buildFHSUserEnv { name = "platformio"; targetPkgs = pio-pkgs; - multiPkgs = pio-pkgs; + # disabled temporarily because fastdiff no longer support 32bit + # multiPkgs = pio-pkgs; meta = with lib; { description = "An open source ecosystem for IoT development"; From 9f5cc3d58bf6d0df0513a6554305f12f16418397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 29 Aug 2021 22:32:19 +0200 Subject: [PATCH 0925/1062] python39Packages.debugpy: throw on unsupported system this fixes failures for example in nixpkgs-review on aarch64-linux --- pkgs/development/python-modules/debugpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 35ac416d5992..0bdfe35514d4 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; - }.${stdenv.hostPlatform.system}} + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; checkInputs = [ From c617466cadc6c725b532a233d2f06b1f178d537e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:18:44 +0200 Subject: [PATCH 0926/1062] python39Packages.sphinxcontrib-tikz: replace patch by substituteInPlace to prevent apply errors --- .../sphinxcontrib-tikz/binary-paths.patch | 22 ------------------- .../sphinxcontrib-tikz/default.nix | 11 +++++----- 2 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch deleted file mode 100644 index 847a6e076918..000000000000 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sphinxcontrib/tikz.py b/sphinxcontrib/tikz.py -index ee21113..a4f4589 100644 ---- a/sphinxcontrib/tikz.py -+++ b/sphinxcontrib/tikz.py -@@ -242,7 +242,7 @@ def render_tikz(self, node, libs='', stringsubst=False): - tf.write(latex) - tf.close() - -- system([self.builder.config.latex_engine, '--interaction=nonstopmode', -+ system(['@texLive@/bin/pdflatex', '--interaction=nonstopmode', - 'tikz-%s.tex' % shasum], - self.builder) - -@@ -281,7 +281,7 @@ def render_tikz(self, node, libs='', stringsubst=False): - '-sOutputFile=%s' % outfn, '-r' + resolution + 'x' + resolution, - '-f', 'tikz-%s.pdf' % shasum], self.builder) - elif self.builder.config.tikz_proc_suite == "pdf2svg": -- system(['pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) -+ system(['@pdf2svg@/bin/pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) - else: - self.builder._tikz_warned = True - raise TikzExtError('Error (tikz extension): Invalid configuration ' diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 7409791efc45..cc5412fe42ff 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -16,12 +16,11 @@ buildPythonPackage rec { sha256 = "1614a45c960b80009dd42f96689122c9c0781018a0c5ec5828f4cdc5e35b11ad"; }; - patches = [ - (substituteAll { - src = ./binary-paths.patch; - inherit texLive pdf2svg; - }) - ]; + postPatch = '' + substituteInPlace sphinxcontrib/tikz.py \ + --replace "config.latex_engine" "${texLive}/bin/pdflatex" \ + --replace "system(['pdf2svg'" "system(['${pdf2svg}/bin/pdf2svg'" + ''; propagatedBuildInputs = [ sphinx ]; From 25c4bbf1efaaa24913d1ce662d63080ee54eafef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:49:39 +0200 Subject: [PATCH 0927/1062] python39Packages.zodb: remove outdated disabled --- .../python-modules/zodb/default.nix | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index aa7cc6c97ebd..e4f1e403cd97 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -2,7 +2,6 @@ , fetchPypi , buildPythonPackage , python -, pythonAtLeast , zope_testrunner , transaction , six @@ -16,46 +15,43 @@ }: buildPythonPackage rec { - pname = "ZODB"; - version = "5.6.0"; + pname = "ZODB"; + version = "5.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; + }; - # remove broken test - postPatch = '' - rm -vf src/ZODB/tests/testdocumentation.py - ''; + # remove broken test + postPatch = '' + rm -vf src/ZODB/tests/testdocumentation.py + ''; - # ZConfig 3.5.0 is not compatible with Python 3.8 - disabled = pythonAtLeast "3.8"; + propagatedBuildInputs = [ + transaction + six + zope_interface + zodbpickle + zconfig + persistent + zc_lockfile + BTrees + ]; - propagatedBuildInputs = [ - transaction - six - zope_interface - zodbpickle - zconfig - persistent - zc_lockfile - BTrees - ]; + checkInputs = [ + manuel + zope_testrunner + ]; - checkInputs = [ - manuel - zope_testrunner - ]; + checkPhase = '' + ${python.interpreter} -m zope.testrunner --test-path=src [] + ''; - checkPhase = '' - ${python.interpreter} -m zope.testrunner --test-path=src [] - ''; - - meta = with lib; { - description = "Zope Object Database: object database and persistence"; - homepage = "https://pypi.python.org/pypi/ZODB"; - license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; - }; + meta = with lib; { + description = "Zope Object Database: object database and persistence"; + homepage = "https://pypi.python.org/pypi/ZODB"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; } From 5e2ebb592aa056c716f22329b03f45e424e5132f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:50:03 +0200 Subject: [PATCH 0928/1062] vulnix: disable python3Packages overwrite --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15f8a80e174b..eda3a652f4ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14739,9 +14739,7 @@ with pkgs; vultr-cli = callPackage ../development/tools/vultr-cli { }; - vulnix = callPackage ../tools/security/vulnix { - python3Packages = python37Packages; - }; + vulnix = callPackage ../tools/security/vulnix { }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; From 838b36e5881d0e434bad8a452b2054a6768d81ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:52:38 +0200 Subject: [PATCH 0929/1062] python39Packages.zconfig: 3.5.0 -> 3.6.0 --- .../python-modules/zconfig/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index a6a00ad821b8..521bca4ece8c 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -1,32 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchPypi -, fetchpatch , buildPythonPackage , zope_testrunner , manuel , docutils -, pythonAtLeast +, pygments }: buildPythonPackage rec { pname = "ZConfig"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550"; + sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU="; }; - patches = [ - # fixes 3.8+ logger validation issues, has been merged into master, remove next bump - (fetchpatch { - url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch"; - sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij"; - }) - ] ++ lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; + checkInputs = [ pygments ]; meta = with lib; { description = "Structured Configuration Library"; From 5253aa553cb7ab324512e1bc6a5e8b1c10753dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:58:51 +0200 Subject: [PATCH 0930/1062] top-level: use python3Packages instead of python37Packages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eda3a652f4ab..4f68b9c91f31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3598,7 +3598,7 @@ with pkgs; bud = callPackage ../tools/networking/bud { }; - bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; + bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; bumpver = callPackage ../applications/version-management/bumpver { }; From 081a0fa2023f13890ddf20eabd9a2fb5e4dae515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:59:11 +0200 Subject: [PATCH 0931/1062] variety: use python3Packages instead of python37Packages --- pkgs/applications/misc/variety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 9b40c4c44f1f..948719aae762 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, python37Packages +, python3Packages , fehSupport ? false, feh , imagemagickSupport ? true, imagemagick , intltool @@ -13,7 +13,7 @@ , makeWrapper }: -with python37Packages; +with python3Packages; buildPythonApplication rec { pname = "variety"; From 84f13d408f8bbfa2bcf191a6b0f6362c7a773b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:59:43 +0200 Subject: [PATCH 0932/1062] boxfort: use python3Packages instead of python37Packages --- pkgs/development/libraries/boxfort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 740e43216984..93176fb230f1 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, python3Packages }: stdenv.mkDerivation rec { version = "unstable-2019-10-09"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs ci/isdir.py ''; - checkInputs = with python37Packages; [ cram ]; + checkInputs = with python3Packages; [ cram ]; doCheck = true; From 191e88dfbdfb82ad4db6596ee1f1686b6a6a6543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 01:00:01 +0200 Subject: [PATCH 0933/1062] criterion: use python3Packages instead of python37Packages --- pkgs/development/libraries/criterion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index ba436fec0a26..a1e7137d92ab 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext -, dyncall , nanomsg, python37Packages }: +, dyncall , nanomsg, python3Packages }: stdenv.mkDerivation rec { version = "2.3.3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nanomsg ]; - checkInputs = with python37Packages; [ cram ]; + checkInputs = with python3Packages; [ cram ]; cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; From 6b29e13f36b95445fced271f93f43088c3647c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 01:00:25 +0200 Subject: [PATCH 0934/1062] appgate-sdp: use python3Packages instead of python37Packages --- pkgs/applications/networking/appgate-sdp/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index e894572dd78c..397c64141ac9 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -32,8 +32,7 @@ , openssl , pango , procps -, python37 -, python37Packages +, python3 , stdenv , systemd , xdg-utils @@ -101,8 +100,8 @@ stdenv.mkDerivation rec { dontBuild = true; buildInputs = [ - python37 - python37Packages.dbus-python + python3 + python3.pkgs.dbus-python ]; nativeBuildInputs = [ From f777eddfce128d6851863db16ce4a7f55ec4d790 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 01:22:38 +0200 Subject: [PATCH 0935/1062] plover.dev: 4.0.0.dev8 -> 4.0.0.dev10 Also unpins the aging python36Packages. --- pkgs/applications/misc/plover/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index ac4811b30c41..68721c846f74 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python27Packages, python36Packages, wmctrl, +{ lib, fetchurl, python27Packages, python3Packages, wmctrl, qtbase, mkDerivationWith }: { @@ -24,9 +24,9 @@ ]; }; - dev = with python36Packages; mkDerivationWith buildPythonPackage rec { + dev = with python3Packages; mkDerivationWith buildPythonPackage rec { pname = "plover"; - version = "4.0.0.dev8"; + version = "4.0.0.dev10"; meta = with lib; { description = "OpenSteno Plover stenography software"; @@ -36,7 +36,7 @@ src = fetchurl { url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp"; + sha256 = "sha256-Eun+ZgmOIjYw6FS/2OGoBvYh52U/Ue0+NtIqrvV2Tqc="; }; # I'm not sure why we don't find PyQt5 here but there's a similar From 495a9649e623cb06fdd2da5030ebb0107fcdbf24 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 14:23:24 +0200 Subject: [PATCH 0936/1062] python3Packages.mocket: relax decorator constraint Disables a failing test case, because of the relaxed constraint. The geoip2 package, the only consumer of this package, does not exhibit any problems resulting from this change. --- pkgs/development/python-modules/mocket/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 73a3b07a64c3..ff400c6ed20b 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "decorator>=4.0.0,<5" "decorator>=4.0.0,<6" + ''; + propagatedBuildInputs = [ decorator http-parser @@ -54,6 +59,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # incompatible with decorator>=5 + "test_patch" # tests that require network access (like DNS lookups) "test_truesendall" "test_truesendall_with_chunk_recording" From a81561f9f7d6b488e313d1ba504e9ee0297b7deb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 14:47:24 +0200 Subject: [PATCH 0937/1062] python3Packages.geoalchemy2: fix build, enable tests, refactor --- .../python-modules/geoalchemy2/default.nix | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 94b27d6f1270..077523bdb482 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,31 +1,53 @@ { lib , buildPythonPackage , fetchPypi -, sqlalchemy -, shapely +, packaging , setuptools-scm -, pytest +, shapely +, sqlalchemy +, psycopg2 +, pytestCheckHook }: buildPythonPackage rec { pname = "GeoAlchemy2"; version = "0.9.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "b0e56d4a945bdc0f8fa9edd50ecc912889ea68e0e3558a19160dcb0d5b1b65fc"; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ sqlalchemy shapely ]; + nativeBuildInputs = [ + setuptools-scm + ]; - # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst - doCheck = false; + propagatedBuildInputs = [ + packaging + shapely + sqlalchemy + ]; + + checkInputs = [ + psycopg2 + pytestCheckHook + ]; + + disabledTestPaths = [ + # tests require live postgis database + "tests/gallery/test_decipher_raster.py" + "tests/gallery/test_length_at_insert.py" + "tests/gallery/test_summarystatsagg.py" + "tests/gallery/test_type_decorator.py" + "tests/test_functional.py" + ]; meta = with lib; { + description = "Toolkit for working with spatial databases"; homepage = "http://geoalchemy.org/"; license = licenses.mit; - description = "Toolkit for working with spatial databases"; + maintainers = with maintainers; [ ]; }; } From e7477887aee8bd0e84ecfe7d6e0f092e45c48daa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Aug 2021 16:09:41 +0200 Subject: [PATCH 0938/1062] python3Packages.pytest-doctestplus: disable failing tests, update deps --- .../pytest-doctestplus/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 34bf587fa533..8cd73f483fa8 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,18 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, six +, pythonOlder +, packaging , pytest , pytestCheckHook -, numpy , setuptools-scm }: buildPythonPackage rec { pname = "pytest-doctestplus"; version = "0.10.1"; - disabled = isPy27; # abandoned upstream + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -22,19 +21,30 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ - six - numpy + packaging ]; checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # ERROR: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...] + # __main__.py: error: unrecognized arguments: --remote-data + "test_remote_data_url" + "test_remote_data_float_cmp" + "test_remote_data_ignore_whitespace" + "test_remote_data_ellipsis" + "test_remote_data_requires" + "test_remote_data_ignore_warnings" + ]; + meta = with lib; { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; From b85ee268e1cbebe49cb9fa29358c326b1bbff3a8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 30 Aug 2021 17:14:52 +0100 Subject: [PATCH 0939/1062] python3Packages.pyosmium: add requests dependency --- pkgs/development/python-modules/pyosmium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 161fa9d24dc1..bd6b5d701dda 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, cmake, python , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, nose, shapely, pythonOlder, isPyPy, lz4 }: +, nose, shapely, pythonOlder, isPyPy, lz4, requests }: buildPythonPackage rec { pname = "pyosmium"; @@ -17,6 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; + propagatedBuildInputs = [ requests ]; preBuild = "cd .."; From 43c225d3ce7dd1a1e1e1d22cf06f83e87514fd79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0940/1062] python3Packages.alembic: 1.6.5 -> 1.7.1 --- .../python-modules/alembic/default.nix | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 9c7244b3c066..af8b1fc37215 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,26 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, pytest-cov, mock, coverage, setuptools -, Mako, sqlalchemy, python-editor, python-dateutil +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, Mako +, python-dateutil +, sqlalchemy +, importlib-metadata +, importlib-resources +, pytest-xdist +, pytestCheckHook + }: buildPythonPackage rec { pname = "alembic"; - version = "1.6.5"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; + sha256 = "aea964d3dcc9c205b8759e4e9c1c3935ea3afeee259bffd7ed8414f8085140fb"; }; - buildInputs = [ pytest pytest-cov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; + propagatedBuildInputs = [ + Mako + python-dateutil + sqlalchemy + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; - # no traditional test suite - doCheck = false; + pythonImportsCheck = [ + "alembic" + ]; + + checkInputs = [ + pytestCheckHook + pytest-xdist + ]; + + pytestFlagsArray = [ + "--numprocesses" "auto" + ]; meta = with lib; { homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 92571ee890fe2368a41b3ade877f46c55f962199 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0941/1062] python3Packages.astroid: 2.7.2 -> 2.7.3 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 3b23ee2438ec..a4694663bb6b 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.7.2"; # Check whether the version is compatible with pylint + version = "2.7.3"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1vlibff93z9fvkniviwzizsfffw1j0ywkh4rragnlps797143iv4"; + sha256 = "08qxw58cdyglkni6ahyil4cmnb48zz0wr4v05gzqk4r5ifs4gl2m"; }; SETUPTOOLS_SCM_PRETEND_VERSION=version; From 755343688c17eba3687863684752ae7919b13905 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0942/1062] python3Packages.casbin: 1.5.0 -> 1.7.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 0cadf449ea88..47a6a48eaca7 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.5.0"; + version = "1.7.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0sxv9kyzi7kzpljv1mrglz5szfxmqjmmnbcdn8mr0vwx3xibjb9j"; + sha256 = "1qwns8ph8w5bb26hzkk1dadm2bjq74g65wm6g971llb5jdq9a8z9"; }; propagatedBuildInputs = [ From 832b2ae368e5bd982813bae01e6d11aebb16ab58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0943/1062] python3Packages.cfn-lint: 0.53.0 -> 0.53.1 --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index d8e0af78e1cd..6f6d55502958 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.53.0"; + version = "0.53.1"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "sha256-UHcbbBoByoxW7+AUxu5mQmcvC3irHPQvBv4CbBXPTNo="; + sha256 = "1wj2pzrrmrdf3mkhnz1qx41rshvfpgwlrxrb80d63r098pnq6df8"; }; postPatch = '' From 94bddb0b85a5fa6783f8e7bafbbcd0d9b61684eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0944/1062] python3Packages.chart-studio: 5.2.2 -> 5.3.0 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index a373246d49f7..9d8c6ecb84d5 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.2.2"; + version = "5.3.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "14msi6i2caca5riirfv81nskh8w3avnflyr2phm62kygk125h1v7"; + sha256 = "059rq278r5zb2sngby7jzh8kd9c48sd82b6b7s5bbrmzj42sds3n"; }; sourceRoot = "source/packages/python/chart-studio"; From 78503c4085759871735e77609eebe9aa9d3ef6bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0945/1062] python3Packages.commoncode: 21.7.23 -> 21.8.27 --- pkgs/development/python-modules/commoncode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 7c9528c06e52..e7dfb65e7946 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,11 +14,11 @@ }: buildPythonPackage rec { pname = "commoncode"; - version = "21.7.23"; + version = "21.8.27"; src = fetchPypi { inherit pname version; - sha256 = "38511dcd7c518bf7fec4944c78e1118304f2f2582a7e6792cc5773aebe95a086"; + sha256 = "789ee1798cd74ab4516d2e547473d69717d3b2ed7ee180ab2746e0bdfd0d88a4"; }; dontConfigure = true; From d5be30682299bd94b0852e9f11ff184bfa264058 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:06 +0200 Subject: [PATCH 0946/1062] python3Packages.django-environ: 0.4.5 -> 0.5.0 --- pkgs/development/python-modules/django_environ/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index 3f01a2b294a1..6baaf58e7d09 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.4.5"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "6c9d87660142608f63ec7d5ce5564c49b603ea8ff25da595fd6098f6dc82afde"; + sha256 = "a8726675c1ebefa4706b36398c4d3c5c790d335ffe55c4a10378f6bfd57ad8d0"; }; # The testsuite fails to modify the base environment From 6b96887023528dec6df11e12aa19091756be15be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0947/1062] python3Packages.dpkt: 1.9.7.1 -> 1.9.7.2 --- pkgs/development/python-modules/dpkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index 74817e60cbcf..a1036e099ea8 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.7.1"; + version = "1.9.7.2"; src = fetchPypi { inherit pname version; - sha256 = "74899d557ec4e337db29cecc80548b23a1205384d30ee407397cfb9ab178e3d4"; + sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b"; }; # Project has no tests From c08755eb0e3ba5db6628e8f2e4ff3390715065b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0948/1062] python3Packages.google-cloud-bigquery-datatransfer: 3.3.1 -> 3.3.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 f6a62c544cf4..62956e1e46de 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.3.1"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oCktt8wAYKewz6Ga4mIGVy0IWonXTqQvaO5MT4MkHMY="; + sha256 = "fcb71ebe5c5b232d24fe7d666b65709e4fc8db43263c8182e5ed8e5a52abefec"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 5ef52dd2ade9c8cc16598df17c389c5478ca2c1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:07 +0200 Subject: [PATCH 0949/1062] python3Packages.google-cloud-testutils: 1.0.0 -> 1.1.0 --- .../python-modules/google-cloud-testutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 05a66406ce02..2c208511ee3f 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2RaRhRvgnmr/trjAE+RBlVO5AZ54YEFcoRwcPCKCTKs="; + sha256 = "3d79051b6ca170c2a4f159bf56ac3f66c1e5360486121e72c06fdaa3911154bf"; }; propagatedBuildInputs = [ click google-auth six ]; From c7d731dab39f7870d532e81f284bd2eaf66c1bd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0950/1062] python3Packages.google-crc32c: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/google-crc32c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index b36635654a9d..41b23321af98 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "google-crc32c"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "058g69yp7x41mv0d84yp31jv64fpm4r25b86rvvqgc6n74w6jj7k"; + sha256 = "1m2hafyfagvyabizr4fhcp2s2s3x56k006fhvl1qzk994qjhyzqk"; }; buildInputs = [ crc32c ]; From 77565e3cee2b6ff56174ad5574cf27b6dad743d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0951/1062] python3Packages.gradient: 1.7.2 -> 1.7.4 --- pkgs/development/python-modules/gradient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 4303101ed929..7e47faadc0e2 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.7.2"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "108dc01d2f9f9d4fa2c080d12f14b77b4ec6329f239a0b2bc89e09360ae6757d"; + sha256 = "de1d33672f13d4de37a66ba9aebfd503a098d0ca26e5eb8b071e1c0dacd557ea"; }; postPatch = '' From dd93840fa1235deaacc299a1605531edfd7e4df5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0952/1062] python3Packages.hypothesis: 6.15.0 -> 6.17.3 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index bc832f5f1ad5..4d0a1713d954 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.15.0"; + version = "6.17.3"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "0kjnd593wz90gbjwzn4gc9514w4pxg77hpisp9v6m7bj1w7a7x5q"; + sha256 = "1g96q3l97lq3xps36cv147dvj44nh1b0k67z817x7zfwyw844sgn"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From cc5eb10728edea389531b546425e69c3f4ca6404 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0953/1062] python3Packages.ipykernel: 6.2.0 -> 6.3.0 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index a34af6eca28f..041818900978 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.2.0"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - sha256 = "4439459f171d77f35b7f7e72dace5d7c2dd10a5c9e2c22b173ad9048fbfe7656"; + sha256 = "5314690a638f893e2cc3bf3d25042920e9fbb873f7d8263033390264caeb95f4"; }; propagatedBuildInputs = [ From f2ed073a9056488b5e49d8b925386d5dee5135ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0954/1062] python3Packages.ipython: 7.26.0 -> 7.27.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index f03db08bc49b..548ba874cd70 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.26.0"; + version = "7.27.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e"; + sha256 = "58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13"; }; prePatch = lib.optionalString stdenv.isDarwin '' From d229c023d25ed7a358352ca94e8ad0a04d91eb11 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0955/1062] python3Packages.jupyter_client: 7.0.1 -> 7.0.2 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 35faf676f378..e30b3cb63a71 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.0.1"; + version = "7.0.2"; src = fetchPypi { inherit pname version; - sha256 = "48822a93d9d75daa5fde235c35cf7a92fc979384735962501d4eb60b197fb43a"; + sha256 = "0c6cabd07e003a2e9692394bf1ae794188ad17d2e250ed747232d7a473aa772c"; }; propagatedBuildInputs = [ From c9436194e033acbe620745e6ac923eaf940f9971 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0956/1062] python3Packages.kiwisolver: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/kiwisolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 2b157494f919..e5649c58e465 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"; + sha256 = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; From 9305faf3578c64e918d38dcb64fe84dd9ff90175 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0957/1062] python3Packages.labelbox: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 97417b663652..5f8057df849d 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.1.0"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "V${version}"; - sha256 = "0hqjwilz1d5jidgsambr2zrp4czy53rq01p2ib6mndzsdh86nv7w"; + sha256 = "0vp1lk7hipa4ixa1zcy99r9b5xb1gv54h4i0izx6fv4zf9m0gmw1"; }; propagatedBuildInputs = [ From ae0d5b484a67f61be67d1232e64772a57f9ee70a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0958/1062] python3Packages.mautrix: 0.10.5 -> 0.10.6 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index f0005eef61bf..1b8bcb293892 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.10.5"; + version = "0.10.6"; src = fetchPypi { inherit pname version; - sha256 = "b7d52d72a9739963b6d39d5e58ef367c00490a90cf7795f23c8b2e2c140c8882"; + sha256 = "2738370469f8ce27efc37aa6e17319a4149246c9a0da822c8d81d948f0c7e1a7"; }; propagatedBuildInputs = [ From cfe336796f6ef0a5f2a9e53a11cd21e9fe7b9f62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:08 +0200 Subject: [PATCH 0959/1062] python3Packages.minidump: 0.0.18 -> 0.0.19 --- pkgs/development/python-modules/minidump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix index 6c00ad650bb5..589b7e351c1e 100644 --- a/pkgs/development/python-modules/minidump/default.nix +++ b/pkgs/development/python-modules/minidump/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.18"; + version = "0.0.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uf4KZc9C1gWRgHu4ttk1fpL2pG8oUb79uvCIlHItB/8="; + sha256 = "67b3327cb96e319633653a353c6281703772335dc84797d6fdce7daf0b3be077"; }; # Upstream doesn't have tests From c8911ada308f302035cdf95bc50b014c82476840 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0960/1062] python3Packages.mne-python: 0.23.2 -> 0.23.3 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 2f97cac131ec..912c2c52ea8e 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.23.2"; + version = "0.23.3"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "1y6xypfzq7a3ffzwlbqspyzvijr6ihgfzgvhajs16d74pxhdkg74"; + sha256 = "1pil4vy4grg49i5xcrqmi43vf40lk5p4sbj5bl0fjixkklavwmhj"; }; propagatedBuildInputs = [ numpy scipy ]; From 98ec450fc88b220edf91314c1f061eb0091c44b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0961/1062] python3Packages.plaid-python: 8.0.0 -> 8.1.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 72b507a470b4..b864dedecfe7 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "8.0.0"; + version = "8.1.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "ce11a832e04889972809b257e0351e4cc70fd3b5d31de2b97cc9df732a3dcc9b"; + sha256 = "b1f7b5b58ba3c171bb795352119d54797c8c50877bc376d26cd756de2453e9fd"; }; checkInputs = [ pytest ]; From d89e0a4f77b46a8fea435276a5124378c16b788d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0962/1062] python3Packages.plotly: 5.2.2 -> 5.3.0 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 8db9466e0fb2..4b849dd016b8 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.2.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "809f0674a7991daaf4f287964d617d24e9fa44463acd5a5352ebd874cfd98b07"; + sha256 = "b6dc306c56e7d5fa7d017718894099b27290b427abf4acad8e5b77fdc3bd32ec"; }; propagatedBuildInputs = [ From d91533198b733b9a4e3656003430f38f0e9d69ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0963/1062] python3Packages.prettytable: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/prettytable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 23702f8e8cfb..5b3253b31b39 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0"; + sha256 = "bd81678c108e6c73d4f1e47cd4283de301faaa6ff6220bcd1d4022038c56b416"; }; nativeBuildInputs = [ setuptools-scm ]; From e88671f3dbdee8967be7f242b29f337f9006e51d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0964/1062] python3Packages.py3status: 3.38 -> 3.39 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index c8d5068e4e73..e027aaeb294b 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.38"; + version = "3.39"; src = fetchPypi { inherit pname version; - sha256 = "5660163a91590f320685263a738ab910c7a86346d9c85a68639a19ab83433ce6"; + sha256 = "d2a11dde0cc82d0eb5e938fe624f223d852ed848c57299ff562827bc4557375f"; }; doCheck = false; From a7a054346d3c15c77f9060323eaf636f8ef6b5f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0965/1062] python3Packages.pyfaidx: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/pyfaidx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index c179688a8a5b..317691066f47 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "fae5d2264f62f40e6f37090422a764197de610df36afb5ae827b167d34b8621a"; + sha256 = "d1258f8d053cba0c90fe329254e8ec59eb28b535b48d9d06e8c7f1d74b8e4531"; }; propagatedBuildInputs = [ six ]; From 9965898a66e3c7b9e53b0fd66ee33b7371ddde2f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0966/1062] python3Packages.pyfakefs: 4.5.0 -> 4.5.1 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index ab4c2f360760..217e552aa0e1 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.0"; + version = "4.5.1"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "58b017b3437bbe97803a23755876c6d6aeb5aea37e52cec15e5d86b59c4c7295"; + sha256 = "002a065dcbf59c2caa039e4fc4ba01d1d636aa63ee9c794d4c9fc01f0e2d6dc0"; }; postPatch = '' From 6bb29572e4dc9410401bd6b6d166549be8427c78 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0967/1062] python3Packages.pytest: 6.2.4 -> 6.2.5 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index d5b1d14937a0..f2438622f6a6 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "6.2.4"; + version = "6.2.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"; + sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"; }; postPatch = '' From 37fa636325c475b9a26d248c240674f8f611c985 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:09 +0200 Subject: [PATCH 0968/1062] python3Packages.python-gitlab: 2.10.0 -> 2.10.1 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 831ae6e39668..a5c40533c169 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.10.0"; + version = "2.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N2s+mCOBzsc0RxxQKz2ixueFio300DyZNJnmp1k5UOY="; + sha256 = "7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f"; }; propagatedBuildInputs = [ From ca857ce04231048e3e98e87b7d6e27e9d17efdd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:10 +0200 Subject: [PATCH 0969/1062] python3Packages.pytube: 11.0.0 -> 11.0.1 --- pkgs/development/python-modules/pytube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index c71043b71b2a..bd5b9e374f16 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "11.0.0"; + version = "11.0.1"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "1n5zl1x1izyzbrsgf76lk1av6h5m6a69plmhrcjynl880dji2na9"; + sha256 = "04s4hganb6x0dlfyyg9gjah5z0vxd7bxzqwgvd28hqnf0iwc2byb"; }; checkInputs = [ From ca807c744eccbf2ec6f7450126ed108c5b104a53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:10 +0200 Subject: [PATCH 0970/1062] python3Packages.regex: 2021.8.21 -> 2021.8.28 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 0445b02c1f33..92ce64d186db 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2021.4.4"; + version = "2021.8.28"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uro9P5uULEnX5LwQW7KFUcRAZfE5plBiq3kSvvEMmvs="; + sha256 = "f585cbbeecb35f35609edccb95efd95a3e35824cd7752b586503f7e6087303f1"; }; # Sources for different Python releases are located in same folder From 30a1373f5fa32c83c47f757de83f92fcb6dd229c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:17:10 +0200 Subject: [PATCH 0971/1062] python3Packages.rich: 10.7.0 -> 10.9.0 --- pkgs/development/python-modules/rich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 323bd8ba8685..6c953a4579ea 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.7.0"; + version = "10.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "1drh08cmcn8dqi0mpfwscz3ljsv2s60kyhxy6iiw5si7rf717j4p"; + sha256 = "0lf2s7n9b31aavwl5xjl3x1pjc756s8pbk0whh5kag80z5v6qc32"; }; nativeBuildInputs = [ poetry-core ]; From 829d1a42ee2dabcfade856941321f79f46b5e384 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0972/1062] python3Packages.ROPGadget: 6.5 -> 6.6 --- pkgs/development/python-modules/ROPGadget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index 8c34e75139f6..6be0ed48e289 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "6.5"; + version = "6.6"; src = fetchPypi { inherit pname version; - sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c"; + sha256 = "dc61186e0114ec67ec7ce374df8fd2ddc2a7cba129a1242338e900a7483fba22"; }; propagatedBuildInputs = [ capstone ]; From 21d8d4442bf0c949e817a99b4cd61e6c4d5a6395 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0973/1062] python3Packages.ruamel.yaml: 0.17.14 -> 0.17.16 --- pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index f424310bfa74..efd418e454d4 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.17.14"; + version = "0.17.16"; src = fetchPypi { inherit pname version; - sha256 = "4185fcfa9e037fea9ffd0bb6172354a03ec98c21e462355d72e068c74e493512"; + sha256 = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33"; }; # Tests use relative paths From ac59950efd536c206620491d10cbe9335fb5da7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0974/1062] python3Packages.sagemaker: 2.56.0 -> 2.57.0 --- 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 0dae21c7f0e1..23fa728a78a0 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.56.0"; + version = "2.57.0"; src = fetchPypi { inherit pname version; - sha256 = "049699dce6a5c5bab9cd9597985d8a722cb1495ef8af63553cd988c5cce58a1d"; + sha256 = "b03b340fe54f91b0533d3ce19d5b7fdf403da21b5befab70a9915466e48f6e75"; }; pythonImportsCheck = [ From 9cb1a529d3f522a98d063a4e1cd8ecca2f7bc7c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0975/1062] python3Packages.smart-open: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/smart-open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 5e86281642af..bbe8b1b468ee 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "5.2.0"; + version = "5.2.1"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "v${version}"; - sha256 = "sha256-eC9BYHeACzGp382QBNgLcNMYDkHi0WXyEj/Re9ShXuA="; + sha256 = "13a1qsb4vwrhx45hz4qcl0d7bgv20ai5vsy7cq0q6qbj212nff19"; }; propagatedBuildInputs = [ From b22a0a359a2993ebe5f7b51223a5521c0a214ce9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0976/1062] python3Packages.snowflake-connector-python: 2.5.1 -> 2.6.0 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0b0c961e7d09..81d939db66be 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.5.1"; + version = "2.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8af2a51ac890d9e0ffe0cd509ba83198076e2564fb8fdc63c6814b773e70b33a"; + sha256 = "0198d9c1934540ae9c7276d98f1048f3432160613d9d0e49398112bb21b0f0bb"; }; propagatedBuildInputs = [ From 1e5d3eba8b68387e9b72384c0df7a9f6e931a5f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0977/1062] python3Packages.traitlets: 5.0.5 -> 5.1.0 --- pkgs/development/python-modules/traitlets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 3bc05897af66..23412d0a6940 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.0.5"; + version = "5.1.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396"; + sha256 = "bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d"; }; checkInputs = [ glibcLocales pytest mock ]; From f23b0af2bd6e0902835b7855d61bd2e715af1a88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0978/1062] python3Packages.typing_extensions: 3.10.0.0 -> 3.10.0.2 --- pkgs/development/python-modules/typing-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index fd8a25a485b9..939ca25eb1a3 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.10.0.0"; + version = "3.10.0.2"; src = fetchPypi { inherit pname version; - sha256 = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342"; + sha256 = "49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; From e337b46f5c3293dc612ba4056eabdbb2b2ace181 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0979/1062] python3Packages.vispy: 0.8.0 -> 0.8.1 --- .../python-modules/vispy/default.nix | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index e29729a702ef..9ebbfcd77e87 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -1,15 +1,26 @@ -{ lib, buildPythonPackage, substituteAll, stdenv, - fetchPypi, numpy, cython, freetype-py, fontconfig, libGL, - setuptools-scm, setuptools-scm-git-archive - }: +{ lib +, stdenv +, buildPythonPackage +, substituteAll +, fetchPypi +, cython +, fontconfig +, freetype-py +, hsluv +, kiwisolver +, libGL +, numpy +, setuptools-scm +, setuptools-scm-git-archive +}: buildPythonPackage rec { pname = "vispy"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "89533514ffe05b16dca142a0ca455a96d14de209a1620615b1d251fa28d54b9b"; + sha256 = "6e482e68487f5384205d349f288580d6287fd690df4cdc3ad4c573afc39990f1"; }; patches = [ @@ -21,15 +32,37 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython setuptools-scm setuptools-scm-git-archive + cython + setuptools-scm + setuptools-scm-git-archive + ]; + + buildInputs = [ + libGL ]; propagatedBuildInputs = [ - numpy freetype-py fontconfig libGL + fontconfig + freetype-py + hsluv + kiwisolver + numpy ]; doCheck = false; # otherwise runs OSX code on linux. - pythonImportsCheck = [ "vispy" ]; + + pythonImportsCheck = [ + "vispy" + "vispy.color" + "vispy.geometry" + "vispy.gloo" + "vispy.glsl" + "vispy.io" + "vispy.plot" + "vispy.scene" + "vispy.util" + "vispy.visuals" + ]; meta = with lib; { homepage = "https://vispy.org/index.html"; From 18db4c3f33e459d1a876a56512517a400b67d077 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:22:56 +0200 Subject: [PATCH 0980/1062] python3Packages.zarr: 2.9.3 -> 2.9.4 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 3bcfaece12a6..a26fa1dfef3c 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.9.3"; + version = "2.9.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "274d2c1642fab6b4ddd4e465df3cdd456a5f821ed9a425a075436b1d2110bf36"; + sha256 = "5544c47bc2a35f8e8af58bee92378518018b484ba550e997759d18f40fa75719"; }; nativeBuildInputs = [ From aa4e252cd2c514e443e911c8babe59571b673769 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:29:30 +0200 Subject: [PATCH 0981/1062] python3Packages.pydeconz: 82 -> 83 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index fb0852e2bf11..07fe662f6ec0 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "82"; + version = "83"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-DdZ6bf+2rMjgjm5aRxcSRI/hN0zfP7uV8PaM40c9IJo="; + sha256 = "0azpdgmfby8plsp22hy1ip9vzbnmvf9brmah7hcwkpypg31rb61y"; }; propagatedBuildInputs = [ From 1bec8b29ac9ab1e8229f8124d0b25299ec1fa6e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 00:29:31 +0200 Subject: [PATCH 0982/1062] python3Packages.pyTelegramBotAPI: 3.8.3 -> 4.0.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 58d1d0c694a7..f53038b2e1f6 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.8.3"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "afdd887fff42a963f13d09a1f4f5fd24aef08f4b8a594f2ac11e0a29022f1518"; + sha256 = "6accc4af505ee5b312689eaee1a9bc93cb6ea31a2d905a877c6b47f0888c3dcc"; }; propagatedBuildInputs = [ requests ]; From e2ec8b85bfc006a15175206194efdf856a84105f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 03:11:19 +0200 Subject: [PATCH 0983/1062] python3Packages.freetype-py: enable tests --- .../python-modules/freetype-py/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index b0035e838447..13e033e8bc36 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools-scm, freetype }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, setuptools-scm +, freetype +, pytestCheckHook +}: buildPythonPackage rec { pname = "freetype-py"; @@ -20,6 +28,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ freetype ]; + preCheck = '' + cd tests + ''; + + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "freetype" ]; meta = with lib; { From f1691206f62407bb3482fcc4724c838b27a9f36d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Aug 2021 14:16:38 +0200 Subject: [PATCH 0984/1062] python3Packages.mocket: 3.9.42 -> 3.9.44 --- pkgs/development/python-modules/mocket/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index ff400c6ed20b..f8ff484046bb 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,19 +19,14 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.42"; + version = "3.9.44"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah"; + sha256 = "sha256-oeDYzhSzUXxtYhcLjXAmsi1v9vY5qCE/U9YOYxdQxrg="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "decorator>=4.0.0,<5" "decorator>=4.0.0,<6" - ''; - propagatedBuildInputs = [ decorator http-parser @@ -59,8 +54,6 @@ buildPythonPackage rec { ]; disabledTests = [ - # incompatible with decorator>=5 - "test_patch" # tests that require network access (like DNS lookups) "test_truesendall" "test_truesendall_with_chunk_recording" From fe734dd3bb5ab8e5b48ae1b70389c9c2ebc3e0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 16:21:11 +0200 Subject: [PATCH 0985/1062] kupfer: no longer use python36Packages --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f68b9c91f31..7888af80493e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25270,11 +25270,7 @@ with pkgs; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; - kupfer = callPackage ../applications/misc/kupfer { - # using python36 as there appears to be a waf issue with python37 - # see https://github.com/NixOS/nixpkgs/issues/60498 - python3Packages = python36Packages; - }; + kupfer = callPackage ../applications/misc/kupfer { }; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; From acf4f5f2bab5272240e4c8240100936bdf1b5875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 18:15:37 +0200 Subject: [PATCH 0986/1062] python39Packages.canonicaljson: execute tests with pytestCheckHook, disable failing test --- .../python-modules/canonicaljson/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 4a4f56f5abf5..ca64d599534e 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, frozendict, simplejson, six, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, frozendict +, simplejson +, six +, isPy27 +, pytestCheckHook }: buildPythonPackage rec { @@ -13,7 +19,15 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - frozendict simplejson six + frozendict + simplejson + six + ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_frozen_dict" ]; meta = with lib; { From d779e6d217591bbaceff1f643a49d55ee12d8703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 18:27:13 +0200 Subject: [PATCH 0987/1062] python39Packages.ibm-cloud-sdk-core: disable failing tests, remove linting and not required checkInputs --- .../ibm-cloud-sdk-core/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 51e4008ae512..cc7572499da1 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -1,11 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, codecov , pyjwt -, pylint , pytestCheckHook -, pytest-cov , python-dateutil , requests , responses @@ -21,23 +18,20 @@ buildPythonPackage rec { sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; }; - checkInputs = [ - codecov - pylint - pytestCheckHook - pytest-cov - responses - tox - ]; - propagatedBuildInputs = [ pyjwt python-dateutil requests ]; - # Various tests try to access credential files which are not included with the source distribution + checkInputs = [ + pytestCheckHook + responses + tox + ]; + disabledTests = [ + # Various tests try to access credential files which are not included with the source distribution "test_configure_service" "test_cp4d_authenticator" "test_cwd" @@ -49,6 +43,12 @@ buildPythonPackage rec { "test_iam" "test_read_external_sources_2" "test_retry_config_external" + # assertion error due to requests brotli support + "test_http_client" + ]; + + disabledTestPaths = [ + "test/test_container_token_manager.py" ]; meta = with lib; { From 229cd3e58db39afdeee567d980ad7efca23ce7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 19:02:47 +0200 Subject: [PATCH 0988/1062] python39Packages.dateutils: init at 0.6.12 --- .../python-modules/dateutils/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/dateutils/default.nix diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix new file mode 100644 index 000000000000..faa3b1155483 --- /dev/null +++ b/pkgs/development/python-modules/dateutils/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytz }: + +buildPythonPackage rec { + pname = "dateutils"; + version = "0.6.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E="; + }; + + propagatedBuildInputs = [ + python-dateutil + pytz + ]; + + pythonImportsCheck = [ "dateutils" ]; + + meta = with lib; { + description = "Utilities for working with datetime objects."; + homepage = "https://github.com/jmcantrell/python-dateutils"; + license = licenses.bsd0; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 14950372494c..6e5a95ad7f63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1858,6 +1858,8 @@ in { dateparser = callPackage ../development/python-modules/dateparser { }; + dateutils = callPackage ../development/python-modules/dateutils { }; + datrie = callPackage ../development/python-modules/datrie { }; dawg-python = callPackage ../development/python-modules/dawg-python { }; From 6711517eea8e1bd0165b7f4916309888c5ee8dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 20:14:46 +0200 Subject: [PATCH 0989/1062] python39Packages.rdflib-jsonld: mark broken --- pkgs/development/python-modules/rdflib-jsonld/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/rdflib-jsonld/default.nix b/pkgs/development/python-modules/rdflib-jsonld/default.nix index 6e038dd33433..9a0b02c329f7 100644 --- a/pkgs/development/python-modules/rdflib-jsonld/default.nix +++ b/pkgs/development/python-modules/rdflib-jsonld/default.nix @@ -17,5 +17,7 @@ buildPythonPackage rec { license = licenses.bsdOriginal; description = "rdflib extension adding JSON-LD parser and serializer"; maintainers = [ maintainers.koslambrou ]; + # incomptiable with rdflib 6.0.0, half of the test suite fails with import and atrribute errors + broken = true; }; } From ff225beeae6593f7c2d3f4c4f2a63bee448d3e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 20:20:53 +0200 Subject: [PATCH 0990/1062] python39Packages.python-lsp-server: disable failing test after pylint update, format, move postPatch after src --- .../python-lsp-server/default.nix | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 5d13a50a11fd..60215fa0b4cd 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -45,6 +45,12 @@ buildPythonPackage rec { sha256 = "sha256-TyXKlXeXMyq+bQq9ngDm0SuW+rAhDlOVlC3mDI1THwk="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp --cov test" "" + ''; + propagatedBuildInputs = [ jedi pluggy @@ -52,14 +58,14 @@ buildPythonPackage rec { setuptools ujson ] ++ lib.optional withAutopep8 autopep8 - ++ lib.optional withFlake8 flake8 - ++ lib.optional withMccabe mccabe - ++ lib.optional withPycodestyle pycodestyle - ++ lib.optional withPydocstyle pydocstyle - ++ lib.optional withPyflakes pyflakes - ++ lib.optional withPylint pylint - ++ lib.optional withRope rope - ++ lib.optional withYapf yapf; + ++ lib.optional withFlake8 flake8 + ++ lib.optional withMccabe mccabe + ++ lib.optional withPycodestyle pycodestyle + ++ lib.optional withPydocstyle pydocstyle + ++ lib.optional withPyflakes pyflakes + ++ lib.optional withPylint pylint + ++ lib.optional withRope rope + ++ lib.optional withYapf yapf; checkInputs = [ flaky @@ -70,7 +76,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; + disabledTests = [ + # pytlint output changed + "test_lint_free_pylint" + ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py" ++ lib.optional (!withRope) "test/plugins/test_completion.py" @@ -83,12 +92,6 @@ buildPythonPackage rec { ++ lib.optional (!withRope) "test/plugins/test_rope_rename.py" ++ lib.optional (!withYapf) "test/plugins/test_yapf_format.py"; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp --cov test" "" - ''; - preCheck = '' export HOME=$(mktemp -d); ''; From c076955ffdca822d9f227b8f5da830f50d3388f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 20:21:41 +0200 Subject: [PATCH 0991/1062] python39Packages.pyocr: switch to pytestCheckHook, format, fix setuptools not finding version --- .../python-modules/pyocr/default.nix | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 099c9e237111..df20d3bb6c47 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,6 +1,16 @@ -{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools-scm, -setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll, -pytest, tox }: +{ lib +, fetchFromGitLab +, buildPythonPackage +, pillow +, setuptools-scm +, setuptools-scm-git-archive +, tesseract +, cuneiform +, isPy3k +, substituteAll +, pytestCheckHook +, tox +}: buildPythonPackage rec { pname = "pyocr"; @@ -17,20 +27,25 @@ buildPythonPackage rec { sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il"; }; - patches = [ (substituteAll { - src = ./paths.patch; - inherit cuneiform tesseract; - }) + patches = [ + (substituteAll { + src = ./paths.patch; + inherit cuneiform tesseract; + }) ]; - buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ pillow ]; - checkInputs = [ pytest tox ]; - checkPhase = "pytest"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - meta = { + buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + + propagatedBuildInputs = [ pillow ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { inherit (src.meta) homepage; description = "A Python wrapper for Tesseract and Cuneiform"; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; } From a7eb7ecbe38bcba227cee1a1e5e71a831b3a09b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 20:50:14 +0200 Subject: [PATCH 0992/1062] pylode: 2.8.6 -> 2.12.0 --- pkgs/misc/pylode/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix index 33e78bc15231..18e112346912 100644 --- a/pkgs/misc/pylode/default.nix +++ b/pkgs/misc/pylode/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pyLODE"; - version = "2.8.6"; + version = "2.12.0"; src = fetchFromGitHub { owner = "RDFLib"; repo = pname; rev = version; - sha256 = "0zbk5lj9vlg32rmvw1himlw63kxd7sim7nzglrjs5zm6vpi4x5ch"; + sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8="; }; propagatedBuildInputs = with python3Packages; [ @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { jinja2 markdown rdflib - rdflib-jsonld requests six beautifulsoup4 From df05bb468623de7c63ac9fc6e5526624f3150e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 22:02:13 +0200 Subject: [PATCH 0993/1062] python39Packages.moviepy: relax decorator dependency, forma, remove ? null from inputs --- .../python-modules/moviepy/default.nix | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index c3acdbe71ec2..a353816d252e 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pythonAtLeast +, pythonOlder , numpy , decorator , imageio @@ -9,44 +9,56 @@ , proglog , requests , tqdm -# Advanced image processing (triples size of output) + # Advanced image processing (triples size of output) , advancedProcessing ? false -, opencv3 ? null -, scikitimage ? null -, scikit-learn ? null -, scipy ? null -, matplotlib ? null -, youtube-dl ? null +, opencv3 +, scikitimage +, scikit-learn +, scipy +, matplotlib +, youtube-dl }: -assert advancedProcessing -> ( - opencv3 != null && scikitimage != null && scikit-learn != null - && scipy != null && matplotlib != null && youtube-dl != null); - buildPythonPackage rec { pname = "moviepy"; version = "1.0.3"; - disabled = !(pythonAtLeast "3.4"); + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0" + ''; + # No tests, require network connection doCheck = false; propagatedBuildInputs = [ - numpy decorator imageio imageio-ffmpeg tqdm requests proglog - ] ++ (lib.optionals advancedProcessing [ - opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl - ]); + numpy + decorator + imageio + imageio-ffmpeg + tqdm + requests + proglog + ] ++ lib.optionals advancedProcessing [ + opencv3 + scikitimage + scikit-learn + scipy + matplotlib + youtube-dl + ]; meta = with lib; { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From ebe22323830e4aac1be5b062ec8e3235375c57b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 22:03:12 +0200 Subject: [PATCH 0994/1062] python39Packages.fiona: fix tests, format, normalise pname --- pkgs/development/python-modules/fiona/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index a71e6fbaa7e0..987a8ca6209e 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder , attrs, click, cligj, click-plugins, six, munch, enum34 , pytestCheckHook, boto3, mock, giflib, pytz -, gdal -, certifi +, gdal, certifi }: buildPythonPackage rec { - pname = "Fiona"; + pname = "fiona"; version = "1.8.20"; src = fetchPypi { - inherit pname version; + pname = "Fiona"; + inherit version; sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b"; }; @@ -42,11 +42,15 @@ buildPythonPackage rec { preCheck = '' rm -r fiona # prevent importing local fiona + # disable gdal deprecation warnings + export GDAL_ENABLE_DEPRECATED_DRIVER_GTM=YES ''; disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" + # Assert not true + "test_no_append_driver_cannot_append" ]; meta = with lib; { From 618d441bca0b479dfe92dab15d2482545d0997de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 22:04:50 +0200 Subject: [PATCH 0995/1062] python39Packages.werkzeug: normalise pname --- pkgs/development/python-modules/werkzeug/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index d3dce5018d97..898fa4556ec3 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -8,15 +8,16 @@ , pytest-timeout , pytest-xprocess , pytestCheckHook - }: +}: buildPythonPackage rec { - pname = "Werkzeug"; + pname = "werkzeug"; version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "Werkzeug"; + inherit version; sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; }; From 37d31ecb87e11f9a58c42a47937bd7da7f8e666d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 Aug 2021 22:34:15 +0200 Subject: [PATCH 0996/1062] caffe2: mark broken --- pkgs/development/libraries/science/math/caffe2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index fe9a8b671459..202903b9aa18 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -139,5 +139,9 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ yuriaisaka ]; + # fails to compile with + # error: invalid conversion from 'const char*' to 'char*' + # TODO: Remove usage of python2, protobuf overwrite + broken = true; }; } From c8845ea5e9162486ed3cfef776f29ca57fddc448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Sep 2021 00:50:55 +0200 Subject: [PATCH 0997/1062] python39Packages.fastparquet: 0.7.0 -> 0.7.1 --- .../python-modules/fastparquet/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 756d08726c11..56fb6a53e14a 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -5,7 +5,6 @@ , numba , numpy , pandas -, pytest-runner , cramjam , fsspec , thrift @@ -14,26 +13,32 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-08hanzRnt6WuMriNNtOd+ZHycr2XBeIRav+5sgvT7Do="; + hash = "sha256-xV0AXNZSy4LSrHf11OP/+KDbeDQu8yF1ugX+W4mie1E="; }; - nativeBuildInputs = [ pytest-runner ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" \ + --replace "oldest-supported-numpy" "numpy" + ''; + propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; checkInputs = [ pytestCheckHook ]; # Workaround https://github.com/NixOS/nixpkgs/issues/123561 preCheck = '' mv fastparquet/test . - rm -rf fastparquet + rm -r fastparquet fastparquet_test="$out"/${python.sitePackages}/fastparquet/test ln -s `pwd`/test "$fastparquet_test" ''; + postCheck = '' rm "$fastparquet_test" ''; From e673e7fa516baee6c6309135a6e1e143a718fc06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:07:51 +0200 Subject: [PATCH 0998/1062] python3Packages.elmax: 0.1.2 -> 0.1.3 --- pkgs/development/python-modules/elmax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index 775050acb0c9..db1ff91ee0eb 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ="; + sha256 = "sha256-OiVPjWqQw1u0OL6/uYlT+FP2XDh7l3OZyVtQfycHICI="; }; nativeBuildInputs = [ poetry-core ]; From 5afdc27831d68c9c0baaa92183ff9522c232f0a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:07:58 +0200 Subject: [PATCH 0999/1062] python3Packages.hstspreload: 2021.8.1 -> 2021.9.1 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 7b92aeb269df..ecdfb790ebca 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.8.1"; + version = "2021.9.1"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "0si22p461qydh874gkidiar89hrfx7lm7r7g6d1qi7lz8wlwcplv"; + sha256 = "sha256-CZlXnRe4yA6VJF48t73m2PbBRFzg0XTgT7J1N83Ojc4="; }; # tests require network connection From 250f619f52d7c588bcd0f239869b1217ec779387 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:08:05 +0200 Subject: [PATCH 1000/1062] python3Packages.platformdirs: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/platformdirs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 90eb35f993a3..f49b8716211e 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "15f08czqfmxy1y947rlrsjs20jgsy2vc1wqhv4b08b3ijxj0jpqh"; + sha256 = "sha256-g2DPNN7VxK3EjOXOpSWA4a+PghZ7v2jmjw9+VQyCTBI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 0e704fa628ad8a7a9418952bbcb0d8c1f154559a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:41:18 +0200 Subject: [PATCH 1001/1062] python3Packages.ssdp: fix build --- .../python-modules/ssdp/default.nix | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 810106a656e8..bd73a6abaead 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,31 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub , pbr -, pytest -, isPy3k +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "ssdp"; version = "1.1.0"; - disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "d33575a7360aaead5341cc2ceaf47cc80b2309a7dd167c2ea45d5a5b00851665"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "codingjoe"; + repo = pname; + rev = version; + sha256 = "19d2b5frpq2qkfkpz173wpjk5jwhkjpk75p8q92nm8iv41nrzljy"; }; - buildInputs = [ pbr ]; - checkInputs = [ pytest ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # test suite uses new async primitives - doCheck = !isPy27; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pbr + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" \ + --replace "--cov=ssdp" "" + ''; + + pythonImportsCheck = [ "ssdp" ]; meta = with lib; { + description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)"; homepage = "https://github.com/codingjoe/ssdp"; - description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } From e44bb98416572a28aa5006f955cd855c606c65d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 13:50:24 +0200 Subject: [PATCH 1002/1062] bump2version: 1.0.0 -> 1.0.1 --- .../git-and-tools/bump2version/default.nix | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 47d31d6c18f6..ffb9455bd19f 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -1,22 +1,37 @@ -{ buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, testfixtures +}: buildPythonApplication rec { pname = "bump2version"; - version = "1.0.0"; - disabled = isPy27; + version = "1.0.1"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "c4urself"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; + rev = "v${version}"; + sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; }; - checkInputs = [ pytest testfixtures ]; - # X's in pytest are git tests which won't run in sandbox - checkPhase = '' - pytest tests/ -k 'not usage_string_fork' - ''; + checkInputs = [ + pytestCheckHook + testfixtures + ]; + + disabledTests = [ + # X's in pytest are git tests which won't run in sandbox + "usage_string_fork" + "test_usage_string" + "test_defaults_in_usage_with_config" + ]; + + pythonImportsCheck = [ "bumpversion" ]; meta = with lib; { description = "Version-bump your software with a single command"; From 070e765d0aaa3b5e30c85130a6eb9442ac53a488 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 14:11:09 +0200 Subject: [PATCH 1003/1062] python3Packages.cmd2: fix build --- .../python-modules/cmd2/default.nix | 79 +++++++++++-------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index f330a309ebf6..7d979d1f0216 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,21 +1,58 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k -, pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs -, contextlib2 ? null, typing ? null, setuptools-scm -, pytest, mock ? null, pytest-mock -, which, glibcLocales +{ lib +, stdenv +, attrs +, buildPythonPackage +, colorama +, fetchPypi +, glibcLocales +, importlib-metadata +, pyperclip +, pytest-mock +, pytestCheckHook +, pythonOlder +, setuptools-scm +, typing-extensions +, vim +, wcwidth }: + buildPythonPackage rec { pname = "cmd2"; version = "2.1.2"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41"; }; - LC_ALL="en_US.UTF-8"; + LC_ALL = "en_US.UTF-8"; - postPatch = lib.optionalString stdenv.isDarwin '' + buildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + colorama + pyperclip + wcwidth + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + glibcLocales + pytest-mock + vim + ]; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + '' + lib.optionalString stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste @@ -24,33 +61,9 @@ buildPythonPackage rec { export PATH=$(realpath bin):$PATH ''; - disabled = !isPy3k; - - buildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - colorama - pyperclip - six - pyparsing - wcwidth - attrs - ] - ++ lib.optionals (pythonOlder "3.5") [contextlib2 typing] - ; - - doCheck = !stdenv.isDarwin; - # pytest-cov - # argcomplete will generate errors - checkInputs= [ pytest mock which vim glibcLocales pytest-mock ] - ++ lib.optional (pythonOlder "3.6") [ mock ]; - checkPhase = '' - # test_path_completion_user_expansion might be fixed in the next release - py.test -k 'not test_path_completion_user_expansion' - ''; + + pythonImportsCheck = [ "cmd2" ]; meta = with lib; { description = "Enhancements for standard library's cmd module"; From b68026b52be87a6aeb9eceec61c81b629bb95988 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 14:23:18 +0200 Subject: [PATCH 1004/1062] python3Packages.dask: 2021.06.2 -> 2021.08.1 --- .../python-modules/dask/default.nix | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 208856490b86..120c98febce2 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -2,44 +2,51 @@ , stdenv , bokeh , buildPythonPackage +, cloudpickle +, distributed , fetchFromGitHub , fsspec -, pytestCheckHook -, pytest-rerunfailures -, pythonOlder -, cloudpickle +, jinja2 , numpy -, toolz -, dill +, packaging , pandas , partd +, pytest-rerunfailures , pytest-xdist +, pytestCheckHook +, pythonOlder +, pyyaml +, toolz , withExtraComplete ? false -, distributed }: buildPythonPackage rec { pname = "dask"; - version = "2021.06.2"; - disabled = pythonOlder "3.5"; + version = "2021.08.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg="; + sha256 = "sha256-HnrHOp3Y/iLYaK3KVp6NJrK68BMqX8lTl/wLosiGc7k="; }; propagatedBuildInputs = [ - bokeh cloudpickle - dill fsspec - numpy - pandas + packaging partd + pyyaml toolz - ] ++ lib.optionals withExtraComplete [ + pandas + jinja2 + bokeh + numpy + ] ++ lib.optionals (withExtraComplete) [ + # infinite recursion between distributed and dask distributed ]; @@ -63,7 +70,11 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" + # parallelize + "--numprocesses auto" + # rerun failed tests up to three times + "--reruns 3" + # don't run tests that require network access "-m 'not network'" ]; @@ -81,7 +92,16 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ]; + pythonImportsCheck = [ + "dask" + "dask.array" + "dask.bag" + "dask.bytes" + "dask.dataframe" + "dask.dataframe.io" + "dask.dataframe.tseries" + "dask.diagnostics" + ]; meta = with lib; { description = "Minimal task scheduling abstraction"; From 80d7fafa0eb62d209645010f4f589b6611a5a587 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 14:29:39 +0200 Subject: [PATCH 1005/1062] python3Packages.acme-tiny: fix build --- .../python-modules/acme-tiny/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 7d17af3ae787..dcbb9a688f57 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, fusepy, fuse -, openssl }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, fusepy +, fuse +, openssl +}: buildPythonPackage rec { pname = "acme-tiny"; @@ -12,16 +18,18 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/monkey.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf + substituteInPlace tests/utils.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; buildInputs = [ setuptools-scm ]; + checkInputs = [ fusepy fuse ]; doCheck = false; # seems to hang, not sure + pythonImportsCheck = [ "acme_tiny" ]; + meta = with lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; homepage = "https://github.com/diafygi/acme-tiny"; From 0c7822c7e76127e4fc55f011fe4fff74017c5d32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 14:57:25 +0200 Subject: [PATCH 1006/1062] python3Packages.acoustics: fix build --- .../python-modules/acoustics/default.nix | 47 ++++++++++++++----- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 9047910a2138..e888d1241a50 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -1,32 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, numpy, scipy, matplotlib, pandas, tabulate, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, matplotlib +, numpy +, pandas +, pytestCheckHook +, pythonOlder +, scipy +, tabulate +}: buildPythonPackage rec { pname = "acoustics"; version = "0.2.4.post0"; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d"; }; - checkPhase = '' + propagatedBuildInputs = [ + matplotlib + numpy + pandas + scipy + tabulate + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' export HOME=$TMPDIR mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - - pushd tests - py.test -Wignore::DeprecationWarning ./. - popd ''; - disabled = pythonOlder "3.6"; + pytestFlagsArray = [ + "-Wignore::DeprecationWarning" + ]; + + disabledTestPaths = [ + # All tests fail with TypeError + "tests/test_aio.py" + ]; + + pythonImportsCheck = [ "acoustics" ]; meta = with lib; { - description = "A package for acousticians"; + description = "Python package for acousticians"; maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = "https://github.com/python-acoustics/python-acoustics"; From 7f7b3f67c18e9331f304f05a07a96919494ac9f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 15:05:46 +0200 Subject: [PATCH 1007/1062] python3Packages.asttokens: 2.0.4 -> 2.0.5 --- .../python-modules/asttokens/default.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index acd44d55e16f..251205419fe4 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,29 +1,35 @@ -{ lib, fetchPypi, fetchpatch, buildPythonPackage, - setuptools-scm, six, astroid, pytest +{ lib +, fetchPypi +, buildPythonPackage +, setuptools-scm +, six +, astroid +, pytestCheckHook }: buildPythonPackage rec { pname = "asttokens"; - version = "2.0.4"; + version = "2.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; + sha256 = "sha256-mlTBFPAsepSA1WVQkyVGo/H+cdigLxvHzNDuPuNc9NU="; }; - patches = [ - # Fixes compatibility with python 3.9, will be included in the next release - # after 2.0.4 - (fetchpatch { - url = "https://github.com/gristlabs/asttokens/commit/d8ff80ee7d2e64c5e1daf50cc38eb99663f1b1ac.patch"; - sha256 = "19y8n8vpzr2ijldbq5rh19sf0vz5azqqpkb9bx0ljjg98h6k7kjj"; - excludes = [ "setup.cfg" ]; - }) + nativeBuildInputs = [ + setuptools-scm ]; - propagatedBuildInputs = [ setuptools-scm six astroid ]; + propagatedBuildInputs = [ + six + astroid + ]; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "asttokens" ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; From f140e5b2bf8994548cd660fda9dd5a176fd806b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 15:49:12 +0200 Subject: [PATCH 1008/1062] python3Packages.k5test: fix build --- .../python-modules/k5test/default.nix | 12 +-- .../python-modules/k5test/fix-paths.patch | 88 +++++++++++++------ 2 files changed, 66 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 9a9c20e6de15..0079194f4fa7 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , fetchPypi , substituteAll -, six , krb5Full , findutils , which +, pythonOlder }: buildPythonPackage rec { pname = "k5test"; version = "0.10.0"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c"; @@ -27,17 +29,15 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ - six - ]; - # No tests doCheck = false; + pythonImportsCheck = [ "k5test" ]; + meta = with lib; { description = "Library for setting up self-contained Kerberos 5 environment"; homepage = "https://github.com/pythongssapi/k5test"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch index f99835b5f2a3..dc6caf815809 100644 --- a/pkgs/development/python-modules/k5test/fix-paths.patch +++ b/pkgs/development/python-modules/k5test/fix-paths.patch @@ -45,42 +45,74 @@ index e289fac..e2f486a 100644 if options_raw: return options_raw.split('\n') diff --git a/k5test/realm.py b/k5test/realm.py -index f57946b..ad78579 100644 +index 161e5ad..9f50049 100644 --- a/k5test/realm.py +++ b/k5test/realm.py -@@ -181,19 +181,13 @@ class K5Realm(object): - return path +@@ -90,7 +90,7 @@ class K5Realm(metaclass=abc.ABCMeta): - def _init_paths(self, **paths): -- self.kdb5_util = self._discover_path('kdb5_util', -- '/usr/sbin/kdb5_util', paths) -- self.krb5kdc = self._discover_path('krb5kdc', -- '/usr/sbin/krb5kdc', paths) -- self.kadmin_local = self._discover_path('kadmin_local', -- '/usr/sbin/kadmin.local', -- paths) -- self.kprop = self._discover_path('kprop', '/usr/sbin/kprop', paths) -- self.kadmind = self._discover_path('kadmind', -- '/usr/sbin/kadmind', paths) -- -- self._kinit = self._discover_path('kinit', '/usr/bin/kinit', paths) -- self._klist = self._discover_path('klist', '/usr/bin/klist', paths) -+ self.kdb5_util = '@krb5Full@/bin/kdb5_util' -+ self.krb5kdc = '@krb5Full@/bin/krb5kdc' -+ self.kadmin_local = '@krb5Full@/bin/kadmin.local' -+ self.kprop = '@krb5Full@/bin/kprop' -+ self.kadmind = '@krb5Full@/bin/kadmind' -+ self._kinit = '@krb5Full@/bin/kinit' -+ self._klist = '@krb5Full@/bin/klist' + if provider_cls == K5Realm: + krb5_config = _discover_path('krb5-config', +- '/usr/bin/krb5-config', kwargs) ++ '@krb5Full@/bin/krb5-config', kwargs) - def _create_conf(self, profile, filename): - with open(filename, 'w') as conf_file: + try: + krb5_version = subprocess.check_output( +@@ -101,7 +101,7 @@ class K5Realm(metaclass=abc.ABCMeta): + # macOS output doesn't contain Heimdal + if 'heimdal' in krb5_version.lower() or ( + sys.platform == 'darwin' and +- krb5_config == '/usr/bin/krb5-config'): ++ krb5_config == '@krb5Full@/bin/krb5-config'): + provider_cls = HeimdalRealm + else: + provider_cls = MITRealm +@@ -434,14 +434,14 @@ class MITRealm(K5Realm): + @property + def _default_paths(self): + return [ +- ('kdb5_util', 'kdb5_util', '/usr/sbin/kdb5_util'), +- ('krb5kdc', 'krb5kdc', '/usr/sbin/kdb5kdc'), +- ('kadmin', 'kadmin', '/usr/bin/admin'), +- ('kadmin_local', 'kadmin.local', '/usr/sbin/kadmin.local'), +- ('kadmind', 'kadmind', '/usr/sbin/kadmind'), +- ('kprop', 'kprop', '/usr/sbin/kprop'), +- ('_kinit', 'kinit', '/usr/bin/kinit'), +- ('_klist', 'klist', '/usr/bin/klist'), ++ ('kdb5_util', 'kdb5_util', '@krb5Full@/bin/kdb5_util'), ++ ('krb5kdc', 'krb5kdc', '@krb5Full@/bin/kdb5kdc'), ++ ('kadmin', 'kadmin', '@krb5Full@/bin/admin'), ++ ('kadmin_local', 'kadmin.local', '@krb5Full@/bin/kadmin.local'), ++ ('kadmind', 'kadmind', '@krb5Full@/bin/kadmind'), ++ ('kprop', 'kprop', '@krb5Full@/bin/kprop'), ++ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), ++ ('_klist', 'klist', '@krb5Full@/bin/klist'), + ] + + @property +@@ -585,12 +585,12 @@ class HeimdalRealm(K5Realm): + + return [ + ('krb5kdc', 'kdc', os.path.join(base, 'kdc')), +- ('kadmin', 'kadmin', '/usr/bin/kadmin'), +- ('kadmin_local', 'kadmin', '/usr/bin/kadmin'), ++ ('kadmin', 'kadmin', '@krb5Full@/bin/kadmin'), ++ ('kadmin_local', 'kadmin', '@krb5Full@/bin/kadmin'), + ('kadmind', 'kadmind', os.path.join(base, 'kadmind')), +- ('_kinit', 'kinit', '/usr/bin/kinit'), +- ('_klist', 'klist', '/usr/bin/klist'), +- ('_ktutil', 'ktutil', '/usr/bin/ktutil'), ++ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), ++ ('_klist', 'klist', '@krb5Full@/bin/klist'), ++ ('_ktutil', 'ktutil', '@krb5Full@/bin/ktutil'), + ] + + @property diff --git a/k5test/unit.py b/k5test/unit.py -index 4ee7f98..543d662 100644 +index 3c64b9e..59da1ab 100644 --- a/k5test/unit.py +++ b/k5test/unit.py @@ -38,7 +38,7 @@ _KRB_VERSION = None - def krb_minversion_test(target_version, problem): + def krb_minversion_test(target_version, problem, provider=None): global _KRB_VERSION if _KRB_VERSION is None: - _KRB_VERSION = _utils.get_output("krb5-config --version") From 8c41a03a2d851b08b801a85c16b3774e0079bc8c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 16:32:53 +0200 Subject: [PATCH 1009/1062] python3Packages.executing: fix build Adds missing setuptools-scm dependency. --- pkgs/development/python-modules/executing/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index f0c67f3ae591..8ab6994ac415 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools-scm , asttokens }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; From e9120ab7773f8483ab41de5c48263db25665e984 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 16:36:31 +0200 Subject: [PATCH 1010/1062] python3Packages.screeninfo: fix build --- .../python-modules/screeninfo/default.nix | 48 ++++++++++++------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 887542130969..21b3f30e1323 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -1,36 +1,50 @@ -{ lib, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: +{ lib +, buildPythonApplication +, dataclasses +, fetchPypi +, libX11 +, libXinerama +, libXrandr +, pytestCheckHook +, pythonOlder +}: buildPythonApplication rec { pname = "screeninfo"; version = "0.7"; - disabled = isPy27; # dataclasses isn't available for python2 + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "12a97c3527e3544ac5dbd7c1204283e2653d655cbd15844c990a83b1b13ef500"; }; - # dataclasses is a compatibility shim for python 3.6 ONLY - patchPhase = if isPy36 then "" else '' - substituteInPlace setup.py \ - --replace "\"dataclasses\"," "" - '' + '' - substituteInPlace screeninfo/enumerators/xinerama.py \ - --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ - --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" - substituteInPlace screeninfo/enumerators/xrandr.py \ - --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ - --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" - ''; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; - propagatedBuildInputs = lib.optional isPy36 dataclasses; + buildInputs = [ + libX11 + libXinerama + libXrandr + ]; - buildInputs = [ libX11 libXinerama libXrandr]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # We don't have a screen + "screeninfo/test_screeninfo.py" + ]; + + pythonImportsCheck = [ "screeninfo" ]; meta = with lib; { description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = licenses.mit; - maintainers = [ maintainers.nickhu ]; + maintainers = with maintainers; [ nickhu ]; }; } From 7c4c61335c4e7ce50e45de2b45a7c41dc553e8dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 18:01:35 +0200 Subject: [PATCH 1011/1062] python3Packages.quantities: fix build --- .../python-modules/quantities/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 233eb8a44b32..28e08eade43d 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , numpy -, python +, pytestCheckHook }: buildPythonPackage rec { @@ -14,15 +14,27 @@ buildPythonPackage rec { sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0"; }; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; - checkPhase = '' - ${python.interpreter} setup.py test -V 1 - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = { - description = "Quantities is designed to handle arithmetic and"; + disabledTests = [ + # Tests don't work with current numpy + # https://github.com/python-quantities/python-quantities/pull/195 + "test_arctan2" + "test_fix" + ]; + + pythonImportsCheck = [ "quantities" ]; + + meta = with lib; { + description = "Quantities is designed to handle arithmetic and conversions of physical quantities"; homepage = "https://python-quantities.readthedocs.io/"; - license = lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } From 6b0b9774e2401aba3e82ebba89a9f2b9e0002e0d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Sep 2021 18:33:56 +0200 Subject: [PATCH 1012/1062] snscrape: 0.3.4 -> unstable-2021-08-30 --- .../python-modules/snscrape/default.nix | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index a8f565aa3533..98933759f0bb 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -1,33 +1,48 @@ { lib -, buildPythonPackage -, isPy3k -, fetchPypi -, setuptools-scm -, setuptools -, requests -, lxml , beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, lxml +, pythonOlder +, pytz +, requests +, setuptools-scm }: buildPythonPackage rec { pname = "snscrape"; - version = "0.3.4"; + version = "unstable-2021-08-30"; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "36ba7f95c8bf5202749189f760e591952f19c849379c35ff598aafafe5d0cfef"; + src = fetchFromGitHub { + owner = "JustAnotherArchivist"; + repo = pname; + rev = "c76f1637ce1d7a154af83495b67ead2559cd5715"; + sha256 = "01x4961fxj1p98y6fcyxw5sv8fa87x41fdx9p31is12bdkmqxi6v"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + lxml + requests + ] ++ lib.optionals (pythonOlder "3.9") [ + pytz + ]; + # There are no tests; make sure the executable works. checkPhase = '' export PATH=$PATH:$out/bin snscrape --help ''; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; + pythonImportsCheck = [ "snscrape" ]; meta = with lib; { homepage = "https://github.com/JustAnotherArchivist/snscrape"; From 0a88fd9bdbd87a0ce7a32ff4cf200030f443e53f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 20:58:49 +0200 Subject: [PATCH 1013/1062] python3Packages.python-daemon: fix build & refactor --- .../python-modules/python-daemon/default.nix | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 246e253e191d..9df9bf8a593b 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -1,9 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , docutils , lockfile , mock , pytest_4 , testscenarios +, testtools , twine }: @@ -16,13 +19,31 @@ buildPythonPackage rec { sha256 = "bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf"; }; - nativeBuildInputs = [ twine ]; - propagatedBuildInputs = [ docutils lockfile ]; + nativeBuildInputs = [ + twine + ]; - checkInputs = [ pytest_4 mock testscenarios ]; + propagatedBuildInputs = [ + docutils + lockfile + ]; + + checkInputs = [ + pytest_4 + mock + testscenarios + testtools + ]; + + # tests disabled due to incompatibilities with testtools>=2.5.0 checkPhase = '' - pytest -k 'not detaches_process_context \ - and not standard_stream_file_descriptors' + runHook preCheck + pytest -k ' \ + not detaches_process_context and \ + not standard_stream_file_descriptors and \ + not test_module_has_attribute and \ + not test_module_attribute_has_duck_type' + runHook postCheck ''; pythonImportsCheck = [ @@ -35,6 +56,10 @@ buildPythonPackage rec { meta = with lib; { description = "Library to implement a well-behaved Unix daemon process"; homepage = "https://pagure.io/python-daemon/"; - license = [ licenses.gpl3Plus licenses.asl20 ]; + license = with licenses; [ + gpl3Plus + asl20 + ]; + maintainers = with maintainers; [ ]; }; } From 7c2893ed098c0be4ffe85648548df7b4155b2aea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 21:16:52 +0200 Subject: [PATCH 1014/1062] calibre-web: relax requests constraints --- pkgs/servers/calibre-web/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index ef322524ca92..b6dd0b987201 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -18,9 +18,9 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace setup.cfg \ - --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \ - --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ - --replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" + --replace "requests>=2.11.1,<2.25.0" "requests" \ + --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ + --replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" ''; patches = [ From ab7c78ff9cb015b3388dab2ca967aded891201be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Sep 2021 21:24:07 +0200 Subject: [PATCH 1015/1062] python3Packages.hdbscan: add imports check --- pkgs/development/python-modules/hdbscan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index bf48d6cf5e76..9fa932c7e418 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { "test_hdbscan_boruvka_balltree_matches" ]; + pythonImportsCheck = [ "hdbscan" ]; + meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; From 7f732aca66089969ca0733bd129cc1c12b44fe25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 Sep 2021 15:02:25 +0200 Subject: [PATCH 1016/1062] Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next" This reverts commit b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6, reversing changes made to 5b6c2380adb4c4ddb0f87152cef0016333ea5a4d. --- .../applications/graphics/ImageMagick/7.0.nix | 4 +- pkgs/applications/misc/bottles/default.nix | 21 +-- pkgs/applications/misc/plover/default.nix | 8 +- pkgs/applications/misc/variety/default.nix | 4 +- .../networking/appgate-sdp/default.nix | 7 +- .../git-and-tools/bump2version/default.nix | 35 +--- .../alternatives/blas/default.nix | 2 +- pkgs/build-support/setup-hooks/move-docs.sh | 2 +- pkgs/data/misc/shared-mime-info/default.nix | 2 - pkgs/development/compilers/vala/default.nix | 12 +- .../embedded/platformio/chrootenv.nix | 3 +- pkgs/development/embedded/platformio/core.nix | 22 --- pkgs/development/interpreters/rakudo/zef.nix | 4 +- pkgs/development/interpreters/tcl/8.5.nix | 2 - pkgs/development/interpreters/tcl/8.6.nix | 2 - .../development/libraries/boxfort/default.nix | 4 +- .../development/libraries/c-blosc/default.nix | 4 +- .../libraries/criterion/default.nix | 4 +- pkgs/development/libraries/glib/default.nix | 4 +- .../libraries/glibc/2.33-master.patch.gz | Bin 59430 -> 58508 bytes pkgs/development/libraries/glibc/common.nix | 4 +- .../libraries/harfbuzz/default.nix | 6 +- pkgs/development/libraries/imlib2/default.nix | 4 +- .../libraries/libglvnd/default.nix | 4 +- pkgs/development/libraries/libssh/default.nix | 6 +- .../libraries/science/math/caffe2/default.nix | 4 - pkgs/development/libraries/tk/8.6.nix | 2 +- .../python-modules/Cython/default.nix | 13 +- .../python-modules/Fabric/default.nix | 23 +-- .../python-modules/Mako/default.nix | 4 +- .../python-modules/Pygments/default.nix | 4 +- .../python-modules/ROPGadget/default.nix | 4 +- .../python-modules/acme-tiny/default.nix | 20 +- .../python-modules/acoustics/default.nix | 47 ++--- .../python-modules/agate-excel/default.nix | 4 +- .../python-modules/aiobotocore/default.nix | 4 +- .../python-modules/aioprocessing/default.nix | 2 +- .../python-modules/aioredis/default.nix | 17 +- .../python-modules/ajsonrpc/default.nix | 4 +- .../python-modules/alembic/default.nix | 48 +---- .../python-modules/ansi2html/default.nix | 4 +- .../python-modules/ansible-runner/default.nix | 4 +- .../python-modules/apispec/default.nix | 4 +- .../python-modules/arrow/default.nix | 4 +- .../python-modules/asn1/default.nix | 45 ----- .../python-modules/astroid/default.nix | 4 +- .../python-modules/asttokens/default.nix | 34 ++-- .../python-modules/auth0-python/default.nix | 4 +- .../authcaptureproxy/default.nix | 4 +- .../python-modules/awscrt/default.nix | 4 +- .../python-modules/azure-core/default.nix | 4 +- .../default.nix | 6 +- .../azure-mgmt-apimanagement/default.nix | 4 +- .../azure-mgmt-recoveryservices/default.nix | 4 +- .../default.nix | 30 --- .../python-modules/bellows/default.nix | 7 +- .../python-modules/beniget/default.nix | 4 +- .../python-modules/block-io/default.nix | 4 +- .../python-modules/bokeh/default.nix | 4 +- .../python-modules/boto3/default.nix | 4 +- .../python-modules/botocore/default.nix | 4 +- .../python-modules/braintree/default.nix | 4 +- .../python-modules/brotli/default.nix | 20 +- .../python-modules/canonicaljson/default.nix | 20 +- .../python-modules/casbin/default.nix | 4 +- .../python-modules/cffi/default.nix | 4 +- .../python-modules/cfn-lint/default.nix | 4 +- .../charset-normalizer/default.nix | 35 ---- .../python-modules/chart-studio/default.nix | 4 +- .../python-modules/cliff/default.nix | 4 +- .../python-modules/cmd2/default.nix | 83 ++++----- .../python-modules/colorlog/default.nix | 4 +- .../python-modules/commoncode/default.nix | 4 +- .../python-modules/configargparse/default.nix | 6 +- .../python-modules/configparser/default.nix | 6 +- .../python-modules/contextlib2/0.nix | 23 --- .../python-modules/contextlib2/default.nix | 4 +- .../python-modules/cryptacular/default.nix | 4 +- .../python-modules/cryptography/default.nix | 6 +- .../python-modules/cryptography/vectors.nix | 2 +- .../python-modules/cupy/default.nix | 4 +- .../python-modules/cx_freeze/default.nix | 4 +- .../python-modules/cxxfilt/default.nix | 4 +- .../python-modules/dask-jobqueue/default.nix | 4 +- .../python-modules/dask-xgboost/default.nix | 4 +- .../python-modules/dask/default.nix | 58 ++---- .../python-modules/dateutils/default.nix | 25 --- .../python-modules/debugpy/default.nix | 2 +- .../python-modules/decorator/4.nix | 21 --- .../python-modules/decorator/default.nix | 4 +- .../python-modules/distributed/default.nix | 4 +- .../python-modules/distro/default.nix | 4 +- .../django-cacheops/default.nix | 4 +- .../python-modules/django_environ/default.nix | 4 +- .../python-modules/django_taggit/default.nix | 4 +- .../djangorestframework-simplejwt/default.nix | 4 +- .../python-modules/dpkt/default.nix | 4 +- .../python-modules/elmax/default.nix | 4 +- .../python-modules/executing/default.nix | 5 - .../python-modules/extractcode/default.nix | 4 +- .../python-modules/fakeredis/default.nix | 6 +- .../python-modules/fastapi/default.nix | 14 +- .../python-modules/fastdiff/default.nix | 13 +- .../python-modules/fastimport/default.nix | 4 +- .../python-modules/fastparquet/default.nix | 15 +- .../ffmpeg-progress-yield/default.nix | 4 +- .../python-modules/fiona/default.nix | 12 +- .../flask-jwt-extended/default.nix | 4 +- .../python-modules/flask-migrate/default.nix | 4 +- .../python-modules/flit-core/default.nix | 25 +-- .../python-modules/flit-core/tests.nix | 22 --- .../python-modules/fpyutils/default.nix | 4 +- .../python-modules/freetype-py/default.nix | 18 +- .../python-modules/frozendict/default.nix | 41 +---- .../python-modules/gcovr/default.nix | 4 +- .../python-modules/geoalchemy2/default.nix | 42 +---- .../gevent-websocket/default.nix | 6 - .../geventhttpclient/default.nix | 45 ++--- .../google-api-python-client/default.nix | 4 +- .../default.nix | 4 +- .../google-cloud-testutils/default.nix | 4 +- .../python-modules/google-crc32c/default.nix | 4 +- .../python-modules/gradient/default.nix | 4 +- .../python-modules/graphql-core/default.nix | 4 +- .../python-modules/green/default.nix | 4 +- .../python-modules/greenlet/default.nix | 4 +- .../python-modules/h5py/default.nix | 4 +- .../python-modules/hdbscan/default.nix | 2 - .../python-modules/herepy/default.nix | 5 - .../python-modules/hstspreload/default.nix | 4 +- .../python-modules/httpretty/default.nix | 4 +- .../python-modules/httptools/default.nix | 4 +- .../python-modules/httpx/default.nix | 6 +- .../python-modules/humanize/default.nix | 4 +- .../python-modules/hypothesis/default.nix | 4 +- .../python-modules/hypothesmith/default.nix | 4 +- .../ibm-cloud-sdk-core/default.nix | 30 +-- .../python-modules/ibm-watson/default.nix | 4 +- .../python-modules/imageio-ffmpeg/default.nix | 4 +- .../python-modules/imap-tools/default.nix | 4 +- .../python-modules/imdbpy/default.nix | 4 +- .../python-modules/iminuit/default.nix | 4 +- .../python-modules/immutabledict/default.nix | 10 +- .../python-modules/inflect/default.nix | 3 +- .../python-modules/inform/default.nix | 4 +- .../python-modules/intake/default.nix | 4 +- .../python-modules/invoke/default.nix | 4 +- .../python-modules/ipykernel/default.nix | 51 ++++-- .../python-modules/ipykernel/tests.nix | 57 ------ .../python-modules/ipython/default.nix | 4 +- .../python-modules/irc/default.nix | 3 +- .../python-modules/islpy/default.nix | 4 +- .../python-modules/isort/default.nix | 9 +- .../python-modules/iterm2/default.nix | 4 +- .../python-modules/jaraco_classes/default.nix | 4 +- .../jaraco_collections/default.nix | 4 +- .../jaraco_functools/default.nix | 4 +- .../python-modules/jaraco_text/default.nix | 4 +- .../python-modules/jeepney/default.nix | 6 +- .../python-modules/jira/default.nix | 58 ++---- .../python-modules/jira/sphinx-fix.patch | 11 ++ .../jupyter-repo2docker/default.nix | 4 +- .../python-modules/jupyter_client/default.nix | 24 +-- .../python-modules/jupyter_server/default.nix | 4 +- .../python-modules/jupyterlab-git/default.nix | 4 +- .../python-modules/jupyterlab/default.nix | 4 +- .../jupyterlab_server/default.nix | 4 +- .../python-modules/k5test/default.nix | 16 +- .../python-modules/k5test/fix-paths.patch | 88 +++------ .../python-modules/keyring/default.nix | 7 +- .../python-modules/keyrings-alt/default.nix | 8 +- .../python-modules/kiwisolver/default.nix | 4 +- .../python-modules/kubernetes/default.nix | 4 +- .../python-modules/labelbox/default.nix | 4 +- .../python-modules/ldap3/default.nix | 4 +- .../python-modules/lexid/default.nix | 4 +- .../python-modules/libarchive-c/default.nix | 40 ++-- .../python-modules/libcst/default.nix | 4 +- .../python-modules/llvmlite/default.nix | 8 +- .../python-modules/marisa-trie/default.nix | 4 +- .../python-modules/markdown-it-py/default.nix | 14 +- .../marshmallow-oneofschema/default.nix | 4 +- .../mattermostdriver/default.nix | 4 +- .../python-modules/mautrix/default.nix | 4 +- .../python-modules/minidump/default.nix | 4 +- .../python-modules/mitmproxy/default.nix | 4 +- .../python-modules/mkl-service/default.nix | 4 +- .../python-modules/mlflow/default.nix | 4 +- .../python-modules/mne-python/default.nix | 4 +- .../python-modules/mocket/default.nix | 4 +- .../python-modules/monotonic/default.nix | 4 +- .../python-modules/monty/default.nix | 17 +- .../python-modules/motor/default.nix | 16 +- .../python-modules/moviepy/default.nix | 48 ++--- .../python-modules/mypy-boto3-s3/default.nix | 4 +- .../python-modules/mypy-protobuf/default.nix | 4 +- .../python-modules/nbclient/default.nix | 4 +- .../python-modules/nbconvert/default.nix | 4 +- .../python-modules/nbdime/default.nix | 4 +- .../python-modules/numba/default.nix | 19 +- .../python-modules/numpy/default.nix | 4 +- .../python-modules/nunavut/default.nix | 4 +- .../python-modules/openshift/default.nix | 4 +- .../python-modules/optuna/default.nix | 4 +- .../python-modules/pandas/default.nix | 6 +- .../python-modules/panel/default.nix | 11 +- .../python-modules/panel/node/node-env.nix | 10 +- .../panel/node/node-packages.nix | 172 +++++++++--------- .../python-modules/panel/node/package.json | 4 +- .../python-modules/paramiko/default.nix | 20 +- .../python-modules/pathlib2/default.nix | 4 +- .../python-modules/pathspec/default.nix | 4 +- .../python-modules/pathy/default.nix | 4 +- .../python-modules/pdoc3/default.nix | 4 +- .../python-modules/phik/default.nix | 4 +- .../python-modules/pkgconfig/default.nix | 4 +- .../python-modules/pkginfo/default.nix | 4 +- .../python-modules/plaid-python/default.nix | 4 +- .../python-modules/platformdirs/default.nix | 4 +- .../python-modules/plotly/default.nix | 17 +- pkgs/development/python-modules/pluggy/0.nix | 34 ---- .../python-modules/pluggy/default.nix | 4 +- .../python-modules/poetry-core/default.nix | 5 +- .../python-modules/poetry/default.nix | 4 +- .../python-modules/prance/default.nix | 30 +-- .../python-modules/prettytable/default.nix | 4 +- .../python-modules/priority/default.nix | 4 +- .../python-modules/psd-tools/default.nix | 4 +- .../python-modules/pudb/default.nix | 4 +- .../python-modules/py3status/default.nix | 4 +- .../pyTelegramBotAPI/default.nix | 4 +- .../python-modules/pybids/default.nix | 4 +- .../python-modules/pybind11/default.nix | 4 +- .../python-modules/pydeconz/default.nix | 4 +- .../python-modules/pyfaidx/default.nix | 4 +- .../python-modules/pyfakefs/default.nix | 4 +- .../python-modules/pykka/default.nix | 34 +--- .../python-modules/pylint/default.nix | 20 +- .../python-modules/pylitterbot/default.nix | 4 +- .../python-modules/pymatgen/default.nix | 4 +- .../python-modules/pymc3/default.nix | 4 +- .../python-modules/pymongo/default.nix | 16 +- .../python-modules/pynndescent/default.nix | 27 +-- .../python-modules/pyocr/default.nix | 37 ++-- .../python-modules/pyosmium/default.nix | 7 +- .../python-modules/pyphen/default.nix | 20 +- .../python-modules/pyramid/default.nix | 4 +- .../python-modules/pyrsistent/default.nix | 4 +- .../python-modules/pysatochip/default.nix | 28 +-- .../python-modules/pysdl2/default.nix | 4 +- .../pytest-doctestplus/default.nix | 26 +-- .../python-modules/pytest-httpx/default.nix | 4 +- .../python-modules/pytest-isort/default.nix | 4 +- .../python-modules/pytest-relaxed/default.nix | 20 +- .../pytest-xprocess/default.nix | 4 +- pkgs/development/python-modules/pytest/4.nix | 5 - pkgs/development/python-modules/pytest/5.nix | 5 - .../python-modules/pytest/default.nix | 9 +- .../python-modules/python-daemon/default.nix | 39 +--- .../python-modules/python-dotenv/default.nix | 4 +- .../python-modules/python-ethtool/default.nix | 4 +- .../python-modules/python-gitlab/default.nix | 4 +- .../python-lsp-server/default.nix | 33 ++-- .../python-rapidjson/default.nix | 4 +- .../python-modules/pytube/default.nix | 4 +- .../python-modules/pyusb/default.nix | 4 +- .../python-modules/pyvips/default.nix | 4 +- .../python-modules/pyzmq/default.nix | 4 +- .../python-modules/qtpy/default.nix | 4 +- .../python-modules/quantities/default.nix | 28 +-- .../python-modules/queuelib/default.nix | 4 +- .../python-modules/r2pipe/default.nix | 4 +- .../python-modules/rdflib-jsonld/default.nix | 2 - .../python-modules/rdflib/default.nix | 4 +- .../python-modules/regex/default.nix | 4 +- .../python-modules/reportlab/default.nix | 4 +- .../python-modules/requests/default.nix | 20 +- .../python-modules/rich/default.nix | 4 +- .../robotframework-sshlibrary/default.nix | 4 +- .../python-modules/ruamel_yaml/default.nix | 4 +- .../python-modules/sagemaker/default.nix | 4 +- .../python-modules/sanic-testing/default.nix | 13 +- .../scancode-toolkit/default.nix | 4 +- .../python-modules/schema-salad/default.nix | 4 +- .../python-modules/scikit-image/default.nix | 4 +- .../python-modules/scipy/default.nix | 16 +- .../python-modules/screeninfo/default.nix | 52 ++---- .../python-modules/setuptools-scm/default.nix | 20 +- .../simple-salesforce/default.nix | 4 +- .../python-modules/simplejson/default.nix | 4 +- .../python-modules/singledispatch/default.nix | 4 +- .../python-modules/slack-sdk/default.nix | 4 +- .../python-modules/slowapi/default.nix | 6 - .../smart-meter-texas/default.nix | 6 +- .../python-modules/smart-open/default.nix | 4 +- .../snowflake-connector-python/default.nix | 4 +- .../python-modules/snscrape/default.nix | 41 ++--- .../python-modules/sphinx/default.nix | 15 +- .../sphinxcontrib-autoapi/default.nix | 4 +- .../sphinxcontrib-htmlhelp/default.nix | 4 +- .../sphinxcontrib-tikz/binary-paths.patch | 22 +++ .../sphinxcontrib-tikz/default.nix | 15 +- .../python-modules/spyder-kernels/default.nix | 4 +- .../python-modules/spyder/default.nix | 4 +- .../python-modules/sqlalchemy/default.nix | 4 +- .../python-modules/sqlite-utils/default.nix | 17 +- .../python-modules/ssdp/default.nix | 48 ++--- .../python-modules/starlette/default.nix | 30 +-- .../python-modules/sure/default.nix | 4 +- .../tableaudocumentapi/default.nix | 4 +- .../python-modules/tempora/default.nix | 4 +- .../tensorboard-plugin-profile/default.nix | 5 +- .../python-modules/terminado/default.nix | 4 +- .../python-modules/termplotlib/default.nix | 4 +- .../python-modules/tern/default.nix | 4 +- .../python-modules/teslajsonpy/default.nix | 4 +- .../python-modules/testtools/default.nix | 4 +- .../python-modules/texttable/default.nix | 4 +- .../python-modules/tifffile/default.nix | 4 +- .../python-modules/tomli/default.nix | 25 +-- .../python-modules/tomli/tests.nix | 21 --- .../python-modules/towncrier/default.nix | 12 +- .../python-modules/tox/default.nix | 4 +- .../python-modules/tqdm/default.nix | 4 +- .../python-modules/traitlets/default.nix | 4 +- .../python-modules/trustme/default.nix | 12 +- .../python-modules/trytond/default.nix | 4 +- .../python-modules/twine/default.nix | 5 +- .../python-modules/types-pytz/default.nix | 4 +- .../typing-extensions/default.nix | 4 +- .../python-modules/tzlocal/default.nix | 2 +- .../python-modules/uvloop/default.nix | 4 +- .../python-modules/virtualenv/default.nix | 25 +-- .../python-modules/vispy/default.nix | 51 +----- .../python-modules/vivisect/default.nix | 4 +- .../python-modules/vowpalwabbit/default.nix | 4 +- .../python-modules/wasmer/default.nix | 116 ++++-------- .../python-modules/wasmer/tests.nix | 25 --- .../python-modules/watchdog/default.nix | 4 +- .../python-modules/webargs/default.nix | 4 +- .../python-modules/werkzeug/default.nix | 7 +- .../python-modules/xarray/default.nix | 4 +- .../python-modules/xml2rfc/default.nix | 4 +- .../python-modules/xmlsec/default.nix | 3 +- .../python-modules/yamlloader/default.nix | 4 +- .../development/python-modules/yt/default.nix | 4 +- .../python-modules/ytmusicapi/default.nix | 4 +- .../python-modules/zarr/default.nix | 4 +- .../python-modules/zconfig/default.nix | 19 +- .../python-modules/zigpy-xbee/default.nix | 13 +- .../python-modules/zigpy-znp/default.nix | 4 +- .../python-modules/zigpy/default.nix | 4 +- .../python-modules/zipp/default.nix | 16 +- .../python-modules/zodb/default.nix | 70 +++---- .../python-modules/zope_component/default.nix | 4 +- .../python-modules/zope_proxy/default.nix | 4 +- pkgs/development/tools/misc/gnum4/default.nix | 15 +- .../tools/misc/gnum4/s_isdir.patch | 14 ++ .../tools/rust/maturin/default.nix | 6 +- pkgs/misc/pylode/default.nix | 5 +- pkgs/os-specific/bsd/netbsd/default.nix | 41 ++--- pkgs/os-specific/bsd/netbsd/setup-hook.sh | 10 - pkgs/os-specific/bsd/setup-hook.sh | 6 + .../linux/kernel/common-config.nix | 7 +- .../linux/kernel/manual-config.nix | 6 +- pkgs/os-specific/linux/libfabric/default.nix | 4 +- pkgs/servers/calibre-web/default.nix | 6 +- pkgs/servers/home-assistant/default.nix | 2 - pkgs/servers/x11/xorg/default.nix | 6 +- pkgs/servers/x11/xorg/overrides.nix | 14 +- pkgs/servers/x11/xorg/tarballs.list | 2 +- pkgs/stdenv/generic/builder.sh | 14 +- pkgs/stdenv/generic/setup.sh | 108 ++++++----- pkgs/tools/admin/awscli/default.nix | 4 +- .../tools/admin/azure-cli/python-packages.nix | 8 +- pkgs/tools/archivers/cpio/default.nix | 10 +- pkgs/tools/security/wapiti/default.nix | 2 - pkgs/top-level/all-packages.nix | 12 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 37 ++-- pkgs/top-level/python2-packages.nix | 6 - 381 files changed, 1554 insertions(+), 2632 deletions(-) delete mode 100644 pkgs/development/python-modules/asn1/default.nix delete mode 100644 pkgs/development/python-modules/backports-entry-points-selectable/default.nix delete mode 100644 pkgs/development/python-modules/charset-normalizer/default.nix delete mode 100644 pkgs/development/python-modules/contextlib2/0.nix delete mode 100644 pkgs/development/python-modules/dateutils/default.nix delete mode 100644 pkgs/development/python-modules/decorator/4.nix delete mode 100644 pkgs/development/python-modules/flit-core/tests.nix delete mode 100644 pkgs/development/python-modules/ipykernel/tests.nix create mode 100644 pkgs/development/python-modules/jira/sphinx-fix.patch delete mode 100644 pkgs/development/python-modules/pluggy/0.nix create mode 100644 pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch delete mode 100644 pkgs/development/python-modules/tomli/tests.nix delete mode 100644 pkgs/development/python-modules/wasmer/tests.nix create mode 100644 pkgs/development/tools/misc/gnum4/s_isdir.patch delete mode 100644 pkgs/os-specific/bsd/netbsd/setup-hook.sh diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e49427d8e71b..316110633891 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-5"; + version = "7.1.0-4"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-iXE3kVpJHMuZ+H6aaZ1GuOUHnP0lO/Q1F5yK8sPPS3M="; + sha256 = "sha256-CvrSeoKaTigR+4egelwLRr2++CQ5OWUePwX9e1/G1GM="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 52f4e8def20e..21e63b8b29bb 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -3,18 +3,18 @@ , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 -, steam-run, xdg-utils, pciutils, cabextract, wineWowPackages +, steam-run-native }: python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2021.7.28-treviso-2"; + version = "2021.7.14-treviso"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "0kvwcajm9izvkwfg7ir7bks39bpc665idwa8mc8d536ajyjriysn"; + sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix"; }; postPatch = '' @@ -52,14 +52,7 @@ python3Packages.buildPythonApplication rec { dbus-python gst-python liblarch - patool - ] ++ [ - steam-run - xdg-utils - pciutils - cabextract - wineWowPackages.minimal - ]; + ] ++ [ steam-run-native ]; format = "other"; strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 @@ -69,10 +62,8 @@ python3Packages.buildPythonApplication rec { substituteInPlace build-aux/meson/postinstall.py \ --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" substituteInPlace src/runner.py \ - --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ - --replace " {dxvk_setup}" " ${steam-run}/bin/steam-run {dxvk_setup}" - substituteInPlace src/runner_utilities.py \ - --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ + --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ + --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}" ''; preFixup = '' diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 68721c846f74..ac4811b30c41 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python27Packages, python3Packages, wmctrl, +{ lib, fetchurl, python27Packages, python36Packages, wmctrl, qtbase, mkDerivationWith }: { @@ -24,9 +24,9 @@ ]; }; - dev = with python3Packages; mkDerivationWith buildPythonPackage rec { + dev = with python36Packages; mkDerivationWith buildPythonPackage rec { pname = "plover"; - version = "4.0.0.dev10"; + version = "4.0.0.dev8"; meta = with lib; { description = "OpenSteno Plover stenography software"; @@ -36,7 +36,7 @@ src = fetchurl { url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "sha256-Eun+ZgmOIjYw6FS/2OGoBvYh52U/Ue0+NtIqrvV2Tqc="; + sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp"; }; # I'm not sure why we don't find PyQt5 here but there's a similar diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 948719aae762..9b40c4c44f1f 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, python3Packages +, python37Packages , fehSupport ? false, feh , imagemagickSupport ? true, imagemagick , intltool @@ -13,7 +13,7 @@ , makeWrapper }: -with python3Packages; +with python37Packages; buildPythonApplication rec { pname = "variety"; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 397c64141ac9..e894572dd78c 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -32,7 +32,8 @@ , openssl , pango , procps -, python3 +, python37 +, python37Packages , stdenv , systemd , xdg-utils @@ -100,8 +101,8 @@ stdenv.mkDerivation rec { dontBuild = true; buildInputs = [ - python3 - python3.pkgs.dbus-python + python37 + python37Packages.dbus-python ]; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index ffb9455bd19f..47d31d6c18f6 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -1,37 +1,22 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, testfixtures -}: +{ buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: buildPythonApplication rec { pname = "bump2version"; - version = "1.0.1"; - - disabled = pythonOlder "3.6"; + version = "1.0.0"; + disabled = isPy27; src = fetchFromGitHub { owner = "c4urself"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; + rev = "refs/tags/v${version}"; + sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; }; - checkInputs = [ - pytestCheckHook - testfixtures - ]; - - disabledTests = [ - # X's in pytest are git tests which won't run in sandbox - "usage_string_fork" - "test_usage_string" - "test_defaults_in_usage_with_config" - ]; - - pythonImportsCheck = [ "bumpversion" ]; + checkInputs = [ pytest testfixtures ]; + # X's in pytest are git tests which won't run in sandbox + checkPhase = '' + pytest tests/ -k 'not usage_string_fork' + ''; meta = with lib; { description = "Version-bump your software with a single command"; diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index b771e182fe5a..cf880677fddc 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ - -id $out/lib/libblas${canonicalExtension} \ + -id libblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider}/lib \ $out/lib/libblas${canonicalExtension} '' else "") + '' diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh index e4460f98816d..ef31dcdce274 100644 --- a/pkgs/build-support/setup-hooks/move-docs.sh +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare) _moveToShare() { forceShare=${forceShare:=man doc info} - if [[ -z "$out" ]]; then return; fi + if [ -z "$forceShare" -o -z "$out" ]; then return; fi for d in $forceShare; do if [ -d "$out/$d" ]; then diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 4c60895897fe..416bf0095188 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; version = "2.1"; - outputs = [ "out" "dev" ]; - src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 809e81ae548b..8f93a6746ea2 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -116,18 +116,18 @@ in rec { }; vala_0_48 = generic { - version = "0.48.19"; - sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE="; + version = "0.48.18"; + sha256 = "1pbz4nyrrf9wp8rp953sczx545s4g0h5mars9ynkn788dzs2h3wy"; }; vala_0_50 = generic { - version = "0.50.10"; - sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU="; + version = "0.50.9"; + sha256 = "0w5ngs90rq7vy21nqfq8drqyb33kxm17j161qvakwpsbjsidv1mn"; }; vala_0_52 = generic { - version = "0.52.5"; - sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; + version = "0.52.4"; + sha256 = "0cfz3xshc9azxx4fn25x9gadnph6jvf1r2wzd7p5krk0a4755ppc"; }; vala = vala_0_52; diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 138e7186624a..72384c0994a2 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -23,8 +23,7 @@ in buildFHSUserEnv { name = "platformio"; targetPkgs = pio-pkgs; - # disabled temporarily because fastdiff no longer support 32bit - # multiPkgs = pio-pkgs; + multiPkgs = pio-pkgs; meta = with lib; { description = "An open source ecosystem for IoT development"; diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 169ff4cd5a86..a3dcbdd35fdf 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -1,6 +1,5 @@ { stdenv, lib, python3 , fetchFromGitHub -, fetchPypi , git , spdx-license-list-data , version, src @@ -21,15 +20,6 @@ let doCheck = false; }); - ajsonrpc = super.ajsonrpc.overridePythonAttrs (oldAttrs: rec { - pname = "ajsonrpc"; - version = "1.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-CgHCtW0gxZho7ZavvEaODNc+KbFW4sAsHtM2Xk5Cuaw="; - }; - }); - click = super.click.overridePythonAttrs (oldAttrs: rec { version = "7.1.2"; src = oldAttrs.src.override { @@ -38,18 +28,6 @@ let }; }); - starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { - pname = "starlette"; - version = "0.14.2"; - src = fetchFromGitHub { - owner = "encode"; - repo = pname; - rev = version; - sha256 = "sha256-Ki5jTEr5w6CrGK6F60E9uvdUlGx8pxdHMpxHvj9D4js="; - }; - doCheck = false; - }); - uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { version = "0.13.2"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index acc42c9d2d3c..c5b622d2761f 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.11.11"; + version = "0.11.10"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-IOConYPH+t84INXaHw8OVp0mLNucSDS2RT2AlZOUoEs="; + sha256 = "sha256-snnvREM2RLssmE55Ea0Imcw12pmyD6+/11ZXmmUY36U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/tcl/8.5.nix b/pkgs/development/interpreters/tcl/8.5.nix index 9daf67fe2bd0..193ff4f93769 100644 --- a/pkgs/development/interpreters/tcl/8.5.nix +++ b/pkgs/development/interpreters/tcl/8.5.nix @@ -4,8 +4,6 @@ callPackage ./generic.nix (args // rec { release = "8.5"; version = "${release}.18"; - # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated! - src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3"; diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix index 03fcb8317792..37a7fee8a859 100644 --- a/pkgs/development/interpreters/tcl/8.6.nix +++ b/pkgs/development/interpreters/tcl/8.6.nix @@ -4,8 +4,6 @@ callPackage ./generic.nix (args // rec { release = "8.6"; version = "${release}.11"; - # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated! - src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c"; diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 93176fb230f1..740e43216984 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, python3Packages }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }: stdenv.mkDerivation rec { version = "unstable-2019-10-09"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs ci/isdir.py ''; - checkInputs = with python3Packages; [ cram ]; + checkInputs = with python37Packages; [ cram ]; doCheck = true; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 6f59c96d2bc6..a7420e300ed4 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.21.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "sha256-B8SFOc1oGgU5AGAbkqe5oz045H08TnymNAbzz2oOKoo="; + sha256 = "0a3yrig78plzjbazfqcfrzqhnw17xd0dcayvp4z4kp415kgs2a3s"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index a1e7137d92ab..ba436fec0a26 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext -, dyncall , nanomsg, python3Packages }: +, dyncall , nanomsg, python37Packages }: stdenv.mkDerivation rec { version = "2.3.3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nanomsg ]; - checkInputs = with python3Packages; [ cram ]; + checkInputs = with python37Packages; [ cram ]; cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index edb37d2ddd32..3c8fe4d569fa 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.4"; + version = "2.68.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; + sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index 4a287d5c9ca148a2e852930b3437e94bbd7751dc..95edf3cfedd57b7db9782c88de575a9a8a9f176c 100644 GIT binary patch delta 3264 zcmV;x3_tUx&;yLg1F-Mcf9+j+bKAxd|J(c&R}O8HHA&$Okhbh7l;o(5Esf}m-LWzl z5D%I)NvH&=NKyUWySsM>96(S~6T6d{X2vps!@VDSd$+s4CG72l1?zN{ThZqQ2oEH% z7RYSlVM=Ru5Jk`}iDOJ$*Yqq`N7x=M@=Vi#!?>3i(1oTQRCWh!V|+V0g^(akVx%-_mM7(LI3xW`G}8bx{N{e3XLwJU|F(n8pE& zVP>|jf)%h88vVN!peH9ID%p?@sE^4be=~uz&GEkQ21fXb?pp{jdA4qIpgO4mTA({}B!vuCF<1X6*D6K4 zsb7Flu=nSONB-gI>GAQHs64%i0 zm>>01BUdUL(5;{NB{<=$Y%|H$Ln$#NrvRviut1ITVnx1^f3BpYs@N=xX4sZCWbsk^ zxl={-##;h(mqE)CBNd|B+^Gz0BEqKzEoY1;J6YE{IdB3$+ArBl6d;p$GFVMRyc|HU zBiMl18d(@j*~gkn;y1BfUDphI66&TGYT>|&2HM2XbUU)$I0`Jyiel*FLS`5&r>o5j z*b}JQ3%v1Ne+4(+P1AG==ieHM;hcF)w}yr@Gz^Kv>q@eB?K!?<4cR%@s@*L4J*+gK zMy%s7_kUG@eEdQVuxG(^3A+GnygA8|+h|$RvPG_%X(Y~R( zp24D3dU;8DENsqoR*Jl-Y(K|liX5}Gm^L86-7!D_k* zCi5H8%_G4Ea0W_IB#R`)7l!*4`9DBLrNKR|tWaMT{n4Pbg!d4^7;q5*<_DcPhYF|d z$E(?8r^_D4!L>j#XmD`Q<>wyCNJyic3D53$=!rHV3Ua8F&E=Zkw_cXyd?!F1$=6T1 z5g?Vle_l*z90CZN+Df;≠bS+}098Bk$Zv4D8h`UG>@P(TI`h1}Uq)K7Gd!r)3ov z-mLjZ$KgC!2^`Brh-P~U%#J<$f5Z(*$@zy+eaiW+vr&)Kh&j6QT;N|zIah<@x=}AK zf;Ft-U2@GI`hV-QA2-0L{d3-5r|CRX!Kd%pe=T)bOon9uX^vvu_F`w?CCNlf27#T# zv8n4`JcvER-leOO2=mtS^`RzNpdqOt!y4j+s;X^-vx{AXla(ysGvUvR*M~aq9 ze<{X3L69di)VYzlG+TVC`7qU*9Hm^O?&1E^3Nk+qKcx^4o)+=2bql{R>*HnGYoT_? z+tV*YPEzD1Cg3&|iX+&?CVTnBZuDfH{t~#-2PH&2P)zJRN1u>T_0}y>%m!Yw8>feo<{YH{r_Ks@&j&#lpuf6gUg60?_hbDj`Gld%^sE{;x*8@)&Ub$q?X zU*RzlOIuL@EhHcfjUEq!!XC}z;9rkaa?yEdj5@dPwG=Xu3b)Z|GN!wU()$WtXhAe_bT& zrFlEm2J0|1Px+YNG8D=%KJ373@sYo1?il+Em>N`PV98*7_!z_LrA)-94l_hBymJZA ze(RMwI`>Sli`FZcoUJ@{Qx-$*D8eC<29=!U4G{0gh4w^{&= z%scI`jUEO*c#Uu=!LS&VQZbdae*t;zjK)_1W5p8Q5%n*X<&3U?{A4MlCeWizx#FZc zLt0vWoONhI0lX1SX3MU?zlPFsiEn*&;-lN`laYV$_R#;~#{Qe5@%Z5Nk^kfAYybGL^X)0t&z;{$H=wuP zj9+sotM=SHaEF5;6G9##OHaZ2XJpg6ehx=|7g9MemJ2^@U`(=n1T z7%1*iKF`(xJ4-LqEA*9erJK4|=PTt6)azg~Wdk^u4Rv>DTJm1Xe>TMd4V|~ZE`ZAz zkB+s9_u>x9&`sqIO2|cp782gBlWH2?`6_0W%ZjxWTR_hS(^xR(;{G+);5;3}(P_1e zQO@!cS|K7F;5we)bfp@v;&4Lv+ZBhWO367CJt3fEs^Yg4ol8V~)P)nK3~{iU&lHGy zY*xF&%gacI4?#ghe-};SgbZ{=NzxV~UR+A0HlZfSk9OH*$}uW)mE-R>>pE)>sXNFW zqtcTpB<$@vhI8ZuW(efH=iw@wC9eBilyVIavrtz||}z!HZlY zsBQ32{dB2k&)VEBnfwnhVL_?j|0@P-@{*oQA0kx`c1+hMf4wwG=+t)aO8BPws}oPN zgLo2IhUr)docf&Dg3V0x0$00_(Lv~y$TLU+2Qhq(lcmX~UD*eQLU2D4?Cm8wj@$ZEZd#;(ZyTo#iB ze6(3CZe;HkacGD#QtF#UBu2Tdh^ibmdLZaCc(5R$^$b z+3$y*8x3rCU{)*`)Kr{St0APZX`##u{#TUJhx=TA{L_N#hLa^w{$waP|FhJU51xD& z$Om03VsiUSU3oT?XH$8$s)=mn*-@Td<=Io7e+LEV{^VC88;Zs|Hoz<%t>V!xVuhER zaGr*r4f#e9^wL}Tn^FYy8XOW~G0nGzQ>hZ|*VUkh>g;HtHgG0(par!$J6qW*N;`H1UQFfC}@=;=K zK-Qg~1y-G4__HhVzU|n)jmZ!a8;F;fe=U#&8j~d59KHiyI$eor%Juw#MOVLaG5mJ+ z(pfxZ2Q@3_DLloC%5neIT8`biyFbeMSyhYYESAlM(h(P|{RD!#?CFK}v?w2fM6Kbe zuO75vSXB6;+Bkj=C$!J1LnR7F9RlDVnLaF7=O-$+%Q;3ApFXSMYQ-{^V^TQ}f0emS zp8n(>KDfJk^Ww*XtS=OCYsOKrIVXGYt77c#k54nFG}f|njA1=nUDrO9nZ^Td&PYGI zpO5Y`!Aa*#F^Rn8l>4d;rwU^1(tO8d*~Oz)r5oPE(Hn)IyaJbWIB8ecz;5Nl8qz`@ zQaN?mle3b@U-P-LT%e+Km|oCNe|5p|(CV7up<>zampkWDcu+b{Kk zEDM4m4p*h*mEP8nJoV2H-=DL8!@~#`<2!mf`Y`%&JF4br+IFaDi7XUv9~SHdfjN}$ zbMOO)Zh-MQdV4zl$GB5uMi|aNy&eB_c6NIH4%T10S#wn8rp<&PBTw9MHgvIU7CK5L yEa+oGP@uclou}_1d%RF`__B+PLq{UC!t%51%JMv`P|x2CW%?f!&=B*zNdo|eYiaoa delta 4193 zcmV-n5T5Uh$pfa)1F-Mcf9zd*bJIu?{~LdbIhS{_kJ!;$vLUcpCt-63B$b4MJF=zH z)A+C@uVsgX9N+!AduF7uY$v(h|jf;q4i8vVT$sb66;Iy#4+_4hBEmzUXPlYgS)Cz#N@^P4;Jf3jAeTiq}%+i|_V zre1x$tC9^Ffcl6ce=?JEwh77$Z(xM4NZvvYlgEoTcT^`4pp|z=?n$A5Rm|ZZtF_9} z-_&Oy6ztvE!J&U}a&mNZPI|aodWeh}e_qvU`%GD%B<1`FqcG_^iRGbh$J7k9e(D3|F_0QV3JQQQgefAIvoE`ydOzEr7d%b+r}iHMjQw4Cuh*~z-rDIF*9qkYDnqXL=Klfirxp>P1B zj$i}E3uIyN%O2KL62H)PbzL*;Fw#vg(xSc<_qEW_bUU`)Bn~XiiWBJLN@o~kqxo_S z>4x3>q@eB?K!?<4cHk+)h;tGhm{7@ z=<7Ht<6l)yK0Z?b>~S#4U>AUmwGygqR)IS}XM(JaKFr!($e_H$?ARY3OH)S+}M3~+Fe6$S0 z$qixiNU;H&fl?IdA_@4yaKEDX2gs;2c%+p%;$<-&4Qfkx50M)Kt|Gwvpc5xh;k^Cb zd_3#yuNWOqFD#LEa3IaJDWw&3#C*@~X;7^ow~`pK8V zNoBX2e~>p0;Ru`BN>bfI#v7}owdA3ZcW#&fdo|AIJ@#@qWMsNQVAYo=7YzNh%#$jb zH6Q6Dngny<$1)YF*=`E6V;BD)azj!I{vn`GCEs;A>=KNadsm(a|JPE_)!=^Js28Wf z0#@-hz2;B7zxCLwB`|9Ln)DWVJ}Fe^)A#I_e>yBC!!m$0$BAxxiPQJeG}O|5V5do9 z>bjTo6VI@>VRiT_*)0#b3Q(s0sF6b#sE0s28OnRtwx#>^zGvH3?0R0W=h{)zdTaO#XPufbSWpsWR;YqF zL%y>5IP1`a0(c{u%$8k&{~AimrGM+wV;{qA9}oTgHwXSt#|H<8ZYUl-Qdglbdq6n+)R{NQrF|e}!~UC_2XP zMu+2UA}r$}zt!O=)Uhb{Uknt5J2rmFKmS!Mn)v=f+ra+NAMOu-I`rY+@bB$AN%hX= zRkXuCPAhr9lWs-@tT? zGz$7kxRg)hMZiw;S$>7FQm%AU*EYpUc@6d2UyfKG&SeAL9hjDse@oe>IG|zh7T5)F z8ROA$Bk*3xpbXtqWKcpcDo{u$T_2+ospI6BR< z1obR$(FzgW0WOls&5nfeDgh@%yj^j4s+C;2q9+e1g$n$Zs&nZPAF*)4lpzV`ldf6+x@l9GY0C`sBvB-5D$wF#IYKiURRr;?pJ0p0&AMGQ}TY!h%xq|F0OVNg+MgKEx^x_MF5ff89Jy>C|@bO8BPu)zH)I zAPHm3FdZv}Q=gMqu$gII;A&bLhkXxG+KKnAO*AUAj9yQ7bt}=M$WFh#eWt-BX~KKy zedd|mZxh*KF0;jWf-4&JP$)?xc492-2!4Y#XZN>Tb3Xa4S!^=~cyvoG`#o$q*@J93 z%l*ZOO&4Zpe~<*JoqCBC*}CRAt{VnHs(G;C=#dF?<-gxwD10644Z6W}XQ1^5wzh49 z31Z>!YvX1@q=p`sfc!#%Vo&nXIO3psy~BnSB88ovoFBiJ`w1h9u%48ao+Tro`alJ1 zCf_vA6q}S~MK=|TnlhUU3b8PqCh?edA(*&xnKPNde{9dY%wu(*ByS*B%L$6akdjIr zFN`+&DEL?j)s$xde-rmuhs_2|XSK<7|hmRGAzjtM#rLJE!n-MM4(v z@p3x7k-b~JLqk*$sBavT8lhMcx0Eg?BJlUhm!>f8}&P{6b_yLA+xF%<9srF74{AXtsB!mDlG7+#OloPsV;76KmdFWTJyRa7bIpS*Fb!*o2LPt z9<*UtRQE+2-|5~mytyso#Ols$$e^qXi ze}8-rAH1`D^Ww*Xq9=g38^%$wIVXGYt7`1-f1hT~%2>P_uanQ1)WmW=e1 z`}yb{COGMmDJGS-oN~Ww!>NM!_R4(6Wx0b#ty(v{gQGVpKY0aabU10(*T8mg;s(+} z5mGsI*_E@B$Y1lRvRt5|beNvfe@}hE@YMR6;i+QT@S7gwGYzhxbx@vOe^89@Q?|F# z3$iRohIcrWl2>{iA$j7T9lSeZ|AvbpEXE7EI($ETwf?H+Xxe(JXo)Nor4Li~jGQ^F z_|L%y+;szt&*7Vs^M9Oos?5lT^V>J)Z%Jjlose|HjJX3Ywt zwBif;h&(8e>~-tud%(V%Dmi@JM#iBd(X~SMNp|JxJgZU9U+v0Nia#PJ3gR&J%)qgr z+hfa0gVak6H+ACB(zU*o^c~L#D)c8D4B-@jTh~8>4EDT$JqyaT-WQ&RXwYDu*W4K{ zfqzUwW-t_n*rhx~iA_$zf3y-11?LNxkrD$%VsJcl+!R-M@}PHBDM|T(biyq{>7evv z4u{p7N;)n@*j%2@qDe5FA+)U_1aZf2F8tT~?}^*|oRec9?gvl;&h#Dz&z%APDb*gt zULBtfea8YC)dR-YG`b-QLa{5xFsJ6rETd5C8FMUr)F>x6uSd~Se~U1B>_E8E6R0Z5 zx$;t2TOzN3ZO5dOR|oV8RQeV6O-K43NHmbM>bS6w+bnYv;}$0P5e>!)6n7uUa4KS0Vf%${LkI+w zQNW?5NIsv%mixk?A0RR83UE6MgKoI>E zVqY{MxLkxj(4=YFrfI89f56xU8xljCSo!|WWp|Z}$OBJ`f6K1Snc1_qVWwCn%hOLT z;j88ic=%+J0XNNG$3Q%^p&sVSd@BNfAr^5GVTRaX2Mh5q$iCnr$#*i3vN#HoSo%YE z>03|OyIbFJx5-I`S*S!FZe3T1#Wt2A4B}zC_Fb*^@7{OSpj~|5cLau6gioKsEH;L2 zHQqqIB14{@e=A4y`uG6F-?Wk!Z;tla}mJY02)VB@M)Ati;WY!%N)ORc2CacoPMWJ^#^+%iRy)`YZ7Z zWxrD%+eetWE<;!gSCr&+n_X}S6O|{i> zv(N!vSyC9Z_l3kM2^l&H%!W=b3#ro$V^;oo4^~^-GQe9WgXEz&odV0O) zh`S}YkUm=(*Im*9ikbOKJkhGGJ1v$es4OEYg21n#Q<;X>RZ^u^MMzUfvGYRI?Le^M z)(Hp6SE{vM7K61_7R*YVxRXyWqln$7+N{^baq@3};+mJ$)4IiYyu8CX@5B22 2.33-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index e94fcc5ece9d..4a12c5bcc225 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -32,8 +32,7 @@ let in stdenv.mkDerivation { - pname = "harfbuzz${optionalString withIcu "-icu"}"; - inherit version; + name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; src = fetchFromGitHub { owner = "harfbuzz"; @@ -43,7 +42,8 @@ stdenv.mkDerivation { }; postPatch = '' - patchShebangs src/*.py test + patchShebangs src/*.py + patchShebangs test '' + lib.optionalString stdenv.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index b61f4e442bf2..6be73c8da4b3 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.3"; + version = "1.7.2"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; + sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index b4d8657359f1..65d0651ed415 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.3.4"; + version = "1.3.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "0phvgg2h3pcz3x39gaymwb37bnw1s26clq9wsj0zx398zmp3dwpk"; + sha256 = "0gjk6m3gkdm12bmih2jflp0v5s1ibkixk7mrzrk0cj884m3hy1z6"; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c5cd5c353960..c613cfab777b 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.9.6"; + version = "0.8.9"; src = fetchurl { - url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hrz4hb2bgEZv4OBUU8WLh332GvqLqUeljDVtfw+rgps="; + url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; + sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5"; }; postPatch = '' diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 202903b9aa18..fe9a8b671459 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -139,9 +139,5 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ yuriaisaka ]; - # fails to compile with - # error: invalid conversion from 'const char*' to 'char*' - # TODO: Remove usage of python2, protobuf overwrite - broken = true; }; } diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 33e3f8e41675..fdffbeba2c93 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x - sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00"; + sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; }; patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index e22037cbbb9f..dcede9506e32 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -12,7 +12,8 @@ }: let - excludedTests = [ "reimport_from_subinterpreter" ] + excludedTests = [] + ++ [ "reimport_from_subinterpreter" ] # cython's testsuite is not working very well with libc++ # We are however optimistic about things outside of testsuite still working ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] @@ -25,21 +26,19 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.24"; + version = "0.29.22"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM="; + sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY="; }; nativeBuildInputs = [ pkg-config ]; - checkInputs = [ gdb numpy ncurses ]; - buildInputs = [ glibcLocales ]; LC_ALL = "en_US.UTF-8"; @@ -72,7 +71,9 @@ in buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - # doCheck = !stdenv.isDarwin; + +# doCheck = !stdenv.isDarwin; + meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index de53512d0b47..2e70d3aa121e 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -1,11 +1,9 @@ -{ lib -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi , cryptography , invoke , mock , paramiko -, pytestCheckHook +, pytest , pytest-relaxed }: @@ -25,21 +23,20 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ invoke paramiko cryptography ]; + checkInputs = [ pytest mock pytest-relaxed ]; - checkInputs = [ pytestCheckHook pytest-relaxed mock ]; - - # ==================================== ERRORS ==================================== - # ________________________ ERROR collecting test session _________________________ - # Direct construction of SpecModule has been deprecated, please use SpecModule.from_parent - # See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent for more details. + # requires pytest_relaxed, which doesnt have official support for pytest>=5 + # https://github.com/bitprophet/pytest-relaxed/issues/12 doCheck = false; - + checkPhase = '' + pytest tests + ''; pythonImportsCheck = [ "fabric" ]; meta = with lib; { description = "Pythonic remote execution"; - homepage = "https://www.fabfile.org/"; - license = licenses.bsd2; + homepage = "https://www.fabfile.org/"; + license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index cf3028612698..533e1317a091 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.5"; + version = "1.1.4"; src = fetchPypi { inherit pname version; - sha256 = "169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"; + sha256 = "17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab"; }; propagatedBuildInputs = [ markupsafe ]; diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index bb17af144cbe..640c95bfcf9f 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.10.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"; + sha256 = "a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f"; }; propagatedBuildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index 6be0ed48e289..8c34e75139f6 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "6.6"; + version = "6.5"; src = fetchPypi { inherit pname version; - sha256 = "dc61186e0114ec67ec7ce374df8fd2ddc2a7cba129a1242338e900a7483fba22"; + sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c"; }; propagatedBuildInputs = [ capstone ]; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index dcbb9a688f57..76e8a8401fd4 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,35 +1,27 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -, fusepy -, fuse -, openssl -}: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, fusepy, fuse +, openssl }: buildPythonPackage rec { pname = "acme-tiny"; - version = "4.1.1"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b7050b9428d45319e14ab9ea77f0ff4eb40451e5a68325d4c5358a87cff0e793"; + sha256 = "0jmg525n4n98hwy3hf303jbnq23z79sqwgliji9j7qcnph47gkgq"; }; patchPhase = '' substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' + substituteInPlace tests/monkey.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/utils.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf + substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; buildInputs = [ setuptools-scm ]; - checkInputs = [ fusepy fuse ]; doCheck = false; # seems to hang, not sure - pythonImportsCheck = [ "acme_tiny" ]; - meta = with lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; homepage = "https://github.com/diafygi/acme-tiny"; diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index e888d1241a50..9047910a2138 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -1,57 +1,32 @@ -{ lib -, buildPythonPackage -, fetchPypi -, matplotlib -, numpy -, pandas -, pytestCheckHook -, pythonOlder -, scipy -, tabulate -}: +{ lib, buildPythonPackage, fetchPypi +, pytest, numpy, scipy, matplotlib, pandas, tabulate, pythonOlder }: buildPythonPackage rec { pname = "acoustics"; version = "0.2.4.post0"; - disabled = pythonOlder "3.6"; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d"; }; - propagatedBuildInputs = [ - matplotlib - numpy - pandas - scipy - tabulate - ]; - - checkInputs = [ - pytestCheckHook - ]; - - preCheck = '' + checkPhase = '' export HOME=$TMPDIR mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + + pushd tests + py.test -Wignore::DeprecationWarning ./. + popd ''; - pytestFlagsArray = [ - "-Wignore::DeprecationWarning" - ]; - - disabledTestPaths = [ - # All tests fail with TypeError - "tests/test_aio.py" - ]; - - pythonImportsCheck = [ "acoustics" ]; + disabled = pythonOlder "3.6"; meta = with lib; { - description = "Python package for acousticians"; + description = "A package for acousticians"; maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = "https://github.com/python-acoustics/python-acoustics"; diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index cbf49d8477c3..752c905ee8e6 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "agate-excel"; - version = "0.2.5"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; + sha256 = "8f255ef2c87c436b7132049e1dd86c8e08bf82d8c773aea86f3069b461a17d52"; }; propagatedBuildInputs = [ agate openpyxl xlrd ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 591fd8c17874..e07b56d3f266 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.4.1"; + version = "1.3.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "09f06723d1d69c6d407d9a356ca65ab42a5b7b73a45be4b1ed0ed1a6b6057a9f"; + sha256 = "8ecee55346651e0f4cbda883e3e16cfe11460b8d7adcc08d0017cbb867636ae1"; }; # relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index a4571a79b05d..2f6b39678489 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.0"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 807b112772cf..fe48ba0e1e18 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -1,27 +1,20 @@ -{ lib -, buildPythonPackage -, fetchPypi -, async-timeout -, typing-extensions -, hiredis -, isPyPy -, pythonOlder +{ lib, buildPythonPackage, fetchPypi +, pkgs, async-timeout, hiredis, isPyPy, isPy27 }: buildPythonPackage rec { pname = "aioredis"; - version = "2.0.0"; + version = "1.3.1"; - disabled = pythonOlder "3.6"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db"; + sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; }; propagatedBuildInputs = [ async-timeout - typing-extensions ] ++ lib.optional (!isPyPy) hiredis; # Wants to run redis-server, hardcoded FHS paths, too much trouble. diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix index b3482cd74679..e5a81d9cfa6e 100644 --- a/pkgs/development/python-modules/ajsonrpc/default.nix +++ b/pkgs/development/python-modules/ajsonrpc/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ajsonrpc"; - version = "1.2.0"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "791bac18f0bf0dee109194644f151cf8b7ff529c4b8d6239ac48104a3251a19f"; + sha256 = "1b5r8975wdnk3qnc1qjnn4lkxmqcir3brbwnxml9ii90dnsw408a"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index af8b1fc37215..9c7244b3c066 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,56 +1,26 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, Mako -, python-dateutil -, sqlalchemy -, importlib-metadata -, importlib-resources -, pytest-xdist -, pytestCheckHook - +{ lib, buildPythonPackage, fetchPypi +, pytest, pytest-cov, mock, coverage, setuptools +, Mako, sqlalchemy, python-editor, python-dateutil }: buildPythonPackage rec { pname = "alembic"; - version = "1.7.1"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + version = "1.6.5"; src = fetchPypi { inherit pname version; - sha256 = "aea964d3dcc9c205b8759e4e9c1c3935ea3afeee259bffd7ed8414f8085140fb"; + sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; }; - propagatedBuildInputs = [ - Mako - python-dateutil - sqlalchemy - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; + buildInputs = [ pytest pytest-cov mock coverage ]; + propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; - pythonImportsCheck = [ - "alembic" - ]; - - checkInputs = [ - pytestCheckHook - pytest-xdist - ]; - - pytestFlagsArray = [ - "--numprocesses" "auto" - ]; + # no traditional test suite + doCheck = false; meta = with lib; { homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; license = licenses.mit; - maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 50188fe0e4a3..4abcec541a04 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }: buildPythonPackage rec { pname = "ansi2html"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ six setuptools ]; preCheck = "export PATH=$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 9dc8eadb7775..ba11ef11e3b8 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.0.2"; + version = "1.4.7"; src = fetchPypi { inherit pname version; - sha256 = "c02b690803ec0be4453411c53743cd3fdca1dfc66dfa075794e14e717c5b61b3"; + sha256 = "1bb56f9061c3238d89ec8871bc842f5b8d0e868f892347e8455c98d5b6fa58a1"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index c5777d7c5173..2753864fed81 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "5.1.0"; + version = "4.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9ac7a7a6000339a02d05404ef561e013375f170de01d8b238782f8fb83082b5b"; + sha256 = "1yf71c9nq1rfb5pkgmfw486fvywi1bjnmgwxcly7y3basf3980kr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 956dd5f40f2d..d47dd61c3d47 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.1.1"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "dee7602f6c60e3ec510095b5e301441bc56288cb8f51def14dcb3079f623823a"; + sha256 = "1n2vzyrirfj7fp0zn6iipm3i8bch0g4m14z02nrvlyjiyfmi7zmq"; }; postPatch = '' diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix deleted file mode 100644 index 7a83703f862c..000000000000 --- a/pkgs/development/python-modules/asn1/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, future -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "asn1"; - version = "2.4.1"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "andrivet"; - repo = "python-asn1"; - rev = "v${version}"; - sha256 = "0g2d5cr1pxsm5ackba7padf7gvlgrgv807kh0312s5axjd2cww2l"; - }; - - propagatedBuildInputs = [ - future - ]; - - checkInputs = [ - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "enum-compat" "" - ''; - - pytestFlagsArray = [ "tests/test_asn1.py" ]; - - pythonImportsCheck = [ "asn1" ]; - - meta = with lib; { - description = "Python ASN.1 encoder and decoder"; - homepage = "https://github.com/andrivet/python-asn1"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index a4694663bb6b..59bd0bc7c369 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.7.3"; # Check whether the version is compatible with pylint + version = "2.5.6"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "08qxw58cdyglkni6ahyil4cmnb48zz0wr4v05gzqk4r5ifs4gl2m"; + sha256 = "sha256-/nWXzuWkerUDvFT/tJTZuhfju46MAM0cwosVH9BXoY8="; }; SETUPTOOLS_SCM_PRETEND_VERSION=version; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 251205419fe4..bb4cf989cddf 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,35 +1,29 @@ -{ lib -, fetchPypi -, buildPythonPackage -, setuptools-scm -, six -, astroid -, pytestCheckHook +{ lib, fetchPypi, fetchpatch, buildPythonPackage, + setuptools-scm, toml, six, astroid, pytest }: buildPythonPackage rec { pname = "asttokens"; - version = "2.0.5"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mlTBFPAsepSA1WVQkyVGo/H+cdigLxvHzNDuPuNc9NU="; + sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; }; - nativeBuildInputs = [ - setuptools-scm + patches = [ + # Fixes compatibility with python 3.9, will be included in the next release + # after 2.0.4 + (fetchpatch { + url = "https://github.com/gristlabs/asttokens/commit/d8ff80ee7d2e64c5e1daf50cc38eb99663f1b1ac.patch"; + sha256 = "19y8n8vpzr2ijldbq5rh19sf0vz5azqqpkb9bx0ljjg98h6k7kjj"; + excludes = [ "setup.cfg" ]; + }) ]; - propagatedBuildInputs = [ - six - astroid - ]; + propagatedBuildInputs = [ setuptools-scm toml six astroid ]; - checkInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ "asttokens" ]; + checkInputs = [ pytest ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 6d47f95e7564..67701afc0eb0 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.17.0"; + version = "3.16.2"; src = fetchPypi { inherit pname version; - sha256 = "7b21bf91859ea56ac3b665efe5e73340c65dfd30de01081ff334a18a35a188a6"; + sha256 = "sha256-Slpwml1GDdxAZ4P6Vn2brrupRofiOHvmQF26l0gtTJM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index c03b423932df..a780ae59be70 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.0.2"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "1cg63qhf823nf785kyl96r7vyxfl6dlbwsmhcpny8vb65pl9gng5"; + sha256 = "1fbrmh6qa3dm3q3zdxaa0fls94wardbcvnjgwxk686wpjgs1xrs4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index fa29e9f636e3..08e0563b966b 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.12.0"; + version = "0.11.24"; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "65fa09ce78902319392bbb62991ddd3b33cebc0e3bbc81ad2c176072ab40de52"; + sha256 = "b8aa68bca404bf0085be0570eff5b542d01f7e8e3c0f9b0859abfe5e070162ff"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index cd0a816815cd..8dce5b8feb75 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.17.0"; + version = "1.16.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "25407390dde142d3e41ecf78bb18cedda9b7f7a0af558d082dec711c4a334f46"; + sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index fe1d5096cd34..3401ed898c8f 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -6,25 +6,23 @@ , msrest , msrestazure , azure-common -, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "1.0.0"; + version = "0.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; + sha256 = "8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d"; }; propagatedBuildInputs = [ msrest msrestazure azure-common - azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 4c7233203bb9..6cf775c2118e 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "0.3.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; + sha256 = "ec363581ef950945447e45d259441cb690a4b790057c7b8470ad8a6eeca04feb"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 29b0dd2eb1ca..d1f49355f8b9 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "2.0.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a7d3137d5c460f50ac2d44061d60a70b4f2779d4ca844b77419b5725e65e09be"; + sha256 = "ab87108c0d5ce27d80583b4bfad966ad07049dcbc0e9ac28c64aa6bbdae64e22"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix deleted file mode 100644 index 2c1fa41f469b..000000000000 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, importlib-metadata }: - -buildPythonPackage rec { - pname = "backports-entry-points-selectable"; - version = "1.1.0"; - - src = fetchPypi { - pname = "backports.entry_points_selectable"; - inherit version; - sha256 = "988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - # no tests - doCheck = false; - - pythonImportsCheck = [ "backports.entry_points_selectable" ]; - - meta = with lib; { - description = "Compatibility shim providing selectable entry points for older implementations"; - homepage = "https://github.com/jaraco/backports.entry_points_selectable"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index a95bf6054fd8..e52e07627dbb 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -46,9 +46,10 @@ buildPythonPackage rec { ]; disabledTests = [ - # AssertionError: assert 65534 is None - # https://github.com/zigpy/bellows/issues/436 - "test_startup_nwk_params" + # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited + #"test_remigrate_forcibly_downgraded_v4" + # RuntimeError: Event loop is closed + "test_thread_already_stopped" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix index 51f641c51eb4..f8733eeed626 100644 --- a/pkgs/development/python-modules/beniget/default.nix +++ b/pkgs/development/python-modules/beniget/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "beniget"; - version = "0.4.1"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c"; + sha256 = "72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index a76132e3e211..b823b8711a53 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "2.0.4"; + version = "1.1.15"; src = fetchPypi { inherit pname version; - sha256 = "817c9cd2ff76659caca4bb3d6758d5782a85f8c0ea13b08c4e14f0c2a8b7586d"; + sha256 = "97ea037a67af72037cb08cec7e0a9f7866ecdfaa1a8c8ebcc0f4b9359a1516d7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 925eb9c8f39d..6677d9ceacb9 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.3.3"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "a5fdcc181835561447fcc5a371300973fce4114692d5853addec284d1cdeb677"; + sha256 = "fcc0d0a3129ae457cdb0a4f503843a4d13d1f5d07af7748424ea8c7ddfc321f1"; }; patches = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 07a79a6a886b..c8b8210f6503 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.106"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-wHQDeLkTylP1/A26kemadSxaMK57WKDF5U4+KmjfJsU="; + sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index fc275edcc9de..d05c2decf497 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.106"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-bVyYOAix0AQ39W0MCEEr2C2fgBL9t35VX5cneh/U1d8="; + sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 17681f053337..6d64def54ab6 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.12.0"; + version = "4.10.0"; src = fetchPypi { inherit pname version; - sha256 = "946abd50fe2843eec586ac3cec285d27dfae0cc5a43a64b505e8a2800b8a74a6"; + sha256 = "f934a329c7a2b3f7058d5c733cc95da694f66afb5a789162ec701ba4d26a0d90"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 0556c5b4e2a2..1edc62317a64 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -1,7 +1,4 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "brotli"; @@ -19,18 +16,15 @@ buildPythonPackage rec { dontConfigure = true; - checkInputs = [ - pytestCheckHook - ]; + checkInputs = [ pytest ]; - pytestFlagsArray = [ - "python/tests" - ]; + checkPhase = '' + pytest python/tests + ''; - meta = with lib; { + meta = { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index ca64d599534e..4a4f56f5abf5 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,11 +1,5 @@ -{ lib -, buildPythonPackage -, fetchPypi -, frozendict -, simplejson -, six -, isPy27 -, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi +, frozendict, simplejson, six, isPy27 }: buildPythonPackage rec { @@ -19,15 +13,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - frozendict - simplejson - six - ]; - - checkInputs = [ pytestCheckHook ]; - - disabledTests = [ - "test_frozen_dict" + frozendict simplejson six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 47a6a48eaca7..3f2b26e9c5f9 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.7.0"; + version = "0.20.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1qwns8ph8w5bb26hzkk1dadm2bjq74g65wm6g971llb5jdq9a8z9"; + sha256 = "1j7kd4rvf4myg4x4sm4njlhzkxm2m3cva9wmp9vx0nnpfdlyb67f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 94aecdcc4ec4..92899ed85e58 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.6"; + version = "1.14.5"; src = fetchPypi { inherit pname version; - sha256 = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"; + sha256 = "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 6f6d55502958..d8e0af78e1cd 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.53.1"; + version = "0.53.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "1wj2pzrrmrdf3mkhnz1qx41rshvfpgwlrxrb80d63r098pnq6df8"; + sha256 = "sha256-UHcbbBoByoxW7+AUxu5mQmcvC3irHPQvBv4CbBXPTNo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix deleted file mode 100644 index dc0f5e1b296a..000000000000 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "charset-normalizer"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "Ousret"; - repo = "charset_normalizer"; - rev = version; - sha256 = "04rnyrqay11kma9pzagi1mzhc0sq37ggpv39kad2d4ynm35v2hfq"; - }; - - checkInputs = [ - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=charset_normalizer --cov-report=term-missing" "" - ''; - - pythonImportsCheck = [ "charset_normalizer" ]; - - meta = with lib; { - description = "Python module for encoding and language detection"; - homepage = "https://charset-normalizer.readthedocs.io/"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 9d8c6ecb84d5..e059725cad24 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.3.0"; + version = "4.14.3"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "059rq278r5zb2sngby7jzh8kd9c48sd82b6b7s5bbrmzj42sds3n"; + sha256 = "1yrrcn9032r3l8y2cc1wvpydg4rkqvgkpyv1s7znby5mrxa1rjma"; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 7eee574dad48..bb856736d92b 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.9.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3"; + sha256 = "8dd215d0a84c9a3ab2fa2aa700849f4e7b786639f66caa0ad4108c85dca95a7c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 7d979d1f0216..b5bbc88c341f 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,58 +1,21 @@ -{ lib -, stdenv -, attrs -, buildPythonPackage -, colorama -, fetchPypi -, glibcLocales -, importlib-metadata -, pyperclip -, pytest-mock -, pytestCheckHook -, pythonOlder -, setuptools-scm -, typing-extensions -, vim -, wcwidth +{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k +, pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs +, contextlib2 ? null, typing ? null, setuptools-scm +, pytest, mock ? null, pytest-mock +, which, glibcLocales }: - buildPythonPackage rec { pname = "cmd2"; - version = "2.1.2"; - - disabled = pythonOlder "3.6"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41"; + sha256 = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62"; }; - LC_ALL = "en_US.UTF-8"; + LC_ALL="en_US.UTF-8"; - buildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - attrs - colorama - pyperclip - wcwidth - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata - ]; - - checkInputs = [ - pytestCheckHook - glibcLocales - pytest-mock - vim - ]; - - postPatch = '' - sed -i "/--cov/d" setup.cfg - '' + lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste @@ -61,9 +24,33 @@ buildPythonPackage rec { export PATH=$(realpath bin):$PATH ''; - doCheck = !stdenv.isDarwin; + disabled = !isPy3k; - pythonImportsCheck = [ "cmd2" ]; + buildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + colorama + pyperclip + six + pyparsing + wcwidth + attrs + ] + ++ lib.optionals (pythonOlder "3.5") [contextlib2 typing] + ; + + + doCheck = !stdenv.isDarwin; + # pytest-cov + # argcomplete will generate errors + checkInputs= [ pytest mock which vim glibcLocales pytest-mock ] + ++ lib.optional (pythonOlder "3.6") [ mock ]; + checkPhase = '' + # test_path_completion_user_expansion might be fixed in the next release + py.test -k 'not test_path_completion_user_expansion' + ''; meta = with lib; { description = "Enhancements for standard library's cmd module"; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 6abb6ff023ad..39b64e4faf3e 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "6.4.1"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8"; + sha256 = "sha256-8XwBOgaWKwL0RJ7gfP2+ayh98p78LJoVFbSjdvTliOo="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index e7dfb65e7946..16d529b17f53 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,11 +14,11 @@ }: buildPythonPackage rec { pname = "commoncode"; - version = "21.8.27"; + version = "21.6.11"; src = fetchPypi { inherit pname version; - sha256 = "789ee1798cd74ab4516d2e547473d69717d3b2ed7ee180ab2746e0bdfd0d88a4"; + sha256 = "d6c8c985746a541913d5bb534c770f2422e5b4ac7a4ef765abc05c287a40ff4b"; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 1bb036b97df5..45ec7364a59a 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.5.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; - rev = version; - sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2"; + rev = "v${version}"; + sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 3eeae353d115..a939f6623c9c 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm +, toml +}: buildPythonPackage rec { pname = "configparser"; @@ -12,7 +14,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm toml ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/pkgs/development/python-modules/contextlib2/0.nix b/pkgs/development/python-modules/contextlib2/0.nix deleted file mode 100644 index 38d9fb696e28..000000000000 --- a/pkgs/development/python-modules/contextlib2/0.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, unittest2 -}: - -buildPythonPackage rec { - pname = "contextlib2"; - version = "0.6.0.post1"; - - src = fetchPypi { - inherit pname version; - sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; - }; - - checkInputs = [ unittest2 ]; - - meta = { - description = "Backports and enhancements for the contextlib module"; - homepage = "https://contextlib2.readthedocs.org/"; - license = lib.licenses.psfl; - }; -} diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 1387e786e7b7..38d9fb696e28 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "contextlib2"; - version = "21.6.0"; + version = "0.6.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"; + sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; }; checkInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index 31c0ebace475..dccfddaea1ae 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cryptacular"; - version = "1.6.2"; + version = "1.5.5"; src = fetchPypi { inherit pname version; - sha256 = "7b529cb2b8a3c7e5be77921bf1ebc653d4d3a8f791375cc6f971b20db2404176"; + sha256 = "fb4d48716e88e4d050255ff0f065f6d437caa358ceef16ba5840c95cece224f9"; }; buildInputs = [ coverage nose ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 2fea6e89494d..9b35b5654e26 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -23,18 +23,18 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.4.8"; # Also update the hash in vectors.nix + version = "3.4.7"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"; + sha256 = "04x7bhjkglxpllad10821vxddlmxdkd3gjvp35iljmnj2s0xw41x"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - sha256 = "01h511h6l4qvjxbaw662m1l84pb4wrhwxmnb3qj6ik13mx2m477m"; + sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62"; }; cargoRoot = "src/rust"; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 7602582f8306..0cb23d53c03c 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c"; + sha256 = "1hh4j88ywil3jf62ppj1blygmdirbqz86pynd9lqfijiaym3mb57"; }; # No tests included diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index c165c9af7a20..6a072ab8e1a7 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "9.4.0"; + version = "8.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4402bd33a051e82f6888dab088a8d657714ca6d1e945b513dcc513a95a435bd5"; + sha256 = "f3ed02ba18e38b4f3ed2c324fa08967e6714f59357ccb0b28badd9572e77500b"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 42fa8fd8ddca..b6edb2ced1f2 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.7"; + version = "6.6"; src = fetchPypi { inherit pname version; - sha256 = "050f1dd133a04810bd7f38ac7ae3b290054acb2ff4f6e73f7a286266d153495d"; + sha256 = "c4af8ad3f7e7d71e291c1dec5d0fb26bbe92df834b098ed35434c901fbd6762f"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 117b12145764..1cc5ad19bda2 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cxxfilt"; - version = "0.3.0"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "7df6464ba5e8efbf0d8974c0b2c78b32546676f06059a83515dbdfa559b34214"; + sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b"; }; postPatch = let diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 5e43a8f16648..7719842fbad6 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.3"; + version = "0.7.2"; pname = "dask-jobqueue"; src = fetchPypi { inherit pname version; - sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79"; + sha256 = "1767f4146b2663d9d2eaef62b882a86e1df0bccdb8ae68ae3e5e546aa6796d35"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index 1f9be870c975..eb18ac31fd03 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.2.0"; + version = "0.1.11"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "6d9c491dc4099f74a0df66c4d439d296c0f1fba97009fe93e21b2350f295b4ca"; + sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; }; propagatedBuildInputs = [ xgboost dask distributed ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 120c98febce2..208856490b86 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -2,51 +2,44 @@ , stdenv , bokeh , buildPythonPackage -, cloudpickle -, distributed , fetchFromGitHub , fsspec -, jinja2 +, pytestCheckHook +, pytest-rerunfailures +, pythonOlder +, cloudpickle , numpy -, packaging +, toolz +, dill , pandas , partd -, pytest-rerunfailures , pytest-xdist -, pytestCheckHook -, pythonOlder -, pyyaml -, toolz , withExtraComplete ? false +, distributed }: buildPythonPackage rec { pname = "dask"; - version = "2021.08.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "2021.06.2"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-HnrHOp3Y/iLYaK3KVp6NJrK68BMqX8lTl/wLosiGc7k="; + sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg="; }; propagatedBuildInputs = [ - cloudpickle - fsspec - packaging - partd - pyyaml - toolz - pandas - jinja2 bokeh + cloudpickle + dill + fsspec numpy - ] ++ lib.optionals (withExtraComplete) [ - # infinite recursion between distributed and dask + pandas + partd + toolz + ] ++ lib.optionals withExtraComplete [ distributed ]; @@ -70,11 +63,7 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - # parallelize - "--numprocesses auto" - # rerun failed tests up to three times - "--reruns 3" - # don't run tests that require network access + "-n $NIX_BUILD_CORES" "-m 'not network'" ]; @@ -92,16 +81,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ - "dask" - "dask.array" - "dask.bag" - "dask.bytes" - "dask.dataframe" - "dask.dataframe.io" - "dask.dataframe.tseries" - "dask.diagnostics" - ]; + pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ]; meta = with lib; { description = "Minimal task scheduling abstraction"; diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix deleted file mode 100644 index faa3b1155483..000000000000 --- a/pkgs/development/python-modules/dateutils/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytz }: - -buildPythonPackage rec { - pname = "dateutils"; - version = "0.6.12"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E="; - }; - - propagatedBuildInputs = [ - python-dateutil - pytz - ]; - - pythonImportsCheck = [ "dateutils" ]; - - meta = with lib; { - description = "Utilities for working with datetime objects."; - homepage = "https://github.com/jmcantrell/python-dateutils"; - license = licenses.bsd0; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 0bdfe35514d4..35ac416d5992 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} + }.${stdenv.hostPlatform.system}} )''; checkInputs = [ diff --git a/pkgs/development/python-modules/decorator/4.nix b/pkgs/development/python-modules/decorator/4.nix deleted file mode 100644 index 8e8fd28f0b54..000000000000 --- a/pkgs/development/python-modules/decorator/4.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/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index f8d3f5c9ac61..8e8fd28f0b54 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "5.0.9"; + version = "4.4.2"; src = fetchPypi { inherit pname version; - sha256 = "72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5"; + sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 38c977f3ffa5..ce0cf13e9a92 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.8.1"; + version = "2021.6.2"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "c13ac10ecd9ee5f0ff67f5697149062d6e483f23a079918df1ab2e19b11fa77d"; + sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index bf8675af941d..885538de65ce 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distro"; - version = "1.6.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"; + sha256 = "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92"; }; # tests are very targeted at individual linux distributions diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 58900ac2cbf4..c9344d3bd010 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "django-cacheops"; - version = "6.0"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841"; + sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index 6baaf58e7d09..3f01a2b294a1 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.5.0"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "a8726675c1ebefa4706b36398c4d3c5c790d335ffe55c4a10378f6bfd57ad8d0"; + sha256 = "6c9d87660142608f63ec7d5ce5564c49b603ea8ff25da595fd6098f6dc82afde"; }; # The testsuite fails to modify the base environment diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index ab908c639a00..cbfcc103c5c1 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "1.5.1"; + version = "1.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a"; + sha256 = "b9ed6e94bad0bed3bf062a6be7ee3db117fda02c6419c680d614197364ea018b"; }; propagatedBuildInputs = [ isort django ]; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index ad9afabadf2c..82ff51fd3821 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "djangorestframework_simplejwt"; - version = "4.8.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a"; + sha256 = "c0e9b617da337becb55e67935eb992fad84f861418e7ab5fb3e77a3fd18d4137"; }; propagatedBuildInputs = [ django djangorestframework pyjwt ]; diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index a1036e099ea8..74817e60cbcf 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.7.2"; + version = "1.9.7.1"; src = fetchPypi { inherit pname version; - sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b"; + sha256 = "74899d557ec4e337db29cecc80548b23a1205384d30ee407397cfb9ab178e3d4"; }; # Project has no tests diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index db1ff91ee0eb..775050acb0c9 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax"; - version = "0.1.3"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-OiVPjWqQw1u0OL6/uYlT+FP2XDh7l3OZyVtQfycHICI="; + sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 8ab6994ac415..f0c67f3ae591 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools-scm , asttokens }: @@ -16,10 +15,6 @@ buildPythonPackage rec { sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv"; }; - nativeBuildInputs = [ - setuptools-scm - ]; - preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index a39205f5aeea..28dece127b12 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -11,11 +11,11 @@ }: buildPythonPackage rec { pname = "extractcode"; - version = "21.7.23"; + version = "21.6.2"; src = fetchPypi { inherit pname version; - sha256 = "58aa16d60cfcbd3695d7ea84a1e30d5ba9fa6f614b2ef4a6d0565b2ac5d4f757"; + sha256 = "e665501438fedeb6e75335d880c8913a8cd894fd8adcf9c243eb6d48fad2d01c"; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index e76eb8903d60..2e0e5c65d06b 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "11ccfc9769d718d37e45b382e64a6ba02586b622afa0371a6bd85766d72255f3"; + sha256 = "sha256-Ecz8l2nXGNN+RbOC5kproCWGtiKvoDcaa9hXZtciVfM="; }; propagatedBuildInputs = [ @@ -41,8 +41,8 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # AttributeError: 'AsyncGenerator' object has no attribute XXXX - "test/test_aioredis2.py" + # Missing support for later pytest-asyncio, https://github.com/jamesls/fakeredis/issues/307 + "test/test_aioredis1.py" ]; pythonImportsCheck = [ "fakeredis" ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index f068c4cb735e..62aedf1f2117 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -55,18 +55,8 @@ buildPythonPackage rec { # ignoring deprecation warnings to avoid test failure from # tests/test_tutorial/test_testing/test_tutorial001.py - pytestFlagsArray = [ - "--ignore=tests/test_default_response_class.py" - "-W ignore::DeprecationWarning" - ]; - - disabledTests = [ - "test_get_custom_response" - - # Failed: DID NOT RAISE - "test_websocket_invalid_data" - "test_websocket_no_credentials" - ]; + pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" "-W ignore::DeprecationWarning"]; + disabledTests = [ "test_get_custom_response" ]; meta = with lib; { homepage = "https://github.com/tiangolo/fastapi"; diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index a790f1623817..b3e27d7a5e81 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -1,33 +1,30 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-benchmark, wasmer }: buildPythonPackage rec { pname = "fastdiff"; - version = "0.3.0"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4dfa09c47832a8c040acda3f1f55fc0ab4d666f0e14e6951e6da78d59acd945a"; + sha256 = "1ai95vjchl4396zjl1b69xfqvn9kn1y7c40d9l0qxdss0pcx6fk2"; }; postPatch = '' substituteInPlace setup.py \ --replace 'pytest-runner' "" - substituteInPlace setup.cfg \ - --replace "collect_ignore = ['setup.py']" "" ''; - propagatedBuildInputs = [ wasmer wasmer-compiler-cranelift ]; + propagatedBuildInputs = [ wasmer ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; pythonImportsCheck = [ "fastdiff" ]; + disabledTests = [ "test_native" ]; meta = with lib; { description = "A fast native implementation of diff algorithm with a pure Python fallback"; homepage = "https://github.com/syrusakbary/fastdiff"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - # resulting compiled object panics at import - broken = stdenv.is32bit; }; } diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index bd5c270d686c..fe46405eb3f1 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "fastimport"; - version = "0.9.14"; + version = "0.9.13"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6ac99dda4e7b0b3ae831507b6d0094802e6dd95891feafde8cc5c405b6c149ca"; + sha256 = "486135a39edb85808fdbbe2c8009197978800a4544fca56cc2074df32e1304f3"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 56fb6a53e14a..756d08726c11 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -5,6 +5,7 @@ , numba , numpy , pandas +, pytest-runner , cramjam , fsspec , thrift @@ -13,32 +14,26 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.7.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-xV0AXNZSy4LSrHf11OP/+KDbeDQu8yF1ugX+W4mie1E="; + hash = "sha256-08hanzRnt6WuMriNNtOd+ZHycr2XBeIRav+5sgvT7Do="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" \ - --replace "oldest-supported-numpy" "numpy" - ''; - + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; checkInputs = [ pytestCheckHook ]; # Workaround https://github.com/NixOS/nixpkgs/issues/123561 preCheck = '' mv fastparquet/test . - rm -r fastparquet + rm -rf fastparquet fastparquet_test="$out"/${python.sitePackages}/fastparquet/test ln -s `pwd`/test "$fastparquet_test" ''; - postCheck = '' rm "$fastparquet_test" ''; diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 4b4d6bdd7fc2..5d2641970721 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.1.2"; + version = "0.0.4"; src = fetchPypi { inherit pname version; - sha256 = "92ae36ff5cf38428bd3695629b5065d161c658fb0de0faf2c20cd7a99dac3820"; + sha256 = "e944093e2c1b213da8fa4f0c276c1bad44e0b8ba8be7e4fd001f5132d16baef5"; }; propagatedBuildInputs = [ colorama tqdm ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 987a8ca6209e..a71e6fbaa7e0 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder , attrs, click, cligj, click-plugins, six, munch, enum34 , pytestCheckHook, boto3, mock, giflib, pytz -, gdal, certifi +, gdal +, certifi }: buildPythonPackage rec { - pname = "fiona"; + pname = "Fiona"; version = "1.8.20"; src = fetchPypi { - pname = "Fiona"; - inherit version; + inherit pname version; sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b"; }; @@ -42,15 +42,11 @@ buildPythonPackage rec { preCheck = '' rm -r fiona # prevent importing local fiona - # disable gdal deprecation warnings - export GDAL_ENABLE_DEPRECATED_DRIVER_GTM=YES ''; disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" - # Assert not true - "test_no_append_driver_cannot_append" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 22be871f745f..d9eae8ffa585 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "4.3.0"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "6e2b40d548b9dfc6051740c4552c097ac38e514e500c16c682d9a533d17ca418"; + sha256 = "22b8ffa7587d50aaf65f3009f1d55ef7287da8260eaf4655a5837e33479216c3"; }; propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 010e79ecbf2c..26f2ab4aea18 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Migrate"; - version = "3.1.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "57d6060839e3a7f150eaab6fe4e726d9e3e7cffe2150fb223d73f92421c6d1d9"; + sha256 = "00m76kgdkk0w5bfq8hbqszpyaqk0yxdvmz4s67lvd36pc7wfhhjd"; }; checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 7b2731595629..a4c6b99b07f4 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage -, callPackage , flit +, isPy3k , toml , pytestCheckHook , testpath @@ -12,11 +12,6 @@ buildPythonPackage rec { version = "3.2.0"; format = "pyproject"; - outputs = [ - "out" - "testsout" - ]; - inherit (flit) src patches; preConfigure = '' @@ -27,23 +22,19 @@ buildPythonPackage rec { toml ]; - postInstall = '' - mkdir $testsout - cp -R ../tests $testsout/tests - ''; - - # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm - doCheck = false; + checkInputs = [ + pytestCheckHook + testpath + ]; passthru.tests = { inherit flit; - pytest = callPackage ./tests.nix { }; }; - meta = with lib; { + meta = { description = "Distribution-building parts of Flit. See flit package for more information"; homepage = "https://github.com/takluyver/flit"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh SuperSandro2000 ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.fridh ]; }; } diff --git a/pkgs/development/python-modules/flit-core/tests.nix b/pkgs/development/python-modules/flit-core/tests.nix deleted file mode 100644 index 0fd13e80cb12..000000000000 --- a/pkgs/development/python-modules/flit-core/tests.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildPythonPackage -, flit -, flit-core -, pytestCheckHook -, testpath -}: - -buildPythonPackage rec { - pname = "flit-core"; - inherit (flit-core) version; - - src = flit-core.testsout; - - dontBuild = true; - dontInstall = true; - - checkInputs = [ - flit - pytestCheckHook - testpath - ]; -} diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix index 493304428524..0120391aee1b 100644 --- a/pkgs/development/python-modules/fpyutils/default.nix +++ b/pkgs/development/python-modules/fpyutils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "fpyutils"; - version = "2.0.1"; + version = "2.0.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; rev = version; - sha256 = "1dksx5ykm7f1bi16wg8kqqqlnc874k3vg9kfjbbbalv8w0g2g2am"; + sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index 13e033e8bc36..b0035e838447 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -1,12 +1,4 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, substituteAll -, setuptools-scm -, freetype -, pytestCheckHook -}: +{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools-scm, freetype }: buildPythonPackage rec { pname = "freetype-py"; @@ -28,14 +20,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ freetype ]; - preCheck = '' - cd tests - ''; - - checkInputs = [ - pytestCheckHook - ]; - pythonImportsCheck = [ "freetype" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 4acf53563ded..e172f3815b7e 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -1,47 +1,16 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -, pytestCheckHook -, setuptoolsBuildHook -, python -}: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "frozendict"; - version = "2.0.5"; # 2.0.6 breaks canonicaljson - format = "setuptools"; - - disabled = !isPy3k; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wb7hwHDY2fZA4SjluHV2pEAAhgCfeGLRPAv4YA5iE9M="; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; }; - pythonImportsCheck = [ - "frozendict" - ]; - - checkInputs = [ - pytestCheckHook - ]; - - preCheck = '' - rm -r frozendict - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH - ''; - - disabledTests = [ - # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' - "test_union" - ]; - - disabledTestPaths = [ - # unpackaged test dependency: coold - "test/test_coold.py" - "test/test_coold_subclass.py" - ]; + # frozendict does not come with tests + doCheck = false; meta = with lib; { homepage = "https://github.com/slezica/python-frozendict"; diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 71480ab21131..1332777189b1 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gcovr"; - version = "5.0"; + version = "4.2"; src = fetchPypi { inherit pname version; - sha256 = "1d80264cbaadff356b3dda71b8c62b3aa803e5b3eb6d526a24932cd6660a2576"; + sha256 = "0gyady7x3v3l9fm1zan0idaggqqcm31y7g5vxk7h05p5h7f39bjs"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 077523bdb482..c4c0f41d8d17 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,53 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, packaging -, setuptools-scm -, shapely , sqlalchemy -, psycopg2 -, pytestCheckHook +, shapely +, setuptools-scm +, pytest }: buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.9.4"; - format = "setuptools"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "b0e56d4a945bdc0f8fa9edd50ecc912889ea68e0e3558a19160dcb0d5b1b65fc"; + sha256 = "56f969cf4ad6629ebcde73e807f7dac0a9375c79991b4f93efab191f37737a00"; }; - nativeBuildInputs = [ - setuptools-scm - ]; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ sqlalchemy shapely ]; - propagatedBuildInputs = [ - packaging - shapely - sqlalchemy - ]; - - checkInputs = [ - psycopg2 - pytestCheckHook - ]; - - disabledTestPaths = [ - # tests require live postgis database - "tests/gallery/test_decipher_raster.py" - "tests/gallery/test_length_at_insert.py" - "tests/gallery/test_summarystatsagg.py" - "tests/gallery/test_type_decorator.py" - "tests/test_functional.py" - ]; + # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst + doCheck = false; meta = with lib; { - description = "Toolkit for working with spatial databases"; homepage = "http://geoalchemy.org/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + description = "Toolkit for working with spatial databases"; }; } diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 24af4416ab3c..7ff62a378ca9 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -17,16 +17,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent gunicorn ]; - # zero tests run - doCheck = false; - - pythonImportsCheck = [ "geventwebsocket" ]; - meta = with lib; { homepage = "https://www.gitlab.com/noppo/gevent-websocket"; description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; - maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index fd759a0bd723..5563ff94baf5 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,49 +1,32 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi -, backports_ssl_match_hostname -, brotli -, certifi +, pytest , gevent +, certifi , six -, dpkt -, pytestCheckHook +, backports_ssl_match_hostname +, pythonOlder }: buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.5.1"; + version = "1.4.5"; src = fetchPypi { inherit pname version; - sha256 = "4aead64253d2769a6528544f7812ce8d71ae13551d079f2d9a3533d72818f2e0"; + sha256 = "3f0ab18d84ef26ba0c9df73ae2a41ba30a46072b447f2e36c740400de4a63d44"; }; - propagatedBuildInputs = [ - brotli - certifi - gevent - six - ] ++ lib.optionals (pythonOlder "3.7") [ - backports_ssl_match_hostname - ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ gevent certifi six ] + ++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ]; - checkInputs = [ - dpkt - pytestCheckHook - ]; - - disabledTests = [ - # socket.gaierror: [Errno -2] Name or service not known - "test_client_simple" - "test_client_without_leading_slas" - "test_request_with_headers" - "test_response_context_manager" - "test_client_ssl" - "test_ssl_fail_invalid_certificate" - "test_multi_queries_greenlet_safe" - ]; + # Several tests fail that require network + doCheck = false; + checkPhase = '' + py.test $out + ''; meta = with lib; { homepage = "https://github.com/gwik/geventhttpclient"; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 45d6044b8ea7..2fd9247c8825 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.18.0"; + version = "2.15.0"; src = fetchPypi { inherit pname version; - sha256 = "a25661ec6cf4c159f41fe9c061c2bee31b2dddaf2ad787e23617048a25b53842"; + sha256 = "sha256-g3VIkjKCP0TGARlqlgUF4D7FjJXdtkFcax0ddrRo+Lo="; }; # No tests included in archive 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 62956e1e46de..f6a62c544cf4 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.3.2"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "fcb71ebe5c5b232d24fe7d666b65709e4fc8db43263c8182e5ed8e5a52abefec"; + sha256 = "sha256-oCktt8wAYKewz6Ga4mIGVy0IWonXTqQvaO5MT4MkHMY="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 2c208511ee3f..05a66406ce02 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.1.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3d79051b6ca170c2a4f159bf56ac3f66c1e5360486121e72c06fdaa3911154bf"; + sha256 = "sha256-2RaRhRvgnmr/trjAE+RBlVO5AZ54YEFcoRwcPCKCTKs="; }; propagatedBuildInputs = [ click google-auth six ]; diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index 41b23321af98..b36635654a9d 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "google-crc32c"; - version = "1.1.3"; + version = "1.1.2"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "1m2hafyfagvyabizr4fhcp2s2s3x56k006fhvl1qzk994qjhyzqk"; + sha256 = "058g69yp7x41mv0d84yp31jv64fpm4r25b86rvvqgc6n74w6jj7k"; }; buildInputs = [ crc32c ]; diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 7e47faadc0e2..57b58699ec38 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.7.4"; + version = "1.5.5"; src = fetchPypi { inherit pname version; - sha256 = "de1d33672f13d4de37a66ba9aebfd503a098d0ca26e5eb8b071e1c0dacd557ea"; + sha256 = "fee5016afe5e61a640bb9d7e234a10926c17c9e83c876b617438ff5f5ce039ad"; }; postPatch = '' diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 1909dd99fe0f..7ac25424616a 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.6"; + version = "3.1.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "1ip0yrqmnqncgpwvba18x020gkwr7csiw4zdy6mrdnvwf5qyam4x"; + sha256 = "055gfvyax781f4zk4pl60y8yd90bnn4rkqh5i48pczaff0lwlfj1"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 0320a3858be1..934c363245d7 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "green"; - version = "3.3.0"; + version = "3.2.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a4d86f2dfa4ccbc86f24bcb9c9ab8bf34219c876c24e9f0603aab4dfe73bb575"; + sha256 = "e51d4ff6e6885942d944304fedc7440a8f87917aa09526beeecb31a0dae655b8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index e997c7da3987..4d829f3d6473 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "1.1.1"; + version = "1.1.0"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "c0f22774cd8294078bdf7392ac73cf00bfa1e5e0ed644bd064fdabc5f2a2f481"; + sha256 = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index dfa4288e54fc..9e5921bb412d 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.4.0"; + version = "3.2.1"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ee1c683d91ab010d5e85cb61e8f9e7ee0d8eab545bf3dd50a9618f1d0e8f615e"; + sha256 = "sha256-iUdL6RG/zbNMvw2YuOxItXjCeon9sa5O51E/HvjZJJ4="; }; # avoid strict pinning of numpy diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 9fa932c7e418..bf48d6cf5e76 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -44,8 +44,6 @@ buildPythonPackage rec { "test_hdbscan_boruvka_balltree_matches" ]; - pythonImportsCheck = [ "hdbscan" ]; - meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 9b1a50a532fa..13454e4e1966 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -20,11 +20,6 @@ buildPythonPackage rec { sha256 = "sha256-05x3EQoyv38j4UcixN0sf5BI2oTjfasAIQyZqQSjdPM="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "requests==2.25.1" "requests>=2.25.1" - ''; - propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index ecdfb790ebca..7b92aeb269df 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.9.1"; + version = "2021.8.1"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-CZlXnRe4yA6VJF48t73m2PbBRFzg0XTgT7J1N83Ojc4="; + sha256 = "0si22p461qydh874gkidiar89hrfx7lm7r7g6d1qi7lz8wlwcplv"; }; # tests require network connection diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 78a529666139..f0c0b9b2ee99 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "httpretty"; - version = "1.1.4"; + version = "1.1.3"; # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"; + sha256 = "229ade39175ea4324e767f29dc24e5f846fbc72bf80e1a919b2547a6574ff601"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index 0a5b510b0ad9..54b512be1fd4 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.3.0"; + version = "0.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3f9b4856d46ba1f0c850f4e84b264a9a8b4460acb20e865ec00978ad9fbaa4cf"; + sha256 = "94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"; }; # tests are not included in pypi tarball diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 014272bcc107..6a9300566d59 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , brotlicffi , certifi -, charset-normalizer , h2 , httpcore , rfc3986 @@ -19,20 +18,19 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.19.0"; + version = "0.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-bUxxeUYqOHBmSL2gPQG5cIq6k5QY4Kyhj9ToA5yZXPA="; + sha256 = "0rr5b6z96yipvp4riqmmbkbcy0sdyzykcdwf5y9ryh27pxr8q8x4"; }; propagatedBuildInputs = [ brotlicffi certifi - charset-normalizer h2 httpcore rfc3986 diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 85ec6257ea5d..4c5bd0e3af25 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "3.11.0"; + version = "3.9.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "4160cdc63fcd0daac27d2e1e218a31bb396fc3fe5712d153675d89432a03778f"; + sha256 = "892a5b7b87763c4c6997a58382c2b1f4614048a2e01c23ef1bb0456e6f9d4d5d"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 4d0a1713d954..35f53864eb9d 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.17.3"; + version = "6.14.0"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "1g96q3l97lq3xps36cv147dvj44nh1b0k67z817x7zfwyw844sgn"; + sha256 = "0yns81j3fnpdfaphk722xcnidqhgy0kmd7ik6aw7l795l0wivhxj"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 0d175989271c..4bf1ca8d02f7 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.1.9"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "039fd6aa0102f89df9df7ad4cff70aa8068678c13c3be2713c92568917317a04"; + sha256 = "sha256-+f8EexXE7TEs49pX6idXD4bWtTzhKvnyXlnmV2oAQQo="; }; propagatedBuildInputs = [ hypothesis lark-parser libcst ]; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index cc7572499da1..8e7f4832c254 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, codecov , pyjwt +, pylint , pytestCheckHook +, pytest-cov , python-dateutil , requests , responses @@ -11,27 +14,30 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.11.3"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; + sha256 = "ab9520be99066ec41a24e31ac653c28953adc8fc349f0fa53a598e1802a79cd6"; }; + checkInputs = [ + codecov + pylint + pytestCheckHook + pytest-cov + responses + tox + ]; + propagatedBuildInputs = [ pyjwt python-dateutil requests ]; - checkInputs = [ - pytestCheckHook - responses - tox - ]; - + # Various tests try to access credential files which are not included with the source distribution disabledTests = [ - # Various tests try to access credential files which are not included with the source distribution "test_configure_service" "test_cp4d_authenticator" "test_cwd" @@ -43,12 +49,6 @@ buildPythonPackage rec { "test_iam" "test_read_external_sources_2" "test_retry_config_external" - # assertion error due to requests brotli support - "test_http_client" - ]; - - disabledTestPaths = [ - "test/test_container_token_manager.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 9e5198a1cb30..49e4541143e9 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.2.3"; + version = "5.2.2"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "0i0zs38hqgh2510b3690nrq2pvx7wcdlv9iyjgsrfl7gid8qi3ng"; + sha256 = "sha256-bK6lcTKAVwAJDb5LqKRWR/4wcOKx7bRwWYC+WB5qJE4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index a249b2dbfe19..9d1755d81b97 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.5"; + version = "0.4.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f2ea4245a2adad25dedf98d343159579167e549ac8c4691cef5eff980e20c139"; + sha256 = "73640a7a54f95e607addd637c766d56be31d975a64ddb97d14df012575ef1a5d"; }; patches = [ diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index ef13bf471e16..d1cecdda42d9 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.46.0"; + version = "0.44.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "08a4p4q96zz6qp3cy7hs5jn9h2gf68d8zchw4w0kk83sm1r8rpxw"; + sha256 = "sha256-C9396yRSowaLe3E1s+rw8bah77znjfoIhLwJpcqhN6Y="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/imdbpy/default.nix b/pkgs/development/python-modules/imdbpy/default.nix index ab7575f99be8..dea62f080093 100644 --- a/pkgs/development/python-modules/imdbpy/default.nix +++ b/pkgs/development/python-modules/imdbpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "IMDbPY"; - version = "2021.4.18"; + version = "2020.9.25"; src = fetchPypi { inherit pname version; - sha256 = "af57f03638ba3b8ab3d696bfef0eeaf6414385c85f09260aba0a16b32174853f"; + sha256 = "1p3j9j1jcgbw4626cvgpryhvczy9gzlg0laz6lflgq17m129gin2"; }; patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index cd598d602a29..42a1d7c4ffdb 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.8.2"; + version = "2.6.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ffba627a638fe233bbef03e91af6063c1e5d62405327219b03f0abf50196a95b"; + sha256 = "5fb8786bcad53762648ddacb008d18b49704ba5c011ade240004bfc5a628b4f6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index b45b852f85fc..54fef8720ca5 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -7,16 +7,22 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.0"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - sha256 = "sha256-Jf7ad3ImPfEvCBrUZ1NVXMCBqwLmd0hwpKfe9rVsehc="; + sha256 = "1n71154nfb6vr41iv00xcwkxmwnn1vwzbr3s23bjvlhvmnjb48a8"; }; + # https://github.com/corenting/immutabledict/issues/56 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index ca454d432317..9081a30ac6be 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPy27 , setuptools-scm +, toml , pytestCheckHook }: @@ -16,7 +17,7 @@ buildPythonPackage rec { sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm toml ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 9ef6fd1e0a1d..2397c0bc4db6 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "inform"; - version = "1.25"; + version = "1.24"; src = fetchFromGitHub { owner = "KenKundert"; repo = "inform"; rev = "v${version}"; - sha256 = "1r56wmn21c7ggy33548l6dfjswhadkp2iaalfb7xgsxmq7qfcnax"; + sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; postPatch = '' diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 3a959b897216..fff6d74b56a1 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.3"; + version = "0.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f64543353f30d9440b953984f78b7a0954e5756d70c64243609d307ba488014f"; + sha256 = "b0cab1d185a703acb38eecb9cff3edd5cc7004fe18a36d5e42a8f7fffc9cca1c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 45c341c209cf..08d72cec4961 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.6.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "374d1e2ecf78981da94bfaf95366216aaec27c2d6a7b7d5818d92da55aa258d3"; + sha256 = "f0c560075b5fb29ba14dad44a7185514e94970d1b9d57dcd3723bec5fed92650"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 041818900978..0d44c406349d 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -1,39 +1,56 @@ { lib , stdenv , buildPythonPackage -, callPackage , fetchPypi -, debugpy +, flaky , ipython , jupyter_client -, tornado , traitlets +, tornado , pythonOlder +, pytestCheckHook +, nose }: buildPythonPackage rec { pname = "ipykernel"; - version = "6.3.0"; + version = "5.5.5"; src = fetchPypi { inherit pname version; - sha256 = "5314690a638f893e2cc3bf3d25042920e9fbb873f7d8263033390264caeb95f4"; + sha256 = "e976751336b51082a89fc2099fb7f96ef20f535837c398df6eab1283c2070884"; }; - propagatedBuildInputs = [ - debugpy - ipython - jupyter_client - tornado - traitlets - ]; + propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; - # check in passthru.tests.pytest to escape infinite recursion with ipyparallel - doCheck = false; + checkInputs = [ pytestCheckHook nose flaky ]; + dontUseSetuptoolsCheck = true; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = lib.optionals stdenv.isDarwin ([ + # see https://github.com/NixOS/nixpkgs/issues/76197 + "test_subprocess_print" + "test_subprocess_error" + "test_ipython_start_kernel_no_userns" - passthru.tests = { - pytest = callPackage ./tests.nix { }; - }; + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" + ] ++ lib.optionals (pythonOlder "3.8") [ + # flaky test https://github.com/ipython/ipykernel/issues/485 + "test_shutdown" + + # test regression https://github.com/ipython/ipykernel/issues/486 + "test_sys_path_profile_dir" + "test_save_history" + "test_help_output" + "test_write_kernel_spec" + "test_ipython_start_kernel_userns" + "ZMQDisplayPublisherTests" + ]); + + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; meta = { description = "IPython Kernel for Jupyter"; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix deleted file mode 100644 index 9375dbc2bfdc..000000000000 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, pythonOlder -, flaky -, ipykernel -, ipyparallel -, nose -, pytestCheckHook - -}: - -buildPythonPackage rec { - pname = "ipykernel-tests"; - inherit (ipykernel) version; - - src = ipykernel.src; - - dontBuild = true; - dontInstall = true; - - checkInputs = [ - flaky - ipykernel - ipyparallel - nose - pytestCheckHook - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - disabledTests = lib.optionals stdenv.isDarwin ([ - # see https://github.com/NixOS/nixpkgs/issues/76197 - "test_subprocess_print" - "test_subprocess_error" - "test_ipython_start_kernel_no_userns" - - # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" - ] ++ lib.optionals (pythonOlder "3.8") [ - # flaky test https://github.com/ipython/ipykernel/issues/485 - "test_shutdown" - - # test regression https://github.com/ipython/ipykernel/issues/486 - "test_sys_path_profile_dir" - "test_save_history" - "test_help_output" - "test_write_kernel_spec" - "test_ipython_start_kernel_userns" - "ZMQDisplayPublisherTests" - ]); - - # Some of the tests use localhost networking. - __darwinAllowLocalNetworking = true; -} diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 548ba874cd70..e036a3378643 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.27.0"; + version = "7.24.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13"; + sha256 = "9bc24a99f5d19721fb8a2d1408908e9c0520a17fff2233ffe82620847f17f1b6"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 423ec4ecf292..60a960a204c4 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools-scm, jaraco_collections, importlib-metadata +, setuptools-scm, jaraco_collections, importlib-metadata, toml }: buildPythonPackage rec { @@ -28,6 +28,7 @@ buildPythonPackage rec { pytz jaraco_itertools jaraco_collections + toml ]; meta = with lib; { diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 918d8be8e9f1..736588aa4504 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2021.1"; + version = "2020.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b3f49de925149dbf2482e648016507cd66d0dce6668a1bc4de5e7a937e9c576d"; + sha256 = "7eb7dfa41d6a67d9ee4ea4bb9f08bdbcbee42b364502136b7882cfd80ff427e0"; }; postConfigure = '' diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index b55fb9156814..1195f0f6b097 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -6,16 +6,17 @@ , pytestCheckHook }: -buildPythonPackage rec { +let +in buildPythonPackage rec { pname = "isort"; - version = "5.9.3"; + version = "5.6.4"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = version; - sha256 = "sha256-JbRZ/3Xz35tGoCNnQesR08Sjoz3yimxZyxhhOXGvmXw="; + sha256 = "1m7jpqssnbsn1ydrw1dn7nrcrggqcvj9v6mk5ampxmvk94xd2r2q"; }; nativeBuildInputs = [ @@ -45,7 +46,6 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "--ignore=tests/benchmark/" # requires pytest-benchmark "--ignore=tests/integration/" # pulls in 10 other packages "--ignore=tests/unit/profiles/test_black.py" # causes infinite recursion to include black ]; @@ -63,7 +63,6 @@ buildPythonPackage rec { # plugin not available "test_isort_literals_issue_1358" "test_isort_supports_formatting_plugins_issue_1353" - "test_sort_configurable_sort_issue_1732" "test_value_assignment_list" # profiles not available "test_isort_supports_shared_profiles_issue_970" diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index a1b777c1bb76..3b98f25c566f 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.27"; + version = "1.21"; src = fetchPypi { inherit pname version; - sha256 = "dcbd89d0502e72a9a41b055f5cf10b5a991f60fb12df29918d9c2183d1389abd"; + sha256 = "06be59e0314a2f0f32753eb2d44eb563e85253875bc8da64df5b4eeba7fc05bd"; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index aadb9f9028f1..a727e774ec30 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 -, setuptools-scm +, setuptools-scm, toml , more-itertools , pytestCheckHook }: @@ -20,7 +20,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 46f2bfdff3fc..060d45938118 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.4.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "344d14769d716e7496af879ac71b3c6ebdd46abc64bd9ec21d15248365aa3ac9"; + sha256 = "3662267424b55f10bf15b6f5dee6a6e48a2865c0ec50cc7a16040c81c55a98dc"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 3ad652af7643..1fca58ebf733 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools-scm +, setuptools-scm, toml , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 32e8aa23aeb4..3126ab999674 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.5.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "ede4e9103443b62b3d1d193257dfb85aab7c69a6cef78a0887d64bb307a03bc3"; + sha256 = "f07f1076814a17a98eb915948b9a0dc71b1891c833588066ec1feb04ea4389b1"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 3079f152e444..2acf0361bcbc 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, async-timeout , dbus , pytest , pytest-trio @@ -13,17 +12,16 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.7.1"; + version = "0.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"; + sha256 = "1237cd64c8f7ac3aa4b3f332c4d0fb4a8216f39eaa662ec904302d4d77de5a54"; }; checkInputs = [ - async-timeout dbus pytest pytest-trio diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index c7d8207aa3d9..a3f790abfc51 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,56 +1,34 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, defusedxml -, flaky -, keyring -, requests-mock -, requests_oauthlib -, requests-toolbelt -, setuptools-scm -, setuptools-scm-git-archive -, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, isPy3k +, pytest, pytest-runner, pbr, glibcLocales , pytest-cov +, requests, requests_oauthlib, requests-toolbelt, defusedxml +, ipython }: buildPythonPackage rec { pname = "jira"; - version = "3.0.1"; + version = "2.0.0"; - src = fetchFromGitHub { - owner = "pycontribs"; - repo = pname; - rev = version; - sha256 = "sha256-hAUAzkHPXFDlKEom+dkzr8GQ+sqK2Ci1/k+QuSNvifE="; + PBR_VERSION = version; + + src = fetchPypi { + inherit pname version; + sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report=xml --cov jira" "" - ''; - - nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - propagatedBuildInputs = [ - defusedxml - keyring - requests_oauthlib - requests-toolbelt - ]; - - checkInputs = [ - flaky - pytestCheckHook - requests-mock - ]; + buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; + propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers doCheck = false; + patches = [ ./sphinx-fix.patch ]; + + LC_ALL = "en_US.utf8"; + + disabled = !isPy3k; + meta = with lib; { description = "This library eases the use of the JIRA REST API from Python."; - homepage = "https://github.com/pycontribs/jira"; license = licenses.bsd2; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/jira/sphinx-fix.patch b/pkgs/development/python-modules/jira/sphinx-fix.patch new file mode 100644 index 000000000000..ccc47ac4b9cf --- /dev/null +++ b/pkgs/development/python-modules/jira/sphinx-fix.patch @@ -0,0 +1,11 @@ +diff --git a/setup.py b/setup.py +index c49a24d..31aeec2 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,5 +11,5 @@ except ImportError: + + + setuptools.setup( +- setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner', 'sphinx>=1.6.5'], ++ setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner'], + pbr=True) diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index f4eb9190aa4b..1b352f1e24c9 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "2021.8.0"; + version = "2021.3.0"; pname = "jupyter-repo2docker"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "9d1b3c3ec7944ea6b0a234d6fa77293a2d1ed1c080eba8466aba94f811b3465d"; + sha256 = "42e0cf67181bdd03b54dabde695befec0586ed68a4ec1240104e209997d776c4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index e30b3cb63a71..fbc37c3f581b 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,34 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, entrypoints -, jupyter_core -, nest-asyncio -, python-dateutil -, pyzmq -, tornado , traitlets +, jupyter_core +, pyzmq +, python-dateutil , isPyPy , py +, tornado }: buildPythonPackage rec { pname = "jupyter_client"; - version = "7.0.2"; + version = "6.1.12"; src = fetchPypi { inherit pname version; - sha256 = "0c6cabd07e003a2e9692394bf1ae794188ad17d2e250ed747232d7a473aa772c"; + sha256 = "c4bca1d0846186ca8be97f4d2fa6d2bae889cce4892a167ffa1ba6bd1f73e782"; }; propagatedBuildInputs = [ - entrypoints - jupyter_core - nest-asyncio - python-dateutil - pyzmq - tornado traitlets + jupyter_core + pyzmq + python-dateutil + tornado ] ++ lib.optional isPyPy py; # Circular dependency with ipykernel diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 3150235fcc7a..72e1540e0781 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "jupyter_server"; - version = "1.10.2"; + version = "1.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d3a3b68ebc6d7bfee1097f1712cf7709ee39c92379da2cc08724515bb85e72bf"; + sha256 = "8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index dbff1660b1cc..67769e24b328 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.32.2"; + version = "0.30.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "4c5743a05150ed7736e028aac15787a66735f160e9ae198dacc5a4bd1a727ce2"; + sha256 = "f44a33cf59b424e0b5ff984b18eae33e45dab1ef9dc1901b1dd23f9adff15df2"; }; propagatedBuildInputs = [ notebook nbdime git ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 21255bba94f2..6264bbb5c44e 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.1.9"; + version = "3.1.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "007e42f833e59fd36872d459e45be243d899edbd0e4a98d21388632e4e0d8af7"; + sha256 = "6d2ada6a333861f33a1b555d3cb7b07aa9d1ab80f07997b3d0c43878a98c1174"; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 2c54fa9da7f7..cca40463b024 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.7.2"; + version = "2.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c6c9ae5796ed60c65bccd84503cbd44b9e35b046b8265f24db3cc4d61631fc0d"; + sha256 = "31457ef564febc42043bc539356c804f6f9144f602e2852150bf0820ed6d7e18"; }; postPatch = '' diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 0079194f4fa7..80b62f1e4483 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -2,21 +2,19 @@ , buildPythonPackage , fetchPypi , substituteAll +, six , krb5Full , findutils , which -, pythonOlder }: buildPythonPackage rec { pname = "k5test"; - version = "0.10.0"; - - disabled = pythonOlder "3.6"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c"; + sha256 = "1lqp3jgfngyhaxjgj3n230hn90wsylwilh120yjf62h7b1s02mh8"; }; patches = [ @@ -29,15 +27,17 @@ buildPythonPackage rec { }) ]; + propagatedBuildInputs = [ + six + ]; + # No tests doCheck = false; - pythonImportsCheck = [ "k5test" ]; - meta = with lib; { description = "Library for setting up self-contained Kerberos 5 environment"; homepage = "https://github.com/pythongssapi/k5test"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch index dc6caf815809..f99835b5f2a3 100644 --- a/pkgs/development/python-modules/k5test/fix-paths.patch +++ b/pkgs/development/python-modules/k5test/fix-paths.patch @@ -45,74 +45,42 @@ index e289fac..e2f486a 100644 if options_raw: return options_raw.split('\n') diff --git a/k5test/realm.py b/k5test/realm.py -index 161e5ad..9f50049 100644 +index f57946b..ad78579 100644 --- a/k5test/realm.py +++ b/k5test/realm.py -@@ -90,7 +90,7 @@ class K5Realm(metaclass=abc.ABCMeta): +@@ -181,19 +181,13 @@ class K5Realm(object): + return path - if provider_cls == K5Realm: - krb5_config = _discover_path('krb5-config', -- '/usr/bin/krb5-config', kwargs) -+ '@krb5Full@/bin/krb5-config', kwargs) + def _init_paths(self, **paths): +- self.kdb5_util = self._discover_path('kdb5_util', +- '/usr/sbin/kdb5_util', paths) +- self.krb5kdc = self._discover_path('krb5kdc', +- '/usr/sbin/krb5kdc', paths) +- self.kadmin_local = self._discover_path('kadmin_local', +- '/usr/sbin/kadmin.local', +- paths) +- self.kprop = self._discover_path('kprop', '/usr/sbin/kprop', paths) +- self.kadmind = self._discover_path('kadmind', +- '/usr/sbin/kadmind', paths) +- +- self._kinit = self._discover_path('kinit', '/usr/bin/kinit', paths) +- self._klist = self._discover_path('klist', '/usr/bin/klist', paths) ++ self.kdb5_util = '@krb5Full@/bin/kdb5_util' ++ self.krb5kdc = '@krb5Full@/bin/krb5kdc' ++ self.kadmin_local = '@krb5Full@/bin/kadmin.local' ++ self.kprop = '@krb5Full@/bin/kprop' ++ self.kadmind = '@krb5Full@/bin/kadmind' ++ self._kinit = '@krb5Full@/bin/kinit' ++ self._klist = '@krb5Full@/bin/klist' - try: - krb5_version = subprocess.check_output( -@@ -101,7 +101,7 @@ class K5Realm(metaclass=abc.ABCMeta): - # macOS output doesn't contain Heimdal - if 'heimdal' in krb5_version.lower() or ( - sys.platform == 'darwin' and -- krb5_config == '/usr/bin/krb5-config'): -+ krb5_config == '@krb5Full@/bin/krb5-config'): - provider_cls = HeimdalRealm - else: - provider_cls = MITRealm -@@ -434,14 +434,14 @@ class MITRealm(K5Realm): - @property - def _default_paths(self): - return [ -- ('kdb5_util', 'kdb5_util', '/usr/sbin/kdb5_util'), -- ('krb5kdc', 'krb5kdc', '/usr/sbin/kdb5kdc'), -- ('kadmin', 'kadmin', '/usr/bin/admin'), -- ('kadmin_local', 'kadmin.local', '/usr/sbin/kadmin.local'), -- ('kadmind', 'kadmind', '/usr/sbin/kadmind'), -- ('kprop', 'kprop', '/usr/sbin/kprop'), -- ('_kinit', 'kinit', '/usr/bin/kinit'), -- ('_klist', 'klist', '/usr/bin/klist'), -+ ('kdb5_util', 'kdb5_util', '@krb5Full@/bin/kdb5_util'), -+ ('krb5kdc', 'krb5kdc', '@krb5Full@/bin/kdb5kdc'), -+ ('kadmin', 'kadmin', '@krb5Full@/bin/admin'), -+ ('kadmin_local', 'kadmin.local', '@krb5Full@/bin/kadmin.local'), -+ ('kadmind', 'kadmind', '@krb5Full@/bin/kadmind'), -+ ('kprop', 'kprop', '@krb5Full@/bin/kprop'), -+ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), -+ ('_klist', 'klist', '@krb5Full@/bin/klist'), - ] - - @property -@@ -585,12 +585,12 @@ class HeimdalRealm(K5Realm): - - return [ - ('krb5kdc', 'kdc', os.path.join(base, 'kdc')), -- ('kadmin', 'kadmin', '/usr/bin/kadmin'), -- ('kadmin_local', 'kadmin', '/usr/bin/kadmin'), -+ ('kadmin', 'kadmin', '@krb5Full@/bin/kadmin'), -+ ('kadmin_local', 'kadmin', '@krb5Full@/bin/kadmin'), - ('kadmind', 'kadmind', os.path.join(base, 'kadmind')), -- ('_kinit', 'kinit', '/usr/bin/kinit'), -- ('_klist', 'klist', '/usr/bin/klist'), -- ('_ktutil', 'ktutil', '/usr/bin/ktutil'), -+ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), -+ ('_klist', 'klist', '@krb5Full@/bin/klist'), -+ ('_ktutil', 'ktutil', '@krb5Full@/bin/ktutil'), - ] - - @property + def _create_conf(self, profile, filename): + with open(filename, 'w') as conf_file: diff --git a/k5test/unit.py b/k5test/unit.py -index 3c64b9e..59da1ab 100644 +index 4ee7f98..543d662 100644 --- a/k5test/unit.py +++ b/k5test/unit.py @@ -38,7 +38,7 @@ _KRB_VERSION = None - def krb_minversion_test(target_version, problem, provider=None): + def krb_minversion_test(target_version, problem): global _KRB_VERSION if _KRB_VERSION is None: - _KRB_VERSION = _utils.get_output("krb5-config --version") diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index cf765c06d869..cea38abee395 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.1.0"; + version = "23.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4"; + sha256 = "045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8"; }; nativeBuildInputs = [ @@ -48,9 +48,6 @@ buildPythonPackage rec { disabledTests = lib.optionals (stdenv.isDarwin) [ "test_multiprocess_get" "test_multiprocess_get_after_native_get" - ] ++ [ - # E ValueError: too many values to unpack (expected 1) - "test_entry_point" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index a45be02b55b2..abcd04a1d307 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six -, pytest, backports_unittest-mock, keyring, setuptools-scm +, pytest, backports_unittest-mock, keyring, setuptools-scm, toml }: buildPythonPackage rec { pname = "keyrings.alt"; - version = "4.1.0"; + version = "4.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "52ccb61d6f16c10f32f30d38cceef7811ed48e086d73e3bae86f0854352c4ab2"; + sha256 = "cc475635099d6edd7e475c5a479e5b4da5e811a3af04495a1e9ada488d16fe25"; }; postPatch = '' @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index e5649c58e465..2b157494f919 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.3.2"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c"; + sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index e90f72b0fd25..952527d5cab7 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "18.20.0"; + version = "12.0.1"; prePatch = '' sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0c72d00e7883375bd39ae99758425f5e6cb86388417cf7cc84305c211b2192cf"; + sha256 = "ec52ea01d52e2ec3da255992f7e859f3a76f2bdb51cf65ba8cd71dfc309d8daa"; }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 5f8057df849d..423185b6f226 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.2.0"; + version = "2.6.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "V${version}"; - sha256 = "0vp1lk7hipa4ixa1zcy99r9b5xb1gv54h4i0izx6fv4zf9m0gmw1"; + sha256 = "1lkvc926i3c7isqhaja6k013qgla44cdhvkx76gpdyywq53i9mcb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index cf82b166ec6d..3c613d74e272 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.9.1"; + version = "2.9"; src = fetchPypi { inherit pname version; - sha256 = "f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f"; + sha256 = "18c3ee656a6775b9b0d60f7c6c5b094d878d1d90fc03d56731039f0a4b546a91"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 400643383773..4307d52d8913 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "lexid"; - version = "2021.1006"; + version = "2020.1005"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "509a3a4cc926d3dbf22b203b18a4c66c25e6473fb7c0e0d30374533ac28bafe5"; + sha256 = "52333a2b9ebd14aa0dfeb33de72bd159c2dc31adb9c59cddfc486e2b69bfdcd1"; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 48262398fcbf..73d99afda674 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -1,26 +1,23 @@ -{ lib -, stdenv +{ lib, stdenv , buildPythonPackage -, pythonAtLeast -, fetchFromGitHub -, libarchive +, fetchPypi +, pytest , glibcLocales +, libarchive , mock -, pytestCheckHook }: buildPythonPackage rec { pname = "libarchive-c"; - version = "3.1"; - format = "setuptools"; + version = "2.9"; - src = fetchFromGitHub { - owner = "Changaco"; - repo = "python-${pname}"; - rev = version; - sha256 = "1z4lqy9zlzymshzrcldsc9ipys2l7grqg4yff6ndl6dgbfb0g4jb"; + src = fetchPypi { + inherit pname version; + sha256 = "9919344cec203f5db6596a29b5bc26b07ba9662925a05e24980b84709232ef60"; }; + checkInputs = [ mock pytest glibcLocales ]; + LC_ALL="en_US.UTF-8"; postPatch = '' @@ -28,20 +25,9 @@ buildPythonPackage rec { "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - pythonImportsCheck = [ - "libarchive" - ]; - - checkInputs = [ - glibcLocales - mock - pytestCheckHook - ]; - - disabledTests = lib.optionals (pythonAtLeast "3.9") [ - # causes python3.9 to segfault - "test_custom_writer_and_stream_reader" - ]; + checkPhase = '' + py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar' + ''; meta = with lib; { homepage = "https://github.com/Changaco/python-libarchive-c"; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 5b950ab57397..5a1ef3b7f737 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.20"; + version = "0.3.19"; disabled = pythonOlder "3.6"; # Some files for tests missing from PyPi @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "063bl21gyyd25i2v0j6kz29cxxdfhng2nins4i2qblmac90f2nqy"; + sha256 = "012g1hyaj015k2sf38a7jnpzjic0f8j97ar84d0f00w2ifzwx4ma"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index e3b9e3bb7c8a..c7d2221a22e2 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.37.0"; + version = "0.36.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15"; + sha256 = "765128fdf5f149ed0b889ffbe2b05eb1717f8e20a5c87fa2b4018fbcce0fcfc9"; }; nativeBuildInputs = [ llvm ]; - propagatedBuildInputs = lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = [ ] ++ lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -31,12 +31,10 @@ buildPythonPackage rec { substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" ''; - # Set directory containing llvm-config binary preConfigure = '' export LLVM_CONFIG=${llvm.dev}/bin/llvm-config ''; - checkPhase = '' ${python.executable} runtests.py ''; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 4daa619acc4f..ade031409b41 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "marisa-trie"; - version = "0.7.7"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "bbeafb7d92839dc221365340e79d012cb50ee48a1f3f30dd916eb35a8b93db00"; + sha256 = "c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 8ed57f3ff031..8d75139dddcb 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , attrs @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "1.1.0"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,9 +23,18 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "v${version}"; - sha256 = "0h7rn3rcqfwmnqs97qczwkw9w5g4df8bgn6sw7k149svfqgrkf56"; + hash = "sha256-GA7P2I8N+i2ISsVgx58zyhrfKMcZ7pL4X9T/trbsr1Y="; }; + patches = [ + (fetchpatch { + # :arrow_up: UPGRADE: attrs -> v21 (#165) + # https://github.com/executablebooks/markdown-it-py/pull/165 + url = "https://github.com/executablebooks/markdown-it-py/commit/78381ffe1a651741594dc93e693b761422512fa2.patch"; + sha256 = "1kxhblpi4sycrs3rv50achr8g0wlgq33abg2acra26l736hlsya1"; + }) + ]; + propagatedBuildInputs = [ attrs linkify-it-py ] ++ lib.optional (pythonOlder "3.8") typing-extensions; diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index a4b15ce9a544..343c5952a434 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "3.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "62cd2099b29188c92493c2940ee79d1bf2f2619a71721664e5a98ec2faa58237"; + sha256 = "0s0yr7nv06sfgxglghl2vq74g3m49j60k1hi2qzfsv4bj8hvs35k"; }; propagatedBuildInputs = [ marshmallow setuptools ]; diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix index 6a0be0696063..7d9421b5d949 100644 --- a/pkgs/development/python-modules/mattermostdriver/default.nix +++ b/pkgs/development/python-modules/mattermostdriver/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mattermostdriver"; - version = "7.3.1"; + version = "7.3.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "bf629c4b8f825bd7196208aa93995ac5077bd60939ba67cca314a7f13c1dbcea"; + sha256 = "17jqcpa1xd9n7bf4d5l7wmscls34kymv27gi17pyyfjxbwk5gsga"; }; propagatedBuildInputs = [ websockets requests ]; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 1b8bcb293892..f0005eef61bf 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.10.6"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "2738370469f8ce27efc37aa6e17319a4149246c9a0da822c8d81d948f0c7e1a7"; + sha256 = "b7d52d72a9739963b6d39d5e58ef367c00490a90cf7795f23c8b2e2c140c8882"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix index 589b7e351c1e..6c00ad650bb5 100644 --- a/pkgs/development/python-modules/minidump/default.nix +++ b/pkgs/development/python-modules/minidump/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.19"; + version = "0.0.18"; src = fetchPypi { inherit pname version; - sha256 = "67b3327cb96e319633653a353c6281703772335dc84797d6fdce7daf0b3be077"; + sha256 = "sha256-uf4KZc9C1gWRgHu4ttk1fpL2pG8oUb79uvCIlHItB/8="; }; # Upstream doesn't have tests diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index a6638fc6ff49..e9c12548269f 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "7.0.2"; + version = "6.0.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0y5zsay9b6xgibs6m4gckw63jip35vsdfajsh1nw2zcb2xs1a7qs"; + sha256 = "sha256-FyIZKFQtf6qvwo4+NzPa/KOmBCcdGJ3jCqxz26+S2e4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index be0ac454ee98..c54da3055e7c 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.0.post1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "v${version}"; - sha256 = "0ysjn8z1hkscb4cycbrvcb93r04w5793yylsy40h5dvjd04ns5jc"; + sha256 = "1x8j0ij582dyhay0gaqq45a2jz1m4fr8xw0v65ngviajj3cxmcpb"; }; MKLROOT = mkl; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index b50d98513a2f..2940c111e5dc 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.20.1"; + version = "1.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "71764443c4942f181fee2d5bf44dd74a0507bcc5b62a1f1e08079d1f40a15fc0"; + sha256 = "8942089589d08c05c8a7fc66828c02a9233be462c421881b50bc2a0b183dfdbe"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 912c2c52ea8e..2dfe06d51770 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.23.3"; + version = "0.23.0"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "1pil4vy4grg49i5xcrqmi43vf40lk5p4sbj5bl0fjixkklavwmhj"; + sha256 = "02fcnfsrc6sccv6x2rnx86g0zw0ivk5s8gx230g6pxfg3lap6knv"; }; propagatedBuildInputs = [ numpy scipy ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index f8ff484046bb..73a3b07a64c3 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.44"; + version = "3.9.42"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-oeDYzhSzUXxtYhcLjXAmsi1v9vY5qCE/U9YOYxdQxrg="; + sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index d775d5157191..e93bf206edaa 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "monotonic"; - version = "1.6"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7"; + sha256 = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0"; }; __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 73325c24d94c..ff236d9becc4 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -5,7 +5,6 @@ , msgpack , pytestCheckHook , numpy -, pandas , pydantic , pymongo , ruamel_yaml @@ -14,21 +13,17 @@ buildPythonPackage rec { pname = "monty"; - version = "2021.8.17"; + version = "2021.6.10"; disabled = pythonOlder "3.5"; # uses type annotations + # No tests in Pypi src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "0lg6d0qk6iv476rcn45p5f50kips5g9s709cxddwnk5yrz57c4d0"; + sha256 = "01fhl4pl5gj4ahph4lxcm0fmglh0bjw6jz9ckmgzviasg4l1j6h4"; }; - postPatch = '' - substituteInPlace tests/test_os.py \ - --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' - ''; - propagatedBuildInputs = [ ruamel_yaml tqdm @@ -38,11 +33,15 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook numpy - pandas pydantic pymongo ]; + preCheck = '' + substituteInPlace tests/test_os.py \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' + ''; + meta = with lib; { description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; longDescription = " diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index b75936817426..318d519e57ce 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -1,29 +1,23 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, mockupdb -, pymongo -, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub +, pymongo, mockupdb }: buildPythonPackage rec { pname = "motor"; - version = "2.5.1"; - disabled = pythonOlder "3.6"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = version; - sha256 = "sha256-r+HyIEC+Jafn7eMqkAldsZ5hbem+n+P76RJGAymmBks="; + sha256 = "1sgaqg98h35lazzdi015q1i60ig7krid8b10a5rm6lf755y8yj2c"; }; propagatedBuildInputs = [ pymongo ]; - checkInputs = [ mockupdb ]; - # network connections doCheck = false; + checkInputs = [ mockupdb ]; pythonImportsCheck = [ "motor" ]; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index a353816d252e..c3acdbe71ec2 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder +, pythonAtLeast , numpy , decorator , imageio @@ -9,56 +9,44 @@ , proglog , requests , tqdm - # Advanced image processing (triples size of output) +# Advanced image processing (triples size of output) , advancedProcessing ? false -, opencv3 -, scikitimage -, scikit-learn -, scipy -, matplotlib -, youtube-dl +, opencv3 ? null +, scikitimage ? null +, scikit-learn ? null +, scipy ? null +, matplotlib ? null +, youtube-dl ? null }: +assert advancedProcessing -> ( + opencv3 != null && scikitimage != null && scikit-learn != null + && scipy != null && matplotlib != null && youtube-dl != null); + buildPythonPackage rec { pname = "moviepy"; version = "1.0.3"; - disabled = pythonOlder "3.5"; + disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; sha256 = "2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0" - ''; - # No tests, require network connection doCheck = false; propagatedBuildInputs = [ - numpy - decorator - imageio - imageio-ffmpeg - tqdm - requests - proglog - ] ++ lib.optionals advancedProcessing [ - opencv3 - scikitimage - scikit-learn - scipy - matplotlib - youtube-dl - ]; + numpy decorator imageio imageio-ffmpeg tqdm requests proglog + ] ++ (lib.optionals advancedProcessing [ + opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl + ]); meta = with lib; { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; license = licenses.mit; - maintainers = with maintainers; [ ]; }; + } diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index d16d858c22f5..b25e838c96ff 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.29"; + version = "1.17.97"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "efee8defd50c441f1daec39fe415a81ded16b828678b4606ee8f9dd677bfe53e"; + sha256 = "cc12897498213e6aa1530d9f75dadb3916fcd3ce376639560c2fede2c93c51b9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 17b0d068c981..6c6ea7b7b1c9 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "2.9"; + version = "2.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "278172935d7121c2f8c7c0a05518dd565a2b76d9e9c4a0a3fcd08a21fa685d43"; + sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 3b9986bae048..169b89f7b892 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.4"; + version = "0.5.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce"; + sha256 = "db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c"; }; inherit doCheck; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 67d08f9e50ff..02eda2beb195 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.1.0"; + version = "6.0.7"; src = fetchPypi { inherit pname version; - sha256 = "d22a8ff202644d31db254d24d52c3a96c82156623fcd7c7f987bba2612303ec9"; + sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index a4cbe11fbe7a..96fc94d43e85 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "3.1.0"; + version = "2.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "12dc4390b355b26d07ac8d11d50efbcb54bae0ad5842b817131babd2f4567963"; + sha256 = "4e3efdcfda31c3074cb565cd8e76e2e5421b1c4560c3a00c56f8679dd15590e5"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 287737900b89..74f7d4003dcd 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,39 +12,28 @@ }: buildPythonPackage rec { - version = "0.54.0"; + version = "0.53.1"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "bad6bd98ab2e41c34aa9c80b8d9737e07d92a53df4f74d3ada1458b0b516ccff"; + sha256 = "9cd4e5216acdc66c4e9dab2dfd22ddb5bef151185c070d4a3cd8e78638aff5b0"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "1.21" "1.22" - - substituteInPlace numba/__init__.py \ - --replace "(1, 20)" "(1, 21)" - ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ numpy llvmlite setuptools ]; - + pythonImportsCheck = [ "numba" ]; # Copy test script into $out and run the test suite. checkPhase = '' ${python.interpreter} -m numba.runtests ''; - # ImportError: cannot import name '_typeconv' doCheck = false; - pythonImportsCheck = [ "numba" ]; - meta = with lib; { - homepage = "https://numba.pydata.org/"; + homepage = "http://numba.pydata.org/"; license = licenses.bsd2; description = "Compiling Python code using LLVM"; maintainers = with maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 60f3bf1091ec..9071cec1b03d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.21.2"; + version = "1.21.1"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc"; + sha256 = "1za22ggjxzm7drs2vd15s81ad9rlshk4p7pv7mxcbz4acdiszx6z"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index c628abad8691..e8d032e16aba 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.4.2"; + version = "1.2.2"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "7238780e42a8d6b7fd3296273c76d35dbebb4520d6778472d556b68b77e2aade"; + sha256 = "78ab56951172ecd92f9b66dbf9b0ea986dcc6899d462eeef74563ddf33a5a9a5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index cf604ea38181..052d364982b3 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.12.1"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "a38957684b17ad0e140a87226249bf26de7267db0c83a6d512b48be258052e1a"; + sha256 = "sha256-aggRnD4goiZJPp4cngp8AIrJC/V46378cwUSfq8Xml4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 457d796d0b78..0b496b5ef0f8 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.9.1"; + version = "2.8.0"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "v${version}"; - sha256 = "1fx80qjrkmnvn2mg9fx26qn3sjlwnwqlmkaf6sqhdw79pn6khlpi"; + sha256 = "1w5vyl36mbk78a5028qa7dlzhavrs1dkx3q8m50ij37pa5cnyksz"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 52a77826f2d6..b7e237a3e3ba 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.2"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "cbcb84d63867af3411fa063af3de64902665bb5b3d40b25b2059e40603594e87"; + sha256 = "649ecab692fade3cbfcf967ff936496b0cfba0af00a55dfaacd82bdda5cb2279"; }; nativeBuildInputs = [ cython ]; @@ -105,8 +105,6 @@ buildPythonPackage rec { "test_missing_required_dependency" # AssertionError with 1.2.3 "test_from_coo" - # AssertionError: No common DType exists for the given inputs - "test_comparison_invalid" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 3f6875f4986f..58ae09af14b9 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, bleach , bokeh , param , pyviz-comms @@ -13,11 +12,10 @@ }: let - node = callPackage ./node { }; -in -buildPythonPackage rec { + node = callPackage ./node {}; +in buildPythonPackage rec { pname = "panel"; - version = "0.12.1"; + version = "0.11.3"; # Don't forget to also update the node packages # 1. retrieve the package.json file @@ -25,7 +23,7 @@ buildPythonPackage rec { # 3. node2nix src = fetchPypi { inherit pname version; - sha256 = "e4898d60abdb82f8a429df7f59dbf8bcaf7e19b3e633555512ceb4ce06678458"; + sha256 = "sha256-HpHYHysPE6MRxR0kek5C7sunHMfBsUGdZfxamz2jcLc="; }; # Since 0.10.0 panel attempts to fetch from the web. @@ -44,7 +42,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - bleach bokeh param pyviz-comms diff --git a/pkgs/development/python-modules/panel/node/node-env.nix b/pkgs/development/python-modules/panel/node/node-env.nix index 21089c4d5459..c2b723195b77 100644 --- a/pkgs/development/python-modules/panel/node/node-env.nix +++ b/pkgs/development/python-modules/panel/node/node-env.nix @@ -391,14 +391,13 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" - , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in stdenv.mkDerivation ({ - name = "${name}-${version}"; + name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -447,11 +446,6 @@ let # Run post install hook, if provided runHook postInstall ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) diff --git a/pkgs/development/python-modules/panel/node/node-packages.nix b/pkgs/development/python-modules/panel/node/node-packages.nix index 78c7c4ac37d1..6e45b64d5c6f 100644 --- a/pkgs/development/python-modules/panel/node/node-packages.nix +++ b/pkgs/development/python-modules/panel/node/node-packages.nix @@ -4,22 +4,13 @@ let sources = { - "@babel/runtime-7.15.3" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; - sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; - }; - }; - "@bokeh/bokehjs-2.3.3" = { + "@bokeh/bokehjs-2.3.1" = { name = "_at_bokeh_slash_bokehjs"; packageName = "@bokeh/bokehjs"; - version = "2.3.3"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.3.tgz"; - sha512 = "Zev3p5xnS47YsZo5hcGGNUdISH3mkVLKSc6LMVqEIRlnc7Ay79TD9bnApeYh90k0JU1pcMh0gEqHgwVOGPTZ/w=="; + url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.1.tgz"; + sha512 = "DlNZaqAJFUw38IuSk2TUOcfyiK8Ya3kDRpYt/RgVUftIDW2CWLbBo47kbug9+ykEF49rcnlxcCXhNXzpg4V7gw=="; }; }; "@bokeh/numbro-1.6.2" = { @@ -40,13 +31,13 @@ let sha512 = "W9tm8Qdw5BrylbZbaVWaQMgLfW/klesnj6J3FnyWpo18hCCOFApccUD8iOnRv7bF6PHlgWk84mW3JT5RSzYKjA=="; }; }; - "@luma.gl/constants-8.5.5" = { + "@luma.gl/constants-8.4.4" = { name = "_at_luma.gl_slash_constants"; packageName = "@luma.gl/constants"; - version = "8.5.5"; + version = "8.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.5.tgz"; - sha512 = "3pDC7jFaXliDP7Gvr6pPkorLFBXDnuakNeN87aEYcIM+p3XrkF0rPnDQJEzwScWS9RIopXT858xmL3vG7IYsDw=="; + url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.4.4.tgz"; + sha512 = "4e58QW6UKXkxiIvWSLoAnTc4cT8nvb0PhLzu1h8KiCuaDT5Vq8csOymcNOy/jhpfcIhHlmT1KwowF5m/DcOlKg=="; }; }; "@types/debounce-1.2.0" = { @@ -67,31 +58,31 @@ let sha512 = "0L8Mq1+oaIW0oVzGUDbSW+HnTjCNb4CmoIQE5BkoHt/A7x20z0MJ1PnwfH3atty/vbWLGgvJwVu2Mz3SKFiEFw=="; }; }; - "@types/jquery-3.5.6" = { + "@types/jquery-3.5.5" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.6"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz"; - sha512 = "SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz"; + sha512 = "6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w=="; }; }; - "@types/sizzle-2.3.3" = { + "@types/sizzle-2.3.2" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.3"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; - sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz"; + sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; }; }; - "@types/slickgrid-2.1.31" = { + "@types/slickgrid-2.1.30" = { name = "_at_types_slash_slickgrid"; packageName = "@types/slickgrid"; - version = "2.1.31"; + version = "2.1.30"; src = fetchurl { - url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.31.tgz"; - sha512 = "t/LodOkh8yP+o2jKcHsC0hAjDh1kl4RSFXKWmR9+U5FwXE7VpipqiAkE1W3NnGNA3ni5xnKQJt/CNXurJWTQ6w=="; + url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.30.tgz"; + sha512 = "9nTqNWD3BtEVK0CP+G+mBtvSrKTfQy3Dg5/al+GdTSVMHFm37UxsHJ1eURwPg7rYu6vc7xU95fGTCKMZbxsD5w=="; }; }; "choices.js-9.0.1" = { @@ -211,13 +202,13 @@ let sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; - "ext-1.5.0" = { + "ext-1.4.0" = { name = "ext"; packageName = "ext"; - version = "1.5.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; - sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; + url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; + sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; }; }; "fast-deep-equal-2.0.1" = { @@ -292,13 +283,13 @@ let sha1 = "04ef77862cff2bb79d30f7692095930222bf60f1"; }; }; - "htm-3.1.0" = { + "htm-3.0.4" = { name = "htm"; packageName = "htm"; - version = "3.1.0"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz"; - sha512 = "L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q=="; + url = "https://registry.npmjs.org/htm/-/htm-3.0.4.tgz"; + sha512 = "VRdvxX3tmrXuT/Ovt59NMp/ORMFi4bceFMDjos1PV4E0mV+5votuID8R60egR9A4U8nLt238R/snlJGz3UYiTQ=="; }; }; "jquery-3.6.0" = { @@ -319,6 +310,15 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; "json-formatter-js-2.3.4" = { name = "json-formatter-js"; packageName = "json-formatter-js"; @@ -328,6 +328,15 @@ let sha512 = "gmAzYRtPRmYzeAT4T7+t3NhTF89JOAIioCVDddl9YDb3ls3kWcskirafw/MZGJaRhEU6fRimGJHl7CC7gaAI2Q=="; }; }; + "loose-envify-1.4.0" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; + }; + }; "mgrs-1.0.0" = { name = "mgrs"; packageName = "mgrs"; @@ -355,40 +364,31 @@ let sha512 = "4RtQ1+LHJKesDCNJrXkQcwXAWCrC2aggdLYMstS/G5fEWL+fXZbUA9pwVNHFghMGuFGRATlDLNInRaPeRKzpFQ=="; }; }; - "preact-10.5.14" = { + "preact-10.5.13" = { name = "preact"; packageName = "preact"; - version = "10.5.14"; + version = "10.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/preact/-/preact-10.5.14.tgz"; - sha512 = "KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ=="; + url = "https://registry.npmjs.org/preact/-/preact-10.5.13.tgz"; + sha512 = "q/vlKIGNwzTLu+jCcvywgGrt+H/1P/oIRSD6mV4ln3hmlC+Aa34C7yfPI4+5bzW8pONyVXYS7SvXosy2dKKtWQ=="; }; }; - "proj4-2.7.5" = { + "proj4-2.7.2" = { name = "proj4"; packageName = "proj4"; - version = "2.7.5"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/proj4/-/proj4-2.7.5.tgz"; - sha512 = "5ecXUXbHAfvdhfBQpU7EhUfPCQGUCPmVup/4gnZA3bJY3JcK/xxzm4QQDz1xiXokN6ux65VDczlCtBtKrTSpAQ=="; + url = "https://registry.npmjs.org/proj4/-/proj4-2.7.2.tgz"; + sha512 = "x/EboBmIq48a9FED0Z9zWCXkd8VIpXHLsyEXljGtsnzeztC41bFjPjJ0S//wBbNLDnDYRe0e6c3FSSiqMCebDA=="; }; }; - "redux-4.1.1" = { + "redux-4.0.5" = { name = "redux"; packageName = "redux"; - version = "4.1.1"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz"; - sha512 = "hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw=="; - }; - }; - "regenerator-runtime-0.13.9" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.9"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; + url = "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz"; + sha512 = "VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w=="; }; }; "sprintf-js-1.1.2" = { @@ -400,6 +400,15 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; + "symbol-observable-1.2.0" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; + sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; + }; + }; "timezone-1.0.23" = { name = "timezone"; packageName = "timezone"; @@ -418,13 +427,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.3.1" = { + "tslib-2.2.0" = { name = "tslib"; packageName = "tslib"; - version = "2.3.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; - sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz"; + sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; }; }; "type-1.2.0" = { @@ -454,36 +463,35 @@ let sha1 = "3013e0ea181756306f1609e959cafbc722adb3e9"; }; }; - "wkt-parser-1.3.1" = { + "wkt-parser-1.2.4" = { name = "wkt-parser"; packageName = "wkt-parser"; - version = "1.3.1"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.1.tgz"; - sha512 = "XK5qV+Y5gsygQfHx2/cS5a7Zxsgleaw8iX5UPC5eOXPc0TgJAu1JB9lr0iYYX3zAnN3p0aNiaN5c+1Bdblxwrg=="; + url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.2.4.tgz"; + sha512 = "ZzKnc7ml/91fOPh5bANBL4vUlWPIYYv11waCtWTkl2TRN+LEmBg60Q1MA8gqV4hEp4MGfSj9JiHz91zw/gTDXg=="; }; }; }; args = { name = "_at_holoviz_slash_panel"; packageName = "@holoviz/panel"; - version = "0.12.1"; + version = "0.11.3"; src = ./.; dependencies = [ - sources."@babel/runtime-7.15.3" - sources."@bokeh/bokehjs-2.3.3" + sources."@bokeh/bokehjs-2.3.1" sources."@bokeh/numbro-1.6.2" (sources."@bokeh/slickgrid-2.4.2702" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@luma.gl/constants-8.5.5" + sources."@luma.gl/constants-8.4.4" sources."@types/debounce-1.2.0" sources."@types/gl-matrix-2.4.5" - sources."@types/jquery-3.5.6" - sources."@types/sizzle-2.3.3" - sources."@types/slickgrid-2.1.31" + sources."@types/jquery-3.5.5" + sources."@types/sizzle-2.3.2" + sources."@types/slickgrid-2.1.30" sources."choices.js-9.0.1" sources."d-1.0.1" sources."debounce-1.2.1" @@ -500,7 +508,7 @@ let sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."event-emitter-0.3.5" - (sources."ext-1.5.0" // { + (sources."ext-1.4.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -513,23 +521,25 @@ let sources."fuse.js-3.6.1" sources."gl-matrix-3.3.0" sources."hammerjs-2.0.8" - sources."htm-3.1.0" + sources."htm-3.0.4" sources."jquery-3.6.0" sources."jquery-ui-1.12.1" + sources."js-tokens-4.0.0" sources."json-formatter-js-2.3.4" + sources."loose-envify-1.4.0" sources."mgrs-1.0.0" sources."next-tick-1.0.0" sources."nouislider-14.7.0" - sources."preact-10.5.14" - sources."proj4-2.7.5" - sources."redux-4.1.1" - sources."regenerator-runtime-0.13.9" + sources."preact-10.5.13" + sources."proj4-2.7.2" + sources."redux-4.0.5" sources."sprintf-js-1.1.2" + sources."symbol-observable-1.2.0" sources."timezone-1.0.23" - sources."tslib-2.3.1" + sources."tslib-2.2.0" sources."type-1.2.0" sources."underscore.template-0.1.7" - sources."wkt-parser-1.3.1" + sources."wkt-parser-1.2.4" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/python-modules/panel/node/package.json b/pkgs/development/python-modules/panel/node/package.json index dc1d13ab4875..f40e3773e23b 100644 --- a/pkgs/development/python-modules/panel/node/package.json +++ b/pkgs/development/python-modules/panel/node/package.json @@ -1,6 +1,6 @@ { "name": "@holoviz/panel", - "version": "0.12.1", + "version": "0.11.1", "description": "A high level dashboarding library for python visualization libraries.", "license": "BSD-3-Clause", "repository": { @@ -8,7 +8,7 @@ "url": "https://github.com/holoviz/panel.git" }, "dependencies": { - "@bokeh/bokehjs": "^2.3.3", + "@bokeh/bokehjs": "^2.3.0", "@luma.gl/constants": "^8.0.3", "@types/debounce": "^1.2.0", "@types/gl-matrix": "^2.4.5", diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 88d63f0de93f..c2237f68524f 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -6,7 +6,7 @@ , invoke , pynacl , pyasn1 -, pytestCheckHook +, pytest , pytest-relaxed , mock }: @@ -20,21 +20,25 @@ buildPythonPackage rec { sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"; }; + checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; - checkInputs = [ invoke pytestCheckHook pytest-relaxed mock ]; - - disabledTestPaths = [ - "tests/test_sftp.py" - "tests/test_config.py" - ]; - __darwinAllowLocalNetworking = true; + # 2 sftp tests fail (skip for now) + # test_config relies on artifacts to be to downloaded + # RSA tests don't have valid keys + checkPhase = '' + pytest tests \ + --ignore=tests/test_sftp.py \ + --ignore=tests/test_config.py + ''; + meta = with pkgs.lib; { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; license = licenses.lgpl21Plus; + longDescription = '' This is a library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 757ddc7d9746..b21536060d3a 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.6"; + version = "2.3.5"; src = fetchPypi { inherit pname version; - sha256 = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"; + sha256 = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 6a0281b756ec..cd51747d5678 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.9.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"; + sha256 = "86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd"; }; meta = { diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index 9108c3656dbd..d656a752cf55 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.6.0"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "f83f1eddf77dd86e824143eef8d9adbe0785c3cdd5ec0ed6c0edea3227385048"; + sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M="; }; propagatedBuildInputs = [ smart-open typer google-cloud-storage ]; diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index 1a3996311570..66bed253cb86 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pdoc3"; - version = "0.10.0"; + version = "0.9.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "5f22e7bcb969006738e1aa4219c75a32f34c2d62d46dc9d2fb2d3e0b0287e4b7"; + sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1"; }; nativeBuildInputs = [ setuptools-git setuptools-scm ]; diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index 09a240f4c4a6..b309fb287d80 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "phik"; - version = "0.12.0"; + version = "0.10.0"; format = "wheel"; disabled = !isPy3k; src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "57db39d1c74c84a24d0270b63d1c629a5cb975462919895b96a8522ae0678408"; + sha256 = "b745313c5ff9d6a3092eefa97f83fa4dbed178c9ce69161b655e95497cb2f38b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index fc593e6a48fb..d51a83a05478 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pkgconfig"; - version = "1.5.5"; + version = "1.5.4"; inherit (pkg-config) setupHooks @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899"; + sha256 = "c34503829fd226822fd93c902b1cf275516908a023a24be0a02ba687f3a00399"; }; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 6bfed6305a8a..1b1834e324bb 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.7.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd"; + sha256 = "029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index b864dedecfe7..567fdd42d0d3 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "8.1.0"; + version = "7.4.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "b1f7b5b58ba3c171bb795352119d54797c8c50877bc376d26cd756de2453e9fd"; + sha256 = "ab70467116adc110b56eb5a1fdeed726307cc216e04dda46a782aa1a1468ce0e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index f49b8716211e..90eb35f993a3 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.3.0"; + version = "2.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-g2DPNN7VxK3EjOXOpSWA4a+PghZ7v2jmjw9+VQyCTBI="; + sha256 = "15f08czqfmxy1y947rlrsjs20jgsy2vc1wqhv4b08b3ijxj0jpqh"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 4b849dd016b8..e2496d6097d9 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -1,35 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, decorator +, nbformat , pytz , requests +, retrying , six -, tenacity }: buildPythonPackage rec { pname = "plotly"; - version = "5.3.0"; + version = "4.14.3"; src = fetchPypi { inherit pname version; - sha256 = "b6dc306c56e7d5fa7d017718894099b27290b427abf4acad8e5b77fdc3bd32ec"; + sha256 = "14cxlfl79i9bh3awsf4xgwr14ywm7lnrz2a81s7gp0if77nsx2kx"; }; propagatedBuildInputs = [ + decorator + nbformat pytz requests + retrying six - tenacity ]; # No tests in archive doCheck = false; - meta = with lib; { + meta = { description = "Python plotting library for collaborative, interactive, publication-quality graphs"; homepage = "https://plot.ly/python/"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/pluggy/0.nix b/pkgs/development/python-modules/pluggy/0.nix deleted file mode 100644 index 30fa2e1945b2..000000000000 --- a/pkgs/development/python-modules/pluggy/0.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ buildPythonPackage -, lib -, fetchPypi -, setuptools-scm -, importlib-metadata -}: - -buildPythonPackage rec { - pname = "pluggy"; - version = "0.13.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; - }; - - checkPhase = '' - py.test - ''; - - # To prevent infinite recursion with pytest - doCheck = false; - - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ importlib-metadata ]; - - meta = { - description = "Plugin and hook calling mechanisms for Python"; - homepage = "https://github.com/pytest-dev/pluggy"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 1a1c23f22d0a..30fa2e1945b2 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pluggy"; - version = "1.0.0"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"; + sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index d5262ee22c47..4d8c444dcd20 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , importlib-metadata , intreehooks +, isort , pathlib2 , pep517 , pytest-mock @@ -12,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.4"; + version = "1.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0jgd4d7m5y8ly8n0l9lcq7cjab2y3hifk90f343ksmjzssfd5lg3"; + sha256 = "07x0zagf9cfr7g3132jjd5byywkbnzpfbxjfjzpzpj70fqw70qrc"; }; postPatch = lib.optionalString (pythonOlder "3.8") '' diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 4b7d35093662..7287797ef331 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.8"; + version = "1.1.7"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0qcgjb78nj69sppd8146519q9422xxg1bi34gyxy51sjkvd5lxhz"; + sha256 = "03cbzjw0sb8rs85iq191ndk9523d6qpymh2nhw5bvcxfvsf9042d"; }; postPatch = '' diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 105fa9e180b7..0f18a6ad2072 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -1,43 +1,51 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , chardet +, pyyaml , requests -, ruamel_yaml , six , semver , pytestCheckHook +, pytest-cov +, pytest-runner , openapi-spec-validator }: buildPythonPackage rec { pname = "prance"; - version = "0.21.8.0"; + version = "0.21.2"; - src = fetchFromGitHub { - owner = "RonnyPfannschmidt"; - repo = pname; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; + src = fetchPypi { + inherit pname version; + sha256 = "43ebe3a5b38f0c65c428427004c4d8ce8d7155ddad50610276c89c192680f138"; }; + buildInputs = [ + pytest-runner + ]; + propagatedBuildInputs = [ chardet + pyyaml requests - ruamel_yaml six semver ]; checkInputs = [ pytestCheckHook + pytest-cov openapi-spec-validator ]; postPatch = '' + substituteInPlace setup.py \ + --replace "tests_require = dev_require," "tests_require = None," \ + --replace "chardet~=4.0" "" \ + --replace "semver~=2.13" "" substituteInPlace setup.cfg \ - --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" + --replace "--cov-fail-under=90" "" ''; # Disable tests that require network diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 5b3253b31b39..23702f8e8cfb 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.2.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "bd81678c108e6c73d4f1e47cd4283de301faaa6ff6220bcd1d4022038c56b416"; + sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index 0f11347a74b8..a699f6ff812f 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "priority"; - version = "2.0.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"; + sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb"; }; patches = [ diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index a642d6ba10d1..92810ec6a5fb 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.18"; + version = "1.9.17"; src = fetchPypi { inherit pname version; - sha256 = "d7e510790512f0bb8150c508531c8681c3d9d0ea63b3ba9b11bbf0952cbd69a8"; + sha256 = "d01e11581442dfcc1bd73ac3278bdf1f98e9df8f083a11e5989632ff97322b65"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 6df85ca5f089..af653f260cd3 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2021.1"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e"; + sha256 = "2ef23d3371439f13fffbe7f8b9fc180a19d4183dc9cab204d878d7c7766464bf"; }; propagatedBuildInputs = [ pygments urwid ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index e027aaeb294b..c8d5068e4e73 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.39"; + version = "3.38"; src = fetchPypi { inherit pname version; - sha256 = "d2a11dde0cc82d0eb5e938fe624f223d852ed848c57299ff562827bc4557375f"; + sha256 = "5660163a91590f320685263a738ab910c7a86346d9c85a68639a19ab83433ce6"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index f53038b2e1f6..58d1d0c694a7 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.0.0"; + version = "3.8.3"; src = fetchPypi { inherit pname version; - sha256 = "6accc4af505ee5b312689eaee1a9bc93cb6ea31a2d905a877c6b47f0888c3dcc"; + sha256 = "afdd887fff42a963f13d09a1f4f5fd24aef08f4b8a594f2ac11e0a29022f1518"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index daa879a58a0d..97187abd7591 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.13.2"; + version = "0.13.1"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "9692013af3b86b096b5423b88179c6c9b604baff5a6b6f89ba5f40429feb7a3e"; + sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index e6be3f063fef..3f825a06cd3c 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.7.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "13nq16pxz4vck7jn936ymhm0y0q82hd7kkw0ip7k85cx7wywzbql"; + sha256 = "sha256-iEXoNTsfsDq79bKV7A4aOCHr11rT/cqnyLghEtGsaks="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 07fe662f6ec0..fb0852e2bf11 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "83"; + version = "82"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "0azpdgmfby8plsp22hy1ip9vzbnmvf9brmah7hcwkpypg31rb61y"; + sha256 = "sha256-DdZ6bf+2rMjgjm5aRxcSRI/hN0zfP7uV8PaM40c9IJo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 317691066f47..c179688a8a5b 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.2"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "d1258f8d053cba0c90fe329254e8ec59eb28b535b48d9d06e8c7f1d74b8e4531"; + sha256 = "fae5d2264f62f40e6f37090422a764197de610df36afb5ae827b167d34b8621a"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 217e552aa0e1..ab4c2f360760 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.1"; + version = "4.5.0"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "002a065dcbf59c2caa039e4fc4ba01d1d636aa63ee9c794d4c9fc01f0e2d6dc0"; + sha256 = "58b017b3437bbe97803a23755876c6d6aeb5aea37e52cec15e5d86b59c4c7295"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index dfd84fe066d0..075b607c772e 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -1,39 +1,21 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pytest-mock -}: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-mock }: buildPythonPackage rec { - pname = "pykka"; - version = "3.0.1"; - format = "pyproject"; - disabled = pythonOlder "3.6.1"; + pname = "Pykka"; + version = "2.0.3"; - src = fetchFromGitHub { - owner = "jodal"; - repo = pname; - rev = "v${version}"; - sha256 = "1h3brgm8y4a9s991y0drkp0vvmxix9f2b49f9w6ibhkhr37gc0lh"; + src = fetchPypi { + inherit pname version; + sha256 = "4b9d2363365b3455a0204bf163f09bd351d24b938c618c79d975a9510e128e95"; }; - nativeBuildInputs = [ - poetry-core - ]; - - checkInputs = [ - pytestCheckHook - pytest-mock - ]; + checkInputs = [ pytestCheckHook pytest-mock ]; meta = with lib; { homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst"; - maintainers = with maintainers; [ marsam ]; + maintainers = [ maintainers.marsam ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 2e4953ec7b9b..ef42bd43239a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,13 +1,12 @@ { stdenv , lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder , installShellFiles , astroid , isort , mccabe -, platformdirs , toml , pytest-benchmark , pytest-xdist @@ -16,15 +15,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.10.2"; + version = "2.7.4"; disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = "PyCQA"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-hkrkgUdC5LO1oSPFL6gvIk0zFpMw45gCmnoRbdPZuRs="; + src = fetchPypi { + inherit pname version; + sha256 = "bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee"; }; nativeBuildInputs = [ @@ -35,7 +32,6 @@ buildPythonPackage rec { astroid isort mccabe - platformdirs toml ]; @@ -62,12 +58,6 @@ buildPythonPackage rec { "-n auto" ]; - disabledTestPaths = [ - # tests miss multiple input files - # FileNotFoundError: [Errno 2] No such file or directory - "tests/pyreverse/test_writer.py" - ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index a305a8309a93..08924d515732 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.8.1"; + version = "2021.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-ULaybf2uV8lY9J9EHlszbnLWZJ0QO7y6BQxvdQX+nMU="; + sha256 = "sha256-Z7/j5ZZd8cOJhY/GfKUcDSJZvmU/TR/KDK60j1eYsik="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 56e436e96d2c..364514b6b5d0 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.12"; + version = "2022.0.11"; src = fetchPypi { inherit pname version; - sha256 = "bad712c883a12d774a8a58c35abc5d582c5e5eafdbb5351dc06ebe98c28bd135"; + sha256 = "901d00105142c9added48275188e289e91b3098251ec107aef90acaef3ea6d0d"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 095f3baf97ae..e322bb14f7ba 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.11.4"; + version = "3.11.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3b88d1e6c85f7fb8a9b99d6f136ac860672170370ec4146338fdd160c3b3fd3f"; + sha256 = "d3b93c8923ae8c8107c5adfd22f7c37fa0849a00a9723e0e0a0ca6afb582d6c3"; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 0d18175d7e6d..b81edaac6688 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -1,28 +1,20 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -}: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pymongo"; - version = "3.12.0"; - disabled = pythonOlder "3.6"; + version = "3.11.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I="; + sha256 = "539d4cb1b16b57026999c53e5aab857fe706e70ae5310cc8c232479923f932e6"; }; # Tests call a running mongodb instance doCheck = false; - pythonImportsCheck = [ "pymongo" ]; - meta = with lib; { - description = "Python driver for MongoDB"; homepage = "https://github.com/mongodb/mongo-python-driver"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + description = "Python driver for MongoDB"; }; } diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 7256749f8dec..fa9db26b5e39 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -1,40 +1,43 @@ { lib , buildPythonPackage , fetchPypi -, joblib -, llvmlite -, numba +, nose , scikit-learn , scipy -, pytestCheckHook +, numba +, llvmlite +, joblib }: buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.4"; - format = "setuptools"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "221124cbad8e3cf3ed421a4089d80ac5a29d3215e76cb49effc1df887533d2a8"; + sha256 = "0w87c2v0li2rdbx6qfc2lb6y6bxpdy3jwfgzfs1kcr4d1chj5zfr"; }; propagatedBuildInputs = [ - joblib - llvmlite - numba scikit-learn scipy + numba + llvmlite + joblib ]; checkInputs = [ - pytestCheckHook + nose ]; + checkPhase = '' + nosetests + ''; + meta = with lib; { description = "Nearest Neighbor Descent"; homepage = "https://github.com/lmcinnes/pynndescent"; license = licenses.bsd2; - maintainers = with maintainers; [ mic92 ]; + maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index df20d3bb6c47..099c9e237111 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,16 +1,6 @@ -{ lib -, fetchFromGitLab -, buildPythonPackage -, pillow -, setuptools-scm -, setuptools-scm-git-archive -, tesseract -, cuneiform -, isPy3k -, substituteAll -, pytestCheckHook -, tox -}: +{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools-scm, +setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll, +pytest, tox }: buildPythonPackage rec { pname = "pyocr"; @@ -27,25 +17,20 @@ buildPythonPackage rec { sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il"; }; - patches = [ - (substituteAll { - src = ./paths.patch; - inherit cuneiform tesseract; - }) + patches = [ (substituteAll { + src = ./paths.patch; + inherit cuneiform tesseract; + }) ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ pillow ]; + checkInputs = [ pytest tox ]; + checkPhase = "pytest"; - checkInputs = [ pytestCheckHook ]; - - meta = with lib; { + meta = { inherit (src.meta) homepage; description = "A Python wrapper for Tesseract and Cuneiform"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index bd6b5d701dda..6bd360036000 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, fetchFromGitHub, cmake, python , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, nose, shapely, pythonOlder, isPyPy, lz4, requests }: +, nose, shapely, pythonOlder, isPyPy, lz4 }: buildPythonPackage rec { pname = "pyosmium"; - version = "3.2.0"; + version = "3.1.3"; disabled = pythonOlder "3.4" || isPyPy; @@ -12,12 +12,11 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "0s9h1blz4vrgcvdiikbpi2d4cy69kg2s8ki4dzampm1s0pa92if5"; + sha256 = "11ma8nr7k2ixwwb55fiqvrj5qbmpgkyfk0canz4l0m8b7rcw3qsc"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; - propagatedBuildInputs = [ requests ]; preBuild = "cd .."; diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 74581ba7e33c..2f573b67838b 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,26 +1,14 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -}: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "pyphen"; - version = "0.11.0"; + pname = "Pyphen"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8"; + sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128"; }; - preCheck = '' - sed -i '/addopts/d' pyproject.toml - ''; - - checkInputs = [ - pytestCheckHook - ]; - meta = with lib; { description = "Pure Python module to hyphenate text"; homepage = "https://github.com/Kozea/Pyphen"; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index da9569b7fb73..95333f746d0c 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "2.0"; + version = "1.10.8"; src = fetchPypi { inherit pname version; - sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; + sha256 = "b7cd66595bef92f81764b976ddde2b2fa8e4f5f325e02f65f6ec7f3708b29cf6"; }; checkInputs = [ webtest zope_component ]; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 75cecc7d7091..8a6eb47a46c7 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.18.0"; + version = "0.17.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"; + sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix index a2e726903554..f24571a78cf1 100644 --- a/pkgs/development/python-modules/pysatochip/default.nix +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -1,35 +1,17 @@ -{ lib -, buildPythonPackage -, fetchPypi -, certifi -, cryptography -, ecdsa -, pyaes -, pyopenssl -, pyscard -, pythonOlder -}: +{ lib, buildPythonPackage, fetchPypi, pyscard, ecdsa, pyaes +, pythonOlder }: buildPythonPackage rec { pname = "pysatochip"; - version = "0.12.3"; + version = "0.11.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "24db358a65c0402c299c0c62efcfbbfc98e494181cd30d3996949ac667d5b4d4"; + sha256 = "sha256-Jj/zZIS9aXmZ2xdi29Eun7iRIrIk9oBlrtN9+6opIMo="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "cryptography==3.3.2" "cryptography" \ - --replace "ecdsa==0.15" "ecdsa" \ - --replace "pyopenssl==20.0.0" "pyopenssl" - ''; - - propagatedBuildInputs = [ cryptography ecdsa pyaes pyopenssl pyscard ]; - - checkInputs = [ certifi ]; + propagatedBuildInputs = [ pyscard ecdsa pyaes ]; pythonImportsCheck = [ "pysatochip" ]; diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 26aece1afb21..be9663245bb5 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.8"; + version = "0.9.7"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4dfa3168e4e4e9301a2cd5904bdcea15e2bf62a1c9abb5d3f92d9122ea22c26e"; + sha256 = "e4fcc8aa1108e4917cb56794575ee08c2a3d9c2c52620474e3ecc8538dadf209"; }; # Deliberately not in propagated build inputs; users can decide diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 8cd73f483fa8..01ec38458c9f 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,50 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder -, packaging +, isPy27 +, six , pytest , pytestCheckHook +, numpy , setuptools-scm }: buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.10.1"; - disabled = pythonOlder "3.7"; + version = "0.9.0"; + disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "7e9e0912c206c53cd6ee996265aa99d5c99c9334e37d025ce6114bc0416ffc14"; + sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; }; nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; propagatedBuildInputs = [ - packaging + six + numpy ]; checkInputs = [ pytestCheckHook ]; - disabledTests = [ - # ERROR: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...] - # __main__.py: error: unrecognized arguments: --remote-data - "test_remote_data_url" - "test_remote_data_float_cmp" - "test_remote_data_ignore_whitespace" - "test_remote_data_ellipsis" - "test_remote_data_requires" - "test_remote_data_ignore_warnings" - ]; - meta = with lib; { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index b0bc07b6c162..6e7fd37b915e 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.13.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "0lh7df3ysxmjzvx6242xb6qiwpfxrnj70kjmw5sndvzmy5dfpxfc"; + sha256 = "sha256-eyR0h0fW5a+L6QslTnM0TPvQCto06aMcKCE+b8LqHcQ="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index e628e6a158c5..fe74f692df5e 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "2.0.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "821a8c5c9c4f3a3c52cfa9c541fbe89ac9e28728125125af53724c4c3f129117"; + sha256 = "46a12331a701e2f21d48548b2828c8b0a7956dbf1cd5347163f537deb24332dd"; }; propagatedBuildInputs = [ isort ]; diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 1030f76050ca..19d031b6a2b1 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -4,7 +4,6 @@ , pytest , six , decorator -, pytestCheckHook }: buildPythonPackage rec { @@ -16,23 +15,22 @@ buildPythonPackage rec { sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; }; - # newer decorator versions are incompatible and cause the test suite to fail - # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric - postPatch = '' - substituteInPlace setup.py \ - --replace "decorator>=4,<5" "decorator>=4" \ - --replace "pytest>=3,<5" "pytest>=3" - ''; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ six decorator ]; - checkInputs = [ pytestCheckHook ]; + patchPhase = '' + sed -i "s/pytest>=3,<5/pytest/g" setup.py + ''; - # lots of assertion errors mainly around decorator + # skip tests due to dir requirements doCheck = false; + checkPhase = '' + pytest tests + ''; + meta = with lib; { homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index fcd72ce9b976..0695b49191b4 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.18.1"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "fd9f30ed1584b5833bc34494748adf0fb9de3ca7bacc4e88ad71989c21cba266"; + sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index fd6d3507afb8..c764b55d1f10 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -11,11 +11,6 @@ buildPythonPackage rec { sha256 = "50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" - ''; - checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index b38c1a759fe3..b3e69578d7eb 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -30,11 +30,6 @@ buildPythonPackage rec { sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" - ''; - checkInputs = [ hypothesis pygments ]; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index f2438622f6a6..19289426d71a 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -19,19 +19,14 @@ buildPythonPackage rec { pname = "pytest"; - version = "6.2.5"; + version = "6.2.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"; + sha256 = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pluggy>=0.12,<1.0.0a1" "pluggy>=0.23,<2.0" - ''; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 9df9bf8a593b..246e253e191d 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -1,12 +1,9 @@ -{ lib -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docutils , lockfile , mock , pytest_4 , testscenarios -, testtools , twine }: @@ -19,31 +16,13 @@ buildPythonPackage rec { sha256 = "bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf"; }; - nativeBuildInputs = [ - twine - ]; + nativeBuildInputs = [ twine ]; + propagatedBuildInputs = [ docutils lockfile ]; - propagatedBuildInputs = [ - docutils - lockfile - ]; - - checkInputs = [ - pytest_4 - mock - testscenarios - testtools - ]; - - # tests disabled due to incompatibilities with testtools>=2.5.0 + checkInputs = [ pytest_4 mock testscenarios ]; checkPhase = '' - runHook preCheck - pytest -k ' \ - not detaches_process_context and \ - not standard_stream_file_descriptors and \ - not test_module_has_attribute and \ - not test_module_attribute_has_duck_type' - runHook postCheck + pytest -k 'not detaches_process_context \ + and not standard_stream_file_descriptors' ''; pythonImportsCheck = [ @@ -56,10 +35,6 @@ buildPythonPackage rec { meta = with lib; { description = "Library to implement a well-behaved Unix daemon process"; homepage = "https://pagure.io/python-daemon/"; - license = with licenses; [ - gpl3Plus - asl20 - ]; - maintainers = with maintainers; [ ]; + license = [ licenses.gpl3Plus licenses.asl20 ]; }; } diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 22bf7ea7ece4..6fbda114d338 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.19.0"; + version = "0.17.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"; + sha256 = "b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/python-ethtool/default.nix index e758f4a1ef71..03c147397068 100644 --- a/pkgs/development/python-modules/python-ethtool/default.nix +++ b/pkgs/development/python-modules/python-ethtool/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-ethtool"; - version = "0.15"; + version = "0.14"; src = fetchFromGitHub { owner = "fedora-python"; repo = pname; rev = "v${version}"; - sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i"; + sha256 = "sha256-Sp7ssfLZ/1FEKrvX257pKcaureZ5mdpJ7jCEh/ft1l0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index a5c40533c169..831ae6e39668 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.10.1"; + version = "2.10.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f"; + sha256 = "sha256-N2s+mCOBzsc0RxxQKz2ixueFio300DyZNJnmp1k5UOY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 60215fa0b4cd..5d13a50a11fd 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -45,12 +45,6 @@ buildPythonPackage rec { sha256 = "sha256-TyXKlXeXMyq+bQq9ngDm0SuW+rAhDlOVlC3mDI1THwk="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp --cov test" "" - ''; - propagatedBuildInputs = [ jedi pluggy @@ -58,14 +52,14 @@ buildPythonPackage rec { setuptools ujson ] ++ lib.optional withAutopep8 autopep8 - ++ lib.optional withFlake8 flake8 - ++ lib.optional withMccabe mccabe - ++ lib.optional withPycodestyle pycodestyle - ++ lib.optional withPydocstyle pydocstyle - ++ lib.optional withPyflakes pyflakes - ++ lib.optional withPylint pylint - ++ lib.optional withRope rope - ++ lib.optional withYapf yapf; + ++ lib.optional withFlake8 flake8 + ++ lib.optional withMccabe mccabe + ++ lib.optional withPycodestyle pycodestyle + ++ lib.optional withPydocstyle pydocstyle + ++ lib.optional withPyflakes pyflakes + ++ lib.optional withPylint pylint + ++ lib.optional withRope rope + ++ lib.optional withYapf yapf; checkInputs = [ flaky @@ -76,10 +70,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # pytlint output changed - "test_lint_free_pylint" - ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; + disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py" ++ lib.optional (!withRope) "test/plugins/test_completion.py" @@ -92,6 +83,12 @@ buildPythonPackage rec { ++ lib.optional (!withRope) "test/plugins/test_rope_rename.py" ++ lib.optional (!withYapf) "test/plugins/test_yapf_format.py"; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp --cov test" "" + ''; + preCheck = '' export HOME=$(mktemp -d); ''; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index a939caf49703..63dc4018b27d 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.4"; + version = "1.0"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "018c20d3983cccfdc9cfed64407d4ba861ef3d64fe324a486f7130431afdefa7"; + sha256 = "a61fa61e41b0b85ba9e78444242fddcb3be724de1df79314e6b4766b66e4e11c"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index bd5b9e374f16..93ff39360830 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "11.0.1"; + version = "10.9.3"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "04s4hganb6x0dlfyyg9gjah5z0vxd7bxzqwgvd28hqnf0iwc2byb"; + sha256 = "sha256-x4u68O9dNhDZ+1Q+S4ou6zPqoR2/Yn5lcKgR2kyM/uo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 05fb6b682716..43ae18741e1d 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyusb"; - version = "1.2.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"; + sha256 = "7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index c3eb750783fd..ea40fc573b63 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.15"; + version = "2.1.14"; src = fetchPypi { inherit pname version; - sha256 = "8bca4077dbdc1434dcbc6759407367b6561e3505aa9555b1bc0b45989dcf50b2"; + sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; }; nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 816c46204f88..5aca8d6d66c6 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "22.2.1"; + version = "22.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242"; + sha256 = "7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 7ee51449ed90..17e1d9dbe83b 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.10.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3d20f010caa3b2c04835d6a2f66f8873b041bdaf7a76085c2a0d7890cdd65ea9"; + sha256 = "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 28e08eade43d..233eb8a44b32 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , numpy -, pytestCheckHook +, python }: buildPythonPackage rec { @@ -14,27 +14,15 @@ buildPythonPackage rec { sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0"; }; - propagatedBuildInputs = [ - numpy - ]; + propagatedBuildInputs = [ numpy ]; - checkInputs = [ - pytestCheckHook - ]; + checkPhase = '' + ${python.interpreter} setup.py test -V 1 + ''; - disabledTests = [ - # Tests don't work with current numpy - # https://github.com/python-quantities/python-quantities/pull/195 - "test_arctan2" - "test_fix" - ]; - - pythonImportsCheck = [ "quantities" ]; - - meta = with lib; { - description = "Quantities is designed to handle arithmetic and conversions of physical quantities"; + meta = { + description = "Quantities is designed to handle arithmetic and"; homepage = "https://python-quantities.readthedocs.io/"; - license = licenses.bsd2; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index cd83914669e5..7534974237a9 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "queuelib"; - version = "1.6.2"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "4b207267f2642a8699a1f806045c56eb7ad1a85a10c0e249884580d139c2fcd2"; + sha256 = "631d067c9be57e395c382d680d3653ca1452cd29e8da25c5e8d94b5c0c528c31"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index ffe784ad1995..3fbb0fb4042c 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.6.0"; + version = "1.5.3"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f7d1f629130fac597dc444df57168cf011a18abb1be2f690c8993fc5fb4c78a0"; + sha256 = "8f3708195c8a6e91c5753940fd348cd821df1389d23b889b01b3e88acf407485"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/rdflib-jsonld/default.nix b/pkgs/development/python-modules/rdflib-jsonld/default.nix index 9a0b02c329f7..6e038dd33433 100644 --- a/pkgs/development/python-modules/rdflib-jsonld/default.nix +++ b/pkgs/development/python-modules/rdflib-jsonld/default.nix @@ -17,7 +17,5 @@ buildPythonPackage rec { license = licenses.bsdOriginal; description = "rdflib extension adding JSON-LD parser and serializer"; maintainers = [ maintainers.koslambrou ]; - # incomptiable with rdflib 6.0.0, half of the test suite fails with import and atrribute errors - broken = true; }; } diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 5b16e2f744e2..261ba794e70a 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rdflib"; - version = "6.0.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "7ce4d757eb26f4dd43205ec340d8c097f29e5adfe45d6ea20238c731dc679879"; + sha256 = "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q"; }; propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 92ce64d186db..0445b02c1f33 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2021.8.28"; + version = "2021.4.4"; src = fetchPypi { inherit pname version; - sha256 = "f585cbbeecb35f35609edccb95efd95a3e35824cd7752b586503f7e6087303f1"; + sha256 = "sha256-Uro9P5uULEnX5LwQW7KFUcRAZfE5plBiq3kSvvEMmvs="; }; # Sources for different Python releases are located in same folder diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 71d4cd7425d1..c9f2600efe1e 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.1"; + version = "3.5.67"; src = fetchPypi { inherit pname version; - sha256 = "68f9324000cfc5570b5a59a92306691b5d655078a399f20bc72c2581fe903261"; + sha256 = "0cf2206c73fbca752c8bd39e12bb9ad7f2d01e6fcb2b25b9eaf94ea042fe86c9"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 4b3442657ff8..8b5514f63936 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,10 +1,7 @@ { lib -, brotli -, brotlicffi , buildPythonPackage , certifi , chardet -, charset-normalizer , fetchPypi , idna , pytest-mock @@ -12,23 +9,18 @@ , pytestCheckHook , urllib3 , isPy27 -, isPy3k -, trustme }: buildPythonPackage rec { pname = "requests"; - version = "2.26.0"; + version = "2.25.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; + sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; }; - patches = [ - # Use the default NixOS CA bundle from the certifi package - ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch - ]; + patches = [ ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch ]; postPatch = '' # Use latest idna @@ -40,18 +32,12 @@ buildPythonPackage rec { chardet idna urllib3 - ] ++ lib.optionals (isPy3k) [ - brotlicffi - charset-normalizer - ] ++ lib.optionals (isPy27) [ - brotli ]; checkInputs = [ pytest-mock pytest-xdist pytestCheckHook - trustme ]; # AttributeError: 'KeywordMapping' object has no attribute 'get' diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 6c953a4579ea..323bd8ba8685 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.9.0"; + version = "10.7.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "0lf2s7n9b31aavwl5xjl3x1pjc756s8pbk0whh5kag80z5v6qc32"; + sha256 = "1drh08cmcn8dqi0mpfwscz3ljsv2s60kyhxy6iiw5si7rf717j4p"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 82a5fd3fed67..4d72a2b3b0a1 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.7.0"; + version = "3.6.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "55bd5a11bb1fe60a5a83446e6a3e1e81b13fc671e3b660aa55912a263c1f63aa"; + sha256 = "169c343f4db71e1969169fa6f383ca7fff549aa8f83bdd3d9cbd03cea928b688"; }; # unit tests are impure diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index efd418e454d4..863b62c1bcce 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.17.16"; + version = "0.17.9"; src = fetchPypi { inherit pname version; - sha256 = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33"; + sha256 = "374373b4743aee9f6d9f40bea600fe020a7ac7ae36b838b4a6a93f72b584a14c"; }; # Tests use relative paths diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 23fa728a78a0..2b16b99bea73 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.57.0"; + version = "2.54.0"; src = fetchPypi { inherit pname version; - sha256 = "b03b340fe54f91b0533d3ce19d5b7fdf403da21b5befab70a9915466e48f6e75"; + sha256 = "sha256-uLsBHqzpcuTugRXBihdbib64l396m+os39OhP+tLLCM="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 5e7deb51362e..b59781e5c459 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -19,13 +19,6 @@ buildPythonPackage rec { sha256 = "1pf619cd3dckn3d8gh18vbn7dflvb0mzpf6frx4y950x2j3rdplk"; }; - postPatch = '' - # https://github.com/sanic-org/sanic-testing/issues/19 - substituteInPlace setup.py \ - --replace '"websockets==8.1",' '"websockets>=9.1",' \ - --replace "httpx==0.18.*" "httpx" - ''; - propagatedBuildInputs = [ httpx sanic @@ -37,6 +30,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/sanic-org/sanic-testing/issues/19 + substituteInPlace setup.py \ + --replace '"websockets==8.1",' '"websockets>=9.1",' + ''; + # `sanic` is explicitly set to null when building `sanic` itself # to prevent infinite recursion. In that case we skip running # the package at all. diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 177032aea7f3..fa7dabc27293 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -37,12 +37,12 @@ }: buildPythonPackage rec { pname = "scancode-toolkit"; - version = "21.8.4"; + version = "21.6.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c18340067244274c67e166f701c60e747e1d0bccb17efc99f277a4bc0a5a13c6"; + sha256 = "056923ce556cd6d402e5cc98567cb0331a1b6349d03ec565f8ce1c9c37f3a783"; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index e6342b90bba4..007cca251436 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.1.20210721123742"; + version = "8.1.20210716111910"; src = fetchPypi { inherit pname version; - sha256 = "1549555b9b5656cfc690716f04fb76b9fa002feb278638c446522f030632b450"; + sha256 = "3f851b385d044c58d359285ba471298b6199478a4978f892a83b15cbfb282f25"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index b34d3ff7b8de..f7d3fd63b17b 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.18.3"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "ecae99f93f4c5e9b1bf34959f4dc596c41f2f6b2fc407d9d9ddf85aebd3137ca"; + sha256 = "fbb618ca911867bce45574c1639618cdfb5d94e207432b19bc19563d80d2f171"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 2e19d2d42042..7a9643aa7d24 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -3,9 +3,7 @@ , fetchPypi , python , buildPythonPackage -, cython , gfortran -, pythran , nose , pytest , pytest-xdist @@ -15,20 +13,17 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.7.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "6b47d5fa7ea651054362561a28b1ccc8da9368a39514c1bbf6c0977a1c376764"; + sha256 = "a75b014d3294fce26852a9d04ea27b5671d86736beb34acdfc05859246260707"; }; - nativeBuildInputs = [ cython gfortran pythran ]; - - buildInputs = [ numpy.blas pybind11 ]; - - propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose pytest pytest-xdist ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ numpy.blas pybind11 ]; + propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper prePatch = '' @@ -46,6 +41,7 @@ buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; + # disable stackprotector on aarch64-darwin for now # # build error: diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 21b3f30e1323..80933043b3b9 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -1,50 +1,36 @@ -{ lib -, buildPythonApplication -, dataclasses -, fetchPypi -, libX11 -, libXinerama -, libXrandr -, pytestCheckHook -, pythonOlder -}: +{ lib, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: buildPythonApplication rec { pname = "screeninfo"; - version = "0.7"; - - disabled = pythonOlder "3.6"; + version = "0.6.7"; + disabled = isPy27; # dataclasses isn't available for python2 src = fetchPypi { inherit pname version; - sha256 = "12a97c3527e3544ac5dbd7c1204283e2653d655cbd15844c990a83b1b13ef500"; + sha256 = "1c4bac1ca329da3f68cbc4d2fbc92256aa9bb8ff8583ee3e14f91f0a7baa69cb"; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ - dataclasses - ]; + # dataclasses is a compatibility shim for python 3.6 ONLY + patchPhase = if isPy36 then "" else '' + substituteInPlace setup.py \ + --replace "\"dataclasses\"," "" + '' + '' + substituteInPlace screeninfo/enumerators/xinerama.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" + substituteInPlace screeninfo/enumerators/xrandr.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" + ''; - buildInputs = [ - libX11 - libXinerama - libXrandr - ]; + propagatedBuildInputs = lib.optional isPy36 dataclasses; - checkInputs = [ - pytestCheckHook - ]; - - disabledTestPaths = [ - # We don't have a screen - "screeninfo/test_screeninfo.py" - ]; - - pythonImportsCheck = [ "screeninfo" ]; + buildInputs = [ libX11 libXinerama libXrandr]; meta = with lib; { description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = licenses.mit; - maintainers = with maintainers; [ nickhu ]; + maintainers = [ maintainers.nickhu ]; }; } diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 87f8c3d13ae4..a4cff6d056b0 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -1,25 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, toml, tomli }: +{ lib, buildPythonPackage, fetchPypi, toml }: buildPythonPackage rec { - pname = "setuptools-scm"; - # don't update to 6.1.0 or 6.2.0, releases were pulled because of regression - # https://github.com/pypa/setuptools_scm/issues/615 + pname = "setuptools_scm"; version = "6.0.1"; src = fetchPypi { - pname = "setuptools_scm"; - inherit version; - sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; + inherit pname version; + sha256 = "d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92"; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "tomli~=1.0.0" "tomli>=1.0.0" - ''; - - # TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm - # if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages - propagatedBuildInputs = [ toml tomli ]; + propagatedBuildInputs = [ toml ]; # Requires pytest, circular dependency doCheck = false; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 7a0cebc44f92..592e23578095 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.3"; + version = "1.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "16bd40n0xy0vmsgi2499vc6mx57ksyjrm6v88bwxp49p9qrm4a23"; + sha256 = "1xysym0b1qnxck4hbj5d0l5wapwfahmkr280f6iskz2hi5j2j1yb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 52e55c71aff0..0d4d45cce5d6 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.17.5"; + version = "3.17.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1vljsd5bk12gasadkxcddwhmp38fj64x1aqi4frk3frq9lp8h3a1"; + sha256 = "sha256-Ev1vKyxexPvTT+esf9ngUcHu70Brl27P3qbS5fK2HxU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index 837271b4d57c..8fa62e835f22 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "singledispatch"; - version = "3.7.0"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092"; + sha256 = "d5bb9405a4b8de48e36709238e8b91b4f6f300f81a5132ba2531a9a738eca391"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 92712b2ce41f..6183ee7b0cba 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.10.1"; + version = "3.10.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "1m9jbn5wn892f22lxkxgahlbnwflak50hfjrydblp4agsag94nsg"; + sha256 = "sha256-FOpUO9bXrEOgYGmRmAhHnovzBafu6D2ZSLcgw0+0uzs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix index a1e54a6c5f93..921a191d5fa1 100644 --- a/pkgs/development/python-modules/slowapi/default.nix +++ b/pkgs/development/python-modules/slowapi/default.nix @@ -43,12 +43,6 @@ buildPythonPackage rec { starlette ]; - disabledTests = [ - # E AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. - "test_endpoint_request_param_invalid" - "test_endpoint_response_param_invalid" - ]; - patches = [ # Switch to poetry-core, https://github.com/laurentS/slowapi/pull/54 (fetchpatch { diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index a9364ad0d1f2..f8bd6825673c 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -3,14 +3,13 @@ , pythonOlder , fetchFromGitHub , aiohttp -, asn1 , python-dateutil , tenacity }: buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.4.7"; + version = "0.4.4"; disabled = pythonOlder "3.6"; @@ -18,7 +17,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "1hfvv3kpkc7i9mn58bjgvwjj0mi2syr8fv4r8bwbhq5sailma27j"; + sha256 = "sha256-jewibcsqWnl0OQ2oEEOSOcyyDCIGZiG4EZQfuFUbxK4="; }; postPatch = '' @@ -28,7 +27,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - asn1 python-dateutil tenacity ]; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index bbe8b1b468ee..5e86281642af 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "5.2.1"; + version = "5.2.0"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "v${version}"; - sha256 = "13a1qsb4vwrhx45hz4qcl0d7bgv20ai5vsy7cq0q6qbj212nff19"; + sha256 = "sha256-eC9BYHeACzGp382QBNgLcNMYDkHi0WXyEj/Re9ShXuA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 81d939db66be..0b0c961e7d09 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.6.0"; + version = "2.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0198d9c1934540ae9c7276d98f1048f3432160613d9d0e49398112bb21b0f0bb"; + sha256 = "8af2a51ac890d9e0ffe0cd509ba83198076e2564fb8fdc63c6814b773e70b33a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 98933759f0bb..a8f565aa3533 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -1,48 +1,33 @@ { lib -, beautifulsoup4 , buildPythonPackage -, fetchFromGitHub -, lxml -, pythonOlder -, pytz -, requests +, isPy3k +, fetchPypi , setuptools-scm +, setuptools +, requests +, lxml +, beautifulsoup4 }: buildPythonPackage rec { pname = "snscrape"; - version = "unstable-2021-08-30"; + version = "0.3.4"; - disabled = pythonOlder "3.8"; + disabled = !isPy3k; - src = fetchFromGitHub { - owner = "JustAnotherArchivist"; - repo = pname; - rev = "c76f1637ce1d7a154af83495b67ead2559cd5715"; - sha256 = "01x4961fxj1p98y6fcyxw5sv8fa87x41fdx9p31is12bdkmqxi6v"; + src = fetchPypi { + inherit pname version; + sha256 = "36ba7f95c8bf5202749189f760e591952f19c849379c35ff598aafafe5d0cfef"; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - beautifulsoup4 - lxml - requests - ] ++ lib.optionals (pythonOlder "3.9") [ - pytz - ]; - # There are no tests; make sure the executable works. checkPhase = '' export PATH=$PATH:$out/bin snscrape --help ''; - pythonImportsCheck = [ "snscrape" ]; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; meta = with lib; { homepage = "https://github.com/JustAnotherArchivist/snscrape"; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index a04a0585019f..d37ccd3e4489 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch # propagatedBuildInputs , Babel , alabaster @@ -23,6 +22,7 @@ , sphinxcontrib-websupport # check phase , html5lib +, imagemagick , pytestCheckHook , typed-ast }: @@ -39,14 +39,6 @@ buildPythonPackage rec { sha256 = "sha256-0QdgHFX4r40BDHjpi9R40lXqT4n5ZgrIny+w070LZPE="; }; - patches = [ - (fetchpatch { - # Fix tests with pygments 2.10 - url = "https://github.com/sphinx-doc/sphinx/commit/bde6c8d2effc56dc8b9098abee796167f972c306.patch"; - sha256 = "0d0ddhgrrh7z9ix0f3zrc2gjb4d73f6ffm98zl62fzv5l4fd00lr"; - }) - ]; - propagatedBuildInputs = [ Babel alabaster @@ -69,6 +61,7 @@ buildPythonPackage rec { ]; checkInputs = [ + imagemagick html5lib pytestCheckHook ] ++ lib.optionals (pythonOlder "3.8") [ @@ -81,10 +74,6 @@ buildPythonPackage rec { "test_defaults" "test_defaults_json" "test_latex_images" - - # requires imagemagick (increases build closure size), doesn't - # test anything substantial - "test_ext_imgconverter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 9f72e6f3d64f..484b692f69f8 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.8.4"; + version = "1.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8c4ec5fbedc1e6e8f4692bcc4fcd1abcfb9e8dfca8a4ded60ad811a743c22ccc"; + sha256 = "842c0a8f49c824803f7edee31cb1cabd5001a987553bec7b4681283ec9e47d4a"; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 4efdb2633f28..8ca631a2b3c9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "2.0.0"; + version = "1.0.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; + sha256 = "e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch new file mode 100644 index 000000000000..847a6e076918 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch @@ -0,0 +1,22 @@ +diff --git a/sphinxcontrib/tikz.py b/sphinxcontrib/tikz.py +index ee21113..a4f4589 100644 +--- a/sphinxcontrib/tikz.py ++++ b/sphinxcontrib/tikz.py +@@ -242,7 +242,7 @@ def render_tikz(self, node, libs='', stringsubst=False): + tf.write(latex) + tf.close() + +- system([self.builder.config.latex_engine, '--interaction=nonstopmode', ++ system(['@texLive@/bin/pdflatex', '--interaction=nonstopmode', + 'tikz-%s.tex' % shasum], + self.builder) + +@@ -281,7 +281,7 @@ def render_tikz(self, node, libs='', stringsubst=False): + '-sOutputFile=%s' % outfn, '-r' + resolution + 'x' + resolution, + '-f', 'tikz-%s.pdf' % shasum], self.builder) + elif self.builder.config.tikz_proc_suite == "pdf2svg": +- system(['pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) ++ system(['@pdf2svg@/bin/pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) + else: + self.builder._tikz_warned = True + raise TikzExtError('Error (tikz extension): Invalid configuration ' diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index cc5412fe42ff..19f386d7d278 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,18 +9,19 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.14"; + version = "0.4.13"; src = fetchPypi { inherit pname version; - sha256 = "1614a45c960b80009dd42f96689122c9c0781018a0c5ec5828f4cdc5e35b11ad"; + sha256 = "882e3ccfa202559bf77b90c93ee5eb13ec50cdd7714b3673dc6580dea7236740"; }; - postPatch = '' - substituteInPlace sphinxcontrib/tikz.py \ - --replace "config.latex_engine" "${texLive}/bin/pdflatex" \ - --replace "system(['pdf2svg'" "system(['${pdf2svg}/bin/pdf2svg'" - ''; + patches = [ + (substituteAll { + src = ./binary-paths.patch; + inherit texLive pdf2svg; + }) + ]; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 5ce41d8d7575..fa29236563e4 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.1.0"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "6c287207c7855bb581eae66ef8d990407382d5f9caccb1e0cabf909aaaf10c9b"; + sha256 = "cecb0ca0115a42bab864c199a737c859a8534a510fc7edfa33dc42abcbb5287f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index dbe54d52e3a9..5aaf4cb4a757 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.1.1"; + version = "4.2.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6551acfd6fedfebd1f938ef67d3db415b33540f8377e7de3f4d4a2a11dd1b915"; + sha256 = "03159003f6ea51458e10000091e65e77888b095dba48e64ca2b36c75a648580c"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 819f29497246..37e89abf8da9 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.23"; + version = "1.4.22"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dv8kaIH1KAib8ZOFExuWYZe7SUZTmQOW0s4TjipEdYM="; + sha256 = "sha256-7BvibNzNYNGANZpSfVmA2VmiYmmix7GzJ6HuoMqzftg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 8f5f7fd619c5..35f7d7c07c98 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -4,38 +4,36 @@ , pythonOlder , click , click-default-group -, dateutils , sqlite-fts4 , tabulate , pytestCheckHook +, pytest-runner +, black , hypothesis +, sqlite }: buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.17"; + version = "3.9.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "77acd202aa568a1f6888c5d8879f306bb3f8acedc82df0df98eb615caa491abb"; + sha256 = "a08ed62eb269e26ae9c35b9be9cd3d395b0522157e6543128a40cc5302d8aa81"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner"' "" - ''; - propagatedBuildInputs = [ click click-default-group - dateutils sqlite-fts4 tabulate ]; checkInputs = [ pytestCheckHook + pytest-runner + black hypothesis ]; @@ -45,4 +43,5 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ meatcar ]; }; + } diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index bd73a6abaead..ac39cffa393e 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,51 +1,31 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi +, isPy27 , pbr -, pytestCheckHook -, pythonOlder -, setuptools-scm +, pytest +, isPy3k }: buildPythonPackage rec { pname = "ssdp"; - version = "1.1.0"; + version = "1.0.1"; + disabled = !isPy3k; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "codingjoe"; - repo = pname; - rev = version; - sha256 = "19d2b5frpq2qkfkpz173wpjk5jwhkjpk75p8q92nm8iv41nrzljy"; + src = fetchPypi { + inherit pname version; + sha256 = "0yhjqs9jyvwmba8fi72xfi9k8pxy11wkz4iywayrg71ka3la49bk"; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + buildInputs = [ pbr ]; + checkInputs = [ pytest ]; - nativeBuildInputs = [ - setuptools-scm - ]; - - buildInputs = [ - pbr - ]; - - checkInputs = [ - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" \ - --replace "--cov=ssdp" "" - ''; - - pythonImportsCheck = [ "ssdp" ]; + # test suite uses new async primitives + doCheck = !isPy27; meta = with lib; { - description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)"; homepage = "https://github.com/codingjoe/ssdp"; + description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; - maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index e8c130692125..3079b60564f1 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -4,8 +4,6 @@ , fetchFromGitHub , isPy27 , aiofiles -, anyio -, contextlib2 , graphene , itsdangerous , jinja2 @@ -14,24 +12,22 @@ , requests , aiosqlite , databases -, pytest-asyncio , pytestCheckHook -, pythonOlder -, trio +, pytest-asyncio , typing-extensions , ApplicationServices }: buildPythonPackage rec { pname = "starlette"; - version = "0.16.0"; - disabled = pythonOlder "3.6"; + version = "0.14.2"; + disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-/NYhRRZdi6I7CtLCohAqK4prsSUayOxa6sBKIJhPv+w="; + sha256 = "0fz28czvwiww693ig9vwdja59xxs7m0yp1df32ms1hzr99666bia"; }; postPatch = '' @@ -41,27 +37,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiofiles - anyio graphene itsdangerous jinja2 python-multipart pyyaml requests - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - contextlib2 - ] ++ lib.optional stdenv.isDarwin [ - ApplicationServices - ]; + ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; checkInputs = [ aiosqlite databases pytest-asyncio pytestCheckHook - trio typing-extensions ]; @@ -69,12 +57,8 @@ buildPythonPackage rec { # fails to import graphql, but integrated graphql support is about to # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. "tests/test_graphql.py" - ]; - - disabledTests = [ - # asserts fail due to inclusion of br in Accept-Encoding - "test_websocket_headers" - "test_request_headers" + # contextfunction was removed in Jinja 3.1 + "tests/test_templates.py" ]; pythonImportsCheck = [ "starlette" ]; diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index b8bb9a36586a..ee21e9c45168 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "sure"; - version = "2.0.0"; + version = "1.4.11"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "34ae88c846046742ef074036bf311dc90ab152b7bc09c342b281cebf676727a2"; + sha256 = "3c8d5271fb18e2c69e2613af1ad400d8df090f1456081635bd3171847303cdaa"; }; buildInputs = [ rednose ]; diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index 56a3b27e7b96..5260a678e8c7 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tableaudocumentapi"; - version = "0.7"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "5b1d04817a0fba43d58e1ce23c64ad8dfe54dc029ba5ccae3908944555bb13e0"; + sha256 = "fc6d44b62cf6ea29916c073686e2f9f35c9902eccd57b8493f8d44a59a2f60d9"; }; # tests not inclued with release diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 7bd7605fc3ff..8da8d622a7b3 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "4.1.1"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "c54da0f05405f04eb67abbb1dff4448fd91428b58cb00f0f645ea36f6a927950"; + sha256 = "10fdc29bf85fa0df39a230a225bb6d093982fc0825b648a414bbc06bddd79909"; }; disabled = pythonOlder "3.2"; diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 843b9d6c3199..1ae1aa471be5 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -6,15 +6,14 @@ buildPythonPackage rec { pname = "tensorboard_plugin_profile"; - version = "2.5.0"; + version = "2.4.0"; format = "wheel"; src = fetchPypi { inherit pname version; format = "wheel"; - dist = "py3"; python = "py3"; - sha256 = "16jch9py98h7wrffdiz6j0i3kdykxdp5m0kfxr1fxy2phqanpjqk"; + sha256 = "0z6dcjvkk3pzmmmjxi2ybawnfshz5qa3ga92kqj69ld1g9k3i9bj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index aff355d963ce..27c159349b0a 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.11.1"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "962b402edbb480718054dc37027bada293972ecadfb587b89f01e2b8660a2132"; + sha256 = "89d5dac2f4e2b39758a0ff9a3b643707c95a020a6df36e70583b88297cd59cbe"; }; propagatedBuildInputs = [ ptyprocess tornado ]; diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index 492d51dcb2ca..dae40dcb993a 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "termplotlib"; - version = "0.3.8"; + version = "0.3.5"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "10k70pb7554cc2zwkcgxfak8nb7iqqw6njbnaqfdz07l4v9f6smm"; + sha256 = "1z6bw6lkbrgjyq3ndsx20gwpai4scm1q9rjh4rdz0rvja4jdcv3z"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index b8aee5ab9315..0468ee6f84b1 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "tern"; - version = "2.7.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "cfd59431cafd6adf05ccb94be964098d9301f83a03bf715def7861811e4a4b74"; + sha256 = "749c18ef493ebe3ac28624b2b26c6e38f77de2afd6a6579d2c92393d8fbdbd46"; }; preBuild = '' diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 6fefda407f90..750b070804c3 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.19.0"; + version = "0.18.3"; format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "04ihjxysfmppwa7rnz86nd89wrqks2gwvcza8707yddzfp5hh8id"; + sha256 = "1hdc5gm6dg1vw6qfs3z6mg2m94scrvjphj0lin6pi8n3zqj1h26k"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index a07117a1e46d..8ef3d9c4320f 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.5.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f"; + sha256 = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8"; }; propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ]; diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index b104bd845962..a8c6d9dcfda8 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.4"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9"; + sha256 = "ce0faf21aa77d806bbff22b107cc22cce68dc9438f97a2df32c93e9afa4ce436"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 236f3443ca6b..40654366ea21 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.8.8"; + version = "2021.6.14"; src = fetchPypi { inherit pname version; - sha256 = "8260f31c4700143e8374ff6cde5cef7fe54fc9b7313afe88329f407881901dc5"; + sha256 = "a2f83d82800a8d83cbd04340f9d65a6873a970874947a6b823b1b1238e84cba6"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 79cd5a4f500c..c658339dcd9c 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage -, callPackage , fetchFromGitHub , flit-core +, pytestCheckHook +, python-dateutil }: buildPythonPackage rec { @@ -10,11 +11,6 @@ buildPythonPackage rec { version = "1.1.0"; format = "pyproject"; - outputs = [ - "out" - "testsout" - ]; - src = fetchFromGitHub { owner = "hukkin"; repo = pname; @@ -24,24 +20,17 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - postInstall = '' - mkdir $testsout - cp -R benchmark/ pyproject.toml tests/ $testsout/ - ''; + checkInputs = [ + pytestCheckHook + python-dateutil + ]; pythonImportsCheck = [ "tomli" ]; - # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm - doCheck = false; - - passthru.tests = { - pytest = callPackage ./tests.nix { }; - }; - meta = with lib; { description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; homepage = "https://github.com/hukkin/tomli"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch SuperSandro2000 ]; + maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/pkgs/development/python-modules/tomli/tests.nix b/pkgs/development/python-modules/tomli/tests.nix deleted file mode 100644 index 5d3d67dbd128..000000000000 --- a/pkgs/development/python-modules/tomli/tests.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildPythonPackage -, tomli -, pytestCheckHook -, python-dateutil -}: - -buildPythonPackage rec { - pname = "tomli-tests"; - inherit (tomli) version; - - src = tomli.testsout; - - dontBuild = true; - dontInstall = true; - - checkInputs = [ - pytestCheckHook - python-dateutil - tomli - ]; -} diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 83215f5e0af3..6b699a2fbc24 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -3,7 +3,6 @@ , click-default-group , incremental , jinja2 -, mock , pytestCheckHook , toml , twisted @@ -12,11 +11,11 @@ buildPythonPackage rec { pname = "towncrier"; - version = "21.3.0"; + version = "19.9.0"; src = fetchPypi { inherit pname version; - sha256 = "6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe"; + sha256 = "19916889879353a8863f3de8cb1ef19b305a0b5cfd9d36159d76ca2fef08e9aa"; }; propagatedBuildInputs = [ @@ -29,12 +28,7 @@ buildPythonPackage rec { # zope.interface collision doCheck = !isPy27; - checkInputs = [ - git - mock - twisted - pytestCheckHook - ]; + checkInputs = [ git twisted pytestCheckHook ]; pythonImportsCheck = [ "towncrier" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index c660327ad72e..035bb9701bb5 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.24.3"; + version = "3.23.1"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c6c4e77705ada004283610fd6d9ba4f77bc85d235447f875df9f0ba1bc23b634"; + sha256 = "307a81ddb82bd463971a273f33e9533a24ed22185f27db8ce3386bff27d324e3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index babea4357a79..fe2eb35d4df7 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.62.2"; + version = "4.61.1"; src = fetchPypi { inherit pname version; - sha256 = "a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5"; + sha256 = "24be966933e942be5f074c29755a95b315c69a91f839a29139bf26ffffe2d3fd"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 23412d0a6940..3bc05897af66 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.1.0"; + version = "5.0.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d"; + sha256 = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396"; }; checkInputs = [ glibcLocales pytest mock ]; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 103878ccac69..556ca3e2e6ed 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.9.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; + sha256 = "3dcfbe186bf33d146347c6180b67564257f2708960027ab6d24fea2865daabca"; }; checkInputs = [ @@ -42,12 +42,10 @@ buildPythonPackage rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "trustme" ]; - - meta = with lib; { + meta = { description = "High quality TLS certs while you wait, for the discerning tester"; homepage = "https://github.com/python-trio/trustme"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ catern ]; + license = with lib.licenses; [ mit asl20 ]; + maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 75e1ee68e4b3..d5ddf8f58802 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.0.5"; + version = "5.8.9"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3ccb98dbf905d99991ed0151e13c91cd9267e4aa104fa40097df4e02580dadfc"; + sha256 = "5f14e9615ff91e18c146c74eb4c1cd56112662361a52c73389f15baced0bef18"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index f5809b0a9b90..da5c4a9c3f51 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,13 +14,12 @@ buildPythonPackage rec { pname = "twine"; - version = "3.4.2"; - format = "pyproject"; + version = "3.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936"; + sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 4b3f9c1726c8..2fc5cc0d4503 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.1.2"; + version = "2021.1.0"; src = fetchPypi { inherit pname version; - sha256 = "448828a06f2aaa840e57364d866c661645a045e532f817e4f10c8c3ab2b66651"; + sha256 = "0hzjz6wgzfyybcfli4rpmfxk49cn6x3slbs2xdmlnckvlahs5pxd"; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 939ca25eb1a3..fd8a25a485b9 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.10.0.2"; + version = "3.10.0.0"; src = fetchPypi { inherit pname version; - sha256 = "49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"; + sha256 = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 363e1d12a55e..c5514cfa53a4 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "2.1"; # version needs to be compatible with APScheduler + version = "2.1"; propagatedBuildInputs = [ pytz ]; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index c7e11ab6c258..a762ec55ee36 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.16.0"; + version = "0.15.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"; + sha256 = "2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 10e1ebbc87bc..2bcfa88b6ae4 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,9 +1,6 @@ -{ stdenv -, lib -, buildPythonPackage -, pythonOlder -, isPy27 -, backports-entry-points-selectable +{ buildPythonPackage +, appdirs +, contextlib2 , cython , distlib , fetchPypi @@ -11,23 +8,26 @@ , flaky , importlib-metadata , importlib-resources +, isPy27 +, lib , pathlib2 -, platformdirs , pytest-freezegun , pytest-mock , pytest-timeout , pytestCheckHook +, pythonOlder , setuptools-scm , six +, stdenv }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.7.2"; + version = "20.4.7"; src = fetchPypi { inherit pname version; - sha256 = "9ef4e8ee4710826e98ff3075c9a4739e2cb1040de6a2a8d35db0055840dc96a0"; + sha256 = "14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467"; }; nativeBuildInputs = [ @@ -35,12 +35,13 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - backports-entry-points-selectable + appdirs distlib filelock - platformdirs six - ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [ + ] ++ lib.optionals isPy27 [ + contextlib2 + ] ++ lib.optionals (isPy27 && !stdenv.hostPlatform.isWindows) [ pathlib2 ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 9ebbfcd77e87..849f25ef0df3 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -1,26 +1,15 @@ -{ lib -, stdenv -, buildPythonPackage -, substituteAll -, fetchPypi -, cython -, fontconfig -, freetype-py -, hsluv -, kiwisolver -, libGL -, numpy -, setuptools-scm -, setuptools-scm-git-archive -}: +{ lib, buildPythonPackage, substituteAll, stdenv, + fetchPypi, numpy, cython, freetype-py, fontconfig, libGL, + setuptools-scm, setuptools-scm-git-archive + }: buildPythonPackage rec { pname = "vispy"; - version = "0.8.1"; + version = "0.6.6"; src = fetchPypi { inherit pname version; - sha256 = "6e482e68487f5384205d349f288580d6287fd690df4cdc3ad4c573afc39990f1"; + sha256 = "6f3c4d00be9e6761c046d520a86693d78a0925d47eeb2fc095e95dac776f74ee"; }; patches = [ @@ -32,37 +21,15 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython - setuptools-scm - setuptools-scm-git-archive - ]; - - buildInputs = [ - libGL + cython setuptools-scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ - fontconfig - freetype-py - hsluv - kiwisolver - numpy + numpy freetype-py fontconfig libGL ]; doCheck = false; # otherwise runs OSX code on linux. - - pythonImportsCheck = [ - "vispy" - "vispy.color" - "vispy.geometry" - "vispy.gloo" - "vispy.glsl" - "vispy.io" - "vispy.plot" - "vispy.scene" - "vispy.util" - "vispy.visuals" - ]; + pythonImportsCheck = [ "vispy" ]; meta = with lib; { homepage = "https://vispy.org/index.html"; diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index 5dc8bc2254d4..43e54bda9d6c 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "vivisect"; - version = "1.0.4"; + version = "0.2.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bd47b2cf5874cd2f74e6c36b8a97bf301785bacf9ac0297bbe78ec1b8c86c755"; + sha256 = "8fc4d2097a1d0d8d97aa8c540984cb52432df759f04f2281a21a4e1b7d1a95a7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 1a1c6a33acb3..0a75600bb0f0 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.11.0"; + version = "8.10.2"; src = fetchPypi{ inherit pname version; - sha256 = "cfde0515a3fa4d224aad5461135372f3441ae1a64717ae6bff5e23509d70b0bd"; + sha256 = "e9f7d525a6e88ebff41406409a5c31f79bb008f524fc63a61dc74bac6a1ac887"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index dff14d15b901..d3881032af13 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -1,99 +1,45 @@ -{ stdenv -, lib +{ lib +, stdenv , rustPlatform -, callPackage , fetchFromGitHub , buildPythonPackage , libiconv -, llvm_11 -, libffi -, libxml2 -, ncurses -, zlib }: -let - common = - { pname - , buildAndTestSubdir - , cargoHash - , extraNativeBuildInputs ? [ ] - , extraBuildInputs ? [ ] - }: buildPythonPackage rec { - inherit pname; - version = "1.0.0"; - format = "pyproject"; +buildPythonPackage rec { + pname = "wasmer"; + version = "1.0.0"; - outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; - - src = fetchFromGitHub { - owner = "wasmerio"; - repo = "wasmer-python"; - rev = version; - hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - sha256 = cargoHash; - }; - - nativeBuildInputs = (with rustPlatform; [ cargoSetupHook maturinBuildHook ]) - ++ extraNativeBuildInputs; - - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] - ++ extraBuildInputs; - - inherit buildAndTestSubdir; - - postInstall = lib.optionalString (pname == "wasmer") '' - mkdir $testsout - cp -R tests $testsout/tests - ''; - - # check in passthru.tests.pytest because all packages are required to run the tests - doCheck = false; - - passthru.tests = lib.optionalAttrs (pname == "wasmer") { - pytest = callPackage ./tests.nix { }; - }; - - pythonImportsCheck = [ "${lib.replaceStrings ["-"] ["_"] pname}" ]; - - meta = with lib; { - description = "Python extension to run WebAssembly binaries"; - homepage = "https://github.com/wasmerio/wasmer-python"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; - }; -in -rec { - wasmer = common { - pname = "wasmer"; - buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wasmer-python"; + rev = version; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; }; - wasmer-compiler-cranelift = common { - pname = "wasmer-compiler-cranelift"; - buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-cHgAUwqnbQV3E5nUYGYQ48ntbIFfq4JXfU5IrSFZ3zI="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; }; - wasmer-compiler-llvm = common { - pname = "wasmer-compiler-llvm"; - buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-Jm22CC5S3pN/vdVvsGZdvtoAgPzWVLto8wavSJdxY3A="; - extraNativeBuildInputs = [ llvm_11 ]; - extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; - }; + format = "pyproject"; - wasmer-compiler-singlepass = common { - pname = "wasmer-compiler-singlepass"; - buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-lmqEo3+jYoN+4EEYphcoE4b84jdFcvYVycjrJ956Bh8="; + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + buildAndTestSubdir = "packages/api"; + + doCheck = false; + + pythonImportsCheck = [ "wasmer" ]; + + meta = with lib; { + description = "Python extension to run WebAssembly binaries"; + homepage = "https://github.com/wasmerio/wasmer-python"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/wasmer/tests.nix b/pkgs/development/python-modules/wasmer/tests.nix deleted file mode 100644 index bdb3adfe93ce..000000000000 --- a/pkgs/development/python-modules/wasmer/tests.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildPythonPackage -, wasmer -, pytestCheckHook -, wasmer-compiler-cranelift -, wasmer-compiler-llvm -, wasmer-compiler-singlepass -}: - -buildPythonPackage rec { - pname = "wasmer-tests"; - inherit (wasmer) version; - - src = wasmer.testsout; - - dontBuild = true; - dontInstall = true; - - checkInputs = [ - pytestCheckHook - wasmer - wasmer-compiler-cranelift - wasmer-compiler-llvm - wasmer-compiler-singlepass - ]; -} diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 7dab01b3ca09..921ed5af4aa1 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.5"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "5563b005907613430ef3d4aaac9c78600dd5704e84764cb6deda4b3d72807f09"; + sha256 = "sha256-5SNqjoYCq220uHNmTC01bDZas8rJb73sSXCtYWQV3UU="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index 63ad60c9f084..6db909992f48 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.0.1"; + version = "8.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bcce022250ee97cfbb0ad07b02388ac90a226ef4b479ec84317152345a565614"; + sha256 = "0xy6na8axc5wnp2wg3kvqbpl2iv0hx0rsnlrmrgkgp88znx6cmjn"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 898fa4556ec3..d3dce5018d97 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -8,16 +8,15 @@ , pytest-timeout , pytest-xprocess , pytestCheckHook -}: + }: buildPythonPackage rec { - pname = "werkzeug"; + pname = "Werkzeug"; version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { - pname = "Werkzeug"; - inherit version; + inherit pname version; sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; }; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index ee07adeb9d5b..675461a63cc6 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.19.0"; + version = "0.18.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3a365ce09127fc841ba88baa63f37ca61376ffe389a6c5e66d52f2c88c23a62b"; + sha256 = "5d2e72a228286fcf60f66e16876bd27629a1a70bf64822c565f16515c4d10284"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index b623fc37c224..c975218e5b1d 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.9.1"; + version = "3.8.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "76cee167e81fc3cc0e0cc696fe58cadd039e19a774c8f4d2e5c0fea724c7aaca"; + sha256 = "8e25a9d73acf57ade798fc67841277dbbdb81ced390e6f84362370305b127426"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index c94f018382a6..b8c60f1b6425 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -9,6 +9,7 @@ , xmlsec , pkgconfig , setuptools-scm +, toml , lxml , hypothesis }: @@ -27,7 +28,7 @@ buildPythonPackage rec { ./reset-lxml-in-tests.patch ]; - nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ]; + nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm toml ]; buildInputs = [ xmlsec libxslt libxml2 libtool ]; diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index 97da02102c7f..d2b66cb073d7 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "yamlloader"; - version = "1.1.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8a297c7a197683ba02e5e2b882ffd6c6180d01bdefb534b69cd3962df020bfe6"; + sha256 = "e96dc3dc6895d814c330c054c966d993fc81ef1dbf5a30a4bdafeb256359e058"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index 9611b2722295..42bde9909b8c 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "yt"; - version = "4.0.1"; + version = "3.6.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6219cbf971871320a13679a57722c0363e50db5e6d4d64ea9d197461b2a7f70f"; + sha256 = "be454f9d05dcbe0623328b4df43a1bfd1f0925e516be97399710452931a19bb0"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 77a579eba9c7..6ec5fda2ca58 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.19.1"; + version = "0.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1b8a050e2208b3d05359106d8c44c3d62e60edf6753529bd8a207788a6caeb95"; + sha256 = "sha256-RH0ballPSZQvesdUEsulnBkbbzVA2YrGWhMzRFvuwW0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index a26fa1dfef3c..9fc5589d281d 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.9.4"; + version = "2.9.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5544c47bc2a35f8e8af58bee92378518018b484ba550e997759d18f40fa75719"; + sha256 = "688afec069e0f85b87c1ef4572766f998309c64ab7bea1884cec60e92d109544"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 521bca4ece8c..a6a00ad821b8 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -1,27 +1,32 @@ -{ lib -, stdenv +{ lib, stdenv , fetchPypi +, fetchpatch , buildPythonPackage , zope_testrunner , manuel , docutils -, pygments +, pythonAtLeast }: buildPythonPackage rec { pname = "ZConfig"; - version = "3.6.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU="; + sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550"; }; - patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; + patches = [ + # fixes 3.8+ logger validation issues, has been merged into master, remove next bump + (fetchpatch { + url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch"; + sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij"; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; - checkInputs = [ pygments ]; meta = with lib; { description = "Structured Configuration Library"; diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index be522214164b..1279bb804de6 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -7,12 +7,11 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, zigpy -}: +, zigpy }: buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.14.0"; + version = "0.13.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = version; - sha256 = "sha256-veAkaBHPYgVd3iwvnH/A2upYX4T/qXXNRcaysbRQvNI="; + sha256 = "Krdqb9bYKwUC2cdNppB2+tLwWjzmzIHhXnQ1KRduofU="; }; buildInputs = [ @@ -37,12 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # assertion failure - # E assert ff:ff:ff:ff:ff:ff:ff:ff is None - "test_startup_api_mode_config_fails" - ]; - meta = with lib; { description = "A library which communicates with XBee radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-xbee"; diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index f8413d9aa17f..474e7f309e34 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.5.4"; + version = "0.5.3"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "0jki9qmjazh0by02c0w17dyaz0nl3gzjiy064mj6pi502d175831"; + sha256 = "sha256-nnA/gVXBpCZFkspcO6kF3ZkEDu0vV0d9p1WNGVrN0u8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index af498c59cf06..7dab5cda6cc5 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.37.1"; + version = "0.36.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-tDpu6tv8qwIPB3G5GKURtDi6QOYxF5jEVbzmJ2Px5W4="; + sha256 = "0rfif8ds6m9ndxnc0f02fivc2pwidf476ylyx9y2b1sa2qz36z5w"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index c070e2327772..7ef26dbd7606 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -2,22 +2,31 @@ , buildPythonPackage , fetchPypi , setuptools-scm +, pytest +, pytest-flake8 , more-itertools +, toml }: buildPythonPackage rec { pname = "zipp"; - version = "3.5.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"; + sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools ]; + checkInputs = [ pytest pytest-flake8 ]; + + checkPhase = '' + pytest + ''; + # Prevent infinite recursion with pytest doCheck = false; @@ -25,6 +34,5 @@ buildPythonPackage rec { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; - maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index e4f1e403cd97..aa7cc6c97ebd 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , python +, pythonAtLeast , zope_testrunner , transaction , six @@ -15,43 +16,46 @@ }: buildPythonPackage rec { - pname = "ZODB"; - version = "5.6.0"; + pname = "ZODB"; + version = "5.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; + }; - # remove broken test - postPatch = '' - rm -vf src/ZODB/tests/testdocumentation.py - ''; + # remove broken test + postPatch = '' + rm -vf src/ZODB/tests/testdocumentation.py + ''; - propagatedBuildInputs = [ - transaction - six - zope_interface - zodbpickle - zconfig - persistent - zc_lockfile - BTrees - ]; + # ZConfig 3.5.0 is not compatible with Python 3.8 + disabled = pythonAtLeast "3.8"; - checkInputs = [ - manuel - zope_testrunner - ]; + propagatedBuildInputs = [ + transaction + six + zope_interface + zodbpickle + zconfig + persistent + zc_lockfile + BTrees + ]; - checkPhase = '' - ${python.interpreter} -m zope.testrunner --test-path=src [] - ''; + checkInputs = [ + manuel + zope_testrunner + ]; - meta = with lib; { - description = "Zope Object Database: object database and persistence"; - homepage = "https://pypi.python.org/pypi/ZODB"; - license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; - }; + checkPhase = '' + ${python.interpreter} -m zope.testrunner --test-path=src [] + ''; + + meta = with lib; { + description = "Zope Object Database: object database and persistence"; + homepage = "https://pypi.python.org/pypi/ZODB"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; } diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index a5cbcffe4336..41c15fcd1307 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "5.0.1"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "32cbe426ba8fa7b62ce5b211f80f0718a0c749cc7ff09e3f4b43a57f7ccdf5e5"; + sha256 = "df541a0501c79123f9ac30c6686a9e45c2690c5c3ae4f2b7f4c6fd1a3aaaf614"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 2d1a5880d0de..67e8a191d97a 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.4.0"; + version = "4.3.5"; src = fetchPypi { inherit pname version; - sha256 = "b244904c5148067c3f1899d29a2c1a28faca747b143192c0f825e6bf3170a347"; + sha256 = "a66a0d94e5b081d5d695e66d6667e91e74d79e273eee95c1747717ba9cb70792"; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 50e05e4829a8..d0b5911b71d9 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -7,18 +7,27 @@ stdenv.mkDerivation rec { pname = "gnum4"; - version = "1.4.19"; + version = "1.4.18"; src = fetchurl { url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; + sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; }; doCheck = false; configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; - patches = lib.optional stdenv.isDarwin ./darwin-secure-format.patch; + # Upstream is aware of it; it may be in the next release. + patches = + [ + ./s_isdir.patch + (fetchurl { + url = "https://sources.debian.org/data/main/m/m4/1.4.18-2/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch"; + sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; + }) + ] + ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { homepage = "https://www.gnu.org/software/m4/"; diff --git a/pkgs/development/tools/misc/gnum4/s_isdir.patch b/pkgs/development/tools/misc/gnum4/s_isdir.patch new file mode 100644 index 000000000000..a009a4ba4465 --- /dev/null +++ b/pkgs/development/tools/misc/gnum4/s_isdir.patch @@ -0,0 +1,14 @@ +Fails to build with glibc 2.12.1 without this patch. + +http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html + +--- a/src/path.c ++++ b/src/path.c +@@ -22,6 +22,7 @@ + /* Handling of path search of included files via the builtins "include" + and "sinclude". */ + + #include "m4.h" ++#include "sys/stat.h" + + struct includes diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 9e7e39f3b721..5ab47c8aa8de 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.11.3"; + version = "0.10.6"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-jWkrjFQg0EqM+e/IT2n2E4lGL2kT/Wz7r5BLlzvWSO0="; + hash = "sha256-qWDrdS1zxe5woQSKLHhDSGJ1KF4SHk1mhaQApJXCCO4="; }; - cargoHash = "sha256-+kXwMGeE2HD59EU0Dzvg8I6LcHiPV7SKSFqnCTfkKwY="; + cargoHash = "sha256-NEXgb7yWQkqbbofd3oYQ5n+CmfaM2cWj8HwufrcRKkc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix index 18e112346912..33e78bc15231 100644 --- a/pkgs/misc/pylode/default.nix +++ b/pkgs/misc/pylode/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pyLODE"; - version = "2.12.0"; + version = "2.8.6"; src = fetchFromGitHub { owner = "RDFLib"; repo = pname; rev = version; - sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8="; + sha256 = "0zbk5lj9vlg32rmvw1himlw63kxd7sim7nzglrjs5zm6vpi4x5ch"; }; propagatedBuildInputs = with python3Packages; [ @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { jinja2 markdown rdflib + rdflib-jsonld requests six beautifulsoup4 diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index b903bc461560..1e9331480007 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -16,10 +16,6 @@ let tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; }; - netbsdSetupHook = makeSetupHook { - name = "netbsd-setup-hook"; - } ./setup-hook.sh; - otherSplices = { selfBuildBuild = pkgsBuildBuild.netbsd; selfBuildHost = pkgsBuildHost.netbsd; @@ -64,7 +60,7 @@ in lib.makeScopeWithSplicing extraPaths = [ ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install tsort lorder mandoc groff statHook rsync ]; @@ -122,7 +118,7 @@ in lib.makeScopeWithSplicing version = "9.2"; buildInputs = with self; []; - nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook rsync ]; + nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook rsync ]; skipIncludesPhase = true; @@ -130,7 +126,6 @@ in lib.makeScopeWithSplicing patchShebangs configure ${self.make.postPatch} ''; - buildPhase = '' runHook preBuild @@ -138,7 +133,6 @@ in lib.makeScopeWithSplicing runHook postBuild ''; - installPhase = '' runHook preInstall @@ -149,7 +143,6 @@ in lib.makeScopeWithSplicing runHook postInstall ''; - extraPaths = with self; [ make.src ] ++ make.extraPaths; }; @@ -172,7 +165,7 @@ in lib.makeScopeWithSplicing HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc"; nativeBuildInputs = with buildPackages.netbsd; commonDeps ++ [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal rsync ]; @@ -245,7 +238,7 @@ in lib.makeScopeWithSplicing sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = with self; [ mtree.src make.src ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal mandoc groff rsync ]; @@ -269,7 +262,7 @@ in lib.makeScopeWithSplicing sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "9.2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook rsync + bsdSetupHook rsync ]; propagatedBuildInputs = with self; compatIfNeeded; extraPaths = with self; [ @@ -305,7 +298,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -327,7 +320,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -338,7 +331,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -440,7 +433,7 @@ in lib.makeScopeWithSplicing HOSTPROG = "tic"; buildInputs = with self; compatIfNeeded; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install mandoc groff nbperf ]; @@ -472,7 +465,7 @@ in lib.makeScopeWithSplicing sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install mandoc byacc flex rsync ]; buildInputs = with self; compatIfNeeded; @@ -490,7 +483,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install mandoc groff rsync nbperf rpcgen ]; @@ -517,7 +510,7 @@ in lib.makeScopeWithSplicing propagatedBuildInputs = with self; [ include ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install tsort lorder statHook rsync uudecode config genassym ]; @@ -580,7 +573,7 @@ in lib.makeScopeWithSplicing sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; extraPaths = with self; [ common libc.src sys.src ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal byacc install tsort lorder mandoc statHook ]; @@ -614,7 +607,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install tsort lorder mandoc statHook nbperf tic ]; buildInputs = with self; compatIfNeeded; @@ -677,7 +670,7 @@ in lib.makeScopeWithSplicing makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install tsort lorder rpcgen statHook ]; @@ -755,7 +748,7 @@ in lib.makeScopeWithSplicing sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install mandoc groff flex byacc genassym gencat lorder tsort statHook rsync @@ -793,7 +786,7 @@ in lib.makeScopeWithSplicing (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook + bsdSetupHook makeMinimal install mandoc groff flex byacc genassym gencat lorder tsort statHook rsync rpcgen diff --git a/pkgs/os-specific/bsd/netbsd/setup-hook.sh b/pkgs/os-specific/bsd/netbsd/setup-hook.sh deleted file mode 100644 index 17a8d6fca84a..000000000000 --- a/pkgs/os-specific/bsd/netbsd/setup-hook.sh +++ /dev/null @@ -1,10 +0,0 @@ -mergeNetBSDSourceDir() { - # merge together all extra paths - # there should be a better way to do this - chmod -R u+w $BSDSRCDIR - for path in $extraPaths; do - rsync -Er --chmod u+w $path/ $BSDSRCDIR/ - done -} - -postUnpackHooks+=(mergeNetBSDSourceDir) diff --git a/pkgs/os-specific/bsd/setup-hook.sh b/pkgs/os-specific/bsd/setup-hook.sh index ec23620b194b..98fee66f5dfe 100644 --- a/pkgs/os-specific/bsd/setup-hook.sh +++ b/pkgs/os-specific/bsd/setup-hook.sh @@ -63,9 +63,15 @@ addMakeFlags() { } setBSDSourceDir() { + # merge together all extra paths + # there should be a better way to do this sourceRoot=$PWD/$sourceRoot export BSDSRCDIR=$sourceRoot export _SRC_TOP_=$BSDSRCDIR + chmod -R u+w $sourceRoot + for path in $extraPaths; do + rsync -Er --chmod u+w $path/ $sourceRoot/ + done cd $sourceRoot if [ -d "$BSD_PATH" ] diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 38bb2c4ebd07..1ce4a21e2424 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -35,12 +35,7 @@ let options = { debug = { - # Necessary for BTF - DEBUG_INFO = mkMerge [ - (whenOlder "5.2" (if (features.debug or false) then yes else no)) - (whenAtLeast "5.2" yes) - ]; - DEBUG_INFO_BTF = whenAtLeast "5.2" yes; + DEBUG_INFO = if (features.debug or false) then yes else no; DEBUG_KERNEL = yes; DEBUG_DEVRES = no; DYNAMIC_DEBUG = yes; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 12eca63e2162..77add0aef539 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, gawk, python3Minimal, zlib, pahole +, libelf, cpio, elfutils, zstd, gawk, python3Minimal , writeTextFile }: @@ -316,12 +316,10 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] - ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] + ++ optional (lib.versionAtLeast version "5.2") cpio ++ optional (lib.versionAtLeast version "5.8") elfutils ; - buildInputs = optional (lib.versionAtLeast version "5.2") zlib; - hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; # Absolute paths for compilers avoid any PATH-clobbering issues. diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index 5500076940d5..2abe07b0964e 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.13.1"; + version = "1.13.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0USQMBXZrbz4GtXLNsSti9ohUOqqo0OCtVz+0Uk9ndI="; + sha256 = "sha256-felGKpdihOi4TCp95T1ti7fErQVphP0vYGRKEwlQt4Q="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ; diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index b6dd0b987201..ef322524ca92 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -18,9 +18,9 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace setup.cfg \ - --replace "requests>=2.11.1,<2.25.0" "requests" \ - --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ - --replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" + --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \ + --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ + --replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" ''; patches = [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3a9f7c7480d0..7bf04b65c723 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -172,9 +172,7 @@ in with py.pkgs; buildPythonApplication rec { --replace "awesomeversion==21.4.0" "awesomeversion" \ --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ - --replace "httpx==0.18.2" "httpx>=0.18.2" \ --replace "pip>=8.0.3,<20.3" "pip" \ - --replace "requests==2.25.1" "requests>=2.25.1" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1223b0a50739..0acf8b099891 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1017,11 +1017,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { pname = "libXft"; - version = "2.3.4"; + version = "2.3.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2"; - sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp"; + url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; + sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9eaa910169a5..ec43ae9d59d4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -200,19 +200,11 @@ self: super: ++ malloc0ReturnsNullCrossFlag; patches = [ - # The following three patches add color emoji rendering support. + # Adds color emoji rendering support. # https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1 (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/723092ece088559f1af299236305911f4ee4d450.patch"; - sha256 = "1y5s6x5b7n2rqxapdx65zlcz35s7i7075qxkfnj859hx7k5ybx53"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/e0fc4ce7e87ab9c4b47e5c8e693f070dfd0d2f7b.patch"; - sha256 = "1x7cbhdrprrmngyy3l3b45bz6717dzp881687h5hxa4g2bg5c764"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/d385aa3e5320d18918413df0e8aef3a713a47e0b.patch"; - sha256 = "1acnks2g88hari2708x93ywa9m2f4lm60yhn9va45151ma2qb5n0"; + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/fe41537b5714a2301808eed2d76b2e7631176573.patch"; + sha256 = "045lp1q50i2wlwvpsq6ycxdc6p3asm2r3bk2nbad1dwkqw2xf9jc"; }) ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index b24dc504288e..9b36ca362599 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -188,7 +188,7 @@ mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2 -mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 2d8d784982a8..79bf21ab4730 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -6,14 +6,12 @@ done mkdir $out -{ - echo "export SHELL=$shell" - echo "initialPath=\"$initialPath\"" - echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" - echo "defaultBuildInputs=\"$defaultBuildInputs\"" - echo "$preHook" - cat "$setup" -} > "$out/setup" +echo "export SHELL=$shell" > $out/setup +echo "initialPath=\"$initialPath\"" >> $out/setup +echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup +echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup +echo "$preHook" >> $out/setup +cat "$setup" >> $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv. diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index e52ea8bdd66c..4431936e3d40 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,7 +1,7 @@ set -eu set -o pipefail -if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then +if [ -n "${BASH_VERSINFO-}" ] && [ "${BASH_VERSINFO-}" -lt 4 ]; then echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})" echo "Please install Bash 4 or greater to continue." exit 1 @@ -329,10 +329,6 @@ declare -a pkgTargetHookVars=(envTargetTargetHook) declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) -# those variables are declared here, since where and if they are used varies -# shellcheck disable=SC2034 -declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks - # Add env hooks for all sorts of deps with the specified host offset. addEnvHooks() { local depHostOffset="$1" @@ -374,14 +370,14 @@ declare -a allPlatOffsets=(-1 0 1) # implements. findInputs() { local -r pkg="$1" - local -r hostOffset="$2" - local -r targetOffset="$3" + local -ri hostOffset="$2" + local -ri targetOffset="$3" # Sanity check - (( hostOffset <= targetOffset )) || exit -1 + (( "$hostOffset" <= "$targetOffset" )) || exit -1 - local varVar="${pkgAccumVarVars[hostOffset + 1]}" - local varRef="$varVar[$((targetOffset - hostOffset))]" + local varVar="${pkgAccumVarVars[$hostOffset + 1]}" + local varRef="$varVar[\$targetOffset - \$hostOffset]" local var="${!varRef}" unset -v varVar varRef @@ -408,21 +404,21 @@ findInputs() { # offsets to current offset local -i mapOffsetResult function mapOffset() { - local -r inputOffset="$1" - if (( inputOffset <= 0 )); then - local -r outputOffset=$((inputOffset + hostOffset)) + local -ri inputOffset="$1" + if (( "$inputOffset" <= 0 )); then + local -ri outputOffset="$inputOffset + $hostOffset" else - local -r outputOffset=$((inputOffset - 1 + targetOffset)) + local -ri outputOffset="$inputOffset - 1 + $targetOffset" fi mapOffsetResult="$outputOffset" } # Host offset relative to that of the package whose immediate # dependencies we are currently exploring. - local relHostOffset + local -i relHostOffset for relHostOffset in "${allPlatOffsets[@]}"; do # `+ 1` so we start at 0 for valid index - local files="${propagatedDepFilesVars[relHostOffset + 1]}" + local files="${propagatedDepFilesVars[$relHostOffset + 1]}" # Host offset relative to the package currently being # built---as absolute an offset as will be used. @@ -500,11 +496,11 @@ done # Add package to the future PATH and run setup hooks activatePackage() { local pkg="$1" - local -r hostOffset="$2" - local -r targetOffset="$3" + local -ri hostOffset="$2" + local -ri targetOffset="$3" # Sanity check - (( hostOffset <= targetOffset )) || exit -1 + (( "$hostOffset" <= "$targetOffset" )) || exit -1 if [ -f "$pkg" ]; then source "$pkg" @@ -521,7 +517,7 @@ activatePackage() { addToSearchPath _PATH "$pkg/bin" fi - if (( hostOffset <= -1 )); then + if [[ "$hostOffset" -le -1 ]]; then addToSearchPath _XDG_DATA_DIRS "$pkg/share" fi @@ -535,13 +531,13 @@ activatePackage() { } _activatePkgs() { - local hostOffset targetOffset + local -i hostOffset targetOffset local pkg for hostOffset in "${allPlatOffsets[@]}"; do - local pkgsVar="${pkgAccumVarVars[hostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}" for targetOffset in "${allPlatOffsets[@]}"; do - (( hostOffset <= targetOffset )) || continue + (( "$hostOffset" <= "$targetOffset" )) || continue local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]" local pkgsSlice="${!pkgsRef}[@]" for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do @@ -563,14 +559,14 @@ _activatePkgs # with this information to the relevant env hook array, but bash # doesn't have closures, so it's easier to just pass this in. _addToEnv() { - local depHostOffset depTargetOffset + local -i depHostOffset depTargetOffset local pkg for depHostOffset in "${allPlatOffsets[@]}"; do - local hookVar="${pkgHookVarVars[depHostOffset + 1]}" - local pkgsVar="${pkgAccumVarVars[depHostOffset + 1]}" + local hookVar="${pkgHookVarVars[$depHostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}" for depTargetOffset in "${allPlatOffsets[@]}"; do - (( depHostOffset <= depTargetOffset )) || continue + (( "$depHostOffset" <= "$depTargetOffset" )) || continue local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" if [[ -z "${strictDeps-}" ]]; then @@ -582,12 +578,12 @@ _addToEnv() { # # TODO(@Ericson2314): Don't special-case native compilation for pkg in \ - "${pkgsBuildBuild[@]}" \ - "${pkgsBuildHost[@]}" \ - "${pkgsBuildTarget[@]}" \ - "${pkgsHostHost[@]}" \ - "${pkgsHostTarget[@]}" \ - "${pkgsTargetTarget[@]}" + ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \ + ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \ + ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \ + ${pkgsHostHost+"${pkgsHostHost[@]}"} \ + ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ + ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} do if [[ "$visitedPkgs" = *"$pkg"* ]]; then continue @@ -662,7 +658,7 @@ export NIX_INDENT_MAKE=1 if [ -z "${NIX_BUILD_CORES:-}" ]; then NIX_BUILD_CORES="1" -elif (( NIX_BUILD_CORES <= 0 )); then +elif [ "$NIX_BUILD_CORES" -le 0 ]; then NIX_BUILD_CORES=$(nproc 2>/dev/null || true) if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then : @@ -675,11 +671,11 @@ export NIX_BUILD_CORES # Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly. # Leave it in impure shells for convenience. -if [[ -z "${NIX_SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then +if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then export NIX_SSL_CERT_FILE=/no-cert-file.crt fi # Another variant left for compatibility. -if [[ -z "${SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then +if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then export SSL_CERT_FILE=/no-cert-file.crt fi @@ -1014,19 +1010,17 @@ configurePhase() { configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi - if [[ -f "$configureScript" ]]; then - # Add --disable-dependency-tracking to speed up some builds. - if [ -z "${dontAddDisableDepTrack:-}" ]; then - if grep -q dependency-tracking "$configureScript"; then - configureFlags="--disable-dependency-tracking $configureFlags" - fi + # Add --disable-dependency-tracking to speed up some builds. + if [ -z "${dontAddDisableDepTrack:-}" ]; then + if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then + configureFlags="--disable-dependency-tracking $configureFlags" fi + fi - # By default, disable static builds. - if [ -z "${dontDisableStatic:-}" ]; then - if grep -q enable-static "$configureScript"; then - configureFlags="--disable-static $configureFlags" - fi + # By default, disable static builds. + if [ -z "${dontDisableStatic:-}" ]; then + if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then + configureFlags="--disable-static $configureFlags" fi fi @@ -1034,7 +1028,7 @@ configurePhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $configureFlags "${configureFlagsArray[@]}" + $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"} ) echoCmd 'configure flags' "${flagsArray[@]}" # shellcheck disable=SC2086 @@ -1064,8 +1058,8 @@ buildPhase() { local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags "${makeFlagsArray[@]}" - $buildFlags "${buildFlagsArray[@]}" + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} ) echoCmd 'build flags' "${flagsArray[@]}" @@ -1103,8 +1097,8 @@ checkPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags "${makeFlagsArray[@]}" - ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} ${checkTarget} ) @@ -1129,8 +1123,8 @@ installPhase() { # shellcheck disable=SC2086 local flagsArray=( SHELL=$SHELL - $makeFlags "${makeFlagsArray[@]}" - $installFlags "${installFlagsArray[@]}" + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} ${installTargets:-install} ) @@ -1237,8 +1231,8 @@ installCheckPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags "${makeFlagsArray[@]}" - $installCheckFlags "${installCheckFlagsArray[@]}" + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} ${installCheckTarget:-installcheck} ) @@ -1257,7 +1251,7 @@ distPhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} + $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} ) echo 'dist flags: %q' "${flagsArray[@]}" diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 556539eddd2b..0d0d2ec80ffe 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.106"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.97"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-6o24GUcT3efgK5+Wa7n4+EeA5qXmAGhybzed7ybdT9Q="; + sha256 = "sha256-kecuyQMk4GWH9G0/f4Gi/hWtW4Zme9Q4i7XclcZTlNc="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 1cae7c1cc1fb..2cde5a1da579 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -87,7 +87,6 @@ let postPatch = '' substituteInPlace setup.py \ --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ - --replace "requests~=2.25.1" "requests~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; @@ -99,7 +98,7 @@ let PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \ --ignore=azure/cli/core/tests/test_profile.py \ --ignore=azure/cli/core/tests/test_generic_update.py \ - -k 'not metadata_url and not test_send_raw_requests' + -k 'not metadata_url' ''; pythonImportsCheck = [ @@ -158,7 +157,7 @@ let "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs="; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "1.0.0" "zip" - "sha256-q4cQjA1c4n2AWDtL+tlmrQcEncvA6awoxkqmu9rmTiI="; + "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rza"; azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.12.0" "zip" "sha256-mrw1Gs3LMOPFiL5mSSrm+g1/dxihplA6ItYHbwljJbM="; @@ -202,9 +201,6 @@ let azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.0.0" "zip" "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; - azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "0.2.0" "zip" - "sha256-jDes/Rwzq6hF8uAwLvcmbK0xy6UDzJkKSGhGWay3uR0="; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip" "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index c172edd1fd98..5b88e10b1c37 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: let version = "2.13"; @@ -11,14 +11,6 @@ in stdenv.mkDerivation { sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"; }; - patches = [ - (fetchpatch { - name = "CVE-2021-38185.patch"; - url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=dd96882877721703e19272fe25034560b794061b"; - sha256 = "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32"; - }) - ]; - preConfigure = if stdenv.isCygwin then '' sed -i gnu/fpending.h -e 's,include ,,' '' else null; diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 38ba47a51223..cd89d4039e5f 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -104,8 +104,6 @@ python3.pkgs.buildPythonApplication rec { # Requires a PHP installation "test_timesql" "test_cookies" - # E TypeError: Expected bytes or bytes-like object got: - "test_persister_upload" ]; pythonImportsCheck = [ "wapitiCore" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7888af80493e..15f8a80e174b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3598,7 +3598,7 @@ with pkgs; bud = callPackage ../tools/networking/bud { }; - bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; + bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; bumpver = callPackage ../applications/version-management/bumpver { }; @@ -14739,7 +14739,9 @@ with pkgs; vultr-cli = callPackage ../development/tools/vultr-cli { }; - vulnix = callPackage ../tools/security/vulnix { }; + vulnix = callPackage ../tools/security/vulnix { + python3Packages = python37Packages; + }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; @@ -25270,7 +25272,11 @@ with pkgs; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; - kupfer = callPackage ../applications/misc/kupfer { }; + kupfer = callPackage ../applications/misc/kupfer { + # using python36 as there appears to be a waf issue with python37 + # see https://github.com/NixOS/nixpkgs/issues/60498 + python3Packages = python36Packages; + }; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 27b467cbb2a4..cd35fb250390 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + backports-entry-points-selectable = throw "backports-entry-points-selectable has been removed"; # added 2021-07-01 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff603b6be8e0..d581ad1fa00f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -565,8 +565,6 @@ in { asgiref = callPackage ../development/python-modules/asgiref { }; - asn1 = callPackage ../development/python-modules/asn1 { }; - asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; @@ -625,7 +623,9 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { + pytestCheckHook = self.pytestCheckHook_6_1; + }; asyncwhois = callPackage ../development/python-modules/asyncwhois { }; @@ -979,8 +979,6 @@ in { backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; - backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; - backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; @@ -1423,8 +1421,6 @@ in { chardet = callPackage ../development/python-modules/chardet { }; - charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; - chart-studio = callPackage ../development/python-modules/chart-studio { }; check-manifest = callPackage ../development/python-modules/check-manifest { }; @@ -1860,8 +1856,6 @@ in { dateparser = callPackage ../development/python-modules/dateparser { }; - dateutils = callPackage ../development/python-modules/dateutils { }; - datrie = callPackage ../development/python-modules/datrie { }; dawg-python = callPackage ../development/python-modules/dawg-python { }; @@ -4260,9 +4254,8 @@ in { }; llvmlite = callPackage ../development/python-modules/llvmlite { - # llvmlite always requires a specific version of llvm. - llvm = pkgs.llvm_11; - }; + llvm = pkgs.llvm_9; + }; # llvmlite always requires a specific version of llvm. lmdb = callPackage ../development/python-modules/lmdb { inherit (pkgs) lmdb; @@ -6873,11 +6866,6 @@ in { inherit version; sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; }; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" - ''; }); pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; @@ -8948,7 +8936,9 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; - trio = callPackage ../development/python-modules/trio { }; + trio = callPackage ../development/python-modules/trio { + pytestCheckHook = self.pytestCheckHook_6_1; + }; trueskill = callPackage ../development/python-modules/trueskill { }; @@ -9166,7 +9156,9 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - urllib3 = callPackage ../development/python-modules/urllib3 { }; + urllib3 = callPackage ../development/python-modules/urllib3 { + pytestCheckHook = self.pytestCheckHook_6_1; + }; urlpy = callPackage ../development/python-modules/urlpy { }; @@ -9323,8 +9315,7 @@ in { wasm = callPackage ../development/python-modules/wasm { }; - wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { }); - inherit (self.wasmerPackages) wasmer wasmer-compiler-cranelift wasmer-compiler-llvm wasmer-compiler-singlepass; + wasmer = callPackage ../development/python-modules/wasmer { }; watchdog = callPackage ../development/python-modules/watchdog { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; @@ -9382,7 +9373,9 @@ in { webthing = callPackage ../development/python-modules/webthing { }; - werkzeug = callPackage ../development/python-modules/werkzeug { }; + werkzeug = callPackage ../development/python-modules/werkzeug { + pytestCheckHook = self.pytestCheckHook_6_1; + }; west = callPackage ../development/python-modules/west { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 57e6987e6703..caa44e5947e1 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -70,8 +70,6 @@ with self; with super; { construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; - contextlib2 = callPackage ../development/python-modules/contextlib2/0.nix { }; - convertdate = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; @@ -82,8 +80,6 @@ with self; with super; { dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { }; - decorator = callPackage ../development/python-modules/decorator/4.nix { }; - deskcon = callPackage ../development/python-modules/deskcon { }; django_evolution = callPackage ../development/python-modules/django_evolution { }; @@ -397,8 +393,6 @@ with self; with super; { pip = callPackage ../development/python-modules/pip/20.nix { }; - pluggy = callPackage ../development/python-modules/pluggy/0.nix { }; - postorius = disabled super.postorius; praw = callPackage ../development/python-modules/praw/6.3.nix { }; From 5e3cb00953c6f46d3ffdd9e4550f7744ad4010cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 22:28:11 +0200 Subject: [PATCH 1017/1062] python3Packages.charset-normalizer: init at 2.0.1 --- .../charset-normalizer/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/charset-normalizer/default.nix diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix new file mode 100644 index 000000000000..dc0f5e1b296a --- /dev/null +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "charset-normalizer"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "Ousret"; + repo = "charset_normalizer"; + rev = version; + sha256 = "04rnyrqay11kma9pzagi1mzhc0sq37ggpv39kad2d4ynm35v2hfq"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=charset_normalizer --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ "charset_normalizer" ]; + + meta = with lib; { + description = "Python module for encoding and language detection"; + homepage = "https://charset-normalizer.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e5a95ad7f63..ff603b6be8e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1423,6 +1423,8 @@ in { chardet = callPackage ../development/python-modules/chardet { }; + charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; + chart-studio = callPackage ../development/python-modules/chart-studio { }; check-manifest = callPackage ../development/python-modules/check-manifest { }; From 4cc9b841182fe88ece2d33a77e6937458a0f9fa9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Aug 2021 00:01:24 +0200 Subject: [PATCH 1018/1062] python3Packages.requests: 2.25.1 -> 2.26.0 --- .../development/python-modules/requests/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 4dfd4fd623d4..f7c2cdbf27ac 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , certifi , chardet +, charset-normalizer , fetchPypi , idna , pytest-mock @@ -17,14 +18,17 @@ buildPythonPackage rec { pname = "requests"; - version = "2.25.1"; + version = "2.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; + sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; }; - patches = [ ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch ]; + patches = [ + # Use the default NixOS CA bundle from the certifi package + ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch + ]; postPatch = '' # Use latest idna @@ -32,7 +36,9 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + brotlicffi certifi + charset-normalizer chardet idna urllib3 @@ -47,6 +53,7 @@ buildPythonPackage rec { pytest-mock pytest-xdist pytestCheckHook + trustme ]; # AttributeError: 'KeywordMapping' object has no attribute 'get' From 010096974f03009d221b533dd5c16c3d8b794ba1 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 5 Sep 2021 15:25:02 +0000 Subject: [PATCH 1019/1062] icewm: fix trailing -I compilation errors Fixes cc1plus: error: to generate dependencies you must specify either '-M' or '-MM' errors which occur while compiling due to trailing -I for libintl, which appears to be found now but without requiring any include/link flags. --- pkgs/applications/window-managers/icewm/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 1584b7fed019..e4efc13262d2 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , asciidoc , cmake , expat @@ -48,6 +49,15 @@ stdenv.mkDerivation rec { hash = "sha256-R06tiWS9z6K5Nbi+vvk7DyozpcFdrHleMeh7Iq/FfHQ="; }; + patches = [ + # https://github.com/ice-wm/icewm/pull/57 + # Fix trailing -I that leads to "to generate dependencies you must specify either '-M' or '-MM'" + (fetchpatch { + url = "https://github.com/ice-wm/icewm/pull/57/commits/ebd2c45341cc31755758a423392a0f78a64d2d37.patch"; + sha256 = "16m9znd3ijcfl7la3l27ac3clx8l9qng3fprkpxqcifd89ny1ml5"; + }) + ]; + nativeBuildInputs = [ asciidoc cmake From 1333bd9ac04fa4be2050b356bd2906a882b716ca Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 24 Aug 2021 21:46:29 +0100 Subject: [PATCH 1020/1062] xxkb: explicitly set LIBDIR and CONFDIR In preparation to fix long-standing `imake` bug #135337 we need to set `LIBDIR` and `CONFDIR` away from incorrectly embedded `xorg-cf-files`. Before #135337 the package worked by chance. Issue: https://github.com/NixOS/nixpkgs/issues/135337 --- pkgs/applications/misc/xxkb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 7a0111785c14..b579579195f6 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { makeFlags = [ "BINDIR=${placeholder "out"}/bin" + "CONFDIR=${placeholder "out"}/etc/X11" "PIXMAPDIR=${placeholder "out"}/share/xxkb" + "LIBDIR=${placeholder "out"}/lib/X11" "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" "MANDIR=${placeholder "man"}/share/man" ]; From bace74bbf8e9bac15802c5382d7e46fd26be72ba Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 24 Aug 2021 21:51:28 +0100 Subject: [PATCH 1021/1062] xcruiser: explicitly set LIBDIR and CONFDIR In preparation to fix long-standing `imake` bug #135337 we need to set `LIBDIR` and `CONFDIR` away from incorrectly embedded `xorg-cf-files`. Before #135337 the package worked by chance. Issue: https://github.com/NixOS/nixpkgs/issues/135337 --- pkgs/applications/misc/xcruiser/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 2e4771563a04..db7fe260b924 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation { buildInputs = [ libXt libXaw libXpm libXext ]; makeFlags = [ - "BINDIR=$(out)/bin" - "XAPPLOADDIR=$(out)/etc/X11/app-defaults" + "BINDIR=${placeholder "out"}/bin" + "CONFDIR=${placeholder "out"}/etc/X11" + "LIBDIR=${placeholder "out"}/lib/X11" + "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" ]; meta = with lib; { From 79031203b88f8b96b1321416f59e23481cceed45 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 24 Aug 2021 21:53:54 +0100 Subject: [PATCH 1022/1062] xvkbd: explicitly set LIBDIR and CONFDIR In preparation to fix long-standing `imake` bug #135337 we need to set `LIBDIR` and `CONFDIR` away from incorrectly embedded `xorg-cf-files`. Before #135337 the package worked by chance. Issue: https://github.com/NixOS/nixpkgs/issues/135337 --- pkgs/tools/X11/xvkbd/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 05936d1d1f3d..d751cb8f087a 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation { buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; installTargets = [ "install" "install.man" ]; makeFlags = [ - "BINDIR=$(out)/bin" - "XAPPLOADDIR=$(out)/etc/X11/app-defaults" - "MANPATH=$(out)/man" + "BINDIR=${placeholder "out"}/bin" + "CONFDIR=${placeholder "out"}/etc/X11" + "LIBDIR=${placeholder "out"}/lib/X11" + "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" + "MANPATH=${placeholder "out"}/man" ]; meta = with lib; { From 6073831a11510127a41ff2478abd799f0965e2f4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 23 Aug 2021 09:24:19 +0100 Subject: [PATCH 1023/1062] imake: do not skip Linux* vendor definitions Initial build failure is onserved on `staging` branch: ``` $ nix-build -A transfig ... make[1]: Entering directory '/build/transfig.3.2.4' Imakefile.c:20:2: Include file Imake.tmpl not found imake: Exit code 1. Stop. ``` This happened after 8675ca0 ("xorg.xorgcffiles: 1.0.6 -> 1.0.7") bump which exposed an old bug in `imake.patch`. `imake.patch` dropped by accident definiton of `LinuxRedHat` enum and changed evaluation of the following code: ``` #if LinuxDistribution == LinuxRedHat ... # define ProjectRoot /usr #endif ``` References to `/usr` were addded in https://gitlab.freedesktop.org/xorg/util/cf/-/commit/d47131ed97ee491bb883c29ec0b106e8d5acfcd3. Before this change `LinuxDistribution == LinuxRedHat` evaluated to true. After this change `LinuxDistribution == LinuxRedHat` evaluates to false. Mechanically I moved `#if 0` right after enum definitions but still before system autodetection. Now `transfig` builds successfully. Closes: https://github.com/NixOS/nixpkgs/issues/135337 Signed-off-by: Sergei Trofimovich --- pkgs/servers/x11/xorg/imake.patch | 34 +++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/x11/xorg/imake.patch b/pkgs/servers/x11/xorg/imake.patch index 1d0ec88761d4..e8ce66cdee00 100644 --- a/pkgs/servers/x11/xorg/imake.patch +++ b/pkgs/servers/x11/xorg/imake.patch @@ -1,31 +1,35 @@ -diff -Naur imake-1.0.7-orig/imake.c imake-1.0.7/imake.c ---- imake-1.0.7-orig/imake.c 2013-08-17 10:11:50.000000000 +0000 -+++ imake-1.0.7/imake.c 2015-02-04 09:41:59.000000000 +0000 -@@ -1045,6 +1045,7 @@ - static void - get_distrib(FILE *inFile) - { -+#if 0 - struct stat sb; +Disable imake autodetection for: +- LinuxDistribution to avoid injection of /usr paths +- gcc to avoid use uf /usr/bin/gcc + +https://github.com/NixOS/nixpkgs/issues/135337 +--- a/imake.c ++++ b/imake.c +@@ -1065,6 +1065,7 @@ get_distrib(FILE *inFile) + fprintf (inFile, "%s\n", "#define LinuxWare 11"); + fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); - static const char* suse = "/etc/SuSE-release"; -@@ -1090,6 +1091,7 @@ ++#if 0 /* disable system autodetection. Fall through to LinuxUnknown. */ + # ifdef CROSSCOMPILE + if (CrossCompiling) { + fprintf (inFile, "%s\n", +@@ -1090,6 +1091,7 @@ get_distrib(FILE *inFile) * at the content of /etc/debian_version */ return; } -+#endif ++#endif /* what's the definitive way to tell what any particular distribution is? */ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); -@@ -1337,6 +1339,7 @@ +@@ -1337,6 +1339,7 @@ get_gcc_version(FILE *inFile, char *name) static boolean get_gcc(char *cmd) { -+#if 0 ++#if 0 /* disable gcc autodetection. Fall through to explicitly set. */ struct stat sb; static const char* gcc_path[] = { #if defined(linux) || \ -@@ -1385,6 +1388,9 @@ +@@ -1385,6 +1388,9 @@ get_gcc(char *cmd) } } return FALSE; From 590471d1772e0045e93097c19f955d919350c06c Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 5 Sep 2021 16:51:30 -0700 Subject: [PATCH 1024/1062] ocamlPackages.extlib: fix build We can no longer set dontConfigure, because findlib now sets up a necessary preConfigure hook --- pkgs/development/ocaml-modules/extlib/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 5c7d36fcc08d..d1860788838a 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib cppo ]; createFindlibDestdir = true; - dontConfigure = true; makeFlags = lib.optional minimal "minimal=1"; From 125c7a4ef53def6ffb1a06852e47a64a796e5577 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 5 Sep 2021 16:54:02 -0700 Subject: [PATCH 1025/1062] ocamlPackages.erm_xmpp: fix build Add missing pre/post hooks - preConfigure is now required, as findlib sets a necessary preConfigure hook --- .../ocaml-modules/erm_xmpp/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index cff155f47098..9eaad7575ec3 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -16,9 +16,21 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + runHook preConfigure + ocaml setup.ml -configure --prefix $out + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + ocaml setup.ml -build + runHook postBuild + ''; + installPhase = '' + runHook preInstall + ocaml setup.ml -install + runHook postInstall + ''; createFindlibDestdir = true; From 6310613bb00ff433b53908f859a06aee4b7f07ba Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 5 Sep 2021 17:16:51 -0700 Subject: [PATCH 1026/1062] ocamlPackages.ocaml_oasis: fix build Add missing pre/post hooks - preConfigure is now required, as findlib sets a necessary preConfigure hook --- pkgs/development/tools/ocaml/oasis/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 6854c7c20ca3..10c7bf63aa41 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -18,9 +18,21 @@ stdenv.mkDerivation { ocaml findlib ocamlbuild ocamlmod ocamlify ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + runHook preConfigure + ocaml setup.ml -configure --prefix $out + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + ocaml setup.ml -build + runHook postBuild + ''; + installPhase = '' + runHook preInstall + ocaml setup.ml -install + runHook postInstall + ''; meta = with lib; { homepage = "http://oasis.forge.ocamlcore.org/"; From 3a5fc1aad414f2de7813cec48d25e73aa553c0bb Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 5 Sep 2021 18:21:14 -0700 Subject: [PATCH 1027/1062] ocamlPackages.camomile: fix output dest dir Add missing pre/post hooks - preConfigure is now required to set correct ocaml dest dir as findlib sets a necessary preConfigure hook --- pkgs/development/ocaml-modules/camomile/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index ec20eedd7688..090b96ece0cc 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -15,7 +15,11 @@ buildDunePackage rec { buildInputs = [ cppo ]; - configurePhase = "ocaml configure.ml --share $out/share/camomile"; + configurePhase = '' + runHook preConfigure + ocaml configure.ml --share $out/share/camomile + runHook postConfigure + ''; meta = { inherit (src.meta) homepage; From 53b78c1a641964d54850f427bcd19fa0935400b5 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 5 Sep 2021 18:43:49 -0700 Subject: [PATCH 1028/1062] ocamlPackages.cryptokit: fix output dest dir Add missing pre/post hooks - preConfigure is now required to set correct ocaml dest dir as findlib sets a necessary preConfigure hook --- pkgs/development/ocaml-modules/cryptokit/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 272ff72d8c59..6a50c73103b7 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -11,7 +11,11 @@ buildDunePackage { sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c"; }; - dontConfigure = true; + # dont do autotools configuration, but do trigger findlib's preConfigure hook + configurePhase = '' + runHook preConfigure + runHook postConfigure + ''; buildInputs = [ dune-configurator ncurses ]; propagatedBuildInputs = [ zarith zlib ]; From 4e1b102af618fc3e8da11da8a0cea28e5c104f3a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 7 Sep 2021 00:59:03 +0000 Subject: [PATCH 1029/1062] curl: reenable ca-fallback when not using wolfsslSupport 904625852d535bbe53cadb006c9e1137ab481818 accidentally swapped the behaviour, and enabled ca-fallback when using wolfssl and disabled it without. This effectively disables curl's ability to use the built in CA stack. --- pkgs/tools/networking/curl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5dba94abe35b..aee0668c7f2d 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { "--without-ca-bundle" "--without-ca-path" # The build fails when using wolfssl with --with-ca-fallback - (lib.withFeature wolfsslSupport "ca-fallback") + (lib.withFeature (!wolfsslSupport) "ca-fallback") "--disable-manual" (lib.withFeatureAs sslSupport "ssl" openssl.dev) (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) From 42155910a0a499e9cc937ae89f022fcd5b551cf6 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 6 Sep 2021 13:40:46 -0700 Subject: [PATCH 1030/1062] pkgsStatic.curl: fix build 904625852d535bbe53cadb006c9e1137ab481818 removed the overlay which disables gss and brotli for static curl. Although we can now build them statically, attempting to build curl against them results in 'undefined reference' linker errors. --- pkgs/tools/networking/curl/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index aee0668c7f2d..b3572e01c96d 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -145,5 +145,7 @@ stdenv.mkDerivation rec { license = licenses.curl; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; + # Fails to link against static brotli or gss + broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbb8fdf83919..b8ab569a7274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4109,11 +4109,12 @@ with pkgs; ldapSupport = true; }; - curl = curlMinimal.override { + curl = curlMinimal.override ({ idnSupport = true; + } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { gssSupport = true; brotliSupport = true; - }; + }); curlMinimal = callPackage ../tools/networking/curl { }; From 90354922c244e17dd35b110fa9d5d1083fd18819 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 Sep 2021 15:30:10 +0800 Subject: [PATCH 1031/1062] nixos/doc: adjust to the new structure of kernel packages --- .../configuration/linux-kernel.chapter.md | 35 ++++++++++-------- .../configuration/linux-kernel.chapter.xml | 37 +++++++++++-------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md index aad6d49c72c3..1d06543d4f1e 100644 --- a/nixos/doc/manual/configuration/linux-kernel.chapter.md +++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -5,13 +5,18 @@ option `boot.kernelPackages`. For instance, this selects the Linux 3.10 kernel: ```nix -boot.kernelPackages = pkgs.linuxPackages_3_10; +boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; ``` Note that this not only replaces the kernel, but also packages that are specific to the kernel version, such as the NVIDIA video drivers. This ensures that driver packages are consistent with the kernel. +While `pkgs.linuxKernel.packages` contains all available kernel packages, +you may want to use one of the unversioned `pkgs.linuxPackages_*` aliases +such as `pkgs.linuxPackages_latest`, that are kept up to date with new +versions. + The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: @@ -25,14 +30,13 @@ If you want to change the kernel configuration, you can use the instance, to enable support for the kernel debugger KGDB: ```nix -nixpkgs.config.packageOverrides = pkgs: - { linux_3_4 = pkgs.linux_3_4.override { - extraConfig = - '' - KGDB y - ''; - }; +nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { + linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override { + extraConfig = '' + KGDB y + ''; }; +}; ``` `extraConfig` takes a list of Linux kernel configuration options, one @@ -72,16 +76,17 @@ available parameters, run `sysctl -a`. The first step before compiling the kernel is to generate an appropriate `.config` configuration. Either you pass your own config via the -`configfile` setting of `linuxManualConfig`: +`configfile` setting of `linuxKernel.manualConfig`: ```nix -custom-kernel = super.linuxManualConfig { - inherit (super) stdenv hostPlatform; - inherit (linux_4_9) src; - version = "${linux_4_9.version}-custom"; +custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; + in super.linuxKernel.manualConfig { + inherit (super) stdenv hostPlatform; + inherit (base_kernel) src; + version = "${base_kernel.version}-custom"; - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; }; ``` diff --git a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml index f804d0a3b8c2..a1d6815af29c 100644 --- a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml @@ -6,7 +6,7 @@ selects the Linux 3.10 kernel: -boot.kernelPackages = pkgs.linuxPackages_3_10; +boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; Note that this not only replaces the kernel, but also packages that @@ -14,6 +14,13 @@ boot.kernelPackages = pkgs.linuxPackages_3_10; drivers. This ensures that driver packages are consistent with the kernel. + + While pkgs.linuxKernel.packages contains all + available kernel packages, you may want to use one of the + unversioned pkgs.linuxPackages_* aliases such as + pkgs.linuxPackages_latest, that are kept up to + date with new versions. + The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the @@ -29,14 +36,13 @@ zcat /proc/config.gz enable support for the kernel debugger KGDB: -nixpkgs.config.packageOverrides = pkgs: - { linux_3_4 = pkgs.linux_3_4.override { - extraConfig = - '' - KGDB y - ''; - }; +nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { + linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override { + extraConfig = '' + KGDB y + ''; }; +}; extraConfig takes a list of Linux kernel @@ -82,16 +88,17 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; The first step before compiling the kernel is to generate an appropriate .config configuration. Either you pass your own config via the configfile setting - of linuxManualConfig: + of linuxKernel.manualConfig: -custom-kernel = super.linuxManualConfig { - inherit (super) stdenv hostPlatform; - inherit (linux_4_9) src; - version = "${linux_4_9.version}-custom"; +custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; + in super.linuxKernel.manualConfig { + inherit (super) stdenv hostPlatform; + inherit (base_kernel) src; + version = "${base_kernel.version}-custom"; - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; }; From b913568092d28651b7feb6f3f56cabe2279187c9 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 8 Sep 2021 22:53:09 +0000 Subject: [PATCH 1032/1062] linux_5_13_hardened: port to linux-kernels.nix See c62f911507977ac67fd5e8547af2d1071c5e0891 aka #128134. --- pkgs/top-level/all-packages.nix | 5 ++--- pkgs/top-level/linux-kernels.nix | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd0c3ddbb95f..babb1f7cd413 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21295,9 +21295,8 @@ with pkgs; linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; - - linuxPackages_5_13_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_13 { }); - linux_5_13_hardened = linuxPackages_5_13_hardened.kernel; + linuxPackages_5_13_hardened = linuxKernel.packages.linux_5_13_hardened; + linux_5_13_hardened = linuxKernel.kernels.linux_5_13_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8db28e374005..99f8b5eb7da3 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -202,6 +202,7 @@ let linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; + linux_5_13_hardened = hardenedKernelFor kernels.linux_5_13 { }; }); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -483,6 +484,7 @@ let linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { }); linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); + linux_5_13_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_13 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From 554d86af2039b1b6dbd6c7b3eb969b2bc5d54580 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 9 Sep 2021 18:17:33 -0700 Subject: [PATCH 1033/1062] openjfx11: fix build Remove -Werror=implicit-function-declaration, which when passed to cmake for webkit build breaks C++ compiler configuration due to spurious warnings: `cc1plus: warning: '-Werror=' argument '-Werror=implicit-function-declaration' is not valid for C++` --- pkgs/development/compilers/openjdk/openjfx/11.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 1d741fd8be2d..223a1921ef9d 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -24,6 +24,11 @@ let dontUseCmakeConfigure = true; + postPatch = '' + substituteInPlace buildSrc/linux.gradle \ + --replace ', "-Werror=implicit-function-declaration"' "" + ''; + config = writeText "gradle.properties" ('' CONF = Release JDK_HOME = ${openjdk11-bootstrap.home} From 02633095e3c292cedf8ea35a3e55cbd2cbd4cb37 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 10 Sep 2021 09:03:23 -0700 Subject: [PATCH 1034/1062] python3Packages.backports-entry-points-selectable: use backports namespace --- .../backports-entry-points-selectable/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 2c1fa41f469b..abf6774ddef2 100644 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "backports.entry_points_selectable" ]; + pythonNamespaces = [ "backports" ]; + meta = with lib; { description = "Compatibility shim providing selectable entry points for older implementations"; homepage = "https://github.com/jaraco/backports.entry_points_selectable"; From b3800220258053131be289f6225d2bb8561a7f9d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 10 Sep 2021 09:04:02 -0700 Subject: [PATCH 1035/1062] python3Packages.backports-functools-lru-cache: use backports namespace --- .../python-modules/backports_functools_lru_cache/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index cb5665363f9c..21920c32b4d2 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { # Test fail on Python 2 doCheck = isPy3k; + pythonNamespaces = [ "backports" ]; + meta = { description = "Backport of functools.lru_cache"; homepage = "https://github.com/jaraco/backports.functools_lru_cache"; From 6da8f606837b9c51e185f5753babc44b98630a8c Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 02:31:55 +0000 Subject: [PATCH 1036/1062] aws-sam-cli: further loosen 'requests' dependency --- pkgs/development/tools/aws-sam-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 40c9958c3447..c370cddbe436 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { --replace "Flask~=1.1.2" "Flask~=2.0" \ --replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ - --replace "requests==" "requests~=" \ + --replace "requests==" "requests #" \ --replace "watchdog==" "watchdog #" ''; From 455ef76700ca1b703879cef66333d7e9d4bebba7 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 7 Sep 2021 17:57:29 +0200 Subject: [PATCH 1037/1062] matrix-synapse: use frozendict 1.2 --- pkgs/servers/matrix-synapse/default.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 9b7cd567a77c..e25b6758b49b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -4,10 +4,25 @@ , callPackage }: -with python3.pkgs; +let +py = python3.override { + packageOverrides = self: super: { + frozendict = super.frozendict.overridePythonAttrs (oldAttrs: rec { + version = "1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + }; + doCheck = false; + }); + }; +}; +in + +with py.pkgs; let - plugins = python3.pkgs.callPackage ./plugins { }; + plugins = py.pkgs.callPackage ./plugins { }; tools = callPackage ./tools { }; in buildPythonApplication rec { @@ -66,13 +81,13 @@ buildPythonApplication rec { doCheck = !stdenv.isDarwin; checkPhase = '' - PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests + PYTHONPATH=".:$PYTHONPATH" ${py.interpreter} -m twisted.trial tests ''; passthru.tests = { inherit (nixosTests) matrix-synapse; }; passthru.plugins = plugins; passthru.tools = tools; - passthru.python = python3; + passthru.python = py; meta = with lib; { homepage = "https://matrix.org"; From 222c5477e205a7c2f68ba96a656851d52281a720 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 02:33:29 +0000 Subject: [PATCH 1038/1062] python3Packages.pythran: use LLVM openmp when using clang This fixes pythran (and, therefore, also scipy, etc.) under Darwin builds, which use LLVM by default. --- pkgs/development/python-modules/pythran/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index cb25b09dad72..382a01e7b870 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -2,6 +2,7 @@ , python , buildPythonPackage , fetchFromGitHub +, openmp , pytest-runner , ply , networkx @@ -34,7 +35,7 @@ in buildPythonPackage rec { # Hardcode path to mp library (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; - gomp = "${stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; + gomp = "${if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d2558d2d71d..e90190c3febd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7341,7 +7341,9 @@ in { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - pythran = callPackage ../development/python-modules/pythran { }; + pythran = callPackage ../development/python-modules/pythran { + inherit (pkgs.llvmPackages) openmp; + }; pyeverlights = callPackage ../development/python-modules/pyeverlights { }; From 83d16774f2fc8db795926f1d3cf58b2bf6700fab Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 02:51:11 +0000 Subject: [PATCH 1039/1062] awscli2: add older awscrt to make build work --- pkgs/tools/admin/awscli2/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 0c5d08fd25c5..0b7be59231ca 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -2,6 +2,14 @@ let py = python3.override { packageOverrides = self: super: { + awscrt = super.awscrt.overridePythonAttrs (oldAttrs: rec { + version = "0.11.24"; + src = self.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-uKpovKQEvwCFvgVw7/W1QtAffo48D5sIWav+XgcBYv8="; + }; + }); botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { version = "2.0.0dev138"; src = fetchFromGitHub { @@ -43,12 +51,12 @@ with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "awscrt==0.11.24" "awscrt" \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ - --replace "wcwidth<0.2.0" "wcwidth" + --replace "wcwidth<0.2.0" "wcwidth" \ + --replace "distro>=1.5.0,<1.6.0" "distro" ''; checkInputs = [ jsonschema mock nose ]; From 87a72a58b707822ae2a0ae15c776c87a3e9f487e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 02:57:24 +0000 Subject: [PATCH 1040/1062] python3Packages.lexid: disable lib3to6 usage to fix build --- pkgs/development/python-modules/lexid/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 400643383773..5ef175d57878 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -9,6 +9,12 @@ buildPythonPackage rec { sha256 = "509a3a4cc926d3dbf22b203b18a4c66c25e6473fb7c0e0d30374533ac28bafe5"; }; + prePatch = '' + # Disable lib3to6, since we're only building this on 3.6+ anyway. + substituteInPlace setup.py \ + --replace 'if any(arg.startswith("bdist") for arg in sys.argv):' 'if False:' + ''; + propagatedBuildInputs = [ click ]; checkInputs = [ pytestCheckHook ]; From fc77b402c066a3ae201631db74bb5d8196df13fd Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 03:06:54 +0000 Subject: [PATCH 1041/1062] conan: 1.35.0 -> 1.40.0 --- .../tools/build-managers/conan/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index f59e74b02f4e..95994e0924db 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -21,13 +21,6 @@ let newPython = python3.override { sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; }; }); - urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec { - version = "1.25.11"; - src = oldAttrs.src.override { - inherit version; - sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld"; - }; - }); # https://github.com/conan-io/conan/issues/8876 pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { version = "1.7.1"; @@ -59,14 +52,14 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.35.0"; + version = "1.40.0"; pname = "conan"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = version; - sha256 = "19rgylkjxvv47vz5vgh46rw108xskpv7lmax8y2fnm2wd1j3bq9c"; + sha256 = "1sb4w4wahasrwxkag1g79f135601sca6iafv4r4836f2vi48ka2d"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -106,12 +99,6 @@ in newPython.pkgs.buildPythonApplication rec { # Not enabled right now due to time constraints/failing tests that I didn't have time to track down doCheck = false; - postPatch = '' - substituteInPlace conans/requirements.txt \ - --replace "deprecation>=2.0, <2.1" "deprecation" \ - --replace "six>=1.10.0,<=1.15.0" "six>=1.10.0,<=1.16.0" - ''; - meta = with lib; { homepage = "https://conan.io"; description = "Decentralized and portable C/C++ package manager"; From b44357045a1257a9be6e153a728597c61d9f7341 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 03:08:43 +0000 Subject: [PATCH 1042/1062] python3Packages.agate-excel: add missing olefile dep --- pkgs/development/python-modules/agate-excel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index cbf49d8477c3..4d970b182217 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, agate, openpyxl, xlrd, pytestCheckHook +, agate, openpyxl, xlrd, olefile, pytestCheckHook }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; }; - propagatedBuildInputs = [ agate openpyxl xlrd ]; + propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; checkInputs = [ pytestCheckHook ]; From daa1175255391663ee97d1dd0940d7a7eb5c0078 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 03:19:22 +0000 Subject: [PATCH 1043/1062] cmake: 3.21.1 -> 3.21.2 3.21.1 has a bug which causes darktable to fail to compile (passes weird arguments to ar in the ninja-generated files), which is fixed in 3.21.2. --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index a4532781943f..6cb257256fc0 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI"; - version = "3.21.1"; + version = "3.21.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-+sORUXHU3/JZE5ddcS925prvRL9zi6e5dnk6RYtM/tQ="; + sha256 = "sha256-lCdeC2HIS7QnEPUyCiPG3LLG7gMq59KmFvU/aLPSFlk="; }; patches = [ From a8be3a74ccafe990aeb59f51fabd22b77f7c416d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 11 Sep 2021 15:11:42 +0100 Subject: [PATCH 1044/1062] cmake: revert cmake support for 10.4 Tiger This is a reversed patch of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6426. _CURRENT_OSX_VERSION isn't set properly, which causes this condition to fail, which means we don't get CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG which means we can't compile libcxx. Ugh. --- .../cmake/darwin-always-set-runtime-c-flag.patch | 14 ++++++++++++++ .../tools/build-managers/cmake/default.nix | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/build-managers/cmake/darwin-always-set-runtime-c-flag.patch diff --git a/pkgs/development/tools/build-managers/cmake/darwin-always-set-runtime-c-flag.patch b/pkgs/development/tools/build-managers/cmake/darwin-always-set-runtime-c-flag.patch new file mode 100644 index 000000000000..dc10e6b34231 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/darwin-always-set-runtime-c-flag.patch @@ -0,0 +1,14 @@ +Revert of commit 1af23c4de2c7d58c06171d70b37794b5c860d5f4. +--- b/Modules/Platform/Darwin.cmake ++++ a/Modules/Platform/Darwin.cmake +@@ -47,9 +47,7 @@ + set(CMAKE_SHARED_MODULE_SUFFIX ".so") + set(CMAKE_MODULE_EXISTS 1) + set(CMAKE_DL_LIBS "") ++set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") +-if(NOT "${_CURRENT_OSX_VERSION}" VERSION_LESS "10.5") +- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") +-endif() + + foreach(lang C CXX OBJC OBJCXX) + set(CMAKE_${lang}_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 6cb257256fc0..33dbc25d9bf8 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.isDarwin && isBootstrap) ./remove-systemconfiguration-dep.patch; + ++ lib.optional (stdenv.isDarwin && isBootstrap) ./remove-systemconfiguration-dep.patch + # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. + ++ lib.optional stdenv.isDarwin ./darwin-always-set-runtime-c-flag.patch; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; From b6416616b2646561ca80b2d95398b322e53fb611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 21:16:26 +0200 Subject: [PATCH 1045/1062] zoxide: 0.7.4 -> 0.7.5 --- pkgs/tools/misc/zoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 2f38f6d2beb0..c2eba8c01b46 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-ERCzZM5WeyvBdiEklzmHrLWzMyfVhM+JPI76WXbKPco="; + sha256 = "sha256-DcfWNp9fELRzLfNAU2qGXfLDkSbWGrsfW/Wy0t2ISXU="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-sxE8bZ5VnholrL60JWgyeJHwguTrYol5Hc6MjtOIKcE="; + cargoSha256 = "sha256-O2IPmb9LH0ct0O2kR581Hfxl1sdb8himfq5U733JwGk="; postInstall = '' installManPage man/* From 01ab36d8752c2efe901136f19c18ea309b995ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Sep 2021 11:36:56 +0200 Subject: [PATCH 1046/1062] mariadb.client: fixup build I expect it got broken by mariadb update in PR #132916 (a160dfbf3). --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 29c6e6f00897..a49c0549a668 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -95,7 +95,7 @@ common = rec { # attributes common to both builds rm "$out"/bin/{mariadb_config,mysql_config} rm -r $out/include rm -r $out/lib/pkgconfig - rm -r $out/share/aclocal + rm -rf "$out"/share/aclocal ''; passthru.mysqlVersion = "5.7"; @@ -135,7 +135,7 @@ client = stdenv.mkDerivation (common // { ]; postInstall = common.postInstall + '' - rm -r "$out"/share/doc + rm -rf "$out"/share/doc rm "$out"/bin/{mysqltest,mytop} libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} From 1b5b70a373790fc2aa0b3afe640ad336bfae07ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Sep 2021 15:34:33 +0200 Subject: [PATCH 1047/1062] python39Packages.pyramid_mako: mark broken --- pkgs/development/python-modules/pyramid_mako/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index 47aa1deb5e26..9acffbde4333 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -23,5 +23,8 @@ buildPythonPackage rec { description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; maintainers = with maintainers; []; + # broken on pyramid>=2.0 + # https://github.com/Pylons/pyramid_mako/issues/53 + broken = true; }; } From 9177f704bd01568f975f7ca18e2d2595a3ffe9ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Sep 2021 15:42:03 +0200 Subject: [PATCH 1048/1062] chia: relax all version constraints --- pkgs/applications/blockchains/chia/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 4c596be9f4c8..4d3c4aabdfb0 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -26,6 +26,13 @@ let chia = python3Packages.buildPythonApplication rec { }) ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + + ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem + ''; + nativeBuildInputs = [ python3Packages.setuptools-scm ]; @@ -75,17 +82,6 @@ let chia = python3Packages.buildPythonApplication rec { "test_using_legacy_keyring" ]; - postPatch = '' - # tweak version requirements to what's available in Nixpkgs - substituteInPlace setup.py \ - --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ - --replace "sortedcontainers==2.3.0" "sortedcontainers>=2.3.0" \ - --replace "click==7.1.2" "click>=7.1.2" \ - --replace "clvm==0.9.7" "clvm>=0.9.7" \ - - ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem - ''; - preCheck = '' export HOME=`mktemp -d` ''; From a4cdaede17bea1339c4e607931fa938b8148a56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Sep 2021 15:55:39 +0200 Subject: [PATCH 1049/1062] python39Packages.gcovr: add missing dependency --- pkgs/development/python-modules/gcovr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 71480ab21131..5e9b32048f1f 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -3,6 +3,7 @@ , fetchPypi , jinja2 , lxml +, pygments }: buildPythonPackage rec { @@ -17,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 lxml + pygments ]; # There are no unit tests in the pypi tarball. Most of the unit tests on the @@ -35,5 +37,4 @@ buildPythonPackage rec { license = licenses.bsd0; homepage = "https://www.gcovr.com/"; }; - } From ce79b66953e4c7932f5c43b70181829f58c96598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Sep 2021 15:56:52 +0200 Subject: [PATCH 1050/1062] git-interactive-rebase-tool: fix compile error --- .../git-interactive-rebase-tool/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index be6e96fc8ff5..91f6f2039838 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; @@ -11,7 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DYl/GUbeNtKmXoR3gq8mK8EfsZNVNlrdngAwfzG+epw="; }; - cargoSha256 = "sha256-1joMWPfn0s+pLsO6NHMT6AoXZ33R8MY2AWSrROY2mw8="; + cargoPatches = [ + # update git2 crate to fix a compile error + (fetchpatch { + url = "https://github.com/MitMaro/git-interactive-rebase-tool/commit/f4d3026f23118d29a263bbca6c83f963e76c34c4.patch"; + sha256 = "sha256-6ErPRcPbPRXbEslNiNInbbUhbOWb9ZRll7ZDRgTpWS4="; + }) + ]; + + cargoSha256 = "sha256-2aHW9JIiqkO0X0B0D44tSZ8QkmKH/QZoYvKNEQWldo4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 1efdeb8767c60816a3fbf5c7cdd9f8e3e159f5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Sep 2021 20:32:02 +0200 Subject: [PATCH 1051/1062] python39Packages.autopage: init at 0.4.0 --- .../python-modules/autopage/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/autopage/default.nix diff --git a/pkgs/development/python-modules/autopage/default.nix b/pkgs/development/python-modules/autopage/default.nix new file mode 100644 index 000000000000..9a2ca722a62b --- /dev/null +++ b/pkgs/development/python-modules/autopage/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "autopage"; + version = "0.4.0"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "18f511d8ef2e4d3cc22a986d345eab0e03f95b9fa80b74ca63b7fb001551dc42"; + }; + + pythonImportsCheck = [ "autopage" ]; + + meta = with lib; { + description = "A library to provide automatic paging for console output"; + homepage = "https://github.com/zaneb/autopage"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43b27274a3d0..2e3557201a26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -687,6 +687,8 @@ in { automat = callPackage ../development/python-modules/automat { }; + autopage = callPackage ../development/python-modules/autopage { }; + autopep8 = callPackage ../development/python-modules/autopep8 { }; avahi = toPythonModule (pkgs.avahi.override { From bd6c0565b2947c58d951046ecfd4718489c9b515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Sep 2021 22:07:48 +0200 Subject: [PATCH 1052/1062] python39Packages.pbr: enable tests, adopt into openstack team --- .../python-modules/pbr/default.nix | 19 +++++-- pkgs/development/python-modules/pbr/tests.nix | 49 +++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/pbr/tests.nix diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 9c69e2fea544..9c46e638fc44 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, callPackage +}: buildPythonPackage rec { pname = "pbr"; @@ -11,13 +16,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - # circular dependencies with fixtures + # check in passthru.tests.pytest to escape infinite recursion with fixtures doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + pythonImportsCheck = [ "pbr" ]; meta = with lib; { - homepage = "http://docs.openstack.org/developer/pbr/"; - license = licenses.asl20; description = "Python Build Reasonableness"; + homepage = "https://github.com/openstack/pbr"; + license = licenses.asl20; + maintainers = teams.openstack.members; }; } diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix new file mode 100644 index 000000000000..a1c57684ce46 --- /dev/null +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -0,0 +1,49 @@ +{ stdenv +, buildPythonPackage +, git +, gnupg +, pbr +, mock +, sphinx +, stestr +, testresources +, testscenarios +, virtualenv +}: + +buildPythonPackage rec { + pname = "pbr"; + inherit (pbr) version; + + src = pbr.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pbr + git + gnupg + mock + sphinx + stestr + testresources + testscenarios + virtualenv + ]; + + checkPhase = '' + stestr run -e <(echo " + pbr.tests.test_core.TestCore.test_console_script_develop + pbr.tests.test_core.TestCore.test_console_script_install + pbr.tests.test_wsgi.TestWsgiScripts.test_with_argument + pbr.tests.test_wsgi.TestWsgiScripts.test_wsgi_script_run + ") + ''; +} From 28b6a91047e796b1578120342701dcb89838e4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 13 Sep 2021 11:27:50 +0200 Subject: [PATCH 1053/1062] libssh2: temporarily add separate 1.10.0 This is an attempt to side-step broken builtins.fetchurl and get this tarball into cache, so that staging rebuild might proceed. --- pkgs/development/libraries/libssh2/1_10.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/libraries/libssh2/1_10.nix diff --git a/pkgs/development/libraries/libssh2/1_10.nix b/pkgs/development/libraries/libssh2/1_10.nix new file mode 100644 index 000000000000..edba7a84ef2b --- /dev/null +++ b/pkgs/development/libraries/libssh2/1_10.nix @@ -0,0 +1,10 @@ +{ libssh2, fetchurl }: + +libssh2.overrideAttrs (attrs: rec { + version = "1.10.0"; + src = fetchurl { + url = with attrs; "${meta.homepage}/download/${pname}-${version}.tar.gz"; + sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; + }; + patches = []; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1297600cf9f4..06a53cc4ea97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17526,6 +17526,8 @@ with pkgs; libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; + #FIXME: temporary attribute + libssh2_1_10 = callPackage ../development/libraries/libssh2/1_10.nix { }; libstartup_notification = callPackage ../development/libraries/startup-notification { }; From f3fba3c3361ef0c03180af77852ba60ab501e2cc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 13 Sep 2021 08:15:33 -0700 Subject: [PATCH 1054/1062] azure-cli/azure-cli-core: update requests substitution --- pkgs/tools/admin/azure-cli/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 27e1f060a3f7..b50543dbe3d2 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -87,7 +87,7 @@ let postPatch = '' substituteInPlace setup.py \ --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ - --replace "requests~=2.25.1" "requests~=2.25" \ + --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; From 01bd54a0aa3f4f6ca23efbe0a9592fe578eefe16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 14 Sep 2021 13:54:10 +0200 Subject: [PATCH 1055/1062] python3Packages: rename passthru test for openstack team --- pkgs/development/python-modules/debtcollector/default.nix | 2 +- pkgs/development/python-modules/os-service-types/default.nix | 2 +- pkgs/development/python-modules/oslo-config/default.nix | 2 +- pkgs/development/python-modules/oslotest/default.nix | 2 +- pkgs/development/python-modules/pbr/default.nix | 2 +- pkgs/development/python-modules/stestr/default.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index 75555569e235..df3d78394605 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "debtcollector" ]; diff --git a/pkgs/development/python-modules/os-service-types/default.nix b/pkgs/development/python-modules/os-service-types/default.nix index 990af2ce6b9d..147685fb2b91 100644 --- a/pkgs/development/python-modules/os-service-types/default.nix +++ b/pkgs/development/python-modules/os-service-types/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "os_service_types" ]; diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index fface886eb94..125481d1e026 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix {}; + tests = callPackage ./tests.nix {}; }; pythonImportsCheck = [ "oslo_config" ]; diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index 66e06c8b3e72..aa646a08ee90 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix {}; + tests = callPackage ./tests.nix {}; }; pythonImportsCheck = [ "oslotest" ]; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 9c46e638fc44..77e8d5c210a2 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "pbr" ]; diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index 88259dc718e1..1e5f965a8026 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "stestr" ]; From 54cca75528fafcd8a45413b1323820c9128d01ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Sep 2021 20:30:55 +0200 Subject: [PATCH 1056/1062] python39Packages.cliff: fix missing dependency, tests and adopt to openstack team --- .../python-modules/cliff/default.nix | 46 +++++++++---------- .../python-modules/cliff/tests.nix | 34 ++++++++++++++ 2 files changed, 56 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/cliff/tests.nix diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 7eee574dad48..8b8f536bab6f 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -1,17 +1,14 @@ { lib , buildPythonPackage , fetchPypi +, autopage +, cmd2 , pbr , prettytable , pyparsing -, six -, stevedore , pyyaml -, cmd2 -, pytestCheckHook -, testtools -, fixtures -, which +, stevedore +, callPackage }: buildPythonPackage rec { @@ -23,34 +20,35 @@ buildPythonPackage rec { sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3"; }; + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + propagatedBuildInputs = [ + autopage + cmd2 pbr prettytable pyparsing - six - stevedore pyyaml - cmd2 + stevedore ]; - postPatch = '' - sed -i -e '/cmd2/c\cmd2' -e '/PrettyTable/c\PrettyTable' requirements.txt - ''; + # check in passthru.tests.pytest to escape infinite recursion with stestr + doCheck = false; - checkInputs = [ fixtures pytestCheckHook testtools which ]; - # add some tests - pytestFlagsArray = [ - "cliff/tests/test_utils.py" - "cliff/tests/test_app.py" - "cliff/tests/test_command.py" - "cliff/tests/test_help.py" - "cliff/tests/test_lister.py" - ]; + pythonImportsCheck = [ "cliff" ]; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { description = "Command Line Interface Formulation Framework"; - homepage = "https://docs.openstack.org/cliff/latest/"; + homepage = "https://github.com/openstack/cliff"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = teams.openstack.members; }; } diff --git a/pkgs/development/python-modules/cliff/tests.nix b/pkgs/development/python-modules/cliff/tests.nix new file mode 100644 index 000000000000..f7cc0226f2fc --- /dev/null +++ b/pkgs/development/python-modules/cliff/tests.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, cliff +, docutils +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "cliff"; + inherit (cliff) version; + + src = cliff.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + cliff + docutils + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; +} From ac74b42351e671d45949341fe5b9dac5bb69f574 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sat, 11 Sep 2021 19:23:32 -0600 Subject: [PATCH 1057/1062] csvs-to-sqlite: removed from `python-package` since it's an command line application --- .../python-modules => tools/misc}/csvs-to-sqlite/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{development/python-modules => tools/misc}/csvs-to-sqlite/default.nix (100%) diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix similarity index 100% rename from pkgs/development/python-modules/csvs-to-sqlite/default.nix rename to pkgs/tools/misc/csvs-to-sqlite/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aeb4cc079e7..afad862de885 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2470,7 +2470,7 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; - csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite; + csvs-to-sqlite = python3Packages.callPackage ../tools/misc/csvs-to-sqlite { }; cucumber = callPackage ../development/tools/cucumber {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88fa4b1d1ebb..951c675d09eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1749,8 +1749,6 @@ in { cssutils = callPackage ../development/python-modules/cssutils { }; - csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; - csvw = callPackage ../development/python-modules/csvw { }; cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; From 60ab0ab2db14e405ac6f019229b88ca4ff3e8883 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 14 Sep 2021 09:47:04 -0700 Subject: [PATCH 1058/1062] devpi-server: 6.0.0.dev0 -> 6.2.0, override pyramid version --- .../tools/devpi-server/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index b5ddda9f08b1..8e78bebebe9b 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,8 +1,23 @@ -{ lib, fetchFromGitHub, python3Packages, nginx }: +{ lib, fetchFromGitHub, python3, nginx }: -python3Packages.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + # pyramid 2.0 no longer has a 'pyramid.compat' module + pyramid = super.pyramid.overridePythonAttrs (oldAttrs: rec { + version = "1.10.8"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-t81mWVvvkvgXZLl23d4rL6jk9fMl4C9l9ux/NwiynPY="; + }; + }); + }; + }; + +in with py.pkgs; +buildPythonApplication rec { pname = "devpi-server"; - version = "6.0.0.dev0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "devpi"; @@ -10,9 +25,15 @@ python3Packages.buildPythonApplication rec { rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c"; sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm"; }; + sourceRoot = "source/server"; - propagatedBuildInputs = with python3Packages; [ + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.6.0,<1.0" "pluggy>=0.6.0,<2.0" + ''; + + propagatedBuildInputs = [ py appdirs devpi-common @@ -27,7 +48,7 @@ python3Packages.buildPythonApplication rec { waitress ]; - checkInputs = with python3Packages; [ + checkInputs = [ beautifulsoup4 nginx pytestCheckHook From 92042a285e45c40936a3813b95f2e1079a51ecf9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 14 Sep 2021 10:04:41 -0700 Subject: [PATCH 1059/1062] python3Packages.jupyter-server: 1.10.2 -> 1.11.0, fix build and tests --- .../python-modules/jupyter_server/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 3150235fcc7a..76d0617f4c8a 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -21,16 +21,17 @@ , anyio , websocket-client , requests +, requests-unixsocket }: buildPythonPackage rec { pname = "jupyter_server"; - version = "1.10.2"; + version = "1.11.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d3a3b68ebc6d7bfee1097f1712cf7709ee39c92379da2cc08724515bb85e72bf"; + sha256 = "sha256-irT0hKSiaY91fP8HadJ7XZkeAjKmZtVPTWraTmphMws="; }; propagatedBuildInputs = [ @@ -49,6 +50,7 @@ buildPythonPackage rec { prometheus-client anyio websocket-client + requests-unixsocket ]; checkInputs = [ @@ -59,9 +61,10 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) + export PATH=$out/bin:$PATH ''; - pytestFlagsArray = [ "jupyter_server/tests/" ]; + pytestFlagsArray = [ "jupyter_server" ]; # disabled failing tests disabledTests = [ From afc91f5fefe5d159001238feb56c3267f65357c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 14 Sep 2021 19:49:09 +0200 Subject: [PATCH 1060/1062] graphite2: fixup build on aarch64-darwin after PR #123420 See the PR for discussion. This caused thousands of build regressions. --- pkgs/development/libraries/silgraphite/graphite2.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f0ecab9d1274..ea1bb4936834 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ freetype ] - ++ lib.optionals (!stdenv.cc.isGNU) [ libgcc ]; + # On aarch64-darwin libgcc won't even build currently, and it doesn't seem needed. + ++ lib.optionals (with stdenv; !cc.isGNU && !(isDarwin && isAarch64)) [ libgcc ]; patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; From 6957f6cb1efd2a3b9b85683bd2b3cae6c0b1068c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 14 Sep 2021 11:04:45 -0700 Subject: [PATCH 1061/1062] python3Packages.google-resumable-media: fix google-crc32c bounds --- .../python-modules/google-resumable-media/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index f29604c9da30..854b6304e7a8 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -19,6 +19,11 @@ buildPythonPackage rec { sha256 = "36d682161fdcbfa29681212c210fabecbf6849a505a0cbc54b7f70a10a5278a2"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "google-crc32c >= 1.0, <= 1.1.2" "google-crc32c~=1.0" + ''; + propagatedBuildInputs = [ google-auth google-crc32c requests ]; checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; From a5d5f32f9018fcafb203437740964ab574aef8ab Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Tue, 14 Sep 2021 08:34:34 -0600 Subject: [PATCH 1062/1062] csvs-to-sqlite: added override for `click` dependency to version `7` in order to fix build The application is not capable to build with `click` greate than version `7`. --- pkgs/tools/misc/csvs-to-sqlite/default.nix | 24 +++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix index ea32471f09c5..b351b6e4efb6 100644 --- a/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -1,16 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPy3k -, click -, dateparser -, pandas -, py-lru-cache -, six -, pytestCheckHook -}: +{ lib, python3, fetchFromGitHub }: -buildPythonPackage rec { +let + # csvs-to-sqlite is currently not compatible with Click 8. See the following + # https://github.com/simonw/csvs-to-sqlite/issues/80 + # + # Workaround the issue by providing click 7 explicitly. + python = python3.override { + packageOverrides = self: super: { + click = self.callPackage ../../../development/python-modules/click/7.nix { }; + }; + }; +in with python.pkgs; buildPythonApplication rec { pname = "csvs-to-sqlite"; version = "1.2"; disabled = !isPy3k; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afad862de885..f10b60c4aa75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2470,7 +2470,7 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; - csvs-to-sqlite = python3Packages.callPackage ../tools/misc/csvs-to-sqlite { }; + csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cucumber = callPackage ../development/tools/cucumber {};