From 92bb2a1f2e7221f3fa27c2004726b92e13359243 Mon Sep 17 00:00:00 2001 From: Riccardo Casatta Date: Mon, 14 Apr 2025 12:17:25 +0200 Subject: [PATCH 01/17] clightning: 24.11.1 -> 25.02.1 --- pkgs/by-name/cl/clightning/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix index 2484b659a4a8..0cd9776b4cf2 100644 --- a/pkgs/by-name/cl/clightning/package.nix +++ b/pkgs/by-name/cl/clightning/package.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.11.1"; + version = "25.02.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-FdrD+FA0t90oJnXjUA8oalU7DDjUv70fAteNxbhscgk="; + hash = "sha256-0eRLc/bR4sjnNIKzhkX9yVCAoypf1TVhpa884mmVC54="; }; # when building on darwin we need cctools to provide the correct libtool @@ -95,11 +95,6 @@ stdenv.mkDerivation rec { stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 ) "-Wno-error=gnu-folding-constant"; - # The `clnrest` plugin requires a Python environment to run - postInstall = '' - rm -r $out/libexec/c-lightning/plugins/clnrest - ''; - meta = with lib; { description = "Bitcoin Lightning Network implementation in C"; longDescription = '' From bfe0eaf4982e718452904e8aa4b8ef9451dd0c90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Apr 2025 04:26:55 +0000 Subject: [PATCH 02/17] firefox-devedition-unwrapped: 138.0b5 -> 138.0b9 --- .../browsers/firefox/packages/firefox-devedition.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 3467f1f9943e..79b2e0745b44 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = pname; - version = "138.0b5"; + version = "138.0b9"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "07da38a6aa19de812539ba9b286d5189607ef45e7d8665a0f42facdcf7b3f7854561ad3cb54dce7e049199574b7d6dff01dba03763730e49306efb82833270fb"; + sha512 = "cf737b8c394150430cda512a84ebdf04426db0c413863eb37a327c44fc952db7de1be07956aaded3ddb769480fb307a102c1f4f7dab4ba8a38f2371fdd35a961"; }; meta = { From 7189808799bfab8016348324eab46690b95120b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 09:04:37 +0000 Subject: [PATCH 03/17] python312Packages.tenant-schemas-celery: 3.0.0 -> 4.0.0 --- .../python-modules/tenant-schemas-celery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tenant-schemas-celery/default.nix b/pkgs/development/python-modules/tenant-schemas-celery/default.nix index d08e47ef284a..0becc555d2a9 100644 --- a/pkgs/development/python-modules/tenant-schemas-celery/default.nix +++ b/pkgs/development/python-modules/tenant-schemas-celery/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tenant-schemas-celery"; - version = "3.0.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "maciej-gol"; repo = "tenant-schemas-celery"; tag = version; - hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg="; + hash = "sha256-SpjiVbgAXY+WzVpGYt3uislPn9u1buGN4z94Rg5MAwo="; }; build-system = [ setuptools ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Celery application implementation that allows celery tasks to cooperate with multi-tenancy provided by django-tenant-schemas and django-tenants packages"; homepage = "https://github.com/maciej-gol/tenant-schemas-celery"; - changelog = "https://github.com/maciej-gol/tenant-schemas-celery/releases/tag/${version}"; + changelog = "https://github.com/maciej-gol/tenant-schemas-celery/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jopejoe1 ]; }; From b0e1bb8c2dd43f6ae06c062e8b7b5ee13a3304c2 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Mon, 21 Apr 2025 14:35:39 +0200 Subject: [PATCH 04/17] python3Packages.nanobind: 2.6.1 -> 2.7.0 --- pkgs/development/python-modules/nanobind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 9f0710b79aef..b551b797c78e 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -27,14 +27,14 @@ }: buildPythonPackage rec { pname = "nanobind"; - version = "2.6.1"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "wjakob"; repo = "nanobind"; tag = "v${version}"; - hash = "sha256-1CU5aRhiVPGXLVYZzOM8ELgRwa3hz7kQSwlTYsvFE7s="; + hash = "sha256-ex5svqDp9XJtiNCxu0249ORL6LbG679U6PvKQaWANmE="; fetchSubmodules = true; }; From 3c9c8d7c9f3b114846fbdf169c948f69c36f1779 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Sat, 19 Apr 2025 15:39:52 +0200 Subject: [PATCH 05/17] sld3-image: add option to disable stb --- pkgs/by-name/sd/sdl3-image/package.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index cf9a89d5a125..7e3f265631c6 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -9,8 +9,11 @@ cmake, fetchFromGitHub, validatePkgConfig, + libpng, + libjpeg, # Boolean flags enableTests ? true, + enableSTB ? true, enableImageIO ? stdenv.hostPlatform.isDarwin, }: @@ -39,18 +42,26 @@ stdenv.mkDerivation (finalAttrs: { validatePkgConfig ]; - buildInputs = [ - sdl3 - libtiff - libwebp - libavif - ] ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation); + buildInputs = + [ + sdl3 + libtiff + libwebp + libavif + ] + ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation) + ++ (lib.optionals (!enableSTB) [ + libpng + libjpeg + ]); cmakeFlags = [ # fail when a dependency could not be found (lib.cmakeBool "SDLIMAGE_STRICT" true) # disable shared dependencies as they're opened at runtime using SDL_LoadObject otherwise. (lib.cmakeBool "SDLIMAGE_DEPS_SHARED" false) + # disable stbi + (lib.cmakeBool "SDLIMAGE_BACKEND_STB" enableSTB) # enable imageio backend (lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO) # enable tests From 179580b3338cde77585aa4ab041662dd6aa58908 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Sun, 20 Apr 2025 17:21:53 +0200 Subject: [PATCH 06/17] sdl3-image: remove usage of apple_sdk --- pkgs/by-name/sd/sdl3-image/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index 7e3f265631c6..f2b7cfd054c9 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -1,7 +1,6 @@ { lib, sdl3, - darwin, libavif, libtiff, libwebp, @@ -49,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { libwebp libavif ] - ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation) ++ (lib.optionals (!enableSTB) [ libpng libjpeg From 3911159486aa5b00d214232a36c6a2cd24f3b9a2 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Mon, 21 Apr 2025 00:38:37 +0200 Subject: [PATCH 07/17] sdl3-image: remove uses of 'with' --- pkgs/by-name/sd/sdl3-image/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index f2b7cfd054c9..eb50102c9641 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ evythedemon ]; + maintainers = [ lib.maintainers.evythedemon ]; inherit (sdl3.meta) platforms; }; }) From c705d86bbc578c593717c8db14f5227f427e988e Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Mon, 21 Apr 2025 00:54:13 +0200 Subject: [PATCH 08/17] sdl3-image: add updateScript --- pkgs/by-name/sd/sdl3-image/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index eb50102c9641..70754f72b4d0 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -10,6 +10,7 @@ validatePkgConfig, libpng, libjpeg, + nix-update-script, # Boolean flags enableTests ? true, enableSTB ? true, @@ -66,6 +67,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDLIMAGE_TESTS" enableTests) ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(3\\..*)" + ]; + }; + meta = { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; From 9350ab1ed8cddf9f885d2217b5daf615ee0eb61b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 04:40:40 +0000 Subject: [PATCH 09/17] python312Packages.vfblib: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/vfblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix index 4bd46a3f8fba..4a88c543569b 100644 --- a/pkgs/development/python-modules/vfblib/default.nix +++ b/pkgs/development/python-modules/vfblib/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "vfblib"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "LucasFonts"; repo = "vfbLib"; rev = "v${version}"; - hash = "sha256-D37i4dJPWGruwhLVEEPY3mzu0ONM38JTbC3Pt+/35lQ="; + hash = "sha256-kXuaxdGj2dcenZ4SfRBiDjcLzA3Ehb25T7bKk4dXK9g="; }; build-system = [ From 385bbb5d7281e06eefb8c753f38442aef1b4ccc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:49:00 +0000 Subject: [PATCH 10/17] redu: 0.2.12 -> 0.2.13 --- pkgs/by-name/re/redu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redu/package.nix b/pkgs/by-name/re/redu/package.nix index 5da1913d43a9..e81994bb9604 100644 --- a/pkgs/by-name/re/redu/package.nix +++ b/pkgs/by-name/re/redu/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "redu"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "drdo"; repo = "redu"; tag = "v${finalAttrs.version}"; - hash = "sha256-3DcBTpog5tWv2qdmhOlDLHFY77Cug6mCpDQEAtViw74="; + hash = "sha256-iea3tt1WB0/5XPNeCAk38/UoCHVSngXfNmfZQyspmsw="; }; - cargoHash = "sha256-Rp8y2tBnpzBVEoLP4fTMulIJpu1j2TpJNh5M9kjnuEo="; + cargoHash = "sha256-fiMZIFIVeFnBnRBgmdUB8E5A2pM5nrTfUgD1LS6a4LQ="; env.RUSTC_BOOTSTRAP = 1; From 3c40ba828fba15ee08e6a2f34ed928c552077aa4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 23 Apr 2025 11:37:05 +0200 Subject: [PATCH 11/17] wine: fix stable / yabridge builds with binutils 2.44 This patch is included in wine 10.2 onwards, so unstable / staging don't need it. --- pkgs/applications/emulators/wine/sources.nix | 31 ++++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index d5e34fc625a5..38bbca910c7a 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -65,6 +65,23 @@ let source ${./update-lib.sh} ''; + # Needed for wine versions < 10.2 to fix compatibility with binutils 2.44 + # https://github.com/NixOS/nixpkgs/issues/399714 + # https://bugs.winehq.org/show_bug.cgi?id=57819 + # https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 + patches-binutils-2_44-fix-wine-older-than-10_2 = [ + (pkgs.fetchpatch { + name = "ntdll-use-signed-type"; + url = "https://gitlab.winehq.org/wine/wine/-/commit/fd59962827a715d321f91c9bdb43f3e61f9ebbc.patch"; + hash = "sha256-PvFom9NJ32XZO1gYor9Cuk8+eaRFvmG572OAtNx1tks="; + }) + (pkgs.fetchpatch { + name = "winebuild-avoid using-idata-section"; + url = "https://gitlab.winehq.org/wine/wine/-/commit/c9519f68ea04915a60704534ab3afec5ec1b8fd7.patch"; + hash = "sha256-vA58SfAgCXoCT+NB4SRHi85AnI4kj9S2deHGp4L36vI="; + }) + ]; + inherit (pkgs) writeShellScript; in rec { @@ -96,7 +113,7 @@ rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch - ]; + ] ++ patches-binutils-2_44-fix-wine-older-than-10_2; updateScript = writeShellScript "update-wine-stable" ('' ${updateScriptPreamble} @@ -118,7 +135,11 @@ rec { version = "10.5"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; hash = "sha256-wDbsHvR2dHdKX5lFgwIuni62j+j8GLOox55oWzvsibw="; - inherit (stable) patches; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + ]; # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { @@ -177,7 +198,11 @@ rec { version = "9.21"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; hash = "sha256-REK0f/2bLqRXEA427V/U5vTYKdnbeaJeYFF1qYjKL/8="; - inherit (stable) patches; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + ] ++ patches-binutils-2_44-fix-wine-older-than-10_2; # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { From d34a8934bfc587da384d981d442d6c89bb279bb3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 16:46:26 +0200 Subject: [PATCH 12/17] python312Packages.devito: 4.8.14 -> 4.8.15 Diff: https://github.com/devitocodes/devito/compare/refs/tags/v4.8.14...refs/tags/v4.8.15 Changelog: https://github.com/devitocodes/devito/releases/tag/v4.8.15 --- pkgs/development/python-modules/devito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 988e2a5c7c7c..4275f28f8532 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.14"; + version = "4.8.15"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; tag = "v${version}"; - hash = "sha256-NM60H8Fx0pe4JEF7K8A+1i1MbxKhgab5cGcCD8wl9l8="; + hash = "sha256-Eb8ndWtc8TxQGO/7BCa+gU/3SUVPaOvZQBtj7YHT3PA="; }; pythonRemoveDeps = [ "pip" ]; From 224f27a26566db8faef9265bd06e4895e30d33cd Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 22 Apr 2025 20:35:35 +0200 Subject: [PATCH 13/17] furnace: fix deps after SDL2 migration --- pkgs/by-name/fu/furnace/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 286a7e51dc4f..1ca6761b33c2 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -12,6 +12,7 @@ freetype, libsndfile, libX11, + libGL, rtmidi, SDL2, zlib, @@ -63,16 +64,19 @@ stdenv.mkDerivation (finalAttrs: { libsndfile rtmidi SDL2 - libX11 zlib portaudio ] + ++ lib.optionals withGL [ + libGL + ] ++ lib.optionals withJACK [ libjack2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs alsa-lib + libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From 9fc2bfda831466bbc62182f2095f5773eb51342d Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 23 Apr 2025 16:47:04 +0100 Subject: [PATCH 14/17] emacs: disable native compilation on Darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The duplicate `rpath` issue prevents running Emacs on macOS 15.4 and also breaks the build on that platform, blocking the channels. From asking around, it seems like native compilation shouldn’t have such a huge impact on performance as to not make this worth it as a temporary hack to unblock security fixes and give us more time to sort out a proper solution. --- pkgs/applications/editors/emacs/make-emacs.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index b8156c5b3bcc..4f6fbd9a55c5 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -66,7 +66,11 @@ zlib, # Boolean flags - withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + + # FIXME: Native compilation breaks build and runtime on macOS 15.4; + # see . + withNativeCompilation ? + stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin, noGui ? false, srcRepo ? true, withAcl ? false, From cf0af74237630bbcff00f1f881a6288dea8f21c4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 18:19:55 +0200 Subject: [PATCH 15/17] python312Packages.mlcroissant: init at 1.0.17 --- .../python-modules/mlcroissant/default.nix | 97 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 99 insertions(+) create mode 100644 pkgs/development/python-modules/mlcroissant/default.nix diff --git a/pkgs/development/python-modules/mlcroissant/default.nix b/pkgs/development/python-modules/mlcroissant/default.nix new file mode 100644 index 000000000000..7711374c5370 --- /dev/null +++ b/pkgs/development/python-modules/mlcroissant/default.nix @@ -0,0 +1,97 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + absl-py, + etils, + jsonpath-rw, + networkx, + pandas, + pandas-stubs, + python-dateutil, + rdflib, + requests, + scipy, + tqdm, + + # tests + apache-beam, + gitpython, + pillow, + pytestCheckHook, + pyyaml, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "mlcroissant"; + version = "1.0.17"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mlcommons"; + repo = "croissant"; + tag = "v${version}"; + hash = "sha256-jiyr8x+YRSsRwOVxDPaWemPqglTKVb5jg4rRzUXd3BE="; + }; + + sourceRoot = "${src.name}/python/mlcroissant"; + + build-system = [ + setuptools + ]; + + dependencies = [ + absl-py + etils + jsonpath-rw + networkx + pandas + pandas-stubs + python-dateutil + rdflib + requests + scipy + tqdm + ] ++ etils.optional-dependencies.epath; + + pythonImportsCheck = [ "mlcroissant" ]; + + nativeCheckInputs = [ + apache-beam + gitpython + pillow + pytestCheckHook + pyyaml + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # Requires internet access + "test_hermetic_loading_1_1" + "test_load_from_huggingface" + "test_nonhermetic_loading" + "test_nonhermetic_loading_1_0" + + # AssertionError: assert {'records/aud...t32), 22050)'} == {'records/aud...t32), 22050)'} + "test_hermetic_loading" + + # AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs' + "test_beam_hermetic_loading" + ]; + + meta = { + description = "High-level format for machine learning datasets that brings together four rich layers"; + homepage = "https://github.com/mlcommons/croissant"; + changelog = "https://github.com/mlcommons/croissant/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.all; + mainProgram = "mlcroissant"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b158c2b21768..9fa4de0a4e78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8902,6 +8902,8 @@ self: super: with self; { ml-dtypes = callPackage ../development/python-modules/ml-dtypes { }; + mlcroissant = callPackage ../development/python-modules/mlcroissant { }; + mlflow = callPackage ../development/python-modules/mlflow { }; mlrose = callPackage ../development/python-modules/mlrose { }; From fbb2b72e8f46d43b0954b7a975377bcc20a811df Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 23 Apr 2025 18:39:01 +0200 Subject: [PATCH 16/17] nixos-rebuild: fix typo --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index bd314e86a39d..55759722fec5 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -864,14 +864,14 @@ if [ -z "$rollback" ]; then value = import \"$(realpath $buildFile)\"; set = if builtins.isFunction value then value {} else value; in set.${attr:+$attr.}config.system.build.images.$imageVariant.v.passthru.filePath" \ - "${extraBuildFlags[@]}" + "${extraBuildFlags[@]}" \ | jq -r . )" elif [[ -z $flake ]]; then imageName="$( runCmd nix-instantiate --eval --strict --json --expr \ "with import {}; config.system.build.images.$imageVariant.passthru.filePath" \ - "${extraBuildFlags[@]}" + "${extraBuildFlags[@]}" \ | jq -r . )" else From 4880d3ae43d1c813c476ee70766a1132d0a4d3df Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Wed, 23 Apr 2025 18:41:21 +0200 Subject: [PATCH 17/17] gotosocial: 0.18.3 -> 0.19.0 Release notes: https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.19.0 Full changelog: https://github.com/superseriousbusiness/gotosocial/compare/v0.18.3...v0.19.0 --- pkgs/by-name/go/gotosocial/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index 6a6f48c67f6d..639d0718a22b 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.18.3"; + version = "0.19.0"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-60aSiWHHHDxZggreqTVHip2Ld/PyN9T4k+NGjX/ONQc="; + hash = "sha256-Ba497VKK30MWcLlR4CDDUrFZKWf/UXiSgeDr/f7fFkc="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; tag = "v${version}"; - hash = "sha256-fn3QrfTrKYWABRMF3imyoeVEpARl13fcq6Fu2GwsrcE="; + hash = "sha256-ioIsa2L1w4z1b7tWFhHScmPwRRq0WLngIdm4r2eCveM="; }; vendorHash = null;