diff options
Diffstat (limited to 'pkgs')
25 files changed, 239 insertions, 80 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 5b793b38e172b..44397108f245f 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-51"; + version = "7.1.0-52"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-u2QUtCQ4LzS60iVOOKWx/itmC9uMxPhNvsNANPHrvpE="; + hash = "sha256-GV71O4cHUKJ7+6u4T+vdaFz5q2SpZVDCfEAbfz0s6f4="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index d144db1728681..19e0f2e966116 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -22,6 +22,7 @@ , pkgs , stdenv , fetchpatch +, patchelf # build time , autoconf @@ -101,7 +102,7 @@ # WARNING: NEVER set any of the options below to `true` by default. # Set to `!privacySupport` or `false`. -, crashreporterSupport ? !privacySupport +, crashreporterSupport ? !privacySupport, curl , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , mlsAPISupport ? geolocationSupport @@ -263,7 +264,7 @@ buildStdenv.mkDerivation ({ which wrapGAppsHook ] - ++ lib.optionals crashreporterSupport [ dump_syms ] + ++ lib.optionals crashreporterSupport [ dump_syms patchelf ] ++ lib.optionals pgoSupport [ xvfb-run ] ++ extraNativeBuildInputs; @@ -534,6 +535,10 @@ buildStdenv.mkDerivation ({ } ''; + postFixup = lib.optionalString crashreporterSupport '' + patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter + ''; + doInstallCheck = true; installCheckPhase = '' # Some basic testing diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 15e5f6ddbacfb..92c4474d0bbcf 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -84,13 +84,13 @@ "version": "4.1.0" }, "auth0": { - "hash": "sha256-kyQBl/gdTj1Dlu4/FFowAQbBDTYMjp0JGQ09eBqwHEc=", + "hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=", "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.39.0", - "vendorHash": "sha256-Cusw/qNi+xFblwjvh1xkN28z28TNz3gvTyIRaX/QvH4=", - "version": "0.39.0" + "rev": "v0.40.0", + "vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=", + "version": "0.40.0" }, "avi": { "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", @@ -148,13 +148,13 @@ "version": "1.0.0" }, "baiducloud": { - "hash": "sha256-NKeCPoyeWGWyWScCqCsm4s0U9zCojJ6+OOr+nDdIFqM=", + "hash": "sha256-kG0tE929wtiuSIwT0r6t/odirvZpdnTgcPGFHXmLYYQ=", "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.17.0", + "rev": "v1.17.1", "vendorHash": null, - "version": "1.17.0" + "version": "1.17.1" }, "bigip": { "hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=", @@ -451,24 +451,24 @@ "version": "3.18.0" }, "google": { - "hash": "sha256-MvLzXucKSqyTO9bjbXtBzh3XsOizw0waMGDFhrYtoWM=", + "hash": "sha256-guE04J0RCFOHPXGtEpxGZu8s6fnfoh0WLRRZ5GW/gLk=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.42.1", + "rev": "v4.43.0", "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", - "version": "4.42.1" + "version": "4.43.0" }, "google-beta": { - "hash": "sha256-dtj1LWIXvjInGtbXy5FBdNmQzp+PRKXpnYzsSL/fIaE=", + "hash": "sha256-HB37OQKULhqiMHOE3gs24sjuPsjMessO98z3+5TNNnM=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.42.1", + "rev": "v4.43.0", "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", - "version": "4.42.1" + "version": "4.43.0" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -489,13 +489,13 @@ "version": "1.30.0" }, "gridscale": { - "hash": "sha256-0XKSGfvJ61iD6zZ3Re3tB6Orb2Dklu5tbD8hBGyzlgo=", + "hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=", "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.16.1", + "rev": "v1.16.2", "vendorHash": null, - "version": "1.16.1" + "version": "1.16.2" }, "hcloud": { "hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=", @@ -544,13 +544,13 @@ "version": "1.0.4" }, "http": { - "hash": "sha256-04OMH0+fT4QOV34YdE67avnbC3GoK7xyMGxpILNM7Jk=", + "hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", - "rev": "v3.2.0", - "vendorHash": "sha256-diQ5bYFywVZXziRKiKdIU4grg93vF68bkbMrRpM/vQc=", - "version": "3.2.0" + "rev": "v3.2.1", + "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=", + "version": "3.2.1" }, "huaweicloud": { "hash": "sha256-cr7xV7Z4UU+kRykVSOKeuXDiHQPL4CsCJVXf2uTZOms=", @@ -761,13 +761,13 @@ "version": "1.8.0" }, "mongodbatlas": { - "hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=", + "hash": "sha256-xyKBhIsTawksKruRPXBJ3pEo+ssK7Gol3xCCdNPOes8=", "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.4.6", - "vendorHash": "sha256-OwyzkTgOcn9brsQS1bfOEaXYk9nNLyHsEwli+5PAIPE=", - "version": "1.4.6" + "rev": "v1.5.0", + "vendorHash": "sha256-zaILkt1uuw21r/ZHeSUWcfgPP2gCNRJYfn4DHUtVC2Q=", + "version": "1.5.0" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -1005,13 +1005,13 @@ "version": "0.4.3" }, "scaleway": { - "hash": "sha256-mo8zq/EdT6RrOxBAnWu1rhQpZ26DZcU7I/dMCUIHxBE=", + "hash": "sha256-HQljeUvK010LSWObuZmTkkB6ByrtgBRAeZPYv3d/KSs=", "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.5.0", - "vendorHash": "sha256-CycLXG84Sfi1aciXn2darHIGfE6DpCYOHc7Op/0R26I=", - "version": "2.5.0" + "rev": "v2.6.0", + "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=", + "version": "2.6.0" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1068,13 +1068,13 @@ "version": "0.15.1" }, "snowflake": { - "hash": "sha256-Hoaqj3hksiWm60cSr8OPqAvS29SMVLtwkSWXZvpBePA=", + "hash": "sha256-ED8Sjtimt+9Lg62ZZARtvNNIHePcfLCyxrjQCCpxU9U=", "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.50.0", + "rev": "v0.51.0", "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=", - "version": "0.50.0" + "version": "0.51.0" }, "sops": { "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", @@ -1195,13 +1195,13 @@ "version": "1.9.1" }, "ucloud": { - "hash": "sha256-O/M864JY7nW+PZ53z26QvOAar5DeqBGk+dfzarfUy+g=", + "hash": "sha256-x3+OuRzZdS429v0JNyZkM3v1etUgURSyi9qkt7RhqlI=", "owner": "ucloud", "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.32.4", + "rev": "v1.32.5", "vendorHash": null, - "version": "1.32.4" + "version": "1.32.5" }, "utils": { "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0e76ef4eeafed..fe386cab5ac49 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -74,7 +74,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.3.0"; + version = "4.3.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -83,7 +83,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1ji9351vcvydkcrdwqx22j1nhl9vysd6ajvghaqxdirvqypiygj0"; + sha256 = "0j05hcl5nkvcl74jl8d0inkh6ha9xh299z87br1vr1mblflh087m"; }; postPatch = '' diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index 528fc74394f8f..3b66284e8b0c2 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -10,18 +10,20 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.1.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; rev = "v${version}"; - hash = "sha256-0tHxHek4wqJKLl54zF7wDYN+UPL2y35/YAb6Dtg4k48="; + hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ glm eigen qtbase ]; + cmakeFlags = [ "-DQT_VERSION=6" ]; + doCheck = true; meta = with lib;{ diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index cabb281551d76..1b0f5abdf98ba 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -3,13 +3,15 @@ , fetchFromGitHub , cmake , perl +, wrapGAppsHook , wrapQtAppsHook , qtbase , qtcharts -, qtlocation +, qtpositioning , qtmultimedia -, qtscript , qtserialport +, qttranslations +, qtwayland , qtwebengine , calcmysky , qxlsx @@ -19,28 +21,30 @@ stdenv.mkDerivation rec { pname = "stellarium"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-6EAykJ0yWeU1EBR5+7JjWGUVBE1DKW+W8yJOt0smkaE="; + sha256 = "sha256-ellfBZWOkvlRauuwug96C7P/WjQ6dXiDnT0b3KH5zRM="; }; nativeBuildInputs = [ cmake perl + wrapGAppsHook wrapQtAppsHook ]; buildInputs = [ qtbase qtcharts - qtlocation + qtpositioning qtmultimedia - qtscript qtserialport + qttranslations + qtwayland qtwebengine calcmysky qxlsx @@ -54,6 +58,12 @@ stdenv.mkDerivation rec { 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' ''; + dontWrapGApps = true; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Free open-source planetarium"; homepage = "https://stellarium.org/"; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index fa88b70b47847..f5cf94629e626 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-e3kNr9FMcqznKLFXA8gNTBjaMyXhrWzIxMmX7r6aaWA="; + sha256 = "sha256-mkGyY50WBmVbZ9FEfZRWoGLeZy0HkBzYACbF2u8EN1o="; }; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 497ba195e8977..fef77cb6402d8 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l6QIP/GIm7QMWLjYQJ3yuT7mWriowcND32EUuiNfvNA="; + sha256 = "sha256-Hy2QRGuXSidUrJ7kb1AhkaLeaevhhleGE8QvnNZf/L0="; }; - cargoSha256 = "sha256-t2kxpiSSYzg4MfjCyxkKNfPLTwGB8KgzQonFkLPCpvM="; + cargoSha256 = "sha256-5EJGUi74hrd3vifJ3r2vO0Qq2YEt0stXSi+RAGTme2I="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index cb42276f7d4a3..292a143a67fe7 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.24.1"; + version = "1.25.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uGbaoWJAWbSQ7QkocU7gFZUiWb0GD8mtuO7V0sUXTv0="; + sha256 = "sha256-TWKiSE8mqXz5i4vd32WylTsyxMXXKGmVl3U2q2sMwDQ="; }; postPatch = '' diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 754436cb0b962..5d17df8028d2e 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -17,6 +17,9 @@ , writeText , gstreamer , gst-plugins-base +, gst-plugins-good +, gst-libav +, gst-vaapi , gtk3 , dconf , buildPackages @@ -51,6 +54,7 @@ let inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; patches = [ ./patches/qtbase-qmake-pkg-config.patch + ./patches/qtbase-tzdir.patch ]; }; @@ -66,7 +70,7 @@ let qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; qtlottie = callPackage ./modules/qtlottie.nix { }; qtmultimedia = callPackage ./modules/qtmultimedia.nix { - inherit gstreamer gst-plugins-base; + inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; }; qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; qtpositioning = callPackage ./modules/qtpositioning.nix { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 5e6dace906dcd..bfd33cadf395f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -9,6 +9,9 @@ , alsa-lib , gstreamer , gst-plugins-base +, gst-plugins-good +, gst-libav +, gst-vaapi , libpulseaudio , wayland , elfutils @@ -20,5 +23,6 @@ qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gstreamer gst-plugins-base libpulseaudio elfutils libunwind alsa-lib wayland orc ]; + buildInputs = [ libpulseaudio elfutils libunwind alsa-lib wayland orc ]; + propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]; } diff --git a/pkgs/development/libraries/qt-6/patches/qtbase-tzdir.patch b/pkgs/development/libraries/qt-6/patches/qtbase-tzdir.patch new file mode 100644 index 0000000000000..fc36130c7aad5 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/qtbase-tzdir.patch @@ -0,0 +1,48 @@ +diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp +index 627a4a81..a5f50acc 100644 +--- a/src/corelib/time/qtimezoneprivate_tz.cpp ++++ b/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -51,7 +51,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ // Try TZDIR first, in case we're running on NixOS. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on NixOS. ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -727,18 +731,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return ret; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first, in case we're running on NixOS ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ +- auto check = validatePosixRule(ianaId); +- if (check.isValid) { +- ret.m_hasDst = check.hasDst; +- ret.m_posixRule = ianaId; ++ tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ ++ auto check = validatePosixRule(ianaId); ++ if (check.isValid) { ++ ret.m_hasDst = check.hasDst; ++ ret.m_posixRule = ianaId; ++ } ++ return ret; + } +- return ret; + } + } + } diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix new file mode 100644 index 0000000000000..425d1a67f1363 --- /dev/null +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyspellchecker"; + version = "0.7.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zKbDJCjuOI0Vsbh+lK/Dv5T7GGK6hIo7RJvs1inSatM="; + }; + + # no tests in PyPI + doCheck = false; + + meta = with lib; { + description = "Pure python spell checking"; + homepage = "https://github.com/barrust/pyspellchecker"; + license = licenses.mit; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix index 1aaaff45f1efe..0173f14efd03d 100644 --- a/pkgs/development/python-modules/s3-credentials/default.nix +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -26,22 +26,27 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + boto3 click click-default-group - boto3 ]; checkInputs = [ - pytestCheckHook hypothesis - pytest-mock moto + pytest-mock + pytestCheckHook ]; pythonImportsCheck = [ "s3_credentials" ]; + disabledTests = [ + # AssertionError: assert 'directory/th...ory/... + "test_put_objects" + ]; + meta = with lib; { description = "Python CLI utility for creating credentials for accessing S3 buckets"; homepage = "https://github.com/simonw/s3-credentials"; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 8829a3e1583f5..aed704a161d3c 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.12.1"; + version = "12.13.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6h/TV9Ddv+1pYPV7ZvOfEOOvbocRpLXdeR6EchTvV/A="; + sha256 = "sha256-bGg0UqqplJpsJ2xOHmu6y8ixGxdDkWwZyRrgzrNBlIY="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a918df6e6f9eb..dfcd6a3e2d4d7 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.105"; + version = "0.0.107"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aFBNSEGCutYpjVjAJb1DABv27wfE/qALCFL2r6m/zyQ="; + sha256 = "sha256-Um93keYzoMx0n/znYkvHVTNt4ov+xa2q5pM5XnJwYeY="; }; - cargoSha256 = "sha256-klxpqiT7pf9rHuGPnhAZKEqbuHFIGU7DAbiB6ZptyRI="; + cargoSha256 = "sha256-UxzVpZHS/hKfmAK4Zbejm9iUaALtbBJi4d1OS7vdRg4="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/verible/default.nix b/pkgs/development/tools/verible/default.nix index dc2d015a46f49..d39b91180f98a 100644 --- a/pkgs/development/tools/verible/default.nix +++ b/pkgs/development/tools/verible/default.nix @@ -8,20 +8,23 @@ , python3 }: +let + system = stdenv.hostPlatform.system; +in buildBazelPackage rec { pname = "verible"; - version = "0.0-2172-g238b6df6"; + version = "0.0-2472-ga80124e1"; # These environment variables are read in bazel/build-version.py to create # a build string. Otherwise it would attempt to extract it from .git/. - GIT_DATE = "2022-08-08"; + GIT_DATE = "2022-10-21"; GIT_VERSION = version; src = fetchFromGitHub { owner = "chipsalliance"; repo = "verible"; rev = "v${version}"; - sha256 = "sha256-iOJhdbipuqqBiYGgk95d1c8bEK6Z16l16GuzYCQRc2g="; + sha256 = "sha256:0jpdxqhnawrl80pbc8544pyggdp5s3cbc7byc423d5v0sri2f96v"; }; patches = [ @@ -38,8 +41,14 @@ buildBazelPackage rec { ]; fetchAttrs = { - # Fixed output derivation hash after bazel fetch - sha256 = "sha256-45PINJ7VtL5Jl/nAQNkiSCt8wUwtytNfgeNMZaz3Y9U="; + # Fixed output derivation hash after bazel fetch. + # This varies per platform, probably from the JDK pulled in being part + # of the output derivation ? Is there a more robust way to do this ? + # (Hashes extracted from the ofborg build logs) + sha256 = { + aarch64-linux = "sha256-6Udp7sZKGU8gcy6+5WPhkSWunf1sVkha8l5S1UQsC04="; + x86_64-linux = "sha256-WfhgbJFaM/ipdd1dRjPeVZ1mK2hotb0wLmKjO7e+BO4="; + }.${system} or (throw "No hash for system: ${system}"); }; nativeBuildInputs = [ @@ -63,6 +72,7 @@ buildBazelPackage rec { verilog/tools ''; + bazel = bazel_4; removeRulesCC = false; bazelTarget = ":install-binaries"; bazelTestTargets = [ "//..." ]; @@ -93,6 +103,6 @@ buildBazelPackage rec { description = "Suite of SystemVerilog developer tools. Including a style-linter, indexer, formatter, and language server."; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ hzeller ]; + maintainers = with maintainers; [ hzeller newam ]; }; } diff --git a/pkgs/tools/misc/owofetch/default.nix b/pkgs/tools/misc/owofetch/default.nix index 54b2fa35d696b..4b312f0cea45b 100644 --- a/pkgs/tools/misc/owofetch/default.nix +++ b/pkgs/tools/misc/owofetch/default.nix @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { description = "Alternative to *fetch, uwuifies all stats"; homepage = "https://github.com/netthier/owofetch-rs"; license = licenses.gpl3Only; + platforms = platforms.x86_64; maintainers = with maintainers; [ nullishamy ]; }; } diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 99b5231f82be1..af19108ff2104 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cvx3Lc4FH6RX9UrjX7L3FSt+CcAWieBRTFT1CsLkdFg="; + sha256 = "sha256-+LLAZeK4sV7oEeN3zNqWBkbCLaaGgJMLidZqlTQeymo="; }; vendorSha256 = "sha256-aE/TZ0QlGYvuMVZDntXmYkUKos5NTI/ncRPp9A4CScY="; diff --git a/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch b/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch new file mode 100644 index 0000000000000..8fefb2d6f73a4 --- /dev/null +++ b/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch @@ -0,0 +1,34 @@ +From e8a3a20aed135272a9ec0103f4055411c075f043 Mon Sep 17 00:00:00 2001 +From: Michal Sojka <michal.sojka@cvut.cz> +Date: Mon, 7 Nov 2022 00:07:22 +0100 +Subject: [PATCH] Increase imap_vprintf buffer size + +This fixes "Fatal: buffer too small. Please report a bug." error. See +https://sourceforge.net/p/isync/mailman/isync-devel/thread/87fsevvebj.fsf%40steelpick.2x.cz/#msg37731590 +for related discussion. + +When using mbsync with XOAUTH2 authentication (needed for Office365 +mailboxes), the access token used for the LOGIN command may not fit +into the currently used buffer of 1000 characters. In my case, I need +the buffer to be at least 2000 characters long. To make this more +future-proof, I increase the buffer size to 4000 characters. +--- + src/drv_imap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/drv_imap.c b/src/drv_imap.c +index c5a7aed..7847192 100644 +--- a/src/drv_imap.c ++++ b/src/drv_imap.c +@@ -528,7 +528,7 @@ imap_vprintf( const char *fmt, va_list ap ) + uint totlen = 0; + const char *segs[MAX_SEGS]; + uint segls[MAX_SEGS]; +- char buf[1000]; ++ char buf[4000]; + + d = buf; + ed = d + sizeof(buf); +-- +2.38.1 + diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 8e21ccee10847..7b04e49da702d 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { sha256 = "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw"; }; + patches = [ + # Fixes "Fatal: buffer too small" error + ./0001-Increase-imap_vprintf-buffer-size.patch + ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ openssl db cyrus_sasl zlib ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/tools/video/lux/default.nix index 520ab6b42a2c2..0ef5dcfc5374f 100644 --- a/pkgs/tools/video/lux/default.nix +++ b/pkgs/tools/video/lux/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "lux"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "iawia002"; repo = "lux"; rev = "v${version}"; - sha256 = "sha256-fZR+Q0duITZq3Ynr2WTZAhDnmEkXrT2gXUlpuN0+aFo="; + sha256 = "sha256-kB625R6Qlo9sw0iz8MbaCFOjxpMyH+9ugC6JDn7L7eM="; }; nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "sha256-SHUtyfGRGriEaESo6th7gGQn6V4REdk3XT0ZlGwky7E="; + vendorSha256 = "sha256-2cH5xVz3k9PPjzoMjWch3o8VBfP4nWAvakNwZNQLOeI="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c2590bd2bbce..e8ccc09939c99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4830,7 +4830,9 @@ with pkgs; shab = callPackage ../tools/text/shab { }; - sheldon = callPackage ../tools/misc/sheldon { }; + sheldon = callPackage ../tools/misc/sheldon { + inherit (darwin.apple_sdk.frameworks) Security; + }; shell-hist = callPackage ../tools/misc/shell-hist { }; @@ -21962,7 +21964,7 @@ with pkgs; inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; inherit buildPackages; cmake = cmake.overrideAttrs (attrs: { patches = attrs.patches ++ [ @@ -27565,7 +27567,7 @@ with pkgs; inherit (gnome2) libglade; }; - calcmysky = libsForQt5.callPackage ../applications/science/astronomy/calcmysky { }; + calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { }; calcurse = callPackage ../applications/misc/calcurse { }; @@ -36191,7 +36193,7 @@ with pkgs; sq = callPackage ../development/tools/sq { }; - stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; + stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { }; stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df5aa399ea970..94e7c6781ab90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8612,6 +8612,8 @@ self: super: with self; { pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { }; + pyspellchecker = callPackage ../development/python-modules/pyspellchecker { }; + pyspf = callPackage ../development/python-modules/pyspf { }; pyspice = callPackage ../development/python-modules/pyspice { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 3320ff4ee2042..46417f1d9aaeb 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -30,6 +30,8 @@ in quazip = callPackage ../development/libraries/quazip { }; + qxlsx = callPackage ../development/libraries/qxlsx { }; + poppler = callPackage ../development/libraries/poppler { lcms = pkgs.lcms2; qt6Support = true; |