From 4df5e8249dce54ea8e2eaafbe78f086bc740852d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Nov 2023 11:28:11 -0800 Subject: [PATCH 01/16] python311Packages.robotframework-pythonlibcore: 4.2.0 -> 4.3.0 Diff: https://github.com/robotframework/PythonLibCore/compare/refs/tags/v4.2.0...v4.3.0 Changelog: https://github.com/robotframework/PythonLibCore/blob/refs/tags/v4.3.0/docs/PythonLibCore-4.3.0.rst --- .../robotframework-pythonlibcore/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 43da9125f1ae7..797bda0d3ea40 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -2,30 +2,37 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytest-mockito , pytestCheckHook , robotframework +, typing-extensions }: buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.2.0"; + version = "4.3.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "robotframework"; repo = "PythonLibCore"; rev = "refs/tags/v${version}"; - hash = "sha256-RJTn1zSVJYgbh93Idr77uHl02u0wpj6p6llSJfQVTQk="; + hash = "sha256-5ayOQyOhCg4nLpAyH/eQ6NYEApix0wsL2nhJzEXKJRo="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytest-mockito pytestCheckHook robotframework + typing-extensions ]; preCheck = '' From ba0dc5b5d3007816cd0f5b9520d8bbb15365fd93 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 3 Dec 2023 19:10:57 +0100 Subject: [PATCH 02/16] python311Packages.example-robot-data: 4.0.8 -> 4.0.9 --- pkgs/development/libraries/example-robot-data/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index d9a107bf6497b..11b6898382263 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "example-robot-data"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "Gepetto"; - repo = finalAttrs.pname; + repo = "example-robot-data"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xeNbx1f9QCAOJrXfkk3jo9XH2/4HNtnRA1OSnqA2cLs="; + hash = "sha256-dLW8QaQhTTDcE4QCP9uV4ykOqwc3nbPUmF1B77r8CHQ="; }; strictDeps = true; From 550b95e22c148071bf155573f9ced0bf96e2d408 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 3 Dec 2023 11:36:13 -0700 Subject: [PATCH 03/16] bup: Fix build on Darwin with LLVM 16 Fallout from #234710. --- pkgs/tools/backup/bup/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 7bea67dc621bd..4b9951f2e2eaf 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { "LIBDIR=$(out)/lib/bup" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=implicit-int"; postInstall = '' wrapProgram $out/bin/bup \ From 0ebea895518328b58d169c27860433d5594f4823 Mon Sep 17 00:00:00 2001 From: Kevin Puetz Date: Thu, 9 Nov 2023 21:15:19 -0600 Subject: [PATCH 04/16] qt6.qtmultimedia: Enable Spatial Audio (Quick3D) This was Tech Preview in Qt 6.4, released in 6.5 --- pkgs/development/libraries/qt-6/modules/qtmultimedia.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 538687dce58a0..d92f7157b80b0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -3,6 +3,7 @@ , stdenv , qtbase , qtdeclarative +, qtquick3d , qtshadertools , qtsvg , pkg-config @@ -25,7 +26,7 @@ qtModule { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libunwind orc ] ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ]; - propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ] + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ] ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; From 91b8e472a5b7661bcc2f930a1abe14881f335a73 Mon Sep 17 00:00:00 2001 From: Kevin Puetz Date: Wed, 8 Nov 2023 00:05:37 -0600 Subject: [PATCH 05/16] qt6.qtmultimedia: Compile ffmpeg multimedia plugin This is now the default recommendation upstream for linux platforms > https://doc.qt.io/qt-6.6/qtmultimedia-index.html#ffmpeg-as-the-default-backend > In this release the FFmpeg framework is set as the default backend on > Windows, macOS, Android, and Linux except Yocto distribution. > The version shipped with Qt binary packages is FFmpeg 6.0 > and is tested by the maintainers. libXrandr is required to compile support QT_WINDOW_CAPTURE_BACKEND=x11 --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ pkgs/development/libraries/qt-6/modules/qtmultimedia.nix | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 15696e802c127..9191a204a7a19 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -53,3 +53,5 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399). +- QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS). + The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform. diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index d92f7157b80b0..20c7f8fcf195a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -13,8 +13,10 @@ , gst-plugins-good , gst-libav , gst-vaapi +, ffmpeg_6 , libpulseaudio , wayland +, libXrandr , elfutils , libunwind , orc @@ -24,8 +26,8 @@ qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libunwind orc ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ]; + buildInputs = [ libunwind orc ffmpeg_6 ] + ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr ]; propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ] ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; From d3de574b8ccc0e98b4490197265f60b03b36c0e9 Mon Sep 17 00:00:00 2001 From: Kevin Puetz Date: Sun, 3 Dec 2023 11:30:42 -0600 Subject: [PATCH 06/16] qt6.qtmultimedia: Compile hardware-accelerated VAAPI --- pkgs/development/libraries/qt-6/modules/qtmultimedia.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 20c7f8fcf195a..2545ee1a740ce 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -14,6 +14,7 @@ , gst-libav , gst-vaapi , ffmpeg_6 +, libva , libpulseaudio , wayland , libXrandr @@ -27,7 +28,7 @@ qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libunwind orc ffmpeg_6 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr ]; + ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ]; propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ] ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; From 7e886531a2b9be8ca3fd43bde8e82cbae9b9e4a0 Mon Sep 17 00:00:00 2001 From: Kevin Puetz Date: Sun, 3 Dec 2023 12:58:38 -0600 Subject: [PATCH 07/16] qt6.qtmultimedia: Fix failure to load libva.so QtMultimedia 6.6.0 would select dynamic VAAPI on linux, then warns during build (even though it chose this on purpose): > QT_FEATURE_vaapi is found but ffmpeg doesn't include vaapi, > however dynamic symbols resolve is possible The nuisance warning was fixed for 6.7 and backported to 6.6.1: https://codereview.qt-project.org/c/qt/qtmultimedia/+/517333 However, tracing it helped me figure out why vaapi actually wasn't working: nix doesn't end up with an rpath such that dlopen("va") can actually find libva.so in the nix store, thus failing at runtime: > qt.multimedia.plugin: loading backend "ffmpeg" > qt.core.library: "/nix/store/i9fkjks6dfjj1p9qvj5633sxbrf5rbd8-qtmultimedia-6.6.1/lib/qt-6/plugins/multimedia/libffmpegmediaplugin.so" loaded library > qt.multimedia.ffmpeg.libsymbolsresolver: Start VAAPI symbols resolving: 39 symbols > qt.core.library: "va" cannot load: Cannot load library va: (va: cannot open shared object file: No such file or directory) > qt.multimedia.ffmpeg.libsymbolsresolver: Couldn't load VAAPI library --- pkgs/development/libraries/qt-6/modules/qtmultimedia.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 2545ee1a740ce..f77fdac059ce6 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -33,6 +33,8 @@ qtModule { ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + cmakeFlags = [ "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-include AudioToolbox/AudioToolbox.h"; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin From 0108269b3882c72e60fa4d24b4ab3d586b8ef8e0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 2 Dec 2023 08:48:41 +0900 Subject: [PATCH 08/16] python311Packages.html2image: init at 2.0.4.3 --- .../python-modules/html2image/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/html2image/default.nix diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix new file mode 100644 index 0000000000000..2b99f6bffeee6 --- /dev/null +++ b/pkgs/development/python-modules/html2image/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, requests +, websocket-client +}: + +buildPythonPackage rec { + pname = "html2image"; + version = "2.0.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "vgalin"; + repo = "html2image"; + rev = version; + hash = "sha256-BDl2Kibp1WOAOYNlXa2aaEgQTitk+OZu72OgytciZYI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + requests + websocket-client + ]; + + pythonImportsCheck = [ "html2image" ]; + + meta = with lib; { + description = "A package acting as a wrapper around the headless mode of existing web browsers to generate images from URLs and from HTML+CSS strings or files"; + homepage = "https://github.com/vgalin/html2image"; + changelog = "https://github.com/vgalin/html2image/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b60ba9aafd156..ebf97327f53fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5150,6 +5150,8 @@ self: super: with self; { hstspreload = callPackage ../development/python-modules/hstspreload { }; + html2image = callPackage ../development/python-modules/html2image { }; + html2text = callPackage ../development/python-modules/html2text { }; html5lib = callPackage ../development/python-modules/html5lib { }; From 5f69f0ed2eb1751e24e0cb7f4100bd973dd2db69 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 2 Dec 2023 08:49:11 +0900 Subject: [PATCH 09/16] python311Packages.openai: 0.28.1 -> 1.3.7 openai: cleanup --- .../python-modules/openai/default.nix | 74 +++++++++---------- pkgs/top-level/all-packages.nix | 4 - 2 files changed, 33 insertions(+), 45 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 89a02ae69f154..3c13e035bf025 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -1,30 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, aiohttp -, matplotlib +, pythonOlder +, hatchling +# propagated +, httpx +, pydantic +, typing-extensions +, anyio +, distro +, sniffio +, tqdm +# optional , numpy -, openpyxl , pandas , pandas-stubs -, plotly +# tests +, pytestCheckHook , pytest-asyncio , pytest-mock -, pytestCheckHook -, pythonOlder -, requests -, scikit-learn -, tenacity -, tqdm -, typing-extensions -, wandb -, withOptionalDependencies ? false +, respx +, dirty-equals }: buildPythonPackage rec { pname = "openai"; - version = "0.28.1"; - format = "setuptools"; + version = "1.3.7"; + pyproject = true; disabled = pythonOlder "3.7.1"; @@ -32,35 +34,30 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-liJyeGxnYIC/jUQKdeATHpVJb/12KGbeM94Y2YQphfY="; + hash = "sha256-Pa53s3U5vby1Fq14WMCJnSR6KA3xkVHmBexkNoX/0sk="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ - aiohttp - requests + httpx + pydantic + anyio + distro + sniffio tqdm ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ] ++ lib.optionals withOptionalDependencies (builtins.attrValues { - inherit (passthru.optional-dependencies) embeddings wandb; - }); + ]; passthru.optional-dependencies = { datalib = [ numpy - openpyxl pandas pandas-stubs ]; - embeddings = [ - matplotlib - plotly - scikit-learn - tenacity - ] ++ passthru.optional-dependencies.datalib; - wandb = [ - wandb - ] ++ passthru.optional-dependencies.datalib; }; pythonImportsCheck = [ @@ -71,21 +68,16 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-mock - ]; - - pytestFlagsArray = [ - "openai/tests" + respx + dirty-equals ]; OPENAI_API_KEY = "sk-foo"; disabledTestPaths = [ - # Requires a real API key - "openai/tests/test_endpoints.py" - "openai/tests/asyncio/test_endpoints.py" - # openai: command not found - "openai/tests/test_file_cli.py" - "openai/tests/test_long_examples_validator.py" + # makes network requests + "tests/test_client.py" + "tests/api_resources" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a35ec0b9d1b3c..0ed33bbeef961 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19711,10 +19711,6 @@ with pkgs; openai = with python3Packages; toPythonApplication openai; - openai-full = with python3Packages; toPythonApplication (openai.override { - withOptionalDependencies = true; - }); - openai-whisper = with python3.pkgs; toPythonApplication openai-whisper; openai-whisper-cpp = darwin.apple_sdk_11_0.callPackage ../tools/audio/openai-whisper-cpp { From 9e71df9f5ef28c3868430b50c9e532b34a719751 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 2 Dec 2023 08:49:32 +0900 Subject: [PATCH 10/16] python311Packages.litellm: 0.11.1 -> 1.7.11 --- .../python-modules/litellm/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index ef70a50f70d1c..d25adcdf65c09 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -6,9 +6,16 @@ , openai , python-dotenv , tiktoken +, tokenizers +, click +, jinja2 +, certifi +, appdirs +, aiohttp +, httpx }: let - version = "0.11.1"; + version = "1.7.11"; in buildPythonPackage rec { pname = "litellm"; @@ -19,7 +26,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-5Zk1lc7G0dU/AoLE5V+p30wE/gRfYRPsVS3sNgwWzCU="; + hash = "sha256-B2LGaA6A+pU2aDzPS2d5stY+Z8Wxq3BkXB1CLY6vBiY="; }; postPatch = '' @@ -31,10 +38,16 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - importlib-metadata openai python-dotenv tiktoken + importlib-metadata + tokenizers + click + jinja2 + certifi + appdirs + aiohttp ]; # the import check phase fails trying to do a network request to openai From 34deb05e5599997d5685387e4f44376915f1e561 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 4 Dec 2023 08:53:09 +1000 Subject: [PATCH 11/16] nixos/buildbot: fix worker package --- .../services/continuous-integration/buildbot/worker.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index b906788209b19..2a836c24dda36 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -128,9 +128,7 @@ in { ''; }; - package = mkPackageOption pkgs "python3Packages.buildbot-worker" { - example = "python2Packages.buildbot-worker"; - }; + package = mkPackageOption pkgs "buildbot-worker" { }; packages = mkOption { default = with pkgs; [ git ]; From e270b7beff7c137a8aa0d34867e960febd2a346c Mon Sep 17 00:00:00 2001 From: wh0 Date: Sun, 3 Dec 2023 19:56:50 -0800 Subject: [PATCH 12/16] php: use a versioned url for install-pear-nozlib.phar --- pkgs/development/interpreters/php/install-pear-nozlib-phar.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix b/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix index d359a7ed82aeb..9de0ec4418628 100644 --- a/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix +++ b/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix @@ -3,6 +3,6 @@ }: fetchurl { - url = "https://pear.php.net/install-pear-nozlib.phar"; + url = "https://github.com/pear/pearweb_phars/raw/v1.10.21/install-pear-nozlib.phar"; hash = "sha256-UblKVcsm030tNSA6mdeab+h7ZhANNz7MkFf4Z1iigjs="; } From 3f916c8d59ab7d8e4c9b9cc107f4711064a7b3cf Mon Sep 17 00:00:00 2001 From: erebfaer Date: Sun, 3 Dec 2023 20:07:16 +1100 Subject: [PATCH 13/16] starsector: added missing build input --- pkgs/games/starsector/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index e1bc4a8dbbcfe..2d70022049e1b 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -1,6 +1,7 @@ { lib , fetchzip , libXxf86vm +, libGL , makeWrapper , openal , openjdk @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; - buildInputs = [ xorg.libXxf86vm openal ]; + buildInputs = [ xorg.libXxf86vm openal libGL ]; dontBuild = true; From 515f0d1b59abaa8194c75544eb0d8859915a3edd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Dec 2023 07:07:37 +0000 Subject: [PATCH 14/16] python310Packages.mkdocstrings: 0.23.0 -> 0.24.0 --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index d8fb50f586b28..cc43fc5ddcb0a 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.23.0"; + version = "0.24.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t7wxm600XgYl1jsqjOpZdWcmqR9qafdKTaz/xDPdDPY="; + hash = "sha256-UqX2jNNYwDNhb71qGdjHNoo2MmSxjf/bZiUoSxlE2XQ="; }; postPatch = '' From 608e8f6e87c385545bf353e069d0e8ea8db00d65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Dec 2023 07:07:40 +0000 Subject: [PATCH 15/16] python310Packages.millheater: 0.11.6 -> 0.11.7 --- pkgs/development/python-modules/millheater/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 7f2fe358c2fe3..33f52d0cea672 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.11.6"; + version = "0.11.7"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-qd9JuZv1utwL523eiQ79P3hXuVQ8+teTatOJCtI6v00="; + hash = "sha256-jqtyJHoG/8tgv4OJleb7DV6C7pCpgplieLykfvO3cNM="; }; propagatedBuildInputs = [ From eefffd003a2c2cac2206e48ea9801bfa5ccee74b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 4 Dec 2023 08:55:25 +0100 Subject: [PATCH 16/16] python310Packages.mkdocstrings: refactor --- .../python-modules/mkdocstrings/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index cc43fc5ddcb0a..219f0e63c7b1f 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -1,35 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub +, importlib-metadata , jinja2 , markdown , markupsafe , mkdocs , mkdocs-autorefs +, pdm-backend , pymdown-extensions , pytestCheckHook -, pdm-backend , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "mkdocstrings"; version = "0.24.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mkdocstrings"; - repo = pname; + repo = "mkdocstrings"; rev = "refs/tags/${version}"; hash = "sha256-UqX2jNNYwDNhb71qGdjHNoo2MmSxjf/bZiUoSxlE2XQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' \ - --replace 'license = "ISC"' 'license = {text = "ISC"}' + --replace 'dynamic = ["version"]' 'version = "${version}"' ''; nativeBuildInputs = [ @@ -43,6 +44,9 @@ buildPythonPackage rec { mkdocs mkdocs-autorefs pymdown-extensions + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + typing-extensions ]; nativeCheckInputs = [