diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index e3f15f4f438c..4f5ea3390e88 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -432,7 +432,6 @@ in { path = with pkgs; [ nodejs_18 yarn ffmpeg-headless openssl ]; script = '' - #!/bin/sh umask 077 cat > /var/lib/peertube/config/local.yaml < lib.elem blas-ilp64.passthru.implementation "mkl"; let - python = python3.withPackages (ps: with ps; [ six pyparsing numpy h5py ]); + python = python3.withPackages ( + ps: with ps; [ + six + pyparsing + numpy + h5py + ] + ); qcmaquisSrc = fetchFromGitHub { owner = "qcscine"; repo = "qcmaquis"; @@ -84,41 +95,48 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - buildInputs = [ - blas-ilp64.passthru.provider - hdf5-cpp - python - armadillo - libxc - gsl.dev - boost180 - ] ++ lib.optionals enableMpi [ - mpi - globalarrays - ]; + buildInputs = + [ + blas-ilp64.passthru.provider + hdf5-cpp + python + armadillo + libxc + gsl.dev + boost180 + ] + ++ lib.optionals enableMpi [ + mpi + globalarrays + ]; passthru = lib.optionalAttrs enableMpi { inherit mpi; }; - cmakeFlags = [ - "-DOPENMP=ON" - "-DLINALG=OpenBLAS" - "-DTOOLS=ON" - "-DHDF5=ON" - "-DFDE=ON" - "-DEXTERNAL_LIBXC=${lib.getDev libxc}" - (lib.strings.cmakeBool "DMRG" enableQcmaquis) - (lib.strings.cmakeBool "NEVPT2" enableQcmaquis) - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ - "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" - "-DLINALG=OpenBLAS" - ] ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [ - "-DMKLROOT=${blas-ilp64.passthru.provider}" - "-DLINALG=MKL" - ] ++ lib.optionals enableMpi [ - "-DGA=ON" - "-DMPI=ON" - ]; + cmakeFlags = + [ + "-DOPENMP=ON" + "-DTOOLS=ON" + "-DHDF5=ON" + "-DFDE=ON" + "-DEXTERNAL_LIBXC=${lib.getDev libxc}" + (lib.strings.cmakeBool "DMRG" enableQcmaquis) + (lib.strings.cmakeBool "NEVPT2" enableQcmaquis) + "-DCMAKE_SKIP_BUILD_RPATH=ON" + (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) + (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ] + ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ + "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" + "-DLINALG=OpenBLAS" + ] + ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [ + "-DMKLROOT=${blas-ilp64.passthru.provider}" + "-DLINALG=MKL" + ] + ++ lib.optionals enableMpi [ + "-DGA=ON" + "-DMPI=ON" + ]; preConfigure = lib.optionalString enableMpi '' export GAROOT=${globalarrays}; @@ -148,13 +166,18 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/pymolcas --set MOLCAS $out ''; - meta = with lib; { + meta = { description = "Advanced quantum chemistry software package"; homepage = "https://gitlab.com/Molcas/OpenMolcas"; - maintainers = [ maintainers.markuskowa ]; - license = with licenses; [ lgpl21Only bsd3 ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + maintainers = [ lib.maintainers.markuskowa ]; + license = with lib.licenses; [ + lgpl21Only + bsd3 + ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; mainProgram = "pymolcas"; }; } - diff --git a/pkgs/applications/science/electronics/sv-lang/default.nix b/pkgs/applications/science/electronics/sv-lang/default.nix index 928cf3059385..2bc5059b8b80 100644 --- a/pkgs/applications/science/electronics/sv-lang/default.nix +++ b/pkgs/applications/science/electronics/sv-lang/default.nix @@ -49,15 +49,14 @@ stdenv.mkDerivation rec { cmake python3 ninja - - # though only used in tests, cmake will complain its absence when configuring - catch2_3 ]; buildInputs = [ unordered_dense boost182 fmt_9 + # though only used in tests, cmake will complain its absence when configuring + catch2_3 ]; # TODO: a mysterious linker error occurs when building the unittests on darwin. diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 60615b6f0926..78d312c4011e 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -10,12 +10,12 @@ }: let - version = "3.8.2"; + version = "3.8.5"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-3KCO9ooYN8PPVirU2wh7wu4feHqugc3JSXWR2aWIanE="; + hash = "sha256-8QAnZCvSUMuRj/Rd85j79GXDQxl8HlEaiU4StsXDdpU="; }; npmPkg = buildNpmPackage { @@ -53,7 +53,7 @@ in maven.buildMavenPackage { mvnJdk = jdk; mvnParameters = "-pl !packaging"; - mvnHash = "sha256-AuZp+uq5bmb4gnzKvqXeTmBrsCT6qmJOrwtJq9iCkRQ="; + mvnHash = "sha256-SrEsJfiZrPy2zZ0Vzl7+d+8XUHGd2DOOs+PHBOZrbIU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 4b4958c643b7..21acfc9f37d6 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "athens"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; rev = "v${version}"; - hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0="; + hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU="; }; - vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A="; + vendorHash = "sha256-W65lQYGrRg8LwFERj5MBOPFAn2j+FE7ep4ANuAGmfgM="; CGO_ENABLED = "0"; ldflags = [ diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix index 730a05a259e8..b4d831af3bf4 100644 --- a/pkgs/by-name/av/avro-tools/package.nix +++ b/pkgs/by-name/av/avro-tools/package.nix @@ -7,14 +7,14 @@ }: let pname = "avro-tools"; - version = "1.11.3"; + version = "1.12.0"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI="; + sha256 = "sha256-+OTQ2UWFLcL5HDv4j33LjKvADg/ClbuS6JPlSUXggIU="; }; dontUnpack = true; diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 0dd3feaa7caf..4e0bd6de84a2 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-IlPkJK4pYszrJ43HSTq9Xwpz3K9XnUpoF0Ry7ox85KE="; + hash = "sha256-msSiVlz6Aey8Q+NjtKl58TOkYtPIzw3733kVGs9/8UQ="; }; - cargoHash = "sha256-mMDPpiIWhGMl0a4v1msNfcQqmq5ziB+ppw7RxYNAPaI="; + cargoHash = "sha256-q67UAAVvc070eArfMo4r/UcUUjODuR/vMukiA4ylQ5w="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/iv/ivyterm/package.nix b/pkgs/by-name/iv/ivyterm/package.nix index 7fe42f201b93..b5c7c26f09ce 100644 --- a/pkgs/by-name/iv/ivyterm/package.nix +++ b/pkgs/by-name/iv/ivyterm/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "Tomiyou"; repo = "ivyterm"; rev = "13ee76dfc88bc92807e328991c7a8586a5b13ac7"; - hash = "sha256-vxDJwA+ZM3ROX9d1+o3cXj4LbaO9Wy5jFAVuAPOzCCI="; + hash = "sha256-RVHGDgaNYhR/eGTu4bhJvEfd14qFP+u8ApItVc00Bm8="; }; cargoHash = "sha256-tdaI0diwRjqERmAiuKFhMw4AeqxgMq8YMsZWBjsmd0U="; diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix index 16de4362c4fd..e12c9f501076 100644 --- a/pkgs/by-name/ma/marwaita-orange/package.nix +++ b/pkgs/by-name/ma/marwaita-orange/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-orange"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-LJvlbvbgNH5nnfDAG8BpOBrO2W6VyDeH2yDcjRamUQI="; + hash = "sha256-hp+5UIr3uXuUay3K6HsaGs+Wh9VFx1yVNb3d0Jw2M34="; }; buildInputs = [ diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 38411adb4ea2..1ab75103433c 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.9.0"; + version = "23.10.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-vdqIM0qkCpOjohmMP245Og87wOmejlCBEIceBfwEB8U="; + hash = "sha256-5eXw9buGln2of4wumPUFloguCvru9at4pUEb1FVYzoM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 12942225207d..deaeac82bda8 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -33,10 +33,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16999-938306a7b"; - rpcs3Version = "0.0.33-16999-938306a7b"; - rpcs3Revision = "938306a7bc86edd0dfdd995d28e818f36240bf8f"; - rpcs3Hash = "sha256-5XufzJ3LmhBpLiIscIW3KBgj/R9aSDD5zFiBo/D+p34="; + rpcs3GitVersion = "17070-8b8396b94"; + rpcs3Version = "0.0.33-17070-8b8396b94"; + rpcs3Revision = "8b8396b9455394486656660c960d420c5b6c446c"; + rpcs3Hash = "sha256-LUgKUzoBNY4ZemRBsLOjtXxLXHyRkPivtdSSgUGw5h4="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index e0d96106f792..cdda6d6b9d57 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -102,7 +102,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.0"; + version = "14.0.1"; sources = { x86_64-linux = fetchurl { @@ -112,7 +112,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-RNsTj8/HP10ElIjutYCqp50gN7W7Kz+DA94rkkU/VaI="; + hash = "sha256-DQbKMaXgEXNKHPonQF7RZ1TtEqCRnvD81ahyVUkknY8="; }; i686-linux = fetchurl { @@ -122,7 +122,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-rHInikR2UvsB8A0cC7gqj09CWajJtR9ZhS3WFrv2z94="; + hash = "sha256-khY/B4c0DjqRd0s9PblEhL0jJONVU5mQCAqZ60M+CjE="; }; }; diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index ea58c45f579b..91d03eb80a14 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.24.8"; + version = "1.24.9"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; rev = "v${version}"; - hash = "sha256-tn6GCBX3DrqyZZz2FJLTn1vJd4eEbawyJM5huco21/8="; + hash = "sha256-KXkriFFn1GapoVimcK7Hqv1mUTZ2EbnnZPyX2izI2oo="; }; - cargoHash = "sha256-2qGObTu7g6GbUwd4obgqufig7bABFLBsCWSyZt8AVac="; + cargoHash = "sha256-MCnQJ1cJeWUJ8L+u09px4COG7XUAVOOgBg8nUi37J90="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 3e75bdecaecd..c49df7fd75fe 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -5,6 +5,8 @@ , meson , ninja , pkg-config +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection , gi-docgen , python3 @@ -25,7 +27,8 @@ stdenv.mkDerivation rec { pname = "gusb"; version = "0.4.9"; - outputs = [ "bin" "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" ] + ++ lib.optionals withIntrospection [ "devdoc" ]; src = fetchFromGitHub { owner = "hughsie"; @@ -51,6 +54,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + ] ++ lib.optionals withIntrospection [ gobject-introspection gi-docgen vala @@ -64,7 +68,10 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ + (lib.mesonBool "docs" withIntrospection) + (lib.mesonBool "introspection" withIntrospection) (lib.mesonBool "tests" doCheck) + (lib.mesonBool "vapi" withIntrospection) (lib.mesonOption "usb_ids" "${hwdata}/share/hwdata/usb.ids") ]; diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 5c1b7d1dab0a..086d6ae60c82 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; - passthru.tests = [ raylib-games ]; + passthru.tests = { inherit raylib-games; }; patches = [ # Patch version in CMakeLists.txt to 5.0.0 diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e4c6afce8a61..4636921d60e1 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, clangStdenv , buildPackages , runCommand , fetchurl @@ -72,27 +72,28 @@ , enableGeoLocation ? true , enableExperimental ? false , withLibsecret ? true -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemdSupport ? lib.meta.availableOn clangStdenv.hostPlatform systemd , testers }: -stdenv.mkDerivation (finalAttrs: { +# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. +clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.46.1"; + version = "2.46.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; # https://github.com/NixOS/nixpkgs/issues/153528 # Can't be linked within a 4GB address space. - separateDebugInfo = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.is32bit; + separateDebugInfo = clangStdenv.hostPlatform.isLinux && !clangStdenv.hostPlatform.is32bit; src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-KhT6rDWa/5QdC8REPrVTfjcCvK8xawoSng5l8/+OqsA="; + hash = "sha256-Wq4cXAow1enFgxZStvG978MddeCtgctAGFsK7ZLOebY="; }; - patches = lib.optionals stdenv.hostPlatform.isLinux [ + patches = lib.optionals clangStdenv.hostPlatform.isLinux [ (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; @@ -100,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = lib.optionalString (clangStdenv.hostPlatform != clangStdenv.buildPlatform) '' # Ignore gettext in cmake_prefix_path so that find_program doesn't # pick up the wrong gettext. TODO: Find a better solution for # this, maybe make cmake not look up executables in @@ -123,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { gi-docgen glib # for gdbus-codegen unifdef - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -159,14 +160,14 @@ stdenv.mkDerivation (finalAttrs: { p11-kit sqlite woff2 - ] ++ lib.optionals stdenv.hostPlatform.isBigEndian [ + ] ++ lib.optionals clangStdenv.hostPlatform.isBigEndian [ # https://bugs.webkit.org/show_bug.cgi?id=274032 fontconfig freetype - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [ libedit readline - ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ( + ] ++ lib.optional (clangStdenv.hostPlatform.isDarwin && lib.versionOlder clangStdenv.hostPlatform.darwinSdkVersion "11.0") ( # this can likely be removed as: # "libproc.h is included in the 10.12 SDK Libsystem and should be identical to this one." # but the package is marked broken on darwin so unable to test @@ -178,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { runCommand "webkitgtk_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' - ) ++ lib.optionals stdenv.hostPlatform.isLinux [ + ) ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libseccomp libmanette wayland @@ -211,12 +212,12 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}" - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ # Have to be explicitly specified when cross. # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353 "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}" "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" "-DENABLE_MINIBROWSER=OFF" @@ -255,6 +256,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; - broken = stdenv.hostPlatform.isDarwin; + broken = clangStdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 9afe4ac9182d..29ee03b9df04 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -18,6 +18,7 @@ let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA="; release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4="; + release."1.18.2".sha256 = "sha256-usOYukHQ/h4YBxlhYrAkMTVjNm97hq4IArI9bvDzy/k="; release."1.18.1".sha256 = "sha256-rrIv/mVC0Ez3nU7fpnzwduIC3tI6l73DjgAbv1gd2v0="; release."1.17.0".sha256 = "sha256-J8FJBeaB+2HtHjrkgNzOZJngZ2AcYU+npL9Y1HNPnzo="; release."1.15.2".sha256 = "sha256-+sQYQiN3n+dlzXzi5opOjhkJZqpkNwlHZcUjaUM6+xQ="; diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix index 808530221781..aaae9c534eb7 100644 --- a/pkgs/development/python-modules/avwx-engine/default.nix +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "avwx-engine"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "avwx-rest"; repo = "avwx-engine"; rev = "refs/tags/${version}"; - hash = "sha256-CUnUz2SsXtWaqGzaB1PH+EoHqebSue6e8GXhRZRcXLs="; + hash = "sha256-gDhZlrxiIyj15nxMBFFzuCAHtkDfqYowDZc5g4pQ+i8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index aeb964964dbc..90dde389144e 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -1,31 +1,34 @@ { lib, + torch, + symlinkJoin, buildPythonPackage, fetchFromGitHub, - python, - pythonOlder, + cmake, setuptools, - wheel, - torch, scipy, - symlinkJoin, }: let pname = "bitsandbytes"; - version = "0.43.3"; + version = "0.44.1"; - inherit (torch) cudaCapabilities cudaPackages cudaSupport; - inherit (cudaPackages) backendStdenv cudaVersion; + inherit (torch) cudaPackages cudaSupport; + inherit (cudaPackages) cudaVersion; + + cudaVersionString = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor cudaVersion); # NOTE: torchvision doesn't use cudnn; torch does! # For this reason it is not included. cuda-common-redist = with cudaPackages; [ - cuda_cccl # - libcublas # cublas_v2.h + (lib.getDev cuda_cccl) # + (lib.getDev libcublas) # cublas_v2.h + (lib.getLib libcublas) libcurand libcusolver # cusolverDn.h - libcusparse # cusparse.h + (lib.getDev libcusparse) # cusparse.h + (lib.getLib libcusparse) # cusparse.h + (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h ]; cuda-native-redist = symlinkJoin { @@ -33,7 +36,9 @@ let paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h cuda_runtime_api.h + (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h + (lib.getLib cuda_cudart) + (lib.getStatic cuda_cudart) cuda_nvcc ] ++ cuda-common-redist; @@ -48,47 +53,55 @@ buildPythonPackage { inherit pname version; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "TimDettmers"; repo = "bitsandbytes"; rev = "refs/tags/${version}"; - hash = "sha256-JOB+WCrLFjjeJJHbsOei8+D5CMuFmyVLnoKRd05tYDU="; + hash = "sha256-yvxD5ymMK5p4Xg7Csx/90mPV3yxUC6QUuF/8BKO2p0k="; }; - postPatch = - '' - substituteInPlace Makefile --replace "/usr/bin/g++" "g++" --replace "lib64" "lib" - substituteInPlace bitsandbytes/cuda_setup/main.py \ - --replace "binary_path = package_dir / self.binary_name" \ - "binary_path = Path('$out/${python.sitePackages}/${pname}')/self.binary_name" - '' - + lib.optionalString torch.cudaSupport '' - substituteInPlace bitsandbytes/cuda_setup/main.py \ - --replace "/usr/local/cuda/lib64" "${cuda-native-redist}/lib" - ''; - - CUDA_HOME = "${cuda-native-redist}"; - - preBuild = - if torch.cudaSupport then - with torch.cudaPackages; - let - cudaVersion = lib.concatStrings (lib.splitVersion torch.cudaPackages.cudaMajorMinorVersion); - in - ''make CUDA_VERSION=${cudaVersion} cuda${cudaMajorVersion}x'' - else - ''make CUDA_VERSION=CPU cpuonly''; + # By default, which library is loaded depends on the result of `torch.cuda.is_available()`. + # When `cudaSupport` is enabled, bypass this check and load the cuda library unconditionnally. + # Indeed, in this case, only `libbitsandbytes_cuda124.so` is built. `libbitsandbytes_cpu.so` is not. + # Also, hardcode the path to the previously built library instead of relying on + # `get_cuda_bnb_library_path(cuda_specs)` which relies on `torch.cuda` too. + # + # WARNING: The cuda library is currently named `libbitsandbytes_cudaxxy` for cuda version `xx.y`. + # This upstream convention could change at some point and thus break the following patch. + postPatch = lib.optionalString cudaSupport '' + substituteInPlace bitsandbytes/cextension.py \ + --replace-fail "if cuda_specs:" "if True:" \ + --replace-fail \ + "cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \ + "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaVersionString}.so'" + ''; nativeBuildInputs = [ + cmake + cudaPackages.cuda_nvcc + ]; + + build-system = [ setuptools - wheel - ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ]; + ]; - buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ]; + buildInputs = lib.optionals cudaSupport [ cuda-redist ]; - propagatedBuildInputs = [ + cmakeFlags = [ + (lib.cmakeFeature "COMPUTE_BACKEND" (if cudaSupport then "cuda" else "cpu")) + ]; + CUDA_HOME = "${cuda-native-redist}"; + NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [ + "-I${cuda-native-redist}/include" + "-L${cuda-native-redist}/lib" + ]; + + preBuild = '' + make -j $NIX_BUILD_CORES + cd .. # leave /build/source/build + ''; + + dependencies = [ scipy torch ]; @@ -97,11 +110,11 @@ buildPythonPackage { pythonImportsCheck = [ "bitsandbytes" ]; - meta = with lib; { + meta = { description = "8-bit CUDA functions for PyTorch"; homepage = "https://github.com/TimDettmers/bitsandbytes"; changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 4598356713e6..5f66528967e0 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-7c0P+UTdjyOPdj0AM38TysNdbegT6N1iKKg6Kdgu8jI="; + hash = "sha256-HHoUQ6LfrlUnZNvvbPbQbNW6WLabGa88RsC9M8hlARI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index c0442598e3f8..aa57d59ee42f 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { version = "1.8.8"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dbt-labs"; @@ -47,6 +47,7 @@ buildPythonPackage rec { "protobuf" "agate" "click" + "dbt-common" "dbt-semantic-interfaces" "logbook" "mashumaro" diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix index 782aab2360d4..c53243e48f00 100644 --- a/pkgs/development/python-modules/imagehash/default.nix +++ b/pkgs/development/python-modules/imagehash/default.nix @@ -2,41 +2,52 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, numpy, - six, - scipy, pillow, + pytestCheckHook, + pythonOlder, pywavelets, + scipy, + setuptools, + six, }: buildPythonPackage rec { pname = "imagehash"; - version = "4.3.1"; - format = "setuptools"; + version = "4.3.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "JohannesBuchner"; repo = "imagehash"; - rev = "v${version}"; - hash = "sha256-Tsq10TZqnzNTuO4goKjdylN4Eqy7DNbHLjr5n3+nidM="; + rev = "refs/tags/v${version}"; + hash = "sha256-/kYINT26ROlB3fIcyyR79nHKg9FsJRQsXQx0Bvl14ec="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy - six scipy pillow pywavelets ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + six + ]; + + pythonImportsCheck = [ "imagehash" ]; meta = with lib; { description = "Python Perceptual Image Hashing Module"; - mainProgram = "find_similar_images.py"; homepage = "https://github.com/JohannesBuchner/imagehash"; + changelog = "https://github.com/JohannesBuchner/imagehash/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ e1mo ]; + mainProgram = "find_similar_images.py"; }; } diff --git a/pkgs/development/python-modules/leaone-ble/default.nix b/pkgs/development/python-modules/leaone-ble/default.nix new file mode 100644 index 000000000000..5df616e5f8d6 --- /dev/null +++ b/pkgs/development/python-modules/leaone-ble/default.nix @@ -0,0 +1,52 @@ +{ + lib, + bluetooth-data-tools, + bluetooth-sensor-state-data, + buildPythonPackage, + fetchFromGitHub, + home-assistant-bluetooth, + poetry-core, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + sensor-state-data, +}: + +buildPythonPackage rec { + pname = "leaone-ble"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "bluetooth-devices"; + repo = "leaone-ble"; + rev = "refs/tags/v${version}"; + hash = "sha256-usFjI0zU89dEAbmx9mVemoxlYS8mmLTKIMhH26Rvkeg="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "leaone_ble" ]; + + meta = { + description = "Bluetooth parser for LeaOne devices"; + homepage = "https://github.com/bluetooth-devices/leaone-ble"; + changelog = "https://github.com/bluetooth-devices/leaone-ble/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix index ec823cf5fbf4..1543ce87a885 100644 --- a/pkgs/development/python-modules/lifelines/default.nix +++ b/pkgs/development/python-modules/lifelines/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "lifelines"; - version = "0.29.0"; + version = "0.30.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "CamDavidsonPilon"; repo = "lifelines"; rev = "refs/tags/v${version}"; - hash = "sha256-9ZmecbFjUnWGNf4P3yphiMqG+/ktOYyvMtoZ6sEp1xY="; + hash = "sha256-rbt0eON8Az5jDvj97RDn3ppWyjbrSa/xumbwhq21g6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index d7cf61de83b7..91b5772901db 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-Af15Xs8K/QSeIxQNgi1n8xZ+SyyzNs5JL3wse0+LoyE="; + hash = "sha256-MO/YMvvpsEarc8CjELByHUqR5xFtYqhkKkJrFy0PNvU="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/melnor-bluetooth/default.nix b/pkgs/development/python-modules/melnor-bluetooth/default.nix new file mode 100644 index 000000000000..649433f99795 --- /dev/null +++ b/pkgs/development/python-modules/melnor-bluetooth/default.nix @@ -0,0 +1,64 @@ +{ + lib, + aioconsole, + bleak-retry-connector, + bleak, + buildPythonPackage, + deprecated, + fetchFromGitHub, + freezegun, + poetry-core, + poetry-dynamic-versioning, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + syrupy, + tzdata, + tzlocal, +}: + +buildPythonPackage rec { + pname = "melnor-bluetooth"; + version = "0.0.25"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "vanstinator"; + repo = "melnor-bluetooth"; + rev = "refs/tags/v${version}"; + hash = "sha256-BQKXQrPT/+qm9cRO7pfScPwW0iwdhliTfX4XJ/kRQG0="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + aioconsole + bleak + bleak-retry-connector + deprecated + tzdata + tzlocal + ]; + + nativeCheckInputs = [ + freezegun + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ "melnor_bluetooth" ]; + + meta = { + description = "Module to interact with Melnor and Eden bluetooth watering timers"; + homepage = "https://github.com/vanstinator/melnor-bluetooth"; + changelog = "https://github.com/vanstinator/melnor-bluetooth/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/py-improv-ble-client/default.nix b/pkgs/development/python-modules/py-improv-ble-client/default.nix new file mode 100644 index 000000000000..7f983cf534c5 --- /dev/null +++ b/pkgs/development/python-modules/py-improv-ble-client/default.nix @@ -0,0 +1,50 @@ +{ + lib, + bleak-retry-connector, + bleak, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "py-improv-ble-client"; + version = "1.0.4"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "py-improv-ble-client"; + rev = "refs/tags/${version}"; + hash = "sha256-leYSDB5/jFqlvX78OYzlFkkVxIkJ7iOUoLHBuVj7tAo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=65.6" "setuptools" \ + --replace-fail "wheel~=0.37.1" "wheel" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + bleak + bleak-retry-connector + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "improv_ble_client" ]; + + meta = { + description = "Module to provision devices which implement Improv via BLE"; + homepage = "https://github.com/home-assistant-libs/py-improv-ble-client"; + changelog = "https://github.com/home-assistant-libs/py-improv-ble-client/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix new file mode 100644 index 000000000000..6fabf92f5f84 --- /dev/null +++ b/pkgs/development/python-modules/pydeako/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + mock, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + zeroconf, +}: + +buildPythonPackage rec { + pname = "pydeako"; + version = "0.5.4"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "DeakoLights"; + repo = "pydeako"; + rev = "refs/tags/${version}"; + hash = "sha256-Z0H5VhWfjmvvCGTX//hds9dwk2wJSPXckNac1PkQZNA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ zeroconf ]; + + # Module has no tests + #doCheck = false; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pydeako" ]; + + meta = { + description = "Module used to discover and communicate with Deako devices over the network locally"; + homepage = "https://github.com/DeakoLights/pydeako"; + changelog = "https://github.com/DeakoLights/pydeako/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 1cc1d8f5d180..7cec1417bfc8 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.30"; + version = "3.3.32"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zSeDeGD/78bIoKm6B8BN4qWQE1ivNgyvnrGtgsekM3M="; + hash = "sha256-OYRcgX30O0/F+0H4x2jbPyVNh6xVeBSdfqbtuqUgoNE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytorch3d/default.nix b/pkgs/development/python-modules/pytorch3d/default.nix new file mode 100644 index 000000000000..2a92a51ec8bf --- /dev/null +++ b/pkgs/development/python-modules/pytorch3d/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + torch, + iopath, + cudaPackages, + config, + cudaSupport ? config.cudaSupport, +}: + +assert cudaSupport -> torch.cudaSupport; + +buildPythonPackage rec { + pname = "pytorch3d"; + version = "0.7.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "pytorch3d"; + rev = "V${version}"; + hash = "sha256-DEEWWfjwjuXGc0WQInDTmtnWSIDUifyByxdg7hpdHlo="; + }; + + nativeBuildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + build-system = [ + setuptools + wheel + ]; + dependencies = [ + torch + iopath + ]; + buildInputs = [ (lib.getOutput "cxxdev" torch) ]; + + env = + { + FORCE_CUDA = cudaSupport; + } + // lib.optionalAttrs cudaSupport { + TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}"; + }; + + pythonImportsCheck = [ "pytorch3d" ]; + + passthru.tests.rotations-cuda = + cudaPackages.writeGpuTestPython { libraries = ps: [ ps.pytorch3d ]; } + '' + import pytorch3d.transforms as p3dt + + M = p3dt.random_rotations(n=10, device="cuda") + assert "cuda" in M.device.type + angles = p3dt.matrix_to_euler_angles(M, "XYZ") + assert "cuda" in angles.device.type + assert angles.shape == (10, 3), angles.shape + print(angles) + ''; + + meta = { + description = "FAIR's library of reusable components for deep learning with 3D data"; + homepage = "https://github.com/facebookresearch/pytorch3d"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + pbsds + SomeoneSerge + ]; + }; +} diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix index 74be2546c623..334261463c62 100644 --- a/pkgs/development/python-modules/ydata-profiling/default.nix +++ b/pkgs/development/python-modules/ydata-profiling/default.nix @@ -1,54 +1,59 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, dacite -, htmlmin -, imagehash -, jinja2 -, matplotlib -, multimethod -, numba -, numpy -, pandas -, phik -, pyarrow -, pydantic -, pyyaml -, requests -, scipy -, seaborn -, statsmodels -, tqdm -, typeguard -, visions -, wordcloud +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + dacite, + htmlmin, + imagehash, + jinja2, + matplotlib, + multimethod, + numba, + numpy, + pandas, + phik, + pyarrow, + pydantic, + pyyaml, + requests, + scipy, + setuptools, + seaborn, + statsmodels, + tqdm, + typeguard, + visions, + wordcloud, }: buildPythonPackage rec { pname = "ydata-profiling"; - version = "4.11.0"; + version = "4.12.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ydataai"; - repo = pname; + repo = "ydata-profiling"; rev = "refs/tags/v${version}"; - hash = "sha256-3bgFPPGgLCcJfYr9vmwnHFwz3/zybRI8Aiu5VoOPsNA="; + hash = "sha256-G1qW6HcJi176nfxOBGBK2tLyY/Nnz9STYpZWluWvhP0="; }; preBuild = '' echo ${version} > VERSION ''; + build-system = [ setuptools ]; + pythonRelaxDeps = [ + "imagehash" "scipy" ]; - propagatedBuildInputs = [ + dependencies = [ dacite htmlmin imagehash @@ -72,9 +77,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook pyarrow + pytestCheckHook ]; + disabledTestPaths = [ # needs Spark: "tests/backends/spark_backend" @@ -84,6 +90,7 @@ buildPythonPackage rec { "tests/unit/test_dataset_schema.py" "tests/unit/test_modular.py" ]; + disabledTests = [ # try to download data: "test_decorator" @@ -92,9 +99,7 @@ buildPythonPackage rec { "test_urls" ]; - pythonImportsCheck = [ - "ydata_profiling" - ]; + pythonImportsCheck = [ "ydata_profiling" ]; meta = with lib; { description = "Create HTML profiling reports from Pandas DataFrames"; diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 6248c08360df..cb8d4f2eafac 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.19.1"; + version = "0.19.6"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-uUsNYQPW2MtXxohdenXbNWfikp8TW0chJ5SDYU8ayV4="; + hash = "sha256-zcAV+6GdytdUsVxJCNIhfeVGjWFZ2/mgmwpIXTFLEhk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-2Tuhya70R++Nv5KEd+4vjxiTTansraSXQtGm/FqRktk="; + vendorHash = "sha256-vQjsKQ49ksea5GZXEd7XjGkN0IoW2HQekyQL5fmwCTc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 4584650436c2..06a4c36a7d9f 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.20.2"; + version = "2.21.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-/emP4U2s7/hYJZCJ+TdE5sM45q0C8OrrIFreSupq3ig="; + sha256 = "sha256-9WvBdcl65WTwzFKTPYTg6ufhIBuqx+T99ng7UePSNHU="; }; - vendorHash = "sha256-6HlCj2Wq+lH6OQxG18fCMj1eC2Xy++IQx35nCAtHQ/U="; + vendorHash = "sha256-tjHBnkFlkP7n0/c9bz/nUzWerPzVQ+12cKijG1Jzti8="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix index 3a66444f345c..a191bc3dd7fc 100644 --- a/pkgs/development/tools/relic/default.nix +++ b/pkgs/development/tools/relic/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "relic"; - version = "8.0.1"; + version = "8.1.0"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w7KU3XntkKep0mcuOUBSG4fJW14yCamioeRH5YrULSo="; + sha256 = "sha256-jBE23kGrU/q53ZTVoQ9xmeL+rVuSneObbCRqEa/zvpI="; }; - vendorHash = "sha256-/P4W+smY01feV1HP5Tsx0PsoOyp//ik7RVWuEaiSepY="; + vendorHash = "sha256-x0EqKotZJny+7FtRvdXWUkPpG0jntFGe/IpNzKVL2pI="; ldflags = [ "-s" diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index b85112f75538..92127031c8a5 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.48"; + version = "1.0.50"; src = fetchCrate { inherit pname version; - hash = "sha256-BrWJKM7Vkvjlkn3PCBe45epQc2SkjKVlttQF0/AHSls="; + hash = "sha256-kU2SmD51enAyRzzpPJunMKloKS1m7zwEqk2kMX94s7U="; }; - cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No="; + cargoHash = "sha256-tWMiAb50znyZS77Qcp5dUjPr7qnODjiEFunIyDOde8s="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index cae7901386d1..0e2f6a0639fe 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "cifs-utils"; - version = "7.0"; + version = "7.1"; src = fetchurl { url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; - sha256 = "sha256-De+quFvT6kb/xFq0H7DQrVTQWuLPqn5QPehtTxK8gWE="; + sha256 = "sha256-ohEj92pKajbJZTGJukkY6988/NP5CScwpH/zRQtbWyo="; }; nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 1be7debb895c..b87fe51434f3 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "iputils"; - version = "20240117"; + version = "20240905"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-sERY8ZKuXiY85cXdNWOm4byiNU7mOVIeA55dgQJHdoE="; + hash = "sha256-2CjzIOe1hrW3He9DN+w+Wi2zaaMBkVEdA7dezTpkx8I="; }; outputs = [ "out" "apparmor" ]; diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index 7d9cd9bde024..b42b31c5a214 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - version = "1.0.13"; - sha256 = "162hhmnww8z9k0795ffs8v3f61hlfm375law156sk5l08if19a4r"; + version = "1.0.16"; + hash = "sha256-jsBLy5WDl2l8o/2ccIk1XMqOukeDX5eZ+VH5Dyo5BaA="; in stdenv.mkDerivation { name = "system76-module-${version}-${kernel.version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "pop-os"; repo = "system76-dkms"; rev = version; - inherit sha256; + inherit hash; }; hardeningDisable = [ "pic" ]; @@ -29,11 +29,10 @@ stdenv.mkDerivation { mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d ''; - meta = with lib; { - maintainers = [ maintainers.khumba ]; - license = [ licenses.gpl2Plus ]; + meta = { + maintainers = [ lib.maintainers.khumba ]; + license = [ lib.licenses.gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = versionOlder kernel.version "4.14"; description = "System76 DKMS driver"; homepage = "https://github.com/pop-os/system76-dkms"; longDescription = '' diff --git a/pkgs/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix index d950f5cac15d..885ebca73abb 100644 --- a/pkgs/os-specific/linux/zfs/2_1.nix +++ b/pkgs/os-specific/linux/zfs/2_1.nix @@ -22,9 +22,9 @@ callPackage ./generic.nix args { hash = "sha256-zFO8fMbirEOrn5W57rAN7IWY6EIXG8jDXqhP7BWJyiY="; - tests = [ - nixosTests.zfs.series_2_1 - ]; + tests = { + inherit (nixosTests.zfs) series_2_1; + }; maintainers = [ lib.maintainers.raitobezarius ]; } diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix index befb83b20569..9d8be86258d5 100644 --- a/pkgs/os-specific/linux/zfs/2_2.nix +++ b/pkgs/os-specific/linux/zfs/2_2.nix @@ -19,10 +19,9 @@ callPackage ./generic.nix args { # this package should point to the latest release. version = "2.2.6"; - tests = [ - nixosTests.zfs.installer - nixosTests.zfs.series_2_2 - ]; + tests = { + inherit (nixosTests.zfs) installer series_2_2; + }; maintainers = with lib.maintainers; [ adamcstephens amarshall ]; diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 3fb46077d886..4893c3e32152 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -23,9 +23,9 @@ callPackage ./generic.nix args { version = "2.2.6"; # rev = ""; - tests = [ - nixosTests.zfs.unstable - ]; + tests = { + inherit (nixosTests.zfs) unstable; + }; hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0="; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c6a244127429..1a6dba594ece 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -754,8 +754,9 @@ ]; "deako" = ps: with ps; [ ifaddr + pydeako zeroconf - ]; # missing inputs: pydeako + ]; "debugpy" = ps: with ps; [ debugpy ]; @@ -1940,12 +1941,13 @@ home-assistant-intents ifaddr mutagen + py-improv-ble-client pymicro-vad pyserial pyspeex-noise pyudev zeroconf - ]; # missing inputs: py-improv-ble-client + ]; "incomfort" = ps: with ps; [ incomfort-client ]; @@ -2332,13 +2334,14 @@ hassil home-assistant-intents ifaddr + leaone-ble mutagen pymicro-vad pyserial pyspeex-noise pyudev zeroconf - ]; # missing inputs: leaone-ble + ]; "led_ble" = ps: with ps; [ aioesphomeapi aioruuvigateway @@ -2597,13 +2600,14 @@ hassil home-assistant-intents ifaddr + melnor-bluetooth mutagen pymicro-vad pyserial pyspeex-noise pyudev zeroconf - ]; # missing inputs: melnor-bluetooth + ]; "meraki" = ps: with ps; [ ]; "mercury_nz" = ps: with ps; [ @@ -5126,6 +5130,7 @@ "datadog" "date" "datetime" + "deako" "debugpy" "deconz" "default_config" @@ -5342,6 +5347,7 @@ "image_upload" "imap" "imgw_pib" + "improv_ble" "incomfort" "influxdb" "inkbird" @@ -5396,6 +5402,7 @@ "lawn_mower" "lcn" "ld2410_ble" + "leaone" "led_ble" "lektrico" "lg_netcast" @@ -5443,6 +5450,7 @@ "media_player" "media_source" "melcloud" + "melnor" "meraki" "met" "met_eireann" diff --git a/pkgs/tools/audio/alsaequal/caps_9.x.patch b/pkgs/tools/audio/alsaequal/caps_9.x.patch deleted file mode 100644 index 282e04049747..000000000000 --- a/pkgs/tools/audio/alsaequal/caps_9.x.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ./ctl_equal.c -+++ ./ctl_equal.c -@@ -167,7 +167,7 @@ - snd_ctl_equal_t *equal; - const char *controls = ".alsaequal.bin"; - const char *library = "/usr/lib/ladspa/caps.so"; -- const char *module = "Eq"; -+ const char *module = "Eq10"; - long channels = 2; - const char *sufix = " Playback Volume"; - int err, i, index; ---- ./pcm_equal.c -+++ ./pcm_equal.c -@@ -151,7 +151,7 @@ - snd_config_t *sconf = NULL; - const char *controls = ".alsaequal.bin"; - const char *library = "/usr/lib/ladspa/caps.so"; -- const char *module = "Eq"; -+ const char *module = "Eq10"; - long channels = 2; - int err; diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix index 73b95f9fe7cc..d35facd6c3d9 100644 --- a/pkgs/tools/audio/alsaequal/default.nix +++ b/pkgs/tools/audio/alsaequal/default.nix @@ -1,17 +1,23 @@ -{ lib, stdenv, fetchurl -, alsa-lib, caps +{ lib, stdenv, fetchFromGitHub +, alsa-lib, caps, + ladspaH }: stdenv.mkDerivation rec { pname = "alsaequal"; - version = "0.6"; + version = "0.7.1"; - src = fetchurl { - url = "https://thedigitalmachine.net/tools/alsaequal-${version}.tar.bz2"; - sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli"; + src = fetchFromGitHub { + owner = "bassdr"; + repo = "alsaequal"; + rev = "refs/tags/v${version}"; + hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g="; }; - buildInputs = [ alsa-lib ]; + buildInputs = [ + alsa-lib + ladspaH + ]; makeFlags = [ "DESTDIR=$(out)" ]; @@ -20,10 +26,6 @@ stdenv.mkDerivation rec { # Adds executable permissions to resulting libraries # and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy. ./makefile.patch - # Fixes control port check, which resulted in false error. - ./false_error.patch - # Fixes name change of an "Eq" to "Eq10" method in version 9 of caps library. - ./caps_9.x.patch ]; postPatch = '' @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Real-time adjustable equalizer plugin for ALSA"; - homepage = "https://thedigitalmachine.net/alsaequal.html"; + homepage = "https://github.com/bassdr/alsaequal"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ymeister ]; }; diff --git a/pkgs/tools/audio/alsaequal/false_error.patch b/pkgs/tools/audio/alsaequal/false_error.patch deleted file mode 100644 index 1a8413da2741..000000000000 --- a/pkgs/tools/audio/alsaequal/false_error.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./ctl_equal.c -+++ ./ctl_equal.c -@@ -263,8 +263,8 @@ - for(i = 0; i < equal->num_input_controls; i++) { - if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) { - index = equal->control_data->control[i].index; -- if(equal->klass->PortDescriptors[index] != -- (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) { -+ if(equal->klass->PortDescriptors[index] & -+ (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL) == 0) { - SNDERR("Problem with control file %s, %d.", controls, index); - return -1; - } diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/tools/audio/alsaequal/makefile.patch index ee8aa170d60b..2dc46a4c8d2b 100644 --- a/pkgs/tools/audio/alsaequal/makefile.patch +++ b/pkgs/tools/audio/alsaequal/makefile.patch @@ -4,10 +4,12 @@ install: all @echo Installing... -- $(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/ -- $(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/ -+ $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/ -+ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/ +- $(Q)mkdir -p ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/ +- $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/ +- $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/ ++ $(Q)mkdir -p ${DESTDIR}/$(LIBDIR)/alsa-lib/ ++ $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/ ++ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/ uninstall: @echo Un-installing... diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 35d59d11feeb..2adbb0a73932 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-1fYJ0G75sbg97HiN6HNWwlG82jqENqVTC/sXgH+oXWA="; + hash = "sha256-1I0YcnHGxblfSWlx5bbR4v3UXxKPnYQ90AKnUny2vDg="; }; - cargoHash = "sha256-COZmd5sqaewK0La78/1J9bGJdsPNyeT18wV2qr/b6cM="; + cargoHash = "sha256-vZHFZL3dwFVyLfifpUq4uaqaUac7Itimf2pJGZ4qWMM="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index f8e181e9fa21..2ece72b66bf1 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation { description = "Utility for sharing a Nix store as a binary cache"; maintainers = [ maintainers.eelco ]; license = licenses.lgpl21; + # See https://github.com/edolstra/nix-serve/issues/57 + broken = stdenv.isDarwin; platforms = nix.meta.platforms; mainProgram = "nix-serve"; }; diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index b81010bda27d..6c672837b1ad 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-avak2cc8KDmlTrQutzULuvkWxSgdv3rMI7+G3+jNcdI="; + hash = "sha256-Vq0w3JldUVUh4soULyWQI9D2yknkx529n4aAwhpdfdU="; }; vendorHash = "sha256-N8aJmxNQ/p2ddJG9DuIVVjcgzEC6TzD0sz992h3q0RU="; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3b7e2d78b65..9062826f5ca3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7016,6 +7016,8 @@ self: super: with self; { leanblueprint = callPackage ../development/python-modules/leanblueprint { }; + leaone-ble = callPackage ../development/python-modules/leaone-ble { }; + leb128 = callPackage ../development/python-modules/leb128 { }; led-ble = callPackage ../development/python-modules/led-ble { }; @@ -7847,6 +7849,8 @@ self: super: with self; { meld3 = callPackage ../development/python-modules/meld3 { }; + melnor-bluetooth = callPackage ../development/python-modules/melnor-bluetooth { }; + memestra = callPackage ../development/python-modules/memestra { }; memory-allocator = callPackage ../development/python-modules/memory-allocator { }; @@ -9207,6 +9211,8 @@ self: super: with self; { py-expression-eval = callPackage ../development/python-modules/py-expression-eval { }; + py-improv-ble-client = callPackage ../development/python-modules/py-improv-ble-client { }; + py-machineid = callPackage ../development/python-modules/py-machineid { }; py-ocsf-models = callPackage ../development/python-modules/py-ocsf-models { }; @@ -10512,6 +10518,8 @@ self: super: with self; { pytomorrowio = callPackage ../development/python-modules/pytomorrowio { }; + pytorch3d = callPackage ../development/python-modules/pytorch3d { }; + pytouchlinesl = callPackage ../development/python-modules/pytouchlinesl { }; pyuca = callPackage ../development/python-modules/pyuca { }; @@ -11231,6 +11239,8 @@ self: super: with self; { pydbus = callPackage ../development/python-modules/pydbus { }; + pydeako = callPackage ../development/python-modules/pydeako { }; + pydeck = callPackage ../development/python-modules/pydeck { }; pydeconz = callPackage ../development/python-modules/pydeconz { };