From 4cf7828872f3b6b8045e5a177a619fdb3b575120 Mon Sep 17 00:00:00 2001 From: TakWolf Date: Thu, 6 Jun 2024 15:22:01 +0800 Subject: [PATCH 01/15] maintainers: add TakWolf --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 79b4296693c4..b7d4307ffae8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20271,6 +20271,12 @@ githubId = 870673; name = "Takuo Yonezawa"; }; + TakWolf = { + email = "takwolf@foxmail.com"; + github = "TakWolf"; + githubId = 6064962; + name = "TakWolf"; + }; talkara = { email = "taito.horiuchi@relexsolutions.com"; github = "talkara"; From 94ee620a3f79064e2615a208cc053894c4c1abcc Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:25:30 +0800 Subject: [PATCH 02/15] python311Packages.unidata-blocks: set python 3.10 --- .../python-modules/unidata-blocks/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index 63752e22d462..fc71e13c306b 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, + pytestCheckHook, nix-update-script, - hatch-vcs, hatchling, langcodes, }: @@ -13,8 +12,9 @@ buildPythonPackage rec { pname = "unidata-blocks"; version = "0.0.10"; + pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.10"; src = fetchPypi { pname = "unidata_blocks"; @@ -22,17 +22,16 @@ buildPythonPackage rec { hash = "sha256-wwiOjfIAx6AZtK98uuPQ0jwblq+CdnMQp+JkQWh+RgM="; }; - format = "pyproject"; + build-system = [ hatchling ]; - nativeBuildInputs = [ - hatch-vcs - hatchling + dependencies = [ + langcodes ]; - propagatedBuildInputs = [ langcodes ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "unidata_blocks" ]; + passthru.updateScript = nix-update-script { }; meta = { @@ -40,6 +39,9 @@ buildPythonPackage rec { description = "Library that helps query unicode blocks by Blocks.txt"; platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ h7x4 ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } From 7fc47397703245060db05bd640d62fea8a07c8cc Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:26:18 +0800 Subject: [PATCH 03/15] python311Packages.character-encoding-utils: set python 3.10 --- .../character-encoding-utils/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix index a677d8999e37..83d01916d3c6 100644 --- a/pkgs/development/python-modules/character-encoding-utils/default.nix +++ b/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchPypi, - hatch-vcs, - hatchling, - pytestCheckHook, pythonOlder, + pytestCheckHook, + nix-update-script, + hatchling, }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "0.0.8"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.10"; src = fetchPypi { pname = "character_encoding_utils"; @@ -21,19 +21,22 @@ buildPythonPackage rec { hash = "sha256-UXX4L/x7fP37ZEFDCPc0KRNyx47xvwY0Jz+lfxzUulg="; }; - build-system = [ - hatch-vcs - hatchling - ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "character_encoding_utils" ]; + passthru.updateScript = nix-update-script { }; + meta = { - description = "Some character encoding utils"; homepage = "https://github.com/TakWolf/character-encoding-utils"; + description = "Some character encoding utils"; + platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ h7x4 ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } From 759d6dcd3ea6801b1e3db758aece4b9a10582250 Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:26:45 +0800 Subject: [PATCH 04/15] python311Packages.bdffont: set python 3.10 --- .../python-modules/bdffont/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index 87e4ef29b81b..c4ac42a60452 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -2,42 +2,41 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, + pytestCheckHook, nix-update-script, - hatch-vcs, hatchling, - brotli, - fonttools, }: buildPythonPackage rec { pname = "bdffont"; version = "0.0.26"; + pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.10"; src = fetchPypi { - inherit pname version; + pname = "bdffont"; + inherit version; hash = "sha256-Q8IqwJmAYFicTX7RrVU9UvGZX+oaPb0RKlIFwArktXk="; }; - format = "pyproject"; - - nativeBuildInputs = [ - hatch-vcs - hatchling - ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bdffont" ]; + passthru.updateScript = nix-update-script { }; meta = { homepage = "https://github.com/TakWolf/bdffont"; - description = "Library for manipulating .bdf format fonts"; + description = "A library for manipulating Glyph Bitmap Distribution Format (BDF) Fonts"; platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ h7x4 ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } From e617f54ca2979c3f62571c7bcd4dc586bbcf3d68 Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:27:32 +0800 Subject: [PATCH 05/15] python311Packages.pcffont: use fetchPypi --- .../python-modules/pcffont/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix index 30c0c05cae0e..0f5a49c0692f 100644 --- a/pkgs/development/python-modules/pcffont/default.nix +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, - fetchFromGitHub, - hatchling, - bdffont, + fetchPypi, + pythonOlder, pytestCheckHook, nix-update-script, + hatchling, + bdffont, }: buildPythonPackage rec { @@ -13,11 +14,12 @@ buildPythonPackage rec { version = "0.0.14"; pyproject = true; - src = fetchFromGitHub { - owner = "TakWolf"; - repo = "pcffont"; - rev = "refs/tags/${version}"; - hash = "sha256-UIRhUlsRd3ICdLAjUasQ1NX5NofSKCEqa8cf1c1voGM="; + disabled = pythonOlder "3.10"; + + src = fetchPypi { + pname = "pcffont"; + inherit version; + hash = "sha256-S3mK4tY7zNGRX8K81QJVvaYpIaTDLx5zn4vKbhrK9VM="; }; build-system = [ hatchling ]; @@ -31,9 +33,13 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { }; meta = { - description = "Library for manipulating Portable Compiled Format (PCF) fonts"; homepage = "https://github.com/TakWolf/pcffont"; + description = "A library for manipulating Portable Compiled Format (PCF) Fonts"; + platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } From 689caa9b0d1b23899d20ced7f5462b1610d01d3c Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:28:27 +0800 Subject: [PATCH 06/15] python311Packages.pixel-font-builder: cleanup --- .../pixel-font-builder/default.nix | 40 ++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index 7033179d7370..e30f7c93d32e 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -2,17 +2,15 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, + pytestCheckHook, nix-update-script, - hatch-vcs, hatchling, - bdffont, - brotli, fonttools, - pypng, + brotli, + bdffont, pcffont, - pythonRelaxDepsHook, + pypng, }: buildPythonPackage rec { @@ -28,26 +26,19 @@ buildPythonPackage rec { hash = "sha256-66mGZ7q64z+tTJSSveD7UCkTq7YXgsHTM25MqUSLfvM="; }; - pythonRelaxDeps = [ "fonttools" ]; + build-system = [ hatchling ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - build-system = [ - hatch-vcs - hatchling - ]; - - nativeCheckInputs = [ - pytestCheckHook + dependencies = [ + fonttools + brotli + bdffont + pcffont pypng ]; - dependencies = [ - bdffont - brotli - fonttools - pcffont - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pixel_font_builder" ]; passthru.updateScript = nix-update-script { }; @@ -56,6 +47,9 @@ buildPythonPackage rec { description = "Library that helps create pixel style fonts"; platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ h7x4 ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } From 25e3c526c5ab98516016871af704c18bdcc0c927 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Mon, 10 Jun 2024 18:28:17 +0200 Subject: [PATCH 07/15] haproxy: 2.9.7 -> 3.0.2 --- pkgs/tools/networking/haproxy/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 225c4b1c8cd9..4cef8e04ea2d 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -14,7 +14,6 @@ , openssl , lua5_4 , pcre2 -, systemd }: assert lib.assertOneOf "sslLibrary" sslLibrary [ "quictls" "openssl" "libressl" "wolfssl" ]; @@ -29,17 +28,16 @@ let sslPkg = sslPkgs.${sslLibrary}; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.9.7"; + version = "3.0.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-0aClbwCKjS8Ae8DDffaylSUg0fTd4zuNOAJxDlFYwTE="; + hash = "sha256-lnLuQ7EJ8ZNWw11yaHsiLc+CuHk2DG6CZ3OXN2z13DY="; }; buildInputs = [ sslPkg zlib libxcrypt ] ++ lib.optional useLua lua5_4 - ++ lib.optional usePcre pcre2 - ++ lib.optional stdenv.isLinux systemd; + ++ lib.optional usePcre pcre2; # TODO: make it work on bsd as well makeFlags = [ From 763062c7265f585d136f81fb16fc46c6123fc7e2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 18 Jun 2024 13:11:41 +0200 Subject: [PATCH 08/15] python311Packages.pygame-gui: 0611 -> 0612 --- pkgs/development/python-modules/pygame-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index e370c36bb4d7..5906a6f9a9cb 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "0611"; + version = "0612"; pyproject = true; # nixpkgs-update: no auto update @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - hash = "sha256-bibw6RUQKsOsaISunVEdQCT39KnXJ2VKVrAqsPS+Lu8="; + hash = "sha256-6Ps3pmQ8tYwQyv0TliOvUNLy3GjSJ2jdDQTTxfYej0o="; }; nativeBuildInputs = [ setuptools ]; From d44ea8e29bed9762424baa6c21d404cb65f01a8f Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 20 Jun 2024 18:04:56 +0200 Subject: [PATCH 09/15] python311Packages.{pyside,shiboken}6: 6.7.0 -> 6.7.2 https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-6.7.2?h=v6.7.2 https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-6.7.1?h=v6.7.1 --- .../python-modules/pyside6/default.nix | 21 ++--- .../python-modules/pyside6/qt-6.7.1.patch | 87 ------------------- .../python-modules/shiboken6/default.nix | 48 +++------- 3 files changed, 20 insertions(+), 136 deletions(-) delete mode 100644 pkgs/development/python-modules/pyside6/qt-6.7.1.patch diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 0144c91bd3e9..79c691980ffb 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -8,18 +8,12 @@ shiboken6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pyside6"; inherit (shiboken6) version src; - patches = [ - # stripped down version of https://github.com/pyside/pyside-setup/commit/a0d68856d67ce6e178e3cfc2fccc236707e02fcd - # FIXME: remove in next release - ./qt-6.7.1.patch - ]; - - sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6"; # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. @@ -80,18 +74,19 @@ stdenv.mkDerivation rec { cp -r PySide6.egg-info $out/${python.sitePackages}/ ''; - meta = with lib; { + meta = { description = "Python bindings for Qt"; - license = with licenses; [ + license = with lib.licenses; [ lgpl3Only gpl2Only gpl3Only ]; homepage = "https://wiki.qt.io/Qt_for_Python"; - maintainers = with maintainers; [ + changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ gebner Enzime ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/python-modules/pyside6/qt-6.7.1.patch b/pkgs/development/python-modules/pyside6/qt-6.7.1.patch deleted file mode 100644 index 8a5ece82d9ce..000000000000 --- a/pkgs/development/python-modules/pyside6/qt-6.7.1.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/PySide6/QtMultimedia/CMakeLists.txt -+++ b/PySide6/QtMultimedia/CMakeLists.txt -@@ -12,6 +12,7 @@ ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qaudiosink_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qaudiosource_wrapper.cpp -+${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qcameradevice_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp -@@ -28,7 +29,6 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp --${QtMultimedia_GEN_DIR}/qtaudio_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp -diff --git a/PySide6/QtMultimedia/typesystem_multimedia.xml b/PySide6/QtMultimedia/typesystem_multimedia.xml -index dd58f41cc..d37eb15fd 100644 ---- a/PySide6/QtMultimedia/typesystem_multimedia.xml -+++ b/PySide6/QtMultimedia/typesystem_multimedia.xml -@@ -9,7 +9,7 @@ - - - -- -+ - - - -@@ -65,9 +65,6 @@ - - - -- -- -- - - - -@@ -82,9 +79,6 @@ - - - -- -- -- - - - -diff --git a/PySide6/glue/qtmultimedia.cpp b/PySide6/glue/qtmultimedia.cpp -index d193b1bd3..ac8434b97 100644 ---- a/PySide6/glue/qtmultimedia.cpp -+++ b/PySide6/glue/qtmultimedia.cpp -@@ -2,6 +2,7 @@ - // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - - // @snippet qvideoframe-bits -+#include "object.h" - %BEGIN_ALLOW_THREADS - %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1); - %END_ALLOW_THREADS -@@ -23,5 +24,5 @@ const auto size = %CPPSELF.byteCount(); - - // @snippet qtaudio-namespace-compatibility-alias - Py_INCREF(pyType); --PyModule_AddObject(module, "QAudio", reinterpret_cast(pyType)); -+PyModule_AddObject(module, "QtAudio", reinterpret_cast(pyType)); - // @snippet qtaudio-namespace-compatibility-alias -diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp -index 625e4a405..557f130e0 100644 ---- a/libpyside/signalmanager.cpp -+++ b/libpyside/signalmanager.cpp -@@ -813,11 +813,6 @@ static PyObject *parseArguments(const QMetaMethod &method, void **args) - for (qsizetype i = 0; i < argsSize; ++i) { - void *data = args[i+1]; - auto param = paramTypes.at(i); --#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) -- // Qt 6.7 renamed namespace "QAudio"->"QtAudio" except for signals -- if (param.startsWith("QAudio::"_ba)) -- param.insert(1, 't'); --#endif - Shiboken::Conversions::SpecificConverter converter(param.constData()); - if (!converter) { - PyErr_SetString(PyExc_TypeError, msgCannotConvertParameter(method, i).constData()); - diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index 5bf11c0a14a5..39c61bc8cc3b 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -1,7 +1,6 @@ { lib, fetchurl, - fetchpatch, llvmPackages, python, cmake, @@ -12,28 +11,19 @@ let stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv; in -stdenv'.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { pname = "shiboken6"; - version = "6.7.0"; + version = "6.7.2"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ - url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; - hash = "sha256-gurjcHN99ez1OcFl0J18gdX8YVOlQbjT03sRJ1+ePo8="; + url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz"; + hash = "sha256-OisNDW54yapd3H8GyktvEaP+FFYLrrFI7qU7XZjjaMc="; }; - sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6"; - patches = [ - ./fix-include-qt-headers.patch - # Remove this patch when updating to 6.8.0 - (fetchpatch { - name = "backwards-compatibility-with-6.6.x.patch"; - url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=4f9a20e3635f4f0957e0774588b1d9156e88a572"; - hash = "sha256-B2jhLWopgaSF/rUXMZFPZArDUNojlBgn7kdVyQull+I="; - stripLen = 2; - }) - ]; + patches = [ ./fix-include-qt-headers.patch ]; nativeBuildInputs = [ cmake @@ -57,21 +47,6 @@ stdenv'.mkDerivation rec { substituteInPlace cmake/ShibokenHelpers.cmake --replace-fail '#!/bin/bash' '#!''${BASH}' ''; - # Due to Shiboken.abi3.so being linked to libshiboken6.abi3.so.6.6 in the build tree, - # we need to remove the build tree reference from the RPATH and then add the correct - # directory to the RPATH. On Linux, the second part is handled by autoPatchelfHook. - # https://bugreports.qt.io/browse/PYSIDE-2233 - preFixup = - '' - echo "fixing RPATH of Shiboken.abi3.so" - '' - + lib.optionalString stdenv.isDarwin '' - install_name_tool -change {@rpath,$out/lib}/libshiboken6.abi3.6.6.dylib $out/${python.sitePackages}/shiboken6/Shiboken.abi3.so - '' - + lib.optionalString stdenv.isLinux '' - patchelf $out/${python.sitePackages}/shiboken6/Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} - ''; - postInstall = '' cd ../../.. ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6 @@ -80,18 +55,19 @@ stdenv'.mkDerivation rec { dontWrapQtApps = true; - meta = with lib; { + meta = { description = "Generator for the pyside6 Qt bindings"; - license = with licenses; [ + license = with lib.licenses; [ lgpl3Only gpl2Only gpl3Only ]; homepage = "https://wiki.qt.io/Qt_for_Python"; - maintainers = with maintainers; [ + changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ gebner Enzime ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From 54dfcae99bb8e57ae46c43e81607315e8228bd04 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 22 Jun 2024 11:56:55 -0500 Subject: [PATCH 10/15] python3Packages.amaranth-boards: fix fetchFromGitHub hash stability PR to fix: https://github.com/amaranth-lang/amaranth-boards/pull/246 --- pkgs/development/python-modules/amaranth-boards/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 3e9548bfe5b6..a010d3570b7c 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -19,7 +19,9 @@ buildPythonPackage rec { owner = "amaranth-lang"; repo = "amaranth-boards"; rev = "aba2300dc83216523e1c98fdb22471cb4bac5027"; - hash = "sha256-IMhNMkOf6dg4Djyi39TDTpU0S3TQM1+e6TBoyiITaos="; + # these files change depending on git branch status + postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; + hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8="; }; nativeBuildInputs = [ From 7abf750927b688cb834a53eb52ffe72a1cf71c0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jun 2024 13:29:20 +0000 Subject: [PATCH 11/15] pocketbase: 0.22.13 -> 0.22.14 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index c61b65c33d1a..00e1f8cc38a4 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.13"; + version = "0.22.14"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-eps1sLtE/yBLyq1iTzOWu+RqFAjAg4EXWV7QZnr2KjQ="; + hash = "sha256-d2gqw3IJBkU2sfBf5J0E45VzFtuSox4cHpPucsl/o4s="; }; - vendorHash = "sha256-hxI/0ask3iQW0Ox+HuJ6Oi1jiHF/0NZ+L7cLJijqyyQ="; + vendorHash = "sha256-G5VD5Joq/p1rur0SmK1xNQxtNZh7ZqR5I4j8fgswoDo="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 69074b67a36d30a8eef6e76343246441c2c13730 Mon Sep 17 00:00:00 2001 From: Rayne Date: Sun, 23 Jun 2024 17:03:45 +1000 Subject: [PATCH 12/15] e16: fix e_gen_menu script for NixOS --- pkgs/applications/window-managers/e16/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index d47b63dda4d0..7a2aa724d353 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -16,6 +16,7 @@ , libsndfile , pango , perl +, python3 , gitUpdater }: @@ -47,10 +48,13 @@ stdenv.mkDerivation rec { libsndfile pango perl + python3 ]; postPatch = '' substituteInPlace scripts/e_gen_menu --replace "/usr/local:" "/run/current-system/sw:/usr/local:" + substituteInPlace scripts/e_gen_menu --replace "'/opt'" "'/opt', '/run/current-system/sw'" + substituteInPlace scripts/e_gen_menu --replace "'/.local'" "'/.nix-profile', '/.local'" ''; passthru.updateScript = gitUpdater { From b6815f85706b731569a8651232e75897a3168686 Mon Sep 17 00:00:00 2001 From: Gavin John <> Date: Mon, 24 Jun 2024 06:36:27 -0500 Subject: [PATCH 13/15] monado: Use cmake flag instead of patch --- pkgs/applications/graphics/monado/default.nix | 6 +----- .../graphics/monado/force-enable-steamvr_lh.patch | 12 ------------ 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index fa386c9744f6..95889ffff4d5 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation { "-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON" "-DXRT_HAVE_TRACY=ON" "-DXRT_FEATURE_TRACING=ON" + "-DXRT_HAVE_STEAM=ON" ]; buildInputs = [ @@ -142,11 +143,6 @@ stdenv.mkDerivation { export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} ''; - patches = [ - # We don't have $HOME/.steam when building - ./force-enable-steamvr_lh.patch - ]; - passthru.tests = { basic-service = nixosTests.monado; }; diff --git a/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch b/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch deleted file mode 100644 index eac92675ebd9..000000000000 --- a/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4308d73d..0081d536 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -219,6 +219,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON) - if(EXISTS "$ENV{HOME}/.steam/root") - set(XRT_HAVE_STEAM YES) - endif() -+set(XRT_HAVE_STEAM YES) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(XRT_HAVE_INTERNAL_HID ON) From d213fa697f0af06f504e1ebd37a7bca78bc0e868 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Jun 2024 12:40:30 +0200 Subject: [PATCH 14/15] pkgsMusl.crosvm: fix build Fixes: 74cbe399ba22 ("crosvm: 124.0 -> 125.0") --- pkgs/applications/virtualization/crosvm/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 40d940a6904d..9ba769dfd7ed 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchgit +{ lib, rustPlatform, fetchgit, fetchpatch , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: @@ -14,6 +14,15 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/128e591037c0be0362ed814d0b5583aa65ff09e1%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-p5VzHRb0l0vCJNe48cRl/uBYHwTQMEykMcBOMzL3yaY="; + }) + ]; + separateDebugInfo = true; cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE="; From 36e8d8a53b253019a3b325015be47196c278afb7 Mon Sep 17 00:00:00 2001 From: Mango The Fourth <40720523+MangoIV@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:53:31 +0200 Subject: [PATCH 15/15] vimPlugins.nvim-treesitter: fix update.py and update documentation (#321535) * vimPlugins.nvim-treesitter: fix update.py and update documentation --- doc/languages-frameworks/vim.section.md | 2 +- pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 69031ccbd340..ea10d5045583 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -214,7 +214,7 @@ Note: this is not possible anymore for Neovim. Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). -After running the updater, if nvim-treesitter received an update, also run [`nvim-treesitter/update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`. +When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`. Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 4b70d8555dd2..8ed3cbffa1d3 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -94,5 +94,5 @@ def update_grammars(nvim_treesitter_dir: str): if __name__ == "__main__": - generated = update_grammars(sys.args[1]) + generated = update_grammars(sys.argv[1]) open(join(os.path.dirname(__file__), "generated.nix"), "w").write(generated)