diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-10 00:12:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-10 00:12:33 +0000 |
commit | 864aa20266f410fa57340458b9d5c5e76d2af060 (patch) | |
tree | e86cc0e5b064636ea1d2d8e81309b8f27fefe000 /pkgs/development | |
parent | 01eec38f90306b0b68ba1c715c05244dcc2e5554 (diff) | |
parent | 2b1eb11946cd47f4d7a5e248a091852b0fbb5fda (diff) | |
download | nixpkgs-864aa20266f410fa57340458b9d5c5e76d2af060.tar nixpkgs-864aa20266f410fa57340458b9d5c5e76d2af060.tar.gz nixpkgs-864aa20266f410fa57340458b9d5c5e76d2af060.tar.bz2 nixpkgs-864aa20266f410fa57340458b9d5c5e76d2af060.tar.lz nixpkgs-864aa20266f410fa57340458b9d5c5e76d2af060.tar.xz nixpkgs-864aa20266f410fa57340458b9d5c5e76d2af060.tar.zst nixpkgs-864aa20266f410fa57340458b9d5c5e76d2af060.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development')
88 files changed, 1011 insertions, 1440 deletions
diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 1f58859f8a4..c6f787078b6 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -6,6 +6,7 @@ , git , fetchFromGitHub , ninja +, gitUpdater }: let @@ -13,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.53.0"; + version = "1.54.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-F3pGXZC4jSG9TV2sc5G9bQtKMY6xcPknwO0fqQ6uBoA="; + sha256 = "sha256-jHDQl6UJTyNGZ4PUTEiZCIN/RSRbBxlaVutkwrWbK9M="; fetchSubmodules = true; }; @@ -69,6 +70,10 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "check-circt check-circt-integration"; + passthru.updateScript = gitUpdater { + rev-prefix = "firtool-"; + }; + meta = { description = "Circuit IR compilers and tools"; homepage = "https://circt.org/"; diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index d9f809c0a0a..e894d2607bc 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.30"; + version = "1.73.31"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-dRlQUaWIHbu+DwQBFh6Tf4o2u0LTRw/Ehp2hT9LC8QE="; + sha256 = "sha256-jzjLIayR+xulSGKhvQ9VxWhZC6qRZ/4IHSe3lD8LD+M="; }; installPhase = '' diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 7d59eee55f2..cbe38f1127f 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -47,7 +47,7 @@ let # See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903 disableBootstrap' = disableBootstrap && !langFortran && !langGo; - crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index fd461d209ac..f3bf14e36f7 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -20,7 +20,7 @@ drv: lib.pipe drv (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ( targetPlatform != hostPlatform && - (enableShared || targetPlatform.libc == "msvcrt") && + (enableShared || targetPlatform.isMinGW) && withoutTargetLibc ) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 3cc614965f0..fdc79b57551 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -115,7 +115,7 @@ let inherit version; patches = callFile ./patches {}; /* Cross-gcc settings (build == host != target) */ - crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW; stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; diff --git a/pkgs/development/compilers/ocaml/5.1.nix b/pkgs/development/compilers/ocaml/5.1.nix new file mode 100644 index 00000000000..e11887809d4 --- /dev/null +++ b/pkgs/development/compilers/ocaml/5.1.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "5"; + minor_version = "1"; + patch_version = "0-rc3"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-5.1/ocaml-5.1.0~rc3.tar.xz"; + sha256 = "sha256:0cbvdcsq1qh70mm116dcgk6y7d4g4nrypzq20k7i6ww7am1563d3"; + }; +} diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix index 788c432591e..0c099a4c0d1 100644 --- a/pkgs/development/compilers/zig/hook.nix +++ b/pkgs/development/compilers/zig/hook.nix @@ -9,6 +9,26 @@ makeSetupHook { propagatedBuildInputs = [ zig ]; substitutions = { + # This zig_default_flags below is meant to avoid CPU feature impurity in + # Nixpkgs. However, this flagset is "unstable": it is specifically meant to + # be controlled by the upstream development team - being up to that team + # exposing or not that flags to the outside (especially the package manager + # teams). + + # Because of this hurdle, @andrewrk from Zig Software Foundation proposed + # some solutions for this issue. Hopefully they will be implemented in + # future releases of Zig. When this happens, this flagset should be + # revisited accordingly. + + # Below are some useful links describing the discovery process of this 'bug' + # in Nixpkgs: + + # https://github.com/NixOS/nixpkgs/issues/169461 + # https://github.com/NixOS/nixpkgs/issues/185644 + # https://github.com/NixOS/nixpkgs/pull/197046 + # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 + # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 + zig_default_flags = let releaseType = diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh index f84a02a3268..689ebec8a30 100644 --- a/pkgs/development/compilers/zig/setup-hook.sh +++ b/pkgs/development/compilers/zig/setup-hook.sh @@ -1,25 +1,5 @@ # shellcheck shell=bash disable=SC2154,SC2086 -# This readonly zigDefaultBuildFlagsArray below is meant to avoid CPU feature -# impurity in Nixpkgs. However, this flagset is "unstable": it is specifically -# meant to be controlled by the upstream development team - being up to that -# team exposing or not that flags to the outside (especially the package manager -# teams). - -# Because of this hurdle, @andrewrk from Zig Software Foundation proposed some -# solutions for this issue. Hopefully they will be implemented in future -# releases of Zig. When this happens, this flagset should be revisited -# accordingly. - -# Below are some useful links describing the discovery process of this 'bug' in -# Nixpkgs: - -# https://github.com/NixOS/nixpkgs/issues/169461 -# https://github.com/NixOS/nixpkgs/issues/185644 -# https://github.com/NixOS/nixpkgs/pull/197046 -# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 -# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 - readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -35,7 +15,7 @@ function zigBuildPhase { $zigBuildFlags "${zigBuildFlagsArray[@]}" ) - echoCmd 'build flags' "${flagsArray[@]}" + echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" runHook postBuild @@ -49,7 +29,7 @@ function zigCheckPhase { $zigCheckFlags "${zigCheckFlagsArray[@]}" ) - echoCmd 'check flags' "${flagsArray[@]}" + echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" runHook postCheck @@ -69,7 +49,7 @@ function zigInstallPhase { flagsArray+=("${prefixKey:---prefix}" "$prefix") fi - echoCmd 'install flags' "${flagsArray[@]}" + echoCmd 'zig install flags' "${flagsArray[@]}" zig build install "${flagsArray[@]}" runHook postInstall diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 74aff43f7ca..306c33a91fd 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -221,9 +221,9 @@ in { inherit (pkgs.buildPackages) makeWrapper; }; - sphinxHook = callPackage ({ makePythonHook, sphinx, installShellFiles }: + sphinxHook = callPackage ({ makePythonHook, installShellFiles }: makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; - propagatedBuildInputs = [ sphinx installShellFiles ]; + propagatedBuildInputs = [ pythonForBuild.pkgs.sphinx installShellFiles ]; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index e46c03ed808..080c944c90f 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -9,7 +9,7 @@ , enableDebug ? false , enableSingleThreaded ? false , enableMultiThreaded ? true -, enableShared ? !(with stdenv.hostPlatform; isStatic || libc == "msvcrt") # problems for now +, enableShared ? !(with stdenv.hostPlatform; isStatic || isMinGW) # problems for now , enableStatic ? !enableShared , enablePython ? false , enableNumpy ? false @@ -91,7 +91,7 @@ let ++ lib.optional (!enablePython) "--without-python" ++ lib.optional needUserConfig "--user-config=user-config.jam" ++ lib.optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off" - ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ + ++ lib.optionals stdenv.hostPlatform.isMinGW [ "threadapi=win32" ] ++ extraB2Args ); @@ -259,7 +259,7 @@ stdenv.mkDerivation { # Make boost header paths relative so that they are not runtime dependencies cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; - '' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' + '' + lib.optionalString stdenv.hostPlatform.isMinGW '' $RANLIB "$out/lib/"*.a ''; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 91b0df75f87..0f0e7405d76 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; postPatch = - lib.optionalString ((stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) + lib.optionalString ((stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isMinGW) || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h '' diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index b6902050b5d..27d4fda2ddc 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # This is needed by freeimage patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ] - ++ lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") + ++ lib.optional stdenv.hostPlatform.isMinGW ./mingw-boolean.patch; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index d670f8e9698..3f2f81183ca 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -17,7 +17,7 @@ (stdenv.hostPlatform == stdenv.buildPlatform || stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isWasi) , icuSupport ? false , icu -, enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isMinGW && !stdenv.hostPlatform.isStatic , enableStatic ? !enableShared , gnome }: diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 3b71167cdec..14e2f448082 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzip"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-UqYLRhglh+CDtx4rgvyqumTdXrAcWx8bxxBpo4WOQP4="; + sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M="; }; outputs = [ "out" "dev" "man" ]; @@ -50,6 +50,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; pkgConfigModules = [ "libzip" ]; platforms = platforms.unix; - changelog = "https://github.com/nih-at/libzip/blob/v${version}/NEWS.md"; + changelog = "https://github.com/nih-at/libzip/blob/v${finalAttrs.version}/NEWS.md"; }; }) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 7d8877c79ad..59a3b497579 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit (nixosTests) firefox firefox-esr-102 firefox-esr-115; + inherit (nixosTests) firefox firefox-esr-115; }; meta = with lib; { diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 8badbf9e876..592dbffbdff 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -182,9 +182,9 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) { - inherit (nixosTests) firefox-esr-102; + inherit (nixosTests) firefox-esr-115; } // lib.optionalAttrs (lib.versionAtLeast version nss_latest.version) { - inherit (nixosTests) firefox firefox-esr-115; + inherit (nixosTests) firefox; }; meta = with lib; { diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index b73deed2208..610a458c071 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.4.14.0"; + version = "2.4.15.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "v${version}"; - hash = "sha256-iHXU3Zr32XNn2Q2Pn/sgF6E1q/FXbdmVrOKC4lhGx3k="; + hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch b/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch new file mode 100644 index 00000000000..7312b41fc74 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch @@ -0,0 +1,44 @@ +From 4bfac4471f53c4f74c8d81020beb938f92d84ca5 Mon Sep 17 00:00:00 2001 +From: Bernd Edlinger <bernd.edlinger@hotmail.de> +Date: Tue, 22 Aug 2023 16:07:30 +0200 +Subject: [PATCH] Avoid clobbering non-volatile XMM registers + +This affects some Poly1305 assembler functions +which are only used for certain CPU types. + +Remove those functions for Windows targets, +as a simple interim solution. + +Fixes #21522 + +Reviewed-by: Tomas Mraz <tomas@openssl.org> +Reviewed-by: Paul Dale <pauli@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/21808) + +(cherry picked from commit 7b8e27bc2e02238986d89ef0ece067ec1b48e165) +--- + crypto/poly1305/asm/poly1305-x86_64.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl +index fa9bfb7a7b81..24bab9d0bcf9 100755 +--- a/crypto/poly1305/asm/poly1305-x86_64.pl ++++ b/crypto/poly1305/asm/poly1305-x86_64.pl +@@ -195,7 +195,7 @@ sub poly1305_iteration { + bt \$`5+32`,%r9 # AVX2? + cmovc %rax,%r10 + ___ +-$code.=<<___ if ($avx>3); ++$code.=<<___ if ($avx>3 && !$win64); + mov \$`(1<<31|1<<21|1<<16)`,%rax + shr \$32,%r9 + and %rax,%r9 +@@ -2724,7 +2724,7 @@ sub poly1305_iteration { + .cfi_endproc + .size poly1305_blocks_avx512,.-poly1305_blocks_avx512 + ___ +-if ($avx>3) { ++if ($avx>3 && !$win64) { + ######################################################################## + # VPMADD52 version using 2^44 radix. + # diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index aaee6685cfc..93786881a52 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -241,6 +241,9 @@ in { patches = [ ./1.1/nix-ssl-cert-file.patch + # https://www.openssl.org/news/secadv/20230908.txt + ./1.1/CVE-2023-4807.patch + (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 051a55df8e4..baef243cbdc 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - dontConfigure = stdenv.hostPlatform.libc == "msvcrt"; + dontConfigure = stdenv.hostPlatform.isMinGW; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' export CHOST=${stdenv.hostPlatform.config} @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { '' # Non-typical naming confuses libtool which then refuses to use zlib's DLL # in some cases, e.g. when compiling libpng. - + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt" && shared) '' + + lib.optionalString (stdenv.hostPlatform.isMinGW && shared) '' ln -s zlib1.dll $out/bin/libz.dll ''; @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = []; - installFlags = lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ + installFlags = lib.optionals stdenv.hostPlatform.isMinGW [ "BINARY_PATH=$(out)/bin" "INCLUDE_PATH=$(dev)/include" "LIBRARY_PATH=$(out)/lib" @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${stdenv.cc.targetPrefix}" - ] ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ "-f" "win32/Makefile.gcc" ] ++ lib.optionals shared [ # Note that as of writing (zlib 1.2.11), this flag only has an effect diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix new file mode 100644 index 00000000000..113cabc0440 --- /dev/null +++ b/pkgs/development/misc/juce/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch + +# Native build inputs +, cmake +, pkg-config +, makeWrapper + +# Dependencies +, alsa-lib +, freetype +, curl +, libglvnd +, webkitgtk +, pcre +, darwin +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "juce"; + version = "7.0.7"; + + src = fetchFromGitHub { + owner = "juce-framework"; + repo = "juce"; + rev = finalAttrs.version; + hash = "sha256-r+Wf/skPDexm3rsrVBoWrygKvV9HGlCQd7r0iHr9avM="; + }; + + patches = [ + (fetchpatch { + name = "juce-6.1.2-cmake_install.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/juce/-/raw/4e6d34034b102af3cd762a983cff5dfc09e44e91/juce-6.1.2-cmake_install.patch"; + hash = "sha256-fr2K/dH0Zam5QKS63zos7eq9QLwdr+bvQL5ZxScagVU="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = [ + freetype # libfreetype.so + curl # libcurl.so + stdenv.cc.cc.lib # libstdc++.so libgcc_s.so + pcre # libpcre2.pc + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib # libasound.so + libglvnd # libGL.so + webkitgtk # webkit2gtk-4.0 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.MetalKit + darwin.apple_sdk_11_0.frameworks.WebKit + ]; + + meta = with lib; { + description = "Cross-platform C++ application framework"; + longDescription = "JUCE is an open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, RTAS and AAX audio plug-ins"; + homepage = "https://github.com/juce-framework/JUCE"; + license = with licenses; [ isc gpl3Plus ]; + maintainers = with maintainers; [ kashw2 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index 18d98f364f2..c3be4ad5b9f 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -44,7 +44,6 @@ Here's a simple example of how `resholve.mkDerivation` is already used in nixpkg { lib , fetchFromGitHub , resholve -, substituteAll , bash , coreutils , goss @@ -154,7 +153,7 @@ that the `resholve` CLI expects. Here's an overview: |--------|------|------------| | scripts | `<list>` | scripts to resolve (`$out`-relative paths) | | interpreter | `"none"` `<path>` | The absolute interpreter `<path>` for the script's shebang. The special value `none` ensures there is no shebang. | -| inputs | `<packages>` | Packages to resolve external dependencies from. | +| inputs | `<packages>` `<paths>` | A list of packages and string paths to directories/files to resolve external dependencies from. | | fake | `<directives>` | pretend some commands exist | | fix | `<directives>` | fix things we can't auto-fix/ignore | | keep | `<directives>` | keep things we can't auto-fix/ignore | diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 3f7c011c756..dad33e39b55 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -57,6 +57,7 @@ mapAliases { inherit (pkgs) carto; # added 2023-08-17 castnow = pkgs.castnow; # added 2023-07-30 inherit (pkgs) clean-css-cli; # added 2023-08-18 + inherit (pkgs) clubhouse-cli; # added 2023-08-18 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 @@ -95,6 +96,7 @@ mapAliases { node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 inherit (pkgs) npm-check-updates; # added 2023-08-22 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 + parcel-bundler = parcel; # added 2023-09-04 inherit (pkgs) react-static; # added 2023-08-21 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index ed253a21134..66aff39ea45 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -29,7 +29,6 @@ cdk8s-cli = "cdk8s"; cdktf-cli = "cdktf"; clipboard-cli = "clipboard"; - clubhouse-cli = "club"; conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; diff2html-cli = "diff2html"; @@ -49,7 +48,6 @@ lua-fmt = "luafmt"; near-cli = "near"; neovim = "neovim-node-host"; - parcel-bundler = "parcel"; parsoid = "parse.js"; poor-mans-t-sql-formatter-cli = "sqlformat"; postcss-cli = "postcss"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f4e62fb9ae1..b6c111bdccd 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -38,7 +38,6 @@ , "cdk8s-cli" , "cdktf-cli" , "clipboard-cli" -, "clubhouse-cli" , "coc-clangd" , "coc-cmake" , "coc-css" @@ -193,7 +192,6 @@ , "npm-merge-driver" , "nrm" , "orval" -, "parcel-bundler" , "parcel" , "parsoid" , "patch-package" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 28e380ee3e2..724549d61fb 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -77887,74 +77887,6 @@ in bypassCache = true; reconstructLock = true; }; - clubhouse-cli = nodeEnv.buildNodePackage { - name = "clubhouse-cli"; - packageName = "clubhouse-cli"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clubhouse-cli/-/clubhouse-cli-2.7.0.tgz"; - sha512 = "Vu0ZPruo16+CbH/kCEALHV3lQ4WnRoaqTb+HPy2fY9ywtdOxPCiT//3WSxv8YN5qFwMbI2Fu931mmU9sR/O0ZA=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - sources."ansi-styles-3.2.1" - sources."async-3.2.3" - sources."chalk-2.4.2" - sources."cli-spinner-0.2.10" - sources."clubhouse-lib-0.10.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colors-1.0.3" - sources."commander-2.20.3" - sources."cycle-1.0.3" - sources."debug-4.3.4" - sources."decode-uri-component-0.2.2" - sources."encoding-0.1.13" - sources."escape-string-regexp-1.0.5" - sources."eyes-0.1.8" - sources."fetch-everywhere-1.0.5" - sources."filter-obj-1.1.0" - sources."has-flag-3.0.0" - sources."hasurl-1.0.0" - sources."iconv-lite-0.6.3" - sources."is-stream-1.1.0" - sources."isstream-0.1.2" - sources."lodash-4.17.21" - sources."lodash.sortby-4.7.0" - sources."ms-2.1.2" - sources."mute-stream-0.0.8" - sources."node-fetch-1.7.3" - sources."prompt-1.3.0" - sources."punycode-2.3.0" - sources."query-string-6.14.1" - sources."read-1.0.7" - sources."revalidator-0.1.8" - sources."safer-buffer-2.1.2" - sources."split-on-first-1.1.0" - sources."stack-trace-0.0.10" - sources."strict-uri-encode-2.0.0" - sources."supports-color-5.5.0" - sources."tr46-1.0.1" - sources."universal-url-2.0.0" - sources."webidl-conversions-4.0.2" - sources."whatwg-fetch-3.6.17" - sources."whatwg-url-7.1.0" - (sources."winston-2.4.7" // { - dependencies = [ - sources."async-2.6.4" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A command line tool for viewing, creating and updating clubhouse.io stories"; - homepage = "https://github.com/andjosh/clubhouse-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; @@ -100994,1068 +100926,6 @@ in bypassCache = true; reconstructLock = true; }; - parcel-bundler = nodeEnv.buildNodePackage { - name = "parcel-bundler"; - packageName = "parcel-bundler"; - version = "1.12.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.5.tgz"; - sha512 = "hpku8mW67U6PXQIenW6NBbphBOMb8XzW6B9r093DUhYj5GN2FUB/CXCiz5hKoPYUsusZ35BpProH8AUF9bh5IQ=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.2.1" - sources."@babel/code-frame-7.22.10" - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.10" // { - dependencies = [ - sources."json5-2.2.3" - sources."semver-6.3.1" - ]; - }) - sources."@babel/generator-7.22.10" - sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.10" - (sources."@babel/helper-compilation-targets-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."@babel/helper-create-class-features-plugin-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/helper-define-polyfill-provider-0.4.2" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.22.5" - sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.9" - sources."@babel/helper-optimise-call-expression-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.9" - sources."@babel/helper-replace-supers-7.22.9" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helper-wrap-function-7.22.10" - sources."@babel/helpers-7.22.10" - sources."@babel/highlight-7.22.10" - sources."@babel/parser-7.22.10" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5" - sources."@babel/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.22.5" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" - sources."@babel/plugin-syntax-import-meta-7.10.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.22.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-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.22.5" - sources."@babel/plugin-transform-async-generator-functions-7.22.10" - sources."@babel/plugin-transform-async-to-generator-7.22.5" - sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.22.10" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.5" - sources."@babel/plugin-transform-classes-7.22.6" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.22.10" - sources."@babel/plugin-transform-dotall-regex-7.22.5" - sources."@babel/plugin-transform-duplicate-keys-7.22.5" - sources."@babel/plugin-transform-dynamic-import-7.22.5" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.5" - sources."@babel/plugin-transform-flow-strip-types-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.5" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.5" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.5" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.22.5" - sources."@babel/plugin-transform-modules-systemjs-7.22.5" - sources."@babel/plugin-transform-modules-umd-7.22.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.22.5" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.22.5" - sources."@babel/plugin-transform-numeric-separator-7.22.5" - sources."@babel/plugin-transform-object-rest-spread-7.22.5" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.5" - sources."@babel/plugin-transform-optional-chaining-7.22.10" - sources."@babel/plugin-transform-parameters-7.22.5" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.5" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-react-jsx-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.10" - sources."@babel/plugin-transform-reserved-words-7.22.5" - sources."@babel/plugin-transform-shorthand-properties-7.22.5" - sources."@babel/plugin-transform-spread-7.22.5" - sources."@babel/plugin-transform-sticky-regex-7.22.5" - sources."@babel/plugin-transform-template-literals-7.22.5" - sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-unicode-escapes-7.22.10" - sources."@babel/plugin-transform-unicode-property-regex-7.22.5" - sources."@babel/plugin-transform-unicode-regex-7.22.5" - sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - (sources."@babel/preset-env-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.22.10" - sources."@babel/template-7.22.5" - sources."@babel/traverse-7.22.10" - sources."@babel/types-7.22.10" - sources."@iarna/toml-2.2.5" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@parcel/fs-1.11.0" - sources."@parcel/logger-1.11.1" - sources."@parcel/utils-1.11.0" - sources."@parcel/watcher-1.12.1" - sources."@parcel/workers-1.11.0" - sources."@types/q-1.5.5" - sources."abab-2.0.6" - sources."acorn-7.4.1" - (sources."acorn-globals-4.3.4" // { - dependencies = [ - sources."acorn-6.4.2" - ]; - }) - sources."acorn-walk-6.2.0" - sources."ajv-6.12.6" - sources."alphanum-sort-1.0.2" - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" - sources."ansi-to-html-0.6.15" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."normalize-path-2.1.1" - ]; - }) - 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-buffer-byte-length-1.0.0" - sources."array-equal-1.0.0" - sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.5" - sources."arraybuffer.prototype.slice-1.0.1" - sources."asn1-0.2.6" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" - sources."async-each-1.0.6" - sources."async-limiter-1.0.1" - sources."asynckit-0.4.0" - sources."atob-2.1.2" - sources."available-typed-arrays-1.0.5" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - (sources."babel-plugin-polyfill-corejs2-0.4.5" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.8.3" - sources."babel-plugin-polyfill-regenerator-0.5.2" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) - (sources."babel-types-6.26.0" // { - dependencies = [ - sources."to-fast-properties-1.0.3" - ]; - }) - sources."babylon-walk-1.0.2" - 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."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.13.1" - sources."bindings-1.5.0" - sources."bn.js-5.2.1" - sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."braces-2.3.2" - sources."brfs-1.6.1" - sources."brorand-1.1.0" - sources."browser-process-hrtime-1.0.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - ]; - }) - (sources."browserify-zlib-0.2.0" // { - dependencies = [ - sources."pako-1.0.11" - ]; - }) - sources."browserslist-4.21.10" - (sources."buffer-4.9.2" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) - sources."buffer-equal-0.0.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" - sources."call-bind-1.0.2" - sources."call-me-maybe-1.0.2" - sources."caller-callsite-2.0.0" - sources."caller-path-2.0.0" - sources."callsites-2.0.0" - sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001522" - sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."chokidar-2.1.8" - sources."cipher-base-1.0.4" - sources."class-utils-0.3.6" - sources."cli-cursor-2.1.0" - sources."cli-spinners-1.3.1" - sources."clone-2.1.2" - sources."coa-2.0.2" - sources."collection-visit-1.0.0" - sources."color-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-string-1.9.1" - sources."combined-stream-1.0.8" - sources."command-exists-1.2.9" - sources."commander-2.20.3" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - sources."convert-source-map-1.9.0" - sources."copy-descriptor-0.1.1" - sources."core-js-2.6.12" - sources."core-js-compat-3.32.1" - sources."core-util-is-1.0.3" - sources."cosmiconfig-5.2.1" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" - sources."crypto-browserify-3.12.0" - sources."css-color-names-0.0.4" - sources."css-declaration-sorter-4.0.1" - (sources."css-modules-loader-core-1.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."has-flag-1.0.0" - sources."postcss-6.0.1" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" - ]; - }) - sources."css-select-2.1.0" - sources."css-select-base-adapter-0.1.1" - sources."css-selector-tokenizer-0.7.3" - sources."css-tree-1.0.0-alpha.37" - sources."css-what-3.4.2" - sources."cssesc-3.0.0" - sources."cssnano-4.1.11" - sources."cssnano-preset-default-4.0.8" - sources."cssnano-util-get-arguments-4.0.0" - sources."cssnano-util-get-match-4.0.0" - sources."cssnano-util-raw-cache-4.0.1" - sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.2.0" // { - dependencies = [ - sources."css-tree-1.1.3" - sources."mdn-data-2.0.14" - ]; - }) - sources."cssom-0.3.8" - sources."cssstyle-1.4.0" - sources."dashdash-1.14.1" - sources."data-urls-1.1.0" - sources."deasync-0.1.28" - sources."debug-4.3.4" - sources."decode-uri-component-0.2.2" - sources."deep-is-0.1.4" - (sources."defaults-1.0.4" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."define-properties-1.2.0" - (sources."define-property-0.2.5" // { - dependencies = [ - (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."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."des.js-1.1.0" - sources."destroy-1.2.0" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."domain-browser-1.2.0" - sources."domelementtype-1.3.1" - sources."domexception-1.0.1" - (sources."domhandler-4.3.1" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."domutils-1.7.0" - sources."dot-prop-5.3.0" - sources."dotenv-5.0.1" - sources."dotenv-expand-5.1.0" - sources."duplexer2-0.1.4" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.499" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."encodeurl-1.0.2" - sources."entities-2.2.0" - sources."envinfo-7.10.0" - sources."error-ex-1.3.2" - (sources."es-abstract-1.22.1" // { - dependencies = [ - sources."object-inspect-1.12.3" - ]; - }) - sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.1" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.9.1" - sources."esprima-3.1.3" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."extend-3.0.2" - sources."extend-shallow-2.0.1" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."extsprintf-1.3.0" - sources."falafel-2.2.5" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-2.2.7" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastparse-1.1.2" - sources."file-uri-to-path-1.0.0" - sources."filesize-3.6.1" - sources."fill-range-4.0.0" - sources."for-each-0.3.3" - sources."for-in-1.0.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fragment-cache-0.2.1" - sources."fresh-0.5.2" - sources."fs.realpath-1.0.0" - sources."fsevents-1.2.13" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" - sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.1" - sources."get-port-3.2.0" - sources."get-symbol-description-1.0.0" - sources."get-value-2.0.6" - sources."getpass-0.1.7" - sources."glob-7.2.3" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-to-regexp-0.3.0" - sources."globals-11.12.0" - sources."globalthis-1.0.3" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."grapheme-breaker-0.3.2" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."has-bigints-1.0.2" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - sources."hex-color-regex-1.1.0" - sources."hmac-drbg-1.0.1" - sources."hsl-regex-1.0.0" - sources."hsla-regex-1.0.0" - sources."html-encoding-sniffer-1.0.2" - sources."html-tags-1.2.0" - (sources."htmlnano-0.2.9" // { - dependencies = [ - sources."acorn-8.10.0" - sources."posthtml-0.15.2" - sources."posthtml-parser-0.7.2" - sources."terser-5.19.2" - ]; - }) - (sources."htmlparser2-6.1.0" // { - dependencies = [ - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domutils-2.8.0" - ]; - }) - sources."http-errors-2.0.0" - sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" - sources."iconv-lite-0.4.24" - sources."icss-replace-symbols-1.1.0" - sources."ieee754-1.2.1" - sources."import-fresh-2.0.0" - sources."indexes-of-1.0.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.5" - sources."is-absolute-url-2.1.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-array-buffer-3.0.2" - sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.4" - sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.2" - sources."is-buffer-1.1.6" - sources."is-callable-1.2.7" - sources."is-color-stop-1.1.0" - sources."is-core-module-2.13.0" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-date-object-1.0.5" - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-directory-0.3.1" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-html-1.1.0" - sources."is-negative-zero-2.0.2" - sources."is-number-3.0.0" - sources."is-number-object-1.0.7" - sources."is-obj-2.0.0" - sources."is-plain-object-2.0.4" - sources."is-regex-1.1.4" - sources."is-resolvable-1.1.0" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" - sources."is-typedarray-1.0.0" - sources."is-url-1.2.4" - sources."is-weakref-1.0.2" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" - sources."isarray-2.0.5" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isstream-0.1.2" - sources."js-tokens-4.0.0" - (sources."js-yaml-3.14.1" // { - dependencies = [ - sources."esprima-4.0.1" - ]; - }) - sources."jsbn-0.1.1" - (sources."jsdom-14.1.0" // { - dependencies = [ - sources."acorn-6.4.2" - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - sources."ws-6.2.2" - ]; - }) - sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."json5-1.0.2" - sources."jsprim-1.4.2" - sources."kind-of-3.2.2" - sources."levn-0.3.0" - sources."lodash-4.17.21" - sources."lodash.clone-4.5.0" - sources."lodash.debounce-4.0.8" - sources."lodash.memoize-4.1.2" - sources."lodash.sortby-4.7.0" - sources."lodash.uniq-4.5.0" - sources."log-symbols-2.2.0" - sources."lru-cache-5.1.1" - sources."magic-string-0.22.5" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."md5.js-1.3.5" - sources."mdn-data-2.0.4" - (sources."merge-source-map-1.0.4" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."merge2-1.4.1" - (sources."micromatch-3.1.10" // { - dependencies = [ - sources."define-property-2.0.2" - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - sources."kind-of-6.0.3" - ]; - }) - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-1.2.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - sources."nan-2.17.0" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."define-property-2.0.2" - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - sources."kind-of-6.0.3" - ]; - }) - sources."nice-try-1.0.5" - sources."node-addon-api-1.7.2" - sources."node-forge-0.10.0" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."node-releases-2.0.13" - sources."normalize-path-3.0.0" - sources."normalize-url-3.3.0" - sources."nth-check-1.0.2" - sources."nwsapi-2.2.7" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."object-copy-0.1.0" - sources."object-inspect-1.4.1" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.6" - sources."object.pick-1.3.0" - sources."object.values-1.1.6" - sources."on-finished-2.4.1" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opn-5.5.0" - sources."optionator-0.8.3" - sources."ora-2.1.0" - sources."os-browserify-0.3.0" - sources."pako-0.2.9" - sources."parse-asn1-5.1.6" - sources."parse-json-4.0.0" - sources."parse5-5.1.0" - sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" - 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."pbkdf2-3.1.2" - sources."performance-now-2.1.0" - sources."physical-cpu-count-2.0.0" - sources."picocolors-1.0.0" - sources."pn-1.1.0" - sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.39" // { - dependencies = [ - sources."picocolors-0.2.1" - ]; - }) - (sources."postcss-calc-7.0.5" // { - dependencies = [ - sources."postcss-value-parser-4.2.0" - ]; - }) - sources."postcss-colormin-4.0.3" - sources."postcss-convert-values-4.0.1" - sources."postcss-discard-comments-4.0.2" - sources."postcss-discard-duplicates-4.0.2" - sources."postcss-discard-empty-4.0.1" - sources."postcss-discard-overridden-4.0.1" - sources."postcss-merge-longhand-4.0.11" - (sources."postcss-merge-rules-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - sources."postcss-minify-font-values-4.0.2" - sources."postcss-minify-gradients-4.0.2" - sources."postcss-minify-params-4.0.2" - (sources."postcss-minify-selectors-4.0.2" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - (sources."postcss-modules-extract-imports-1.1.0" // { - dependencies = [ - sources."postcss-6.0.23" - ]; - }) - (sources."postcss-modules-local-by-default-1.2.0" // { - dependencies = [ - sources."postcss-6.0.23" - ]; - }) - (sources."postcss-modules-scope-1.1.0" // { - dependencies = [ - sources."postcss-6.0.23" - ]; - }) - (sources."postcss-modules-values-1.3.0" // { - dependencies = [ - sources."postcss-6.0.23" - ]; - }) - sources."postcss-normalize-charset-4.0.1" - sources."postcss-normalize-display-values-4.0.2" - sources."postcss-normalize-positions-4.0.2" - sources."postcss-normalize-repeat-style-4.0.2" - sources."postcss-normalize-string-4.0.2" - sources."postcss-normalize-timing-functions-4.0.2" - sources."postcss-normalize-unicode-4.0.1" - sources."postcss-normalize-url-4.0.1" - sources."postcss-normalize-whitespace-4.0.2" - sources."postcss-ordered-values-4.1.2" - sources."postcss-reduce-initial-4.0.3" - sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-6.0.13" - sources."postcss-svgo-4.0.3" - sources."postcss-unique-selectors-4.0.1" - sources."postcss-value-parser-3.3.1" - sources."posthtml-0.11.6" - (sources."posthtml-parser-0.4.2" // { - dependencies = [ - sources."domhandler-2.4.2" - sources."entities-1.1.2" - sources."htmlparser2-3.10.1" - sources."readable-stream-3.6.2" - ]; - }) - sources."posthtml-render-1.4.0" - sources."prelude-ls-1.1.2" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."psl-1.9.0" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."punycode-2.3.0" - (sources."purgecss-2.3.0" // { - dependencies = [ - sources."commander-5.1.0" - sources."postcss-7.0.32" - sources."supports-color-6.1.0" - ]; - }) - sources."q-1.5.1" - sources."qs-6.5.3" - sources."querystring-es3-0.2.1" - sources."quote-stream-1.0.2" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" - sources."range-parser-1.2.1" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) - sources."readdirp-2.2.1" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.14.0" - sources."regenerator-transform-0.15.2" - (sources."regex-not-1.0.2" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."regexp.prototype.flags-1.5.0" - sources."regexpu-core-5.3.2" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."relateurl-0.2.7" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."request-2.88.2" - sources."request-promise-core-1.1.4" - sources."request-promise-native-1.0.9" - sources."resolve-1.22.4" - sources."resolve-from-3.0.0" - sources."resolve-url-0.2.1" - sources."restore-cursor-2.0.0" - sources."ret-0.1.15" - sources."rgb-regex-1.0.1" - sources."rgba-regex-1.0.0" - sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" - sources."safe-array-concat-1.0.0" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."saxes-3.1.11" - sources."semver-5.7.2" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serialize-to-js-3.1.2" - sources."serve-static-1.15.0" - sources."set-value-2.0.1" - sources."setimmediate-1.0.5" - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - 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.12.3" - ]; - }) - sources."signal-exit-3.0.7" - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."snapdragon-util-3.0.1" - sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.21" - sources."source-map-url-0.4.1" - (sources."split-string-3.1.0" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."sprintf-js-1.0.3" - sources."srcset-3.0.1" - sources."sshpk-1.17.0" - sources."stable-0.1.8" - (sources."static-eval-2.1.0" // { - dependencies = [ - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - ]; - }) - sources."static-extend-0.1.2" - sources."static-module-2.2.5" - sources."statuses-2.0.1" - sources."stealthy-require-1.1.1" - sources."stream-browserify-2.0.2" - sources."stream-http-2.8.3" - sources."string.prototype.trim-1.2.7" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" - sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" - (sources."stylehacks-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svgo-1.3.2" - sources."symbol-tree-3.2.4" - sources."terser-3.17.0" - sources."through2-2.0.5" - sources."timers-browserify-2.0.12" - sources."timsort-0.3.0" - sources."tiny-inflate-1.0.3" - sources."to-arraybuffer-1.0.1" - sources."to-fast-properties-2.0.0" - sources."to-object-path-0.3.0" - (sources."to-regex-3.0.2" // { - dependencies = [ - sources."define-property-2.0.2" - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."to-regex-range-2.1.1" - sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" - sources."tr46-1.0.1" - sources."tty-browserify-0.0.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" - sources."typedarray-0.0.6" - sources."unbox-primitive-1.0.2" - (sources."uncss-0.17.3" // { - dependencies = [ - sources."is-absolute-url-3.0.3" - sources."postcss-selector-parser-6.0.2" - ]; - }) - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."unicode-trie-0.3.1" - sources."union-value-1.0.1" - sources."uniq-1.0.1" - sources."uniqs-2.0.0" - sources."unquote-1.1.1" - (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."isarray-1.0.0" - ]; - }) - sources."upath-1.2.0" - sources."update-browserslist-db-1.0.11" - sources."uri-js-4.4.1" - sources."urix-0.1.0" - (sources."url-0.11.1" // { - dependencies = [ - sources."punycode-1.4.1" - sources."qs-6.11.2" - ]; - }) - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" - sources."uuid-3.4.0" - sources."v8-compile-cache-2.4.0" - sources."vendors-1.0.4" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - sources."vlq-0.2.3" - sources."vm-browserify-1.1.2" - 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-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.11" - sources."word-wrap-1.2.5" - sources."wrappy-1.0.2" - sources."ws-5.2.3" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" - sources."xtend-4.0.2" - sources."yallist-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Blazing fast, zero configuration web application bundler"; - homepage = "https://github.com/parcel-bundler/parcel#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; parcel = nodeEnv.buildNodePackage { name = "parcel"; packageName = "parcel"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index a73cd7d128c..c58c474e5a2 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -256,13 +256,6 @@ final: prev: { ''; }; - parcel = prev.parcel.override { - buildInputs = [ final.node-gyp-build ]; - preRebuild = '' - sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js - ''; - }; - pnpm = prev.pnpm.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 4c92b58bdbc..f1fbd02ba0f 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl -, ppx_sexp_conv, ppx_cstruct +, ppx_sexp_conv , mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk , x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf , rresult, mtime, logs, fmt, cmdliner, base64 @@ -24,8 +24,6 @@ buildDunePackage rec { ppx_sexp_conv eqaf ]; - buildInputs = [ ppx_cstruct ]; - doCheck = true; checkInputs = [ cstruct-unix cmdliner fmt ]; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 2d5f73be42b..7a07daf8ddc 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -35,6 +35,7 @@ let param = "4.13" = v6_6; "4.14" = v6_6; "5.0" = v6_6; + "5.1" = v6_6; }.${ocaml.meta.branch}; in diff --git a/pkgs/development/perl-modules/tk-configure-implicit-int-fix.patch b/pkgs/development/perl-modules/tk-configure-implicit-int-fix.patch new file mode 100644 index 00000000000..215bf864cfe --- /dev/null +++ b/pkgs/development/perl-modules/tk-configure-implicit-int-fix.patch @@ -0,0 +1,11 @@ +--- a/JPEG/jpeg/configure 2013-11-15 18:50:03.000000000 -0500 ++++ b/JPEG/jpeg/configure 2023-09-05 23:36:12.675151164 -0400 +@@ -623,7 +623,7 @@ + cat > conftest.$ac_ext <<EOF + #line 625 "configure" + #include "confdefs.h" +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + ac_cv_prog_cc_works=yes diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix new file mode 100644 index 00000000000..6f998be9a1f --- /dev/null +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -0,0 +1,27 @@ +{ buildPecl, lib, pcre2, fetchFromGitHub, php, pkg-config }: + +buildPecl rec { + pname = "phalcon"; + version = "5.3.0"; + + src = fetchFromGitHub { + owner = "phalcon"; + repo = "cphalcon"; + rev = "v${version}"; + hash = "sha256-82DJ+Qx0OYhw9Nv6FkAoyBec8WWfAiqNfBU9Ll/8RfA="; + }; + + internalDeps = [ php.extensions.session php.extensions.pdo ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pcre2 ]; + + sourceRoot = "${src.name}/build/phalcon"; + + meta = with lib; { + description = "Phalcon is a full stack PHP framework offering low resource consumption and high performance."; + license = licenses.bsd3; + homepage = "https://phalcon.io"; + maintainers = teams.php.members ++ [ maintainers.krzaczek ]; + }; +} diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index cdd8ff94b89..c2f189e2749 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -1,5 +1,6 @@ { lib , aiofiles +, async-timeout , buildPythonPackage , cryptography , fetchFromGitHub @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = !isPy3k; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - hash = "sha256-+RU3nyJpHq0r/9erEbjUILpwIPWq14HdOX7LkSxySs4="; + hash = "sha256-pOkFUh3SEu/ch9R1lVoQn50nufQp8oI+D4/+Ybal5CA="; }; propagatedBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { async = [ aiofiles + async-timeout ]; usb = [ libusb1 @@ -46,9 +48,7 @@ buildPythonPackage rec { mock pycryptodome pytestCheckHook - ] - ++ passthru.optional-dependencies.async - ++ passthru.optional-dependencies.usb; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "adb_shell" diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix index 68e79900849..b4d39350ba4 100644 --- a/pkgs/development/python-modules/aiomqtt/default.nix +++ b/pkgs/development/python-modules/aiomqtt/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "aiomqtt"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sbtinstruments"; repo = "aiomqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-8f3opbvN/hmT6AEMD7Co5n5IqdhP0higbaDGUBWJRzU="; + hash = "sha256-WfHyCjNowtgTBADKeGyBBbO2JQ6YXJFvAtSq0iLzSbw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index f2afe527833..8ea691eb485 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -1,6 +1,7 @@ { lib , adb-shell , aiofiles +, async-timeout , buildPythonPackage , fetchFromGitHub , mock @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.71"; + version = "0.0.72"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,11 +21,12 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-vFEMOGxkt4zfOeKTKwr2tcBUSYRPSWNlaKUVcPIM34w="; + hash = "sha256-oDC5NWmdo6Ijxz2ER9CjtCZxWkancUNyxVe2ofH4c+Q="; }; propagatedBuildInputs = [ adb-shell + async-timeout pure-python-adb ]; diff --git a/pkgs/development/python-modules/anel-pwrctrl-homeassistant/default.nix b/pkgs/development/python-modules/anel-pwrctrl-homeassistant/default.nix new file mode 100644 index 00000000000..d32138c68df --- /dev/null +++ b/pkgs/development/python-modules/anel-pwrctrl-homeassistant/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: +buildPythonPackage rec { + pname = "anel-pwrctrl-homeassistant"; + version = "0.0.1.dev2"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "anel_pwrctrl-homeassistant"; + hash = "sha256-AcsnYD9CeGAarm5QdweUF6CUFwUywhfmU46NG8+Cm4s="; + }; + + # No tests + doCheck = false; + + pythonImportsCheck = [ + "anel_pwrctrl" + ]; + + meta = with lib; { + description = "Discover and control ANEL NET-PwrCtrl devices"; + homepage = "https://github.com/mweinelt/anel-pwrctrl"; + license = licenses.mit; + maintainers = with maintainers; [jamiemagee]; + }; +} diff --git a/pkgs/development/python-modules/ansi2image/default.nix b/pkgs/development/python-modules/ansi2image/default.nix new file mode 100644 index 00000000000..1d66f846bac --- /dev/null +++ b/pkgs/development/python-modules/ansi2image/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, colorama +, fetchFromGitHub +, pillow +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ansi2image"; + version = "0.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "helviojunior"; + repo = "ansi2image"; + rev = "refs/tags/v${version}"; + hash = "sha256-1sPEEWcOzesLQXSeMsUra8ZRSMAKzH6iisOgdhpxhKM="; + }; + + propagatedBuildInputs = [ + colorama + pillow + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ansi2image" + ]; + + pytestFlagsArray = [ + "tests/tests.py" + ]; + + meta = with lib; { + description = "Module to convert ANSI text to an image"; + homepage = "https://github.com/helviojunior/ansi2image"; + changelog = "https://github.com/helviojunior/ansi2image/blob/${version}/CHANGELOG"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/baycomp/default.nix b/pkgs/development/python-modules/baycomp/default.nix index a9167a4c0ac..0d4f59745f0 100644 --- a/pkgs/development/python-modules/baycomp/default.nix +++ b/pkgs/development/python-modules/baycomp/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "baycomp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - hash = "sha256-xDRywWvXzfSITdTHPdMH5KPacJf+Scg81eiNdRQpI7A="; + hash = "sha256-MrJa17FtWyUd259hEKMtezlTuYcJbaHSXvJ3k10l2uw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breezy/Cargo.lock b/pkgs/development/python-modules/breezy/Cargo.lock index 5811ccf10ff..6b145749770 100644 --- a/pkgs/development/python-modules/breezy/Cargo.lock +++ b/pkgs/development/python-modules/breezy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -25,7 +25,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "breezy" -version = "3.3.3" +version = "3.3.4" dependencies = [ "pyo3", ] @@ -50,15 +50,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -66,24 +66,24 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" @@ -97,31 +97,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" dependencies = [ "cfg-if", "indoc", @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" dependencies = [ "once_cell", "target-lexicon", @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" dependencies = [ "libc", "pyo3-build-config", @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" dependencies = [ "proc-macro2", "quote", @@ -179,27 +179,39 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.8.3" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -208,13 +220,13 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rio-py" -version = "3.3.3" +version = "3.3.4" dependencies = [ "lazy_static", "pyo3", @@ -223,15 +235,15 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "syn" @@ -246,15 +258,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unindent" @@ -263,19 +275,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -288,42 +291,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 9868bc672b7..5fb4dd913e6 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.3.3"; + version = "3.3.4"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-WrXmxp63uja5lfPIPjPnvh1d/KwrkoOIjh4MYeRwMOc="; + hash = "sha256-fEEvOfo8YWhx+xuiqD/KNstlso5/K1XJnGY64tkLIwE="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 369879878bb..dd4e5f50333 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -17,6 +17,7 @@ , six , zope-component , zope_interface +, setuptools , dialog , gnureadline , pytest-xdist @@ -26,13 +27,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "2.4.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BQsdhlYABZtz5+SORiCVnWMZdMmiWGM9W1YLqObyFo8="; + hash = "sha256-CbYamk1+NvcyS6w7pOjpD5lqWHCk+VJqF9R3xYxzpQk="; }; sourceRoot = "${src.name}/${pname}"; @@ -52,6 +53,7 @@ buildPythonPackage rec { six zope-component zope_interface + setuptools # for pkg_resources ]; buildInputs = [ dialog gnureadline ]; diff --git a/pkgs/development/python-modules/debianbts/default.nix b/pkgs/development/python-modules/debianbts/default.nix index b2c2b271d61..5390e40a206 100644 --- a/pkgs/development/python-modules/debianbts/default.nix +++ b/pkgs/development/python-modules/debianbts/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, nix-update-script , pysimplesoap , pytest , pytest-xdist , pythonOlder @@ -13,6 +14,7 @@ buildPythonPackage rec { format = "pyproject"; disabled = pythonOlder "3.7"; + passthru.updateScript = nix-update-script { }; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix index f96d8093609..2f1c6e3c32a 100644 --- a/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-admin-sortable2"; - version = "2.1.8"; + version = "2.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-aTOpu6nb7cShBrtIjkuKH7hcvgRZ+0ZQT+YC1l2/0+k="; + hash = "sha256-vwNnhcWYaFoAGesINAuI/mynS9F4Az4ikObEG2L6S/E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-celery-results/default.nix b/pkgs/development/python-modules/django-celery-results/default.nix index 3e413ca4e15..080d63b75bf 100644 --- a/pkgs/development/python-modules/django-celery-results/default.nix +++ b/pkgs/development/python-modules/django-celery-results/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "django-celery-results"; - version = "2.4.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_celery_results"; inherit version; - hash = "sha256-dapRlw21aRy/JCxqD/UMjN9BniZc0Om3cjNdBkNsS5k="; + hash = "sha256-PstxR/dz800DgbrGJGM3zkz4ii6nuCd07UjlGLZ7uP0="; }; postPatch = '' @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Celery result back end with django"; homepage = "https://github.com/celery/django-celery-results"; + changelog = "https://github.com/celery/django-celery-results/blob/v{version}/Changelog"; license = licenses.bsd3; maintainers = with maintainers; [ babariviere ]; }; diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix new file mode 100644 index 00000000000..51e7265725a --- /dev/null +++ b/pkgs/development/python-modules/dronecan/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dronecan"; + version = "1.0.25"; + format = "setuptools"; + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0WKmVZwE6OgBckWWvPcn5BYqXMEt6Mr1P68UMHfRp4I="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dronecan" + ]; + + meta = with lib; { + description = "Python implementation of the DroneCAN v1 protocol stack"; + longDescription = '' + DroneCAN is a lightweight protocol designed for reliable communication in aerospace and robotic applications via CAN bus. + ''; + homepage = "https://dronecan.github.io/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix new file mode 100644 index 00000000000..d3633af2bb8 --- /dev/null +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, onnxruntime +, requests +, tokenizers +, tqdm +, pytestCheckHook +}: + +buildPythonPackage { + pname = "fastembed"; + version = "unstable-2023-09-07"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "qdrant"; + repo = "fastembed"; + rev = "9c5d32f271dfe9ae4730694727ff5df480983942"; + hash = "sha256-d7Zb0IL0NOPEPsCHe/ZMNELnSCG4+y8JmGAXnCRUd50="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + onnxruntime + requests + tokenizers + tqdm + ]; + + pythonImportsCheck = [ "fastembed" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # there is one test and it requires network + doCheck = false; + + meta = with lib; { + description = "Fast, Accurate, Lightweight Python library to make State of the Art Embedding"; + homepage = "https://github.com/qdrant/fastembed"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 455a04d2cf0..846b390b9c9 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.5.0"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IYkx6OKypzpY6zVKKI4DoP1fscRYMmGsbkwHhmZGjJM="; + hash = "sha256-lyhS9sZfkz4VpKIQwrlpMHY7Rxl830ql9b6kNe+2Juc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix new file mode 100644 index 00000000000..ce866a67b4c --- /dev/null +++ b/pkgs/development/python-modules/gradio/client.nix @@ -0,0 +1,109 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pythonRelaxDepsHook +# pyproject +, hatchling +, hatch-requirements-txt +, hatch-fancy-pypi-readme +# runtime +, setuptools +, fsspec +, httpx +, huggingface-hub +, packaging +, requests +, typing-extensions +, websockets +# checkInputs +, pytestCheckHook +, pytest-asyncio +, pydub +, gradio +}: + +let + + # Cyclic dependencies are fun! + # This is gradio without gradio-client, only needed for checkPhase + gradio' = (gradio.override (old: { + gradio-client = null; + })).overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pythonRelaxDepsHook ]; + pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio_client" ]; + doInstallCheck = false; + doCheck = false; + pythonImportsCheck = null; + }); + +in + +buildPythonPackage rec { + pname = "gradio_client"; + version = "0.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + # no tests on pypi + src = fetchFromGitHub { + owner = "gradio-app"; + repo = "gradio"; + #rev = "refs/tags/v${gradio.version}"; + rev = "ba4c6d9e65138c97062d1757d2a588c4fc449daa"; # v3.43.1 is not tagged... + sparseCheckout = [ "client/python" ]; + hash = "sha256-savka4opyZKSWPeBqc2LZqvwVXLYIZz5dS1OWJSwvHo="; + }; + prePatch = '' + cd client/python + ''; + + nativeBuildInputs = [ + hatchling + hatch-requirements-txt + hatch-fancy-pypi-readme + ]; + + propagatedBuildInputs = [ + setuptools # needed for 'pkg_resources' + fsspec + httpx + huggingface-hub + packaging + requests + typing-extensions + websockets + ]; + + nativeCheckInputs =[ + pytestCheckHook + pytest-asyncio + pydub + gradio' + ]; + disallowedReferences = [ + gradio' # ensuring we don't propagate this intermediate build + ]; + + # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). + preCheck = '' + export HOME=$TMPDIR + cat ${./conftest-skip-network-errors.py} >> test/conftest.py + ''; + + pytestFlagsArray = [ + "test/" + #"-m" "not flaky" # doesn't work, even when advertised + #"-x" "-W" "ignore" # uncomment for debugging help + ]; + + pythonImportsCheck = [ "gradio_client" ]; + + meta = with lib; { + homepage = "https://www.gradio.app/"; + description = "Lightweight library to use any Gradio app as an API"; + license = licenses.asl20; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index ffb99d72932..c09b55496be 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pythonOlder , pythonRelaxDepsHook -, writeText # pyproject , hatchling @@ -13,49 +12,48 @@ # runtime , setuptools , aiofiles -, aiohttp , altair , fastapi , ffmpy -, markdown-it-py -, mdit-py-plugins +, gradio-client +, httpx +, huggingface-hub +, importlib-resources +, jinja2 , markupsafe , matplotlib , numpy , orjson +, packaging , pandas , pillow -, pycryptodome +, pydantic , python-multipart , pydub , pyyaml , requests +, semantic-version +, typing-extensions , uvicorn -, jinja2 -, fsspec -, httpx -, pydantic , websockets -, typing-extensions # check , pytestCheckHook +, boto3 +, ffmpeg +, ipython , pytest-asyncio -, mlflow -, huggingface-hub -, transformers -, wandb , respx , scikit-image -, ipython -, ffmpeg +, torch +, tqdm +, transformers , vega_datasets -, boto3 }: buildPythonPackage rec { pname = "gradio"; - version = "3.20.1"; + version = "3.43.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -64,12 +62,13 @@ buildPythonPackage rec { # and has more frequent releases compared to github tags src = fetchPypi { inherit pname version; - hash = "sha256-oG97GwehyBWjWXzDqyfj+x2mAfM6OQhYKdA3j0Rv8Vs="; + hash = "sha256-a8eHw8jedrse1dpgup9BL60oXx4wvOk8X5z5DP1DWOs="; }; - pythonRelaxDeps = [ - "mdit-py-plugins" - ]; + # fix packaging.ParserSyntaxError, which can't handle comments + postPatch = '' + sed -ie "s/ #.*$//g" requirements*.txt + ''; nativeBuildInputs = [ pythonRelaxDepsHook @@ -79,55 +78,52 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - setuptools # needs pkg_resources + setuptools # needed for 'pkg_resources' aiofiles - aiohttp altair fastapi ffmpy - markdown-it-py - mdit-py-plugins + gradio-client + httpx + huggingface-hub + importlib-resources + jinja2 markupsafe matplotlib numpy orjson + packaging pandas pillow - pycryptodome + pydantic python-multipart pydub pyyaml requests + semantic-version + typing-extensions uvicorn - jinja2 - fsspec - httpx - pydantic websockets - typing-extensions - ] ++ markdown-it-py.optional-dependencies.linkify; + ]; nativeCheckInputs = [ pytestCheckHook + boto3 + ffmpeg + ipython pytest-asyncio - mlflow - #comet-ml # FIXME: enable once packaged - huggingface-hub - transformers - wandb respx scikit-image - ipython - ffmpeg - vega_datasets - boto3 # shap is needed as well, but breaks too often + torch + tqdm + transformers + vega_datasets ]; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. - preCheck = let - in '' + preCheck = '' export HOME=$TMPDIR cat ${./conftest-skip-network-errors.py} >> test/conftest.py ''; @@ -136,9 +132,8 @@ buildPythonPackage rec { # Actually broken "test_mount_gradio_app" - # FIXME: enable once comet-ml is packaged - "test_inline_display" - "test_integration_comet" + # requires network, it caught our xfail exception + "test_error_analytics_successful" # Flaky, tries to pin dependency behaviour. Sensitive to dep versions # These error only affect downstream use of the check dependencies. @@ -156,12 +151,16 @@ buildPythonPackage rec { # makes pytest freeze 50% of the time "test/test_interfaces.py" ]; - #pytestFlagsArray = [ "-x" "-W" "ignore" ]; # uncomment for debugging help + pytestFlagsArray = [ + "-x" # abort on first failure + #"-m" "not flaky" # doesn't work, even when advertised + #"-W" "ignore" # uncomment for debugging help + ]; # check the binary works outside the build env doInstallCheck = true; postInstallCheck = '' - env --ignore-environment $out/bin/gradio --help >/dev/null + env --ignore-environment $out/bin/gradio environment >/dev/null ''; pythonImportsCheck = [ "gradio" ]; diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 886df4537ed..2bd0c72151b 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.56.2"; + version = "1.58.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dKgXZq9jmrjxt/WVMdyBRkD0obzwEtwGzmviBbUKOUw="; + hash = "sha256-5gSKdY0XtsoXBSWOfuXZJtKWCpWuCLoJKd0jPlBazT0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 3fa3546eb97..29cbed491c1 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f8bRVo9365w5gMpkb31thGXCRWZuKfkFEow9Wv4/+bM="; + hash = "sha256-biQEAuRxz8q0d40IFElf06Iu6RzwikV4kYZOoj9gbWA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index aba6a22ea16..1fbb4e10805 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.10.0"; + version = "1.10.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-XPmrGg0SCTiZKMeTCeJywuKaa5ByY9FQTBy+THSJSiQ="; + hash = "sha256-IGFc6GulFs8Leq2EzGB+TiyRBCMulUzQ7MvzNTCl4dQ="; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 84e693bb722..76eea509758 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.3.1"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H5N5Bt9lMpupgBPclpL+IqTF5KZIES3lAFCLGKIbQeM="; + hash = "sha256-kvhl5iHhd4TnlVCAttBCSJ47jilJScxExurDBPWXcrE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 2df248c3d4d..37564eeb213 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.18.2"; + version = "7.19.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-43kyDgolXEu5J5OVaLKqjVdyWaobfGNvevNFh4CFjss="; + hash = "sha256-Wczk1DNoOpvd7efnZFUf4FSjYqHdkMKMNwNVeQOPeEg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nlpcloud/default.nix b/pkgs/development/python-modules/nlpcloud/default.nix index e995f6a97fa..49fdb5e528f 100644 --- a/pkgs/development/python-modules/nlpcloud/default.nix +++ b/pkgs/development/python-modules/nlpcloud/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nlpcloud"; - version = "1.1.43"; + version = "1.1.44"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-y3OZ5Tgd9FJmuon+9UyFmJgoASd1UyZVsWxmlPaxqEI="; + hash = "sha256-dOW/M9FJJiCii4+lZJ6Pg2bAdSpul4JRtzYdI7VgJbM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 3fca04a27db..0942dd0662c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.19"; + version = "8.13.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OBgCR2lyQMzt103sS/vbwiuxCLnF+ZHycMo+QTleb5Y="; + hash = "sha256-vys1qAbTeXnlNhEJQp2kbZoEflnZr5hjnXM8g059qyI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/proxy-db/default.nix b/pkgs/development/python-modules/proxy-db/default.nix new file mode 100644 index 00000000000..1a6781b763f --- /dev/null +++ b/pkgs/development/python-modules/proxy-db/default.nix @@ -0,0 +1,56 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, click +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, six +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "proxy-db"; + version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Nekmo"; + repo = "proxy-db"; + rev = "refs/tags/v${version}"; + hash = "sha256-NdbvK2sJKKoWNYsuBaCMWtKEvuMhgyKXcKZXQgTC4bY="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + click + requests + six + sqlalchemy + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "proxy_db" + ]; + + meta = with lib; { + description = "Module to manage proxies in a local database"; + homepage = "https://github.com/Nekmo/proxy-db/"; + changelog = "https://github.com/Nekmo/proxy-db/blob/v${version}/HISTORY.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix index d17c719196e..f897509c182 100644 --- a/pkgs/development/python-modules/pydiscourse/default.nix +++ b/pkgs/development/python-modules/pydiscourse/default.nix @@ -1,14 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytest-mock +, pytestCheckHook , pythonOlder , requests -, unittestCheckHook +, requests-mock }: buildPythonPackage rec { pname = "pydiscourse"; - version = "1.4.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +19,7 @@ buildPythonPackage rec { owner = "pydiscourse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-peDkXRcD/ieWYWXqv8hPxTSNRXBHcb/3sj/JJSF2RYg="; + hash = "sha256-BvVKOfc/PiAnkEnH5jsd8/0owr+ZvJIz/tpZx6K0fP0="; }; propagatedBuildInputs = [ @@ -25,7 +27,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - unittestCheckHook + pytest-mock + pytestCheckHook + requests-mock ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix new file mode 100644 index 00000000000..31ef680c85c --- /dev/null +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -0,0 +1,59 @@ +{ lib +, authlib +, buildPythonPackage +, dataclasses-json +, fetchFromGitHub +, httpx +, marshmallow +, pytest-httpx +, poetry-core +, pytestCheckHook +, pythonOlder +, pytz +, respx +}: + +buildPythonPackage rec { + pname = "pydiscovergy"; + version = "2.0.3"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "jpbede"; + repo = "pydiscovergy"; + rev = "refs/tags/${version}"; + hash = "sha256-iE80r9xXDI01gG0S9zhWsLSdVLQo2R4A5Ktnccsetzk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + authlib + dataclasses-json + httpx + marshmallow + pytz + ]; + + nativeCheckInputs = [ + pytest-httpx + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ + "pydiscovergy" + ]; + + meta = with lib; { + description = "Async Python 3 library for interacting with the Discovergy API"; + homepage = "https://github.com/jpbede/pydiscovergy"; + changelog = "https://github.com/jpbede/pydiscovergy/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index eb6fbe371b6..fd9ca66daeb 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.18.1"; + version = "0.18.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O4PNlL3lPSIyFw9MtPP678ggLBQRPedbZn1gWys7DPQ="; + hash = "sha256-GyYJZIjvy4JYNCUUJpQxt32U8lMS/iQoz4llbCmJQhU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index d4715c131ce..3715cc56404 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.5.0"; + version = "3.5.1"; format = "setuptools"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZoGpMhJng46nW7v/QgjGCsFZV6xV4PSh9/DH1d2dzdg="; + hash = "sha256-YFA9msaPOPDbQPkDbT8Rl7jWafUX8eFnV4JimSg+mmc="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 6d6f4c3baa4..4461c02c8ca 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-bP64JMDhSYusLzRq0Mv89x1c9DflmYFTih9RP+dY4/c="; + hash = "sha256-qvWrMucaSx7LltWYru30qVPDTVHtuqf8tKGFL+Fl8fU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysimplesoap/default.nix b/pkgs/development/python-modules/pysimplesoap/default.nix index eecf5442538..b35a6b6d6e7 100644 --- a/pkgs/development/python-modules/pysimplesoap/default.nix +++ b/pkgs/development/python-modules/pysimplesoap/default.nix @@ -3,13 +3,15 @@ , fetchPypi , buildPythonPackage , m2crypto +, nix-update-script }: buildPythonPackage rec { pname = "pysimplesoap"; - # Unfortunately, the latest stable release is broken on Python 3. version = "1.16.2"; + passthru.updateScript = nix-update-script { }; + src = fetchPypi { pname = "PySimpleSOAP"; inherit version; @@ -20,6 +22,7 @@ buildPythonPackage rec { m2crypto ]; + # Patches necessary for Python 3 compatibility plus bugfixes patches = map (args: fetchDebianPatch ({ inherit pname version; debianRevision = "5"; diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 5eb3b19afe0..a8e019ce88b 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.32.4"; + version = "0.33.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-tZ0nyjARqXDffDOBTsGQ1iZSzzkMToUENb+NwhJ7xY4="; + hash = "sha256-UAQlKfh6oljeWtEGYx7JiT1z9yFCAXRSlI4Ot6JUnoQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 57e5ab8ee01..643a67d898e 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -3,20 +3,22 @@ , fetchFromGitHub , grpcio , grpcio-tools -, h2 , httpx , numpy , pytestCheckHook , poetry-core , pydantic , pythonOlder -, typing-extensions , urllib3 +, portalocker +, fastembed +# check inputs +, pytest-asyncio }: buildPythonPackage rec { pname = "qdrant-client"; - version = "1.1.0"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rpNTV3VBTND39iW/kve0aG1KJzAIl1whmhH+e6RbOhw="; + hash = "sha256-k+ggx4QyVduqtV4WwHELyQDAHdaGE0bizpG1ie6x7FM="; }; nativeBuildInputs = [ @@ -36,31 +38,28 @@ buildPythonPackage rec { numpy httpx grpcio - typing-extensions + # typing-extensions grpcio-tools pydantic urllib3 - h2 + portalocker + ] ++ httpx.optional-dependencies.http2; + + pythonImportsCheck = [ + "qdrant_client" ]; nativeCheckInputs = [ pytestCheckHook + pytest-asyncio ]; - pythonImportsCheck = [ - "qdrant_client" - ]; + # tests require network access + doCheck = false; - disabledTests = [ - # Tests require network access - "test_conditional_payload_update" - "test_locks" - "test_multiple_vectors" - "test_points_crud" - "test_qdrant_client_integration" - "test_quantization_config" - "test_record_upload" - ]; + passthru.optional-dependencies = { + fastembed = [ fastembed ]; + }; meta = with lib; { description = "Python client for Qdrant vector search engine"; diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix new file mode 100644 index 00000000000..eafb5dd66a8 --- /dev/null +++ b/pkgs/development/python-modules/reptor/default.nix @@ -0,0 +1,99 @@ +{ lib +, asgiref +, buildPythonPackage +, certifi +, charset-normalizer +, deepl +, django +, fetchFromGitHub +, gql +, idna +, markdown-it-py +, mdurl +, pygments +, pytest +, pytestCheckHook +, pythonOlder +, pyyaml +, reptor +, requests +, rich +, setuptools +, sqlparse +, termcolor +, toml +, urllib3 +, xmltodict +}: + +buildPythonPackage rec { + pname = "reptor"; + version = "0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Syslifters"; + repo = "reptor"; + rev = "refs/tags/${version}"; + hash = "sha256-Pkz0snlYMd+xn7fJKVdO8M8wA7ABSq8R6i6UN+bwx6Y="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + asgiref + certifi + charset-normalizer + django + idna + markdown-it-py + mdurl + pygments + pyyaml + requests + rich + sqlparse + termcolor + toml + urllib3 + xmltodict + ]; + + passthru.optional-dependencies = { + ghostwriter = [ + gql + ]; + translate = [ + deepl + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "reptor" + ]; + + disabledTestPaths = [ + # Tests want to use pip install dependencies + "reptor/plugins/importers/GhostWriter/tests/test_ghostwriter.py" + ]; + + meta = with lib; { + description = "Module to do automated pentest reporting with SysReptor"; + homepage = "https://github.com/Syslifters/reptor"; + changelog = "https://github.com/Syslifters/reptor/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 165cfd2ebbf..04c934b4ed1 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ropgadget"; - version = "7.2"; + version = "7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "refs/tags/v${version}"; - hash = "sha256-JvGDnMh42CbdsbE8jM3jD/4JMl6XlmkJfojvlBhFWA0="; + hash = "sha256-6m8opcTM4vrK+VCPXxNhZttUq6YmS8swLUDhjyfinWE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix index 2c90e86d8fa..ea35dfed1b1 100644 --- a/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-app-django"; rev = "refs/tags/${version}"; - hash = "sha256-GLOZfiSXkUnTK8Mxg+5jbxkE6Mo0kW5vMZsPe9G/dpU="; + hash = "sha256-YJsE8YfLaUsBjwehheic6YG+6robWeBzKL3T7V0c8E8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index bf21e0ee59d..020417ece1d 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.2"; + version = "0.7.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-CyyvzhuDB9XgroeP+WPTJIufT3VU9fD6Pg2Q1prB0Mo="; + hash = "sha256-sIPuo1kd08Quflf7oFxoo1H56cdUDlbNTfFkn8j3jVE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index 97114328969..0d1e44468e4 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { pname = "tika-client"; - version = "0.2.0"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stumpylog"; repo = "tika-client"; - rev = version; - hash = "sha256-ApKj+Lo3bG6bkgyYBwfY+4uodcGB/bupoGwZdSkizQE="; + rev = "refs/tags/${version}"; + hash = "sha256-yp9Wxc5RUZYhv2RxQwImZGqqoQmtZEkfEmj40ilxhQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 24626a9d66c..e507ceaf092 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "4.3.0"; + version = "6.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Trim21"; repo = "transmission-rpc"; rev = "refs/tags/v${version}"; - hash = "sha256-kcrPUBpx8puhG4de55tDGDmOnJPAOZzr+zC5gRd8b0s="; + hash = "sha256-gRyxQ6Upc1YBRhciVfyt0IGjv8K8ni4I1ODRS6o3tHA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 482c4749456..05d26bcd485 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -2,18 +2,18 @@ , buildPythonPackage , fetchPypi , setuptools-scm -, pyxb +, elementpath , pytestCheckHook }: buildPythonPackage rec { pname = "yangson"; - version = "1.4.16"; + version = "1.4.18"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-P447JnQ8zhalcg9k8prW1QQE3h5PqY155hFtvLvBVSI="; + hash = "sha256-VMgx2MTiOoAw8tW8SckheN950JVbdWWSS3PWDNs0dT0="; }; nativeBuildInputs = [ @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - pyxb + elementpath ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix index afb475e018e..c90da30a746 100644 --- a/pkgs/development/python-modules/yaspin/default.nix +++ b/pkgs/development/python-modules/yaspin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yaspin"; - version = "2.3.0"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pavdmyt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TURfjhEqkg8TT7dsoIOn2iAeD7+lX8+s9hItritf1GU="; + hash = "sha256-cYTCJyHZ9yNg6BfpZ+g3P0yMWFhYUxgYtlbANNgfohQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 448b8a1b7cc..f59a7e9ab7d 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.215.1"; + version = "0.216.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-n6swStUU+mKeUhs94h71eCJk02yP6QFAkpDz67DJmXg="; + sha256 = "sha256-Nx6BAeaJGbrfjmH5dSb8Cb1TG2SDeF+lCeGOLW27cJs="; }; postPatch = '' diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index eb72de76af7..ca056a7f4d9 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-02W9YOnV/zXopH3C9UNKu5gepNVS2gzoGa10uaKYu94="; + hash = "sha256-Dyu/cPoYI8dm/p/91oL5g8ilz9ksw4i0opsPT6rGztc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-h1uAAL3FBskx6Qv9E5WY+UPeXK49WW/hFoNN4QyKevU="; + vendorHash = "sha256-Jsp4rGIltszpQe05S3W+UFzPxhb6N5lCzUaZWBkXNWY="; nativeBuildInputs = [ installShellFiles ]; @@ -45,6 +45,8 @@ buildGoModule rec { # networking required to fetch alpine-keys # pulled out into a separate library next release "-skip=TestInitDB" + # fails to build image on read-only filesystem + "-skip=TestPublish" ]; postInstall = '' diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index d8020902154..c1bd29124c6 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.13.0"; + version = "1.13.3"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-iCopvHLbOepgsMFn//kfIdNZtAN7kqzZ1lVXcIGAAso="; + hash = "sha256-br3MRV2QTDHkRUdmv9s09aiPNfQtpwGBpS4Uk5tNbg8="; }; - cargoHash = "sha256-pEx7dszYfFxCGokkEbpNjoE1KsXo2r6t6FGLBXMZGwo="; + cargoHash = "sha256-2YsAVgBL3QUKCa5BN9KOWgBwITigDmifI+GhLj5j2W4="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 0a1c0f838e4..20f905a50ec 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.07.13"; + version = "2023.09.07"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-QldjFSUDZAafIzJCQGm9EKq8sVDGiyDsWpGVTYtWNTk="; + sha256 = "sha256-F7ePdITYKkGB6nsR3EFJ7zLDCUoT0g3i+AAjXzBd624="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 7cc6136b53f..429c19ecfce 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }: +{ lib, buildPythonPackage, fetchPypi, fetchurl, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg, unzip, zip }: { # this is exposed for potential plugins to use and for nix-update inherit buildbot-pkg; @@ -29,6 +29,42 @@ }; }; + www-react = buildPythonPackage rec { + pname = "buildbot-www-react"; + inherit (buildbot-pkg) version; + format = "wheel"; + + # fetchpypy returns a 404 for the wheel? + # normal source release doesn't have any assets + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/buildbot_www_react-${version}-py3-none-any.whl"; + hash = "sha256-pEzuMiDhGQtIWQm80lgKIcTjnS7Z8UJhH9plJup5O84="; + }; + + # Remove unneccessary circular dependency on buildbot + postPatch = '' + pushd dist + unzip buildbot_www_react-${version}-py3-none-any.whl + sed -i "s/Requires-Dist: buildbot//" buildbot_www_react-${version}.dist-info/METADATA + chmod -R u+w buildbot_www_react-${version}-py3-none-any.whl + zip -r buildbot_www_react-${version}-py3-none-any.whl buildbot_www_react-${version}.dist-info + popd + ''; + + buildInputs = [ buildbot-pkg ]; + nativeBuildInputs = [ unzip zip ]; + + # No tests + doCheck = false; + + meta = with lib; { + homepage = "https://buildbot.net/"; + description = "Buildbot UI (React)"; + maintainers = with maintainers; [ mic92 ]; + license = licenses.gpl2Only; + }; + }; + console-view = buildPythonPackage rec { pname = "buildbot-console-view"; inherit (buildbot-pkg) version; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index a295993607a..3bbbfc840e4 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -6,6 +6,7 @@ nix-update buildbot nix-update --version=skip buildbot-worker nix-update --version=skip buildbot-plugins.buildbot-pkg nix-update --version=skip buildbot-plugins.www +nix-update --version=skip buildbot-plugins.www-react nix-update --version=skip buildbot-plugins.console-view nix-update --version=skip buildbot-plugins.waterfall-view nix-update --version=skip buildbot-plugins.grid-view diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 27f477c5554..43c36322eb0 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.24"; + version = "3.16.27"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DXdecPsxYE12YkOn6acuai+mbqNkzZUEXEw1+ZcJlt8="; + sha256 = "sha256-ZHDx6xE/apYF05CXtGJxlp2AWfeEAkWi3zloTFFr78M="; }; subPackages = [ "." ]; - vendorHash = "sha256-9ZWK5xw2onwm9F/o/upGuo080X6neXUrSF+0WR+FpCs="; + vendorHash = "sha256-2+7GQ54AHEF8ukvn/xUAD1eGESo8jO6TlRFPwlEvZ6A="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 0d4cf62bf9d..0f0266d18ce 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.28.0"; + version = "3.29.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-jVRQnZGM+N3W/f4mW322qPiv7PFrFoyUHNdZNoAkpAc="; + hash = "sha256-RzXJCYiIxbSgXuUinS5ixKCobZtMx5MM/ilzSPzTdsI="; }; - vendorHash = "sha256-gXWuKOTb/7AIF6orXlIHpdSxdYxl12Es2cl4egdJfxo="; + vendorHash = "sha256-+8nLU2mg7fiWSRu0w9ZMd5KvyFyYbNO1tyJpZASdc2c="; doCheck = false; diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index 870f9b52023..67e507d01da 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rehf0mbdHgfjcsRKYCAqaUKsys3rRZFJxwHk2h/aICM="; + hash = "sha256-Yh+82gtHACTfctnIHQS+t7Pn+eZ5ZY5ySh/ae6g81lU="; }; vendorHash = "sha256-5LHL0L7xTmy3yBs7rtrC1uvUjLKBU8LpjQaHyeRyFhw="; diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index e681f780708..1331d02810f 100644 --- a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-8hy+lRh6WqyjInqGD21GHdS0QWz8g0e8MdZbQblv8II="; + hash = "sha256-4tJrEipVbiYQY0L9sDH0f/qT8WY7c3md/Bar/dST+VI="; }; vendorHash = "sha256-/mfwBHaouYN8JIxPz720/7MlMVh+5EEB+ocnYe4B020="; diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index 757eeb2b4d9..262f37db09d 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.42"; + version = "0.0.43"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "v${version}"; - hash = "sha256-SZwMgxQUuGq74mca1mgZ41esW/mr+mvlOhHXFALjd8U="; + hash = "sha256-+h69AtuFBvqy/P6Qe5s0Ht66eXzg5KDs2ipoNyKludo="; }; - cargoHash = "sha256-iPNdkKLvLyJGwdd19tNNwuxVBctp1K+UuQjjLLzkgHg="; + cargoHash = "sha256-Jqe3mswnbrfvUdQm4DfnCkJGksEuGzfuxNjEI7cEyQs="; nativeBuildInputs = [ git diff --git a/pkgs/development/tools/redisinsight/default.nix b/pkgs/development/tools/redisinsight/default.nix index 20ba4ba18c4..bb96df683e2 100644 --- a/pkgs/development/tools/redisinsight/default.nix +++ b/pkgs/development/tools/redisinsight/default.nix @@ -22,28 +22,28 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "redisinsight-electron"; - version = "2.30.0"; + version = "2.32"; src = fetchFromGitHub { owner = "RedisInsight"; repo = "RedisInsight"; rev = "${finalAttrs.version}"; - hash = "sha256-TzqbMycKcOlUSKvfghip/KdMRiwstkFP+iJG5/9JVlA="; + hash = "sha256-esaH10AyEooym/62F5LJL7oP5UmD6T2UX8g/9QniL9s="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - sha256 = "sha256-aDr5wxM/Rp3Tj09nPpLPJHSG5A73+4rAfrMCcxCr7so="; + sha256 = "NHKttywAaWAYkciGzYCnm1speHrWsv1t+dxL1DZgM7o="; }; feOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/redisinsight/yarn.lock"; - sha256 = "sha256-O+8lNDrqPdxE+tgjpKbgm9Q66VlJaJgZRHlNyaFkumM="; + sha256 = "1S1KNUOtmywQ0eyqVS2oRlhpjcL9eps8CR7AtC9ujSU="; }; apiOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/redisinsight/api/yarn.lock"; - sha256 = "sha256-2Tvck+9MDj6s+7jehUEyPfJiFFxbMOYDFD/Qgt2En6c="; + sha256 = "P99+1Dhdg/vznC2KepPrVGNlrofJFydXkZVxgwprIx4="; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper python3 nest-cli libsass pkg-config ] diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 507ec3a7143..99a1610381e 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-loGQTCi6lTNB/jn47fvWTqKr01p4xRqyq+Y02a/UwSc="; + sha256 = "sha256-yLxWV9/e+0IAe4z11i+wwNb6yUehzQwV+EYCe3Z1MOM="; }; - cargoSha256 = "sha256-gk/0aTMlUWYKfJJ9CfTvYLTZ6/ShIRuhpywhuwFHD5E="; + cargoSha256 = "sha256-/Za1T+HYI7mmKQHn7qm1d6hqh1qyp9DAOOMi32Tev9g="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix index dca10dc1c42..afe21ea80f5 100644 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.1.5"; + version = "1.2.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YCWjdY8feiqU4/bOn19qbY8YiKa3SvFImvH0wDKXOhI="; + hash = "sha256-roeim5enxqklJOW7Qqr+Gci5lUIOW9kn3tlCm8qrEJk="; }; - cargoSha256 = "sha256-mNJZjEkuUwo/aqyotqjNj+P50dFFGaJnLQ2CyCYg/1Y="; + cargoHash = "sha256-A/HlFse2wWOH85oZQvlRaePdF/4YfSL3qroDYGwwi9U="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 506c71808a0..55911b7f8a6 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bnceN47OFGlxs3ibcKoZFjoTgXRQxA2ZqxnthJ/fsqE="; + hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4="; }; - cargoSha256 = "sha256-qMPJC61ZVW9olMgNnGrvcQ/je4se4J5gOVoaOpNMUo8="; + cargoHash = "sha256-tyPhKWDSDNxQy+vpWNS5VP5D8TkUR7MJSAlG8wZsDy4="; meta = with lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 257f440187b..7c4b390cc66 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.6.0"; - sha256 = "sha256-nvtcunqPSxjTiw19N6mzDe1zOQyE44DPTeianTCn1vo="; + version = "20.6.1"; + sha256 = "sha256-Ouxeco2qOIAMNDsSkiHTSIBkolKaObtUZ7xVviJsais="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch |