diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-11 03:51:33 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-11 03:51:33 +0100 |
commit | c1e6c6af692c2cf07b4982c0f573acc9f16b78fc (patch) | |
tree | c436a224f5f71c2a2d91926240b76ceab78d77b9 /pkgs/development | |
parent | 33aa224777a5077ff1dfa4c8f4653d8aab268d76 (diff) | |
parent | b0644b461f97d4f7240b089074084c18f521f497 (diff) | |
download | nixpkgs-c1e6c6af692c2cf07b4982c0f573acc9f16b78fc.tar nixpkgs-c1e6c6af692c2cf07b4982c0f573acc9f16b78fc.tar.gz nixpkgs-c1e6c6af692c2cf07b4982c0f573acc9f16b78fc.tar.bz2 nixpkgs-c1e6c6af692c2cf07b4982c0f573acc9f16b78fc.tar.lz nixpkgs-c1e6c6af692c2cf07b4982c0f573acc9f16b78fc.tar.xz nixpkgs-c1e6c6af692c2cf07b4982c0f573acc9f16b78fc.tar.zst nixpkgs-c1e6c6af692c2cf07b4982c0f573acc9f16b78fc.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/development')
119 files changed, 1051 insertions, 409 deletions
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix new file mode 100644 index 00000000000..bcaab6fae86 --- /dev/null +++ b/pkgs/development/compilers/asn1c/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "asn1c"; + version = "0.9.28"; + + src = fetchurl { + url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; + sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; + }; + + outputs = [ "out" "doc" "man" ]; + + buildInputs = [ perl ]; + + preConfigure = '' + patchShebangs examples/crfc2asn1.pl + ''; + + postInstall = '' + cp -r skeletons/standard-modules $out/share/asn1c + ''; + + doCheck = true; + + meta = with lib; { + homepage = "http://lionet.info/asn1c/compiler.html"; + description = "Open Source ASN.1 Compiler"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.numinit ]; + }; +} diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index c82fc654b47..2d445d94f68 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,25 +1,18 @@ -{ lib, stdenv, fetchurl, python3, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, stanc, python3, buildPackages, runtimeShell }: -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 - 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; + version = "2.31.0"; + + src = fetchFromGitHub { + owner = "stan-dev"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-Uh/ZhEnbhQwC8xGFjDzH9No3VRgVbHYk2KoC+e3YhJw="; + }; + + nativeBuildInputs = [ stanc ]; buildFlags = [ "build" ]; enableParallelBuilding = true; @@ -38,6 +31,13 @@ stdenv.mkDerivation rec { src/test/interface/stansummary_test.cpp ''; + preConfigure = '' + mkdir -p bin + ln -s ${buildPackages.stanc}/bin/stanc bin/stanc + ''; + + makeFlags = lib.optional stdenv.isDarwin "arch=${stdenv.hostPlatform.darwinArch}"; + checkPhase = '' ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. preFixup = "rm -rf stan"; - meta = { + meta = with lib; { description = "Command-line interface to Stan"; longDescription = '' Stan is a probabilistic programming language implementing full Bayesian @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { likelihood estimation with Optimization (L-BFGS). ''; homepage = "https://mc-stan.org/interfaces/cmdstan.html"; - license = lib.licenses.bsd3; - platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + license = licenses.bsd3; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 6375c513f41..a98e188271c 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -20,7 +20,7 @@ args@ , makeWrapper , ncurses5 , perl -, python27 +, python3 , requireFile , stdenv , unixODBC @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ]; buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook runtimeDependencies = [ - ncurses5 expat python27 zlib glibc + ncurses5 expat python3 zlib glibc xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext gtk2 glib fontconfig freetype unixODBC alsa-lib ]; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index bd3cd5a7573..cb78eb5c6b3 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.7.20"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - hash = "sha256-XjyND5ZUEP8S6Q1vjcXfL8Cf1ZWmhNUUYWhRzn6Urn0="; + hash = "sha256-C7lBn6yYMqVqOhnK0oL48tbxI30tRn3I3+m9SipDxC4="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/stanc/default.nix b/pkgs/development/compilers/stanc/default.nix new file mode 100644 index 00000000000..e3df16230a7 --- /dev/null +++ b/pkgs/development/compilers/stanc/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, ocamlPackages +}: + +ocamlPackages.buildDunePackage rec { + pname = "stanc"; + version = "2.31.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchFromGitHub { + owner = "stan-dev"; + repo = "stanc3"; + rev = "v${version}"; + hash = "sha256-5GOyKVt3LHN1D6UysOZT8isVQLKexwEcK0rwI45dDcg="; + }; + + # Error: This expression has type [ `Use_Sys_unix ] + postPatch = '' + substituteInPlace test/integration/run_bin_on_args.ml \ + --replace "if Sys.file_exists (to_windows path) then to_windows cmd else cmd" "cmd" + ''; + + buildInputs = with ocamlPackages; [ + core_unix + menhir + menhirLib + ppx_deriving + fmt + yojson + ]; + + meta = with lib; { + homepage = "https://github.com/stan-dev/stanc3"; + description = "The Stan compiler and utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index a6ddb17f928..fd54383f9ef 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -7,13 +7,13 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { pname = "avrdude"; - version = "7.0"; + version = "7.1"; src = fetchFromGitHub { owner = "avrdudes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8MKrvBvFF3WFwBMIN75vCOS0khliHQI+GGQvCk7T1o="; + sha256 = "sha256-pGjOefWnf11kG/zFGwYGet1OjAhKsULNGgh6vqvIQ7c="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5af3c76a9e3..39ce0f254a5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -448,7 +448,7 @@ self: super: { # # # Depends on itself for testing # doctest-discover = addBuildTool super.doctest-discover - # (if pkgs.buildPlatform != pkgs.hostPlatform + # (if pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform # then self.buildHaskellPackages.doctest-discover # else dontCheck super.doctest-discover); doctest-discover = dontCheck super.doctest-discover; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 292a143a67f..b29a9cb5451 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TWKiSE8mqXz5i4vd32WylTsyxMXXKGmVl3U2q2sMwDQ="; + sha256 = "sha256-o5+gVRYJCkzoEejJoPwkNRawj2BO6fjdBloy2D1kHb4="; }; postPatch = '' diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 804c97ffd74..81d9e54de43 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,29 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, zlib +}: stdenv.mkDerivation rec { pname = "assimp"; - version = "5.1.3"; + version = "5.2.5"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-GNSfaP8O5IsjGwtC3DFaV4OiMMUXIcmHmz+5TCT/HP8="; + hash = "sha256-vQx+PaET5mlvvIGHk6pEnZvM3qw8DiC3hd1Po6OAHxQ="; }; - patches = [ - # Fix include directory with split outputs - # https://github.com/assimp/assimp/pull/4337 - (fetchpatch { - url = "https://github.com/assimp/assimp/commit/5dcaf445c3da079cf43890a0688428a7e1de0b30.patch"; - sha256 = "sha256-KwqTAoDPkhFq469+VaUuGoqfymu2bWLG9W3BvFvyU5I="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ boost zlib ]; + cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "https://www.assimp.org/"; diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 3f3ade4065e..f047200fb15 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.11"; + version = "0.13.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3HNfEZ/PMHLhPp7boYyY/x5wXN9Eg+G1400q1riG2oI="; + sha256 = "sha256-4HPFTTnrk1Ro934iS2hacBKCTz4e6Thurjl1P621ZLg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 2700a9cbad8..27b7b9b9c8c 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,23 +2,18 @@ stdenv.mkDerivation rec { pname = "cdk"; - version ="5.0-20210109"; - - buildInputs = [ - ncurses - ]; + version = "5.0-20221025"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY="; + hash = "sha256-A8z6Icn8PWHd0P2hnaVFNZBVu+71ociC37n/SPN0avI="; }; - patches = [ - # Proposed upstream as https://lists.gnu.org/archive/html/bug-ncurses/2021-12/msg00004.html - ./parallel.patch + buildInputs = [ + ncurses ]; enableParallelBuilding = true; @@ -26,8 +21,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Curses development kit"; homepage = "https://invisible-island.net/cdk/"; - license = licenses.bsdOriginal ; - maintainers = [ maintainers.raskin ]; + changelog = "https://invisible-island.net/cdk/CHANGES"; + license = licenses.mit; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/cdk/parallel.patch b/pkgs/development/libraries/cdk/parallel.patch deleted file mode 100644 index 729c71e96af..00000000000 --- a/pkgs/development/libraries/cdk/parallel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -296,7 +296,9 @@ LIB_OBJECT = @LIB_OBJECT@ - - all sources :: $(AUTO_SRC) - --$(OBJECTS) : include/cdk_config.h -+# make sure we generate all headers before trying -+# to build first source file. -+$(OBJECTS) : $(MY_HDR) - - # - # Standard library directive. diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix index 164a010669d..b677bf69fe6 100644 --- a/pkgs/development/libraries/cgreen/default.nix +++ b/pkgs/development/libraries/cgreen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cgreen"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "cgreen-devs"; repo = "cgreen"; rev = version; - sha256 = "sha256-BXch/V73a35Y6MqUlmR8mDp3ttwEAQTnqDC+ygLbIPY="; + sha256 = "sha256-uyw5beBZ3MnDyaxBWIDGl/L/0yv0ROafXwgxhQ+A+n4="; }; postPatch = '' diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 8f1bc88d7fb..8d1c19a48ac 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "sha256-utME3hZ3p2tx7vmp5dlAJ6J9MFEhFm/qbscGu1t9jnc="; + sha256 = "sha256-+1EdNdmEk5tQDd1DXklPbEKC/Dr2yV2gwbtwBtZxpNM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 689b38c6aa2..4d342f61ecc 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { pname = "gdal"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - hash = "sha256-hWuV73b7czmbxpnd82V2FHM+ak9JviDHVodVXAHh/pc="; + hash = "sha256-fdj/o+dm7V8QLrjnaQobaFX80+penn+ohx/yNmUryRA="; }; nativeBuildInputs = [ @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - changelog = "https://docs.unidata.ucar.edu/netcdf-c/${src.rev}/RELEASE_NOTES.html"; + changelog = "https://github.com/OSGeo/gdal/blob/${src.rev}/NEWS.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ marcweber dotlambda ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index ab3a9faca00..f656288443b 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.1"; + version = "1.89.2"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-wIkbluNGiK5HPmFaS5o2tZt/kPcqcXup+V2jnQQDSd0="; + sha256 = "sha256-NJRDVNnOCJ0lfxSXxzVpSo2m6DCppgdoRRGDYoRcajs="; }; dontBuild = true; diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index 3b27df77211..419cbfdb9f5 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "args"; - version = "6.3.0"; + version = "6.4.4"; src = fetchFromGitHub { owner = "Taywee"; repo = pname; rev = version; - sha256 = "sha256-fEM9KNqqxYbafMcHCW46Y//8Hrvd7gZrCIQhH5lhpFc="; + sha256 = "sha256-niuBM8tPCedFNCrkgvLE7PZu411sKgcvovr++6dIaus="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index b142a0a4156..a461f5039aa 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, pkg-config +}: stdenv.mkDerivation rec { pname = "libb2"; @@ -7,18 +13,19 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BLAKE2"; repo = "libb2"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; }; - preConfigure = '' - patchShebangs autogen.sh - ./autogen.sh - ''; + nativeBuildInputs = [ + autoreconfHook + libtool + pkg-config + ]; configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 6fb7b3879c2..980b01549a2 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "1.2.6"; + version = "1.2.8"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AMLnUFLDL592zcbVN8yaQeOJQWDLUUG+6aKh4paPGlE="; + sha256 = "sha256-XWrLtWoYIEyGSwc1Qq1Q2NTn0USm1ekVyLWuwvppOZE="; }; buildInputs = [ libbaseencode libgcrypt ]; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 0f4bed9c39d..b359ce44b03 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.104.0"; + version = "1.105.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-+FQ6XE+CtvSNSgpEr8h0mcr9DCC6TvGgLrYGdw0Ve2o="; + hash = "sha256-WdTCMuGlg072j6fNZ1sey8EKL47BsdKh3SQ5a++Y34I="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-c3tt+nYZksI/VhJk4bNHu9ZXeDTaA2aLAQo1BmuF+2g="; + hash = "sha256-K1DMQ0FHUbyn/cVHKuTBusve0f5SIq1YuGH3cZYealE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/protobuf/3.17.nix b/pkgs/development/libraries/protobuf/3.17.nix index d869b9ce76e..36198b5d337 100644 --- a/pkgs/development/libraries/protobuf/3.17.nix +++ b/pkgs/development/libraries/protobuf/3.17.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.17.3"; sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d"; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index c62e4d46ce8..7ee378d8ed3 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.19.6"; sha256 = "sha256-+ul9F8tyrwk2p25Dd9ragqwpYzdxdeGjpXhLAwKYWfM="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix index 818e65639e5..bae3550f8f0 100644 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ b/pkgs/development/libraries/protobuf/3.20.nix @@ -1,6 +1,6 @@ -{ callPackage, abseil-cpp, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.20.3"; sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index f5797ea7f9f..fe85be8cf02 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ -{ callPackage, abseil-cpp, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3-cmake.nix { +callPackage ./generic-v3-cmake.nix ({ version = "3.21.12"; sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.8.nix b/pkgs/development/libraries/protobuf/3.8.nix index 2ea03643b3a..fe5ad4b4e02 100644 --- a/pkgs/development/libraries/protobuf/3.8.nix +++ b/pkgs/development/libraries/protobuf/3.8.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.8.0"; sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8"; -} +} // args) diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 7f03baba0f4..12a41104cfd 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,19 +1,22 @@ -{ mkDerivation +{ stdenv , lib , fetchFromGitHub , nix-update-script , cmake , pkg-config , adwaita-qt +, adwaita-qt6 , glib , gtk3 , qtbase +, qtwayland , pantheon , substituteAll , gsettings-desktop-schemas +, useQt6 ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qgnomeplatform"; version = "0.8.4"; @@ -38,15 +41,24 @@ mkDerivation rec { ]; buildInputs = [ - adwaita-qt glib gtk3 qtbase + ] ++ lib.optionals (!useQt6) [ + adwaita-qt + ] ++ lib.optionals useQt6 [ + adwaita-qt6 + qtwayland ]; + # Qt setup hook complains about missing `wrapQtAppsHook` otherwise. + dontWrapQtApps = true; + cmakeFlags = [ "-DGLIB_SCHEMAS_DIR=${glib.getSchemaPath gsettings-desktop-schemas}" "-DQT_PLUGINS_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" + ] ++ lib.optionals useQt6 [ + "-DUSE_QT6=true" ]; passthru = { diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index cf2346bad27..a15b3512aec 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -6,7 +6,6 @@ , fetchpatch , fetchurl , flatbuffers -, hostPlatform , lib , zlib }: @@ -160,7 +159,7 @@ stdenv.mkDerivation rec { mkdir "$out" # copy the static lib and binaries into the output dir - cp -r ./tensorflow/lite/tools/make/gen/linux_${hostPlatform.uname.processor}/{bin,lib} "$out" + cp -r ./tensorflow/lite/tools/make/gen/linux_${stdenv.hostPlatform.uname.processor}/{bin,lib} "$out" find ./tensorflow/lite -type f -name '*.h' | while read f; do path="$out/include/''${f/.\//}" diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 327e848d89e..235202284bc 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { postInstall = optionalString enablePython '' substitute \ ${./vtk.egg-info} \ - $out/lib/python${python.pythonVersion}/site-packages/vtk-${version}.egg-info \ + $out/${python.sitePackages}/vtk-${version}.egg-info \ --subst-var-by VTK_VER "${version}" ''; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index ec862f3899d..bf2825b5967 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -15,14 +15,14 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "xgboost"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "dmlc"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-nXF6IYaK13n8fuNt1wOXoJCVNve/lwUROV7UE5W3RKA="; + hash = "sha256-unTss2byytG8KUQfg5s34YpRuHHDLo7D/ZickHhz1AE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index ff3b8769935..22d2b643b27 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,29 +1,21 @@ -{ lib, fetchFromGitHub, buildDunePackage, easy-format }: +{ lib, fetchurl, buildDunePackage, camlp-streams, easy-format }: buildDunePackage rec { pname = "biniou"; - version = "1.2.1"; + version = "1.2.2"; - useDune2 = true; - - src = fetchFromGitHub { - owner = "ocaml-community"; - repo = pname; - rev = version; - sha256 = "0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790"; + src = fetchurl { + url = "https://github.com/ocaml-community/biniou/releases/download/${version}/biniou-${version}.tbz"; + hash = "sha256-i/P/F80Oyy1rbR2UywjvCJ1Eyu+W6brmvmg51Cj6MY8="; }; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ camlp-streams easy-format ]; strictDeps = true; - postPatch = '' - patchShebangs . - ''; - meta = { description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-community/biniou"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "bdump"; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 6876727a0c2..01eeba71fa0 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.38.0"; + version = "3.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-USnOf/nwuAyZpvy/cXpQtkWKXPKu0hj1HFwolrpecQM="; + hash = "sha256-l5upg3Jux+HHtiYM95+5qL05kzmVHrzPYrqIejbaVZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 00b2df62563..241f46b0d68 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.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-JHKF1uTzAzYrVx1iOtOjJYFbnvFeTzUjTmm24leHIMs="; + hash = "sha256-PngFhzeBm3lm69KKjcj4NvFb1DVspdkQaiVSg0FZnV4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 1f817b54b39..b63c59728cc 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2022.11.0"; + version = "2023.01.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KxT3Se27b+XoTETXCljOVGVmEuXcpYxOhIBs1xAdtZ8="; + hash = "sha256-enNYzU65QBT/ryCUNwB08U+QiFvVb03fbYzZ5Qk6GTk="; }; nativeBuildInputs = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Ridwell waste recycling"; homepage = "https://github.com/bachya/aioridwell"; + changelog = "https://github.com/bachya/aioridwell/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index bc6954900ae..d40c8de96af 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2021.10.1"; + version = "2022.11.1"; format = "flit"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cjrh"; repo = pname; - rev = "v${version}"; - hash = "sha256-9e1vUWDBv3BYWuKR/rZUvaIxFFetzBQaygXKnl4PDd8="; + rev = "refs/tags/v${version}"; + hash = "sha256-1qXt3HT/0sECOqPRwc0p+5+YZh1kyHSbkZHajcrjvZc="; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Boilerplate for asyncio applications"; homepage = "https://github.com/cjrh/aiorun"; + changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index c1a611505ae..511b1c5f84c 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.2.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pa7ijfT/VbXNxwf9RITWxhUVUbimuBEjlU3xnDm3Zzk="; + hash = "sha256-rz8r+FieBQAZKxZR741CffuEyGcLe6ghdEKFGfeD6vg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 0646d10a137..d56a99685cd 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-nyFEyOo4qtkyjAmkOV0JEOKAKWJKwjRrywKqP2yoJ54="; + hash = "sha256-Uq/weFiqbfGLqYlu5hH/l++YglqCGpL2NtNccI3gOqQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index bc1b290a1f2..1ef304b1bf1 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.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-LChk65iM238jB1jwgEis5Wfz8YGmb9UCOdmQcU+3bFA="; + hash = "sha256-6y5GkoC/U2tNHnKxLPyDxrf3zZkDNPbje0RQRkaKDuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 041af30ddfd..a7121a2a18c 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.5"; + version = "0.34.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-GJG3rmJoBxDrqzsNY2r1cEywRfB4tlLn2DDsaDEI3Bo="; + hash = "sha256-J6PUVdIs9adRdFbw9yzu1Y9jU9Ge0hGxueXbE1b03og="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 9c7bb0898d8..8e508bbe8b6 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -5,17 +5,15 @@ , decorator , fetchFromGitHub , future -, nose , pysmt , pythonOlder , pytestCheckHook -, six , z3 }: buildPythonPackage rec { pname = "claripy"; - version = "9.2.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = pname; - rev = "v${version}"; - hash = "sha256-Cf56Q2ZqBq3uoCGqG5pYxA6ANP8VLC6pAMZIL5ubq30="; + rev = "refs/tags/v${version}"; + hash = "sha256-ItWL2DGoMkOMOMsTTfal8W9DZCmXMuZs0cZbYESlFU4="; }; nativeBuildInputs = [ @@ -40,15 +38,13 @@ buildPythonPackage rec { ]; checkInputs = [ - nose pytestCheckHook - six ]; postPatch = '' # Use upstream z3 implementation substituteInPlace setup.cfg \ - --replace "z3-solver == 4.10.2.0" "" + --replace "z3-solver==4.10.2.0" "" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 3e876db6d66..aa713ed4a76 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.32"; + version = "9.2.33"; # 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-KYWhwL3DAa/2Hb4I1NfYWA5gXrwEeMpDpAWCWGLqFeE="; + hash = "sha256-Abh6kSHnTtz/pz5xPJeg0UZcRQDah4D0tlsLnkyI2lE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 4b633841267..446fdaf07b3 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "datadiff"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VASUQKiW3lJH7i57eqVCX5OayDLDftshAfjTA26Jyqg="; + hash = "sha256-I9QpQyW3sHyUgCYZYfJecTJDNHLaQtqnXG4WeA4p5VE="; }; # Tests are not part of the PyPI releases diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix new file mode 100644 index 00000000000..6301348e60e --- /dev/null +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, django_4 +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-admin-sortable2"; + version = "2.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-fcCP8PvOWFlQL4CdEIwElfOw2UYJJp6u27EjfgMISss="; + }; + + propagatedBuildInputs = [ + django_4 + ]; + + pythonImportsCheck = [ + "adminsortable2" + ]; + + # Tests are very slow (end-to-end with playwright) + doCheck = false; + + meta = with lib; { + description = "Generic drag-and-drop ordering for objects in the Django admin interface"; + homepage = "https://github.com/jrief/django-admin-sortable2"; + changelog = "https://github.com/jrief/django-admin-sortable2/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix new file mode 100644 index 00000000000..8c0fbf647b2 --- /dev/null +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, chardet +, diff-match-patch +, django +, fetchFromGitHub +, python +, pythonOlder +, pytz +, tablib +}: + +buildPythonPackage rec { + pname = "django-import-export"; + version = "2.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "django-import-export"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-km6TQq4OZZtx9/lgBzS3tEifAYjkkUX//9FRATDLX/0="; + }; + + propagatedBuildInputs = [ + diff-match-patch + django + tablib + ] ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml); + + checkInputs = [ + chardet + pytz + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} tests/manage.py test core --settings=settings + runHook postCheck + ''; + + pythonImportsCheck = [ + "import_export" + ]; + + meta = with lib; { + description = "Django application and library for importing and exporting data with admin integration"; + homepage = "https://github.com/django-import-export/django-import-export"; + changelog = "https://github.com/django-import-export/django-import-export/blob/${version}/docs/changelog.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix new file mode 100644 index 00000000000..8af5e8fee89 --- /dev/null +++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -0,0 +1,58 @@ +{ lib +, babel +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, phonenumbers +, python +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "django-phonenumber-field"; + version = "6.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stefanfoulis"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + phonenumbers + babel + ]; + + checkInputs = [ + djangorestframework + ]; + + pythonImportsCheck = [ + "phonenumber_field" + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = with lib; { + description = "A django model and form field for normalised phone numbers using python-phonenumbers"; + homepage = "https://github.com/stefanfoulis/django-phonenumber-field/"; + changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix new file mode 100644 index 00000000000..c1605a93d39 --- /dev/null +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, pytest-django +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-rest-registration"; + version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "apragacz"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-JoIeVjl5s60ilq9kU28Jo+GaYRKU61hoqy1GzYmMdZQ="; + }; + + propagatedBuildInputs = [ + django + djangorestframework + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + pythonImportsCheck = [ + "rest_registration" + ]; + + disabledTests = [ + # This test fails on Python 3.10 + "test_convert_html_to_text_fails" + # This test is broken and was removed after 0.7.3. Remove this line once version > 0.7.3 + "test_coreapi_autoschema_success" + ]; + + meta = with lib; { + description = "User-related REST API based on the awesome Django REST Framework"; + homepage = "https://github.com/apragacz/django-rest-registration/"; + changelog = "https://github.com/apragacz/django-rest-registration/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix new file mode 100644 index 00000000000..9a8a7c5e461 --- /dev/null +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, django +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-vite"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "MrBin99"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE="; + }; + + propagatedBuildInputs = [ + django + ]; + + # Package doesn’t have any tests + doCheck = false; + + pythonImportsCheck = [ + "django_vite" + ]; + + meta = with lib; { + description = "Integration of ViteJS in a Django project"; + homepage = "https://github.com/MrBin99/django-vite"; + changelog = "https://github.com/MrBin99/django-vite/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 04c0c84315f..1eb8e73e61f 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.6.7"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-ZbdrqR1apeZMnJb2hzvPyCKWl+0A9ROMZJXIshPVGW0="; + hash = "sha256-Vb2sXZjhBZpZdemtGZ8dajB9Ziu/obLv80R63IH/hJg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 8572a5f1030..97afb19058f 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.8.4"; + version = "2.8.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aqR3zg9zvtopOzTGMUo/K3jBtFzK6a2fqknjncfzQ2k="; + hash = "sha256-fk6RJgn8m2Czof72VX7BXd+cT5RiZ6kuaSDf1N12XjU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 7d11b2b3c1c..d1ed5572ff1 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.0.3"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gE4PyJCrgEekqR3S4YNUtp3yd2AOt7TmKvvDaJ4stk0="; + hash = "sha256-0SFlDmAxvgZCJSFIrXXEjpJ4D0GRJQ0nkBv9D9EpC2g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index a1bec8f3a1f..063cece8a38 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -1,9 +1,8 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , pytestCheckHook , pythonOlder - # Python dependencies , colorama , intervaltree , json5 @@ -15,16 +14,22 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.6"; + version = "0.2.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0="; + hash = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "json5==0.9.5" "json5>=0.9.5" + ''; + propagatedBuildInputs = [ colorama intervaltree @@ -35,18 +40,18 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "json5==0.9.5" "json5>=0.9.5" - ''; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "graphtage" ]; + pythonImportsCheck = [ + "graphtage" + ]; meta = with lib; { - homepage = "https://github.com/trailofbits/graphtage"; description = "A utility to diff tree-like files such as JSON and XML"; + homepage = "https://github.com/trailofbits/graphtage"; + changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ veehaitch ]; }; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 30b0085ff7f..eacca2b8514 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2022.12.1"; + version = "2023.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; - rev = version; - sha256 = "sha256-W1WJWG5R7Sucdw6TzsGFs5mH6BoUfA8URTgWlnRXa14="; + rev = "refs/tags/${version}"; + hash = "sha256-MF+pRP0KluF7LrSkfxs6ZSEXyqmr51mUqUn01dLdUdQ="; }; # Tests require network connection diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 4843ad39fd4..f55c3e88ab0 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.6.10"; + version = "1.6.11"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "huawei-lte-api"; rev = "refs/tags/${version}"; - hash = "sha256-dYYZxG5vAR5JT5HIr4jGWYxpy+tGYYXwhB4bzb27ON0="; + hash = "sha256-pOBYMSORgT8WOnhCdazuKucjPoOywnrWa+qCYR5qSls="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index c1e70fbf990..f7bccb3b84f 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.16.0"; + version = "3.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MfWZGWbU0k586EYY0uhHHo2LuhQSmCfgs9Lz50Ds5Hc="; + hash = "sha256-TsM56eE2qCJsr+ZHTaY7Wd/ZjhFqWJXA7Z3O+2MCgPc="; }; propagatedBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library for the IBM Cloud services"; homepage = "https://github.com/IBM/python-sdk-core"; + changelog = "https://github.com/IBM/python-sdk-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 3211aed644e..6d32ee9660a 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -1,23 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, yajl, cffi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, yajl +, cffi +, pytestCheckHook +}: buildPythonPackage rec { pname = "ijson"; - version = "3.1.4"; + version = "3.2.0.post0"; src = fetchPypi { inherit pname version; - sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea"; + hash = "sha256-gKW9fpkjyrIAcB9nrSNyEEMouZ3fJJ276INBAshS0xY="; }; - buildInputs = [ yajl ]; - propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + buildInputs = [ + yajl + ]; + + propagatedBuildInputs = [ + cffi + ]; + + checkInputs = [ + pytestCheckHook + ]; doCheck = true; + pythonImportsCheck = [ + "ijson" + ]; + meta = with lib; { description = "Iterative JSON parser with a standard Python iterator interface"; homepage = "https://github.com/ICRAR/ijson"; + changelog = "https://github.com/ICRAR/ijson/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 4018655cc48..baa9a0dc1ab 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -234,11 +234,13 @@ let fetchAttrs = { sha256 = if cudaSupport then - "sha256-Z9GDWGv+1YFyJjudyshZfeRJsKShoA1kIbNR3h3GxPQ=" - else if stdenv.isDarwin then - "sha256-i3wiJHD4+pgTvDMhnYiQo9pdxxKItgYnc4/4wGt2NXM=" - else - "sha256-liRxmjwm0OmVMfgoGXx+nGBdW2fzzP/d4zmK6A59HAM="; + "sha256-n8wo+hD9ZYO1SsJKgyJzUmjRlsz45WT6tt5ZLleGvGY=" + else { + x86_64-linux = "sha256-A0A18kxgGNGHNQ67ZPUzh3Yq2LEcRV7CqR9EfP80NQk="; + aarch64-linux = "sha256-mU2jzuDu89jVmaG/M5bA3jSd7n7lDi+h8sdhs1z8p1A="; + x86_64-darwin = "sha256-9nNTpetvjyipD/l8vKlregl1j/OnZKAcOCoZQeRBvts="; + aarch64-darwin = "sha256-dOGUsdFImeOLcZ3VtgrNnd8A/HgIs/LYuH9GQV7A+78="; + }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); }; buildAttrs = { diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 8093c949d39..2e9f2ba3648 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -17,15 +17,16 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.11.1"; - disabled = pythonOlder "3.6"; + version = "1.12.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9g6h8GMOcICiry9M9b/Tt0ONsTxuJI/duprUkxB1Gr0="; + hash = "sha256-5apn+8X7si8jniHSjt7sveqIuzeuI4uXllR627aT2vI="; }; nativeBuildInputs = [ @@ -48,7 +49,10 @@ buildPythonPackage rec { smbus-cffi ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; postInstall = '' installManPage liquidctl.8 @@ -58,19 +62,23 @@ buildPythonPackage rec { cp extra/linux/71-liquidctl.rules $out/lib/udev/rules.d/. ''; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; postBuild = '' # needed for pythonImportsCheck export XDG_RUNTIME_DIR=$TMPDIR ''; - pythonImportsCheck = [ "liquidctl" ]; + pythonImportsCheck = [ + "liquidctl" + ]; meta = with lib; { description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; homepage = "https://github.com/liquidctl/liquidctl"; - changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; + changelog = "https://github.com/liquidctl/liquidctl/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ arturcygan evils ]; }; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index e7a752663c6..6c52490dc0e 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailmanclient"; - version = "3.3.4"; + version = "3.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0y31HXjvU/bwy0s0PcDOlrX1RdyTTnk41ceD4A0R4p4="; + hash = "sha256-Y1gcYEyn6sAhSJwVqsygaklY63b2ZXTG+rBerGVN2Fc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/markuppy/default.nix b/pkgs/development/python-modules/markuppy/default.nix new file mode 100644 index 00000000000..e10b7b4bb1d --- /dev/null +++ b/pkgs/development/python-modules/markuppy/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "markuppy"; + version = "1.14"; + + src = fetchPypi { + pname = "MarkupPy"; + inherit version; + sha256 = "sha256-Gt7iwKVCrzeP6EVI/29rAWjzy39Ca0aWEDiivPqtDV8="; + }; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "MarkupPy" ]; + + meta = with lib; { + description = "An HTML/XML generator"; + homepage = "https://github.com/tylerbakke/MarkupPy"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index b58c6207a96..2c1d7766b2c 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.8"; + version = "2.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-4zhwMCEIVYHrf9gT6Eoiw9huR5D2njDo62L0MvXqrgE="; + hash = "sha256-3OA61cuj9u6ejkQJgCjnu8ERjACKXz2hUekbvZqiPJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index f1ba9ee7330..ba635c62f7a 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , aiohttp , buildPythonPackage , fetchFromGitHub @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.12"; + version = "0.3.14"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,9 +21,15 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vEB9ztz0RTGoolFUVQcMV7DUthCEAx1kpwkAS2186OU="; + hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'aiohttp = "^3.8.1,!=3.8.2,!=3.8.3"' 'aiohttp = "*"' \ + --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -38,20 +44,15 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" - ''; - pythonImportsCheck = [ "motioneye_client" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python library for motionEye"; homepage = "https://github.com/dermotduffy/motioneye-client"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 0f95c059d86..ea3558ab0bd 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-x67zkQTUhGS5LIVOW2F+OJxnUPwsH1/bX42RArNscUc="; + hash = "sha256-emUz6DHnrDBOu9Wlhum7ntK3JIt94/05tuBAT2x4Bjs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 42533cfcacd..bfeb3a58eff 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "5.2.2"; + version = "6.0.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "sha256-+0s47YhpMojxmRHKC7kazov2ZUsOs2/Y2EmHAAcARf0="; + sha256 = "YobBihNPbqYYWhe3x0p+BIlEK8R62s/dDFWUzP7fCTI="; }; checkInputs = [ unittestCheckHook git which ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index f61f94f00c2..54643bc7f0a 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.0.1"; + version = "14.0.2"; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-eYn24FkAXj/ESCoC0QaLY+wRhkxZP1KnuY4VU1WiG24="; + hash = "sha256-s2G+ZNMEF3ZB1+ibPiYPuqdypoYFdFPpASeqFReR8/g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 47e649ae3f7..256057393e7 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.15.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c5bsynNozFkY1VtAesKFXpwC81d8iZd48kFBHPRf43M="; + hash = "sha256-BbIgsIzvkUlH8JrD42Afy0U5GSk9H3ut48/XPYUZSew="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index e1f92f30730..6a20154da38 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.9.3"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-piFSIf6zlV1IX6kMe87E+yllDOOco9DBEmcQOS4Nwtw="; + hash = "sha256-hx5jxSExFgeVzcjpw90xP4bg3/NMFRyY3NkSPG2M5nM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 6fbd87ead77..f1cd028c520 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "6.2.6"; + version = "6.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-SqGWXuRwz79ZoDFL6sU9hX3FG/VLwLhQYzZOtT3tqvE="; + hash = "sha256-0E+kkvxT1jLfoBg3C9BfbSqfIX3K/Z5kK1kCdOks2Hk="; }; patches = [ diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 66a249a3d35..e57655c2227 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -193,6 +193,8 @@ buildPythonPackage rec { ln -s ${driver} $out/${python.sitePackages}/playwright/driver ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + # Skip tests because they require network access. doCheck = false; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 9fd494ede2f..74a34ae60b3 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.12.3"; + version = "23.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RzNc8clL6kqJuC0+KJLtgby/6Bn/CS3QLfx7Ug6TX3M="; + hash = "sha256-2ca+VGylu4Km7M2Oz76ljbhSIDehVfviwVXnV+pXFRE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index f6e0459139a..8d5969d18f0 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "precis-i18n"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "byllyfish"; repo = "precis_i18n"; - rev = "v${version}"; - hash = "sha256-90yNusUyz8qJi7WWYIFhHzrpvu1TqxfpT+lv2CVhSR8="; + rev = "refs/tags/v${version}"; + hash = "sha256-DSm+KomveGs9ZzNFiT0B1gAjx2fh0BaUdKW0J+kW24U="; }; pythonImportsCheck = [ @@ -23,8 +23,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/byllyfish/precis_i18n"; description = "Internationalized usernames and passwords"; + homepage = "https://github.com/byllyfish/precis_i18n"; + changelog = "https://github.com/byllyfish/precis_i18n/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 394ea6e3fb0..004572279ab 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -1,22 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , requests , requests-oauthlib , voluptuous -, pythonOlder }: buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.23"; + version = "0.0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VLT+VlwQAAxU1WRNCB4t4fhQ2u+6w5zqdM6mSbR7+xI="; + hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { voluptuous ]; - # no tests + # Module no tests doCheck = false; pythonImportsCheck = [ @@ -35,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with Neato Botvac Connected vacuum robots"; homepage = "https://github.com/stianaske/pybotvac"; + changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix index 909feb94432..d8aa5760d5d 100644 --- a/pkgs/development/python-modules/pycoolmasternet-async/default.nix +++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pycoolmasternet-async"; - version = "0.1.3"; + version = "0.1.6"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,13 +15,15 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pycoolmasternet-async"; rev = "v${version}"; - hash = "sha256-1Xd8OdN8d3g23kQZqihZrNLKoqLCbu5BvAMNitg8aDA="; + hash = "sha256-7RYKZWs8SCXCBgjbiTLSRUPujeraxiOE6MHENPmhimg="; }; # no tests implemented doCheck = false; - pythonImportsCheck = [ "pycoolmasternet_async" ]; + pythonImportsCheck = [ + "pycoolmasternet_async" + ]; meta = with lib; { description = "Python library to control CoolMasterNet HVAC bridges over asyncio"; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index f2263a99dff..d0f4437cddb 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.11"; + version = "3.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-oJ6Y4Bo4OLPVEy8vygU1FeRpZskfkCFBObvzTMuif5M="; + hash = "sha256-i9xC1Vijf/pU7WmRaosdEs5tPNos2hq3cGkT8MGM1Ro="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 704c2526328..91f09cc531f 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.12.0"; + version = "2023.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uqiSNqM1HKNAipIKKsUHv9mPfdk01ZrNWMXIzhgxxjU="; + hash = "sha256-XUiDZW3r8I8Vyx30UhopQ6S0HpSi0VNgvyu2RMNt2Eg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 04a59fa5df9..90202829fc6 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.14"; + version = "0.9.15"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JAkfjZ5DdkZZHH921bru49OqbNiuSSpRxwJuUzifGHo="; + sha256 = "sha256-kIp946iMKyKiwhppkXxTIVKJW9GkkFJ6Jw7hTK1A5kc="; }; # Deliberately not in propagated build inputs; users can decide diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 596c3a64cd7..726b37946b9 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.12"; + version = "1.0.13"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mcaulifn"; repo = "solcast"; - rev = "v${version}"; - hash = "sha256-azcEbv/4M3UqRyV30yld+6pWbSxbGXiJJHWMDL4xgOM="; + rev = "refs/tags/v${version}"; + hash = "sha256-peoC6NrenfQYqr1hgPth8pqyTRZb+phD6UQhjnZF92U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the Solcast API"; homepage = "https://github.com/mcaulifn/solcast"; + changelog = "https://github.com/mcaulifn/solcast/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix index beba5130578..d62afa64686 100644 --- a/pkgs/development/python-modules/pysoma/default.nix +++ b/pkgs/development/python-modules/pysoma/default.nix @@ -1,20 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "pysoma"; - version = "0.0.11"; + version = "0.0.12"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U/kLaO/GBpOa9mHHlYQiWSw7sVNPaMneDURoJBqqojo="; + hash = "sha256-me/A3BIAFJ8CxyiF5RvANdC/NbSYGmcjCFbpybkTxKM="; }; # Project has no test doCheck = false; - pythonImportsCheck = [ "api" ]; + + pythonImportsCheck = [ + "api" + ]; meta = with lib; { description = "Python wrapper for the HTTP API provided by SOMA Connect"; diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index 01bf784e385..4ee6f81ac31 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -4,11 +4,12 @@ , fetchFromGitHub , setuptools , pythonOlder +, packaging }: buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.7.16"; + version = "1.7.18"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,21 +18,16 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-n04N7wfCBJIbwEEHJ6I1Lt3rpZg46umGPawShlXDuZ8="; + hash = "sha256-LQjtePFSMvZdAGH6f8CveaE7ASm/x9GuFj9s3TipYHQ="; }; - postPatch = '' - # https://github.com/jafar-atili/pySwitchbee/pull/2 - substituteInPlace pyproject.toml \ - --replace '"asyncio",' "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ aiohttp + packaging ]; # Module doesn't have tests diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix new file mode 100644 index 00000000000..d388c840a00 --- /dev/null +++ b/pkgs/development/python-modules/pytest-base-url/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytest +, pytest-localserver +, requests +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytest-base-url"; + version = "2.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-v6pLejWNeb9Do6x2EJqmLKj8DNqcMtmYIs+7iDYsbjk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + pytest-localserver + ]; + + pytestFlagsArray = [ + "tests" + ]; + + pythonImportsCheck = [ + "pytest_base_url" + ]; + + meta = with lib; { + description = "pytest plugin for URL based tests"; + homepage = "https://github.com/pytest-dev/pytest-base-url"; + changelog = "https://github.com/pytest-dev/pytest-base-url/blob/v${version}/CHANGES.rst"; + license = licenses.mpl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix new file mode 100644 index 00000000000..9e620a6210a --- /dev/null +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, playwright +, pytest +, pytest-base-url +, pytestCheckHook +, python-slugify +, pythonOlder +, setuptools-scm +, django +}: + +buildPythonPackage rec { + pname = "pytest-playwright"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "playwright-pytest"; + rev = "refs/tags/v${version}"; + hash = "sha256-fHzQxbQBSEkCFu/ualjzSmIt3SiEa2ktTvIJKPZLT9Q="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + playwright + pytest-base-url + python-slugify + ]; + + # Most of the tests rely on network access, or on unavailable browsers such as + # msedge, chrome or webkit + doCheck = false; + + preCheck = '' + export PLAYWRIGHT_BROWSERS_PATH=${playwright.browsers} + ''; + + pythonImportsCheck = [ + "pytest_playwright" + ]; + + meta = with lib; { + description = "Pytest plugin to write end-to-end browser tests with Playwright"; + homepage = "https://github.com/microsoft/playwright-pytest"; + changelog = "https://github.com/microsoft/playwright-pytest/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 67119cdda52..01dc904293e 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; + hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -51,10 +51,10 @@ buildPythonPackage rec { --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ - --replace "flake8>=5.0.0,<5.1.0" "flake8" \ + --replace "flake8>=5.0.0,<7" "flake8" \ --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ - --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \ - --replace "pyflakes>=2.5.0,<2.6.0" "pyflakes" + --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \ + --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes" ''; nativeBuildInputs = [ @@ -150,6 +150,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/python-lsp/python-lsp-server"; + changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index c3d1d66f7bc..529d0d2a361 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build @@ -29,14 +28,16 @@ buildPythonPackage rec { pname = "pytoolconfig"; - version = "1.2.4"; + version = "1.2.5"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "bagel897"; repo = "pytoolconfig"; rev = "refs/tags/v${version}"; - hash = "sha256-UdBPp9Ur3+hYn2CBY91jK1hT/GHyA8qbQ3w0OuLBrFU="; + hash = "sha256-b7er/IgXr2j9dSnI87669BXWA5CXNTzwa1DTpl8PBZ4="; }; outputs = [ @@ -56,14 +57,6 @@ buildPythonPackage rec { sphinxHook ] ++ passthru.optional-dependencies.doc; - patches = [ - (fetchpatch { - # Fix documentation build - url = "https://github.com/bagel897/pytoolconfig/commit/c8a010842d738242d6bb8deb28ecd62342a60e03.patch"; - hash = "sha256-hYcPjQeHYGtSPy363RVS5YgQ+obJQuC+Q9ZuOGvKRAY="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace "packaging>=22.0" "packaging" @@ -76,9 +69,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - validation = [ pydantic ]; - global = [ platformdirs ]; - doc = [ sphinx tabulate ]; + validation = [ + pydantic + ]; + global = [ + platformdirs + ]; + doc = [ + sphinx + tabulate + ]; }; pythonImportsCheck = [ @@ -93,7 +93,7 @@ buildPythonPackage rec { changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; description = "Python tool configuration"; homepage = "https://github.com/bagel897/pytoolconfig"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ hexa ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fab hexa ]; }; } diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 12cfd4e7177..35610559020 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.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5ZCFAEHcM+3yH9pFyrduG8Uo1Ofr4JkvcXjJEi5KRMc="; + hash = "sha256-RDCNoP3B1+kyyEBszAbAm9G+G+4LE3ceojB5uQup7Ng="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index c554f9febf4..f29ecc171b8 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.1.3"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - sha256 = "sha256-4qg43qxrgBSES2ng7DbjgWrsXY+3+olvUe19zW2UXCE="; + sha256 = "sha256-AscfyYURP91aDoPo/ii3uEHQL82DAHpBHlGm1MjLx8c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 4d8c10e97ca..e6e31041c2f 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -10,10 +11,12 @@ buildPythonPackage rec { version = "6.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "RestrictedPython"; inherit version; - sha256 = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; + hash = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; }; checkInputs = [ @@ -28,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Restricted execution environment for Python to run untrusted code"; homepage = "https://github.com/zopefoundation/RestrictedPython"; + changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${version}/CHANGES.rst"; license = licenses.zpl21; maintainers = with maintainers; [ juaningan ]; }; diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix index da4f3699a76..5648d3efdde 100644 --- a/pkgs/development/python-modules/rfcat/default.nix +++ b/pkgs/development/python-modules/rfcat/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , future @@ -6,7 +7,6 @@ , numpy , pyserial , pyusb -, hostPlatform , pytestCheckHook , pythonOlder }: @@ -33,7 +33,7 @@ buildPythonPackage rec { pyusb ]; - postInstall = lib.optionalString hostPlatform.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/etc/udev/rules.d cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d ''; diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 89772638ae3..2c91bdf72b6 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytoolconfig +, pytest-timeout , pytestCheckHook +, pythonOlder , setuptools }: @@ -11,9 +13,13 @@ buildPythonPackage rec { version = "1.6.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-kxrqFUNlVWp9qsAcvOzgycEYdVv/98ZaskK2lYUWfso="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-rope"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-avNCti288dY9pl5AVTmUzZU/vb6WDkXEtELNlEi6L/o="; }; nativeBuildInputs = [ @@ -25,6 +31,7 @@ buildPythonPackage rec { ] ++ pytoolconfig.optional-dependencies.global; checkInputs = [ + pytest-timeout pytestCheckHook ]; @@ -37,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python refactoring library"; homepage = "https://github.com/python-rope/rope"; - maintainers = with maintainers; [ goibhniu ]; + changelog = "https://github.com/python-rope/rope/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix new file mode 100644 index 00000000000..1780d94ded9 --- /dev/null +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, click +, defusedxml +, fetchFromGitHub +, httpx +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "sfrbox-api"; + version = "0.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "hacf-fr"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-kXM+Y7ZKKczVdKTXqmbgSxlFfHx3hAvT9nkF3Ex7ChY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pydantic = ">=1.10.2"' 'pydantic = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + defusedxml + httpx + pydantic + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ + "sfrbox_api" + ]; + + meta = with lib; { + description = "Module for the SFR Box API"; + homepage = "https://github.com/hacf-fr/sfrbox-api"; + changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 260a2723650..f23cc45ebe1 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,28 +1,35 @@ { lib , stdenv , buildPythonPackage -, fetchPypi -, substituteAll , pythonOlder -, geos -, pytestCheckHook +, fetchPypi , cython +, geos +, setuptools , numpy +, pytestCheckHook }: buildPythonPackage rec { pname = "shapely"; version = "2.0.0"; - disabled = pythonOlder "3.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; + hash = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; }; nativeBuildInputs = [ - geos # for geos-config cython + geos # for geos-config + setuptools + ]; + + buildInputs = [ + geos ]; propagatedBuildInputs = [ @@ -33,9 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - # Environment variable used in setup.py - GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - preCheck = '' rm -r shapely # prevent import of local shapely ''; @@ -54,9 +58,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "shapely" ]; meta = with lib; { - description = "Geometric objects, predicates, and operations"; - homepage = "https://pypi.python.org/pypi/Shapely/"; - license = with licenses; [ bsd3 ]; + changelog = "https://github.com/shapely/shapely/blob/${version}/CHANGES.txt"; + description = "Manipulation and analysis of geometric objects"; + homepage = "https://github.com/shapely/shapely"; + license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; } diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix index 3ee2feeaa96..87523b7f629 100644 --- a/pkgs/development/python-modules/spacy/legacy.nix +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -14,11 +14,15 @@ buildPythonPackage rec { # checkInputs = [ pytestCheckHook spacy ]; doCheck = false; - pythonImportsCheck = [ "spacy_legacy" ]; + + pythonImportsCheck = [ + "spacy_legacy" + ]; meta = with lib; { - description = "A Path interface for local and cloud bucket storage"; - homepage = "https://github.com/justindujardin/pathy"; + description = "Legacy registered functions for spaCy backwards compatibility"; + homepage = "https://github.com/explosion/spacy-legacy"; + changelog = "https://github.com/explosion/spacy-legacy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; }; diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index 97e03ad4b03..2affcdd4af7 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.4.1"; + version = "1.5.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; - format = "setuptools"; - src = fetchPypi { inherit pname version; - sha256 = "sha256-SMJHBsI7tCYhc7b6Seq7EK+hW4QS8UKDEgVJUXzPoxQ="; + hash = "sha256-Oudl06lAnuYMD7TSTC3raoBheqknBU9bzX/JjwaV5Yc="; }; propagatedBuildInputs = [ @@ -35,18 +34,23 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore tests that require network access (TestWikipediaFlags and TestW3CSVG), and tests that - # require files missing in the 1.0.0 PyPI release (TestOtherFiles). - pytestFlagsArray = [ - "-k 'not TestWikipediaFlags and not TestW3CSVG and not TestOtherFiles'" + disabledTests = [ + # Ignore tests that require network access (TestWikipediaFlags and TestW3CSVG), and tests that + # require files missing in the 1.0.0 PyPI release (TestOtherFiles). + "TestWikipediaFlags" + "TestW3CSVG" + "TestOtherFiles" ]; - pythonImportsCheck = [ "svglib.svglib" ]; + pythonImportsCheck = [ + "svglib.svglib" + ]; meta = with lib; { - homepage = "https://github.com/deeplook/svglib"; description = "A pure-Python library for reading and converting SVG"; - license = licenses.lgpl3; + homepage = "https://github.com/deeplook/svglib"; + changelog = "https://github.com/deeplook/svglib/blob/v${version}/CHANGELOG.rst"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ trepetti ]; }; } diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 39ca2941c03..b2d789683fd 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, markuppy , odfpy , openpyxl , pandas @@ -37,7 +38,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { all = [ - # markuppy + markuppy odfpy openpyxl pandas @@ -50,7 +51,7 @@ buildPythonPackage rec { tabulate ]; html = [ - # markuppy + markuppy ]; ods = [ odfpy diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index e3210b44325..63858112ced 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -21,10 +21,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-tailscale"; - rev = "v${version}"; - sha256 = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; + rev = "refs/tags/v${version}"; + hash = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,13 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "tailscale" ]; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Tailscale API"; homepage = "https://github.com/frenck/python-tailscale"; + changelog = "https://github.com/frenck/python-tailscale/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index a549fe393b9..d5aa29b23ae 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -372,11 +372,11 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-SudzMTxfifKJJso6haCgOD2dXeAhYSXHA2nzq1ErTHg=" - else "sha256-bwZwK24DlUevN5gIdKmBkq1dJpn0i2H4hq+IN77BzjE="; - aarch64-linux = "sha256-ZbCNZSHF9of+KGTNEqFdKQ44MVNto/rTyo2XEsKXISg="; - x86_64-darwin = "sha256-ZfZQjLdqo8VVlfKfkdolvSHQvKe4IbQSLc/4cNzHr3E="; - aarch64-darwin = "sha256-u+ODHAZDlGe06PUWId4sNKyl60vhAPMd01jMm2EvN8E="; + then "sha256-Q6a/Q4fr5cmqqkIoL8ZBJOKfF4NXnrhqFi2VgUpHC3E=" + else "sha256-RBrmxWBn5Yj5fIHlPYXuWOFMTqDGbgk+IvUXk7kIXHM="; + aarch64-linux = "sha256-MEkn2DplUW1R95q+A6uuIKNtMEBv08jU8kvTbMgIKJU="; + x86_64-darwin = "sha256-bqZTu0AABeg6M2IVwlkUPuF8EMsbQXurcmjWZY0EN9E="; + aarch64-darwin = "sha256-q1PfVqyZ3KG65aKw6l9vhxCfPoxH6Nb5y1Eh9P8Ovqk="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 0f67fe231a3..45ac7a9e877 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tpm2-pytss"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iN5ePKMnYh1VzGbKtwdIx1tG74T+8ax/AqDGgermr90="; + hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 5a0907adc60..3a970d42d05 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.21.7"; + version = "4.4.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+bqsQfyvsLjsZViT/uvF2L0YnaBQYtA7RWahbAkvwIw="; + sha256 = "sha256-fYJtRY6abb19TyH99tfDm6Li80dMijSAACQZZYYKDt8="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 5fd59516d49..893a59dffae 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.52.3"; + version = "0.53.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-axk6C8RLuoKWUdJ3sOklWqnlYTWKTaQh51eWZm2Dy+0="; + hash = "sha256-9KTBzPklQpqzLOQYRz6Kd0wUSHr2sfypvTu0X7om31Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 72562d4935b..94165d992d8 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildPackages , pkg-config , meson @@ -56,6 +57,14 @@ stdenv.mkDerivation rec { hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c="; }; + patches = [ + (fetchpatch { + name = "CVE-2022-4843.patch"; + url = "https://github.com/radareorg/radare2/commit/842f809d4ec6a12af2906f948657281c9ebc8a24.patch"; + sha256 = "sha256-asEXW9Ox48w9WQhOA9tleXIvynIjsWb6ItKmFTojgbQ="; + }) + ]; + preBuild = '' pushd ../libr/arch/p/arm/v35arm64 cp -r ${arm64} arch-arm64 diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 6c37a5dca42..f5936704e30 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.3.1"; + version = "4.3.2"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-GWg3W/jjDKH6BcvjGt215J03NiDVWihU/m+2kejPVPA="; + sha256 = "sha256-lcYI0Yns/R5VeOUG68Xe8h1BO8wlKvL1CZIqzWkgsqo="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 816326489d8..a109fe44039 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -81,7 +81,7 @@ buildBazelPackage rec { rm -rf $bazelOut/external/com_google_protobuf ''; - sha256 = "sha256-R+Hc9ldYcKgAXETKr2+Hk7IrjJ93WkrjyJ1SQRoM9V4="; + sha256 = "sha256-tRtlwv38bExvtHaCbRUp1kLgxvZSNaYCpFG/wwrkFrk="; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 7b2bef113b3..e00e2d4b271 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -26,12 +26,12 @@ }: let - version = "5.2.0"; + version = "5.4.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "sha256-ggqU27FAce1tjCZs8MCA7LJlpe6mUwdXlInEZiwtWCo="; + hash = "sha256-ocYtm8tOAxBt3wt72WGWuiRuHJt6k12vjZvtqLvcuKE="; }; # Update with `eval $(nix-build -A bazel_5.updater)`, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json index 9ca98f1132a..fc6895e047e 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json @@ -1129,18 +1129,18 @@ "generator_function": "dist_http_archive", "generator_name": "platforms", "name": "platforms", - "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, - "platforms-0.0.4.tar.gz": { - "name": "platforms-0.0.4.tar.gz", - "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "platforms-0.0.5.tar.gz": { + "name": "platforms-0.0.5.tar.gz", + "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, "remote_coverage_tools": { diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index e56b621610a..cbe00b1ad51 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk17, git, perl, cmake }: let pname = "fastddsgen"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-P0Fj8znhky8mTebnoNyojKDdnDowQaGXpX5L0CHcEeU="; + hash = "sha256-lxMv1hXjHFslJts63/FJPjj0mAKTluY/pNTvf15Oo9o="; }; # fake build to pre-download deps into fixed-output derivation diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index a8e393a050e..87b86b9b023 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gore"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZNv3sqwOEtxjvyqC9oR8xYwo8sywU2MF8ngBw407/ko="; + sha256 = "sha256-Z2WOgkgi/JK/s0961FvgboJwYtxbFdRSzzPiE74SVaY="; }; - vendorSha256 = "sha256-HrdNWsUVz5G5tG/ZFz2z1Vt4kM12I088/6OIkRFyDl8="; + vendorHash = "sha256-1ftO+Bjc+vqB/azn4K6iRNrCLrz+QjpPzNfja3yvOrs="; doCheck = false; diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/development/tools/jqp/default.nix index 519bef162ac..8491900b2c1 100644 --- a/pkgs/development/tools/jqp/default.nix +++ b/pkgs/development/tools/jqp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f1HSwo0TwNpw02bNT1dzfovXcRQuP/IxAmomBgKuQxQ="; + sha256 = "sha256-qN248U4Fx4IAjJegCUj98PzrypMp9PQEr2RUaKX3yE4="; }; - vendorSha256 = "sha256-cx5esdxAJInxXHXx0xeKQNGTDBjKD3GhnY0Fu/Tzy9U="; + vendorHash = "sha256-qZTqqSANg0FpupWXTrHuYmnaTE387FhC40ZrZ9tlfew="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index bff6f36c805..002dffd05f7 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.9.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - hash = "sha256-qoKmYFwGgJrv39g6XvcUkYkjjfrfcxAztjsuTxwnVBM="; + hash = "sha256-TYw2YrilrEUCvyT9VvzrQnHcSnhPrNiAMRjLEk/QjgU="; }; - cargoSha256 = "sha256-XJkcwaDgorRwKmMTMGN2z9ONTlO0ftjP9V4/OPpDClc="; + cargoHash = "sha256-pgktCRxYlxo/kMdBm3/dzdU3rOXSNFY9IIE8j8Dgro0="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix index e9261c06258..66fbb4dc731 100644 --- a/pkgs/development/tools/mani/default.nix +++ b/pkgs/development/tools/mani/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mani"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-2WuUQt9q19JYlfAyoGFRVpiLmsMbN45cYdF16j+jhhk="; + sha256 = "sha256-PuoGuweuDcSM1qfjXABSdoqbMLc5a+lYGFr0kZZkgVE="; }; - vendorSha256 = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8="; + vendorHash = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index 343d41be6f1..0856a837388 100644 --- a/pkgs/development/tools/mask/default.nix +++ b/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mlARZ05xppPvr6Z5uoveYt3Y3LtdMkbFqxW1EkX+ud0="; + sha256 = "sha256-mPnykI3scTBzGjDa8nawWYRvZBkq74/t5WMbMbs3zVE="; }; - cargoSha256 = "sha256-EulRz/IjLLvNT9YxyNjJynFEGyQ/Q2Out984xS9Wp5o="; + cargoSha256 = "sha256-h58MA3F4UA4gp64UPnK6Tvlvr4PFvrVKmjp48lZjH68="; # tests require mask to be installed doCheck = false; @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A CLI task runner defined by a simple markdown file"; homepage = "https://github.com/jacobdeichert/mask"; + changelog = "https://github.com/jacobdeichert/mask/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 3489ce3d1f7..dedbb8e300c 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -1,21 +1,28 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "act"; - version = "0.2.34"; + version = "0.2.35"; src = fetchFromGitHub { owner = "nektos"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-75gUiFDKpIfl9xU9MAb/JkTof5NakPHR0lEaMJpSYZQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-igmxiPVq9aWntIkBSl7crrbXM9N9Iv4KULsj5Q2ZL2I="; }; - vendorSha256 = "sha256-4r25EqpnCWfJmidWZlerbNaUnDCMPMCcsGRluwHQyvY="; + vendorHash = "sha256-FKpNMZrME3HqqVlp09O3Ppb/MjEzYFuawA+WlKFUfME="; doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; meta = with lib; { description = "Run your GitHub Actions locally"; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 53b02cc16ea..667acd91f34 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -147,7 +147,8 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; - platforms = with platforms; linux ++ cygwin ++ darwin; + # GDB upstream does not support ARM darwin + platforms = with platforms; linux ++ cygwin ++ ["x86_64-darwin"]; maintainers = with maintainers; [ pierron globin lsix ]; }; } diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 14b0ce8b922..b7337e11998 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-6dpEWODqxafMLzUzJgTI9y1nV67GyUihbQB6UHAYStY="; + hash = "sha256-BKDjtC3NDazFsvX/FM0qXpHd1muXUQDgzBMSLipA4/U="; }; vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A="; diff --git a/pkgs/development/tools/parsing/nex/default.nix b/pkgs/development/tools/parsing/nex/default.nix new file mode 100644 index 00000000000..287098ed8d3 --- /dev/null +++ b/pkgs/development/tools/parsing/nex/default.nix @@ -0,0 +1,27 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +}: +# upstream is pretty stale, but it still works, so until they merge module +# support we have to use gopath: see blynn/nex#57 +buildGoPackage rec { + pname = "nex"; + version = "unstable-2021-03-30"; + + src = fetchFromGitHub { + owner = "blynn"; + repo = pname; + rev = "1a3320dab988372f8910ccc838a6a7a45c8980ff"; + hash = "sha256-DtJkV380T2B5j0+u7lYZfbC0ej0udF4GW2lbRmmbjAM="; + }; + + goPackagePath = "github.com/blynn/nex"; + subPackages = [ "." ]; + + meta = with lib; { + description = "Lexer for Go"; + homepage = "https://github.com/blynn/nex"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index e819a55eef3..5b62959db0f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation ({ $CC -fPIC -c src/scanner.c -o scanner.o $CFLAGS fi $CC -fPIC -c src/parser.c -o parser.o $CFLAGS + rm -rf parser $CXX -shared -o parser *.o runHook postBuild ''; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 5246f13e564..2e8ffcd1a8f 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.215"; + version = "0.0.217"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f/ZqHPZ1lhYn1iPz0dwIQQpjWmZj1fxBiVMTbT8bTRo="; + sha256 = "sha256-/nZtq1FSOsB0OX0lVFY3o0F/1ZobM8iW+3zp4muhtfU="; }; - cargoSha256 = "sha256-o3W0yyqGh3CDgymISsJyxLolxwOAY4p8ldrCwU8qwiA="; + cargoSha256 = "sha256-mSDr2ywrk2cPp2NrvjaxU//+ZYQZe05XF5Ny8Bkx7uA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix index 479c5d6cef7..e484f930c1e 100644 --- a/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-guppy"; - version = "unstable-2022-12-05"; + version = "unstable-2023-01-08"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; - rev = "4dad33053d3047293da35ade33158b709fe8bb23"; - sha256 = "sha256-CWyXNBBo+yyF2s6BT6FFu6CI7xId38vsyg0uSezsusc="; + rev = "81753212702ca2b11b65ac8b98db6c9e4f4d278f"; + sha256 = "sha256-fCZlnE+/U+Z+X9n6x6qWHxODH5ESV0cM+hwxeyUZs6c="; }; - cargoSha256 = "sha256-jwfZ5FH2qlzmxKT9LTXkmvwL5fhKljUPYwYXXqDRDXc="; + cargoSha256 = "sha256-H2voc37Ywmi8oy15UY9J3hW6sbqc3RZuelxWJxrwZKg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index c596e61586c..c8d3f360da2 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -1,15 +1,20 @@ -{ lib, rustPlatform, fetchCrate }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.17"; + version = "0.9.18"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-FgG9sdXZhSlX4p3I9WL5ORN7FCg4Zgt/Y+GRCWhIoP8="; + src = fetchFromGitHub { + owner = "guppy-rs"; + repo = "guppy"; + rev = "cargo-hakari-${version}"; + sha256 = "sha256-ZjU+0e0GmLCC9cha1RcTV0vEbuRi/SmU9qaNONIB7nI="; }; - cargoHash = "sha256-pYjjiQUnBfZ9wQgXhm4c+A7zMAF9k/Mzl5ccPX407/A="; + cargoHash = "sha256-/KH+h+4xfU2fitWv+IrLkwgiQ8tVjm41DiZtbrerRZ4="; + + cargoBuildFlags = [ "-p" "cargo-hakari" ]; + cargoTestFlags = [ "-p" "cargo-hakari" ]; meta = with lib; { description = "Manage workspace-hack packages to speed up builds in large workspaces."; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index df204220b5b..7089a574748 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.4"; + version = "0.5.5"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-xBWp9+Vv1Ho63WWlvbvLU+h0dh5CpUamlRQtmX6rOeY="; + sha256 = "sha256-L+byatz2Pq30+Gw0lq1/7Q1FJXi6z+J/nhySFBAfoMo="; }; - cargoSha256 = "sha256-GKrqB6BtRbhtOlD2YeEMh6aqblPNEJjkR+tAsSpOFig="; + cargoSha256 = "sha256-/8kza5fW23UYlebchYtgo2GU8M7LXNXSKV2dQ6xZllw="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index a5facfee823..800d610a6d7 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.27.7"; + version = "1.29.3"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-3IHKFO/P5TdD8ujFUuJj0xZsJDIUSmKjy7j6BefPK58="; + sha256 = "sha256-VA2OU2lnrbqNrQgyxYz2fh+jrJkHWTIOVrdYBwaK2kI="; }; - vendorSha256 = "sha256-RO9dZP236Kt8SSpZFF7KRksrjgwiEkPxE5DIMUK69Kw="; + vendorSha256 = "sha256-pzbwHnUCZkHmj+ZKJJ3zGG1pVHYlvoMMF3jx9FYg01U="; ldflags = [ "-s" "-w" "-X" "github.com/supabase/cli/cmd.version=${version}" ]; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 31fc7270c23..673c3dbbdad 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-EChOQTWGt/LUfwCxmMmYC+zHjW9hVvghhOGr4DfpNtQ="; + sha256 = "sha256-kLPs/9tQtvUEOGsLtnK0uqJnCWTHR6JU7BCwtFEmIlQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/zq/default.nix b/pkgs/development/tools/zq/default.nix index 06e055d9182..c62de54360f 100644 --- a/pkgs/development/tools/zq/default.nix +++ b/pkgs/development/tools/zq/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "zq"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "brimdata"; repo = "zed"; rev = "v${version}"; - hash = "sha256-DVQoWam5szELJ3OeIKHYF0CBZ0AJlhuIJRrdhqmyhQM="; + hash = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; }; - vendorSha256 = "sha256-2zSSjAoeb+7Nk/dxpvp5P2/bSJXgkA0TieTQHK4ym1Y="; + vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; subPackages = [ "cmd/zq" ]; |