diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9ac5164d4f86..82578c4b1d13 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7439,6 +7439,12 @@ fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; }]; }; + jleightcap = { + email = "jack@leightcap.com"; + github = "jleightcap"; + githubId = 30168080; + name = "Jack Leightcap"; + }; jlesquembre = { email = "jl@lafuente.me"; github = "jlesquembre"; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 28254cbf2ca0..9f80b40d116c 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -13,11 +13,7 @@ let if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs; realGrub = if cfg.zfsSupport then grubPkgs.grub2.override { zfsSupport = true; } - else if cfg.trustedBoot.enable - then if cfg.trustedBoot.isHPLaptop - then grubPkgs.trustedGrub-for-HP - else grubPkgs.trustedGrub - else grubPkgs.grub2; + else grubPkgs.grub2; grub = # Don't include GRUB if we're only generating a GRUB menu (e.g., @@ -674,39 +670,6 @@ in ''; }; - trustedBoot = { - - enable = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Enable trusted boot. GRUB will measure all critical components during - the boot process to offer TCG (TPM) support. - ''; - }; - - systemHasTPM = mkOption { - default = ""; - example = "YES_TPM_is_activated"; - type = types.str; - description = lib.mdDoc '' - Assertion that the target system has an activated TPM. It is a safety - check before allowing the activation of 'trustedBoot.enable'. TrustedBoot - WILL FAIL TO BOOT YOUR SYSTEM if no TPM is available. - ''; - }; - - isHPLaptop = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Use a special version of TrustedGRUB that is needed by some HP laptops - and works only for the HP laptops. - ''; - }; - - }; - }; }; @@ -782,18 +745,6 @@ in assertion = cfg.efiSupport || all (c: c < 2) (mapAttrsToList (n: c: if n == "nodev" then 0 else c) bootDeviceCounters); message = "You cannot have duplicated devices in mirroredBoots"; } - { - assertion = !cfg.efiSupport || !cfg.trustedBoot.enable; - message = "Trusted GRUB does not have EFI support"; - } - { - assertion = !cfg.zfsSupport || !cfg.trustedBoot.enable; - message = "Trusted GRUB does not have ZFS support"; - } - { - assertion = !cfg.trustedBoot.enable || cfg.trustedBoot.systemHasTPM == "YES_TPM_is_activated"; - message = "Trusted GRUB can break the system! Confirm that the system has an activated TPM by setting 'systemHasTPM'."; - } { assertion = cfg.efiInstallAsRemovable -> cfg.efiSupport; message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn on boot.loader.grub.efiSupport"; @@ -841,6 +792,10 @@ in (mkRenamedOptionModule [ "boot" "grubDevice" ] [ "boot" "loader" "grub" "device" ]) (mkRenamedOptionModule [ "boot" "bootMount" ] [ "boot" "loader" "grub" "bootDevice" ]) (mkRenamedOptionModule [ "boot" "grubSplashImage" ] [ "boot" "loader" "grub" "splashImage" ]) + (mkRemovedOptionModule [ "boot" "loader" "grub" "trustedBoot" ] '' + Support for Trusted GRUB has been removed, because the project + has been retired upstream. + '') (mkRemovedOptionModule [ "boot" "loader" "grub" "extraInitrd" ] '' This option has been replaced with the bootloader agnostic boot.initrd.secrets option. To migrate to the initrd secrets system, diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 835ef8a70bc4..95a57a701924 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230508-1"; + version = "20230510"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-0kkbJGZEnB6bL+aNhHpSI2oHpsVmju3OEFG7mitKBsc="; + hash = "sha256-EsFF9fPpHfVmbLm2hRpcJBmwfovfK4CV3LukrG9nP3U="; }; postPatch = '' diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix new file mode 100644 index 000000000000..43bb42ea202e --- /dev/null +++ b/pkgs/applications/office/gnote/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchurl +, desktop-file-utils +, gettext +, gspell +, gtkmm3 +, itstool +, libsecret +, libuuid +, libxml2 +, libxslt +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gnote"; + version = "44.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-3DvXkmj+mdTtVmeawHbMnZqq9ieWE403HPCIFffmSS0="; + }; + + buildInputs = [ + gspell + gtkmm3 + libsecret + libuuid + libxml2 + libxslt + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + itstool + meson + ninja + pkg-config + wrapGAppsHook + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Gnote"; + description = "A note taking application"; + maintainers = with maintainers; [ jfvillablanca ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index f0c116a1bb68..b760acc8c8a6 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-security"; - version = "3.0.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; + hash = "sha256-OLA+/oLCNEzqID/alebQC3rCJ4L6HAtYXNDqLI/z5wI="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 56fdc5ed8211..c0047b69dd41 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lOtdrNXY9IYMGFdqhX4rM228OAZ2bUEBZKP+gcDGfuM="; + hash = "sha256-uPa8iXG++doRMAK83NSnqiqnZSIjdL7zMTkjdRrSjtA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix index 6682ae36a6fe..2065d603fae1 100644 --- a/pkgs/development/python-modules/eternalegypt/default.nix +++ b/pkgs/development/python-modules/eternalegypt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "eternalegypt"; - version = "0.0.15"; + version = "0.0.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-CKiv5gVHaEyO9P5x2FKgpSIm2pUiFptaEQVPZHALASk="; + hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0="; }; propagatedBuildInputs = [ @@ -28,11 +28,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "eternalegypt" ]; + pythonImportsCheck = [ + "eternalegypt" + ]; meta = with lib; { description = "Python API for Netgear LTE modems"; homepage = "https://github.com/amelchio/eternalegypt"; + changelog = "https://github.com/amelchio/eternalegypt/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 30849134cb56..1df4625a6818 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "fx2"; - version = "0.9"; + version = "0.11"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; rev = "v${version}"; - hash = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; + hash = "sha256-uJpXsUMFqJY7mjj1rtfc0XWEfNDxO1xXobgBDGFHnp4="; }; nativeBuildInputs = [ sdcc ]; @@ -23,8 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ libusb1 crcmod ]; preBuild = '' + make -C firmware cd software - ${python.pythonForBuild.interpreter} setup.py build_ext ''; preInstall = '' diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 7d0f5740b734..adb6e2424ff2 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = version; - hash = "sha256-UJfAlSgH3xFqSOjJFon87YWd08nFgi1yYbEsCyMDVlA="; + hash = "sha256-VGPlOHQNtXrfmcne93xDIxN20KDGlTQrjeAKhX/L6K0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 19139af43890..5f5fc791baa4 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.14.2"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8EdAnHrgff+Xf7r/FuyGYZxpzEXusRTyXbNTNgPcHO0="; + hash = "sha256-pyGmzG2oy+1Ip4w+pyjASvVyZDEjDylBZfbxLPFzSoU="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index d66d77fc77e7..3697e6188ed2 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "2.1.4"; + version = "3.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F8NqdEYz38mWSfOQ9oIjQccaGkON8skqm+ItQD71CPo="; + hash = "sha256-Lq8jYLEJKluRfsuRghkp7VPIcrHn3qaJTyid9O8lriA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 881280a1fca8..e2cd47fa47a8 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.3"; + version = "0.14.4"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-XOu17oydXwfyowYUmCKF7/RC0RQ0Uf1Ixmn+VTa85Lo="; + hash = "sha256-3U/PL8cnbNPw3xEM56YZesQEDXTE79yMCSsjdxwfUU0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix new file mode 100644 index 000000000000..174feb8b230d --- /dev/null +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, cmake +, ninja +, qt6 +, python +, shiboken6 +, libxcrypt +}: + +stdenv.mkDerivation rec { + pname = "pyside6"; + + inherit (shiboken6) version src; + + sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + + postPatch = '' + # Don't ignore optional Qt modules + substituteInPlace cmake/PySideHelpers.cmake \ + --replace \ + 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ + 'set (found_basepath 0)' + ''; + + nativeBuildInputs = [ + cmake + ninja + python + ]; + + buildInputs = with qt6; [ + # required + qtbase + # optional + qt3d + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qthttpserver + qtmultimedia + qtnetworkauth + qtquick3d + qtremoteobjects + qtscxml + qtsensors + qtspeech + qtsvg + qttools + qtwebchannel + qtwebengine + qtwebsockets + ] ++ lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]; + + propagatedBuildInputs = [ + shiboken6 + ]; + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + ]; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Python bindings for Qt"; + license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner Enzime ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index 9bc33c575572..f4840bba20d2 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "1.0.9"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Rg5+EOsxRse618WvP4+9ybiu0mJpizrzCmeIbRnFgaA="; + hash = "sha256-0JPniehl4cnoTWgqmq1fMZwU8FFl2Zx4CF81az6iaxQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 46c99543a342..8d3ea92339bf 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.6.3"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-bRO2xO3Q9ruu5KY9SHwdhDU3DoZfW98uYiEFv5P0Fqc="; + hash = "sha256-wMDO0CUCSSCB8cXvTmIEWD8OGMZRZNhmmRx+fZnK288="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix new file mode 100644 index 000000000000..ef59ff5bf2c6 --- /dev/null +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -0,0 +1,75 @@ +{ lib +, fetchurl +, llvmPackages +, python +, qt6 +, cmake +, autoPatchelfHook +, stdenv +, libxcrypt +}: + +llvmPackages.stdenv.mkDerivation rec { + pname = "shiboken6"; + version = "6.5.0"; + + 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"; + sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ="; + }; + + sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + + patches = [ + ./fix-include-qt-headers.patch + ]; + + # Due to Shiboken.abi3.so being linked to libshiboken6.abi3.so.6.5 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 + postBuild = '' + echo "fixing RPATH of Shiboken.abi3.so" + '' + (if stdenv.isDarwin then '' + invalid_rpaths=$(otool -l Shiboken.abi3.so | awk ' + /^[^ ]/ {f = 0} + $2 == "LC_RPATH" && $1 == "cmd" {f = 1} + f && gsub(/^ *path | \(offset [0-9]+\)$/, "") == 2 + ' | grep --invert-match /nix/store) + install_name_tool $(echo $invalid_rpaths | sed 's/^/-delete_rpath /' | tr '\n' ' ' | sed 's/ $//') Shiboken.abi3.so + install_name_tool -add_rpath $out/lib Shiboken.abi3.so + '' else '' + patchelf Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes /nix/store + ''); + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + ]; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + cmake + python + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.libclang + qt6.qtbase + ] ++ (lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]); + + meta = with lib; { + description = "Generator for the pyside6 Qt bindings"; + license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner Enzime ]; + }; +} diff --git a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch new file mode 100644 index 000000000000..4c6d7bdad3fd --- /dev/null +++ b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch @@ -0,0 +1,80 @@ +--- a/ApiExtractor/clangparser/compilersupport.cpp ++++ b/ApiExtractor/clangparser/compilersupport.cpp +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include + +@@ -341,6 +342,13 @@ QByteArrayList emulatedCompilerOptions() + { + QByteArrayList result; + HeaderPaths headerPaths; ++ ++ bool isNixDebug = qgetenv("NIX_DEBUG").toInt() > 0; ++ // examples: ++ // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtsensors-6.4.2-dev/include ++ // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtbase-6.4.2-dev/include ++ QRegularExpression qtHeaderRegex(uR"(/[0-9a-z]{32}-qt[a-z0-9]+-)"_s); ++ + switch (compiler()) { + case Compiler::Msvc: + result.append(QByteArrayLiteral("-fms-compatibility-version=19.26.28806")); +@@ -352,9 +360,30 @@ QByteArrayList emulatedCompilerOptions() + appendClangBuiltinIncludes(&headerPaths); + break; + case Compiler::Clang: +- headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s))); ++ // fix: error: cannot jump from switch statement to this case label: case Compiler::Gpp ++ // note: jump bypasses variable initialization: const HeaderPaths clangPaths = ++ { ++ //headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s))); ++ // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors. ++ // PySide requires that Qt headers are not -isystem ++ // https://bugreports.qt.io/browse/PYSIDE-787 ++ const HeaderPaths clangPaths = gppInternalIncludePaths(compilerFromCMake(u"clang++"_qs)); ++ for (const HeaderPath &h : clangPaths) { ++ auto match = qtHeaderRegex.match(QString::fromUtf8(h.path)); ++ if (!match.hasMatch()) { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found non-qt header: " << h.path; ++ // add using -isystem ++ headerPaths.append(h); ++ } else { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found qt header: " << h.path; ++ headerPaths.append({h.path, HeaderType::Standard}); ++ } ++ } + result.append(noStandardIncludeOption()); + break; ++ } + case Compiler::Gpp: + if (needsClangBuiltinIncludes()) + appendClangBuiltinIncludes(&headerPaths); +@@ -363,8 +392,20 @@ QByteArrayList emulatedCompilerOptions() + // etc (g++ 11.3). + const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_qs)); + for (const HeaderPath &h : gppPaths) { +- if (h.path.contains("c++") || h.path.contains("sysroot")) ++ // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors. ++ // PySide requires that Qt headers are not -isystem ++ // https://bugreports.qt.io/browse/PYSIDE-787 ++ auto match = qtHeaderRegex.match(QString::fromUtf8(h.path)); ++ if (!match.hasMatch()) { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found non-qt header: " << h.path; ++ // add using -isystem + headerPaths.append(h); ++ } else { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found qt header: " << h.path; ++ headerPaths.append({h.path, HeaderType::Standard}); ++ } + } + break; + } +-- +2.39.0 diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 133c9401a293..27356372fce0 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -17,20 +17,20 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "molobrakos"; repo = "volvooncall"; rev = "refs/tags/v${version}"; - hash = "sha256-/BMwDuo4xE/XOLM8qzJwt0A0h0+ihbCVCxT3BBToiVU="; + hash = "sha256-FLrsU3u/0+T09cu2zU2fLjuAy9PWAikgbaW8xBALjwU="; }; patches = [ - # Remove async, https://github.com/molobrakos/volvooncall/pull/92 + # Remove asynctest, https://github.com/molobrakos/volvooncall/pull/92 (fetchpatch { name = "remove-asnyc.patch"; url = "https://github.com/molobrakos/volvooncall/commit/ef0df403250288c00ed4c600e9dfa79dcba8941e.patch"; @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; + changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; license = licenses.unlicense; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 362907a4941c..50e9f240ba1d 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -3,22 +3,24 @@ , fetchFromGitHub , pkg-config , bzip2 +, xz +, zstd , stdenv , rustup }: rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-fpOBSMVBkuFJcog5g5qFO/0GI78GkkwWQC7zocrVJ2w="; + hash = "sha256-uXC+iaOcEIyGMVNtAduhT68GuE29aL/3S6uEMllAWNA="; }; - cargoHash = "sha256-BqbF21OotztNZsol6wlTDzfz0ViybPF5KK/v+F9N5Us="; + cargoHash = "sha256-/TLi+ESOZhJ4Xg3hdUEWhM0K4asI9+L1M1+hWuDOj9Q="; nativeBuildInputs = [ pkg-config @@ -26,8 +28,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 + xz + zstd ]; + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + nativeCheckInputs = lib.optionals stdenv.isDarwin [ rustup ]; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix deleted file mode 100644 index 559eec9bbdd0..000000000000 --- a/pkgs/tools/misc/grub/trusted.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, fetchpatch -, autogen -, flex -, bison -, python2 -, autoconf -, automake -, gettext -, ncurses -, libusb-compat-0_1 -, freetype -, qemu -, lvm2 -, for_HP_laptop ? false -}: - -let - pcSystems = { - i686-linux.target = "i386"; - x86_64-linux.target = "i386"; - }; - - inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems); - - version = if for_HP_laptop then "1.2.1" else "1.2.0"; - - unifont_bdf = fetchurl { - url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; - sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; - }; - - po_src = fetchurl { - name = "grub-2.02-beta2.tar.gz"; - url = "https://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz"; - sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm"; - - }; - -in - -stdenv.mkDerivation rec { - pname = "trustedGRUB2"; - inherit version; - - src = fetchFromGitHub { - owner = "Sirrix-AG"; - repo = "TrustedGRUB2"; - rev = version; - sha256 = - if for_HP_laptop - then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw=" - else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns="; - }; - - nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; - buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] - ++ lib.optional doCheck qemu; - - hardeningDisable = [ "stackprotector" "pic" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; # generated code redefines yyfree - - preConfigure = - '' for i in "tests/util/"*.in - do - sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' - done - - # Apparently, the QEMU executable is no longer called - # `qemu-system-i386', even on i386. - # - # In addition, use `-nodefaults' to avoid errors like: - # - # chardev: opening backend "stdio" failed - # qemu: could not open serial device 'stdio': Invalid argument - # - # See . - sed -i "tests/util/grub-shell.in" \ - -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' - ''; - - prePatch = - '' tar zxf ${po_src} grub-2.02~beta2/po - rm -rf po - mv grub-2.02~beta2/po po - sh autogen.sh - gunzip < "${unifont_bdf}" > "unifont.bdf" - sed -i "configure" \ - -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" - ''; - - patches = [ - ./fix-bash-completion.patch - (fetchpatch { - # glibc-2.26 and above needs '' - url = "https://github.com/Rohde-Schwarz/TrustedGRUB2/commit/7a5b301e3adb8e054288518a325135a1883c1c6c.patch"; - sha256 = "1jfrrmcrd9a8w7n419kszxgbpshx7888wc05smg5q4jvc1ag3xm7"; - }) - ]; - - # save target that grub is compiled for - grubTarget = lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"; - - doCheck = false; - # On -j16 races with early header creation: - # config.h:38:10: fatal error: ./config-util.h: No such file or directory - enableParallelBuilding = false; - - meta = with lib; { - description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; - homepage = "https://github.com/Sirrix-AG/TrustedGRUB2"; - license = licenses.gpl3Plus; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 08622c30e6da..a4d78a15a3af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1657,6 +1657,8 @@ mapAliases ({ trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned"; trilium = throw "trilium has been removed. Please use trilium-desktop instead"; # Added 2020-04-29 truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 + trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 + trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 tvbrowser-bin = tvbrowser; # Added 2023-03-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f89f485593a8..e82b9f3034e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8170,10 +8170,6 @@ with pkgs; grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { }; - trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; - - trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; - grub2 = callPackage ../tools/misc/grub/default.nix { # update breaks grub2 gnulib = pkgs.gnulib.overrideAttrs (_: rec { @@ -20752,6 +20748,8 @@ with pkgs; gnome-menus = callPackage ../development/libraries/gnome-menus { }; + gnote = callPackage ../applications/office/gnote { }; + elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; gtk2 = callPackage ../development/libraries/gtk/2.x.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26b7aee601cb..917df56d5f9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9175,6 +9175,10 @@ self: super: with self; { inherit (pkgs) cmake ninja qt5; }); + pyside6 = toPythonModule (callPackage ../development/python-modules/pyside6 { + inherit (pkgs) cmake ninja qt6; + }); + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; @@ -10953,6 +10957,10 @@ self: super: with self; { inherit (pkgs) cmake llvmPackages qt5; }); + shiboken6 = toPythonModule (callPackage ../development/python-modules/shiboken6 { + inherit (pkgs) cmake llvmPackages qt6; + }); + shippai = callPackage ../development/python-modules/shippai { }; shiv = callPackage ../development/python-modules/shiv { };