diff options
Diffstat (limited to 'pkgs/development')
269 files changed, 1780 insertions, 1496 deletions
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 2d5619620417..5c04ca4a50ff 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -49,17 +49,18 @@ let # targetInfo.triple is what Google thinks the toolchain should be, this is a little # different from what we use. We make it four parts to conform with the existing # standard more properly. - targetConfig = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config); + targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); in rec { # Misc tools binaries = stdenv.mkDerivation { - pname = "${targetConfig}-ndk-toolchain"; + pname = "${targetPrefix}ndk-toolchain"; inherit (androidndk) version; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; propagatedBuildInputs = [ androidndk ]; passthru = { + inherit targetPrefix; isClang = true; # clang based cc, but bintools ld }; dontUnpack = true; @@ -91,23 +92,23 @@ rec { ln -s $out/toolchain/bin $out/bin ln -s $out/toolchain/${targetInfo.triple}/bin/* $out/bin/ for f in $out/bin/${targetInfo.triple}-*; do - ln -s $f ''${f/${targetInfo.triple}-/${targetConfig}-} + ln -s $f ''${f/${targetInfo.triple}-/${targetPrefix}} done for f in $(find $out/toolchain -type d -name ${targetInfo.triple}); do - ln -s $f ''${f/${targetInfo.triple}/${targetConfig}} + ln -s $f ''${f/${targetInfo.triple}/${targetPrefix}} done - rm -f $out/bin/${targetConfig}-ld - ln -s $out/bin/lld $out/bin/${targetConfig}-ld + rm -f $out/bin/${targetPrefix}ld + ln -s $out/bin/lld $out/bin/${targetPrefix}ld (cd $out/bin; for tool in llvm-*; do - ln -sf $tool ${targetConfig}-$(echo $tool | sed 's/llvm-//') + ln -sf $tool ${targetPrefix}$(echo $tool | sed 's/llvm-//') ln -sf $tool $(echo $tool | sed 's/llvm-//') done) # handle last, as llvm-as is for llvm bytecode - ln -sf $out/bin/${targetInfo.triple}-as $out/bin/${targetConfig}-as + ln -sf $out/bin/${targetInfo.triple}-as $out/bin/${targetPrefix}as ln -sf $out/bin/${targetInfo.triple}-as $out/bin/as patchShebangs $out/bin @@ -131,7 +132,7 @@ rec { # Android needs executables linked with -pie since version 5.0 # Use -fPIC for compilation, and link with -pie if no -shared flag used in ldflags echo "-target ${targetInfo.triple} -fPIC" >> $out/nix-support/cc-cflags - echo "-z,noexecstack -z,relro -z,now" >> $out/nix-support/cc-ldflags + echo "-z,noexecstack -z,relro -z,now -z,muldefs" >> $out/nix-support/cc-ldflags echo 'if [[ ! " $@ " =~ " -shared " ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh echo "-Xclang -mnoexecstack" >> $out/nix-support/cc-cxxflags if [ ${targetInfo.triple} == arm-linux-androideabi ]; then diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 47625a4d5de9..f33e594b7e25 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" + "POSTINSTALL_PROGRAM=install_name_tool" ]); # We need a bootstrap-chicken to regenerate the c-files after diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 6aa30a584a8e..c82fc654b47a 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,14 +1,25 @@ { lib, stdenv, fetchurl, python3, runtimeShell }: -stdenv.mkDerivation rec { - pname = "cmdstan"; - version = "2.31.0"; - +let + # FIXME: remove conditional on future release + version = if stdenv.isx86_64 then "2.31.0" else "2.30.1"; # includes stanc binaries needed to build cmdstand - src = fetchurl { - url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "sha256-BMqRRWIC/Z7It2qkESJd9L3ycyxvA6NHiWbAvzVMzIQ="; + srcs = rec { + aarch64-linux = fetchurl { + url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}-linux-arm64.tar.gz"; + sha256 = "sha256-oj/7JHT4LZcRAHiA2KbM6pZbOe6C98Ff//cNsG9DIm8="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; + sha256 = "sha256-BMqRRWIC/Z7It2qkESJd9L3ycyxvA6NHiWbAvzVMzIQ="; + }; + x86_64-linux = x86_64-darwin; }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation rec { + pname = "cmdstan"; + inherit version src; buildFlags = [ "build" ]; enableParallelBuilding = true; @@ -22,6 +33,9 @@ stdenv.mkDerivation rec { substituteInPlace stan/lib/stan_math/make/libraries \ --replace "/usr/bin/env bash" "bash" patchShebangs . + '' + lib.optionalString stdenv.isAarch64 '' + sed -z -i "s/TEST(CommandStansummary, check_console_output).*TEST(CommandStansummary, check_csv_output)/TEST(CommandStansummary, check_csv_output)/" \ + src/test/interface/stansummary_test.cpp ''; checkPhase = '' @@ -41,10 +55,9 @@ stdenv.mkDerivation rec { ''; # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. - preFixup = "rm -rf $(pwd)"; + preFixup = "rm -rf stan"; meta = { - broken = stdenv.isLinux && stdenv.isAarch64; description = "Command-line interface to Stan"; longDescription = '' Stan is a probabilistic programming language implementing full Bayesian @@ -54,6 +67,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://mc-stan.org/interfaces/cmdstan.html"; license = lib.licenses.bsd3; - platforms = lib.platforms.all; + platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 7f6e2ce6ace8..1bad4bba76e8 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.18.8"; + version = "1.18.9"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-H3mAIwUBVHnnfYxkFTC8VOyZRlfVxSceAXLrcRg0ahI="; + sha256 = "sha256-++fwm5aso9tvrq8YDai7Yyho7ASXMeNV/2FpUZfA4+o="; }; strictDeps = true; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 7a6c019c16da..58370c1a15a2 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls, Security }: +{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls_2, Security }: let ocamlDependencies = version: @@ -42,7 +42,7 @@ let inherit version; buildInputs = [ zlib pcre neko ] - ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls + ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security ++ ocamlDependencies version; diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index 1c614103bdec..f975b39773d5 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -15,7 +15,7 @@ , libgit2 , curl , nghttp2 -, mbedtls +, mbedtls_2 , libssh2 , gmp , mpfr @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { libgit2 curl nghttp2 - mbedtls + mbedtls_2 libssh2 gmp mpfr diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 96bf06e41ea0..40e39d411d69 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config -, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs +, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls_2, openssl, pkgs, gtk2, libpthreadstubs }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil - libmysqlclient mbedtls openssl libpthreadstubs ] + libmysqlclient mbedtls_2 openssl libpthreadstubs ] ++ lib.optional stdenv.isLinux gtk2 ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 95abb373272c..820469ab8f15 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -4,8 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath , headless ? false -# disabled by default since openjfx11 depends on python2 (EOL) -, enableJavaFX ? false, openjfx +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 60100a5ecc16..a8de9fe43ffc 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -4,8 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath , headless ? false -# disabled by default since openjfx11 depends on python2 (EOL) -, enableJavaFX ? false, openjfx +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 68a0a9fa7007..5b7e87b0ef3a 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -4,8 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath , headless ? false -# disabled by default since openjfx11 depends on python2 (EOL) -, enableJavaFX ? false, openjfx +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 37c3a6a3de3a..1381b0995a76 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -4,8 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath , headless ? false -# disabled by default since openjfx11 depends on python2 (EOL) -, enableJavaFX ? false, openjfx +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index 0fbd9eff3e4c..127a921f097c 100644 --- a/pkgs/development/compilers/openjdk/meta.nix +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -3,7 +3,7 @@ lib: version: with lib; { license = licenses.gpl2Only; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo asbachb ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ]; mainProgram = "java"; knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" ]) [ "This OpenJDK version has reached its end of life." diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index f67c18289134..1bbb4e42dbc5 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,26 +1,36 @@ { stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python2, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby , openjdk11-bootstrap }: let major = "11"; - update = ".0.3"; + update = ".0.11"; build = "1"; repover = "${major}${update}+${build}"; gradle_ = (gradle_4.override { java = openjdk11-bootstrap; }); + NIX_CFLAGS_COMPILE = [ + # avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + # glib-2.62 deprecations + # -fcommon: gstreamer workaround for -fno-common toolchains: + # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of + # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here + "-fcommon" + ]; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}-${build}"; src = fetchurl { - url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; - sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; + url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; + sha256 = "sha256-mbEALUxuwbtlGeZ2Xsm3m3aNDdthLYWd6QHmdkAILxc="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -34,8 +44,7 @@ let JDK_HOME = ${openjdk11-bootstrap.home} '' + args.gradleProperties or ""); - #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + inherit NIX_CFLAGS_COMPILE; buildPhase = '' runHook preBuild @@ -67,8 +76,7 @@ let outputHashMode = "recursive"; # Downloaded AWT jars differ by platform. outputHash = { - i686-linux = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"; - x86_64-linux = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"; + x86_64-linux = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa8="; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -91,11 +99,7 @@ in makePackage { cp -r build/modular-sdk $out ''; - # glib-2.62 deprecations - # -fcommon: gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; + inherit NIX_CFLAGS_COMPILE; stripDebugList = [ "." ]; @@ -105,6 +109,9 @@ in makePackage { new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done + + # Remove licenses, otherwise they may conflict with the ones included in the openjdk + rm -rf $out/modules_legal/* ''; disallowedReferences = [ openjdk11-bootstrap ]; @@ -119,6 +126,6 @@ in makePackage { license = licenses.gpl2; description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 4ffe8abd47b9..d2903c685a90 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -72,7 +72,6 @@ let # Downloaded AWT jars differ by platform. outputHash = { x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw"; - i686-linux = "0hx69p2z96p7jbyq4r20jykkb8gx6r8q2cj7m30pldlsw3650bqx"; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -121,6 +120,6 @@ in makePackage { license = licenses.gpl2; description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 62bd8b15d1ad..7594d7487659 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.23"; + version = "0.24"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-mOakdXhSij8k4Eo7RwpKjd59IkNjw31NNFDJtL6Adgo="; + hash = "sha256-rso08/b0ukrh6KYFpn4bFn0pP83URfeJGw28iLIjlPw="; }; enableParallelBuilding = true; diff --git a/pkgs/development/embedded/jtag-remote-server/default.nix b/pkgs/development/embedded/jtag-remote-server/default.nix index bcfba506a002..4a2c9c3df3d2 100644 --- a/pkgs/development/embedded/jtag-remote-server/default.nix +++ b/pkgs/development/embedded/jtag-remote-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jtag-remote-server"; - version = "unstable-2022-06-09"; + version = "1.2"; src = fetchFromGitHub { owner = "jiegec"; repo = pname; - rev = "917d8d298423ba1aa6e75aa92e009b7f27f74a57"; - hash = "sha256-Jy0OyRgn9SYpjP3HYWPvRirfxXk4/vMYvZuI3XpPtBw="; + rev = "v${version}"; + hash = "sha256-qtgO0BO2hvWi/E2RzGTTuQynKbh7/OLeoLcm60dqro8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/development/embedded/nmrpflash/default.nix index a05170b1bd80..76c8902f590a 100644 --- a/pkgs/development/embedded/nmrpflash/default.nix +++ b/pkgs/development/embedded/nmrpflash/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "nmrpflash"; - version = "0.9.18.2"; + version = "0.9.19"; src = fetchFromGitHub { owner = "jclehner"; repo = "nmrpflash"; rev = "v${version}"; - sha256 = "sha256-hKE9FEBkbN39zBRSoy3Ntq/fziizskJXNBcwQZX9igE="; + sha256 = "sha256-bXxJiIbMk8JG0nbWOgINUAb8zaGBN3XUdA3JZev4Igs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 3cc287c50352..1a1f40e3f9f6 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.0.167"; + version = "1.0.168"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-tqhl2d0HZJNVP3EX2y5YiOmCgJsXegUUO91+f9MxQyU="; + sha256 = "sha256-K56SEfSq0mjltUwR2VZxGiGn9nnEdDBoZrkaBOIIl7k="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/development/interpreters/hashlink/default.nix index 1af48cba55ab..e24742ac136e 100644 --- a/pkgs/development/interpreters/hashlink/default.nix +++ b/pkgs/development/interpreters/hashlink/default.nix @@ -7,7 +7,7 @@ , libjpeg_turbo , libuv , libvorbis -, mbedtls +, mbedtls_2 , openal , pcre , SDL2 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libpng libuv libvorbis - mbedtls + mbedtls_2 openal pcre SDL2 diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 6ea49852a40e..1ac48d7f0575 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -1,17 +1,9 @@ { callPackage, lib, stdenv, fetchurl, ... }@_args: let - hash = "sha256-MSBENMUl+F5k9manZvYjRDY3YWsYToZSQU9hmhJ8Xvc="; - base = callPackage ./generic.nix (_args // { version = "8.2.0"; - phpAttrsOverrides = attrs: attrs // { - src = fetchurl { - url = "https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz"; - inherit hash; - }; - }; - inherit hash; + hash = "sha256-G/T8pmP5PZ4LSQm9bq4Fg6HOOD5/Bd8Sbyjycvof1Ro="; }); in diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 8fbcd7027ae9..d6e8f935380c 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -507,7 +507,15 @@ in with passthru; stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = "http://python.org"; + homepage = "https://www.python.org"; + changelog = let + majorMinor = lib.versions.majorMinor version; + dashedVersion = lib.replaceStrings [ "." "a" ] [ "-" "-alpha-" ] version; + in + if sourceVersion.suffix == "" then + "https://docs.python.org/release/${version}/whatsnew/changelog.html" + else + "https://docs.python.org/${majorMinor}/whatsnew/changelog.html#python-${dashedVersion}"; description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 903dae38ac12..0c58d067f7e1 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -157,10 +157,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "sha256-WRFHWgesK1PXRuiKBxavbStHNJQZGRNuoNM/ucdblxQ="; + sha256 = "sha256-gzjwwiIthH6QTJVTaRVdwb7u7YBujV7wSwDvR4cji/0="; inherit (darwin) configd; inherit passthruFun; }; @@ -170,10 +170,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "sha256-URT8eRiipeIOtarGlrMMNvQSxu8ksT9cnrngVpgtlVA="; + sha256 = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI="; inherit (darwin) configd; inherit passthruFun; }; @@ -195,10 +195,10 @@ in { sourceVersion = { major = "3"; minor = "11"; - patch = "0"; + patch = "1"; suffix = ""; }; - sha256 = "sha256-pX3ILXc1hhe6ZbmEHO4eO0QfOGw3id3AZ27KB38pUcM="; + sha256 = "sha256-hYeRkvLP/VbLFsCSkFlJ6/Pl45S392RyNSljeQHftY8="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 4feefd2be02a..dc9e93b0450f 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DDgt7NjTNiqSq8+yC7bjlpKvWt36ybRCGByx07N4hC8="; + sha256 = "sha256-DJEX/BoiabAQKRKyXuefCoJouFKZ3sAnCQDsHmNC/t8="; fetchSubmodules = true; }; - cargoSha256 = "sha256-xYOSMWPGLI6xnYhAZDM+MvD/zI0hsoqie86SUGn2EDI="; + cargoSha256 = "sha256-L+VozBK1RJGg2F51Aeau8jH1XM5IfR7qkhb7iXmQXE4="; cargoBuildFlags = [ "--package wasmtime-cli" diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 0dff90313538..74f83a30a502 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.6.0"; + version = "5.6.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "89uHl0Qqm4UGKs0LPheskSWgtIfhQhbQmwOwiEGCDrk="; + sha256 = "1QEVuFyHKqwpaTS17nJqP6FWxvWtltJ+Dt0Kpa0XMig="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 2ce613c78534..81e5763aa3eb 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -205,7 +205,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" - ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h"; + ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h" + ++ lib.optionals enableGcs [ "-DCMAKE_CXX_STANDARD=17" ]; doInstallCheck = true; ARROW_TEST_DATA = lib.optionalString doInstallCheck "${arrow-testing}/data"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index ac10472e014e..3dc3bb5dacdc 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,16 +1,11 @@ { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom , wafHook -, withQt4 ? true, qt4 ? null -, withQt5 ? false, qt5 ? null }: - -# I haven't found an XOR operator in nix... -assert withQt4 || withQt5; -assert !(withQt4 && withQt5); +, withQt5 ? true, qt5 ? null +}: stdenv.mkDerivation rec { pname = "suil"; version = "0.10.6"; - name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; @@ -19,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ gtk2 lv2 serd sord sratom ] - ++ (lib.optionals withQt4 [ qt4 ]) - ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); + ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]); dontWrapQtApps = true; diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 0692c5ef7abb..19ad8053c19f 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.51"; + version = "0.2.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-10SDOl0XoALdSxJWHDLDkvX7rArUQKXjjXfAECFy/Vw="; + sha256 = "sha256-tFweXB610Ua8+x05rg+rOqh9QPhXjpvvzGf8EVVIHks="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 6c1c2cdefb9c..2bc457cac18e 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -2,7 +2,7 @@ , cmake , bc-decaf , fetchFromGitLab -, mbedtls +, mbedtls_2 , lib , stdenv }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Vendored by BC bc-decaf - mbedtls + mbedtls_2 ]; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 22817feadeda..187264caed19 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , lib , libantlr3c -, mbedtls +, mbedtls_2 , stdenv , zlib }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-Wno-error=stringop-overflow" ]; - propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ]; + propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ]; meta = with lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index bea3f007e631..feb41bf62941 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -13,6 +13,7 @@ , enableStatic ? !enableShared , enablePython ? false , enableNumpy ? false +, enableIcu ? stdenv.hostPlatform == stdenv.buildPlatform , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? [] , boostBuildPatches ? [] @@ -226,7 +227,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ which boost-build ] ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ expat zlib bzip2 libiconv ] - ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu + ++ optional enableIcu icu ++ optionals enablePython [ libxcrypt python ] ++ optional enableNumpy python.pkgs.numpy; @@ -239,7 +240,7 @@ stdenv.mkDerivation { "--libdir=$(out)/lib" "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase ] ++ optional (toolset != null) "--with-toolset=${toolset}" - ++ [ (if stdenv.hostPlatform == stdenv.buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ]; + ++ [ (if enableIcu then "--with-icu=${icu.dev}" else "--without-icu") ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/fancypp/default.nix b/pkgs/development/libraries/fancypp/default.nix new file mode 100644 index 000000000000..f93ab77c63de --- /dev/null +++ b/pkgs/development/libraries/fancypp/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "fancypp"; + version = "unstable-2021-04-08"; + + src = fetchFromGitHub { + owner = "Curve"; + repo = "fancypp"; + rev = "ede7f712a08f7c66ff4a5590ad94a477c48850a5"; + sha256 = "sha256-E2JsQnvrqrZFYo+xBJr7xDCoPnRQftqUjjBpZzFvIic="; + }; + + # Header-only library. + dontBuild = true; + + installPhase = '' + mkdir "$out" + cp -r include "$out" + ''; + + meta = with lib; { + description = "Tiny C++ Library for terminal colors and more!"; + homepage = "https://github.com/Curve/fancypp"; + maintainers = with maintainers; [ aidalgol ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/fox/clang.patch b/pkgs/development/libraries/fox/clang.patch deleted file mode 100644 index 0ca2ebf0d8da..000000000000 --- a/pkgs/development/libraries/fox/clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp -index 1ecdb45..9058a30 100644 ---- a/src/FXReactor.cpp -+++ b/src/FXReactor.cpp -@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){ - } - - // Normal case -- if(0<=hand){ -+ if(0==hand){ - - // Any handles active? - if(0<nhand){ diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 2eda944048ab..49526b99c53b 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,30 +1,31 @@ { lib , stdenv , fetchurl +, fetchpatch , libpng , libjpeg , libtiff , zlib , bzip2 +, libGL +, libGLU , libXcursor , libXext , libXrandr , libXft -, CoreServices ? null +, CoreServices }: stdenv.mkDerivation rec { pname = "fox"; - version = "1.7.9"; + version = "1.7.81"; src = fetchurl { - url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; - sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; + url = "http://fox-toolkit.org/ftp/${pname}-${version}.tar.gz"; + sha256 = "sha256-bu+IEqNkv9OAf96dPYre3CP759pjalVIbYyc3QSQW2w="; }; - patches = [ ./clang.patch ]; - - buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXext libXrandr libXft ] + buildInputs = [ libpng libjpeg libtiff zlib bzip2 libGL libGLU libXcursor libXext libXrandr libXft ] ++ lib.optional stdenv.isDarwin CoreServices; doCheck = true; @@ -42,9 +43,8 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = []; - broken = stdenv.isDarwin && stdenv.isAarch64; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index fb2929a72f16..3ffaedb6b729 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -18,37 +18,31 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let - googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6"; + googleapisRev = "13d5b3f3f9412f38427c8ad48068f04ad1ee9808"; googleapis = fetchFromGitHub { + name = "googleapis-src"; owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY="; + hash = "sha256-SiU7N1EQ/7LWhUwgf4c0CBfUzNGiLe4sSbbJmJF3sao="; }; excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml); in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "1.38.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA="; + sha256 = "sha256-o8aURM8fvxn0FZjuqJGclq9Brss8LOFZzD0FV2j/lUc="; }; postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ - --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" - - # https://github.com/googleapis/google-cloud-cpp/issues/8992 - for file in external/googleapis/config.pc.in google/cloud/{,*/}config.pc.in; do - substituteInPlace "$file" \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ - done + --replace "https://github.com/googleapis/googleapis/archive/\''${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" + sed -i '/https:\/\/storage.googleapis.com\/cloud-cpp-community-archive\/com_google_googleapis/d' external/googleapis/CMakeLists.txt ''; nativeBuildInputs = [ @@ -123,6 +117,7 @@ stdenv.mkDerivation rec { # this adds a good chunk of time to the build "-DBUILD_TESTING:BOOL=ON" "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" + "-DCMAKE_CXX_STANDARD=17" ] ++ lib.optionals (apis != [ "*" ]) [ "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" ]; diff --git a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml index 8cbe766862b2..71529bfb4550 100644 --- a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml +++ b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml @@ -13,6 +13,7 @@ whole = [ "bigtable_read_sync_vs_async_benchmark", "bigtable_scan_throughput_benchmark", "bigtable_table_sample_rows_integration_test", + "common_grpc_utils_internal_grpc_impersonate_service_account_integration_test", "iam_iam_credentials_integration_test", "iam_iam_integration_test", "logging_quickstart", @@ -48,6 +49,7 @@ whole = [ "storage_curl_request_integration_test", "storage_curl_resumable_upload_session_integration_test", "storage_curl_sign_blob_integration_test", + "storage_decompressive_transcoding_integration_test", "storage_grpc_integration_test", "storage_key_file_integration_test", "storage_minimal_iam_credentials_rest_integration_test", @@ -84,13 +86,13 @@ whole = [ "storage_throughput_experiment_test", "storage_tracing_integration_test", "storage_unified_credentials_integration_test", - "common_grpc_utils_internal_grpc_impersonate_service_account_integration_test" ] cases = [ "BackupExtraIntegrationTest.CreateBackupWithExpiredVersionTime", "BackupExtraIntegrationTest.BackupWithExpiredVersionTime", "BackupExtraIntegrationTest.BackupWithFutureVersionTime", "BackupExtraIntegrationTest.CreateBackupWithFutureVersionTime", + "BlockingPublisherIntegrationTest.Basic", "DatabaseAdminClientTest.CreateWithEncryptionKey", "DatabaseAdminClientTest.CreateWithNonexistentEncryptionKey", "DatabaseAdminClientTest.DatabaseBasicCRUD", @@ -98,12 +100,16 @@ cases = [ "DatabaseAdminClientTest.VersionRetentionPeriodCreateFailure", "DatabaseAdminClientTest.VersionRetentionPeriodUpdate", "DatabaseAdminClientTest.VersionRetentionPeriodUpdateFailure", + "ErrorParsingIntegrationTest.FailureContainsErrorInfo", + "GrpcServiceAccountIntegrationTest.GetServiceAccount", + "GrpcBucketMetadataIntegrationTest.ObjectMetadataCRUD", "InstanceAdminClientTest.InstanceConfig", "InstanceAdminClientTest.InstanceIam", "InstanceAdminClientTest.InstanceReadOperations", "LoggingIntegrationTest.ListMonitoredResourceDescriptors", "LoggingIntegrationTest.WriteLogEntries", "ObjectFileMultiThreadedTest.Download", + "ObjectReadLargeIntegrationTest.LimitedMemoryGrowth", "SubscriberIntegrationTest.FireAndForget", "SubscriberIntegrationTest.PublishOrdered", "SubscriberIntegrationTest.PublishPullAck", diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 56f3cf0e7abd..744f9652378f 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -54,22 +54,26 @@ stdenv.mkDerivation rec { buildInputs = [ openssl protobuf ] ++ lib.optionals stdenv.isLinux [ libnsl ]; - cmakeFlags = [ - "-DgRPC_ZLIB_PROVIDER=package" - "-DgRPC_CARES_PROVIDER=package" - "-DgRPC_RE2_PROVIDER=package" - "-DgRPC_SSL_PROVIDER=package" - "-DgRPC_PROTOBUF_PROVIDER=package" - "-DgRPC_ABSL_PROVIDER=package" - "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ - # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is - # only an issue with the useLLVM stdenv, not the darwin stdenv… - # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 - "-DCMAKE_CXX_STANDARD=11" - ]; + cmakeFlags = + let + # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is + # only an issue with the useLLVM stdenv, not the darwin stdenv… + # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 + useLLVMAndOldCC = (stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0"; + cxxStandard = if useLLVMAndOldCC then "11" else "17"; + in + [ + "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_RE2_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_CXX_STANDARD=${cxxStandard}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" + ]; # CMake creates a build directory by default, this conflicts with the # basel BUILD file on case-insensitive filesystems. diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index 19c46d4776c4..80b518ab27b8 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -6,6 +6,7 @@ , pkg-config , gobject-introspection , vala +, pandoc , gi-docgen , python3 , libsoup_3 @@ -16,14 +17,14 @@ stdenv.mkDerivation rec { pname = "gssdp"; - version = "1.6.1"; + version = "1.6.2"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r4KbiWREJpuQlhRFhpKU7xUtPBqAhTHlwVmMpvVYzA="; + sha256 = "QQs3be7O2YNrV/SI+ABS/koU+J4HWxzszyjlH0kPn7k="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { pkg-config gobject-introspection vala + pandoc gi-docgen python3 ]; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index a76805d8d1fb..acd2cae6abfc 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; }; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" ]; diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 0e4afedc369f..fc9fc1da08b9 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.1"; + version = "1.6.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hTgUUtKvlbjhSyTUqYljPQ2DzYjRJy8nzLJBbMyDbUc="; + sha256 = "sha256-6QBZzIOAXa2T6DvkflOVjwdHHMRk+UQ5HntcgqpRoY8="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix new file mode 100644 index 000000000000..19618613ee17 --- /dev/null +++ b/pkgs/development/libraries/httplib/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "httplib"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "yhirose"; + repo = "cpp-httplib"; + rev = "v${version}"; + sha256 = "sha256-rsElqtoRz/sOXpAsfSJbMlwIKdaGJkSZfKHzB/wMhY8="; + }; + + # Header-only library. + dontBuild = true; + + installPhase = '' + mkdir -p "$out/include" + cp -r httplib.h "$out/include" + ''; + + meta = with lib; { + description = "A C++ header-only HTTP/HTTPS server and client library"; + homepage = "https://github.com/yhirose/cpp-httplib"; + maintainers = with maintainers; [ aidalgol ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 33ec04734f5b..da724aaac9b4 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.23.0"; + version = "3.24.0"; outputs = [ "out" "dev" "info" "doc" ] # configure: WARNING: cannot generate manual pages while cross compiling @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-jXNhHzydWaMhFbEKoFHyZ77GCvAqxyT3P0xIAgFlTzY="; + sha256 = "sha256-QSrCQhP3t+WPyBQPLJbZEaDCjXD8Lo6IAGKHsbL2S1o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index cbfc06bc81c5..d9beee7933fa 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libnfs"; @@ -13,7 +13,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare"; + patches = [ + # Fixes 100% CPU usage in multi-threaded mode + (fetchpatch { + url = "https://github.com/sahlberg/libnfs/commit/34d6fe37e986da5b0ced86cd028a88e482537d5a.patch"; + sha256 = "sha256-i7mi+TVdkLb4MztT5Ic/Q8XBIWk9lo8v5bNjHOr6LaI="; + }) + # Fixes deprecation warnings on macOS + (fetchpatch { + url = "https://github.com/sahlberg/libnfs/commit/f6631c54a7b0385988f11357bf96728a6d7345b9.patch"; + sha256 = "sha256-xLRZ9J1vr04n//gNv9ljUBt5LHUGBRRVIXJCMlFbHFI="; + }) + ]; + + configureFlags = [ + "--enable-pthread" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index df209993bb10..de71d021d015 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-RQlT+G0aSHHETyJaWKhGFdBLSv0qoZsavggv/ubeSQA="; + sha256 = "sha256-eWtQaYUWZNQYQOUXnbUfjrtpoO6CnNJ8WjlowA49sG0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index ad7a7e5473e9..a3b43e9377e1 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -1,21 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, texinfo, pcre2 -, enablePython ? false, python ? null, swig, libxml2, ncurses +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, writeShellScript +, pkg-config +, texinfo +, pcre2 +, swig +, libxml2 +, ncurses +, enablePython ? false +, python ? null }: let isPython3 = enablePython && python.pythonAtLeast "3"; in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "sha256-CZZ5/uCls2tY3PKmD+hBBvp7d7KX8nZuCPf03sa4iXc="; + sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE="; fetchSubmodules = true; }; + postPatch = let + printVersion = writeShellScript "print-version" '' + echo ${lib.escapeShellArg version} + ''; + in '' + # avoid git dependency + cp ${printVersion} build-aux/git-version-gen + ''; + + preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' + # prevent configure picking up stack_size from distutils.sysconfig + export PYTHON_EXTRA_LDFLAGS=" " + ''; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] ++ lib.optional enablePython swig; diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index ef56f936dccf..2d7e6c5fb7a2 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "zmPsWdTbM+T50X0BsVTn1Aw/5N6sL5hIQiRG5WSG1eg="; + sha256 = "gT6jpFN0mkSdDs+8GQa0qKuL5KLzxanBMGwA4EATW7Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix new file mode 100644 index 000000000000..ba1f520b08cf --- /dev/null +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "2.28.1"; + hash = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw="; +} diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix new file mode 100644 index 000000000000..d6f53feb086b --- /dev/null +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "3.2.1"; + hash = "sha256-+M36NvFe4gw2PRbld/2JV3yBGrqK6soWcmrSEkUNcrc="; +} diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/generic.nix index 2bd924d870c7..bb87c6dbc8ad 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -1,4 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv +, version +, hash , fetchFromGitHub , cmake @@ -11,17 +14,13 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - # Auto updates are disabled due to repology listing dev releases as release - # versions. See - # * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428 - # * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d - version = "2.28.1"; # nixpkgs-update: no auto update + inherit version; src = fetchFromGitHub { - owner = "ARMmbed"; + owner = "Mbed-TLS"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw="; + inherit hash; }; nativeBuildInputs = [ cmake ninja perl python3 ]; @@ -40,10 +39,11 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://tls.mbed.org/"; + homepage = "https://www.trustedfirmware.org/projects/mbed-tls/"; + changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ raphaelr ]; }; } diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 8ca137e66119..d85e24f90781 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, boost, llvmPackages }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, boost, llvmPackages }: stdenv.mkDerivation rec { pname = "mdds"; version = "2.0.2"; - src = fetchurl { - url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "sha256-EyEfLy44fvO3TXOh3O5Soa1c4G34+OZkdnnfknijEWo="; + src = fetchFromGitLab { + owner = "mdds"; + repo = pname; + rev = version; + sha256 = "sha256-jCzF0REocpnP56LfY42zlGTXyKyz4GPovDshhrh4jyo="; }; postInstall = '' @@ -14,14 +16,17 @@ stdenv.mkDerivation rec { cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; checkInputs = [ boost ]; meta = with lib; { - homepage = "https://gitlab.com/mdds/mdds"; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = platforms.all; + homepage = "https://gitlab.com/mdds/mdds"; + maintainers = []; license = licenses.mit; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index e1eaa1d924b7..225ce967080d 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6VTAm0MJp++T4TtpJgrNxXOMkHR36zgbeLseQU7m29g="; + sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 5ee10c854a55..880f5d50a042 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -49,15 +49,11 @@ stdenv.mkDerivation rec { printf %s 'https://AnotherFoxGuy.com/CMakeCM::modules/JoinPaths.cmake.1' > JoinPaths.cmake.whence )''; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/Makefile \ - --replace -Wl,-soname, -Wl,-install_name,$out/lib/ - ''; - meta = with lib; { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; homepage = "https://github.com/RigsOfRods/socketw"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 95003a0b00ef..66002df49052 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "sha256-RTuWj795YrXVo3TIiEr3Dy/QmSL5Ch0VVc4gRlDhNTM="; + sha256 = "sha256-rVv5TLxirtmoRJl0+RupbkvzChuSMSGi3NTa0dchZSU="; }; postPatch = '' diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 2017d5435ea4..34cb8d21f839 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,29 +1,34 @@ -{ fetchFromGitHub +{ lib , stdenv -, lib +, fetchFromGitHub , cmake -, libGLU -, libGL -, freetype +, pkg-config +, unzip +, SDL2 +, boost , freeimage -, zziplib -, xorgproto -, libXrandr -, libXaw -, freeglut -, libXt +, freetype , libpng -, boost , ois +, pugixml +, zziplib + # linux +, freeglut +, libGL +, libGLU +, libICE +, libSM , libX11 +, libXaw , libXmu -, libSM -, pkg-config -, libXxf86vm -, libICE -, unzip +, libXrandr , libXrender -, SDL2 +, libXt +, libXxf86vm +, xorgproto + # darwin +, Cocoa + # optional , withNvidiaCg ? false , nvidia_cg_toolkit , withSamples ? false @@ -31,59 +36,63 @@ stdenv.mkDerivation rec { pname = "ogre"; - version = "1.12.1"; + version = "13.5.3"; src = fetchFromGitHub { owner = "OGRECave"; repo = "ogre"; rev = "v${version}"; - sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM="; + sha256 = "sha256-fjgMAuIA7rm3Gt2z//kPkc7LOcfddoFgY38B7bs6zZo="; }; - # fix for ARM. sys/sysctl.h has moved in later glibcs, and - # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't - # needed anyway. - postPatch = '' - substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ - --replace '#include <sys/sysctl.h>' "" - ''; - - cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] - ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") - ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") - ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; + nativeBuildInputs = [ + cmake + pkg-config + unzip + ]; + buildInputs = [ + SDL2 + boost + freeimage + freetype + libpng + ois + pugixml + zziplib + ] ++ lib.optionals stdenv.isLinux [ + freeglut + libGL + libGLU + libICE + libSM + libX11 + libXaw + libXmu + libXrandr + libXrender + libXt + libXxf86vm + xorgproto + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ] ++ lib.optionals withNvidiaCg [ + nvidia_cg_toolkit + ]; - nativeBuildInputs = [ cmake unzip pkg-config ]; - buildInputs = - [ - libGLU - libGL - freetype - freeimage - zziplib - xorgproto - libXrandr - libXaw - freeglut - libXt - libpng - boost - ois - libX11 - libXmu - libSM - libXxf86vm - libICE - libXrender - SDL2 - ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + cmakeFlags = [ + "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" + "-DOGRE_BUILD_DEPENDENCIES=OFF" + "-DOGRE_BUILD_SAMPLES=${toString withSamples}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" + ]; meta = { - description = "A 3D engine"; + description = "3D Object-Oriented Graphics Rendering Engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ raskin wegank ]; + platforms = lib.platforms.unix; license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 885fbb058bd1..3a6a7b57c40f 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -23,7 +23,7 @@ sdlSupport ? false, SDL2, restSupport ? false, asio, withApps ? false, - withExamples ? false, fltk, wxGTK30-gtk3, + withExamples ? false, fltk, wxGTK30, }: stdenv.mkDerivation rec { @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ++ lib.optional luaSupport lua ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio - ++ lib.optionals withExamples [ fltk wxGTK30-gtk3 ] + ++ lib.optionals withExamples [ fltk wxGTK30 ] ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost ; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 61f758b7c4a9..45a34971c8f0 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -87,28 +87,24 @@ let x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; riscv64-linux = "./Configure linux64-riscv64"; - mipsel-linux = "./Configure linux-mips32"; - mips64el-linux = - if stdenv.hostPlatform.isMips64n64 - then "./Configure linux64-mips64" - else if stdenv.hostPlatform.isMips64n32 - then "./Configure linux-mips64" - else throw "unsupported ABI for ${stdenv.hostPlatform.system}"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" - else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64 - then "./Configure BSD-x86_64" - else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32 - then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" else if stdenv.hostPlatform.isBSD - then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + then if stdenv.hostPlatform.isx86_64 then "./Configure BSD-x86_64" + else if stdenv.hostPlatform.isx86_32 + then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" + else "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isMinGW then "./Configure mingw${lib.optionalString (stdenv.hostPlatform.parsed.cpu.bits != 32) (toString stdenv.hostPlatform.parsed.cpu.bits)}" else if stdenv.hostPlatform.isLinux - then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + then if stdenv.hostPlatform.isx86_64 then "./Configure linux-x86_64" + else if stdenv.hostPlatform.isMips32 then "./Configure linux-mips32" + else if stdenv.hostPlatform.isMips64n32 then "./Configure linux-mips64" + else if stdenv.hostPlatform.isMips64n64 then "./Configure linux64-mips64" + else "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isiOS then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" else diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 2e1000ef5e64..87736e1ebc75 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "proj"; - version = "9.1.0"; + version = "9.1.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-Upsp72RorV+5PFPHOK3zCJgVTRZ6fSVVFRope8Bp8/M="; + hash = "sha256-yw7eSm64qFFt9egJWKVyVo0e7xQRSmfUY7pk6Cwvwdk="; }; patches = [ diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index e1675e029fc3..d396e18aad24 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -18,7 +18,6 @@ , ccache , xmlstarlet , libproxy -, xlibsWrapper , xorg , zstd , double-conversion @@ -129,7 +128,6 @@ stdenv.mkDerivation rec { unixODBCDrivers.sqlite unixODBCDrivers.mariadb ] ++ lib.optionals stdenv.isLinux [ - xlibsWrapper util-linux systemd mtdev diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 3ac23d28a798..e28cdb438e5e 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -4,13 +4,12 @@ , qtdeclarative , wayland , pkg-config -, xlibsWrapper , libdrm }: qtModule { pname = "qtwayland"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ wayland xlibsWrapper libdrm ]; + buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index d22f59271fec..451e856c4e01 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.28"; + version = "1.3.29"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RkOP+et8wFb44NLqkizXB68U0NRKKvhDl4PyQWz2m6A="; + sha256 = "sha256-MKrZP81PrpOsVhS+kAjcd1Eumhq7F4HWWbFnypZttuY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/semver-cpp/default.nix b/pkgs/development/libraries/semver-cpp/default.nix new file mode 100644 index 000000000000..966f170eaad0 --- /dev/null +++ b/pkgs/development/libraries/semver-cpp/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "semver-cpp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "Neargye"; + repo = "semver"; + rev = "v${version}"; + sha256 = "sha256-nRWmY/GJtSkPJIW7i7/eIr/YtfyvYhJVZBRIDXUC7xg="; + }; + + # Header-only library. + dontBuild = true; + + installPhase = '' + mkdir "$out" + cp -r include "$out" + ''; + + meta = with lib; { + description = "Semantic Versioning for modern C++"; + homepage = "https://github.com/Neargye/semver"; + maintainers = with maintainers; [ aidalgol ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/smokegen/default.nix b/pkgs/development/libraries/smokegen/default.nix index 643ae1064db7..2a93965aeb39 100644 --- a/pkgs/development/libraries/smokegen/default.nix +++ b/pkgs/development/libraries/smokegen/default.nix @@ -1,16 +1,18 @@ -{ pkgs, lib, ... }: +{ stdenv, lib, cmake, qt4, fetchzip }: -pkgs.stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "smokegen"; - version = "v4.14.3"; - src = pkgs.fetchzip { - url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + version = "4.14.3"; + + src = fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; hash = "sha256-finsoruPeJZLawIjNUJ25Pq54eaCByfALVraNQJPk7c="; }; - buildInputs = [ pkgs.cmake pkgs.qt4 ]; - buildPhase = '' - cmake . - ''; + + strictDeps = true; + nativeBuildInputs = [ cmake qt4 ]; + buildInputs = [ qt4 ]; + meta = with lib; { description = "A general purpose C++ parser with a plugin infrastructure"; homepage = "https://invent.kde.org/unmaintained/smokegen"; diff --git a/pkgs/development/libraries/smokeqt/default.nix b/pkgs/development/libraries/smokeqt/default.nix index 145a9f243bb3..1c427b8abb70 100644 --- a/pkgs/development/libraries/smokeqt/default.nix +++ b/pkgs/development/libraries/smokeqt/default.nix @@ -1,16 +1,22 @@ -{ pkgs, lib, ... }: +{ stdenv, lib, cmake, qt4, smokegen, fetchzip }: -pkgs.stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "smokeqt"; - version = "v4.14.3"; - src = pkgs.fetchzip { - url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + version = "4.14.3"; + + src = fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; hash = "sha256-8FiEGF8gduVw5I/bi2wExGUWmjIjYEhWpjpXKJGBNMg="; }; + + strictDeps = true; + nativeBuildInputs = [ cmake smokegen ]; + buildInputs = [ qt4 ]; + cmakeFlags = [ "-DCMAKE_CXX_STANDARD=98" ]; - buildInputs = [ pkgs.cmake pkgs.qt4 pkgs.smokegen ]; + meta = with lib; { description = "Bindings for the Qt libraries"; homepage = "https://invent.kde.org/unmaintained/smokeqt"; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 55793719dd81..32225a7bb0d8 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "L84OyF+3YXyLKIfCJ5d0DV3shOwDbbdNbCCLurXFjCQ="; + sha256 = "EB42CPHCi/7YriVSL3pyC1WfiJp24oCvvlCk2LBk+Sw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 0aa6fc39baad..3a88e3bd04b4 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "60"; + version = "61"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-E1uHNcGxBrwg00tNnY3qH6BpvXtBEGkX7QFy0aMLSnA="; + sha256 = "sha256-JJWq706GLywUO5voYKzxcOvMWF4/NXEbqOrj5uG4DWw="; }; patches = [ diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 07ec683bf05a..f87557ac4623 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.70.1"; + version = "0.70.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-H0YBy/6lMCuWkCIIyPGF5bGLJZtTWLyTzzkr9ZhxxbY="; + sha256 = "sha256-TRW0OA3j9WTVfqvQBjicQHxwXfWwxwAw/cwklxozTYA="; }; patches = [ diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 580af7235e05..e61a6f6c3931 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - hash = "sha256-d8DDyEsK35WK7c0udZI5HxQLO+mbod8hlbSoa3IWWS0="; + hash = "sha256-36L7kZ9Dqp3pDjodqELBdSBFwrf+GnRP7KNFYrRUCuU="; }; postPatch = '' diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 3b848f788c10..b60e1f486dc8 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -3,8 +3,6 @@ , expat , fetchFromGitHub , gst_all_1 -, withGtk2 ? true -, gtk2 , gtk3 , libGL , libGLU @@ -34,11 +32,6 @@ , WebKit }: -assert withGtk2 -> (!withWebKit); - -let - gtk = if withGtk2 then gtk2 else gtk3; -in stdenv.mkDerivation rec { pname = "wxwidgets"; version = "3.0.5.1"; @@ -60,7 +53,7 @@ stdenv.mkDerivation rec { libjpeg_turbo zlib ] ++ lib.optionals stdenv.isLinux [ - gtk + gtk3 libSM libXinerama libXxf86vm @@ -148,7 +141,6 @@ stdenv.mkDerivation rec { }; passthru = { - inherit gtk; inherit compat26 compat28 unicode; }; } diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index e54f764f9a50..903de4d9a232 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "I9xQgiE3lNb2vRodO5R1y40lqoOKzALskrVePidant4="; + sha256 = "8eyWeoiJ3b/GlqGVfmkf2/uS7FnOpRNgbfxwWjclw8w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index b72820c77a68..d8c29e56aaab 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: +{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls_2 }: stdenv.mkDerivation { pname = "yojimbo"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ premake5 doxygen ]; - propagatedBuildInputs = [ libsodium mbedtls ]; + propagatedBuildInputs = [ libsodium mbedtls_2 ]; postBuild = '' premake5 docs diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 217922886df8..e379c12f9716 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -312,6 +312,12 @@ rec { ln -s $i $out/bin done + # the emulator auto-linked from platform-tools does not find its local qemu, while this one does + ${lib.optionalString includeEmulator '' + rm $out/bin/emulator + ln -s $out/libexec/android-sdk/emulator/emulator $out/bin + ''} + # Write licenses mkdir -p licenses ${lib.concatMapStrings (licenseName: diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 1ef63d3f6b92..4e5b04e62404 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -135,10 +135,6 @@ final: prev: { meta = oldAttrs.meta // { broken = since "12"; }; }); - deltachat-desktop = prev."deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop".override (oldAttrs: { - meta = oldAttrs.meta // { broken = true; }; # use the top-level package instead - }); - eask = prev."@emacs-eask/cli".override { name = "eask"; }; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index caf3e7a63f0d..761453739e29 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -1,17 +1,24 @@ {lib, stdenv, fetchurl, zlib, ocaml, findlib}: let - param = - if lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.10"; - url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; - sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI="; + common = { patches = []; postPatchInit = '' cp META-zip META-camlzip echo 'directory="../zip"' >> META-camlzip ''; + }; + param = + if lib.versionAtLeast ocaml.version "4.07" + then common // { + version = "1.11"; + url = "https://github.com/xavierleroy/camlzip/archive/rel111.tar.gz"; + sha256 = "sha256-/7vF3j4cE9wOWScjdtIy0u3pGzJ1UQY9R/3bdPHV7Tc="; + } else if lib.versionAtLeast ocaml.version "4.02" + then common // { + version = "1.10"; + url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; + sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI="; } else { version = "1.05"; download_id = "1037"; @@ -25,7 +32,7 @@ let in stdenv.mkDerivation { - pname = "camlzip"; + pname = "ocaml${ocaml.version}-camlzip"; version = param.version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix index 4baa21c57cf1..39f325b5fe76 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/default.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -10,6 +10,7 @@ buildDunePackage rec { pname = "gen_js_api"; version = "1.1.1"; + duneVersion = "3"; src = fetchFromGitHub { owner = "LexiFi"; diff --git a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix index 381fda7acd93..0cfe8f4bbfc1 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "ojs"; inherit (gen_js_api) version src; + duneVersion = "3"; propagatedBuildInputs = [ js_of_ocaml-compiler ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 67d0e6c7896e..8a640437bcaf 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -84,6 +84,7 @@ with self; async_js = janePackage { pname = "async_js"; + duneVersion = "3"; hash = "0rld8792lfwbinn9rhrgacivz49vppgy29smpqnvpga89wchjv0v"; meta.description = "A small library that provide Async support for JavaScript platforms"; buildInputs = [ js_of_ocaml-ppx ]; @@ -190,6 +191,7 @@ with self; bonsai = janePackage { pname = "bonsai"; + duneVersion = "3"; hash = "0k4grabwqc9sy4shzp77bgfvyajvvc0l8qq89ia7cvlwvly7gv6a"; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ ppx_pattern_bind ]; @@ -309,6 +311,7 @@ with self; incr_dom = janePackage { pname = "incr_dom"; + duneVersion = "3"; hash = "0mi98cwi4npdh5vvcz0pb4sbb9j9dydl52s51rswwc3kn8mipxfx"; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ js_of_ocaml-ppx ]; @@ -877,6 +880,7 @@ with self; virtual_dom = janePackage { pname = "virtual_dom"; + duneVersion = "3"; hash = "0vcydxx0jhbd5hbriahgp947mc7n3xymyrsfny1c4adk6aaq3c5w"; meta.description = "OCaml bindings for the virtual-dom library"; buildInputs = [ js_of_ocaml-ppx ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 5ced2323ea70..676bea0e47fe 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -87,6 +87,7 @@ with self; async_js = janePackage { pname = "async_js"; + duneVersion = "3"; hash = "184j077bz686k5lrqswircnrdqldb316ngpzq7xri1pcsl39sy3q"; meta.description = "A small library that provide Async support for JavaScript platforms"; buildInputs = [ js_of_ocaml-ppx ]; @@ -207,6 +208,7 @@ with self; bonsai = janePackage { pname = "bonsai"; + duneVersion = "3"; hash = "150zx2g1dmhyrxwqq8j7f2m3hjpmk5bk182ihx2gdbarhw1ainpm"; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ ppx_pattern_bind ]; @@ -281,7 +283,8 @@ with self; core_unix = janePackage { pname = "core_unix"; - hash = "1xzxqzg23in5ivz0v3qshzpr4w92laayscqj9im7jylh2ar1xi0a"; + version = "0.15.2"; + hash = "sha256-9f2PiLo+4Bjnfvh3scvIiPHj0wPZozmMMiCTe7vC1EA="; meta.description = "Unix-specific portions of Core"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ core_kernel expect_test_helpers_core ocaml_intrinsics ppx_jane timezone spawn ]; @@ -292,7 +295,8 @@ with self; csvfields = janePackage { pname = "csvfields"; - hash = "0z47pq17bw776hzvk48ypbd92ps9vlvl86mnhw3j6cqx4ahbjik3"; + version = "0.15.1"; + hash = "sha256-bBupsarwjte2NCncNDFSkrrmMR3EYPn+D7xI9zQOhFA="; propagatedBuildInputs = [ core num ]; meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; }; @@ -382,6 +386,7 @@ with self; incr_dom = janePackage { pname = "incr_dom"; + duneVersion = "3"; hash = "1sija9w2im8vdp61h387w0mww9hh7jgkgsjcccps4lbv936ac7c1"; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ js_of_ocaml-ppx ]; @@ -570,6 +575,7 @@ with self; ppx_css = janePackage { pname = "ppx_css"; + duneVersion = "3"; hash = "09dpmj3f3m3z1ji9hq775iqr3cfmv5gh7q9zlblizj4wx4y0ibyi"; meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within"; propagatedBuildInputs = [ core_kernel ppxlib js_of_ocaml js_of_ocaml-ppx sedlex ]; @@ -900,7 +906,8 @@ with self; sexp_pretty = janePackage { pname = "sexp_pretty"; - hash = "1p1jspwjvrhm8li22xl0n8wngs12d9g7nc1svk6xc32jralnxblg"; + version = "0.15.1"; + hash = "sha256-UJEO2P4C7ZaD110MEfkG4FXfGDVAAW2TAK489faV6SM="; minimumOCamlVersion = "4.07"; meta.description = "S-expression pretty-printer"; propagatedBuildInputs = [ ppx_base re sexplib ]; @@ -1045,6 +1052,7 @@ with self; hash = "15xia9v4ighzm0gv3vbqk9nvg47cvzqmfnl2zr67yxv4b98kyzv3"; meta.description = "OCaml bindings for the virtual-dom library"; buildInputs = [ js_of_ocaml-ppx ]; + duneVersion = "3"; propagatedBuildInputs = [ core_kernel gen_js_api js_of_ocaml lambdasoup tyxml ]; }; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 239cbca42986..c073ddf39cd2 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ] - ++ lib.optional (lib.versionAtLeast version "3.3.1") [ uucp logs ] ; + ++ lib.optionals (lib.versionAtLeast version "3.3.1") [ uucp logs ] ; meta = { description = "Terminal manipulation library for OCaml"; diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 60a07d30d059..aaa68c214460 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; nativeBuildInputs = [ ocaml findlib opaline eliom ]; + # Remove widgets not compatible with jsoo 4.1.0 + # https://github.com/ocsigen/ocsigen-toolkit/issues/221 + preConfigure = '' + rm src/widgets/ot_{carousel,drawer,swipe,tongue}.eliom{,i} + ''; + strictDeps = true; installPhase = '' diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 388360462dcf..cd90ea6f407e 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,18 +1,10 @@ -{ buildPecl, lib, php }: +{ buildPecl, lib }: -let - versionData = if (lib.versionOlder php.version "8.1") then { - version = "3.1.6"; - sha256 = "1lnmrb5kgq8lbhjs48j3wwhqgk44pnqb1yjq4b5r6ysv9l5wlkjm"; - } else { - version = "3.2.0RC2"; - sha256 = "dQgXDP3Ifg+D0niWxaJ4ec71Vfr8KH40jv6QbxSyY+4="; - }; -in buildPecl { pname = "xdebug"; - inherit (versionData) version sha256; + version = "3.2.0"; + sha256 = "1drj00z8ididm2iw7a7pnrsvakrr1g0i49aqkyz5zpysxh7b4sbp"; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch deleted file mode 100644 index 937479959926..000000000000 --- a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/git/cmd.py b/git/cmd.py -index a4faefe..51ad442 100644 ---- a/git/cmd.py -+++ b/git/cmd.py -@@ -175,7 +175,7 @@ class Git(LazyMixin): - - # CONFIGURATION - -- git_exec_name = "git" # default that should work on linux and windows -+ git_exec_name = "@git@/bin/git" - - # Enables debugging of GitPython's git commands - GIT_PYTHON_TRACE = os.environ.get("GIT_PYTHON_TRACE", False) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6253c43d60c6..5333d2e29fa1 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-siODqRqji2u+EJag/wTXCZG4LATNxggpMtqMHZAfQ9o="; + hash = "sha256-6+3lZygQEezEbGIMbB6NINjVDkgt5sYO2FV5wpienuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 051913ccce56..283fd87c55fb 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "22.10.1"; + version = "22.12.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - hash = "sha256-ceBuqaMqqL6qwN52765MG4sLt+08hx2G9rUVNC7x6ik="; + rev = "refs/tags/${version}"; + hash = "sha256-j7ikJS6lcqr7K4fU/EL43lFlWtGvPT4V9JC2Iqhi0ec="; }; postPatch = '' @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the GitHub API"; homepage = "https://github.com/ludeeus/aiogithubapi"; + changelog = "https://github.com/ludeeus/aiogithubapi/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index a4e39cb98aa3..40d9003a7ba7 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.3.5"; + version = "2.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rZagtP0DwYr6+eQOEaLXRnZUnhKXcWbn6wOJPAA6WVM="; + hash = "sha256-xgk42/g5mRQiTjYuUnXCfLnQm6DNIJsvMbBOhr2NncQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index c4881dcdd56f..b3cb92b95fe6 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -1,14 +1,15 @@ { lib , aiohttp +, bluetooth-data-tools , buildPythonPackage , fetchFromGitHub -, netifaces +, orjson , pythonOlder }: buildPythonPackage rec { pname = "aioshelly"; - version = "4.1.2"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,12 +18,13 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0BxbcWA2Kdk1xTSKN/dH9LJc3yI60kmyMCrK77tqyNE="; + hash = "sha256-jhoPgwydB/DZx7hC16XgM0UBhmByVZRT5b7BDETA+FY="; }; propagatedBuildInputs = [ aiohttp - netifaces + bluetooth-data-tools + orjson ]; # Project has no test diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 70737dcca796..97cbd60db1ab 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jJVXGBK8wWXEGvCzOTicHUh9jH35d1ARIxkLwn/ctjM="; + hash = "sha256-IGIEmM9eZ5T+op3ctGr72oy/cU48+OHaFJaZ8DRTY38="; }; propagatedBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SMB library"; homepage = "https://github.com/skelsec/aiosmb"; + changelog = "https://github.com/skelsec/aiosmb/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 5a671bce26ce..4106049be0b7 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.2.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Vob5p0+SlZR2eHj5Br2pWp3FCxW+zgY6crh8jrkreT0="; + hash = "sha256-k3xmW8aMBz6dbWuLnd6tw2BFoTuD80fpY7q2NfYqMlw="; }; nativeBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with Switcher water heater"; homepage = "https://github.com/TomerFi/aioswitcher"; + changelog = "https://github.com/TomerFi/aioswitcher/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index b75b9ac31810..2ac587ddff3a 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "41"; + version = "42"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rBluo4080m9jFnquXaQY/Cntp7wHToY16aNFhzrQJs8="; + hash = "sha256-vScAWEjdzXSy1gktz+Tfhx13S6OeXZbwZgoS6D1BBtk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index f592ba98e390..6f3319e8375f 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -11,7 +11,7 @@ , cppheaderparser , dpkt , fetchFromGitHub -, GitPython +, gitpython , itanium-demangler , mulpyplexer , nampa @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ttq9V+Bhmbeit3OBUquIlLW7HQeCe2+KE/QkuvLJMjE="; + hash = "sha256-16/hocVfd2RI8qQ9Qt7EM/gGfyGpWabyZhtfwOscqQY="; }; propagatedBuildInputs = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { cle cppheaderparser dpkt - GitPython + gitpython itanium-demangler mulpyplexer nampa diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index d3911f370160..463890c61ebc 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -25,7 +25,7 @@ , flask-caching , flask-session , flask-wtf -, GitPython +, gitpython , graphviz , gunicorn , httpx @@ -161,7 +161,7 @@ buildPythonPackage rec { flask-session flask-wtf flask-login - GitPython + gitpython graphviz gunicorn httpx diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 7081f426c66f..0c81edc1cc22 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-dzD73jmbeQQY/IjF6XRdOcDIhR2lzeA2XQdipssiT00="; + hash = "sha256-LUrLO9BFbpB2p6PtTZPdpLsGHPh088aPHIyoxgv4dGg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index e4f5f8758b1c..863a2fd5417f 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rhqML/w8Hp8xZogjc2ZD+Y9C9c/w1e4X7WNoFaLz9Ps="; + hash = "sha256-JHGkQmxt/29GRnVS/GLU1g5Yc+q6voKNOh3n3LfcfcY="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Socks4/5 client and server library"; homepage = "https://github.com/skelsec/asysocks"; + changelog = "https://github.com/skelsec/asysocks/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 515b3f398dfd..aa69731809ba 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -3,20 +3,23 @@ , fetchPypi , azure-common , azure-storage-common +, msrest }: buildPythonPackage rec { pname = "azure-storage-queue"; - version = "2.1.0"; + version = "12.5.0"; src = fetchPypi { inherit pname version; - sha256 = "14e82d3691f1bbd23f2aff143a6c17af3c297164f6e597d223b65a67051ba278"; + sha256 = "sha256-OzdEJK9y0y2v+Lr5tkYwB0w6iz/VMypFIWs7yWvHsXI="; + extension = "zip"; }; propagatedBuildInputs = [ azure-common azure-storage-common + msrest ]; # has no tests diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index cf1bbd9c54aa..73de9a4688d0 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -1,31 +1,35 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib , isPy3k - -# pythonPackages -, GitPython +, pythonOlder +, gitpython , pbr , pyyaml -, six +, rich , stevedore }: buildPythonPackage rec { pname = "bandit"; version = "1.7.4"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; + hash = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; }; - propagatedBuildInputs = [ - GitPython + nativeBuildInputs = [ pbr + ]; + + propagatedBuildInputs = [ + gitpython pyyaml - six + rich stevedore ]; @@ -33,12 +37,15 @@ buildPythonPackage rec { # and this requires Network Connectivity doCheck = false; - meta = { + pythonImportsCheck = [ + "bandit" + ]; + + meta = with lib; { description = "Security oriented static analyser for python code"; - homepage = "https://bandit.readthedocs.io/en/latest/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - kamadorueda - ]; + homepage = "https://bandit.readthedocs.io/"; + changelog = "https://github.com/PyCQA/bandit/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 1125e45e6282..041af30ddfd9 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.4"; + version = "0.34.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc="; + hash = "sha256-GJG3rmJoBxDrqzsNY2r1cEywRfB4tlLn2DDsaDEI3Bo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index b040ef83d9d9..6961a9c93221 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -1,6 +1,7 @@ { lib , async-timeout , bleak +, bluetooth-adapters , dbus-fast , buildPythonPackage , fetchFromGitHub @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.9.0"; + version = "2.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-U9Urxu7BdTTecONcb2d6jg9oE6fmdNMEVSayLNQiyvY="; + hash = "sha256-QAQQ53T3MTNNaK0rzsBb2F1/qMvMHtr6/+3k1CAKXi0="; }; postPatch = '' @@ -36,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout bleak + bluetooth-adapters dbus-fast ]; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index b696b6b9369e..6e750422120f 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -3,18 +3,21 @@ , pythonOlder , fetchFromGitHub , poetry-core +, aiohttp , async-timeout , bleak , dbus-fast +, mac-vendor-lookup , myst-parser , pytestCheckHook , sphinxHook , sphinx-rtd-theme +, usb-devices }: buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.8.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K5EeDcGcjrZYQTbuYAzT7XhcAqpYW1w/jP5T0cOPsVU="; + hash = "sha256-meBCjWKAIN6sNrBp/Riptu9igvVwIPf0G2x+Z3Kqkts="; }; postPatch = '' @@ -44,9 +47,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp async-timeout bleak dbus-fast + mac-vendor-lookup + usb-devices ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index a4353a19204f..0c85bf8c0505 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.5.1"; + version = "0.5.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LvLav3OCud1EZe3JXvjbuuKU9xtd6ywrx6pZLLP0N/A="; + hash = "sha256-f6HJlFqpmFhM9M1Cuvjz/63DXoikO33y/tmv57snI7g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/btrfsutil/default.nix b/pkgs/development/python-modules/btrfsutil/default.nix new file mode 100644 index 000000000000..d529ec09c705 --- /dev/null +++ b/pkgs/development/python-modules/btrfsutil/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, btrfs-progs +}: +buildPythonPackage { + pname = "btrfsutil"; + inherit (btrfs-progs) version src; + format = "setuptools"; + + buildInputs = [ btrfs-progs ]; + + preConfigure = '' + cd libbtrfsutil/python + ''; + + # No tests + doCheck = false; + pythonImportsCheck = [ "btrfsutil" ]; + + meta = with lib; { + description = "Library for managing Btrfs filesystems"; + homepage = "https://btrfs.wiki.kernel.org/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ raskin lopsided98 ]; + }; +} diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index e4eae0d3fe75..75e3cd4f4b3b 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros - ] ++ lib.optional (pythonOlder "3.11") [ rtoml ]; + ] ++ lib.optionals (pythonOlder "3.11") [ rtoml ]; pythonImportsCheck = [ "bundlewrap" ]; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index e231624e40f8..2e3e1778d175 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -1,23 +1,49 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: +{ lib +, buildPythonPackage +, fetchPypi +, git +, gitpython +, krb5 +, mock +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "CCColUtils"; + pname = "cccolutils"; version = "1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "1gwcq4xan9as1j3q9k2zqrywxp46qx0ljwxbck9id2fvilds6ck3"; + pname = "CCColUtils"; + inherit version; + hash = "sha256-YzKjG43biRbTZKtzSUHHhtzOfcZfzISHDFolqzrBjL8="; }; - buildInputs = [ krb5Full ]; - propagatedBuildInputs = [ nose GitPython mock git ]; + buildInputs = [ + krb5 + ]; + + propagatedBuildInputs = [ + git + gitpython + mock + ]; + + checkInputs = [ + pytestCheckHook + ]; - doCheck = isPy3k; # needs unpackaged module to run tests on python2 + pythonImportsCheck = [ + "cccolutils" + ]; meta = with lib; { description = "Python Kerberos 5 Credential Cache Collection Utilities"; homepage = "https://pagure.io/cccolutils"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ disassembler ]; }; } diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix index 5b8a75c7c123..741ed3791368 100644 --- a/pkgs/development/python-modules/chat-downloader/default.nix +++ b/pkgs/development/python-modules/chat-downloader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "chat-downloader"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; src = fetchPypi { inherit version pname; - sha256 = "f095cd90c312eecec647de2ff49f3ef4cfc30e3935731d21315380f331bdd095"; + sha256 = "e19f961480b14b55d03d4d4aaa766d46131bdf2ea8a79b47d20037dfd980201a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 9afd28132e15..5ccf2e257438 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-7tn/OdPNUnbF2T0wASCBfuTZ0zI1j8GY5kh0QwbzS+8="; + hash = "sha256-CGYX8IzVBqhF0IenTFKtx79J81X6UGkvm/XvFovnHYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 88d472a9de7a..1a8a3f2b871e 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.27"; + version = "9.2.28"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-PP8TdAiyqdcgJNz5jYjAFcuv42ca0zfLwL289XKDqk4="; + hash = "sha256-t3TO1rHf5iA+9WW3Adi37fL7XjRUZFPowUWchX9eEVI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 7c1594e9e805..4479d1f24855 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -3,12 +3,15 @@ , fetchFromGitHub , mock , pytestCheckHook +, pyyaml }: buildPythonPackage rec { pname = "configargparse"; version = "1.5.3"; + format = "setuptools"; + src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; @@ -19,6 +22,7 @@ buildPythonPackage rec { checkInputs = [ mock pytestCheckHook + pyyaml ]; pythonImportsCheck = [ "configargparse" ]; diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index 2fd90b23bee0..5928a9b90ecf 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -1,22 +1,26 @@ { lib +, attrs , buildPythonPackage -, fetchPypi , certvalidator -, attrs -, six -, urllib3 , cryptoparser +, fetchPypi +, pythonOlder , requests +, six +, urllib3 }: buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.8.1"; + version = "0.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "CryptoLyzer"; inherit version; - sha256 = "sha256-FbxSjKxhzlpj3IezuLCQvoeZMG1q+OE/yn5vB/XE1rI="; + hash = "sha256-Bo8w9ijJu9IWdgr8OQws2iErzmuxUhs9YE6NAydPYgM="; }; propagatedBuildInputs = [ @@ -28,13 +32,17 @@ buildPythonPackage rec { requests ]; - doCheck = false; # Tests require networking + # Tests require networking + doCheck = false; - pythonImportsCheck = [ "cryptolyzer" ]; + pythonImportsCheck = [ + "cryptolyzer" + ]; meta = with lib; { - description = "Fast and flexible cryptographic protocol analyzer"; + description = "Cryptographic protocol analyzer"; homepage = "https://gitlab.com/coroner/cryptolyzer"; + changelog = "https://gitlab.com/coroner/cryptolyzer/-/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ kranzes ]; }; diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index cfac7f20376e..c4771b394994 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.8.0"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kJg8d1PoGIC0feefbJM8oyXcRyMGdg1wWkQUl/nSNCo="; + hash = "sha256-eLQNqeCUnjcxWbazhWHtqJJgvPUMH42fboU5y2ZMy44="; }; propagatedBuildInputs = [ @@ -23,11 +23,14 @@ buildPythonPackage rec { python-dateutil ]; - pythonImportsCheck = [ "cryptoparser" ]; + pythonImportsCheck = [ + "cryptoparser" + ]; meta = with lib; { - description = "Fast and flexible security protocol parser and generator"; + description = "Security protocol parser and generator"; homepage = "https://gitlab.com/coroner/cryptoparser"; + changelog = "https://gitlab.com/coroner/cryptoparser/-/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ kranzes ]; }; diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index 49b5c7590691..8bdcb400b96f 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "tags/${version}"; - hash = "sha256-MZzCTUleEddIlZBRhxD8ZgaWAOFcpa5hvNuIjrBJRzk="; + hash = "sha256-8qlXwEbgLRZ1qYtBJ1c0nv6qfIOW5zAK9eOS+n+afWQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 7db2e1d15b74..950afaabb8dc 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -13,7 +13,7 @@ , langdetect , parameterized , pytestCheckHook -, GitPython +, gitpython , parsel , requests , ruamel-yaml @@ -50,7 +50,7 @@ buildPythonPackage rec { checkInputs = [ parameterized pytestCheckHook - GitPython + gitpython parsel requests ruamel-yaml diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 8efa6983150d..db9d6bde1614 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "db-dtypes"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-db-dtypes-pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-ilcVog6mhF83GVa68BppUzvKNRPdSDXla2MU6M2EzLg="; + hash = "sha256-RlSze0e2NNHJ6kAbj9TX58MaEPutyjcLXIOYjpugO6o="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pandas Data Types for SQL systems (BigQuery, Spanner)"; homepage = "https://github.com/googleapis/python-db-dtypes-pandas"; + changelog = "https://github.com/googleapis/python-db-dtypes-pandas/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 628e18931255..98acaaba4094 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -7,56 +7,75 @@ , httpx , mypy-boto3-s3 , numpy -, scipy , pydantic +, pytest-asyncio , pytestCheckHook +, pythonOlder , pyyaml +, scipy , six }: buildPythonPackage rec { pname = "dependency-injector"; - version = "4.35.3"; + version = "4.40.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; rev = version; - sha256 = "sha256-2qe4A2T3EagNCh1zSbPWblVN7p9NH8rNwQQVyESJTdk="; + hash = "sha256-lcgPFdAgLmv7ILL2VVfqtGSw96aUfPv9oiOhksRtF3k="; }; propagatedBuildInputs = [ six ]; + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + pydantic = [ + pydantic + ]; + flask = [ + flask + ]; + yaml = [ + pyyaml + ]; + }; + checkInputs = [ - aiohttp fastapi - flask httpx mypy-boto3-s3 numpy - pydantic - scipy + pytest-asyncio pytestCheckHook - pyyaml - ]; + scipy + ] ++ passthru.optional-dependencies.aiohttp + ++ passthru.optional-dependencies.pydantic + ++ passthru.optional-dependencies.yaml + ++ passthru.optional-dependencies.flask; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "six>=1.7.0,<=1.15.0" "six" - ''; + pythonImportsCheck = [ + "dependency_injector" + ]; disabledTestPaths = [ - # There is no unique identifier to disable the one failing test + # Exclude tests for EOL Python releases "tests/unit/ext/test_aiohttp_py35.py" + "tests/unit/wiring/test_*_py36.py" ]; - pythonImportsCheck = [ "dependency_injector" ]; - meta = with lib; { description = "Dependency injection microframework for Python"; homepage = "https://github.com/ets-labs/python-dependency-injector"; + changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${version}/docs/main/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 935abb99c8db..cb6f40e422ce 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.1.3"; + version = "4.1.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Z4u/yGBOskbtVOIGPwdl8TsyGlBSa9yMsflD7af6MfE="; + hash = "sha256-04pOEI0jhsuWN9pmqC3I0HM8rt5Mg8Sv29p4r0IUIRs="; }; patches = [ @@ -113,6 +113,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://docs.djangoproject.com/en/${lib.versions.majorMinor version}/releases/${version}/"; description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."; homepage = "https://www.djangoproject.com"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix index 432f77220adc..9a17d19a9d14 100644 --- a/pkgs/development/python-modules/docstring-to-markdown/default.nix +++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "docstring-to-markdown"; - version = "0.10"; + version = "0.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "0rflkbms94wkcypjcnz30bc4w4iww91h7sqq3j2b6ypzl4g48csa"; + rev = "refs/tags/v${version}"; + hash = "sha256-4Jl1XJpxwbxGWxdF4bOerjHyzHCIHtrydklwwk1WGs4="; }; patches = [ @@ -31,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-lsp/docstring-to-markdown"; description = "On the fly conversion of Python docstrings to markdown"; + changelog = "https://github.com/python-lsp/docstring-to-markdown/releases/tag/v${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index d80b703522dc..d1abca2b6e53 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.10.27"; + version = "22.12.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pzVzCEkndbesX3tzuuPqtpEmCd5/bSuQmJ2J2IPFRMk="; + hash = "sha256-/XV0dwCkp1kOrXepEaPPEWefBphGB6rQPeTWmo3cHPY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 7ee4c0999b4e..14401f7e53fd 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.9.29"; + version = "2022.12.7"; format = "wheel"; disable = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-VZ7heZnA9ScoSB3PaxsM+Ml0PmjF46GMtFp5knR4aak="; + hash = "sha256-fLdsEqJe9l24WrB0PfkHVz0DAnozYx8X0mflmOuxkfc="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "A clean customizable documentation theme for Sphinx"; homepage = "https://github.com/pradyunsg/furo"; + changelog = "https://github.com/pradyunsg/furo/blob/${version}/docs/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; }; diff --git a/pkgs/development/python-modules/gamble/default.nix b/pkgs/development/python-modules/gamble/default.nix index 0df84510efd4..3b62893e149f 100644 --- a/pkgs/development/python-modules/gamble/default.nix +++ b/pkgs/development/python-modules/gamble/default.nix @@ -7,12 +7,14 @@ buildPythonPackage rec { pname = "gamble"; - version = "0.10"; - disabled = pythonOlder "3.6"; + version = "0.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1lb5x076blnnz2hj7k92pyq0drbjwsls6pmnabpvyvs4ddhz5w9w"; + hash = "sha256-zsEBqhKidgO1e0lpKhw+LY75I2Df+IefNLaSkBBFKFU="; }; checkInputs = [ @@ -26,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of gambling classes/tools"; homepage = "https://github.com/jpetrucciani/gamble"; + changelog = "https://github.com/jpetrucciani/gamble/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; }; diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 5e4b40e612bc..110b04f658df 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.0.3"; + version = "4.0.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-FDxyuSR0Ekal/3+OhR3Z0pkiWYMToeCcfwBQp3bjnyw="; + hash = "sha256-g0hnwUX33qZ36JgKx3KHP3BciYujQ+Eahe6bF3m87FM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index 2d7da28535cf..0f223b03760a 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, GitPython +, gitpython +, pythonOlder }: buildPythonPackage rec { pname = "git-sweep"; version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1csp0zd049d643d409rfivbswwzrayb4i6gkypp5mc27fb1z2afd"; + hash = "sha256-zSnxw3JHsFru9fOZSJZX+XOu144uJ0DaIKYlAtoHV7M="; }; - propagatedBuildInputs = [ GitPython ]; + propagatedBuildInputs = [ + gitpython + ]; - # no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "gitsweep" ]; + pythonImportsCheck = [ + "gitsweep" + ]; meta = with lib; { description = "A command-line tool that helps you clean up Git branches"; @@ -26,5 +34,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ pSub ]; }; - } diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index 8d89c1af8d0c..e577a1e508a4 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -1,44 +1,47 @@ { lib , buildPythonPackage +, ddt , fetchFromGitHub -, substituteAll -, git , gitdb -, ddt +, pkgs , pythonOlder +, substituteAll , typing-extensions }: buildPythonPackage rec { pname = "gitpython"; - version = "3.1.27"; + version = "3.1.29"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gitpython-developers"; repo = "GitPython"; rev = version; - sha256 = "sha256-RA+6JFXHUQoXGErV8+aYuJPsfXzNSZK3kTm6eMbQIss="; + hash = "sha256-RNDBoGWnkirPZjxn5oqH3zwYqVFLedNrSRpZOHU0j+w="; }; - patches = [ - (substituteAll { - src = ./hardcode-git-path.patch; - inherit git; - }) - ]; - propagatedBuildInputs = [ - gitdb ddt + gitdb + pkgs.gitMinimal ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + postPatch = '' + substituteInPlace git/cmd.py \ + --replace 'git_exec_name = "git"' 'git_exec_name = "${pkgs.gitMinimal}/bin/git"' + ''; + # Tests require a git repo doCheck = false; - pythonImportsCheck = [ "git" ]; + pythonImportsCheck = [ + "git" + ]; meta = with lib; { description = "Python Git Library"; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index b45eb0ce1201..9b785a61c907 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.13.2"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a0R8CefN6gtIYqtNdCW9QKJulsbDnH6dFuUfTp8jUnA="; + hash = "sha256-hJgEFRr65eGuV0xx/4leyBZzdd9jt/SEKm3MApzHCGA="; }; propagatedBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Bigtable API client library"; homepage = "https://github.com/googleapis/python-bigtable"; + changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 7fbc6ad0bb51..2fb93c8a73d1 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qr2RiIFl1njOOhoblub93foMQ63xpgp9Wj5p0SoLoHw="; + hash = "sha256-bxFBWi6cx7TeeofMP59XVRX9aDpCP2N5lAkUpWYW1wU="; }; propagatedBuildInputs = [ @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stackdriver Logging API client library"; homepage = "https://github.com/googleapis/python-logging"; + changelog = "https://github.com/googleapis/python-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 8272416b29f2..2704b357004c 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.23.0"; + version = "3.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1RHzpCRYU2dUxZLa+zzopHd+xfnq7eWF6HDIkVk+2NY="; + hash = "sha256-Ko/9gfcR7BBX+U60vlWgdh4d1xptUJRRyWmAGq6a4/E="; }; propagatedBuildInputs = [ @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Spanner API client library"; homepage = "https://github.com/googleapis/python-spanner"; + changelog = "https://github.com/googleapis/python-spanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index c2da89dc6c44..2059d7c092f8 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-4kR3Hc5M4FDG/WFtIW20a9d0vwLzmqtrlhd+teMiejA="; + hash = "sha256-UBkfe4d+K+730TbvModZF1ET7uxMpQGxOkq0PF/WiWc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index ab64a78c103f..a2543ae227bd 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "2.6.1"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; + hash = "sha256-drzmlHfU2ut3o7JASvFbEcf6OVtWa8kAyzpeDV5iGlc="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "General simulation data file format"; homepage = "https://github.com/glotzerlab/gsd"; + changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 35133847139c..c38746299c5d 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.7.1"; + version = "5.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XznXohg0O2UU8G4iUODEE+tOgU3eaqv0hdrLaqMcqrA="; + hash = "sha256-znb5wWuIzLeSNQFCIkpZr6jmn3Rj89NBcUjL6JLvx8s="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; + changelog = "https://github.com/burnash/gspread/blob/v${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index f703820a4f5c..16c6eb513c6d 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -6,7 +6,7 @@ , six , decorator , nose -, krb5Full +, krb5 , GSS , parameterized , shouldbe @@ -30,12 +30,12 @@ buildPythonPackage rec { # It's used to locate headers postPatch = '' substituteInPlace setup.py \ - --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5Full}"' + --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"' ''; nativeBuildInputs = [ cython - krb5Full + krb5 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index a1c07368c0de..375e975d969a 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,19 +15,18 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.56.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-IgDOugHr4fCD9o3QQY5w/ibjak/d56R31KgQAbjUkkI="; + sha256 = "sha256-KG2eCwGZWVtepJQdsSwFziWsT1AbV6rYWRIO/I/CR8g="; }; postPatch = '' substituteInPlace setup.py \ --replace "acme==" "acme>=" \ - --replace "cryptography>=2.8,<38.0" "cryptography" \ --replace "pycognito==" "pycognito>=" \ --replace "snitun==" "snitun>=" \ ''; diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 4b0a9b660cfb..68261007b7c5 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -2,14 +2,16 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, cython , poetry-core +, setuptools , bleak , pytestCheckHook }: buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.6.0"; + version = "1.8.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6w940Yn0WgVC0Rn9OX40+6hO4maPSC7VrT3ARD8CIjQ="; + hash = "sha256-oOrsZmAXLYsJ19DrQ70O0RpeSz8Jn8oD41Tsc5DVUng="; }; postPatch = '' @@ -26,7 +28,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + cython poetry-core + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 50819a3c3444..3f983681316e 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.12"; + version = "1.0.13"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-gad+sg5MZvAzy1xE+xF/4GdLClB5EiyPH39nIlhO7IQ="; + hash = "sha256-bNVvQbwtef7Q0OBtR/8vsDDPkgGQgzdBC3QyoxLW3Wo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index f11dd0e87642..9c12520e9718 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ical"; - version = "4.1.2"; + version = "4.2.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kbPiyHu8k0cIkeX1XF2p5yQwiDvEWJhclENQly5QJa0="; + hash = "sha256-YvBcfrZiHTornCEAFhNLN/siNvl119pD+o+0yNsRBA8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index f0b702b1b513..f17af2b24fa5 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jeeftor"; repo = pname; - rev = version; - hash = "sha256-dn5814eRZ9456Fn7blf1UzXPii4dXu3sjoXBV7CmwSs="; + rev = "refs/tags/${version}"; + hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; }; propagatedBuildInputs = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to read Intellifire fireplace status data"; homepage = "https://github.com/jeeftor/intellifire4py"; + changelog = "https://github.com/jeeftor/intellifire4py/blob/${version}/CHANGELOG"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index f420aefd7df9..47cd5fed605a 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.42.1"; + version = "0.44"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coveooss"; repo = pname; - rev = "v${version}"; - hash = "sha256-WVLIx85ivHz5b6C1AfgMAApngeFCuWwWhaBWNcfOvXA="; + rev = "refs/tags/v${version}"; + hash = "sha256-LsZPf5PVXPSyHNgfBdjH4hG4OFIdSprO5uj3saPDqzo="; }; postPatch = '' @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; homepage = "https://github.com/coveooss/json-schema-for-humans"; + changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ astro ]; }; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index c7a294eef44f..cc709c4f47a3 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { babel jupyter_server tomli - ] ++ lib.optional (pythonOlder "3.10") [ + ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index dabbe303e161..dc5b56c3c010 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, GitPython +, gitpython , isort , jupyter-client , jupyter-packaging @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DDF4aTLkhEl4xViYh/E0/y6swcwZ9KbeS0qKm+HdFz8="; + hash = "sha256-DDF4aTLkhEl4xViYh/E0/y6swcwZ9KbeS0qKm+HdFz8="; }; patches = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; checkInputs = [ - GitPython + gitpython isort jupyter-client notebook diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 6123f4d410f6..6c2e8466a1de 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , substituteAll -, krb5Full +, krb5 , findutils , which , pythonOlder @@ -23,9 +23,9 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit findutils krb5Full; + inherit findutils krb5; # krb5-config is in dev output - krb5FullDev = krb5Full.dev; + krb5Dev = krb5.dev; which = "${which}/bin/which"; }) ]; diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch index dc6caf815809..c455ecf00ef7 100644 --- a/pkgs/development/python-modules/k5test/fix-paths.patch +++ b/pkgs/development/python-modules/k5test/fix-paths.patch @@ -7,13 +7,13 @@ index e289fac..e2f486a 100644 # if there was no LD_LIBRARY_PATH, or the above failed if _PLUGIN_DIR is None: - lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64') -+ lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib64') ++ lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib64') _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir)) # /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family if _PLUGIN_DIR is None: - lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib') -+ lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib') ++ lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib') _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir)) if _PLUGIN_DIR is not None: @@ -53,7 +53,7 @@ index 161e5ad..9f50049 100644 if provider_cls == K5Realm: krb5_config = _discover_path('krb5-config', - '/usr/bin/krb5-config', kwargs) -+ '@krb5Full@/bin/krb5-config', kwargs) ++ '@krb5@/bin/krb5-config', kwargs) try: krb5_version = subprocess.check_output( @@ -62,7 +62,7 @@ index 161e5ad..9f50049 100644 if 'heimdal' in krb5_version.lower() or ( sys.platform == 'darwin' and - krb5_config == '/usr/bin/krb5-config'): -+ krb5_config == '@krb5Full@/bin/krb5-config'): ++ krb5_config == '@krb5@/bin/krb5-config'): provider_cls = HeimdalRealm else: provider_cls = MITRealm @@ -78,14 +78,14 @@ index 161e5ad..9f50049 100644 - ('kprop', 'kprop', '/usr/sbin/kprop'), - ('_kinit', 'kinit', '/usr/bin/kinit'), - ('_klist', 'klist', '/usr/bin/klist'), -+ ('kdb5_util', 'kdb5_util', '@krb5Full@/bin/kdb5_util'), -+ ('krb5kdc', 'krb5kdc', '@krb5Full@/bin/kdb5kdc'), -+ ('kadmin', 'kadmin', '@krb5Full@/bin/admin'), -+ ('kadmin_local', 'kadmin.local', '@krb5Full@/bin/kadmin.local'), -+ ('kadmind', 'kadmind', '@krb5Full@/bin/kadmind'), -+ ('kprop', 'kprop', '@krb5Full@/bin/kprop'), -+ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), -+ ('_klist', 'klist', '@krb5Full@/bin/klist'), ++ ('kdb5_util', 'kdb5_util', '@krb5@/bin/kdb5_util'), ++ ('krb5kdc', 'krb5kdc', '@krb5@/bin/kdb5kdc'), ++ ('kadmin', 'kadmin', '@krb5@/bin/admin'), ++ ('kadmin_local', 'kadmin.local', '@krb5@/bin/kadmin.local'), ++ ('kadmind', 'kadmind', '@krb5@/bin/kadmind'), ++ ('kprop', 'kprop', '@krb5@/bin/kprop'), ++ ('_kinit', 'kinit', '@krb5@/bin/kinit'), ++ ('_klist', 'klist', '@krb5@/bin/klist'), ] @property @@ -95,15 +95,15 @@ index 161e5ad..9f50049 100644 ('krb5kdc', 'kdc', os.path.join(base, 'kdc')), - ('kadmin', 'kadmin', '/usr/bin/kadmin'), - ('kadmin_local', 'kadmin', '/usr/bin/kadmin'), -+ ('kadmin', 'kadmin', '@krb5Full@/bin/kadmin'), -+ ('kadmin_local', 'kadmin', '@krb5Full@/bin/kadmin'), ++ ('kadmin', 'kadmin', '@krb5@/bin/kadmin'), ++ ('kadmin_local', 'kadmin', '@krb5@/bin/kadmin'), ('kadmind', 'kadmind', os.path.join(base, 'kadmind')), - ('_kinit', 'kinit', '/usr/bin/kinit'), - ('_klist', 'klist', '/usr/bin/klist'), - ('_ktutil', 'ktutil', '/usr/bin/ktutil'), -+ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), -+ ('_klist', 'klist', '@krb5Full@/bin/klist'), -+ ('_ktutil', 'ktutil', '@krb5Full@/bin/ktutil'), ++ ('_kinit', 'kinit', '@krb5@/bin/kinit'), ++ ('_klist', 'klist', '@krb5@/bin/klist'), ++ ('_ktutil', 'ktutil', '@krb5@/bin/ktutil'), ] @property @@ -116,7 +116,7 @@ index 3c64b9e..59da1ab 100644 global _KRB_VERSION if _KRB_VERSION is None: - _KRB_VERSION = _utils.get_output("krb5-config --version") -+ _KRB_VERSION = _utils.get_output("@krb5FullDev@/bin/krb5-config --version") ++ _KRB_VERSION = _utils.get_output("@krb5Dev@/bin/krb5-config --version") _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.') def make_ext_test(func): diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 2e3808db8561..c858dcde6619 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -11,15 +11,19 @@ , mock , vcrpy , pytest +, pythonOlder }: buildPythonPackage rec { pname = "knack"; - version = "0.10.0"; + version = "0.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ExkPqV1MIbzgS0vuItak4/sZqTtpmbHRBL0CxHZwbCg="; + hash = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg="; }; propagatedBuildInputs = [ @@ -42,9 +46,14 @@ buildPythonPackage rec { HOME=$TMPDIR pytest . ''; + pythonImportsCheck = [ + "knack" + ]; + meta = with lib; { homepage = "https://github.com/microsoft/knack"; description = "A Command-Line Interface framework"; + changelog = "https://github.com/microsoft/knack/blob/v${version}/HISTORY.rst"; platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 947d29762f3e..64eb6499afb4 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "life360"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GacesPWPTuIIZel4OARWW13OYflYFNf4Jxh9I8ms7s0="; + hash = "sha256-AY3TW6gpKST2uxxpmtlLz+qP18yJHyOk6XdA5yGJBEg="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with Life360"; homepage = "https://github.com/pnbruckner/life360"; + changelog = "https://github.com/pnbruckner/life360/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 0e80ef1da88b..0054d8916362 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.16.6"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-x8a2W64zLDi8r7d8B7GYCwWtSAB3BH+Sprbw+Xr7mH4="; + hash = "sha256-nR7ZKKpqiCrQbXsS+znmNht1OvcYL6hSQxHMcJ+/yKA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix index 2c0a7d4f7240..d4a1be562f9e 100644 --- a/pkgs/development/python-modules/mac-vendor-lookup/default.nix +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bauerj"; repo = "mac_vendor_lookup"; - rev = "5b57faac0c5a701a7e18085e331853397b68c07c"; - hash = "sha256-F/aiMs+J4bAesr6mKy+tYVjAjZ3l9vyHxV7zaaB6KbA="; + rev = "90dbea48f8a9d567b5f9039ebd151ddfe7d12a19"; + hash = "sha256-mPPJDrWdyvkTdb4WfeTNYwuC+Ek9vH7ORKRTREg+vK8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix index f913beb07ef1..02a6b5348ed4 100644 --- a/pkgs/development/python-modules/mathlibtools/default.nix +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , click , fetchPypi -, GitPython +, gitpython , networkx , pydot , PyGithub @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ atomicwrites click - GitPython + gitpython networkx pydot PyGithub diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index 5cc40f4a6ca6..bb3d4b917f1f 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , ipykernel }: buildPythonPackage rec { pname = "metakernel"; version = "0.29.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "sha256-A++uLR4hhOQYmA6o9wBTejFju3CpbK0hwIs7XFscddQ="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ ipykernel ]; # Tests hang, so disable diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 4b4cf1315b5f..b85000fe05c5 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , pythonOlder # Mitmproxy requirements @@ -8,7 +7,6 @@ , blinker , brotli , certifi -, click , cryptography , flask , h11 @@ -16,6 +14,7 @@ , hyperframe , kaitaistruct , ldap3 +, mitmproxy-wireguard , msgpack , passlib , protobuf @@ -42,24 +41,16 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "8.1.1"; - disabled = pythonOlder "3.8"; + version = "9.0.1"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "mitmproxy"; + repo = "mitmproxy"; rev = "refs/tags/v${version}"; sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04="; }; - patches = [ - # Fix onboarding addon tests failing with Flask >= v2.2 - (fetchpatch { - url = "https://github.com/mitmproxy/mitmproxy/commit/bc370276a19c1d1039e7a45ecdc23c362626c81a.patch"; - hash = "sha256-Cp7RnYpZEuRhlWYOk8BOnAKBAUa7Vy296UmQi3/ufes="; - }) - ]; - propagatedBuildInputs = [ setuptools # setup.py @@ -67,7 +58,6 @@ buildPythonPackage rec { blinker brotli certifi - click cryptography flask h11 @@ -75,11 +65,12 @@ buildPythonPackage rec { hyperframe kaitaistruct ldap3 + mitmproxy-wireguard msgpack passlib protobuf - publicsuffix2 pyopenssl + publicsuffix2 pyparsing pyperclip ruamel-yaml @@ -120,6 +111,12 @@ buildPythonPackage rec { # ValueError: Exceeds the limit (4300) for integer string conversion "test_roundtrip_big_integer" ]; + + disabledTestPaths = [ + # teardown of half the tests broken + "test/mitmproxy/addons/test_onboarding.py" + ]; + dontUsePytestXdist = true; pythonImportsCheck = [ "mitmproxy" ]; diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index d944a987aa42..8d05efbca088 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.8.0"; + version = "0.8.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = version; - hash = "sha256-KAVBK0ZR1R27cWH99DVOYNFWKa4ubBXzgM0hVpGRIpE="; + hash = "sha256-TwvXH/n2do4GnkxStW8fk9MRm59t/eP0sOjGnl3fYkw="; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python handler for mkdocstrings"; homepage = "https://github.com/mkdocstrings/python"; + changelog = "https://github.com/mkdocstrings/python/blob/${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index cc5abbdd3d2f..375c56b6885a 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -9,7 +9,7 @@ , fetchpatch , fetchPypi , flask -, GitPython +, gitpython , gorilla , gunicorn , importlib-metadata @@ -50,7 +50,7 @@ buildPythonPackage rec { docker entrypoints flask - GitPython + gitpython gorilla gunicorn importlib-metadata @@ -81,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open source platform for the machine learning lifecycle"; homepage = "https://github.com/mlflow/mlflow"; + changelog = "https://github.com/mlflow/mlflow/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 6ec4772611f8..d11338a0f070 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jcrist"; repo = pname; - rev = version; - hash = "sha256-q7WNVnkvK7MTleHEuClOFJ0Wv6EWu/3ztMi6TYdKgKU="; + rev = "refs/tags/${version}"; + hash = "sha256-/tu29RIszjzYQKeyYe+8Zkud3L/HBoWdXdpNcilWERs="; }; # Requires libasan to be accessible @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to handle JSON/MessagePack"; homepage = "https://github.com/jcrist/msgspec"; + changelog = "https://github.com/jcrist/msgspec/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 00be47cf8207..9ae495cf55e2 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.11.11"; + version = "7.12.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-4iyh/oXuYsdtqEf1Dh4Z3y8AHWiS1TmimO5HUwsHrHA="; + hash = "sha256-YmWQZvSABE0IKvISJWeB0rYryZ9FNTCgS7/lE2/sO04="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index eb36da387f60..6825978f19f3 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { version = "1.26.0.post1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -31,9 +31,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Type annotations for boto3"; - homepage = "https://vemel.github.io/boto3_stubs_docs/mypy_boto3_s3/"; - license = with licenses; [ bsd3 ]; + description = "Type annotations for boto3.s3"; + homepage = "https://github.com/youtype/mypy_boto3_builder"; + license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index da00ff3702dd..78cb915b29e6 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , hypothesis , setuptools-scm , six @@ -19,7 +19,7 @@ , pygments , tornado , requests -, GitPython +, gitpython , jupyter-server-mathjax , notebook , jinja2 @@ -28,14 +28,18 @@ buildPythonPackage rec { pname = "nbdime"; version = "3.1.1"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b"; + hash = "sha256-Z3ZzIOlxN09wGhdapZq9OlVHIwOdOfrpCOctFjMNZIs="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ attrs @@ -48,7 +52,7 @@ buildPythonPackage rec { pygments tornado requests - GitPython + gitpython notebook jinja2 ]; @@ -78,6 +82,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ + "nbdime" + ]; + meta = with lib; { homepage = "https://github.com/jupyter/nbdime"; description = "Tools for diffing and merging of Jupyter notebooks."; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 3ae81a4afed6..de424d8afdf9 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -5,6 +5,7 @@ , dacite , fetchFromGitHub , aqipy-atmotech +, orjson , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.4.2"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,13 +23,14 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - hash = "sha256-UbknJ+dX+4kzfe6/gg/Nj1Ay8YXtIRj203B6NkhGVys="; + hash = "sha256-84cd869k+JZZpjBBoHH2AyIo8ixJzVgpLLRBV4cMNKA="; }; propagatedBuildInputs = [ aiohttp - dacite aqipy-atmotech + dacite + orjson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index a0aac69df9e1..41b22ee21703 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.1.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hMTafmG3mk6jyrqxI7L/rQxKGpgNgEZ+b6d6/yISCng="; + hash = "sha256-F6vTOwE8WdcELH+W7VuRbGDLD+7+a09iai/TDMBfv4s="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}"; description = "Module for the NextDNS API"; homepage = "https://github.com/bieniu/nextdns"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index e253c0b5c9bf..e5d37fcfba8d 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , git -, GitPython +, gitpython , pycryptodomex , pytestCheckHook , pythonOlder @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bitcoinlib - GitPython + gitpython pycryptodomex ]; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Create and verify OpenTimestamps proofs"; homepage = "https://github.com/opentimestamps/python-opentimestamps"; + changelog = "https://github.com/opentimestamps/python-opentimestamps/releases/tag/python-opentimestamps-v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ erikarvstedt ]; }; diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 72892a109539..2f9e2d0c4b08 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { disabledTests = [ # timming sensitive "test_dummy_verify" - ] - # These tests fail because they don't expect support for algorithms provided through libxcrypt - ++ lib.optionals stdenv.isDarwin [ + "test_encrypt_cost_timing" + ] ++ lib.optionals stdenv.isDarwin [ + # These tests fail because they don't expect support for algorithms provided through libxcrypt "test_82_crypt_support" ]; diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 295df5aab39c..1a77aa0ca169 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.9"; + version = "0.2.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DvbOA/NXHTuE84zWicOUtAKgGHUmKrAWgeFW1+uA8JY="; + hash = "sha256-AlJ61Sp6HSy6nJ6trVF2OD9ziSIW241peRXcda3xWnQ="; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "C implementation of patiencediff algorithm for Python"; homepage = "https://github.com/breezy-team/patiencediff"; + changelog = "https://github.com/breezy-team/patiencediff/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ wildsebastian ]; }; diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix index 0693fbf4fde8..fd1b95c48226 100644 --- a/pkgs/development/python-modules/pip-requirements-parser/default.nix +++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pip-requirements-parser"; - version = "31.2.0"; + version = "32.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nexB"; repo = pname; rev = "v${version}"; - hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0="; + hash = "sha256-Wu4C93PWujygKIzXqUjCmKWcllr+hkuvnqDuw6/D9Do="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to parse pip requirements"; homepage = "https://github.com/nexB/pip-requirements-parser"; + changelog = "https://github.com/nexB/pip-requirements-parser/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 4d207628cf8e..59980857560f 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.11.0"; + version = "22.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WGtHMQ+8hACt8SMyO0zO80ASlfykJfHQOtNwyk1fsFE="; + hash = "sha256-8enSKOVEkYPI/2d2nzDkf1GO15kpMI6xDktroK9Ti2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 4061edfc5ae4..cd1fb4806f18 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" ]; - setupPyGlobalFlags = "--cpp_implementation"; + setupPyGlobalFlags = [ "--cpp_implementation" ]; pythonImportsCheck = [ "google.protobuf" diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 41c514d2ca63..09c624bbdc1d 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "psrpcore"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; repo = pname; - rev = "v${version}"; - hash = "sha256-f1NGE+wSgi8yqBicZZRfUqzinsqazuIaoAje2y+dK1w="; + rev = "refs/tags/v${version}"; + hash = "sha256-uX99BsQn1Ckl+2Lt4I0EMZLTKeDrX0mtSc9w5aFpvxQ="; }; propagatedBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the PowerShell Remoting Protocol (PSRP)"; homepage = "https://github.com/jborean93/psrpcore"; + changelog = "https://github.com/jborean93/psrpcore/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index af07f013ee05..c78aacc8d5a2 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.21"; + version = "3.0.22"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pXuZUurEoSVApN+0zNSiQ0A+zrJ7DRMkW15BRMhzHTI="; + hash = "sha256-wJezJEBgFKAFxrCfSTu73eVx5BI2CvK6FVGHOhDDbPg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index b397d4cf59f1..7ff24f974ee4 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.21.1"; + version = "5.23.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-b/X+UHJnGCzE3AR+spXJWv/NVq5BVvNlzEyHpqDhquY="; + hash = "sha256-YT667WBOnObGpagml9xAj6N+Kdhq3rhx0XspJJXhrUE="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index 0c700151f694..30631de36e52 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -1,32 +1,68 @@ -{ lib, buildPythonPackage, fetchFromGitHub, GitPython -, libpcap, meson, ninja, pillow, pkg-config, pygobject3, SDL2 -, alsa-lib, soundtouch, openal +{ lib +, alsa-lib +, buildPythonPackage +, fetchFromGitHub +, gitpython +, libpcap +, meson +, ninja +, openal +, pillow +, pkg-config +, pygobject3 +, pythonOlder +, SDL2 +, soundtouch }: buildPythonPackage rec { pname = "py-desmume"; version = "0.0.4.post2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY="; + hash = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY="; fetchSubmodules = true; }; - buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ]; - nativeBuildInputs = [ meson ninja pkg-config ]; - propagatedBuildInputs = [ pillow pygobject3 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + alsa-lib + gitpython + libpcap + openal + SDL2 + soundtouch + ]; + + propagatedBuildInputs = [ + pillow + pygobject3 + ]; - hardeningDisable = [ "format" ]; + hardeningDisable = [ + "format" + ]; doCheck = false; # there are no tests - pythonImportsCheck = [ "desmume" ]; + + pythonImportsCheck = [ + "desmume" + ]; meta = with lib; { - homepage = "https://github.com/SkyTemple/py-desmume"; description = "Python library to interface with DeSmuME, the Nintendo DS emulator"; + homepage = "https://github.com/SkyTemple/py-desmume"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix ]; }; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 29ef48bde165..0b15832ba28a 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , callPackage , fetchFromGitHub +, fetchpatch , cffi , gmp }: @@ -21,6 +22,13 @@ buildPythonPackage rec { hash = "sha256-SPRoAfwP1MFlVzZsVWmXDWUY5Yje7eg7d+9zJhZNXrw="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Legrandin/pycryptodome/commit/1c043abb089ddbc2fc43d1c169672688ccc64c64.patch"; + sha256 = "sha256-QklwOlFpQNAH0CpR06fWSZqx8C97RV8BRsKbp2j8js8="; + }) + ]; + postPatch = '' substituteInPlace lib/Crypto/Math/_IntegerGMP.py \ --replace 'load_lib("gmp"' 'load_lib("${gmp}/lib/libgmp.so.10"' diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 6c98fdf83a16..a8a0229f8621 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -15,7 +15,7 @@ , tomli , tomlkit , typing-extensions -, GitPython +, gitpython , pytest-timeout , pytest-xdist , pytestCheckHook @@ -73,7 +73,7 @@ buildPythonPackage rec { ''; checkInputs = [ - GitPython + gitpython # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt pytest-timeout pytest-xdist diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 169784039c6c..704c2526328b 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.11.0"; + version = "2022.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GEKLkFzQV8xI3c8061fO1p66WKj3eDXmx7VaRYDu7kw="; + hash = "sha256-uqiSNqM1HKNAipIKKsUHv9mPfdk01ZrNWMXIzhgxxjU="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; + changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 9348a4f8f373..5c9cfa2a4e80 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.3.3"; + version = "5.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-j21CCPTRj7c7vClujHYEkmH31B48gDFYQbBXoChNSaI="; + hash = "sha256-qg/aFK7rt2a/ZcLm+VSlq8UYBh6zS0/VVLqRAN7kLus="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 5035f7c1a369..5461dc44523a 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,12 +22,15 @@ buildPythonPackage rec { owner = "jbarrancos"; repo = pname; rev = version; - hash = "sha256-MikJDW5Fo2DNpn9/Hyc1ecIIMEwE8GD5LKpka2t7aCk="; + hash = "sha256-yGUBCs1IxbGKBo21gExFIqDawM2EHlO+jiRqonEUnPk="; }; postPatch = '' substituteInPlace pytest.ini \ --replace "--cov=pyrainbird --cov-report=term-missing" "" + + substituteInPlace setup.cfg \ + --replace "pycryptodome>=3.16.0" "pycryptodome" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 5ce800af4d25..72fc5ab0a200 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -7,21 +7,26 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.6"; + version = "0.5.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "OnFreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jhThPU4wlujZVC9v/8JSRFxC0LlJedFevOENdRHidV8="; + hash = "sha256-ySFHB+PZmjsqKJQrfFoupylowsOiV5B2feHX7nF8dUA="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyrisco" ]; + + pythonImportsCheck = [ + "pyrisco" + ]; meta = with lib; { description = "Python interface to Risco alarm systems through Risco Cloud"; diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index c7b469dbf760..b33a1bd9f385 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; # `stripLen` does not seem to work here - patchFlags = "-p2"; + patchFlags = [ "-p2" ]; sourceRoot = "${src.name}/src"; diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index d95af8651f34..223024fe6451 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "1.0.4"; + version = "1.1.0"; pname = "pytest-random-order"; src = fetchPypi { inherit pname version; - sha256 = "6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52"; + sha256 = "sha256-2+beu5NTp6+YTMnt2+s1d91Nu8wVKaeePSH2jtm0VgU="; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix new file mode 100644 index 000000000000..ba44e94b9a31 --- /dev/null +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -0,0 +1,138 @@ +{ lib +, arangodb +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pyjwt +, pytest +, mock +, requests +, requests-toolbelt +}: + +let + testDBOpts = { + host = "127.0.0.1"; + port = "8529"; + password = "test"; + secret = "secret"; + }; +in + +buildPythonPackage rec { + pname = "python-arango"; + version = "7.5.3"; + disabled = pythonOlder "3.7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ArangoDB-Community"; + repo = "python-arango"; + rev = version; + sha256 = "0qb2yp05z8dmgsyyxqrl3q0a60jaiih96zhxmqrn2yf7as45n07j"; + }; + + propagatedBuildInputs = [ + requests + requests-toolbelt + pyjwt + ]; + + checkInputs = [ + arangodb + mock + pytestCheckHook + ]; + + # arangodb is compiled only for particular target architectures + # (i.e. "haswell"). Thus, these tests may not pass reproducibly, + # failing with: `166: Illegal instruction` if not run on arangodb's + # specified architecture. + # + # nonetheless, the client library should remain in nixpkgs - since + # the client library will talk to arangodb across the network and + # architecture issues will be irrelevant. + doCheck = false; + + preCheck = lib.optionalString doCheck '' + # Start test DB + mkdir -p .nix-test/{data,work} + + ICU_DATA=${arangodb}/share/arangodb3 \ + GLIBCXX_FORCE_NEW=1 \ + TZ=UTC \ + TZ_DATA=${arangodb}/share/arangodb3/tzdata \ + ARANGO_ROOT_PASSWORD=${testDBOpts.password} \ + ${arangodb}/bin/arangod \ + --server.uid=$(id -u) \ + --server.gid=$(id -g) \ + --server.authentication=true \ + --server.endpoint=http+tcp://${testDBOpts.host}:${testDBOpts.port} \ + --server.descriptors-minimum=4096 \ + --server.jwt-secret=${testDBOpts.secret} \ + --javascript.app-path=.nix-test/app \ + --log.file=.nix-test/log \ + --database.directory=.nix-test/data \ + --foxx.api=false & + ''; + + pytestFlagsArray = [ + "--host" + testDBOpts.host + "--port" + testDBOpts.port + "--passwd" + testDBOpts.password + "--secret" + testDBOpts.secret + ]; + + disabledTests = [ + # AssertionError geo-related - try enabling later + "test_document_find_in_box" + + # maybe arangod misconfig - try enabling later + # arango.exceptions.JWTAuthError: [HTTP 401][ERR 401] Wrong credentials + "test_auth_jwt" + + # ValueError - try enabling later + # maybe missed 3.9.3->3.10.0 changes + # most caused by key change: isNewlyCreated->new + "test_add_hash_index" + "test_add_skiplist_index" + "test_add_persistent_index" + "test_add_ttl_index" + "test_delete_index" + "test_pregel_management" + + # formatting error - try enabling later + # maybe missed 3.9.3->3.10.0 changes + # caused by: body["computedValues"] = None + "test_permission_management" + "test_collection_misc_methods" + "test_collection_management" + "test_replication_inventory" + + # want outgoing network to update foxx apis + # so foxx.api disabled in arangod startup + "test_foxx_service_management_file" + "test_foxx_service_management_json" + "test_foxx_config_management" + "test_foxx_dependency_management" + "test_foxx_development_toggle" + "test_foxx_misc_functions" + + # no replication configured via arangod invocation + "test_replication_applier" + ]; + + pythonImportsCheck = [ "arango" ]; + + meta = with lib; { + description = "Python Driver for ArangoDB"; + homepage = "https://github.com/ArangoDB-Community/python-arango"; + license = licenses.mit; + maintainers = [ maintainers.jsoo1 ]; + }; +} diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 390aad8b55cd..560e0db14241 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "python-glanceclient"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fknYBKZzCA6sThugNQT5+p+/hqv8vW6M2LMMpbT+7rY="; + hash = "sha256-+CmOh9Dr6Gx8MLkR1u/YNpScOxIO7OUIbJAio+omOpg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 4c9cf5003cce..62e6ce951bde 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -133,7 +133,7 @@ buildPythonPackage rec { # https://github.com/python-lsp/python-lsp-server/issues/243 "test_numpy_completions" "test_workspace_loads_pycodestyle_config" - ] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # pyqt5 is broken on aarch64-darwin "test_pyqt_completion" ]; diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 301ce42f0c77..4e10af5b40d3 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -18,17 +18,16 @@ , python-keystoneclient , debtcollector , callPackage -, pythonOlder }: buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yoyQyhyqRQZ8yyn3sv94JqkVZQMybwxLGFForZowr3o="; + hash = "sha256-Hf/U3LFcIsT00lIzvvZaowfMth/zj5WY6UAxYWjC1JA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index 5ae75098ddd3..62adeb1fe759 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.1.0"; + version = "18.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eCBVnRZfGk2BDn2nyV+IQl2L5JX20aPG9CA7isGH4lQ="; + hash = "sha256-GFu/LK+189dh8nLj4YSnAMx7pc99UWGQZb5/XEtbfPQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 2f7614e5bb57..a4047483eb63 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.3"; + version = "0.26.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-4yDV6tH1XSWZfcjCJ/3r4hl1n4Sbgc3x7YPE6GOfA3Y="; + hash = "sha256-R++vsJ2CJwPxG/32qam/LRj7GUj3obh9z20xXNMAnQ4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index af7c4b1cc52a..9cf53fb9e210 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.5.1"; + version = "4.5.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7LgAK0AzQ7uoVW7fXwoU512iI5LG0BL8N0R9f7AjFN4="; + hash = "sha256-xYDt/vvzI7qIK/8XE6mhcI5GPDKyHRj73Lagn0QOOz0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 19d8fee57ef4..25e075b31806 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.0.4"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1Svz/9ZS5ynr88/We1fa+H1IGdC5ljUa4M5O8X+muX4="; + sha256 = "sha256-ulYOzCIpHkL/2nQExomoV4mLkU6e0ns4MHxEbjCPGrQ="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to manage Etekcity Devices and Levoit Air Purifier"; homepage = "https://github.com/webdjoe/pyvesync"; + changelog = "https://github.com/webdjoe/pyvesync/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 88670ec9f7a5..b928c2a4549e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-r46rTS9MOMUUWRwGF3pohV+1bPL03VmoILEjEKfr04o="; + hash = "sha256-fDsJqilxIt/LApXVrTm3JyOrZ6BR0+IbnFux/huF2ZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index af842c6c9559..e275e4303174 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.24.1"; + version = "0.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KUOGbGQd1ffXNkQiW8yeUxValCOAfd8nBv9nnk9giVU="; + hash = "sha256-jBA3exH/qzEaKZeumvgKD0tKnDptZdlv1KykyUHs8Bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 4b6f8b4874c8..104e5bfb8297 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.5.2"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ewels"; repo = pname; - rev = "v${version}"; - hash = "sha256-eW5CR7ReVsFLJ09F4EUQbvFB+GdlnTay0bX4NNLQ0xo="; + rev = "refs/tags/v${version}"; + hash = "sha256-l8tMyxSkh4eckD21NofK9FBgeGKAqZB0J3B98HpWZ0s="; }; propagatedBuildInputs = [ @@ -26,17 +26,6 @@ buildPythonPackage rec { rich ]; - passthru.optional-dependencies = { - typer = [ - typer - ]; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "typer>=0.4,<0.6" "typer>=0.4" - ''; - # Module has no test doCheck = false; @@ -47,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to format click help output nicely with rich"; homepage = "https://github.com/ewels/rich-click"; + changelog = "https://github.com/ewels/rich-click/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index b296f5dc168d..31938569ca5a 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "rstcheck-core"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rstcheck"; repo = pname; - rev = "v${version}"; - hash = "sha256-XNr+prK9VDP66ZaFvh3Qrx+eJs6mnVO8lvoMC/qrCLs="; + rev = "refs/tags/v${version}"; + hash = "sha256-9U+GhkwBr+f3yEe7McOxqPRUuTp9vP+3WT5wZ92n32w="; }; nativeBuildInputs = [ @@ -45,12 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' \ - --replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' - ''; - pythonImportsCheck = [ "rstcheck_core" ]; @@ -58,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for checking syntax of reStructuredText"; homepage = "https://github.com/rstcheck/rstcheck-core"; + changelog = "https://github.com/rstcheck/rstcheck-core/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index a3789b97088a..2f2ee962e89a 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "6.1.0"; + version = "6.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rstcheck"; repo = pname; - rev = "v${version}"; - hash = "sha256-dw/KggiZpKaFZMcTIaSBUhR4oQsZI3iSmEj9Sy80wTs="; + rev = "refs/tags/v${version}"; + hash = "sha256-6TpDzk0GjIn9AnWadwHoYRc3SNi9nBAM7GyKm338wH8="; }; nativeBuildInputs = [ @@ -47,12 +47,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' \ - --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' - ''; - pythonImportsCheck = [ "rstcheck" ]; @@ -65,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks syntax of reStructuredText and code blocks nested within it"; homepage = "https://github.com/myint/rstcheck"; + changelog = "https://github.com/rstcheck/rstcheck/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ staccato ]; }; diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix new file mode 100644 index 000000000000..dd8c338fd314 --- /dev/null +++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -0,0 +1,57 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, hatchling +, home-assistant-bluetooth +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "ruuvitag-ble"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-WkPYlEkUH1xvGjBVr6JkLx5CfIPvAa9vX50OjCOmTME="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ruuvitag_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "ruuvitag_ble" + ]; + + meta = with lib; { + description = "Library for Ruuvitag BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/ruuvitag-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 4c3dffd0f80f..873073e105cd 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fsspec , funcy -, GitPython +, gitpython , pathspec , pygit2 , pygtrie @@ -42,7 +42,7 @@ buildPythonPackage rec { dulwich fsspec funcy - GitPython + gitpython pathspec pygit2 pygtrie diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index b3f2d6955709..22e7b4897e0a 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.10.4"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,9 +19,13 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = version; - hash = "sha256-yflI17lLZMXXB0ye+jz3VWWMdZtcBTwbg8deA4ENmWw="; + hash = "sha256-QX8CPf3o0IaAhjWYeUjDoAgktNrh/sSRjFhOweAxxco="; }; + postPatch = '' + sed -i '/download_url/d' setup.py + ''; + propagatedBuildInputs = [ aiohttp requests diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index 68e9638c350a..66aaf43a98e5 100644 --- a/pkgs/development/python-modules/simber/default.nix +++ b/pkgs/development/python-modules/simber/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "simber"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; - rev = version; - hash = "sha256-P4bhxu9Di4E2Zkd0vIkyDi1S6Y0V/EQSMF4ftWoiXKE="; + rev = "refs/tags/${version}"; + hash = "sha256-d9YhqYmRyoYb03GqYKM7HkK8cnTQKPbSP6z2aanB6pQ="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple, minimal and powerful logger for Python"; homepage = "https://github.com/deepjyoti30/simber"; + changelog = "https://github.com/deepjyoti30/simber/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ j0hax ]; }; diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 97b844613b18..90df4d2847cc 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.11.2"; + version = "2022.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-fGCYsuhqPs3ZYInx6Z3iRb4dtjoA7mJKpBDVx+6d/qA="; + hash = "sha256-oajFn/aMZvDpagLKadQ0Ez1uJhfUaJK4Rv6IUq3lRVE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index d73b60906cc5..563f20f6f7d0 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "strenum"; - version = "0.4.8"; + version = "0.4.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "irgeek"; repo = "StrEnum"; - rev = "v${version}"; - hash = "sha256-S64YfF+cbefXRWoeJK99ZPTiO9DUcDaT77hVQd7pKDk="; + rev = "refs/tags/v${version}"; + hash = "sha256-tElXpwyjrgTw9eHqGPgXakY+G9JXkBQYG7jSZSjv6P0="; }; postPatch = '' @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "MOdule for enum that inherits from str"; homepage = "https://github.com/irgeek/StrEnum"; + changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index fba544789a81..6923fe36c8ae 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -1,36 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, opencv3 -, pyqt5 -, pyqtgraph -, numpy -, scipy -, numba -, pandas -, tables -, git -, scikitimage -, matplotlib -, qdarkstyle -, GitPython +{ lib , anytree -, pims +, arrayqueues +, av +, buildPythonPackage +, colorspacious +, fetchPypi +, flammkuchen +, git +, gitpython , imageio , imageio-ffmpeg -, av +, lightparam +, matplotlib , nose -, pytestCheckHook +, numba +, numpy +, opencv3 +, pandas +, pims +, pyqt5 +, pyqtgraph , pyserial -, arrayqueues -, colorspacious +, pytestCheckHook +, pythonOlder +, qdarkstyle , qimage2ndarray -, flammkuchen -, lightparam +, scikitimage +, scipy +, tables }: buildPythonPackage rec { pname = "stytra"; version = "0.8.34"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -42,12 +47,6 @@ buildPythonPackage rec { rm stytra/tests/test_z_experiments.py ''; - checkInputs = [ - nose - pytestCheckHook - pyserial - ]; - propagatedBuildInputs = [ opencv3 pyqt5 @@ -61,7 +60,7 @@ buildPythonPackage rec { scikitimage matplotlib qdarkstyle - GitPython + gitpython anytree qimage2ndarray flammkuchen @@ -74,10 +73,16 @@ buildPythonPackage rec { av ]; - meta = { - homepage = "https://github.com/portugueslab/stytra"; + checkInputs = [ + nose + pytestCheckHook + pyserial + ]; + + meta = with lib; { description = "A modular package to control stimulation and track behaviour"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ tbenst ]; + homepage = "https://github.com/portugueslab/stytra"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tbenst ]; }; } diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index bf975f5e8483..a8e00cace53e 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.6.1"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "G-Two"; repo = pname; - rev = "v${version}"; - hash = "sha256-esZ+nIHIXKfilb8dBFbAbQQFI6fFRUcoFVCPdnqGXYw="; + rev = "refs/tags/v${version}"; + hash = "sha256-igfC/Hi/cbNnHmrzgWQnhJ9cdWHPI0fIqPIYeIZuxgU="; }; propagatedBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with STARLINK-enabled vehicle"; homepage = "https://github.com/G-Two/subarulink"; + changelog = "https://github.com/G-Two/subarulink/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 635733149504..4769dc64e7ab 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -1,28 +1,32 @@ { lib , buildPythonPackage -, fetchPypi -, pyyaml +, debian-inspector , docker , dockerfile-parse -, requests -, stevedore -, pbr -, debian-inspector -, license-expression -, regex -, GitPython -, prettytable +, fetchPypi +, gitpython , idna +, license-expression , packageurl-python +, pbr +, prettytable +, pythonOlder +, pyyaml +, regex +, requests +, stevedore }: buildPythonPackage rec { pname = "tern"; version = "2.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MMsq8/Obe3ogQSjiP8EebYseUJGcchMOczUrxE9jht4="; + hash = "sha256-MMsq8/Obe3ogQSjiP8EebYseUJGcchMOczUrxE9jht4="; }; preBuild = '' @@ -42,7 +46,7 @@ buildPythonPackage rec { stevedore debian-inspector regex - GitPython + gitpython prettytable idna packageurl-python @@ -58,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "A software composition analysis tool and Python library that generates a Software Bill of Materials for container images and Dockerfiles"; homepage = "https://github.com/tern-tools/tern"; + changelog = "https://github.com/tern-tools/tern/releases/tag/v${version}"; license = licenses.bsd2; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix index 90caab8ebef8..a72802e2c7b3 100644 --- a/pkgs/development/python-modules/tilequant/default.nix +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchFromGitHub, GitPython, click, ordered-set, pillow, sortedcollections }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, gitpython +, click +, ordered-set +, pythonOlder +, pillow +, sortedcollections +}: let aikku93-tilequant = fetchFromGitHub { @@ -11,6 +20,9 @@ in buildPythonPackage rec { pname = "tilequant"; version = "0.4.0.post0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SkyTemple"; @@ -23,15 +35,26 @@ buildPythonPackage rec { cp -R --no-preserve=mode ${aikku93-tilequant} __aikku93_tilequant ''; - buildInputs = [ GitPython ]; - propagatedBuildInputs = [ click ordered-set pillow sortedcollections ]; + buildInputs = [ + gitpython + ]; + + propagatedBuildInputs = [ + click + ordered-set + pillow + sortedcollections + ]; doCheck = false; # there are no tests - pythonImportsCheck = [ "skytemple_tilequant" ]; + + pythonImportsCheck = [ + "skytemple_tilequant" + ]; meta = with lib; { - homepage = "https://github.com/SkyTemple/tilequant"; description = "Tool for quantizing image colors using tile-based palette restrictions"; + homepage = "https://github.com/SkyTemple/tilequant"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix ]; }; diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix index 951ae8d9874d..5ca8d7649901 100644 --- a/pkgs/development/python-modules/versionfinder/default.nix +++ b/pkgs/development/python-modules/versionfinder/default.nix @@ -2,7 +2,7 @@ , backoff , buildPythonPackage , fetchFromGitHub -, GitPython +, gitpython , pytestCheckHook , pythonOlder , requests @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - GitPython + gitpython backoff ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Find the version of another package, whether installed via pip, setuptools or git"; homepage = "https://github.com/jantman/versionfinder"; + changelog = "https://github.com/jantman/versionfinder/blob/${version}/CHANGES.rst"; license = licenses.agpl3Plus; maintainers = with maintainers; [ zakame ]; }; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index f9e862c0fbbb..ad1ac6da5dd3 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -8,7 +8,7 @@ , fetchFromGitHub , flask , git -, GitPython +, gitpython , jsonref , jsonschema , matplotlib @@ -67,7 +67,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click docker_pycreds - GitPython + gitpython pathtools promise protobuf diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index d9fead66e355..380fefbc4cd0 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -12,6 +12,7 @@ , ncurses , libintl , wxGTK +, gtk3 , IOKit , Carbon , Cocoa @@ -42,7 +43,7 @@ buildPythonPackage rec { then [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ] else - [ wxGTK.gtk ] + [ gtk3 ] ); propagatedBuildInputs = [ @@ -58,7 +59,7 @@ buildPythonPackage rec { --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ - ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"), + ("gdk", "${gtk3}/lib/libgtk-x11-2.0.so"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), ("appsvc", None) ]}' diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 676afd2a44dd..8aa63e8f3948 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.11.0"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-qAqXg+skA7FfAjRXljt1UpyOcC3KYghc+5wjiRzlyyg="; + rev = "refs/tags/v${version}"; + hash = "sha256-MwKhoerfloFT5/x1darfMP/qF5sEy6LiKEogINIUq0c="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Xiaomi BLE devices"; homepage = "https://github.com/Bluetooth-Devices/xiaomi-ble"; + changelog = "https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 7b22508e2a20..2f3a3768331f 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "1.2.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5uRPMu9qZ0ofMdgk8d1IpKjHjnEP+zhWs+EDQx9wk6U="; + hash = "sha256-a8hC63G+FZBe6yePgrmzRsRTzpHWS+tBQmVUS/uHfzI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index 11066aa26332..e24e712e7c07 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-R3byV8llg7X+KYuYTsEtdLSFfLsPD4tyqAaU0CifDks="; + hash = "sha256-mql3r1TdVHwpJi54TMj6kfP3uZO2maa5dynUL4fOiNY="; }; postPatch = '' @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to read weather data from ZAMG Austria"; homepage = "https://github.com/killer0071234/python-zamg"; + changelog = "https://github.com/killer0071234/python-zamg/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 86059d60b0cb..73ed507444b6 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.87"; + version = "0.0.88"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-MX+UWS1h2HMIhyrhtn/tzti2w9RBHptVE3klATIXvAM="; + hash = "sha256-GjKYa8wgNugGC4IZJfMLVJnlPAgBmTLd8Wwy6e4g/+U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index babfcf54c04e..5671a7c12256 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.19.1"; + version = "0.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qbzHG6qoTAm773HAoAjmmanqVtuIDR72ECQH+N+iw3o="; + hash = "sha256-Eu+6I904vwPewQesYtn8cWXoo36fQpa1Bw660tnV+Lw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 083805f8e7ee..b545752b4ef5 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-32QSFBzYg+E++5euCWKgbF3/uLEn1uObenmR/Wv9XZc="; + sha256 = "sha256-orJDOnkZH9siDg8H8M8C0UTxJfWPTB+gBNtUM6s4F94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9b5bd33f85e7..5fd59516d492 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.6"; + version = "0.52.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-keQFFWPl2SCy1cyvbqDrA9/Yude8bf0qNiyEbFjFv/o="; + hash = "sha256-axk6C8RLuoKWUdJ3sOklWqnlYTWKTaQh51eWZm2Dy+0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index dcbeca33f827..42aaaa4d13e1 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.43.0"; + version = "0.43.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qzAM3vcVySJB6OfOHKXYYXDR+xOSbGpyH7b9TaYkOLM="; + hash = "sha256-qnGMUY7c2jqLQbVybVdu9vWcPMFoxCnCCTBhWP+AXE0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python2-modules/TurboCheetah/default.nix b/pkgs/development/python2-modules/TurboCheetah/default.nix deleted file mode 100644 index 717b2b5f2780..000000000000 --- a/pkgs/development/python2-modules/TurboCheetah/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cheetah -, nose -}: - -buildPythonPackage rec { - pname = "TurboCheetah"; - version = "1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c"; - }; - - propagatedBuildInputs = [ cheetah ]; - - checkInputs = [ nose ]; - - meta = { - description = "TurboGears plugin to support use of Cheetah templates"; - homepage = "http://docs.turbogears.org/TurboCheetah"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/cheetah/default.nix b/pkgs/development/python2-modules/cheetah/default.nix deleted file mode 100644 index 1cee46fa7252..000000000000 --- a/pkgs/development/python2-modules/cheetah/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, markdown -, isPy3k -, TurboCheetah -}: - -buildPythonPackage rec { - pname = "cheetah"; - version = "2.4.4"; - - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"; - }; - - propagatedBuildInputs = [ markdown ]; - - doCheck = false; # Circular dependency - - checkInputs = [ - TurboCheetah - ]; - - meta = { - homepage = "http://www.cheetahtemplate.org/"; - description = "A template engine and code generation tool"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/construct/default.nix b/pkgs/development/python2-modules/construct/default.nix deleted file mode 100644 index 5bbbd1501453..000000000000 --- a/pkgs/development/python2-modules/construct/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub -, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel-yaml -}: - -buildPythonPackage rec { - pname = "construct"; - version = "2.10.54"; - - # no tests in PyPI tarball - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48"; - }; - - checkInputs = [ pytestCheckHook enum34 numpy ]; - - # these have dependencies that are broken on Python 2 - disabledTestPaths = [ - "tests/gallery/test_gallery.py" - "tests/test_benchmarks.py" - "tests/test_compiler.py" - ]; - - disabledTests = [ - "test_benchmarks" - "test_timestamp" - ] ++ lib.optionals stdenv.isDarwin [ - "test_multiprocessing" - ]; - - meta = with lib; { - description = "Powerful declarative parser (and builder) for binary data"; - homepage = "https://construct.readthedocs.org/"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python2-modules/httpretty/default.nix b/pkgs/development/python2-modules/httpretty/default.nix deleted file mode 100644 index 92ed5c6616e0..000000000000 --- a/pkgs/development/python2-modules/httpretty/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, tornado -, requests -, httplib2 -, sure -, nose -, nose-exclude -, coverage -, rednose -, nose-randomly -, six -, mock -}: - -buildPythonPackage rec { - pname = "httpretty"; - version = "0.9.7"; - - # drop this for version > 0.9.7 - # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 - doCheck = lib.versionAtLeast version "0.9.8"; - - src = fetchPypi { - inherit pname version; - sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"; - }; - - propagatedBuildInputs = [ six ]; - - checkInputs = [ nose sure coverage mock rednose - # Following not declared in setup.py - nose-randomly requests tornado httplib2 nose-exclude - ]; - - __darwinAllowLocalNetworking = true; - - # Those flaky tests are failing intermittently on all platforms - NOSE_EXCLUDE = lib.concatStringsSep "," [ - "tests.functional.test_httplib2.test_callback_response" - "tests.functional.test_requests.test_streaming_responses" - "tests.functional.test_httplib2.test_callback_response" - "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2" - ]; - - meta = with lib; { - homepage = "https://httpretty.readthedocs.org/"; - description = "HTTP client request mocking tool"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/markdown/default.nix b/pkgs/development/python2-modules/markdown/default.nix deleted file mode 100644 index 13ed2f1744a2..000000000000 --- a/pkgs/development/python2-modules/markdown/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, nose -, pyyaml -, pythonOlder -, importlib-metadata -}: - -buildPythonPackage rec { - pname = "Markdown"; - version = "3.1.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; - }; - - propagatedBuildInputs = [ - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - checkInputs = [ nose pyyaml ]; - - meta = { - description = "A Python implementation of John Gruber's Markdown with Extension support"; - homepage = "https://github.com/Python-Markdown/markdown"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/mutagen/default.nix b/pkgs/development/python2-modules/mutagen/default.nix deleted file mode 100644 index 7f2e9f452b4d..000000000000 --- a/pkgs/development/python2-modules/mutagen/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, hypothesis -, pycodestyle -, pyflakes -, pytest -, setuptools -, pkgs -}: - -buildPythonPackage rec { - pname = "mutagen"; - version = "1.43.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9"; - }; - - propagatedBuildInputs = [ setuptools ]; - checkInputs = [ - pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis - ]; - LC_ALL = "en_US.UTF-8"; - - meta = with lib; { - description = "Python multimedia tagging library"; - homepage = "https://mutagen.readthedocs.io"; - license = licenses.lgpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/python2-modules/numpy/default.nix b/pkgs/development/python2-modules/numpy/default.nix deleted file mode 100644 index 0bb01ef6812a..000000000000 --- a/pkgs/development/python2-modules/numpy/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, fetchPypi -, python -, buildPythonPackage -, gfortran -, pytest -, blas -, lapack -, writeTextFile -, isPyPy -, cython -, setuptools - }: - -assert (!blas.isILP64) && (!lapack.isILP64); - -let - cfg = writeTextFile { - name = "site.cfg"; - text = (lib.generators.toINI {} { - ${blas.implementation} = { - include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; - library_dirs = "${blas}/lib:${lapack}/lib"; - runtime_library_dirs = "${blas}/lib:${lapack}/lib"; - libraries = "lapack,lapacke,blas,cblas"; - }; - lapack = { - include_dirs = "${lib.getDev lapack}/include"; - library_dirs = "${lapack}/lib"; - runtime_library_dirs = "${lapack}/lib"; - }; - blas = { - include_dirs = "${lib.getDev blas}/include"; - library_dirs = "${blas}/lib"; - runtime_library_dirs = "${blas}/lib"; - }; - }); - }; -in buildPythonPackage rec { - pname = "numpy"; - version = "1.16.6"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff"; - }; - - nativeBuildInputs = [ gfortran pytest cython setuptools ]; - buildInputs = [ blas lapack ]; - - patches = lib.optionals python.hasDistutilsCxxPatch [ - # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 - # Patching of numpy.distutils is needed to prevent it from undoing the - # patch to distutils. - ./numpy-distutils-C++.patch - ]; - - preConfigure = '' - sed -i 's/-faltivec//' numpy/distutils/system_info.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) - ''; - - preBuild = '' - ln -s ${cfg} site.cfg - ''; - - enableParallelBuilding = true; - - doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) - - checkPhase = '' - runHook preCheck - pushd "$out" - ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' - popd - runHook postCheck - ''; - - passthru = { - # just for backwards compatibility - blas = blas.provider; - blasImplementation = blas.implementation; - inherit cfg; - }; - - # Disable test - # - test_large_file_support: takes a long time and can cause the machine to run out of disk space - NOSE_EXCLUDE="test_large_file_support"; - - meta = { - description = "Scientific tools for Python"; - homepage = "https://numpy.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; - }; -} diff --git a/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch b/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch deleted file mode 100644 index b2626ea26e5b..000000000000 --- a/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py ---- a/numpy/distutils/unixccompiler.py -+++ b/numpy/distutils/unixccompiler.py -@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts - if opt not in llink_s: - self.linker_so = llink_s.split() + opt.split() - -- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) -- - # gcc style automatic dependencies, outputs a makefile (-MF) that lists - # all headers needed by a c file as a side effect of compilation (-MMD) - if getattr(self, '_auto_depends', False): -@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts - deps = [] - - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + -- extra_postargs, display = display) -+ if self.detect_language(src) == 'c++': -+ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src) -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps + -+ extra_postargs, display = display) -+ else: -+ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + -+ extra_postargs, display = display) -+ - except DistutilsExecError: - msg = str(get_exception()) - raise CompileError(msg) diff --git a/pkgs/development/python2-modules/pillow/default.nix b/pkgs/development/python2-modules/pillow/default.nix deleted file mode 100644 index 61242c894a89..000000000000 --- a/pkgs/development/python2-modules/pillow/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k -, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook -}@args: - -import ./generic.nix (rec { - pname = "Pillow"; - version = "6.2.2"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; - }; - - meta = with lib; { - homepage = "https://python-pillow.org/"; - description = "The friendly PIL fork (Python Imaging Library)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; - knownVulnerabilities = [ - "CVE-2020-10177" - "CVE-2020-10378" - "CVE-2020-10379" - "CVE-2020-10994" - "CVE-2020-11538" - "CVE-2020-35653" - "CVE-2020-35654" - "CVE-2020-35655" - "CVE-2021-25289" - "CVE-2021-25290" - "CVE-2021-25291" - "CVE-2021-25292" - "CVE-2021-25293" - "CVE-2021-27921" - "CVE-2021-27922" - "CVE-2021-27923" - ]; - }; -} // args ) diff --git a/pkgs/development/python2-modules/pillow/generic.nix b/pkgs/development/python2-modules/pillow/generic.nix deleted file mode 100644 index 3e33f1a8aa0f..000000000000 --- a/pkgs/development/python2-modules/pillow/generic.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ pname -, version -, disabled -, src -, meta -, ... -}@args: - -with args; - -buildPythonPackage rec { - inherit pname version src meta; - - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - # Disable darwin tests which require executables: `iconutil` and `screencapture` - disabledTests = lib.optionals stdenv.isDarwin [ - "test_grab" - "test_grabclipboard" - "test_save" - - # pillow-simd - "test_roundtrip" - "test_basic" - ] ++ lib.optionals (lib.versions.major version == "6") [ - # RuntimeError: Error setting from dictionary - "test_custom_metadata" - ]; - - propagatedBuildInputs = [ olefile ] - ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - - checkInputs = [ pytestCheckHook pyroma numpy ]; - - buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] - ++ lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="$LDFLAGS -L${libwebp}/lib" - export CFLAGS="$CFLAGS -I${libwebp}/include" - '' + lib.optionalString (lib.versionAtLeast version "7.1.0") '' - export LDFLAGS="$LDFLAGS -L${libxcb}/lib" - export CFLAGS="$CFLAGS -I${libxcb.dev}/include" - '' + lib.optionalString stdenv.isDarwin '' - # Remove impurities - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; -} diff --git a/pkgs/development/python2-modules/prettytable/default.nix b/pkgs/development/python2-modules/prettytable/default.nix deleted file mode 100644 index 8191e9b5f579..000000000000 --- a/pkgs/development/python2-modules/prettytable/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, glibcLocales -, setuptools-scm -, wcwidth -}: - -buildPythonPackage rec { - pname = "prettytable"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ glibcLocales ]; - - propagatedBuildInputs = [ wcwidth ]; - - preCheck = '' - export LANG="en_US.UTF-8" - ''; - - # no test no longer available in pypi package - doCheck = false; - pythonImportsCheck = [ "prettytable" ]; - - meta = with lib; { - description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = "http://code.google.com/p/prettytable/"; - license = licenses.bsd3; - }; - -} diff --git a/pkgs/development/python2-modules/pyyaml/default.nix b/pkgs/development/python2-modules/pyyaml/default.nix deleted file mode 100644 index 3edfae90e668..000000000000 --- a/pkgs/development/python2-modules/pyyaml/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, cython -, libyaml -, isPy27 -, python -}: - -buildPythonPackage rec { - pname = "PyYAML"; - version = "5.4.1.1"; - - src = fetchFromGitHub { - owner = "yaml"; - repo = "pyyaml"; - rev = version; - sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8"; - }; - - nativeBuildInputs = [ cython ]; - - buildInputs = [ libyaml ]; - - checkPhase = '' - runHook preCheck - PYTHONPATH=""tests/lib":$PYTHONPATH" ${python.interpreter} -m test_all - runHook postCheck - ''; - - pythonImportsCheck = [ "yaml" ]; - - meta = with lib; { - description = "The next generation YAML parser and emitter for Python"; - homepage = "https://github.com/yaml/pyyaml"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/qpid-python/default.nix b/pkgs/development/python2-modules/qpid-python/default.nix deleted file mode 100644 index e22b3215e81f..000000000000 --- a/pkgs/development/python2-modules/qpid-python/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, isPy3k -}: - -buildPythonPackage rec { - pname = "qpid-python"; - version = "0.32"; - disabled = isPy3k; - - src = fetchurl { - url = "http://www.us.apache.org/dist/qpid/${version}/${pname}-${version}.tar.gz"; - sha256 = "09hdfjgk8z4s3dr8ym2r6xn97j1f9mkb2743pr6zd0bnj01vhsv4"; - }; - - # needs a broker running and then ./qpid-python-test - doCheck = false; - - meta = with lib; { - homepage = "https://qpid.apache.org/"; - description = "Python client implementation and AMQP conformance tests for Apache Qpid"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f5bed2e3f5b2..229410315150 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -321,13 +321,13 @@ let Biostrings = [ pkgs.zlib ]; bnpmr = [ pkgs.gsl ]; cairoDevice = [ pkgs.gtk2.dev ]; - Cairo = with pkgs; [ libtiff libjpeg cairo.dev xlibsWrapper fontconfig.lib ]; + Cairo = with pkgs; [ libtiff libjpeg cairo.dev xorg.libXt.dev fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw.dev ]; ChemmineOB = with pkgs; [ openbabel pkg-config ]; curl = [ pkgs.curl.dev ]; data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; - devEMF = with pkgs; [ xorg.libXft.dev xlibsWrapper ]; + devEMF = with pkgs; [ xorg.libXft.dev ]; diversitree = with pkgs; [ gsl fftw ]; exactextractr = [ pkgs.geos ]; EMCluster = [ pkgs.lapack ]; @@ -346,7 +346,7 @@ let haven = with pkgs; [ libiconv zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl ]; - imager = [ pkgs.xlibsWrapper ]; + imager = [ pkgs.xorg.libX11.dev ]; iBMQ = [ pkgs.gsl ]; igraph = with pkgs; [ gmp libxml2.dev ]; JavaGD = [ pkgs.jdk ]; diff --git a/pkgs/development/tools/agda-pkg/default.nix b/pkgs/development/tools/agda-pkg/default.nix index 7c4ddb8a6883..498b38ec7aff 100644 --- a/pkgs/development/tools/agda-pkg/default.nix +++ b/pkgs/development/tools/agda-pkg/default.nix @@ -1,4 +1,6 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +}: with python3Packages; @@ -22,7 +24,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click - GitPython + gitpython pony whoosh natsort diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 105080ce2230..2db9533590a3 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -70,7 +70,7 @@ buildPythonApplication rec { dockerfile-parse dpath flake8 - GitPython + gitpython jmespath jsonpath-ng jsonschema diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix index 12d36dc6089e..5bd6cdc00697 100644 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ b/pkgs/development/tools/analysis/cvehound/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { ]; checkInputs = with python3.pkgs; [ - GitPython + gitpython psutil pytestCheckHook ]; diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index ff7462091069..2100b72c9878 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "smatch"; - version = "1.72"; + version = "1.73"; src = fetchFromGitHub { owner = "error27"; repo = "smatch"; rev = version; - sha256 = "sha256-XVW4sAgIxaJjAk75bp/O286uddIfgfKtIA2LniUGWBM="; + sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A semantic analysis tool for C"; - homepage = "http://smatch.sourceforge.net/"; + homepage = "https://sparse.docs.kernel.org/"; maintainers = with maintainers; [ marsam ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/ansible-language-server/default.nix b/pkgs/development/tools/ansible-language-server/default.nix index be4bba8c2659..8d9b1f0ca50f 100644 --- a/pkgs/development/tools/ansible-language-server/default.nix +++ b/pkgs/development/tools/ansible-language-server/default.nix @@ -1,6 +1,7 @@ { lib , buildNpmPackage , fetchFromGitHub +, nix-update-script }: buildNpmPackage rec { @@ -29,7 +30,7 @@ buildNpmPackage rec { sed -i '/"prepack"/d' package.json ''; - passthru.updateScript = { + passthru.updateScript = nix-update-script { attrPath = pname; }; diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix new file mode 100644 index 000000000000..55e152e22ab4 --- /dev/null +++ b/pkgs/development/tools/bbin/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, babashka +, graalvm17-ce +}: + +stdenvNoCC.mkDerivation rec { + pname = "bbin"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "babashka"; + repo = "bbin"; + rev = "v${version}"; + sha256 = "sha256-Oo6YF+uxcUG26Pz1X5uzPE/Hsx0UToOErZ2oUiKuZyI="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D bbin $out/bin/bbin + mkdir -p $out/share + cp -r docs $out/share/docs + wrapProgram $out/bin/bbin \ + --prefix PATH : "${lib.makeBinPath [ babashka graalvm17-ce ]}" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/babashka/bbin"; + description = "Install any Babashka script or project with one command"; + license = licenses.mit; + inherit (babashka.meta) platforms; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 3a61faa42c15..966937deffa8 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.9"; + version = "0.10.10"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-XDy07dFzylRl825QYqRt5eydVPR4jEevC2VrqxgTFt0="; + hash = "sha256-Qen3z2qbgyHHYUscBh7Udc1/c82WDLnDIsZJF+tcR5M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index b94a376ebb34..69320cc217e7 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -81,14 +81,13 @@ stdenv.mkDerivation (finalAttrs: { ''; buildPhase = let - muonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; - muonConditionFlag = condition: flag: - "-D${condition}=${lib.boolToString flag}"; + muonBool = lib.mesonBool; + muonEnable = lib.mesonEnable; + cmdlineForMuon = lib.concatStringsSep " " [ - (muonConditionFlag "static" stdenv.targetPlatform.isStatic) - (muonFeatureFlag "docs" buildDocs) - (muonFeatureFlag "samurai" embedSamurai) + (muonBool "static" stdenv.targetPlatform.isStatic) + (muonEnable "docs" buildDocs) + (muonEnable "samurai" embedSamurai) ]; cmdlineForSamu = "-j$NIX_BUILD_CORES"; in '' diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index db5898a6059e..c8a74bd03085 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b1lqgY6pu4yt3yY2UupG7PQUkgotK0VDffCW/0thxoo="; + sha256 = "sha256-FKnOqK3qmzWEmf+92up8ApeotyQyZpbmLDY72U3+mY8="; }; - vendorSha256 = "sha256-JqSk4w0chtWNYDQXo8oh5spAxor2kixo3fZcpV4LJ+8="; + vendorSha256 = "sha256-dYa6OuC2ingAh2VOzyGR4lK1GbTJ/l9iKXYWqRJmByc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 5e3801628e7c..a944550f0792 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.4.8"; + version = "0.5.0"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-9IdQWNbk28OdpxVU1t4d1sGvjc62GeWUueYGDKRfOy4="; + hash = "sha256-NJ6DIZWab9KayFALHON9GfYg6sQOf71SbtfV+3TYKLQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index ea3d7669544d..89c08d3100da 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 = "2022.11.02"; + version = "2022.12.08"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-FLnij5ff7+tP+SoBnB2zVEpuWRG2MYp9avTrh2q6g4k="; + sha256 = "sha256-9BFu9vD+DrMW/25do5jWhBU1Dog7XaiWhBxFIBgR6io="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 080e73ab2687..6cc572b87bc1 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -5,19 +5,19 @@ }: buildGoModule rec { pname = "coder"; - version = "0.12.5"; + version = "0.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-tPpWj2MV2LLIOGq+RTpHpLozgqv7gBgYD3jjehRXOvk="; + hash = "sha256-85eH3gKn1khMiksA/kL+fHt1WiaOzVntYCiL1PR/0Cg="; }; # integration tests require network access doCheck = false; - vendorHash = "sha256-3SStGCDpo+AS4PM9mbXM0EjsJ/3CVFQyb/NRK9RSZ3A="; + vendorHash = "sha256-tdqqGM2b8un4BFtvRJsmiIGdb1AOKP8XxcgGg2DilXA="; nativeBuildInputs = [ installShellFiles ]; @@ -29,9 +29,9 @@ buildGoModule rec { ''; meta = with lib; { - description = "Remote development environments on your infrastructure provisioned with Terraform"; + description = "Provision software development environments via Terraform on Linux, macOS, Windows, X86, ARM, and of course, Kubernetes"; homepage = "https://coder.com"; license = licenses.agpl3; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ ghuntley urandom ]; }; } diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 84c9c9268496..9947f12e523e 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , fetchurl , git +, glibc , icu , libkrb5 , lib @@ -259,7 +260,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib' substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \ --replace 'source ./env.sh' $out/bin/env.sh - + '' + lib.optionalString stdenv.isLinux '' + # Make binary paths absolute + substituteInPlace $out/lib/config.sh \ + --replace 'ldd' '${glibc}/bin/ldd' \ + --replace '/sbin/ldconfig' '${glibc}/bin/ldconfig' + '' + '' # Remove uneeded copy for run-helper template substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' ' substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' diff --git a/pkgs/development/tools/cue/validator.nix b/pkgs/development/tools/cue/validator.nix new file mode 100644 index 000000000000..cddc3fe342b7 --- /dev/null +++ b/pkgs/development/tools/cue/validator.nix @@ -0,0 +1,17 @@ +{ cue, writeShellScript, lib }: +# `document` must be a fragment of definition or structure that the input data will be matched against. +# `document` must exist in the Cue schema file provided (`cueSchemaFile`). +# The result is a script that can be used to validate the input data (JSON/YAML and more can be supported depending on Cue) +# against the fragment described by `document` or the whole definition. +# The script will be strict and enforce concrete values, i.e. partial documents are not supported. +cueSchemaFile: { document ? null }: + writeShellScript "validate-using-cue" + ''${cue}/bin/cue \ + --all-errors \ + --strict \ + vet \ + --concrete \ + "$1" \ + ${cueSchemaFile} \ + ${lib.optionalString (document != null) "-d \"${document}\""} + '' diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 0cefbfc9281f..b13b396cbf37 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-8sqOhhuneLFxhmZjoMYYfWw9wv55zWzw3QQEZW+hxBU="; + sha256 = "sha256-CUCIY3tDkmNPnHFgfjWa5wVFvaSWV9DAyPFx3+dHxZQ="; }; vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M="; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index df4729eeb816..afb3b1c17e07 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.15.18"; + version = "0.16.1"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; + sha256 = "sha256-5b9uJfIGWDQi5exPVCgK/9wrozptX1FebPMrWJ0v4TM="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 69c4e9907804..07448b21bb80 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -1,12 +1,12 @@ -{ fetchFromGitLab +{ lib +, fetchFromGitLab , python -, lib , apksigner }: python.pkgs.buildPythonApplication rec { - version = "2.1.1"; pname = "fdroidserver"; + version = "2.1.1"; src = fetchFromGitLab { owner = "fdroid"; @@ -16,24 +16,28 @@ python.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" + substituteInPlace fdroidserver/common.py \ + --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" ''; preConfigure = '' ${python.interpreter} setup.py compile_catalog ''; + postInstall = '' patchShebangs gradlew-fdroid install -m 0755 gradlew-fdroid $out/bin ''; - buildInputs = [ python.pkgs.babel ]; + buildInputs = with python.pkgs; [ + babel + ]; propagatedBuildInputs = with python.pkgs; [ androguard clint defusedxml - GitPython + gitpython libcloud mwclient paramiko @@ -59,7 +63,7 @@ python.pkgs.buildPythonApplication rec { homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; license = licenses.agpl3; - maintainers = [ lib.maintainers.obfusk ]; + maintainers = with maintainers; [ obfusk ]; }; } diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index b6d1688e5e68..6509f371e4fc 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.32.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ttprb8w4EWq2F8TbeUt+rCc0paxLXkEzISnAskIstmo="; + sha256 = "sha256-dwnPFbgfrc+1qF3u5Nm1KQu84UWK6H6VerSUaQacbRs="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-6nw7q/XQ3EOaXmyiqJJjLSX4W9Mn9W5nfl8shUttBx0="; + cargoSha256 = "sha256-T88C5oYyVfepUw0cdNRhEwrvEI0t1gw/5qZL1E46pkY="; doCheck = false; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index a1b406ff8666..3b7911c20fe3 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-FgDjuiBFzOaT8GlJYI7xNfxC9uhyZtBAIBFXZgW0BDU="; + sha256 = "sha256-RowVdrpUQdoxgJCrg9rzaF/7ZA09SKzjsVrzQb5wzR8="; }; preCheck = '' diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index c428c8160ecc..c9d15f020125 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-b5YNiMnk1tBk7kO4YWAU8cyg5oHhKu95ogTtZ3N/6IY="; + sha256 = "sha256-UsMUBdhoWl2e4i3m7Tu4R3qULRf85V4Uw/52xMMyWio="; }; vendorSha256 = "sha256-+DmnYd415FWgbY+gkDVWjnvbjTppfFV5NMpIE3Mm124="; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 177e2448cc31..13ccfcc80964 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - sconsFlags = "platform=linuxbsd target=editor production=true"; + sconsFlags = [ "platform=linuxbsd target=editor production=true" ]; preConfigure = '' sconsFlags+=" ${ lib.concatStringsSep " " diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 6aa8cd74f1f8..758a4c1fbaa6 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hcloud"; - version = "1.31.0"; + version = "1.31.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-AYxuH0R8vS7vBcEca1xM/0F70x5Zr+NUmcfRrRjb6cs="; + sha256 = "sha256-GyUobaU8ZJG/LrMM2LevBBhZN70grx6iJIMRxBRMqBg="; }; vendorSha256 = "sha256-sSsu8p9dHLzJRWSLQHQNMmoziOrlDL4BoLIcBo2REbQ="; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index c70569fd7518..c4e0a47257eb 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.22675"; + version = "0.1.22770"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yCjCsUxl2IUIsiHBlqdNLtjbr+wNn6BpssD3+EHsHKA="; + sha256 = "sha256-3IQSI2cG+wEH7IgV8nEWvQRdfsSap8wQCniMWL/khOg="; }; vendorSha256 = "sha256-tTG2i6ZEck0arKfCiFK7pGg9SE4n7FrF16US67Wj1gY="; diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/development/tools/misc/grpc-client-cli/default.nix index 15d9dc6fdcaa..b569b9ff9f6c 100644 --- a/pkgs/development/tools/misc/grpc-client-cli/default.nix +++ b/pkgs/development/tools/misc/grpc-client-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-MZEsThE0cajIJXvsuefNjQMAmnATNCWYBVVJQnd+q6c="; + sha256 = "sha256-tvpLsiZvGneabAoTewIEnCh+0lzbr7DNepjXGg7azLc="; }; - vendorSha256 = "sha256-4rU2r0hOR+XCZubLZCNnqoJ1br/WNtb70HN5urat5jQ="; + vendorSha256 = "sha256-NFVDDOejclWA2WQr7CHX1CUNu+Lh5jukroSrkxby8Ag="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 9879768086ac..2ad51f093fcd 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.3.1"; + version = "0.3.3"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-SjGtFkFyHJRnFg3QwXksrV+T08oku80vcivLzFWt94g="; + sha256 = "sha256-XzAU8Rs0/Q1KvE2tF0zzv9d2/a07BzZQbVzOdrPlbSk="; }; - cargoSha256 = "sha256-cd/4otvrneOqntBzNZP1/RY0jg/NYeugiblr1tatITI="; + cargoSha256 = "sha256-r5rIuulcPB5Y4AkbUPswf3W4DZ9Pc8auzmDDvSOOZEA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Ccache with Cloud Storage"; homepage = "https://github.com/mozilla/sccache"; - maintainers = with maintainers; [ doronbehar ]; + changelog = "https://github.com/mozilla/sccache/releases/tag/v${version}"; + maintainers = with maintainers; [ doronbehar figsoda ]; license = licenses.asl20; }; } diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index e5a26b75aa03..5b5b87b0392f 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-SeVLQ05vPywSOnOEhJhQXYhdptmIhvYbbf9SX5eVzik="; + sha256 = "sha256-1qYTYAXNMM3umRFpWoij8VU3rhBI4QWePa5Uaz2Y4Ik="; }; - cargoSha256 = "sha256-jp84LqFuK6Du2mWmgvadD7p8n/zcLKAKBOMQiERTKBI="; + cargoSha256 = "sha256-il7n8uxeXPKCBpRv3rqZZzqWjfpy558YNKBs9qOJ2oI="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 0148cbb7f97c..175f2b016e33 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CyWOXyJ9c7gf+WznU1SLX7tEM1f95015w9ePVwZ7GJU="; + sha256 = "sha256-enPnj4/p83hQkVv821MGyGipgEmVo12IZzy/3y8UprQ="; }; - vendorSha256 = "sha256-UYFw9srf4FcF2XGIfsJQsRapEwcOHql59rKeKUnXPLo="; + vendorSha256 = "sha256-U3zslBDVz5nvhNgcn5L84hSUolf7XFCuh7zMZxyW/gQ="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 64313112f43b..cec91a02f209 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "4.0.0"; - useDune2 = true; + version = "4.1.0"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "sha256:0pj9jjrmi0xxrzmygv4b5whsibw1jxy3wgibmws85x5jwlczh0nz"; + sha256 = "sha256-kXk/KaWvPeq6P301zqsR5znP4KXMMFVvYgFGGm1CNu8="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 679fd9ab9de8..9a86e52c65a4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -5,7 +5,8 @@ buildDunePackage { pname = "js_of_ocaml"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; buildInputs = [ ppxlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 8cdb7224d891..741dd1f6acd3 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -5,7 +5,8 @@ buildDunePackage { pname = "js_of_ocaml-lwt"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; buildInputs = [ js_of_ocaml-ppx ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 535fe6dae79c..8c473d90996e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -6,7 +6,8 @@ buildDunePackage { pname = "js_of_ocaml-ppx"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; buildInputs = [ js_of_ocaml ]; propagatedBuildInputs = [ ppxlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 5256cd4037fc..0bb0674d322e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -5,7 +5,8 @@ buildDunePackage { pname = "js_of_ocaml-ppx_deriving_json"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; propagatedBuildInputs = [ js_of_ocaml ppxlib ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index b7f94177c586..3631c0e9e7fd 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.45.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-7w5HOZr1cei7AvMdHdVzjB3ZQGWCOgm/g9UhuO3vSJI="; + sha256 = "sha256-aN/3xJFAc4r1nXF01tz4G4lP1KEQZQ3y+QuJ+wToD6M="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index c734cfd3c0f0..cf9c2cf585cc 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -25,14 +25,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.4.7"; + version = "2.4.8"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LiL1TtMKypI8tVa0uZm1sCudCbw+pnTo/Z/J/PL2+44="; + hash = "sha256-j5B/aDDVV/Wb71nVwc4CUxS8AY05AI+n042Q/yNAl0c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 4b10b3f8dd9a..6dad28bbdc05 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.37.0"; + version = "1.38.0"; inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet; @@ -221,6 +221,16 @@ lib.makeScope pkgs.newScope (self: { getFunctorFn ( [ + # Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750). + (self: super: lib.attrsets.mapAttrs + ( + name: value: + if lib.isDerivation value && self.hasPythonModule value && (normalizePackageName name) != name + then null + else value + ) + super) + ( self: super: { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index b0607e261601..a2c30400a60d 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -1204,6 +1204,9 @@ "autobahn": [ "setuptools" ], + "autoflake": [ + "hatchling" + ], "autograd": [ "setuptools" ], @@ -1262,6 +1265,27 @@ "poetry-core", "setuptools" ], + "aws-cdk-asset-awscli-v1": [ + "setuptools" + ], + "aws-cdk-asset-kubectl-v20": [ + "setuptools" + ], + "aws-cdk-asset-node-proxy-agent": [ + "setuptools" + ], + "aws-cdk-asset-node-proxy-agent-v5": [ + "setuptools" + ], + "aws-cdk-aws-batch-alpha": [ + "setuptools" + ], + "aws-cdk-aws-lambda-python-alpha": [ + "setuptools" + ], + "aws-cdk-lib": [ + "setuptools" + ], "aws-error-utils": [ "poetry" ], @@ -1280,6 +1304,9 @@ "awscli-cwlogs": [ "setuptools" ], + "awscli-local": [ + "setuptools" + ], "awscrt": [ "setuptools" ], @@ -2995,6 +3022,9 @@ "construct": [ "setuptools" ], + "constructs": [ + "setuptools" + ], "consul": [ "setuptools" ], @@ -3707,6 +3737,9 @@ "django-4": [ "setuptools" ], + "django-admin-sortable2": [ + "setuptools" + ], "django-allauth": [ "setuptools" ], @@ -3763,6 +3796,9 @@ "django-cors-headers": [ "setuptools" ], + "django-countries": [ + "setuptools" + ], "django-crispy-forms": [ "setuptools" ], @@ -3850,6 +3886,9 @@ "django-modelcluster": [ "setuptools" ], + "django-modeltranslation": [ + "setuptools" + ], "django-mptt": [ "setuptools" ], @@ -4706,6 +4745,9 @@ "fabric": [ "setuptools" ], + "fabric2": [ + "setuptools" + ], "fabulous": [ "setuptools" ], @@ -7168,6 +7210,9 @@ "pbr", "setuptools" ], + "jsii": [ + "setuptools" + ], "jsmin": [ "setuptools" ], @@ -8882,6 +8927,15 @@ "mypy-boto3-sqs": [ "setuptools" ], + "mypy-boto3-ssm": [ + "setuptools" + ], + "mypy-boto3-stepfunctions": [ + "setuptools" + ], + "mypy-boto3-sts": [ + "setuptools" + ], "mypy-extensions": [ "setuptools" ], @@ -8983,7 +9037,11 @@ "setuptools" ], "nbclient": [ - "setuptools" + "setuptools", + { + "buildSystem": "hatchling", + "from": "0.7.1" + } ], "nbconflux": [ "setuptools" @@ -9521,6 +9579,9 @@ "openapi-core": [ "setuptools" ], + "openapi-python-client": [ + "poetry-core" + ], "openapi-schema-validator": [ "poetry-core", "setuptools" @@ -12038,7 +12099,8 @@ "setuptools" ], "pymssql": [ - "cython" + "cython", + "setuptools" ], "pymsteams": [ "setuptools" @@ -12771,6 +12833,9 @@ "pyssim": [ "setuptools" ], + "pystac": [ + "setuptools" + ], "pystache": [ "setuptools" ], @@ -12932,6 +12997,9 @@ "setuptools", "setuptools-scm" ], + "pytest-docker": [ + "setuptools" + ], "pytest-doctestplus": [ "setuptools", "setuptools-scm" @@ -13640,6 +13708,9 @@ "python-uinput": [ "setuptools" ], + "python-ulid": [ + "setuptools" + ], "python-unshare": [ "setuptools" ], @@ -15995,6 +16066,9 @@ "streamlabswater": [ "setuptools" ], + "streamlink": [ + "setuptools" + ], "streamz": [ "setuptools" ], @@ -16702,6 +16776,9 @@ "tornado": [ "setuptools" ], + "tornado-utils": [ + "setuptools" + ], "torpy": [ "setuptools" ], @@ -16982,6 +17059,9 @@ "flit-core", "setuptools" ], + "types-aioboto3": [ + "setuptools" + ], "types-aiobotocore": [ "setuptools" ], @@ -16994,6 +17074,9 @@ "types-aiobotocore-elbv2": [ "setuptools" ], + "types-aiobotocore-resourcegroupstaggingapi": [ + "setuptools" + ], "types-aiobotocore-ssm": [ "setuptools" ], @@ -17039,9 +17122,15 @@ "types-markdown": [ "setuptools" ], + "types-pkg-resources": [ + "setuptools" + ], "types-protobuf": [ "setuptools" ], + "types-python-dateutil": [ + "setuptools" + ], "types-pytz": [ "setuptools" ], @@ -17060,6 +17149,9 @@ "types-setuptools": [ "setuptools" ], + "types-six": [ + "setuptools" + ], "types-tabulate": [ "setuptools" ], diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index a19095230826..6a140ca25289 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -59,9 +59,6 @@ let in lib.composeManyExtensions [ - # normalize all the names - (self: super: poetryLib.normalizePackageSet super) - # NixOps (self: super: lib.mapAttrs (_: v: addBuildSystem { inherit self; drv = v; attr = "poetry"; }) (lib.filterAttrs (n: _: lib.strings.hasPrefix "nixops" n) super) @@ -400,7 +397,7 @@ lib.composeManyExtensions [ ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] + ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); @@ -639,6 +636,7 @@ lib.composeManyExtensions [ fiona = super.fiona.overridePythonAttrs ( old: { + format = "setuptools"; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal ]; nativeBuildInputs = [ pkgs.gdal # for gdal-config @@ -1080,9 +1078,9 @@ lib.composeManyExtensions [ buildInputs = old.buildInputs or [ ] ++ [ pkgs.which - ] ++ lib.optional enableGhostscript [ + ] ++ lib.optionals enableGhostscript [ pkgs.ghostscript - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; @@ -1099,7 +1097,7 @@ lib.composeManyExtensions [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config - ] ++ lib.optional (lib.versionAtLeast super.matplotlib.version "3.5.0") [ + ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [ self.setuptools-scm self.setuptools-scm-git-archive ]; @@ -1395,6 +1393,7 @@ lib.composeManyExtensions [ "3.7.9" = "sha256-QHzAhjHgm4XLxY2zUdnIsd/WWMI7dJLQQAvTXC+2asQ="; "3.8.0" = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; "3.8.1" = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY="; + "3.8.3" = "sha256-oSZO4cN1sJKd0T7pYrKG63is8AZMKaLRZqj5UCVY/14="; }.${version} or ( lib.warn "Unknown orjson version: '${version}'. Please update getCargoHash." lib.fakeHash ); @@ -1771,7 +1770,7 @@ lib.composeManyExtensions [ pymssql = super.pymssql.overridePythonAttrs (old: { buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.openssl ]; + ++ [ pkgs.openssl pkgs.libkrb5 ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.freetds ]; }); @@ -2112,8 +2111,8 @@ lib.composeManyExtensions [ if old.format != "wheel" then { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ] ++ - lib.optional (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ - lib.optional (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; + lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ + lib.optionals (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; @@ -2399,6 +2398,7 @@ lib.composeManyExtensions [ let # Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0 getRepoHash = version: { + "0.18.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; "0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; "0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx"; "0.16.1" = "1ss6gzcr6js2d2sddgz1p52gyiwpqmgrxm8r6wim7gnm4wvhav8a"; diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index b06f345d71f3..13b61e1d694d 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-k8FUdQDgtR6g/LRCT45RYVUImEKCneQh9BG6P4y1SME="; + sha256 = "sha256-5Vr7qE6AFesvBkOpgStxI26m8rbQ8pXOXvNxbcX/ilc="; }; - vendorSha256 = "sha256-ZchgruaQOokgCh+6qkVr/d+PVflh/lKd10Ty+bMBEH0="; + vendorSha256 = "sha256-D8ITrzEwas/UElfsXBG2BfHGFcFsxzWFar2ehgLwy5U="; excludedPackages = [ "tests" ]; diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix index 1ecfd6e2bfe2..89fc4e87438a 100644 --- a/pkgs/development/tools/refurb/default.nix +++ b/pkgs/development/tools/refurb/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "refurb"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dosisod"; repo = "refurb"; - rev = "v${version}"; - hash = "sha256-JA/kU+2cpNKY2umA3NXwsqbfOMv9t6I7GlMYhiA6GTg"; + rev = "refs/tags/v${version}"; + hash = "sha256-dpPPhA5bVLiG9DsJ3RnO9RpCd0j4u5f//x/OTdlC+GQ="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix index 938f596beae4..6a225b9b47aa 100644 --- a/pkgs/development/tools/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.22"; + version = "1.24"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-eqMIOb9XAgXtoCJABvZkkS/rhHK7jNqabIFwdCgcSJU="; + sha256 = "sha256-owFNk+UMKBkrad45zcSHTUidmRVIIGRZ06Ll84ZfEfA="; }; buildInputs = [ diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index dcf13834a51f..6fb47035f0a8 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.132"; + version = "0.0.171"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0UcZBGD1l2hP8VH0tdNKY/SiXVTPLL0/eZpOwYnUgPs="; + sha256 = "sha256-2aqpQo7U17wqQ/YUMreOOKkcVWiKHAdFAUL/6HP6zN8="; }; - cargoSha256 = "sha256-DlSSzFf2AludfAKrXSsI/V0K2ZjCy/ehZd3ULe3fjK4="; + cargoSha256 = "sha256-N/WoPc2BxujqE/OSp9RWS7dBHGKxIixtBqwDwR3p6TM="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 4229f762bbcf..88b99889f1ba 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-T8Hhody0jMmZb6/xMkSvKCv4STZPbcrf/UB3APspYDM="; + sha256 = "sha256-8476jJK1oiXVX9G09NSL+xvXZdZ+h7grCHC6R0XXewo="; }; cargoPatches = [ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-2Reqj+WP6OoaB/3Z5llZP4c5ToVmMNX0Fe0IqDwcg2E="; + cargoSha256 = "sha256-EFpkBWQSWYyMrUa9Dh+n9kDNmXL/2yuEmFN3DcPeE7U="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch index e084538ca924..ea8b67085fd2 100644 --- a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch +++ b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch @@ -1,6 +1,6 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -183,6 +183,7 @@ dependencies = [ +@@ -207,6 +207,7 @@ dependencies = [ "toml_edit", "twox-hash", "url", @@ -8,32 +8,33 @@ ] [[package]] -@@ -1039,6 +1040,12 @@ version = "0.1.0" +@@ -1093,6 +1094,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" -+version = "0.3.22" ++version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" ++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + [[package]] name = "ppv-lite86" - version = "0.2.15" -@@ -1902,4 +1909,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" + version = "0.2.16" +@@ -2045,4 +2052,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" dependencies = [ "cc", "libc", + "pkg-config", ] -diff --git a/Cargo.toml b/Cargo.toml -index bf2a896..35cbf7c 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -80,3 +80,5 @@ toml_edit = "0.9" +@@ -80,6 +80,8 @@ toml_edit = "0.15" twox-hash = "1.6" # Url parsing url = "2.2" -+ ++# Use pkg-config feature of zstd +zstd = { version = "*", features = ["pkg-config"] } + + [dev-dependencies] + # Filesystems - Filesystem fixtures and assertions for testing diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index b6a6c2f53539..99d3eb61e43f 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -1,27 +1,26 @@ -{ lib, rustPlatform, fetchCrate, stdenv, CoreFoundation, CoreServices }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.5.14"; + version = "0.7.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-urbyWNbmj2qEO4JJ/waRXGRJ9L5KgwsRB5Wh9yib8zc="; + src = fetchFromGitHub { + owner = "regexident"; + repo = pname; + rev = version; + sha256 = "sha256-IBvSuyr3ERfPIivw6sEJSRta07Awmwd47cV1iKmvt8A="; }; - cargoSha256 = "sha256-3OxO+j5UuPEg9xNmN+kIqpdq6fVnFpgx5xCaMNue52g="; + cargoSha256 = "sha256-zX3lBNQVWBrVQh+02TDUqU7Xmbd7hBOzJxD7cSNTNR0="; buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - CoreServices + darwin.apple_sdk.frameworks.CoreServices ]; - # the crate version doesn't include all the files required to run tests - doCheck = false; - meta = with lib; { description = "A cargo plugin for showing a tree-like overview of a crate's modules"; homepage = "https://github.com/regexident/cargo-modules"; + changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ figsoda rvarago ]; }; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 4bc23ae141d0..d5627993e298 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.24.0"; + version = "0.24.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-6PAOyZmaqsHHyzS9sI591tnAi3/kwRlQR4K4iZJmR5Q="; + sha256 = "sha256-xXwJ6MXnSgqIQ5IuqfDm/TUXgkppKCPG3TB7veza/H8="; }; - cargoSha256 = "sha256-wWSVpWmD1ZItXgH5q0u16oBQ+d4wKjg+pvt/ZlgiWBg="; + cargoSha256 = "sha256-1sSvK8oZspIxDcMAl2MyAQzuijAxj1kpiZf1QwwyYDs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index 30aa56aa29f2..61dc0d655fbb 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "11.1.0"; + version = "11.1.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-WQUWAE8PR3FxTmWxoXmi6nsiyfbmLaIzOBJhC/8QYQw="; + sha256 = "sha256-ml+LqfnDld+I3G6+LaPJOeZa+swCtuu0ndW0yJraSxs="; }; - cargoSha256 = "sha256-GirS6Tu5gkNPVGAKzfFkyi3tTlu3RRzp/PWHhPbmKdI="; + cargoSha256 = "sha256-0exatgmksg07KQO/3s9BD4uIZRHwjytQPtaRv+JydPc="; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f9ec10f34301..8021ab2e6319 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-10-31"; - cargoSha256 = "sha256-yehukhYwNhFqHUYmIe0P/LPgRHvyj1/DFCl2yzBkB8Q="; + version = "2022-12-05"; + cargoSha256 = "sha256-lD52qI6LX5ORBWknCC4gAWQG8FPlNhOj6xQo1eXpO30="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-D0YwkSqwtD08twtCtN5q0a8S0Y26kgDWg1ruRNEQEOw="; + sha256 = "sha256-2Syd2jVpY0UIfsYlmzvWICZTDVRG4UchcbRlNhuJSpM="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index df451e863481..7883e8841b0a 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -1,4 +1,17 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv, testers, sqlx-cli }: +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, fetchpatch +, pkg-config +, openssl +, SystemConfiguration +, CoreFoundation +, Security +, libiconv +, testers +, sqlx-cli +}: rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; @@ -11,6 +24,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pQlrKjhOJfjNEmLxqnFmmBY1naheZUsaq2tGdLKGxjg="; }; + patches = [ + # https://github.com/launchbadge/sqlx/pull/2228 + (fetchpatch { + name = "fix-rust-1.65-compile.patch"; + url = "https://github.com/launchbadge/sqlx/commit/2fdf85b212332647dc4ac47e087df946151feedf.patch"; + hash = "sha256-5BCuIwmECe9qQrdYll7T+UOGwuTBolWEhKNE7GcZqJw="; + }) + ]; + cargoSha256 = "sha256-AbA8L7rkyZfKW0vvjyrcW5eU6jGD+zAqIcEUOJmeqJs="; doCheck = false; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index 27f61f4e7021..ec780ccef057 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-6DbWz4u4mbW/aSDpaLxP4bG14gHxMGc4A8zMTVH/vj0="; + sha256 = "sha256-z1jefnWtaV97kq7CpfKsnFOgLHXDBonsmZTfUKJ4VIM="; }; - cargoSha256 = "sha256-6dYXGxDNiLzpyZCmF2OJl2HAFyzJeAeQpEfaIZBBJD8="; + cargoSha256 = "sha256-TjkileWGB7ocBJPGh2Bm1ucigwL4j/uXgIOAonPHjbA="; nativeBuildInputs = lib.optional robloxSupport pkg-config; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 871fbb64b7fd..f83535a10e47 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cMT6+U9tfucPE5IkHjsWlzcD+nLQC24fqTyOhsTwFqk="; + sha256 = "sha256-EVsgiG16R4wh4Dh10rv7/H+VDONaVPWOfRNStrw8aso="; }; - cargoSha256 = "sha256-H8oD769xdsXIJWqfFCL76MIKrKkHUSTzzciuHJBdjyI="; + cargoSha256 = "sha256-fDh6TchwQO+FvyPJzrso1Ls9ZIKMHDdFBTzf6AuvGqs="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/development/tools/tarmac/default.nix b/pkgs/development/tools/tarmac/default.nix new file mode 100644 index 000000000000..15e5ecfe10a8 --- /dev/null +++ b/pkgs/development/tools/tarmac/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl_1_1 +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "tarmac"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "Roblox"; + repo = "tarmac"; + rev = "v${version}"; + sha256 = "sha256-O6qrAzGiAxiE56kpuvH/jDKHRXxHZ2SlDL5nwOOd4EU="; + }; + + cargoSha256 = "sha256-QnpowYv/TBXjPHK8z6KAzN3gSsfNOf9POybqsyugeWc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl_1_1 + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + meta = with lib; { + description = "Resource compiler and asset manager for Roblox"; + longDescription = '' + Tarmac is a resource compiler and asset manager for Roblox projects. + It helps enable hermetic place builds when used with tools like Rojo. + ''; + homepage = "https://github.com/Roblox/tarmac"; + downloadPage = "https://github.com/Roblox/tarmac/releases/tag/v${version}"; + changelog = "https://github.com/Roblox/tarmac/raw/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ wackbyte ]; + }; +} diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index b8db2d4aac43..9e4d2caabc30 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation { homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; license = licenses.gpl2Only; maintainers = with maintainers; [ matthuszagh wegank ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index a26e71522e5f..8e33b84b364e 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-mhfRrmZkeQWbYlgDEsjiUSOALXc6tI8eK81rjLYSXwk="; + sha256 = "sha256-3uyMwW8v2rPguXbPKy8IyQxroNaNS6rrXEcgRP91fdU="; }; vendorSha256 = null; |