From c927a4cfed58c0d5bb1bcde4cd7782b2b9e96151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Apr 2023 10:37:42 -0700 Subject: [PATCH 001/189] python310Packages.python-rapidjson: 1.9 -> 1.10 Changelog: https://github.com/python-rapidjson/python-rapidjson/blob/v1.10/CHANGES.rst --- .../python-modules/python-rapidjson/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 9cb3baf0663d..8e1e0c5e6036 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -12,12 +12,12 @@ let rapidjson' = rapidjson.overrideAttrs (old: { - version = "unstable-2022-05-24"; + version = "unstable-2023-03-06"; src = fetchFromGitHub { owner = "Tencent"; repo = "rapidjson"; - rev = "232389d4f1012dddec4ef84861face2d2ba85709"; - hash = "sha256-RLvDcInUa8E8DRA4U/oXEE8+TZ0SDXXDU/oWvpfDWjw="; + rev = "083f359f5c36198accc2b9360ce1e32a333231d9"; + hash = "sha256-8O5KwZcvoEkpE+O0Twn2CKHjV2AYh8qnSaBofoWEBs8="; }; patches = [ (fetchpatch { @@ -30,13 +30,15 @@ let cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ]; }); in buildPythonPackage rec { - version = "1.9"; + version = "1.10"; pname = "python-rapidjson"; disabled = pythonOlder "3.7"; + format = "setuptools"; + src = fetchPypi { inherit pname version; - hash = "sha256-vn01HHES2sYIEzoj9g6VOVZo0JgaB/QDf2Pg6Ir88Bo="; + hash = "sha256-rP7L9e25HscqIKEl3n9WuML2Fh7/TGU4LI7mokhNNUA="; }; setupPyBuildFlags = [ @@ -53,6 +55,7 @@ in buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-rapidjson/python-rapidjson/blob/v${version}/CHANGES.rst"; homepage = "https://github.com/python-rapidjson/python-rapidjson"; description = "Python wrapper around rapidjson"; license = licenses.mit; From d344c8deffd6313b66baaae86c02b8bbd259d1b3 Mon Sep 17 00:00:00 2001 From: Andrew Kvapil Date: Sat, 22 Jul 2023 13:53:45 +0200 Subject: [PATCH 002/189] maintainers: add viluon --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 41da5bc9ae48..b78db0c310d7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17318,6 +17318,12 @@ fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; }]; }; + viluon = { + email = "nix@viluon.me"; + github = "viluon"; + githubId = 7235381; + name = "Ondřej Kvapil"; + }; vincentbernat = { email = "vincent@bernat.ch"; github = "vincentbernat"; From 8217e2362e0dc3598657cfe42e9f0802f6d58986 Mon Sep 17 00:00:00 2001 From: Andrew Kvapil Date: Fri, 14 Jul 2023 13:08:09 +0200 Subject: [PATCH 003/189] ccemux: 1.1.1 -> unstable-2023-07-08 --- pkgs/applications/emulators/ccemux/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix index 742b3dc88ae2..15fb0f88593f 100644 --- a/pkgs/applications/emulators/ccemux/default.nix +++ b/pkgs/applications/emulators/ccemux/default.nix @@ -3,24 +3,24 @@ }: let - version = "1.1.1"; - rev = "af12e2e4da586275ba931eae8f40a2201251bf59"; + version = "unstable-2023-07-08"; + rev = "989cfe52a0458b991e0a7d87edec81d3fef472ac"; baseUrl = "https://emux.cc/versions/${lib.substring 0 8 rev}/CCEmuX"; jar = if useCCTweaked then fetchurl { url = "${baseUrl}-cct.jar"; - sha256 = "0d9gzi1h5vz32fp4lfn7dam189jcm7bwbqwmlpj0c47p8l0d4lsv"; + hash = "sha256-B9Zan6wpYnUtaNbUIrXvkchPiEquMs9R2Kiqg85/VdY="; } else fetchurl { url = "${baseUrl}-cc.jar"; - sha256 = "0ky5vxh8m1v98zllifxif8xxd25j2xdp19hjnj4xlkck71lbnb34"; + hash = "sha256-2Z38O6z7OrHKe8GdLnexin749uJzQaCZglS+SwVD5YE="; }; desktopIcon = fetchurl { url = "https://github.com/CCEmuX/CCEmuX/raw/${rev}/src/main/resources/img/icon.png"; - sha256 = "1vmb6rg9k2y99j8xqfgbsvfgfi3g985rmqwrd7w3y54ffr2r99c2"; + hash = "sha256-gqWURXaOFD/4aZnjmgtKb0T33NbrOdyRTMmLmV42q+4="; }; desktopItem = makeDesktopItem { name = "CCEmuX"; @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/CCEmuX/CCEmuX"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; - maintainers = with maintainers; [ CrazedProgrammer ]; + maintainers = with maintainers; [ CrazedProgrammer viluon ]; }; } From 974c1466b36af5f317e7eec395f17d4a22ce2632 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 1 Aug 2023 14:03:11 -0600 Subject: [PATCH 004/189] microsoft-edge 114.0.1823.79 -> 115.0.190.188 --- .../networking/browsers/microsoft-edge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index d4d2eaf483c7..214bda1c202d 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,9 +1,9 @@ { stable = import ./browser.nix { channel = "stable"; - version = "114.0.1823.79"; + version = "115.0.1901.188"; revision = "1"; - sha256 = "sha256-FyEsIGwGDzX22scKd8L67uw5ipqN1e9CrC+qACRBZRg="; + sha256 = "sha256-0xf2d2wxc2hjxz070nkrbgsszylwhck6x655ginjmh0qm76kf4wr"; }; beta = import ./browser.nix { channel = "beta"; From 34061e987cc445d9c5cd34f86aeb61e219a2a1c0 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 2 Aug 2023 14:23:53 -0600 Subject: [PATCH 005/189] Update stable sha256 hash to SRI hash --- .../applications/networking/browsers/microsoft-edge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 214bda1c202d..f1427bbbf579 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -3,7 +3,7 @@ channel = "stable"; version = "115.0.1901.188"; revision = "1"; - sha256 = "sha256-0xf2d2wxc2hjxz070nkrbgsszylwhck6x655ginjmh0qm76kf4wr"; + sha256 = "sha256-mRM3zakYwCptfKWYbiaDnPqv9Vt5WnDA7xIK1rlownU="; }; beta = import ./browser.nix { channel = "beta"; From 0a0caf5d2a2206398bac243bdbdda9668b15e01d Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 4 Aug 2023 09:04:47 +0200 Subject: [PATCH 006/189] poppler: 23.07.0 -> 23.08.0 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bc1478a90925..3774a3e05dcf 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.07.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-8ptLS/R1cmERdkVMjyFQbXHSfspQEaOapEA4swuVfbA="; + hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg="; }; nativeBuildInputs = [ From 742b7e4ade3b918aa20f0025c9292862809bd40b Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sat, 5 Aug 2023 11:50:24 +0200 Subject: [PATCH 007/189] todoman: 4.1.0 -> 4.3.1 --- pkgs/applications/office/todoman/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 7794116ecd46..2ea7fe7a2e19 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "todoman"; - version = "4.1.0"; - format = "setuptools"; + version = "4.3.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pimutils"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MItFZ+4Q7UKeIWHl8KFiWOLNgFcfb0h1YWjPd+g48Wg="; + hash = "sha256-pa1zzu0ITJObzhSmohjgiGTCoautXrY+SQQ3hxEtQcE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -48,15 +48,11 @@ python3.pkgs.buildPythonApplication rec { hypothesis pytestCheckHook glibcLocales + pytest-cov ]; LC_ALL = "en_US.UTF-8"; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=todoman --cov-report=term-missing" "" - ''; - postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${jq}/bin/jq " @@ -67,7 +63,6 @@ python3.pkgs.buildPythonApplication rec { # Testing of the CLI part and output "test_color_due_dates" "test_color_flag" - "test_datetime_serialization" # Will be fixed in versions after 4.1.0 "test_default_command" "test_main" "test_missing_cache_dir" From 79e4abbb7ccb92d01f45d6cbc1b83a8e093be28b Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sat, 5 Aug 2023 14:36:07 +0200 Subject: [PATCH 008/189] todoman: add `meta.mainProgram` --- pkgs/applications/office/todoman/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 2ea7fe7a2e19..10334d6c4157 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -93,5 +93,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; license = licenses.isc; maintainers = with maintainers; [ leenaars ]; + mainProgram = "todo"; }; } From a5b92645f1e6762e4b53f48652cb766184d84e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= Date: Wed, 9 Aug 2023 16:23:18 +0200 Subject: [PATCH 009/189] qt6.qtbase: fix macdeployqt would not find qmlimportscanner The qmlimportscanner tool is provided by qtdeclarative. Because of the modularized installation in Nix, it can not be found via the usual mechanisms. Also, hard-coding it like we do for Qt5 would also not work, as it would require making qtbase depend on qtdeclarative. Here we add an option to provide its location via the environment. While this means macdeployqt does not work out of the box, it provides a workaround for users. Also, we make sure that qmlimportscanner gets passed the right QML import paths as described in the environment. --- pkgs/development/libraries/qt-6/default.nix | 3 ++ ...anner-in-macdeployqt-via-environment.patch | 35 +++++++++++++++++++ ...-folder-of-this-library-does-actuall.patch | 35 +++++++++++++++++++ ...mlimportscanner-the-QML2_IMPORT_PATH.patch | 30 ++++++++++++++++ 4 files changed, 103 insertions(+) create mode 100644 pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch create mode 100644 pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch create mode 100644 pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index d9bc6ae15e1f..74ac03bbeb6d 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -48,6 +48,9 @@ let ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch ./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch + ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch + ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch + ./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch ]; }; env = callPackage ./qt-env.nix { }; diff --git a/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch b/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch new file mode 100644 index 000000000000..32e30679ec59 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch @@ -0,0 +1,35 @@ +From 505391a31aa353b8f1cc5d3feb9861582554d9f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= +Date: Wed, 9 Aug 2023 16:16:21 +0200 +Subject: [PATCH 1/3] Find qmlimportscanner in macdeployqt via environment + +The qmlimportscanner tool is provided by qtdeclarative. Because of the +modularized installation in Nix, it can not be found via the usual +mechanisms. Also, hard-coding it like we do for Qt5 would also not +work, as it would require making qtbase depend on qtdeclarative. + +Here we add an option to provide its location via the environment. +While this means macdeployqt does not work out of the box, it provides +a workaround for users. +--- + src/tools/macdeployqt/shared/shared.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp +index 643fe5390a..b8fcc9c9bd 100644 +--- a/src/tools/macdeployqt/shared/shared.cpp ++++ b/src/tools/macdeployqt/shared/shared.cpp +@@ -1270,6 +1270,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + if (!QFile::exists(qmlImportScannerPath)) + qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; + ++ // Fallback: Pass qml import scanner via environment variable ++ if (!QFile::exists(qmlImportScannerPath)) ++ qmlImportScannerPath = ::qgetenv("NIX_QMLIMPORTSCANNER"); ++ + // Verify that we found a qmlimportscanner binary + if (!QFile::exists(qmlImportScannerPath)) { + LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; +-- +2.26.2 + diff --git a/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch b/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch new file mode 100644 index 000000000000..4436d512d9d8 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch @@ -0,0 +1,35 @@ +From 32df59bea18bebc18d6d308750e88be325522d2e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= +Date: Thu, 10 Aug 2023 14:15:34 +0200 +Subject: [PATCH 2/3] Check in the QML folder of this library does actually + exist + +In a modularized installation, this folder will be the location where +`qtbase` itself is installed, but `qtbase` does not have any QML +code, and `qmlimportscanner` will complain that it does not exist. +--- + src/tools/macdeployqt/shared/shared.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp +index b8fcc9c9bd..676d34d545 100644 +--- a/src/tools/macdeployqt/shared/shared.cpp ++++ b/src/tools/macdeployqt/shared/shared.cpp +@@ -1290,9 +1290,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + } + for (const QString &importPath : qmlImportPaths) + argumentList << "-importPath" << importPath; ++ + QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); +- argumentList.append( "-importPath"); +- argumentList.append(qmlImportsPath); ++ if (QFile::exists(qmlImportsPath)) { ++ argumentList.append( "-importPath"); ++ argumentList.append(qmlImportsPath); ++ } + + // run qmlimportscanner + QProcess qmlImportScanner; +-- +2.26.2 + diff --git a/pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch new file mode 100644 index 000000000000..81f0f76636d9 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -0,0 +1,30 @@ +From 39eb99dcd66f8ffb632fed6308a49896fe5ad2d3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= +Date: Thu, 10 Aug 2023 14:17:03 +0200 +Subject: [PATCH 3/3] Pass to qmlimportscanner the QML2_IMPORT_PATH + +--- + src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp +index 676d34d545..7908b07b3c 100644 +--- a/src/tools/macdeployqt/shared/shared.cpp ++++ b/src/tools/macdeployqt/shared/shared.cpp +@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + argumentList.append(qmlImportsPath); + } + ++ // In a modularized installation of qt as we have in Nix, instead, we will ++ // read the paths from the environment, as they are spread in multiple ++ // locations and normally set in the environment like this ++ auto envQmlImportPaths = ::qgetenv("QML2_IMPORT_PATH").split(':'); ++ for (const QString &importPath : envQmlImportPaths) ++ argumentList << "-importPath" << importPath; ++ + // run qmlimportscanner + QProcess qmlImportScanner; + qmlImportScanner.start(qmlImportScannerPath, argumentList); +-- +2.26.2 + From 983cc8fa111cc7874a066f5532afae8a08f47032 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Mon, 31 Jul 2023 23:47:05 +0200 Subject: [PATCH 010/189] invidious: unstable-2023-06-06 -> unstable-2023-08-07 --- pkgs/servers/invidious/default.nix | 14 +++++++++----- pkgs/servers/invidious/versions.json | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 7efeb5d9c39d..0b1cea5fd689 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -97,12 +97,16 @@ crystal.buildCrystalPackage rec { cp -r config/sql $out/share/invidious/config ''; - # Invidious tries to open config/config.yml and connect to the database, even - # when running --help. This specifies a minimal configuration in an - # environment variable. Even though the database is bogus, --help still - # works. + # Invidious tries to open and validate config/config.yml, even when + # running --help. This specifies a minimal configuration in an + # environment variable. Even though the database and hmac_key are + # bogus, --help still works. installCheckPhase = '' - INVIDIOUS_CONFIG="database_url: sqlite3:///dev/null" $out/bin/invidious --help + INVIDIOUS_CONFIG="$(cat < Date: Thu, 10 Aug 2023 22:39:42 +0300 Subject: [PATCH 013/189] forge-mtg: 1.6.56 -> 1.6.57 Trivial bump, requested on Matrix --- pkgs/games/forge-mtg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix index fbcc652d80d3..cc5c56977bb9 100644 --- a/pkgs/games/forge-mtg/default.nix +++ b/pkgs/games/forge-mtg/default.nix @@ -8,13 +8,13 @@ }: let - version = "1.6.56"; + version = "1.6.57"; src = fetchFromGitHub { owner = "Card-Forge"; repo = "forge"; rev = "forge-${version}"; - hash = "sha256-VB/ToTq1XwHPEUNmbocwUoCP4DfyAFdlRAwxrx4tNJU="; + hash = "sha256-pxnnqLfyblbIgIRZZrx8Y8K43zUv9mu7PzZ7zltpEUQ="; }; # launch4j downloads and runs a native binary during the package phase. @@ -27,7 +27,7 @@ maven.buildMavenPackage { # Tests need a running Xorg. mvnParameters = "-DskipTests"; - mvnHash = "sha256-ajrHnaiJS7ZnR9BjLaXK2bnAKCp5UWQqYpjWbz3z6bw="; + mvnHash = "sha256-QK9g0tG75lIhEtf4jW03N32YbD9Fe5iI0JTuqmCTtnE="; nativeBuildInputs = [ makeWrapper ]; From 05245fc0ea7a7af15bed9544c4c2f4d639a80ef2 Mon Sep 17 00:00:00 2001 From: ash Date: Thu, 10 Aug 2023 18:40:42 +0100 Subject: [PATCH 014/189] nixos/picom: add `package` option --- nixos/modules/services/x11/picom.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 1d6f3daa4022..01db5a7cd4d4 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -61,6 +61,8 @@ in { ''; }; + package = mkPackageOption pkgs "picom" { }; + fade = mkOption { type = types.bool; default = false; @@ -301,13 +303,13 @@ in { }; serviceConfig = { - ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}"; + ExecStart = "${cfg.package}/bin/picom --config ${configFile}"; RestartSec = 3; Restart = "always"; }; }; - environment.systemPackages = [ pkgs.picom ]; + environment.systemPackages = [ cfg.package ]; }; meta.maintainers = with lib.maintainers; [ rnhmjoj ]; From be50a4d290f5959c43849abe7e46f8a2358f4283 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Aug 2023 13:02:01 +0200 Subject: [PATCH 015/189] mailmanPackages.postorius: 1.3.6 -> 1.3.8 ChangeLog: https://gitlab.com/mailman/postorius/-/compare/1.3.6...1.3.8 --- pkgs/servers/mail/mailman/postorius.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index fefffffc87c8..1e93b20f3232 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -4,13 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "postorius"; - # Note: Mailman core must be on the latest version before upgrading Postorious. - # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - version = "1.3.6"; + version = "1.3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KwzEU9IfcQ6YPZu3jPuFrd6ux/3e2pzoLfTrak/aGmg="; + sha256 = "sha256-1mSt+PVx3xUJDc5JwrCmKiRNIDwbsjjbM2Fi5Sgz6h8="; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; From 9c9615018927f47efb18f3da0653a0f269086179 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Aug 2023 13:05:57 +0200 Subject: [PATCH 016/189] mailmanPackages.hyperkitty: 1.3.5 -> 1.3.7 ChangeLog: https://gitlab.com/mailman/hyperkitty/-/compare/1.3.5...1.3.7 --- ...ble-broken-test_help_output-testcase.patch | 36 +++++++++++++++++++ pkgs/servers/mail/mailman/hyperkitty.nix | 20 ++--------- 2 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch diff --git a/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch b/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch new file mode 100644 index 000000000000..3b6094bd02f0 --- /dev/null +++ b/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch @@ -0,0 +1,36 @@ +From 1a914beafe2b00770213fa4d146ffad9d897dc0c Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 12 Aug 2023 12:27:25 +0200 +Subject: [PATCH] Disable broken `test_help_output` testcase + +The assertion fails, but checking for the exact whereabouts of helptext +doesn't bring too much value anyways, so it seems OK to just skip the +test. +--- + .../tests/commands/test_attachments_to_file.py | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/hyperkitty/tests/commands/test_attachments_to_file.py b/hyperkitty/tests/commands/test_attachments_to_file.py +index b3e61f3a..8db7c4b2 100644 +--- a/hyperkitty/tests/commands/test_attachments_to_file.py ++++ b/hyperkitty/tests/commands/test_attachments_to_file.py +@@ -83,16 +83,3 @@ class CommandTestCase(TestCase): + self.assertEqual(fp.getvalue(), """\ + 2 attachments moved. + """) +- +- def test_help_output(self): +- with io.StringIO() as fp, redirect_stdout(fp): +- with suppress(SystemExit): +- call_command('attachments_to_file', '--help') +- +- output_value = fp.getvalue() +- assert ( +- "HYPERKITTY_ATTACHMENT_FOLDER" in output_value +- and "-c CHUNK_SIZE" in output_value +- and "-c CHUNK_SIZE, --chunk-size CHUNK_SIZE" in output_value +- and "-v {0,1}, --verbosity {0,1}" in output_value +- ) +-- +2.40.1 + diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index f0cac80bb5fd..334a24b1ed00 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,36 +1,22 @@ { lib , python3 , fetchPypi -, fetchpatch }: with python3.pkgs; buildPythonPackage rec { pname = "HyperKitty"; - # Note: Mailman core must be on the latest version before upgrading HyperKitty. - # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - version = "1.3.5"; + version = "1.3.7"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y="; + sha256 = "sha256-TXSso+wwVGdBymIzns5yOS4pj1EdConmm87b/NyBAss="; }; patches = [ - # FIXME: backport Python 3.10 support fix, remove for next release - (fetchpatch { - url = "https://gitlab.com/mailman/hyperkitty/-/commit/551a44a76e46931fc5c1bcb341235d8f579820be.patch"; - sha256 = "sha256-5XCrvyrDEqH3JryPMoOXSlVVDLQ+PdYBqwGYxkExdvk="; - includes = [ "hyperkitty/*" ]; - }) - - # Fix for Python >=3.9.13 - (fetchpatch { - url = "https://gitlab.com/mailman/hyperkitty/-/commit/3efe7507944dbdbfcfa4c182d332528712476b28.patch"; - sha256 = "sha256-yXuhTbmfDiYEXEsnz+zp+xLHRqI4GtkOhGHN+37W0iQ="; - }) + ./0001-Disable-broken-test_help_output-testcase.patch ]; postPatch = '' From 892661f45b57a188986a2f5518d163146b11fd9e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Aug 2023 13:00:00 +0200 Subject: [PATCH 017/189] mailmanPackages.web: 0.0.5 -> 0.0.6 ChangeLog: https://gitlab.com/mailman/mailman-web/-/compare/0.0.5...0.0.6 --- pkgs/servers/mail/mailman/web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index bb50586e8d56..b63fa8c65505 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -6,12 +6,12 @@ with python3.pkgs; buildPythonPackage rec { pname = "mailman-web"; - version = "0.0.5"; + version = "0.0.6"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9pvs/VATAsMcGNrj58b/LifysEPTNhrAP57sfp4nX6Q="; + sha256 = "sha256-UWdqrcx529r6kwgf0YEHiDrpZlGoUBR6OdYtHMTPMGY="; }; postPatch = '' From 2cefe69f6f97b705fc49cdfb9bccca4d01280fa0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Aug 2023 13:10:05 +0200 Subject: [PATCH 018/189] mailmanPackages.python: allow changing python package-set used for mailman When having a patch for a python module that should only be used for mailman, but for nothing else, it's now possible to apply it like this: self: super: { mailmanPackages = super.mailmanPackages.extend (mailmanSelf: mailmanSuper: { python3 = mailmanSuper.python3.override { overlay = pythonSelf: pythonSuper: { psycopg2 = /* ... */; }; }; }); } The underlying issue is that the `packageOverrides`-mechanism of `pkgs.python3` doesn't compose, so an optional overlay is manually applied to the `python3` used for mailman. --- pkgs/servers/mail/mailman/python.nix | 34 +++++++++++++++------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 288e48d814e4..58256a961aba 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -1,19 +1,21 @@ -{ python3, fetchPypi }: +{ python3, lib, overlay ? (_: _: {}) }: python3.override { - packageOverrides = self: super: { - # does not find tests - alembic = super.alembic.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); - # Fixes `AssertionError: database connection isn't set to UTC` - psycopg2 = super.psycopg2.overridePythonAttrs (a: rec { - version = "2.8.6"; - src = fetchPypi { - inherit version; - inherit (a) pname; - sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543"; - }; - }); - }; + packageOverrides = lib.composeExtensions + (self: super: { + # does not find tests + alembic = super.alembic.overridePythonAttrs (oldAttrs: { + doCheck = false; + }); + # Fixes `AssertionError: database connection isn't set to UTC` + psycopg2 = super.psycopg2.overridePythonAttrs (a: (rec { + version = "2.8.6"; + src = super.fetchPypi { + inherit version; + inherit (a) pname; + sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543"; + }; + })); + }) + overlay; } From 8b45dd8698683cd45cf1710666a7542d49b09eb9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Aug 2023 13:17:15 +0200 Subject: [PATCH 019/189] mailmanPackages: remove psycopg2 pin This hack was necessary for django 2.x[1] which was the default `django` version (i.e. current LTS) when this fix was needed. However, 2.x is now EOL and not packaged anymore and mailman is running with django3, so this can be dropped. [1] https://github.com/psycopg/psycopg2/issues/1293 --- pkgs/servers/mail/mailman/python.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 58256a961aba..be50e9be7e61 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -7,15 +7,6 @@ python3.override { alembic = super.alembic.overridePythonAttrs (oldAttrs: { doCheck = false; }); - # Fixes `AssertionError: database connection isn't set to UTC` - psycopg2 = super.psycopg2.overridePythonAttrs (a: (rec { - version = "2.8.6"; - src = super.fetchPypi { - inherit version; - inherit (a) pname; - sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543"; - }; - })); }) overlay; } From 729f9309b0fd29410517291c824de9019165a671 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 12 Aug 2023 21:48:02 -0400 Subject: [PATCH 020/189] minizign: init at unstable-2023-08-13 https://github.com/jedisct1/zig-minisign --- pkgs/tools/security/minizign/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/security/minizign/default.nix diff --git a/pkgs/tools/security/minizign/default.nix b/pkgs/tools/security/minizign/default.nix new file mode 100644 index 000000000000..a5fd19405a37 --- /dev/null +++ b/pkgs/tools/security/minizign/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, zig_0_11 +}: + +stdenv.mkDerivation { + pname = "minizign"; + version = "unstable-2023-08-13"; + + src = fetchFromGitHub { + owner = "jedisct1"; + repo = "zig-minisign"; + rev = "47edc26d0c7bcfb531fe08e3b2411d8dda516d47"; + hash = "sha256-zyxjUFxg+VufEVycYGCQPdjERE3p5Vz5iIi2UDujEjI="; + }; + + nativeBuildInputs = [ + zig_0_11.hook + ]; + + meta = with lib; { + description = "Minisign reimplemented in Zig"; + homepage = "https://github.com/jedisct1/zig-minisign"; + license = licenses.isc; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "minizign"; + inherit (zig_0_11.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f4fb0027463..e08791c0fe7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9956,6 +9956,8 @@ with pkgs; ministat = callPackage ../tools/misc/ministat { }; + minizign = callPackage ../tools/security/minizign { }; + mitm6 = callPackage ../tools/security/mitm6 { }; mjolnir = callPackage ../servers/mjolnir { From b668cff0b395be9e96d0157ea45ad0756bb61fee Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 13 Aug 2023 10:15:24 +0200 Subject: [PATCH 021/189] python3Packages.pygraphviz: 1.10 -> 1.11 Signed-off-by: Matthias Beyer --- pkgs/development/python-modules/pygraphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 80f16e760d8b..12876e2a3e02 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.10"; + version = "1.11"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-RX4JOoiBKJAyUaJmqMwWtLqT8/YzSz6/7ZLHRxp02Gc="; + hash = "sha256-qX61ztJm9FBT67HyxsbSkJFpBQPjpcFL5/kIs3sG8tQ="; extension = "zip"; }; From c563c6d89a1720d6cbb23ff6fc31ec981ce410dd Mon Sep 17 00:00:00 2001 From: Ferdinand Bachmann Date: Fri, 11 Aug 2023 15:23:24 +0200 Subject: [PATCH 022/189] wl-mirror: 0.13.1 -> 0.13.2 --- pkgs/tools/wayland/wl-mirror/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 8e19bdc1d9e4..0746dd5ff09b 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,16 +28,17 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-qYJmcsID5qbUs27ZCU2HkWVVnBmxWmyzSgruLPB4jI8="; + hash = "sha256-dmdRe4GZ1W2gD7ZF1MudBqfZIm9HyBjISa+xB54BLz4="; }; strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ cmake pkg-config wayland-scanner scdoc makeWrapper ]; buildInputs = [ libGL wayland wayland-protocols wlr-protocols bash ]; From 51c70d97ef774075f75e35bfb63655e489d033a8 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 13 Aug 2023 12:30:18 -0400 Subject: [PATCH 023/189] python310Packages.pydicom: 2.3.1 -> 2.4.2 --- pkgs/development/python-modules/pydicom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 34a802a25692..a2100c83c8df 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -11,13 +11,13 @@ let pname = "pydicom"; - version = "2.3.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; rev = "refs/tags/v${version}"; - hash = "sha256-xt0aK908lLgNlpcI86OSxy96Z/PZnQh7+GXzJ0VMQGA="; + hash = "sha256-FNZVu2/7kBGeP4iTH53bsApfHzHFxr5bxqbqkI4T95E="; }; # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded @@ -25,8 +25,8 @@ let test_data = fetchFromGitHub { owner = "pydicom"; repo = "pydicom-data"; - rev = "bbb723879690bb77e077a6d57657930998e92bd5"; - hash = "sha256-dCI1temvpNWiWJYVfQZKy/YJ4ad5B0e9hEKHJnEeqzk="; + rev = "cbb9b2148bccf0f550e3758c07aca3d0e328e768"; + hash = "sha256-nF/j7pfcEpWHjjsqqTtIkW8hCEbuQ3J4IxpRk0qc1CQ="; }; in From 36b84c802a80f752ee333807c470feda4737d626 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 13 Aug 2023 13:00:41 -0400 Subject: [PATCH 024/189] python310Packages.deid: 0.3.21 -> 0.3.22 --- pkgs/development/python-modules/deid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix index 6c5146313881..6927d656a9f2 100644 --- a/pkgs/development/python-modules/deid/default.nix +++ b/pkgs/development/python-modules/deid/default.nix @@ -36,7 +36,7 @@ let in buildPythonPackage rec { pname = "deid"; - version = "0.3.21"; + version = "0.3.22"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -46,8 +46,8 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; # the github repo does not contain Pypi version tags: - rev = "38717b8cbfd69566ba489dd0c9858bb93101e26d"; - hash = "sha256-QqofxNjshbNfu8vZ37rB6pxj5R8q0wlUhJRhrpkKySk="; + rev = "40dc96125daeb65856d643e12c3d6dfec756be0d"; + hash = "sha256-OtxQPF29eqt8I1Q12ga8a1IjBVO+VBk6y0DQmRtCNoU="; }; propagatedBuildInputs = [ From b36ab895e7d57675919cf85e98d7b7f2c6ec9da4 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 13 Aug 2023 10:08:37 -0700 Subject: [PATCH 025/189] python3.pkgs.typer: unpin flit-core dependency --- pkgs/development/python-modules/typer/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index e5676eba4679..b072f3a6d8ca 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -28,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-UJIv15rqL0dRqOBAj/ENJmK9DIu/qEdVppnzutopeLI="; }; + patches = [ + # https://github.com/tiangolo/typer/pull/651 + (fetchpatch { + name = "unpin-flit-core-dependency.patch"; + url = "https://github.com/tiangolo/typer/commit/78a0ee2eec9f54ad496420e177fdaad84984def1.patch"; + hash = "sha256-VVUzFvF2KCXXkCfCU5xu9acT6OLr+PlQQPeVGONtU4A="; + }) + ]; + nativeBuildInputs = [ flit-core ]; From 090ac7923541810892cd78ed87afcbc958081451 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 10 Aug 2023 19:27:43 +0200 Subject: [PATCH 026/189] dumpasn1: init at 20230207.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/security/dumpasn1/configpath.patch | 28 +++++++++++++++ pkgs/tools/security/dumpasn1/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 pkgs/tools/security/dumpasn1/configpath.patch create mode 100644 pkgs/tools/security/dumpasn1/default.nix diff --git a/pkgs/tools/security/dumpasn1/configpath.patch b/pkgs/tools/security/dumpasn1/configpath.patch new file mode 100644 index 000000000000..4578faafc350 --- /dev/null +++ b/pkgs/tools/security/dumpasn1/configpath.patch @@ -0,0 +1,28 @@ +From ab8bd63b32b963ddc7346a2dabfd39fba8bfba72 Mon Sep 17 00:00:00 2001 +From: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Date: Sun, 13 Aug 2023 14:13:21 +0200 +Subject: [PATCH] make config path injectable during build + +This way a config path can be added to the list during build by +defining the makro. + +Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> +--- + dumpasn1.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dumpasn1.c b/dumpasn1.c +index e7bf268..94f1582 100644 +--- a/dumpasn1.c ++++ b/dumpasn1.c +@@ -451,6 +451,10 @@ static const char *configPaths[] = { + /* General environment-based paths */ + "$DUMPASN1_PATH/", + ++ #ifdef DUMPASN1_CONFIG_PATH ++ DUMPASN1_CONFIG_PATH, ++ #endif /* DUMPASN1_CONFIG_PATH */ ++ + NULL + }; + #endif /* OS-specific search paths */ diff --git a/pkgs/tools/security/dumpasn1/default.nix b/pkgs/tools/security/dumpasn1/default.nix new file mode 100644 index 000000000000..d224531940a7 --- /dev/null +++ b/pkgs/tools/security/dumpasn1/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +}: +stdenv.mkDerivation (finalAttrs: { + pname = "dumpasn1"; + version = "20230207.0.0"; + + src = fetchFromGitHub { + owner = "katexochen"; + repo = "dumpasn1"; + rev = "v${finalAttrs.version}"; + hash = "sha256-r40czSLdjCYbt73zK7exCoP/kMq6+pyJfz9LKJLLaXM="; + }; + + CFLAGS = ''-DDUMPASN1_CONFIG_PATH='"$(out)/etc/"' ''; + + makeFlags = [ "prefix=$(out)" ]; + + patches = [ + # Allow adding a config file path during build via makro. + # Used to add the store path of the included config file through CFLAGS. + # This won't be merged upstream. + ./configpath.patch + ]; + + meta = with lib; { + description = "Display and debug ASN.1 data"; + homepage = "https://github.com/katexochen/dumpasn1"; + license = licenses.bsd2; + maintainers = with maintainers; [ katexochen ]; + platforms = platforms.linux ++ platforms.darwin; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdccfbd1df83..940417f36ac2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7438,6 +7438,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + dumpasn1 = callPackage ../tools/security/dumpasn1 { }; + dumptorrent = callPackage ../tools/misc/dumptorrent { }; duo-unix = callPackage ../tools/security/duo-unix { }; From 68fa45a35932755e195bd2778ade8d6ef72dd41e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 21:54:04 +0000 Subject: [PATCH 027/189] cava: 0.8.3 -> 0.9.0 --- pkgs/applications/audio/cava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index e898f17d9345..1e8b3047de72 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.8.3"; + version = "0.9.0"; buildInputs = [ alsa-lib @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "sha256-6xiWhWynIbUWFIieiYIg24PgwnKuNSIEpkY+P6gyFGw="; + sha256 = "sha256-mIgkvgVcbRdE29lSLojIzIsnwZgnQ+B2sgScDWrLyd8="; }; nativeBuildInputs = [ autoreconfHook ]; From 1c1c9678c2a11bf02deea7b44f28004740b7e0c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 22:10:16 +0000 Subject: [PATCH 028/189] netbird-ui: 0.22.3 -> 0.22.4 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 25c2f9a3aeb5..67e7f453eb5c 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1LUHS3G46EnDz0FgAXXOqluGD+fTRaALypZKNgXtCf0="; + sha256 = "sha256-t5uD/1SryxlCA1IPYPTL2nTov+cDzGdprs+J06vpLKI="; }; - vendorHash = "sha256-Fj80sYoNXt/rHUC8IEevbNbSIvWHPaKd90UQQTkd/7w="; + vendorHash = "sha256-CwozOBAPFSsa1XzDOHBgmFSwGiNekWT8t7KGR2KOOX4="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 96add9e2ab6d16adfbb89b1c6cb65f7b373e9b12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 22:28:43 +0000 Subject: [PATCH 029/189] operator-sdk: 1.30.0 -> 1.31.0 --- pkgs/development/tools/operator-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 9dcac86c7613..3ba63d8440b3 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mDjBu25hOhm3FrUDsFq1rjBn58K91Bao8gqN2heZ9ps="; + hash = "sha256-v/7nqZg/lwiK2k92kQWSZCSjEZhTAQHCGBcTfxQX2r0="; }; - vendorHash = "sha256-QfTWjSsWpbbGgKrv4U2E6jA6eAT4wnj0ixpUqDxtsY8="; + vendorHash = "sha256-geKWTsDLx5drTleTnneg2JIbe5sMS5JUQxTX9Bcm+IQ="; nativeBuildInputs = [ makeWrapper From 0a75ed748e2f3389ef76838e949bcc0b97c62176 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 22:59:18 +0000 Subject: [PATCH 030/189] pachyderm: 2.6.8 -> 2.7.0 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index c948d08d305f..5483fc1e0f49 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.6.8"; + version = "2.7.0"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-2AD/JGdcJV8qYH/k3gR9YgLsMcyKtWJmqQN29NUsE4Y="; + hash = "sha256-OA6NY8hI/Aw6vdtDfN1cRXdsLLfxW5ECg5tobPZB66Y="; }; - vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY="; + vendorHash = "sha256-q8Cx+J5BjMvO5wuvH5Tc5Oa9rjW7vXvS4DhSVv/E3E4="; subPackages = [ "src/server/cmd/pachctl" ]; From 8d6d3bd8f5926915fde96476739c1f636ba4bbb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Aug 2023 00:14:33 +0000 Subject: [PATCH 031/189] level-zero: 1.13.1 -> 1.13.5 --- pkgs/development/libraries/level-zero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index a117863aa337..c213e75d5f2d 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.13.1"; + version = "1.13.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-qV2OM41+DkuT3lDCTHOyNkHixD/HITfCiItBQX6Ewio="; + hash = "sha256-XpLbbcB8M63q+0Vj7NrERSXVIjy5KQrVZMvYijUbJhw="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; From 39151c541c5b16e6efeb7d5c6e84bbc71454e852 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 13 Aug 2023 22:23:38 -0400 Subject: [PATCH 032/189] python310Packages.linear_operator: 0.4.0 -> 0.5.1 --- pkgs/development/python-modules/linear_operator/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/linear_operator/default.nix b/pkgs/development/python-modules/linear_operator/default.nix index 48fb004c14c4..baecb5a732f6 100644 --- a/pkgs/development/python-modules/linear_operator/default.nix +++ b/pkgs/development/python-modules/linear_operator/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, jaxtyping , scipy , torch , pytestCheckHook @@ -8,14 +9,14 @@ buildPythonPackage rec { pname = "linear_operator"; - version = "0.4.0"; + version = "0.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; rev = "v${version}"; - hash = "sha256-0f3F3k3xJACbx42jtwsAmjZwPAOfLywZs8VOrwWicc4="; + hash = "sha256-7NkcvVDwFaLHBZZhq7aKY3cWxe90qeKmodP6cVsdrPM="; }; postPatch = '' @@ -24,6 +25,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + jaxtyping scipy torch ]; From c9196ec1f1d928c325b7b647a927a604c5407231 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 13 Aug 2023 22:23:56 -0400 Subject: [PATCH 033/189] python310Packages.gpytorch: 1.10 -> 1.11 --- pkgs/development/python-modules/gpytorch/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index f914bc326ba9..74d85d801f69 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gpytorch"; - version = "1.10"; + version = "1.11"; format = "pyproject"; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; rev = "v${version}"; - hash = "sha256-KY3ItkVjBfIYMkZAmD56EBGR9YN/MRN7b2K3zrK6Qmk="; + hash = "sha256-cpkfjx5G/4duL1Rr4nkHTHi03TDcYbcx3bKP2Ny7Ijo="; }; postPatch = '' @@ -40,6 +40,8 @@ buildPythonPackage rec { # flaky numerical tests "test_classification_error" "test_matmul_matrix_broadcast" + # https://github.com/cornellius-gp/gpytorch/issues/2396 + "test_t_matmul_matrix" ]; meta = with lib; { From 4ca759e003f389565d4f0ab5ad977aaacbfd9187 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 13 Aug 2023 22:24:12 -0400 Subject: [PATCH 034/189] python310Packages.botorch: 0.8.5 -> 0.9.2 --- pkgs/development/python-modules/botorch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index a27523d2fe95..5729a7a40a41 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.8.5"; + version = "0.9.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - hash = "sha256-VcNHgfk8OfLJseQxHksycWuCPCudCtOdcRV0XnxHSfU="; + hash = "sha256-8obS+qMQwepKUxPkMbufR/SaacYekl6FA6t6XW6llA4="; }; nativeBuildInputs = [ From 73743d45e07eb00a57c0024725b4a919e6c4a16f Mon Sep 17 00:00:00 2001 From: kashw2 Date: Mon, 14 Aug 2023 12:50:34 +1000 Subject: [PATCH 035/189] leetcode-cli: 0.4.1 -> 0.4.2 --- pkgs/applications/misc/leetcode-cli/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index 4683a8052fbc..cc59d6b18c28 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -7,18 +7,20 @@ , sqlite , stdenv , darwin +, testers +, leetcode-cli }: rustPlatform.buildRustPackage rec { pname = "leetcode-cli"; - version = "0.4.1"; + version = "0.4.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-8v10Oe3J0S9xp4b2UDOnv+W0UDgveK+mAyV3I/zZUGw="; + sha256 = "sha256-Yr8Jsy8863O6saaFRAxssni+PtK7XYe+Iifgxu8Rx6Q="; }; - cargoHash = "sha256-MdHk8i/murKcWi9gydyPyq/6r1SovKP04PMJyXXrCiQ="; + cargoHash = "sha256-rab/oLr27UOlnwUUB1RXC/egLoYyzmVtzN1L+AGed8o="; nativeBuildInputs = [ pkg-config From e2f4aedc423400c73064666ad44218b261a3f8b2 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Mon, 14 Aug 2023 12:50:54 +1000 Subject: [PATCH 036/189] added passthru version test --- pkgs/applications/misc/leetcode-cli/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index cc59d6b18c28..be9102b6120b 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -32,6 +32,12 @@ rustPlatform.buildRustPackage rec { sqlite ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + passthru.tests = testers.testVersion { + package = leetcode-cli; + command = "leetcode -V"; + version = "leetcode ${version}"; + }; + meta = with lib; { description = "May the code be with you 👻"; longDescription = "Use leetcode.com in command line"; From dd7d7cd54e3c55f61075e8772bb6dfc7ec958218 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 14 Aug 2023 11:24:12 +0800 Subject: [PATCH 037/189] monitor: 0.16.1 -> 0.17.0 https://github.com/stsdc/monitor/compare/0.16.1...0.17.0 --- pkgs/applications/system/monitor/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index e3917ce0e014..ca3c5e0faef7 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -9,6 +9,7 @@ , pantheon , python3 , curl +, flatpak , gettext , glib , gtk3 @@ -27,13 +28,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-ZTsb1xcJ7eeCEPebZW0anmG1SUPAzZakw4WzJql9VTQ="; + sha256 = "sha256-GUNMA4CRO4cKBjNr7i8yRflstbT8g2ciDHppjUUbAOc="; fetchSubmodules = true; }; @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl + flatpak glib gtk3 json-glib @@ -85,7 +87,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gitUpdater { - ignoredVersions = "ci.*"; + # Upstream frequently tags these to fix CI, which are mostly irrelevant to us. + ignoredVersions = "-"; }; }; From 9fcc64eb9baefc8f2b2969ad1b374c3dd33c434e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 14 Aug 2023 04:20:00 +0000 Subject: [PATCH 038/189] twilio-cli: 5.11.0 -> 5.12.0 Changelog: https://github.com/twilio/twilio-cli/blob/5.12.0/CHANGES.md --- pkgs/development/tools/twilio-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index f30a0737dd4b..d64da750c407 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.11.0"; + version = "5.12.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-h8Y8AgXOfl7GWlyRYRAw+SlD3ZX9U0NMyvBQiI/vGgY="; + sha256 = "sha256-K8SMUT2f8pgxCP5JGFyo/gLm60t0OeCt/1fYAw2HQX0="; }; buildInputs = [ nodejs ]; From 1a2bcd8551d6f6eec4a8185748028a89ac94e8dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Aug 2023 05:18:06 +0000 Subject: [PATCH 039/189] saga: 9.0.2 -> 9.1.1 --- pkgs/applications/gis/saga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 4e4d6211b823..9be6e3c036a1 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.0.2"; + version = "9.1.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - sha256 = "sha256-dyqunuROQlF1Lo/XsNj9QlN7WbimksfT1s8TrqB9PXE="; + sha256 = "sha256-VXupgjoiexZZ1kLXAbbQMW7XQ7FWjd1ejZPeeTffUhM="; }; sourceRoot = "saga-${version}/saga-gis"; From 466e2298cf17f7532d8dbdb64c5b420e38e613c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Aug 2023 08:01:52 +0000 Subject: [PATCH 040/189] asunder: 2.9.7 -> 3.0.1 --- pkgs/applications/audio/asunder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index d6efada90763..dbaef1cf2acf 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - version = "2.9.7"; + version = "3.0.1"; pname = "asunder"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; - sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1"; + sha256 = "sha256-iGji4bl7ZofIAOf2EiYqMWu4V+3TmIN2jOYottJTN2s="; }; nativeBuildInputs = [ intltool makeWrapper pkg-config ]; From 57909125148692d055362e8340b05f4ab6df372e Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Fri, 28 Jul 2023 13:43:29 +0200 Subject: [PATCH 041/189] bazel_6: installCheckPhase .bazelversion override In case bazel dist archive includes .bazelversion (like in 5.4.1 https://github.com/bazelbuild/bazel/issues/18189 or 6.3.1rc1) running bazel commands in dist worktree will require using version specified in .bazelversion. If .bazelversion is absent there any available version will be used. Let's make sure we don't fail installCheckPhase for dist archives that do include .bazelversion (note: bazel bootstrapping from sources not via bazel works regardless of that file, so that's only about test/check phases) --- .../tools/build-managers/bazel/bazel_6/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 1424817edc90..91f0a71c3603 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -625,6 +625,12 @@ stdenv.mkDerivation rec { cd ./bazel_src + # If .bazelversion file is present in dist files and doesn't match `bazel` version + # running `bazel` command within bazel_src will fail. + # Let's remove .bazelversion within the test, if present it is meant to indicate bazel version + # to compile bazel with, not version of bazel to be built and tested. + rm -f .bazelversion + # test whether $WORKSPACE_ROOT/tools/bazel works mkdir -p tools From 94a30928952ce432a058cb40b305ed5cb16d973f Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 14 Aug 2023 11:18:06 +0300 Subject: [PATCH 042/189] nixos/picom: mkPackageOption -> mkPackageOptionMD --- nixos/modules/services/x11/picom.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 01db5a7cd4d4..91463724c072 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -61,7 +61,7 @@ in { ''; }; - package = mkPackageOption pkgs "picom" { }; + package = mkPackageOptionMD pkgs "picom" { }; fade = mkOption { type = types.bool; From e0fad0515b7821648183363f4efb616adfafc429 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 14 Aug 2023 11:19:41 +0300 Subject: [PATCH 043/189] nixos/picom: use lib.getExe Co-authored-by: Jian Lin <75130626+jian-lin@users.noreply.github.com> --- nixos/modules/services/x11/picom.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 91463724c072..3df0ea9e60bb 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -303,7 +303,7 @@ in { }; serviceConfig = { - ExecStart = "${cfg.package}/bin/picom --config ${configFile}"; + ExecStart = "${getExe cfg.package} --config ${configFile}"; RestartSec = 3; Restart = "always"; }; From ea8f6c0e2c83ea1d403a74e436050bd38457b740 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Aug 2023 08:23:17 +0000 Subject: [PATCH 044/189] gpsprune: 22.2 -> 23.1 --- pkgs/applications/misc/gpsprune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 58a18f59b5b6..dd76fe87550a 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "22.2"; + version = "23.1"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-7T7UmS650VvYN29vQxemzsaxF5wPFF+yCNCTyXY7nmY="; + sha256 = "sha256-0Lf/GuqlovVbnk3jSJHFGF688GXABcSVLr1hATaIomk="; }; dontUnpack = true; From f2b600e71fc6c28b84e79fa2c0f4770c35e2c230 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Aug 2023 08:23:42 +0000 Subject: [PATCH 045/189] ryujinx: 1.1.974 -> 1.1.986 --- .../emulators/ryujinx/default.nix | 6 +- pkgs/applications/emulators/ryujinx/deps.nix | 102 +++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index fd8cd88fafc7..19e9ea8026d8 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.974"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.986"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "5a0aa074b661753d8f0202a73d9f6f3ac6e2ab11"; - sha256 = "0f1wivwf7hnsqi7sgqjrikxvakrk8dmywpmyd36a3s5lbk878wp3"; + rev = "33f544fd9248361440afd6013e0ef9d69971d6da"; + sha256 = "1cnz3j8qndfrm1iifbzswyf4vcii939naj29bvr2mp6bdwrbqi49"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 8de8a7293e56..7d952d9371f0 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -2,49 +2,54 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "0.10.21"; sha256 = "1x6z0wvlg5ww6n7idj2pwc6mxd7k9xsb7vh3v0z4in3rck0vwz95"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.16"; sha256 = "11v3a4kda04jacznl7j8fc9zw16ysajwc3ljmdribbqz1rrr823v"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.21"; sha256 = "0rx9qni3m1zhv6n73kskgj7vd6fxsalg84i2202gz53m11li7yvj"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.21"; sha256 = "0jjx8lfbzqznqv7xpkfi8xvygqcqfk8wzkj9ambq30cn4h1ids05"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.21"; sha256 = "10fl0nb8lhpvms1apb3mmswrpirc2j8vr78jvb63cni0885vxhab"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.21"; sha256 = "038i1vim97niyh9qf5b1lbrakc8r7m03nk1yqn3iv563q8zbwfq7"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.21"; sha256 = "0p0jz3za6y708fp0wpbjyqivfp6979ldwx8r95nmdmh10fm9q4yi"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.21"; sha256 = "08f17zb0dq7p7naz96il15lhbrzan4897wghkl8rrd80dw0bhbb2"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.21"; sha256 = "03ca99awvp178jsndy5zlsc17rlx29iz0x2jvj85fh6qdvds2dhj"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.21"; sha256 = "0fja6rv0gw5kjiz0vpnyv5lv8xz5gzd71wz0052x9mrgq3jz00p8"; }) - (fetchNuGet { pname = "Avalonia.Svg"; version = "0.10.18"; sha256 = "06h7yh2lkm4rqfchn7nxqjbqx4afh42w61z9sby7b5gj56h5a84q"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.18"; sha256 = "0s25aq3xz0km55jwdxp59z8cc0d1zqaag1hiwnxdzd30id2ahn66"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.21"; sha256 = "0ichldyigbsd82jrryq340bqlh7jw9zr850fyni2g3h0bbcx5327"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.21"; sha256 = "08vbdiv2k9vp8gp59rk0z63jyn8hlv8a4956jczy05ail5qfl94v"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.3"; sha256 = "1ig635386glxgfv9l894dqp98l93ymsylml649xm42lc9a9f1khc"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; sha256 = "06wgzhxkivlaxkn8p61wainsprml2g1q4jmvy9fpn64qnfywjdn7"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.3"; sha256 = "0xcxwc588lc2ify2d3m53pmwjgf7p9lwz5q11hn8p5c9zh01iai9"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.3"; sha256 = "1kls0v2rjimcv7k0dvqd3l694xdg9nf8wdzcz1cadi4qvj0bx7l4"; }) + (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0"; sha256 = "1qxw096av0n4ks0jixh7xxrzgsn9fshp1ypy3vvij7r0a1sk7y1q"; }) + (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0-rc2.1"; sha256 = "0pmc0fi2abn9qaqwx9lvqnd1a5a8lzp8zin72d3k3xjsh1w1g0n8"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.3"; sha256 = "0g8hzvkf2rrfnpmm56m2miwpdw14l04rr0q8xz03j220fy9xk5fm"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.3"; sha256 = "1rificg9ikf8m2550ylrqavkkvihf8xb22agmdrbz07v7s93v731"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.3"; sha256 = "0w8qc45phfz4mnnx1mfxi042qmq31shmjmz5inb4maw9xha0yr3c"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.3"; sha256 = "09g4flx6sg2b2mkwbqrwl51q87xzy0d43j2xjxvnwc8vwhr1h8gs"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.3"; sha256 = "1gi3y2cdfcjkwjldavahyx09a1n91jpvx8szwrfgr3kk4ycc5lyn"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.3"; sha256 = "0syh20a6892pip4qz32kgc5w77ig40yjgwbcknivhjr8arc3126r"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.3"; sha256 = "0089z8ml8pblq6hispj1nf7lvf6zplrrlix22jcd87pm13232pg2"; }) + (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0"; sha256 = "1xmgaj2wnjdl16x4y6rmfp3q9faca5na90zlb8j62rxcwf1v3lkr"; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0"; sha256 = "0cd8w9pm7lpifdzjmsnmjlzdqgq3qw653mcj3adczb5ycqqbd8p3"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.3"; sha256 = "0zkm0asxcbsybswxs0p6ybsiq6j1l1j02h0xfxzsmhcimm3y92kk"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.3"; sha256 = "14pj98057fmfgafq0pni7pw79ls0lsf3jaydfjmdjyw5x2b2x51q"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.3"; sha256 = "0pb41fpiwndcf34r53apxf92qgqxavc4zfl1xy847pz3kj1vsclp"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) (fetchNuGet { pname = "DynamicData"; version = "7.14.2"; sha256 = "07k79w4702masq71rk865mi3h1kaxamyp7dgl08ny4n22gg8482k"; }) (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) - (fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; }) + (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.1"; sha256 = "12w6rk3qgn6i2zk06appf98pgdf89pw10865qcwn5xpjwm7487k2"; }) (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) - (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.2.0"; sha256 = "1abck2gad29mgf9gwqgc6wr8iwl64v50n0sbxcj1bcxgkgndraiq"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.3.0-beta.4"; sha256 = "17847ssn15l755zmspvb69wsfbj9ayvy9xl8zgjx6wvvwp6x89cp"; }) (fetchNuGet { pname = "LibHac"; version = "0.18.0"; sha256 = "19d5fqdcws0730580jlda6pdddprxcrhw7b3ybiiglabsr7bmgdv"; }) - (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.10.4"; sha256 = "1bdgy6g15d1mln1xpvs6sy0l2zvfs4hxw6nc3qm16qb8hdgvb73y"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.10.4"; sha256 = "0ccbzp0d01dcahm7ban7xyh1rk7k2pkml3l5i7s85cqk5lnczpw2"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) + (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.11.0"; sha256 = "0ynvaq3faqh4pirl0l8l6xq2ikk3f27xw05i8vm3vwamgy4p7k2f"; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.6.0"; sha256 = "0qvkwkbqz4dhkxsisanax1lwm3nzyyb4kgb40qczxbl8g251cjp2"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.6.0"; sha256 = "1yfvwygx795c9lswpiv8q19zydifarzljdmvv67vjmi559cm8b1q"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) @@ -136,7 +141,7 @@ (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0"; sha256 = "0gdsrzh8q8mxlm7sxvai7zshaz93a3dm1ha4cgs4845lfhpn8nhc"; }) (fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; }) (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; }) (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; }) @@ -144,16 +149,16 @@ (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.1-preview.108"; sha256 = "1hjscqn2kfgvn367drxzwssj5f5arn919x6clywbbf2dhggcdnn5"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "SPB"; version = "0.0.4-build28"; sha256 = "1ran6qwzlkv6xpvnp7n0nkva0zfrzwlcxj7zfzz9v8mpicqs297x"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "0.5.18"; sha256 = "0x68cs525k7c2dvj3vhjhx7bcls600xlsjkhfi7xvj0621masxa4"; }) - (fetchNuGet { pname = "Svg.Model"; version = "0.5.18"; sha256 = "1pqqaphdsjv4w9qlzb2i0kf0aas8778nlb4nysyiy5rdvpp7zzng"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "0.5.18"; sha256 = "0j1n096d49gd53j6zzngf5v81dnrdzaa4rx7fpmk8zp1xz2wjb2j"; }) + (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0"; sha256 = "0bmvgaqy4iaxw9x88ifx3a2zz0vw3p9w6pj4bk3xfnf5p9vjx1mr"; }) + (fetchNuGet { pname = "Svg.Model"; version = "1.0.0"; sha256 = "0yrjcqcrlgqpdm3bi59nc3fppcqgrfc7jddjwxjj2q423gimip97"; }) + (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0"; sha256 = "1bs2l9fjiqpip4qh0aw7x8f8m0ja0xlcj5vwd329knkww2jx1d3c"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) @@ -163,7 +168,7 @@ (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) @@ -186,12 +191,12 @@ (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Management"; version = "7.0.2"; sha256 = "0mjdkzl459hnz0qg4m0xp2kwizsqgdc9vc3xk7y7cv0znhhbb7bc"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) @@ -204,13 +209,11 @@ (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) @@ -218,6 +221,7 @@ (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) @@ -227,9 +231,8 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) @@ -253,7 +256,6 @@ (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) @@ -269,14 +271,12 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) (fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-fb78016"; sha256 = "1r43b5fd5q8xq8b5nk11jsz2gnm96dh7sxc0rrv2p605ivz7icin"; }) - (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.6.1"; sha256 = "0348gj9g5rl0pj2frx4vscj6602gfyn9ba3i1rmfcrxh9jwwa09m"; }) ] From 552fafbb315a1f605e95dc27f87159df5f618738 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 14 Aug 2023 12:44:21 +0300 Subject: [PATCH 046/189] linuxPackages.rtw88: 2022-11-05 -> 2023-07-23 --- pkgs/os-specific/linux/rtw88/default.nix | 8 ++++---- pkgs/top-level/linux-kernels.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index abe98927613f..a28a9f3d19e8 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "unstable-2022-11-05"; + version = "unstable-2023-07-23"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "c0dfe571fd7b307e036f186ef5711b4c0d9f3f08"; - sha256 = "1gc5nv5pyrfag826z36vsrbirg6iww99yx45pcgpp7rmrpbwamvg"; + rev = "9b6fe04a741a6b0a1edc5ca134927784bff033a5"; + hash = "sha256-OzaIy+WTrljwAhC73wEIRUXrkz1NrGNJAS3zofQyV6E="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "The newest Realtek rtlwifi codes"; + description = "Backport of the latest Realtek RTW88 driver from wireless-next for older kernels"; homepage = "https://github.com/lwfinger/rtw88"; license = with licenses; [ bsd3 gpl2Only ]; maintainers = with maintainers; [ tvorog atila ]; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c68f0345f112..bf2114130e74 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -442,7 +442,6 @@ in { rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; rtw88 = callPackage ../os-specific/linux/rtw88 { }; - rtlwifi_new = rtw88; rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null; From 30cfb7d36737d766dad1e0d6dc551cfeedf7433f Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 14 Aug 2023 13:23:38 +0200 Subject: [PATCH 047/189] portfolio: 0.64.5 -> 0.65.0 https://github.com/portfolio-performance/portfolio/releases/tag/0.65.0 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 88fcdfd50c29..b6b8166d2678 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.64.5"; + version = "0.65.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-dF8w5JyUNypLyPqFC6dWLArPjykvy9BPZnHYs6lyYQM="; + hash = "sha256-a1LL8RCxItrtsyQrJSbMEBPUwxKK6t8FXdFEhxGdvxw="; }; nativeBuildInputs = [ From d2ebdcb1bd10deb5949bc5e0a4f26e4d70d4f339 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 14 Aug 2023 09:23:34 -0400 Subject: [PATCH 048/189] typst-lsp: 0.9.0 -> 0.9.1 Diff: https://github.com/nvarner/typst-lsp/compare/v0.9.0...v0.9.1 Changelog: https://github.com/nvarner/typst-lsp/releases/tag/v0.9.1 --- .../language-servers/typst-lsp/Cargo.lock | 18 ++++++++++-------- .../language-servers/typst-lsp/default.nix | 16 ++++------------ 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index c7073c422c48..f09600ebe5be 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -96,9 +96,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", @@ -3045,9 +3045,9 @@ checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-lsp" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b38fb0e6ce037835174256518aace3ca621c4f96383c56bb846cfc11b341910" +checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508" dependencies = [ "async-trait", "auto_impl", @@ -3068,13 +3068,13 @@ dependencies = [ [[package]] name = "tower-lsp-macros" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34723c06344244474fdde365b76aebef8050bf6be61a935b91ee9ff7c4e91157" +checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -3267,10 +3267,11 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.9.0" +version = "0.9.1" dependencies = [ "anyhow", "async-compression", + "async-trait", "bpaf", "chrono", "comemo", @@ -3287,6 +3288,7 @@ dependencies = [ "opentelemetry", "opentelemetry-jaeger", "parking_lot", + "percent-encoding", "regex", "reqwest", "same-file", diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index e730ab24ce8b..20cbb146bcf1 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -1,21 +1,19 @@ { lib , rustPlatform , fetchFromGitHub -, pkg-config -, openssl , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-XV/LlibO+2ORle0lVcqqHrDdH75kodk9yOU3OsHFA+A="; + hash = "sha256-vzywUbfLyogJhjybiUEGJ2XESjDWE2fMfHM0uJxZC38="; }; cargoLock = { @@ -25,19 +23,13 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; checkFlags = [ # requires internet access - "--skip=workspace::package::external::repo::test::full_download" + "--skip=workspace::package::external::remote_repo::test::full_download" ]; meta = with lib; { From 7900a6ac9d404087c133bb57c3e67cc96924ed5f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 15:30:09 +0200 Subject: [PATCH 049/189] nextcloud: 27.0.1 -> 27.0.2 ChangeLog: https://nextcloud.com/changelog/#27-0-2 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 5c2ef84eb5fd..488d68c17c1c 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -72,8 +72,8 @@ in { }; nextcloud27 = generic { - version = "27.0.1"; - sha256 = "sha256-OXa16PWPk03b63zEmsM7Ea0629f21dCQig/DahYMJ70="; + version = "27.0.2"; + sha256 = "sha256-ei3OpDqjuPswM0fv2kxvN3M8yhE8juFt2fDl+2jHIS8="; packages = nextcloud27Packages; }; From ff8121a61576017efea042902d26597468c75525 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 15:30:59 +0200 Subject: [PATCH 050/189] nextcloudPackages*: update --- pkgs/servers/nextcloud/packages/25.json | 24 ++++++------- pkgs/servers/nextcloud/packages/26.json | 34 +++++++++--------- pkgs/servers/nextcloud/packages/27.json | 46 +++++++++++++++---------- 3 files changed, 57 insertions(+), 47 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index a951e2127d63..fd9143895c5e 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "00m00jm6x6kkwbn8v7v0yjmr7m5isizsyll4nqy409c1jvmhq2rq", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz", - "version": "4.4.3", + "sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", + "version": "4.4.4", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -80,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "1mcb3dw1kx7fd35hm30af88wkfwc5q6jfqph2vmf1a0k5nkjg7vc", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.4/groupfolders-v13.1.4.tar.gz", - "version": "13.1.4", + "sha256": "1yfhy14cfz16ax5i8d6zhl4m161qzy98xzm36y1656rh96i2ksbx", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.5/groupfolders-v13.1.5.tar.gz", + "version": "13.1.5", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "0fr72j4al8mi6fr7cdsyvvnp5cc39mphaaf3bcpkxy4a2v2hn2k0", - "url": "https://github.com/nextcloud/news/releases/download/21.2.0/news.tar.gz", - "version": "21.2.0", + "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", + "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", + "version": "22.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -280,9 +280,9 @@ ] }, "user_saml": { - "sha256": "0kf8h6z32x2gr87lm0l2cc7lghs8s222553lczxlfgj1xbi7486n", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.1/user_saml-v5.2.1.tar.gz", - "version": "5.2.1", + "sha256": "1gsq5mcn5nnxd56jlp4j2610gqq2gk3ma9yvhgy74wl0sqil98jd", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.2/user_saml-v5.2.2.tar.gz", + "version": "5.2.2", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 6da303e42389..6ae670aad2d7 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "00m00jm6x6kkwbn8v7v0yjmr7m5isizsyll4nqy409c1jvmhq2rq", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz", - "version": "4.4.3", + "sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", + "version": "4.4.4", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -80,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "1nmc6b4bv66b3dp1qfgw19qml70b81gb2bql5ff33jhamd8ihdh0", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.3/groupfolders-v14.0.3.tar.gz", - "version": "14.0.3", + "sha256": "00w3ri03d8kwnzzjgfbx8c5882gnw666nyxpjp4nq5rmr05m14s1", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.4/groupfolders-v14.0.4.tar.gz", + "version": "14.0.4", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -110,9 +110,9 @@ ] }, "mail": { - "sha256": "1scx48g1h209pp4flq837njdgcdh4dxwh2n9jzv48zax8i9yz961", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.4/mail-v3.2.4.tar.gz", - "version": "3.2.4", + "sha256": "044adgcsix1lkisk6lr6y1z7hiqb0p3sipwn16xilxy1cdnxwf5h", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.6/mail-v3.2.6.tar.gz", + "version": "3.2.6", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -120,8 +120,8 @@ ] }, "maps": { - "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", + "sha256": "0517kakkk7lr7ays6rrnl276709kcm5yvkp8g6cwjnfih7pmnkn9", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0-2a-nightly/maps-1.1.0-2a-nightly.tar.gz", "version": "1.1.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "0fr72j4al8mi6fr7cdsyvvnp5cc39mphaaf3bcpkxy4a2v2hn2k0", - "url": "https://github.com/nextcloud/news/releases/download/21.2.0/news.tar.gz", - "version": "21.2.0", + "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", + "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", + "version": "22.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -270,9 +270,9 @@ ] }, "user_saml": { - "sha256": "0kf8h6z32x2gr87lm0l2cc7lghs8s222553lczxlfgj1xbi7486n", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.1/user_saml-v5.2.1.tar.gz", - "version": "5.2.1", + "sha256": "1gsq5mcn5nnxd56jlp4j2610gqq2gk3ma9yvhgy74wl0sqil98jd", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.2/user_saml-v5.2.2.tar.gz", + "version": "5.2.2", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index a00e459d8570..27b3b202802c 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "00m00jm6x6kkwbn8v7v0yjmr7m5isizsyll4nqy409c1jvmhq2rq", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz", - "version": "4.4.3", + "sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", + "version": "4.4.4", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -80,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "13d4zqlfg2sq8j1jrq6lvsn8vx17825h3i3r88wi66ndsijz11dq", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.0.1/groupfolders-v15.0.1.tar.gz", - "version": "15.0.1", + "sha256": "1ghq09ym82i6w4w11zarx5m64axa3m1abwyzmmhz9zv1rlz5xjm4", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.0.2/groupfolders-v15.0.2.tar.gz", + "version": "15.0.2", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -110,9 +110,9 @@ ] }, "mail": { - "sha256": "1scx48g1h209pp4flq837njdgcdh4dxwh2n9jzv48zax8i9yz961", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.4/mail-v3.2.4.tar.gz", - "version": "3.2.4", + "sha256": "044adgcsix1lkisk6lr6y1z7hiqb0p3sipwn16xilxy1cdnxwf5h", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.6/mail-v3.2.6.tar.gz", + "version": "3.2.6", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -139,6 +139,16 @@ "agpl" ] }, + "news": { + "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", + "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", + "version": "22.0.0", + "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", + "homepage": "https://github.com/nextcloud/news", + "licenses": [ + "agpl" + ] + }, "notes": { "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", @@ -160,9 +170,9 @@ ] }, "onlyoffice": { - "sha256": "16vdbpylicdb8gz76j9sr8p15frwhdk0sd7sp0s3g6f49lb7fdrz", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.1.0/onlyoffice.tar.gz", - "version": "8.1.0", + "sha256": "1872y2fpz3hrmafhcc6n84d63j5wgzx2plpirr91z3a8650frf3m", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.2.0/onlyoffice.tar.gz", + "version": "8.2.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ @@ -210,9 +220,9 @@ ] }, "spreed": { - "sha256": "07bf6vmz957m2myazkvw63q40lisi14kyb42w4gpg3860ihr16sc", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.0.2/spreed-v17.0.2.tar.gz", - "version": "17.0.2", + "sha256": "02npdw77xbpmxr8nff4wpiz08155zcxbkd3awhzhl6gq00pigwrw", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.0.3/spreed-v17.0.3.tar.gz", + "version": "17.0.3", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -260,9 +270,9 @@ ] }, "user_saml": { - "sha256": "0kf8h6z32x2gr87lm0l2cc7lghs8s222553lczxlfgj1xbi7486n", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.1/user_saml-v5.2.1.tar.gz", - "version": "5.2.1", + "sha256": "1gsq5mcn5nnxd56jlp4j2610gqq2gk3ma9yvhgy74wl0sqil98jd", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.2/user_saml-v5.2.2.tar.gz", + "version": "5.2.2", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ From b4549bc909777d8ffd8c652cc9d2ae2f31e51cd5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 15:34:38 +0200 Subject: [PATCH 051/189] gitea: 1.20.1 -> 1.20.2 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.20.2 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 89cae801ec29..c017b360c36e 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.20.1"; + version = "1.20.2"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-LYOCNZJiGuMM1ly1Sp+0F8Us8LtAXzH5NzJf2CLcHck="; + hash = "sha256-a88ltflOcZQVWcEjC3r6rbPSk6LRtATcEQecYt/wg04="; }; vendorHash = null; From 7ea6850614c8aed4c554ac6ea3622f09ad8338d2 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Aug 2023 15:35:49 +0200 Subject: [PATCH 052/189] texstudio: 4.6.2 -> 4.6.3 --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 97f51014d0b6..b9a386684f9e 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-2bvKB/8HcZoTk2J6FQXXJREqGp6EZ95C2Aqcx9o/eho="; + hash = "sha256-L8N7T7FFfjT801HxbQiiC0ewW7vde4S0RVmNT2CWiWY="; }; nativeBuildInputs = [ From 6f0c6c95e90f099589b016c452a13d726dd1df4f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 15:37:27 +0200 Subject: [PATCH 053/189] wiki-js: 2.5.299 -> 2.5.300 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.300 Apparently they actually fixed their Node 18+ support, so we can drop the patchery 🎉 --- pkgs/servers/web-apps/wiki-js/default.nix | 39 +------------------ .../web-apps/wiki-js/drop-node-check.patch | 19 --------- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 pkgs/servers/web-apps/wiki-js/drop-node-check.patch diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 20fa13d1739f..b79dffc08371 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,48 +2,13 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.299"; + version = "2.5.300"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-GYe05dbR8RwCzPedeCMUQTWZ51roM/V2jUPPv7o7UEU="; + sha256 = "sha256-Cycq2oeB8v02VtE5KPs09+uzZqvGbJRH+J4YPDYo+yY="; }; - # Implements nodejs 18 support as it's not planned to fix this before - # the release of v3[1] which is planned to happen in 2023, but not before - # NixOS 23.05. However, in the lifespan of 23.05 v16 will get EOLed, so - # we have to hack this on our own. - # - # The problem we fix here is that `exports."/public/"` in a `package.json` - # is prohibited, i.e. you cannot export full directories anymore. - # - # Unfortunately it's non-trivial to fix this because v10 of `extract-files` - # (where the problem is fixed) doesn't work for graphql-tools (which depends - # on this). Updating this as well is also quite complex because in later - # versions the package was split up into multiple smaller packages and - # thus a lot of parts of the code-base would need to be changed accordingly. - # - # Since this is the only breaking change of nodejs 17/18[2][3], this workaround - # will be necessary until we can upgrade to v3. - # - # [1] https://github.com/requarks/wiki/discussions/6388 - # [2] https://nodejs.org/en/blog/release/v17.0.0 - # [3] https://nodejs.org/en/blog/release/v18.0.0 - patches = [ ./drop-node-check.patch ]; - nativeBuildInputs = [ jq moreutils ]; - postPatch = '' - # Dirty hack to implement nodejs-18 support. - <./node_modules/extract-files/package.json jq ' - # error out loud if the structure has changed and we need to change - # this expression - if .exports|has("./public/")|not then - halt_error(1) - else - .exports."./public/*" = "./public/*.js" | del(.exports."./public/") - end - ' | sponge ./node_modules/extract-files/package.json - ''; - sourceRoot = "."; dontBuild = true; diff --git a/pkgs/servers/web-apps/wiki-js/drop-node-check.patch b/pkgs/servers/web-apps/wiki-js/drop-node-check.patch deleted file mode 100644 index 227649ba10d2..000000000000 --- a/pkgs/servers/web-apps/wiki-js/drop-node-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/server/index.js b/server/index.js -index 7cdb4f80..161ebeb7 100644 ---- a/server/index.js -+++ b/server/index.js -@@ -8,14 +8,6 @@ const { nanoid } = require('nanoid') - const { DateTime } = require('luxon') - const { gte } = require('semver') - --// ---------------------------------------- --// Check Node.js version --// ---------------------------------------- --if (gte(process.version, '18.0.0')) { -- console.error('You\'re using an unsupported Node.js version. Please read the requirements.') -- process.exit(1) --} -- - // ---------------------------------------- - // Init WIKI instance - // ---------------------------------------- From 4fba496c6a63e6a8a4fb8abb6f85f333f5dc0e3a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 15:56:36 +0200 Subject: [PATCH 054/189] nextcloud25: 25.0.9 -> 25.0.10 ChangeLog: https://nextcloud.com/changelog/#25-0-10 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 488d68c17c1c..871fda08b40b 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -60,8 +60,8 @@ in { ''; nextcloud25 = generic { - version = "25.0.9"; - sha256 = "sha256-k5XVM0ABRtAiCNoPNvkpYxq16Nb9Xd/VXNpqIDWg/nA="; + version = "25.0.10"; + sha256 = "sha256-alvh0fWESSS5KbfiKI1gaoahisDWnfT/bUhsSEEXfQI="; packages = nextcloud25Packages; }; From 986c328056c73bb74ad68f2298f7b31055082ff6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 15:57:10 +0200 Subject: [PATCH 055/189] nextcloud26: 26.0.4 -> 26.0.5 ChangeLog: https://nextcloud.com/changelog/#26-0-4 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 871fda08b40b..1093d49b3202 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -66,8 +66,8 @@ in { }; nextcloud26 = generic { - version = "26.0.4"; - sha256 = "sha256-gBya6RLPYmS+csFB5BjT2H1OZxx6ndZDAI9dfWmR6i4="; + version = "26.0.5"; + sha256 = "sha256-nhq0aAY4T1hUZdKJY66ZSlirCSgPQet8YJpciwJw1b4="; packages = nextcloud26Packages; }; From 75dda16dff1b1cc147ad6a2a30897531f1a566f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 16:11:46 +0200 Subject: [PATCH 056/189] python311Packages.qcodes: 0.39.0 -> 0.39.1 Changelog: https://github.com/QCoDeS/Qcodes/releases/tag/v0.39.1 --- .../python-modules/qcodes/default.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 75042a72d8d7..fb70d6d1f788 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -53,14 +53,14 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.39.0"; + version = "0.39.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zKn9LN7FBxKUfYSxUV1O6fB2s/B5bQpGDZTrK4DcxmU="; + sha256 = "sha256-2gJ/WeynabiGB1Z66+qaUbf6/1wogf/XjIE2mCAXUZY="; }; postPatch = '' @@ -78,8 +78,9 @@ buildPythonPackage rec { broadbean h5netcdf h5py - ipywidgets ipykernel + ipython + ipywidgets jsonschema matplotlib numpy @@ -87,18 +88,17 @@ buildPythonPackage rec { opencensus-ext-azure packaging pandas + pillow pyvisa + rsa ruamel-yaml tabulate - typing-extensions tqdm + typing-extensions uncertainties websockets wrapt xarray - ipython - pillow - rsa ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; @@ -134,10 +134,22 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # depends on qcodes-loop, causing a cyclic dependency + # Test depends on qcodes-loop, causing a cyclic dependency "qcodes/tests/dataset/measurement/test_load_legacy_data.py" ]; + disabledTests = [ + # Tests are time-sensitive and power-consuming + # Those tests fails repeatably + "test_access_channels_by_slice" + "test_do1d_additional_setpoints_shape" + "test_dond_1d_additional_setpoints_shape" + "test_field_limits" + "test_get_array_in_scalar_param_data" + "test_get_parameter_data" + "test_ramp_safely" + ]; + pythonImportsCheck = [ "qcodes" ]; @@ -147,8 +159,8 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "https://qcodes.github.io/Qcodes/"; description = "Python-based data acquisition framework"; + homepage = "https://qcodes.github.io/Qcodes/"; changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ evilmav ]; From c6edc47816e5986ef2166220d2af135b7a210c5b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 16:11:53 +0200 Subject: [PATCH 057/189] prometheus-redis-exporter: 1.51.0 -> 1.52.0 ChangeLog: https://github.com/oliver006/redis_exporter/releases/tag/v1.52.0 --- .../monitoring/prometheus/redis-exporter.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index b6641914ad35..e256c8e2c789 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,25 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "redis_exporter"; - version = "1.51.0"; + version = "1.52.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-NvkAwUrygjys25lcTxtRnrex4+XIK2yzqKkk26f4cmE="; + sha256 = "sha256-DVl67+pouQHg26vF5ONntPjQfyxnLusI3LTpT96ogNw="; }; - patches = [ - # https://github.com/oliver006/redis_exporter/pull/812 - (fetchpatch { - url = "https://github.com/Ma27/redis_exporter/commit/250b2e9febbadef326ca9ae68c372dfaabd53ca9.patch"; - sha256 = "sha256-G1OIUwlFZ06UWudWvc6v1YFcRz05ji1326nUcd9zYDc="; - }) - ]; - - vendorHash = "sha256-S7cEaFBgyvDmsNq+NvqtC8I2SRL/ngXUuNdx6TN/riI="; + vendorHash = "sha256-nezvUbKZ8yi7Etp/dg3sT2g5bWBFMYZimt31NT91BEo="; ldflags = [ "-X main.BuildVersion=${version}" From 0e5416a459907e48abc49050335b271f3e93bd90 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 16:12:31 +0200 Subject: [PATCH 058/189] prometheus-postgres-exporter: 0.13.1 -> 0.13.2 ChangeLog: https://github.com/prometheus-community/postgres_exporter/releases/tag/v0.13.2 --- pkgs/servers/monitoring/prometheus/postgres-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index a2c542b1e871..52589af2da7e 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-DBb15rtwrR+jixbnZEfhQUkCo+N+kPiZ60VxtNoL90c="; + sha256 = "sha256-K0B6EsRCWznYf4xS+9T4HafOSUPHCNsu2ZSIVXneGyk="; }; vendorHash = "sha256-0MQS42/4iImtq3yBGVCe0BwV0HiJCo7LVEAbsKltE4g="; From 5137587585bbc76f585f4383888ecc8718f805ee Mon Sep 17 00:00:00 2001 From: francescoDeSimone Date: Mon, 14 Aug 2023 17:12:35 +0200 Subject: [PATCH 059/189] duplicati: 2.0.6.3 -> 2.0.7.1 --- pkgs/tools/backup/duplicati/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index edea1e4b8634..74f47499526f 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "duplicati"; - version = "2.0.6.3"; + version = "2.0.7.1"; channel = "beta"; - build_date = "2021-06-17"; + build_date = "2023-05-25"; src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - sha256 = "sha256-usMwlmer6rLgP46wGVkaAIocUW4MjuEpVWdX7rRcghg="; + sha256 = "sha256-isPmRC6N+gEZgvJ0bgeFf5kOQJsicZOsGnT+CAGgg+U="; stripRoot = false; }; From ce0123ad6c2ab2e1510e234e16f491eae1eb9536 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 14 Aug 2023 11:13:23 -0400 Subject: [PATCH 060/189] typos: 1.16.4 -> 1.16.5 Diff: https://github.com/crate-ci/typos/compare/v1.16.4...v1.16.5 Changelog: https://github.com/crate-ci/typos/blob/v1.16.5/CHANGELOG.md --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 57b23899155e..3904d45a7191 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.4"; + version = "1.16.5"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-/LEE+54ppv/jkUgpuMReorQA9D4KAuPG04E8lIk7upA="; + hash = "sha256-KRu9hbMwfLug827r0OnrRQIiF0y6Qq6Llb5F1rwQdt4="; }; - cargoHash = "sha256-hvFDmtNweTXQEgu5ng/lBVu7OPnA8hA8h6HFvGxCJIE="; + cargoHash = "sha256-oBl8FTgxTK8czIExMsAHgJyHsfEzyoDRiAhH9R5tHKw="; meta = with lib; { description = "Source code spell checker"; From a007a8850b981de1c3e6f87e0b4dc1035d79bd47 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 15 Aug 2023 00:46:29 +0900 Subject: [PATCH 061/189] python310Packages.treeo: mark as broken --- pkgs/development/python-modules/treeo/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index 30a90bd36eea..1560e1810ba6 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -53,5 +53,7 @@ buildPythonPackage rec { homepage = "https://github.com/cgarciae/treeo"; license = licenses.mit; maintainers = with maintainers; [ ndl ]; + # obsolete as of 2023-02-27 and not updated for more than a year as of 2023-08 + broken = true; }; } From 877980c41089488cc5eb9684e127c998dcbfd932 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 14 Aug 2023 18:40:50 +0200 Subject: [PATCH 062/189] linuxPackage.nvidia_x11*: Remove another nvidia-settings library --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 07a9961a1bab..b7824f209776 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -64,6 +64,7 @@ installPhase() { for i in $lib32 $out; do rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately rm -f $i/lib/libnvidia-gtk* # built from source + rm -f $i/lib/libnvidia-wayland-client* # built from source if [ "$useGLVND" = "1" ]; then # Pre-built libglvnd rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.* From 2249c1e5dc72467dda4339a5d92759b6e94eba22 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 14 Aug 2023 19:00:07 +0200 Subject: [PATCH 063/189] linuxPackage.nvidia_x11.settings: nixpkgs-fmt and add opengl runpath --- .../os-specific/linux/nvidia-x11/settings.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 5570228d78bf..a052cf0e48f3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,9 +1,25 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, m4, jansson, gtk2, dbus, gtk3 -, libXv, libXrandr, libXext, libXxf86vm, libvdpau -, librsvg, wrapGAppsHook -, withGtk2 ? false, withGtk3 ? true +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, pkg-config +, m4 +, jansson +, gtk2 +, dbus +, gtk3 +, libXv +, libXrandr +, libXext +, libXxf86vm +, libvdpau +, librsvg +, wrapGAppsHook +, addOpenGLRunpath +, withGtk2 ? false +, withGtk3 ? true }: let @@ -69,10 +85,10 @@ stdenv.mkDerivation { fi ''; - nativeBuildInputs = [ pkg-config m4 ]; + nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ]; buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] - ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; + ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; installFlags = [ "PREFIX=$(out)" ]; @@ -100,6 +116,8 @@ stdenv.mkDerivation { postFixup = '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \ $out/bin/$binaryName + + addOpenGLRunpath $out/bin/$binaryName ''; passthru = { From 1302818fee73d235624135f55da320b2aeb8981c Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 14 Aug 2023 13:27:06 -0400 Subject: [PATCH 064/189] ripdrag: 0.4.0 -> 0.4.1 Diff: https://github.com/nik012003/ripdrag/compare/v0.4.0...v0.4.1 Changelog: https://github.com/nik012003/ripdrag/releases/tag/v0.4.1 --- pkgs/tools/misc/ripdrag/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index b80e9f974d48..1901f47e5505 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -1,15 +1,17 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, wrapGAppsHook4, gtk4 }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, wrapGAppsHook4, gtk4 }: rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.4.0"; + version = "0.4.1"; - src = fetchCrate { - inherit pname version; - hash = "sha256-9VGvwMovJb1IIpwf+1FxcxnPcmPl+59jfQC6365E95s="; + src = fetchFromGitHub { + owner = "nik012003"; + repo = "ripdrag"; + rev = "v${version}"; + hash = "sha256-Omq5y6ECo+3thhz88IMZJGkRNlAEuMAMbljVKXzxSQc="; }; - cargoHash = "sha256-kxT0wJodPiHXX/bsvrlPbyfUbxPBgmv68a8I5pKOwEg="; + cargoHash = "sha256-NQHFnA/9K8V8sxX9Lzoh6tuKvMmx7FMd8lTTPiQ+xnU="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; @@ -18,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An application that lets you drag and drop files from and to the terminal"; homepage = "https://github.com/nik012003/ripdrag"; + changelog = "https://github.com/nik012003/ripdrag/releases/tag/${src.rev}"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; }; From db78e8cdf6615c803a70f5ea948c64256ba664c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Aug 2023 11:02:32 -0700 Subject: [PATCH 065/189] libdeltachat: 1.118.0 -> 1.119.1 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.118.0...v1.119.1 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.119.1/CHANGELOG.md --- .../libraries/libdeltachat/Cargo.lock | 20 +++++++++---------- .../libraries/libdeltachat/default.nix | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 735db14604c5..f2528c30384e 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -1123,7 +1123,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.118.0" +version = "1.119.1" dependencies = [ "ansi_term", "anyhow", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.118.0" +version = "1.119.1" dependencies = [ "anyhow", "async-channel", @@ -1223,7 +1223,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.118.0" +version = "1.119.1" dependencies = [ "ansi_term", "anyhow", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.118.0" +version = "1.119.1" dependencies = [ "anyhow", "deltachat", @@ -1263,7 +1263,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.118.0" +version = "1.119.1" dependencies = [ "anyhow", "deltachat", @@ -4958,14 +4958,14 @@ dependencies = [ [[package]] name = "tokio-tar" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50188549787c32c1c3d9c8c71ad7e003ccf2f102489c5a96e385c84760477f4" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" dependencies = [ "filetime", "futures-core", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "tokio", "tokio-stream", "xattr", @@ -5778,9 +5778,9 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 562f45048aab..96ef2f6cd427 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.118.0"; + version = "1.119.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-1vkmz7LFG420zYETYIf3ayOQEPp+hz7Dr7gULz1nJOs="; + hash = "sha256-LP5h99qldf9QoRDmo581H+sUx1QsD6nOGt1ES3Fr/6E="; }; patches = [ From d81f7def9459efd2cbc73716c2a4d28c9fffcbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Aug 2023 11:06:02 -0700 Subject: [PATCH 066/189] deltachat-desktop: 1.38.1 -> 1.40.0 Diff: https://github.com/deltachat/deltachat-desktop/compare/v1.38.1...v1.40.0 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.40.0/CHANGELOG.md --- .../instant-messengers/deltachat-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 3dd30751cd0d..6ad5b5ddc153 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -33,16 +33,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.38.1"; + version = "1.40.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-nXYXjq6bLGvH4m8ECwxfkcUjOsUUj07bt3NFb3oD0Gw="; + hash = "sha256-QvSBM2zR/LcQ2wtkh6mtlU8iqYmZfv6U5bRyMYjLZhE="; }; - npmDepsHash = "sha256-fQKFSWljHHPp1A8lcxVxrMVESuTiB3GkSWDb98yCZz4="; + npmDepsHash = "sha256-lxyXfPNu5U+0cge+cwcXHIJv+gVXCSzc5t/2c4IQxNM="; nativeBuildInputs = [ makeWrapper From c28d2906d454dee59918a0b8322a6fa1dc9aee58 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 14 Aug 2023 14:23:10 -0400 Subject: [PATCH 067/189] ztags: init at unstable-2023-08-03 https://github.com/gpanders/ztags --- pkgs/development/tools/misc/ztags/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/misc/ztags/default.nix diff --git a/pkgs/development/tools/misc/ztags/default.nix b/pkgs/development/tools/misc/ztags/default.nix new file mode 100644 index 000000000000..589e9c0062b2 --- /dev/null +++ b/pkgs/development/tools/misc/ztags/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, zig_0_11 +}: + +stdenv.mkDerivation { + pname = "ztags"; + version = "unstable-2023-08-03"; + + src = fetchFromGitHub { + owner = "gpanders"; + repo = "ztags"; + rev = "6ef039047f6580772c5ff97e8770d919dc07a4fa"; + hash = "sha256-WuDEHzNU3I4VPHEAkRdIUE5LPbQEKbUnITdFutGV58Y="; + }; + + nativeBuildInputs = [ + zig_0_11.hook + ]; + + meta = with lib; { + description = "Generate tags files for Zig projects"; + homepage = "https://github.com/gpanders/ztags"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "ztags"; + inherit (zig_0_11.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9942cd0dc795..8c7f1fcf923d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20339,6 +20339,8 @@ with pkgs; zon2nix = callPackage ../tools/nix/zon2nix { }; + ztags = callPackage ../development/tools/misc/ztags { }; + ### DEVELOPMENT / LIBRARIES a52dec = callPackage ../development/libraries/a52dec { }; From 8f24fc203767d48eecdb94c62025c88e964d95ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Aug 2023 12:07:18 -0700 Subject: [PATCH 068/189] python310Packages.spsdk: 1.10.1 -> 1.11.0 Diff: https://github.com/nxp-mcuxpresso/spsdk/compare/refs/tags/1.10.1...1.11.0 Changelog: https://github.com/nxp-mcuxpresso/spsdk/blob/1.11.0/docs/release_notes.rst --- pkgs/development/python-modules/spsdk/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 2177ebc97220..4aafc2e6c131 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -17,10 +17,12 @@ , deepmerge , fastjsonschema , hexdump +, importlib-metadata , jinja2 , libusbsio , oscrypto , pycryptodome +, pyftdi , pylink-square , pyocd , pypemicro @@ -34,13 +36,13 @@ buildPythonPackage rec { pname = "spsdk"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { - owner = "NXPmicro"; + owner = "nxp-mcuxpresso"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2UTgVHqFJqizJ6mDT7+PFec3bQexcBG6v8X0E5Ai4Hc="; + hash = "sha256-B3qedAXSG3A8rcWu1O2GnZ1ZqHN+7fQK43qXzGnDEY0="; }; nativeBuildInputs = [ @@ -92,6 +94,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + importlib-metadata + pyftdi pytestCheckHook voluptuous ]; @@ -99,8 +103,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "spsdk" ]; meta = with lib; { + changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; - homepage = "https://github.com/NXPmicro/spsdk"; + homepage = "https://github.com/nxp-mcuxpresso/spsdk"; license = licenses.bsd3; maintainers = with maintainers; [ frogamic sbruder ]; }; From a306dbd89e1b6f2739fe39fb39a8b430bc65556b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 May 2023 15:26:48 +0200 Subject: [PATCH 069/189] python311Packages.awesomeversion: add changelog to meta --- pkgs/development/python-modules/awesomeversion/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index d838a0f28750..159f06ddb393 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-3bHE3U4MM/fQM9zBYfoLpAObay82vchjX9FpJukMGNg="; }; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to deal with versions"; homepage = "https://github.com/ludeeus/awesomeversion"; + changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 9a2a6044bf0db95b302f0c437c0db195783ecc9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Aug 2023 12:59:50 -0700 Subject: [PATCH 070/189] pynitrokey: unpin click version --- pkgs/tools/security/pynitrokey/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index b0a40fba9dcb..337d08da9624 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -46,6 +46,7 @@ buildPythonApplication rec { ]; pythonRelaxDeps = [ + "click" "cryptography" "protobuf" "python-dateutil" From bc7c971b7e53dd9be55612b4c2c2295e1e19f1f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 18:19:26 +0200 Subject: [PATCH 071/189] python311Packages.okta: 2.8.0 -> 2.9.2 Changelog: https://github.com/okta/okta-sdk-python/blob/v2.9.2/CHANGELOG.md --- .../python-modules/okta/default.nix | 58 +++++++++++-------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index 42b4738fe6fa..f2e19e4a6340 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -1,58 +1,69 @@ { lib , stdenv -, buildPythonPackage -, fetchPypi -# install requirements -, pycryptodome -, yarl -, flatdict -, python-jose , aenum , aiohttp +, buildPythonPackage +, fetchPypi +, flatdict +, pycryptodome +, pycryptodomex , pydash -, xmltodict -, pyyaml -# test requirements -, pytestCheckHook -, pytest-recording +, pyfakefs , pytest-asyncio , pytest-mock -, pyfakefs +, pytest-recording +, pytestCheckHook +, python-jose +, pythonOlder +, pyyaml +, xmltodict +, yarl }: buildPythonPackage rec { pname = "okta"; - version = "2.8.0"; + version = "2.9.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yIVJoKX9b9Y7Ydl28twHxgPbUa58LJ12Oz3tvpU7CAc="; + hash = "sha256-kbzqriybzN/86vov3Q+kH2lj9plK1GzWPlc/Nc/nWF0="; }; propagatedBuildInputs = [ - pycryptodome - yarl - flatdict - python-jose aenum aiohttp + flatdict + pycryptodome + pycryptodomex pydash - xmltodict + python-jose pyyaml + xmltodict + yarl ]; checkInputs = [ - pytestCheckHook + pyfakefs pytest-asyncio pytest-mock pytest-recording - pyfakefs + pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; + pytestFlagsArray = [ + "tests/" + ]; disabledTests = [ "test_client_raise_exception" + # vcr.errors.CannotOverwriteExistingCassetteException: Can't overwrite existing cassette + "test_get_org_contact_user" + "test_update_org_contact_user" + "test_get_role_subscription" + "test_subscribe_unsubscribe" ]; pythonImportsCheck = [ @@ -68,6 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for the Okta Management API"; homepage = "https://github.com/okta/okta-sdk-python"; + changelog = "https://github.com/okta/okta-sdk-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ jbgosselin ]; }; From 9e7f179d416b424b147da79938e59b1c7d81108b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 21:45:44 +0200 Subject: [PATCH 072/189] python311Packages.vulcan-api: fix issue with cchardet/faust-cchardet --- pkgs/development/python-modules/vulcan-api/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index eeeb24688811..a7ed68b16a1c 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , pyopenssl , pythonOlder +, pythonRelaxDepsHook , pytz , related , requests @@ -28,6 +29,14 @@ buildPythonPackage rec { hash = "sha256-5Tj611p4wYn7GjoCtCTRhUZkKyAJglHcci76ciVFWik="; }; + pythonRemoveDeps = [ + "faust-cchardet" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ aenum aiodns From b315d0a03d8d0bc5f92894f170d55f05ac8e2a10 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 13 Aug 2023 22:33:06 -0400 Subject: [PATCH 073/189] python310Packages.ax: 0.3.2 -> 0.3.4 --- pkgs/development/python-modules/ax/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix index be254b3db9ce..e9ca9dba6ca7 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ax"; - version = "0.3.2"; + version = "0.3.4"; format = "pyproject"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = version; - hash = "sha256-1KLLjeUktXvIDOlTQzMmpbL/On8PTxZQ44Qi4BT3nPk="; + hash = "sha256-Yc6alEKXbtQ0hitIdPhkJWhZQg150b0NJJRLZ+f1hdY="; }; nativeBuildInputs = [ @@ -66,6 +66,10 @@ buildPythonPackage rec { "--ignore=ax/service/tests/test_with_db_settings_base.py" "--ignore=ax/storage" ]; + disabledTests = [ + # exact comparison of floating points + "test_optimize_l0_homotopy" + ]; pythonImportsCheck = [ "ax" ]; meta = with lib; { From 6729fcf0b457bed77bdae316392eff7f1a03218e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 14 Aug 2023 22:23:34 +0200 Subject: [PATCH 074/189] maintainers/team-list: add GaetanLepage to jupyter team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7d6df479d6ed..859eaf9e60a7 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -413,6 +413,7 @@ with lib.maintainers; { jupyter = { members = [ + GaetanLepage natsukium ]; scope = "Maintain Jupyter and related packages."; From ebb53eb4220ed4753cb90ad8d8d33579780d86f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:32:38 +0200 Subject: [PATCH 075/189] python311Packages.boschshcpy: 0.2.57 -> 0.2.60 Diff: https://github.com/tschamm/boschshcpy/compare/0.2.57...0.2.60 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 0c76607137cd..8d0f0b21590e 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.57"; + version = "0.2.60"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-/TD5zvvtOkoVG+EJzNNSMbOKXm78Di9tDrBIxpN4wbg="; + hash = "sha256-RCHOkTBnJcqGc3Y0cQhkgkizuqNl98MU8lxpVoHVLcc="; }; propagatedBuildInputs = [ From 125aaaa2519bb0e25338e4dd4017cd4e844da9a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:33:07 +0200 Subject: [PATCH 076/189] python311Packages.bthome-ble: 3.0.0 -> 3.1.0 Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/refs/tags/v3.0.0...v3.1.0 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v3.1.0/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 31774f941983..282f0dc09100 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.0.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-dLXeJojGeiwPPxXES1qzay1kC/YiI6pKyxKD2z32Av8="; + hash = "sha256-CcLb+2UOLKwfBw3E51LJUZmLqpBw85nLXl1J/oFfEVs="; }; nativeBuildInputs = [ From e48398dfb99cac1bbf7ad4664a39084b771ff3de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:33:52 +0200 Subject: [PATCH 077/189] python311Packages.mypy-boto3-ebs: 1.28.13 -> 1.28.16 --- pkgs/development/python-modules/mypy-boto3-ebs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix index 62b26ff2d21b..56734b6a9d52 100644 --- a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-ebs"; - version = "1.28.13"; + version = "1.28.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GhOEPhx4zD5jXyTMH75DOq0UL4LgOMkJn0U5nKciNMI="; + hash = "sha256-PJkVweQPGGR3NwCpg/O+Cs822XU6awMfUL6wWwT6e0w="; }; propagatedBuildInputs = [ From 144482aebd86aa64335772b2976d5fec29512a82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:38:09 +0200 Subject: [PATCH 078/189] python311Packages.pylitterbot: 2023.4.3 -> 2023.4.4 Diff: https://github.com/natekspencer/pylitterbot/compare/refs/tags/v2023.4.3...v2023.4.4 Changelog: https://github.com/natekspencer/pylitterbot/releases/tag/v2023.4.4 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 4f70a25afabf..0a8b27e5cbbb 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.4.3"; + version = "2023.4.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pUtOLQ4ftG0tYPued12CqKGt3LKyfmLPxIYKvkYg1nI="; + hash = "sha256-Vsnxb597HOu1zHXqZjC3rsjyEQYoSNQcXiArzqOWBUQ="; }; nativeBuildInputs = [ From 89ca95f00b482970ee8bc5f5f9c7febd746bdc31 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:39:13 +0200 Subject: [PATCH 079/189] python311Packages.pyschlage: 2023.7.0 -> 2023.8.1 Diff: https://github.com/dknowles2/pyschlage/compare/refs/tags/2023.7.0...2023.8.1 Changelog: https://github.com/dknowles2/pyschlage/releases/tag/2023.8.1 --- pkgs/development/python-modules/pyschlage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index abc30c72ce84..ff0d39fa7e32 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.7.0"; + version = "2023.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-PH8ClpuYwTu+34hSPPwI1KMFut6UaxWVrbf38LYb9EQ="; + hash = "sha256-PTkuVGUdqRcvgcIL7yoVWNLQcWyDpXXHLxb7CoD8J1s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 64e8ab0cb598bd58163340b932b5ed52303cced4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:47:15 +0200 Subject: [PATCH 080/189] python311Packages.twilio: 8.5.0 -> 8.6.0 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/8.5.0...8.6.0 Changelog: https://github.com/twilio/twilio-python/blob/8.6.0/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 81b2f1afd141..fadf2ef3818c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.5.0"; + version = "8.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-tU4nyjo1DC7F2UvaV6Hn/Nqxbm8OR1E1qtUGMVgZ8U8="; + hash = "sha256-ATspn/cY9DJahcsesnzwDOCEKYoUbqSoeOR3+kLou0s="; }; propagatedBuildInputs = [ From 6d3e7145f7207679667b140db61c00ed146e26e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:54:06 +0200 Subject: [PATCH 081/189] python311Packages.caldav: 1.2.1 -> 1.3.6 Diff: https://github.com/python-caldav/caldav/compare/refs/tags/v1.2.1...v1.3.6 Changelog: https://github.com/python-caldav/caldav/releases/tag/v1.3.6 --- pkgs/development/python-modules/caldav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index c53eb0e20bce..15daa3b0697c 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "caldav"; - version = "1.2.1"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "python-caldav"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nA7if28M4rDZwlF+ga/1FqD838zeu0OblrPUer3w3qM="; + hash = "sha256-N3pY3UYxOZgZbXqqsvASej12dOtdpyEHOL10btOKm/w="; }; propagatedBuildInputs = [ From bc018252ffdfc8e4015aaa7ba938dbfbe015d21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Aug 2023 13:49:41 -0700 Subject: [PATCH 082/189] python310Packages.ocrmypdf: 14.3.0 -> 14.4.0 Diff: https://github.com/ocrmypdf/OCRmyPDF/compare/v14.3.0...v14.4.0 Changelog: https://github.com/ocrmypdf/OCRmyPDF/blob/v14.4.0/docs/release_notes.rst --- pkgs/development/python-modules/ocrmypdf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index a9eeef0c55de..58d77f7712d0 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, coloredlogs , deprecation , fetchFromGitHub , ghostscript @@ -17,6 +16,7 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, rich , reportlab , setuptools , setuptools-scm @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.3.0"; + version = "14.4.0"; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-OUz19N2YIl7iwayjulx0v1K00jB5SdWo8m5XiJ9BDSs="; + hash = "sha256-i1ZUBKR8dJXZkALUFwkzYcjtZ5Li66DfD2fupCGRQC4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -69,7 +69,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - coloredlogs deprecation img2pdf packaging @@ -78,6 +77,7 @@ buildPythonPackage rec { pillow pluggy reportlab + rich tqdm ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources From 8fab18d4c153d7bd4fbb42fd81465be9206ce067 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 14 Aug 2023 23:29:00 +0200 Subject: [PATCH 083/189] lib.removePrefix: Add tests --- lib/tests/misc.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index dcfa4c540f0c..6d55ae684771 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -349,6 +349,27 @@ runTests { expected = true; }; + testRemovePrefixExample1 = { + expr = removePrefix "foo." "foo.bar.baz"; + expected = "bar.baz"; + }; + testRemovePrefixExample2 = { + expr = removePrefix "xxx" "foo.bar.baz"; + expected = "foo.bar.baz"; + }; + testRemovePrefixEmptyPrefix = { + expr = removePrefix "" "foo"; + expected = "foo"; + }; + testRemovePrefixEmptyString = { + expr = removePrefix "foo" ""; + expected = ""; + }; + testRemovePrefixEmptyBoth = { + expr = removePrefix "" ""; + expected = ""; + }; + testNormalizePath = { expr = strings.normalizePath "//a/b//c////d/"; expected = "/a/b/c/d/"; From 150217c1ac10fbef93e03694f6955029249c9aa4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 14 Aug 2023 23:29:18 +0200 Subject: [PATCH 084/189] lib.removePrefix: Optimise --- lib/strings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 1eb6cf9c1afb..df891c899887 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -629,10 +629,10 @@ rec { This behavior is deprecated and will throw an error in the future.'' (let preLen = stringLength prefix; - sLen = stringLength str; in if substring 0 preLen str == prefix then - substring preLen (sLen - preLen) str + # -1 will take the string until the end + substring preLen (-1) str else str); From 9bd3f4c03057b8e6b8bed7843fc016fdf700014d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 23:42:48 +0200 Subject: [PATCH 085/189] python311Packages.backports-strenum: init at 1.2.4 --- .../backports-strenum/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/backports-strenum/default.nix diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix new file mode 100644 index 000000000000..a23a79024a48 --- /dev/null +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, wheel +}: + +buildPythonPackage rec { + pname = "backports-strenum"; + version = "1.2.4"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "clbarnes"; + repo = "backports.strenum"; + rev = "refs/tags/v${version}"; + hash = "sha256-AhAMVawnBMJ45a3mpthUZvqTeqeCB1Uco4MSusLyA4E="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "backports.strenum" + ]; + + meta = with lib; { + description = "Base class for creating enumerated constants that are also subclasses of str"; + homepage = "https://github.com/clbarnes/backports.strenum"; + license = with licenses; [ psfl ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a69194411de..1dab3acea718 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1211,6 +1211,8 @@ self: super: with self; { backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; + backports-strenum = callPackage ../development/python-modules/backports-strenum { }; + backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { }; bacpypes = callPackage ../development/python-modules/bacpypes { }; From 519c64b1be76fccf0a2722c011509aeae506d638 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Aug 2023 23:36:42 +0200 Subject: [PATCH 086/189] nextcloudPackages*: pin `maps` to stable 1.1.0 No idea what this gibberish disguised as tag is, but nc4nix doesn't seem to cope well with it. For now, let's pin `maps` to the stable 1.1 release (as it's the case for nextcloud27 already) since 1.1 is supported for all of v25 to v27[1], so this seems reasonable to do. [1] https://github.com/nextcloud/maps/blob/v1.1.0/appinfo/info.xml#L36 --- pkgs/servers/nextcloud/packages/25.json | 4 ++-- pkgs/servers/nextcloud/packages/26.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index fd9143895c5e..0c4d462b8b87 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -120,8 +120,8 @@ ] }, "maps": { - "sha256": "0517kakkk7lr7ays6rrnl276709kcm5yvkp8g6cwjnfih7pmnkn9", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0-2a-nightly/maps-1.1.0-2a-nightly.tar.gz", + "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", "version": "1.1.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 6ae670aad2d7..1a913713dd20 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -120,8 +120,8 @@ ] }, "maps": { - "sha256": "0517kakkk7lr7ays6rrnl276709kcm5yvkp8g6cwjnfih7pmnkn9", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0-2a-nightly/maps-1.1.0-2a-nightly.tar.gz", + "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", "version": "1.1.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", From 4eceab09f427f6d5050dff286902ba728dfd1e11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 23:44:40 +0200 Subject: [PATCH 087/189] python311Packages.pyoverkiz: 1.9.1 -> 1.10.1 Diff: https://github.com/iMicknl/python-overkiz-api/compare/refs/tags/v1.9.1...v1.10.1 Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.10.1 --- pkgs/development/python-modules/pyoverkiz/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 7f261a3cfd1b..4dae164a0501 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -2,6 +2,7 @@ , aiohttp , attrs , backoff +, backports-strenum , boto3 , buildPythonPackage , fetchFromGitHub @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.9.1"; + version = "1.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-03tbWCkSAG/aE6hsPxCPuGRFPTiMgkp/tCzWScPW8YE="; + hash = "sha256-tb0xU1H1VrWTuObCg1+mFkzawAzrknO3fER7cN2St7U="; }; postPatch = '' @@ -37,11 +38,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - attrs aiohttp + attrs backoff - pyhumps + backports-strenum boto3 + pyhumps warrant-lite ]; From f445f64207c41c8cb0f6bae31296ac10a561928f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 7 Aug 2023 21:51:23 -0700 Subject: [PATCH 088/189] libgcc: (re)init at 12.3.0 This commit restores the pkgs/development/libraries/gcc/libgcc package, which was deleted by commit 9818d120be614c478f569c21d4b9d358632e651e. We need to be able to build libgcc separately from gcc in order to avoid a circular dependency. Nixpkgs is unusual -- unlike any other distribution, it cannot tolerate circular dependencies between dynamically linked libraries. Because of this, upstream is extremely unsympathetic to the trouble that the glibc<->gcc circular dependency causes for us; if we don't solve it ourselves it will not be solved. --- .../libraries/gcc/libgcc/default.nix | 156 ++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 4 + 3 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/gcc/libgcc/default.nix diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix new file mode 100644 index 000000000000..835956055448 --- /dev/null +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -0,0 +1,156 @@ +{ lib, stdenvNoLibs, buildPackages +, gcc, glibc +, libiberty +}: + +stdenvNoLibs.mkDerivation rec { + pname = "libgcc"; + inherit (gcc.cc) src version; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ libiberty ]; + + postUnpack = '' + mkdir -p ./build + buildRoot=$(readlink -e "./build") + ''; + + postPatch = '' + sourceRoot=$(readlink -e "./libgcc") + ''; + + hardeningDisable = [ "pie" ]; + + preConfigure = '' + cd "$buildRoot" + '' + + # Drop in libiberty, as external builds are not expected + + '' + ( + mkdir -p build-${stdenvNoLibs.buildPlatform.config}/libiberty/ + cd build-${stdenvNoLibs.buildPlatform.config}/libiberty/ + ln -s ${buildPackages.libiberty}/lib/libiberty.a ./ + ) + '' + # A few misc bits of gcc need to be built. + # + # - We "shift" the tools over to fake platforms perspective from the previous + # stage. + # + # - We define GENERATOR_FILE so nothing bothers looking for GNU GMP. + # + # - We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built. + + '' + mkdir -p "$buildRoot/gcc" + cd "$buildRoot/gcc" + ( + export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD + export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD + export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD + export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD + export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD + + export AS=$AS_FOR_BUILD + export CC=$CC_FOR_BUILD + export CPP=$CPP_FOR_BUILD + export CXX=$CXX_FOR_BUILD + export LD=$LD_FOR_BUILD + + export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS + export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC + export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP + export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD + + export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1' + + "$sourceRoot/../gcc/configure" $gccConfigureFlags + + sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile + + make \ + config.h \ + libgcc.mvars \ + tconfig.h \ + tm.h \ + options.h \ + insn-constants.h \ + insn-modes.h + ) + mkdir -p "$buildRoot/gcc/include" + '' + # Preparing to configure + build libgcc itself + + '' + mkdir -p "$buildRoot/gcc/${stdenvNoLibs.hostPlatform.config}/libgcc" + cd "$buildRoot/gcc/${stdenvNoLibs.hostPlatform.config}/libgcc" + configureScript=$sourceRoot/configure + chmod +x "$configureScript" + + export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD + export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD + export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD + export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD + export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD + + export AS=${stdenvNoLibs.cc}/bin/$AS + export CC=${stdenvNoLibs.cc}/bin/$CC + export CPP=${stdenvNoLibs.cc}/bin/$CPP + export CXX=${stdenvNoLibs.cc}/bin/$CXX + export LD=${stdenvNoLibs.cc.bintools}/bin/$LD + + export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS_FOR_TARGET + export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC_FOR_TARGET + export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP_FOR_TARGET + export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET + ''; + + gccConfigureFlags = [ + "--build=${stdenvNoLibs.buildPlatform.config}" + "--host=${stdenvNoLibs.buildPlatform.config}" + "--target=${stdenvNoLibs.hostPlatform.config}" + + "--disable-bootstrap" + "--disable-multilib" "--with-multilib-list=" + "--enable-languages=c" + + "--disable-fixincludes" + "--disable-intl" + "--disable-lto" + "--disable-libatomic" + "--disable-libbacktrace" + "--disable-libcpp" + "--disable-libssp" + "--disable-libquadmath" + "--disable-libgomp" + "--disable-libvtv" + "--disable-vtable-verify" + + "--with-system-zlib" + ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") + "--with-glibc-version=${glibc.version}"; + + configurePlatforms = [ "build" "host" ]; + configureFlags = [ + "--disable-dependency-tracking" + # $CC cannot link binaries, let alone run then + "cross_compiling=true" + # Do not have dynamic linker without libc + "--enable-static" + "--disable-shared" + + # Avoid dependency on gcc. + "--disable-gcov" + ]; + + makeFlags = [ "MULTIBUILDTOP:=../" ]; + + postInstall = '' + moveToOutput "lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}/include" "$dev" + mkdir -p "$out/lib" "$dev/include" + ln -s "$out/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}"/* "$out/lib" + ln -s "$dev/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}/include"/* "$dev/include/" + ''; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 04273984e81d..1dc91abc1938 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -879,7 +879,6 @@ mapAliases ({ liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22 liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22 liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22 - libgcc = throw "libgcc was removed, use gcc.cc.libgcc if needed"; # added 2023-05-13 libgksu = throw "libgksu has been removed"; # Added 2022-01-16 libgme = game-music-emu; # Added 2022-07-20 libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1613c7a2f075..1b6f36b8d2af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18911,6 +18911,10 @@ with pkgs; librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; + libgcc = callPackage ../development/libraries/gcc/libgcc { + stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems + }; + # This is for e.g. LLVM libraries on linux. gccForLibs = if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU From fcaa5a7556760d520dc78d99ada5a58fc13c7894 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 01:40:31 -0700 Subject: [PATCH 089/189] libgcc: take from gcc unless explicitly overridden --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b6f36b8d2af..7314a8c9f89a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18911,9 +18911,7 @@ with pkgs; librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; - libgcc = callPackage ../development/libraries/gcc/libgcc { - stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems - }; + libgcc = stdenv.cc.cc.libgcc or null; # This is for e.g. LLVM libraries on linux. gccForLibs = From 72fa5978fd45925df9e09b829e23bb429250b898 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 01:59:55 -0700 Subject: [PATCH 090/189] libgcc: minor formatting adjustments --- .../libraries/gcc/libgcc/default.nix | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index 835956055448..c505d69d573d 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -24,30 +24,19 @@ stdenvNoLibs.mkDerivation rec { hardeningDisable = [ "pie" ]; - preConfigure = '' - cd "$buildRoot" + preConfigure = '' - - # Drop in libiberty, as external builds are not expected - + '' + # Drop in libiberty, as external builds are not expected + cd "$buildRoot" ( mkdir -p build-${stdenvNoLibs.buildPlatform.config}/libiberty/ cd build-${stdenvNoLibs.buildPlatform.config}/libiberty/ ln -s ${buildPackages.libiberty}/lib/libiberty.a ./ ) - '' - # A few misc bits of gcc need to be built. - # - # - We "shift" the tools over to fake platforms perspective from the previous - # stage. - # - # - We define GENERATOR_FILE so nothing bothers looking for GNU GMP. - # - # - We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built. - + '' mkdir -p "$buildRoot/gcc" cd "$buildRoot/gcc" ( + # We "shift" the tools over to fake platforms perspective from the previous stage. export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD @@ -65,10 +54,12 @@ stdenvNoLibs.mkDerivation rec { export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD + # We define GENERATOR_FILE so nothing bothers looking for GNU GMP. export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1' "$sourceRoot/../gcc/configure" $gccConfigureFlags + # We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built. sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile make \ @@ -81,9 +72,8 @@ stdenvNoLibs.mkDerivation rec { insn-modes.h ) mkdir -p "$buildRoot/gcc/include" - '' - # Preparing to configure + build libgcc itself - + '' + + # Preparing to configure + build libgcc itself mkdir -p "$buildRoot/gcc/${stdenvNoLibs.hostPlatform.config}/libgcc" cd "$buildRoot/gcc/${stdenvNoLibs.hostPlatform.config}/libgcc" configureScript=$sourceRoot/configure From 2ecf2d954becdd97d78d41d663d0007d72714a5e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 02:00:33 -0700 Subject: [PATCH 091/189] libgcc: use finalAttrs instead of rec --- pkgs/development/libraries/gcc/libgcc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index c505d69d573d..be1e3a682579 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -3,7 +3,7 @@ , libiberty }: -stdenvNoLibs.mkDerivation rec { +stdenvNoLibs.mkDerivation (finalAttrs: { pname = "libgcc"; inherit (gcc.cc) src version; @@ -138,9 +138,9 @@ stdenvNoLibs.mkDerivation rec { makeFlags = [ "MULTIBUILDTOP:=../" ]; postInstall = '' - moveToOutput "lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}/include" "$dev" + moveToOutput "lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}/include" "$dev" mkdir -p "$out/lib" "$dev/include" - ln -s "$out/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}"/* "$out/lib" - ln -s "$dev/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}/include"/* "$dev/include/" + ln -s "$out/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}"/* "$out/lib" + ln -s "$dev/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}/include"/* "$dev/include/" ''; -} +}) From b5893e70468246bcd0062631c0cde3fc5687b362 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 02:01:43 -0700 Subject: [PATCH 092/189] libgcc: let-float gccConfigureFlags out of the derivation attrs --- .../libraries/gcc/libgcc/default.nix | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index be1e3a682579..382140fd80c5 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -3,7 +3,33 @@ , libiberty }: -stdenvNoLibs.mkDerivation (finalAttrs: { +let + gccConfigureFlags = gcc.cc.configureFlags ++ [ + "--build=${stdenvNoLibs.buildPlatform.config}" + "--host=${stdenvNoLibs.buildPlatform.config}" + "--target=${stdenvNoLibs.hostPlatform.config}" + + "--disable-bootstrap" + "--disable-multilib" "--with-multilib-list=" + "--enable-languages=c" + + "--disable-fixincludes" + "--disable-intl" + "--disable-lto" + "--disable-libatomic" + "--disable-libbacktrace" + "--disable-libcpp" + "--disable-libssp" + "--disable-libquadmath" + "--disable-libgomp" + "--disable-libvtv" + "--disable-vtable-verify" + + "--with-system-zlib" + ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") + "--with-glibc-version=${glibc.version}"; + +in stdenvNoLibs.mkDerivation (finalAttrs: { pname = "libgcc"; inherit (gcc.cc) src version; @@ -57,7 +83,7 @@ stdenvNoLibs.mkDerivation (finalAttrs: { # We define GENERATOR_FILE so nothing bothers looking for GNU GMP. export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1' - "$sourceRoot/../gcc/configure" $gccConfigureFlags + "$sourceRoot/../gcc/configure" ${lib.concatStringsSep " " gccConfigureFlags} # We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built. sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile @@ -97,31 +123,6 @@ stdenvNoLibs.mkDerivation (finalAttrs: { export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET ''; - gccConfigureFlags = [ - "--build=${stdenvNoLibs.buildPlatform.config}" - "--host=${stdenvNoLibs.buildPlatform.config}" - "--target=${stdenvNoLibs.hostPlatform.config}" - - "--disable-bootstrap" - "--disable-multilib" "--with-multilib-list=" - "--enable-languages=c" - - "--disable-fixincludes" - "--disable-intl" - "--disable-lto" - "--disable-libatomic" - "--disable-libbacktrace" - "--disable-libcpp" - "--disable-libssp" - "--disable-libquadmath" - "--disable-libgomp" - "--disable-libvtv" - "--disable-vtable-verify" - - "--with-system-zlib" - ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") - "--with-glibc-version=${glibc.version}"; - configurePlatforms = [ "build" "host" ]; configureFlags = [ "--disable-dependency-tracking" From 383d62d94c31a8094154a4b5346679d204a2f0f8 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 02:02:04 -0700 Subject: [PATCH 093/189] libgcc: add glibc as a buildInput This is necessary in order to prevent gcc from switching on `inhibit_libc`, which cripples the `libgcc_s.so` unwinder. --- pkgs/development/libraries/gcc/libgcc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index 382140fd80c5..d3f1ce2a27d6 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -38,6 +38,7 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ libiberty ]; + buildInputs = [ glibc ]; postUnpack = '' mkdir -p ./build From 92186a49bf72a74e507549669cde90977c977efe Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 14 Aug 2023 02:02:31 -0700 Subject: [PATCH 094/189] gcc: factor out forceLibgccToBuildCrtStuff --- .../compilers/gcc/common/builder.nix | 6 +++ .../gcc/common/libgcc-buildstuff.nix | 37 +++++++++++++++++++ .../compilers/gcc/common/libgcc.nix | 14 +++---- .../compilers/gcc/common/pre-configure.nix | 36 +----------------- 4 files changed, 51 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index cd8d4572a158..6df4e32ddb76 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -3,7 +3,13 @@ , enableMultilib }: +let + forceLibgccToBuildCrtStuff = + import ./libgcc-buildstuff.nix { inherit lib stdenv; }; +in + originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { + passthru = (originalAttrs.passthru or {}) // { inherit forceLibgccToBuildCrtStuff; }; preUnpack = '' oldOpts="$(shopt -po nounset)" || true set -euo pipefail diff --git a/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix b/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix new file mode 100644 index 000000000000..e7dc570a560c --- /dev/null +++ b/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +}: + +# Trick to build a gcc that is capable of emitting shared libraries *without* having the +# targetPlatform libc available beforehand. Taken from: +# https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/ +# https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff +let + # crt{i,n}.o are the first and last (respectively) object file + # linked when producing an executable. Traditionally these + # files are delivered as part of the C library, but on GNU + # systems they are in fact built by GCC. Since libgcc needs to + # build before glibc, we can't wait for them to be copied by + # glibc. At this early pre-glibc stage these files sometimes + # have different names. + crtstuff-ofiles = + if stdenv.targetPlatform.isPower + then "ecrti.o ecrtn.o ncrti.o ncrtn.o" + else "crti.o crtn.o"; + + # Normally, `SHLIB_LC` is set to `-lc`, which means that + # `libgcc_s.so` cannot be built until `libc.so` is available. + # The assignment below clobbers this variable, removing the + # `-lc`. + # + # On PowerPC we add `-mnewlib`, which means "libc has not been + # built yet". This causes libgcc's Makefile to use the + # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the + # versions which have been repackaged in libc as `crt{n,i}.o` + # + SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower "-mnewlib"; + +in '' + echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in + echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in + '' diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index b14d111e361f..4ab6eb2b3b44 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -44,14 +44,14 @@ lib.optional (lib.versionAtLeast version "11.0") !langJit && !stdenv.hostPlatform.isDarwin && enableShared - ; + ; - # For some reason libgcc_s.so has major-version "2" on m68k but - # "1" everywhere else. Might be worth changing this to "*". - libgcc_s-version-major = - if targetPlatform.isM68k - then "2" - else "1"; + # For some reason libgcc_s.so has major-version "2" on m68k but + # "1" everywhere else. Might be worth changing this to "*". + libgcc_s-version-major = + if targetPlatform.isM68k + then "2" + else "1"; in (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) { diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 933a132ce4d1..5cb2f186fd1d 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -112,39 +112,5 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export inhibit_libc=true '' -# Trick to build a gcc that is capable of emitting shared libraries *without* having the -# targetPlatform libc available beforehand. Taken from: -# https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/ -# https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff + lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && enableShared) - (let - - # crt{i,n}.o are the first and last (respectively) object file - # linked when producing an executable. Traditionally these - # files are delivered as part of the C library, but on GNU - # systems they are in fact built by GCC. Since libgcc needs to - # build before glibc, we can't wait for them to be copied by - # glibc. At this early pre-glibc stage these files sometimes - # have different names. - crtstuff-ofiles = - if targetPlatform.isPower - then "ecrti.o ecrtn.o ncrti.o ncrtn.o" - else "crti.o crtn.o"; - - # Normally, `SHLIB_LC` is set to `-lc`, which means that - # `libgcc_s.so` cannot be built until `libc.so` is available. - # The assignment below clobbers this variable, removing the - # `-lc`. - # - # On PowerPC we add `-mnewlib`, which means "libc has not been - # built yet". This causes libgcc's Makefile to use the - # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the - # versions which have been repackaged in libc as `crt{n,i}.o` - # - SHLIB_LC = lib.optionalString targetPlatform.isPower "-mnewlib"; - - in '' - echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in - echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in - '') - + (import ./libgcc-buildstuff.nix { inherit lib stdenv; }) From da371c7c5a57a8a34c8bb3ec5336ff97977360de Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 02:02:46 -0700 Subject: [PATCH 095/189] libgcc: use forceLibgccToBuildCrtStuff This duplicates (by reference) the two-line adjustment to libgcc's Makefile needed in order to get crtstuff to build without a full build of gcc. --- pkgs/development/libraries/gcc/libgcc/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index d3f1ce2a27d6..929e7e47f17f 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -45,9 +45,11 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { buildRoot=$(readlink -e "./build") ''; - postPatch = '' - sourceRoot=$(readlink -e "./libgcc") - ''; + postPatch = + gcc.cc.passthru.forceLibgccToBuildCrtStuff + + '' + sourceRoot=$(readlink -e "./libgcc") + ''; hardeningDisable = [ "pie" ]; From fa0ebe80f1e7b3d872b3814bfcb25f991217a5ef Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 02:03:40 -0700 Subject: [PATCH 096/189] libgcc: configureFlags: minimize A lot of these flags were unnecessary. --- pkgs/development/libraries/gcc/libgcc/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index 929e7e47f17f..d3d91616f6b6 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -128,15 +128,9 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { configurePlatforms = [ "build" "host" ]; configureFlags = [ - "--disable-dependency-tracking" - # $CC cannot link binaries, let alone run then "cross_compiling=true" - # Do not have dynamic linker without libc - "--enable-static" - "--disable-shared" - - # Avoid dependency on gcc. "--disable-gcov" + "--with-glibc-version=${glibc.version}" ]; makeFlags = [ "MULTIBUILDTOP:=../" ]; From 8c37dae9adf2c73cbd750566fef244398d5f87e9 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 02:04:08 -0700 Subject: [PATCH 097/189] libgcc: gccConfigureFlags: minimize, fix This commit minimizes libgcc's gccConfigureFlags, and -- importantly -- includes the three flags needed in order to prevent `inhibit_libc` from becoming active. --- .../libraries/gcc/libgcc/default.nix | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index d3d91616f6b6..dd67c2c28da5 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -5,29 +5,18 @@ let gccConfigureFlags = gcc.cc.configureFlags ++ [ - "--build=${stdenvNoLibs.buildPlatform.config}" - "--host=${stdenvNoLibs.buildPlatform.config}" - "--target=${stdenvNoLibs.hostPlatform.config}" - - "--disable-bootstrap" - "--disable-multilib" "--with-multilib-list=" - "--enable-languages=c" - "--disable-fixincludes" "--disable-intl" - "--disable-lto" - "--disable-libatomic" - "--disable-libbacktrace" - "--disable-libcpp" - "--disable-libssp" - "--disable-libquadmath" - "--disable-libgomp" - "--disable-libvtv" - "--disable-vtable-verify" + "--enable-threads=posix" + "--with-glibc-version=${glibc.version}" - "--with-system-zlib" - ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") - "--with-glibc-version=${glibc.version}"; + # these are required in order to prevent inhibit_libc=true, + # which will cripple libgcc's unwinder; see: + # https://github.com/NixOS/nixpkgs/issues/213453#issuecomment-1616346163 + "--with-headers=${lib.getDev glibc}/include" + "--with-native-system-header-dir=${lib.getDev glibc}${glibc.incdir or "/include"}" + "--with-build-sysroot=/" + ]; in stdenvNoLibs.mkDerivation (finalAttrs: { pname = "libgcc"; From 17ce8682d67de1977c0a9bc1ef9258a905aa5a1c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 14 Aug 2023 02:05:16 -0700 Subject: [PATCH 098/189] libgcc: let-rename stdenvNoLibs to stdenv --- .../libraries/gcc/libgcc/default.nix | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index dd67c2c28da5..e3ae86d21eef 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -4,6 +4,7 @@ }: let + stdenv = stdenvNoLibs; gccConfigureFlags = gcc.cc.configureFlags ++ [ "--disable-fixincludes" "--disable-intl" @@ -18,7 +19,7 @@ let "--with-build-sysroot=/" ]; -in stdenvNoLibs.mkDerivation (finalAttrs: { +in stdenv.mkDerivation (finalAttrs: { pname = "libgcc"; inherit (gcc.cc) src version; @@ -47,8 +48,8 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { # Drop in libiberty, as external builds are not expected cd "$buildRoot" ( - mkdir -p build-${stdenvNoLibs.buildPlatform.config}/libiberty/ - cd build-${stdenvNoLibs.buildPlatform.config}/libiberty/ + mkdir -p build-${stdenv.buildPlatform.config}/libiberty/ + cd build-${stdenv.buildPlatform.config}/libiberty/ ln -s ${buildPackages.libiberty}/lib/libiberty.a ./ ) mkdir -p "$buildRoot/gcc" @@ -67,10 +68,10 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { export CXX=$CXX_FOR_BUILD export LD=$LD_FOR_BUILD - export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS - export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC - export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP - export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD + export AS_FOR_TARGET=${stdenv.cc}/bin/$AS + export CC_FOR_TARGET=${stdenv.cc}/bin/$CC + export CPP_FOR_TARGET=${stdenv.cc}/bin/$CPP + export LD_FOR_TARGET=${stdenv.cc.bintools}/bin/$LD # We define GENERATOR_FILE so nothing bothers looking for GNU GMP. export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1' @@ -92,8 +93,8 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { mkdir -p "$buildRoot/gcc/include" # Preparing to configure + build libgcc itself - mkdir -p "$buildRoot/gcc/${stdenvNoLibs.hostPlatform.config}/libgcc" - cd "$buildRoot/gcc/${stdenvNoLibs.hostPlatform.config}/libgcc" + mkdir -p "$buildRoot/gcc/${stdenv.hostPlatform.config}/libgcc" + cd "$buildRoot/gcc/${stdenv.hostPlatform.config}/libgcc" configureScript=$sourceRoot/configure chmod +x "$configureScript" @@ -103,16 +104,16 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD - export AS=${stdenvNoLibs.cc}/bin/$AS - export CC=${stdenvNoLibs.cc}/bin/$CC - export CPP=${stdenvNoLibs.cc}/bin/$CPP - export CXX=${stdenvNoLibs.cc}/bin/$CXX - export LD=${stdenvNoLibs.cc.bintools}/bin/$LD + export AS=${stdenv.cc}/bin/$AS + export CC=${stdenv.cc}/bin/$CC + export CPP=${stdenv.cc}/bin/$CPP + export CXX=${stdenv.cc}/bin/$CXX + export LD=${stdenv.cc.bintools}/bin/$LD - export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS_FOR_TARGET - export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC_FOR_TARGET - export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP_FOR_TARGET - export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET + export AS_FOR_TARGET=${stdenv.cc}/bin/$AS_FOR_TARGET + export CC_FOR_TARGET=${stdenv.cc}/bin/$CC_FOR_TARGET + export CPP_FOR_TARGET=${stdenv.cc}/bin/$CPP_FOR_TARGET + export LD_FOR_TARGET=${stdenv.cc.bintools}/bin/$LD_FOR_TARGET ''; configurePlatforms = [ "build" "host" ]; @@ -125,9 +126,9 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { makeFlags = [ "MULTIBUILDTOP:=../" ]; postInstall = '' - moveToOutput "lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}/include" "$dev" + moveToOutput "lib/gcc/${stdenv.hostPlatform.config}/${finalAttrs.version}/include" "$dev" mkdir -p "$out/lib" "$dev/include" - ln -s "$out/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}"/* "$out/lib" - ln -s "$dev/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}/include"/* "$dev/include/" + ln -s "$out/lib/gcc/${stdenv.hostPlatform.config}/${finalAttrs.version}"/* "$out/lib" + ln -s "$dev/lib/gcc/${stdenv.hostPlatform.config}/${finalAttrs.version}/include"/* "$dev/include/" ''; }) From c0e4121ba537c10ef0a5132777bb35ae94735658 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 14 Aug 2023 02:04:39 -0700 Subject: [PATCH 099/189] libgcc: make needed architecture-specific targets if isM68k --- pkgs/development/libraries/gcc/libgcc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index e3ae86d21eef..afc42bccfb53 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -88,6 +88,9 @@ in stdenv.mkDerivation (finalAttrs: { tm.h \ options.h \ insn-constants.h \ + '' + lib.optionalString stdenv.targetPlatform.isM68k '' + sysroot-suffix.h \ + '' + '' insn-modes.h ) mkdir -p "$buildRoot/gcc/include" From 18c52d09bcd6c60bc60db81fe1a37d7663acaf27 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 14 Aug 2023 13:34:42 -0700 Subject: [PATCH 100/189] libgcc: make needed architecture-specific targets if isArmv7 --- pkgs/development/libraries/gcc/libgcc/default.nix | 3 +++ pkgs/test/cross/default.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index afc42bccfb53..e2fbf55876fa 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -90,6 +90,9 @@ in stdenv.mkDerivation (finalAttrs: { insn-constants.h \ '' + lib.optionalString stdenv.targetPlatform.isM68k '' sysroot-suffix.h \ + '' + lib.optionalString stdenv.targetPlatform.isArmv7 '' + arm-isa.h \ + arm-cpu.h \ '' + '' insn-modes.h ) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 46bb3c8d522d..0b037b6057ec 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -134,6 +134,7 @@ let pkgs.pkgsLLVM.stdenv pkgs.pkgsStatic.bash pkgs.pkgsCross.arm-embedded.stdenv + pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv pkgs.pkgsCross.m68k.stdenv pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc From 64046f019103677f9539b303bf7be0f9be12d29f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 7 Aug 2023 21:50:24 -0700 Subject: [PATCH 101/189] glibcCross: use a libgcc built separately from gcc ### Summary This PR completely and finally solves the gcc<->glibc circular `buildInputs` problem, for cross compilation. The same technique can be applied to native builds in the future. Closes #213453 ### Motivation Prior to this PR, we had the following circular `buildInputs` problem: 1. gcc has glibc in its `buildInputs` - a compiled copy of glibc must be present before building gcc; if it isn't, gcc cripples itself (`inhibit_libc`) and refuses to build libgcc_s.so 2. glibc has libgcc_s.so in its `buildInputs` - glibc `dlopen()`s libgcc_s.so in order to implement POSIX thread cancellation. For security reasons `glibc` requires that the path to `libgcc_s.so` is [hardwired] into `glibc` at compile time, so it's technically not a true dynamic link -- it just pretends to be one. 3. libgcc_s.so is built in the same derivation as gcc - libgcc_s.so is built as part of the gcc build process We must cut one of these three links in the loop. ### Previous Attempts Previously https://github.com/NixOS/nixpkgs/pull/238154 had attempted to cut link (1) by building `gcc` without `glibc`, and using the `libgcc_s` which emerges from that build. Unfortunately this just doesn't work. GCC's configure script extracts quite a lot of information from the glibc headers (which are a build artifact -- you can't just copy them out of the source tarball) and various `./configure`-driven linking attempts. If `glibc` isn't around at build time you wind up with a `libgcc_s.so` that is missing various unwinder features (see https://github.com/NixOS/nixpkgs/issues/213453 for the most problematic one). Musl "cuts" link (2), or rather never creates it in the first place. ["Cancellation cleanup handling in musl has no relationship to C++ exceptions and unwinding... glibc implements cancellation as an exception"](https://wiki.musl-libc.org/functional-differences-from-glibc.html#Thread-cancellation). IMHO Musl made the smarter decision here. It is incredibly rare to find a codebase that uses both POSIX thread cancellation *and* C++ exceptions. I have never seen a codebase that uses both *and* expects them to be aware of each other, and I would be astonished if one existed. Glibc paid an immense cost in complexity for something nobody has ever used. ### Changes Made This PR cuts link (3): instead of building libgcc_s.so as part of gcc, we build it separately from gcc. Now there is a strict acyclic graph of `buildInputs`: ``` gccWithoutTargetLibc | +--->glibc-nolibgcc | | | v +--->libgcc | | | v +--->glibc | | | v +--->gcc ``` In other words, there's a simple linear `buildInputs` chain `glibc-nolibgcc` `->` `libgcc` `->` `glibc` `->` `gcc` where all four packages are compiled by (and therefore have as a `(native)BuildInput`) `gccWithoutTargetLibc`. `gccWithoutTargetLibc` and `glibc-nolibgcc` are strictly bootstrapping artifacts; nothing else has them as a `buildInput` and they shouldn't appear in the closure of any final deployment packages. `glibc-nolibgcc` lacks `libgcc_s.so`, so it will segfault if you try to use it with POSIX thread cancellation. Fortunately all we need from it is (a) its headers (`lib.getDev`) and (b) to use it in the `./configure` script for `libgcc`. When translated over to the native bootstrap, `xgcc` takes the place of `gccWithoutTargetLibc`, and the "first `glibc`" (we build two of them) takes the place of `glibc-nolibgcc`. At that point our native and cross bootstrap have the same overall architecture, and it becomes possible to merge them (at last!) [213453]: https://github.com/NixOS/nixpkgs/issues/213453 [238154]: https://github.com/NixOS/nixpkgs/pull/238154 [hardwired]: https://github.com/NixOS/nixpkgs/blob/7553d0fe29801938bcb280bb324b579ef9016aea/pkgs/development/libraries/glibc/default.nix#L69-L88 --- pkgs/development/libraries/glibc/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 0f6cad157bb7..1c822bf1ed01 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -4,6 +4,7 @@ , withGd ? false , withLibcrypt? false , buildPackages +, libgcc }: let @@ -16,7 +17,7 @@ in (callPackage ./common.nix { inherit stdenv; } { inherit withLinuxHeaders withGd profilingLibraries withLibcrypt; - pname = "glibc" + lib.optionalString withGd "-gd"; + pname = "glibc" + lib.optionalString withGd "-gd" + lib.optionalString (stdenv.cc.isGNU && libgcc==null) "-nolibgcc"; }).overrideAttrs(previousAttrs: { # Note: @@ -90,8 +91,8 @@ in # makeFlags = (previousAttrs.makeFlags or []) - ++ lib.optionals (stdenv.cc.cc?libgcc) [ - "user-defined-trusted-dirs=${stdenv.cc.cc.libgcc}/lib" + ++ lib.optionals (libgcc != null) [ + "user-defined-trusted-dirs=${libgcc}/lib" ]; postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then '' @@ -166,8 +167,8 @@ in passthru = (previousAttrs.passthru or {}) - // lib.optionalAttrs (stdenv.cc.cc?libgcc) { - inherit (stdenv.cc.cc) libgcc; + // lib.optionalAttrs (libgcc != null) { + inherit libgcc; }; meta = (previousAttrs.meta or {}) // { description = "The GNU C Library"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7314a8c9f89a..44d90dd9c575 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21439,6 +21439,11 @@ with pkgs; # Being redundant to avoid cycles on boot. TODO: find a better way glibcCross = callPackage ../development/libraries/glibc { stdenv = gccCrossLibcStdenv; # doesn't compile without gcc + libgcc = callPackage ../development/libraries/gcc/libgcc { + gcc = gccCrossLibcStdenv.cc; + glibc = glibcCross.override { libgcc = null; }; + stdenvNoLibs = gccCrossLibcStdenv; + }; }; muslCross = musl.override { From 1912681314d415cc28e25b7932d9e88dfec75cd3 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 02:06:04 -0700 Subject: [PATCH 102/189] tests.cross.sanity: enable mbuffer test This test passes now. Also fixes a minor oversight in the bug -- the test case needs to `touch $out` on success. --- pkgs/test/cross/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 0b037b6057ec..d6fd8d3b1f80 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -115,6 +115,7 @@ let in pkgs.runCommand "test-mbuffer" {} '' echo hello | ${emulator} ${mbuffer}/bin/mbuffer + touch $out ''; # This is meant to be a carefully curated list of builds/packages @@ -127,7 +128,7 @@ let # of things that often break. So, no buckshot `mapTestOnCross` # calls here. sanity = [ - #pkgs.mbuffer # https://github.com/NixOS/nixpkgs/issues/213453 + mbuffer #pkgs.pkgsCross.gnu64.bash # https://github.com/NixOS/nixpkgs/issues/243164 pkgs.gcc_multi.cc pkgs.pkgsMusl.stdenv From 95f63c3207ef12685381f86ece47ea83a6c9584c Mon Sep 17 00:00:00 2001 From: FrancescoDeSimone Date: Mon, 14 Aug 2023 22:11:33 +0000 Subject: [PATCH 103/189] Update pkgs/tools/backup/duplicati/default.nix Co-authored-by: Ludovico --- pkgs/tools/backup/duplicati/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index 74f47499526f..3667b4afda47 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - sha256 = "sha256-isPmRC6N+gEZgvJ0bgeFf5kOQJsicZOsGnT+CAGgg+U="; + hash = "sha256-isPmRC6N+gEZgvJ0bgeFf5kOQJsicZOsGnT+CAGgg+U="; stripRoot = false; }; From 1fbf8cf3ba911af53495f098ccb54ebc581a9cff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:40:22 +0000 Subject: [PATCH 104/189] checkov: 2.3.364 -> 2.3.365 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.364...2.3.365 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.365 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index e55c4d66e6ef..a9b99927693a 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.364"; + version = "2.3.365"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pec8JLFLqhe75G2Tk/3EwGYr9Dg2xgT8MlVS471QH60="; + hash = "sha256-shJfqslstZIQ7W0GBV75M2ekxpb1/sIqbFDrL74Zpp4="; }; patches = [ From bdc5b90b324688f21c99ac6853d97f4dcc7be10e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:45:41 +0000 Subject: [PATCH 105/189] python311Packages.reolink-aio: 0.7.6 -> 0.7.7 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.7.6...0.7.7 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.7.7 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index ee631bf221c1..8fd5cb699021 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.6"; + version = "0.7.7"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-muxM9+3D8WL2muw5yxbYKmbkVc5lTcj9XQOr67hb/pU="; + hash = "sha256-RlnUROCCYBIgxwnORaG5pxo9Npq80LvVGhmj29tPXN8="; }; postPatch = '' From a5c1dd65fbf0d09f06000fff9b7a3311c5a32466 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 23:05:00 +0000 Subject: [PATCH 106/189] trufflehog: 3.47.0 -> 3.48.0 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.47.0...v3.48.0 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.48.0 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index c9f55216dbdb..4772c9148f92 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.47.0"; + version = "3.48.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-qdVWq+YESSHAmylyOWLygchy1VBxHDOmgk9CxSl22es="; + hash = "sha256-mt4ht9bRV6yh5aunX/zelqttNGvPvhIrX0rN7nEpS2g="; }; vendorHash = "sha256-AlyONwUP4Z8S8Qj3hbGFCyhUlYzlN6AIxGzrnQaXBLY="; From e543e81fae539c68e89431d82d2ff6ef26210dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Mon, 14 Aug 2023 20:51:37 -0300 Subject: [PATCH 107/189] budgie.budgie-backgrounds: 1.0 -> 2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/budgie-backgrounds/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index 37e3b231aa2c..989908916689 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "budgie-backgrounds"; - version = "1.0"; + version = "2.0"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-backgrounds"; rev = "v${version}"; - hash = "sha256-TdtgOYHO2QH4W2jWBuAzYQwxwAPya2lC3VrIi7kvi+M="; + hash = "sha256-L6y9YVS0NFsycS90AmUJJd9HFMJ/Ge99pI426tC05jA="; }; nativeBuildInputs = [ @@ -25,11 +25,6 @@ stdenv.mkDerivation rec { ninja ]; - preConfigure = '' - chmod +x ./scripts/optimizeImage.sh - patchShebangs ./scripts/optimizeImage.sh - ''; - meta = with lib; { description = "The default background set for the Budgie Desktop"; homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; From 79118350b0eb4943c1a97cdb38efc6bad930cffb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 00:09:47 +0000 Subject: [PATCH 108/189] python311Packages.types-ujson: 5.8.0.0 -> 5.8.0.1 --- pkgs/development/python-modules/types-ujson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-ujson/default.nix b/pkgs/development/python-modules/types-ujson/default.nix index 45737880fe24..8819dec4220e 100644 --- a/pkgs/development/python-modules/types-ujson/default.nix +++ b/pkgs/development/python-modules/types-ujson/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-ujson"; - version = "5.8.0.0"; + version = "5.8.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KFao0Ig0db7IDBrHcsAG6mkSFcxV3tIWR7XIfIYknLs="; + hash = "sha256-KxQ4gkirTNH176jEZHYREll8zVfA2EI49zYxq+DiDP0="; }; doCheck = false; From 2af24d44177b851b92f12697455071ee74ff4cc6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 15 Aug 2023 08:14:08 +0800 Subject: [PATCH 109/189] nixos/fcitx5: fix evaluation --- nixos/modules/i18n/input-method/fcitx5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix index 36022b2af824..3d52c08888ea 100644 --- a/nixos/modules/i18n/input-method/fcitx5.nix +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -107,14 +107,14 @@ in }; in lib.attrsets.mergeAttrsList [ - (optionalFile "config" (lib.generators.toINI { }) sts.globalOptions) - (optionalFile "profile" (lib.generators.toINI { }) sts.inputMethod) + (optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions) + (optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod) (lib.concatMapAttrs (name: value: optionalFile "conf/${name}.conf" (lib.generators.toINIWithGlobalSection { }) value) - sts.addons) + cfg.settings.addons) ]; environment.variables = { From fecb8c7752d3f88eb5d83a0b0f24dccb09c8d897 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 15 Aug 2023 08:36:07 +0800 Subject: [PATCH 110/189] nixosTests.fcitx5: make use of the newly added settings option --- nixos/tests/fcitx5/config | 11 -------- nixos/tests/fcitx5/default.nix | 47 ++++++++++++++++++++++++++-------- nixos/tests/fcitx5/profile | 27 ------------------- 3 files changed, 37 insertions(+), 48 deletions(-) delete mode 100644 nixos/tests/fcitx5/config delete mode 100644 nixos/tests/fcitx5/profile diff --git a/nixos/tests/fcitx5/config b/nixos/tests/fcitx5/config deleted file mode 100644 index cf4334639f1c..000000000000 --- a/nixos/tests/fcitx5/config +++ /dev/null @@ -1,11 +0,0 @@ -[Hotkey] -EnumerateSkipFirst=False - -[Hotkey/TriggerKeys] -0=Control+space - -[Hotkey/EnumerateForwardKeys] -0=Alt+Shift_L - -[Hotkey/EnumerateBackwardKeys] -0=Alt+Shift_R diff --git a/nixos/tests/fcitx5/default.nix b/nixos/tests/fcitx5/default.nix index 9b000da48eaf..c113f2e2c052 100644 --- a/nixos/tests/fcitx5/default.nix +++ b/nixos/tests/fcitx5/default.nix @@ -36,6 +36,43 @@ rec { pkgs.fcitx5-m17n pkgs.fcitx5-mozc ]; + fcitx5.settings = { + globalOptions = { + "Hotkey"."EnumerateSkipFirst" = "False"; + "Hotkey/TriggerKeys"."0" = "Control+space"; + "Hotkey/EnumerateForwardKeys"."0" = "Alt+Shift_L"; + "Hotkey/EnumerateBackwardKeys"."0" = "Alt+Shift_R"; + }; + inputMethod = { + "GroupOrder" = { + "0" = "NixOS_test"; + }; + "Groups/0" = { + "Default Layout" = "us"; + "DefaultIM" = "wbx"; + "Name" = "NixOS_test"; + }; + "Groups/0/Items/0" = { + "Name" = "keyboard-us"; + }; + "Groups/0/Items/1" = { + "Layout" = "us"; + "Name" = "wbx"; + }; + "Groups/0/Items/2" = { + "Layout" = "us"; + "Name" = "hangul"; + }; + "Groups/0/Items/3" = { + "Layout" = "us"; + "Name" = "m17n_sa_harvard-kyoto"; + }; + "Groups/0/Items/4" = { + "Layout" = "us"; + "Name" = "mozc"; + }; + }; + }; }; }; @@ -43,7 +80,6 @@ rec { let user = nodes.machine.users.users.alice; xauth = "${user.home}/.Xauthority"; - fcitx_confdir = "${user.home}/.config/fcitx5"; in '' start_all() @@ -56,15 +92,6 @@ rec { machine.succeed("su - ${user.name} -c 'kill $(pgrep fcitx5)'") machine.sleep(1) - machine.copy_from_host( - "${./profile}", - "${fcitx_confdir}/profile", - ) - machine.copy_from_host( - "${./config}", - "${fcitx_confdir}/config", - ) - machine.succeed("su - ${user.name} -c 'alacritty >&2 &'") machine.succeed("su - ${user.name} -c 'fcitx5 >&2 &'") machine.sleep(10) diff --git a/nixos/tests/fcitx5/profile b/nixos/tests/fcitx5/profile deleted file mode 100644 index 1b48c634e0eb..000000000000 --- a/nixos/tests/fcitx5/profile +++ /dev/null @@ -1,27 +0,0 @@ -[Groups/0] -Name=NixOS_test -Default Layout=us -DefaultIM=wbx - -[Groups/0/Items/0] -Name=keyboard-us -Layout= - -[Groups/0/Items/1] -Name=wbx -Layout=us - -[Groups/0/Items/2] -Name=hangul -Layout=us - -[Groups/0/Items/3] -Name=m17n_sa_harvard-kyoto -Layout=us - -[Groups/0/Items/4] -Name=mozc -Layout=us - -[GroupOrder] -0=NixOS_test From 5f5da13264257ed355d31557da2dc14f222e19fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 00:41:43 +0000 Subject: [PATCH 111/189] panoply: 5.2.8 -> 5.2.9 --- pkgs/tools/misc/panoply/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index 44c2df30a330..db72f76e1a05 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.2.8"; + version = "5.2.9"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-KqlXG49hUHoQPvkDxJ2kJzRn+imMONQT04TP5r6AV6I="; + sha256 = "sha256-InnHiaPvSCCtRmWStyrYQMhNQnoG+lhSBe7ECrPFKFc="; }; nativeBuildInputs = [ makeWrapper ]; From 34fd05a06581639e7ea677a0083bb1739dddb013 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Aug 2023 23:39:28 +0000 Subject: [PATCH 112/189] python310Packages.cfgv: 3.3.1 -> 3.4.0 --- .../python-modules/cfgv/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index c7b074089a68..0975d649a167 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -1,23 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, six }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "cfgv"; - version = "3.3.1"; - disabled = isPy27; + version = "3.4.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = "cfgv"; + rev = "refs/tags/v${version}"; + hash = "sha256-P02j53dltwdrlUBG89AI+P2GkXYKTVrQNF15rZt58jw="; }; - propagatedBuildInputs = [ six ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - # Tests not included in PyPI tarball - doCheck = false; + pythonImportsCheck = [ + "cfgv" + ]; meta = with lib; { description = "Validate configuration and produce human readable error messages"; homepage = "https://github.com/asottile/cfgv"; license = licenses.mit; + maintainers = with lib.maintainers; [ nickcao ]; }; } From c802b8f5c12c642ae3dea2bb6db3e5f7a5d89e97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 01:02:02 +0000 Subject: [PATCH 113/189] mkvtoolnix: 77.0 -> 78.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 58cab86e6b1d..0f5b7ca7a070 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "77.0"; + version = "78.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "t+kfFS5c8w+c9wxNh59nceFesfdMy8qvHlUqDbZAxkk="; + sha256 = "sha256-iImcpuGZsRlwBTPyPUsfHAOkOIhc8eYs6rinl8O78oU="; }; nativeBuildInputs = [ From 790f188d604144270b42e96d700e24066cc461a1 Mon Sep 17 00:00:00 2001 From: ayes-web Date: Sat, 22 Jul 2023 19:54:47 +0300 Subject: [PATCH 114/189] duperemove: 0.11.3 -> 0.12 --- pkgs/tools/filesystems/duperemove/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 2bdcc811db0f..0bf0f77880fe 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.11.3"; + version = "0.12"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - sha256 = "sha256-WjUM52IqMDvBzeGHo7p4JcvMO5iPWPVOr8GJ3RSsnUs="; + hash = "sha256-VPwcWAENCRnU51F78FhMPjQZaCTewQRUdeFwK1blJbs="; }; postPatch = '' From 810ec794359b1aa7439b337796a8d364b92b9b4e Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 14 Aug 2023 20:37:26 +1000 Subject: [PATCH 115/189] armcord: 3.2.1 -> 3.2.3 --- .../networking/instant-messengers/armcord/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index 82da4dedc943..d5f8b3aa9da2 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.1"; + version = "3.2.3"; src = let @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - sha256 = "1cfbypn9kh566s09c1bvxswpc0r11pmsvxlh4dixd5s622ia3h7r"; + hash = "sha256-d8Xv9ecXxkUAIqCS82VKlLNne56hESYvYtSDvNvGul0="; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - sha256 = "0mb6az0mzjz2zal7igigjcigg3phn2ijfw04igpl7q2rg6ha3z00"; + hash = "sha256-yqZ4hl+E4IEEEuKhfyDYY1Lyz5/Nekrf8uxoJr1B8w8="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -131,7 +131,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight, alternative desktop client for Discord"; - homepage = "https://github.com/ArmCord/ArmCord"; + homepage = "https://armcord.app"; + downloadPage = "https://github.com/ArmCord/ArmCord"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.osl3; maintainers = with maintainers; [ wrmilling ]; From ea95c0917609e5c48023cc7c6141bea2fdf13970 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 15 Aug 2023 00:07:16 +0800 Subject: [PATCH 116/189] nltk-data: init at unstable-2023-02-02 --- pkgs/tools/text/nltk_data/default.nix | 50 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/text/nltk_data/default.nix diff --git a/pkgs/tools/text/nltk_data/default.nix b/pkgs/tools/text/nltk_data/default.nix new file mode 100644 index 000000000000..1e2d803a21ce --- /dev/null +++ b/pkgs/tools/text/nltk_data/default.nix @@ -0,0 +1,50 @@ +{ lib, newScope, fetchFromGitHub, unzip, stdenvNoCC }: +let + base = { + version = "unstable-2023-02-02"; + nativeBuildInputs = [ unzip ]; + dontBuild = true; + meta = with lib; { + description = "NLTK Data"; + homepage = "https://github.com/nltk/nltk_data"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ happysalada ]; + }; + }; + makeNltkDataPackage = {pname, location, hash}: + let + src = fetchFromGitHub { + owner = "nltk"; + repo = "nltk_data"; + rev = "5db857e6f7df11eabb5e5665836db9ec8df07e28"; + inherit hash; + sparseCheckout = [ "${location}/${pname}.zip" ]; + }; + in + stdenvNoCC.mkDerivation (base // { + inherit pname src; + version = base.version; + installPhase = '' + runHook preInstall + + mkdir -p $out + unzip ${src}/${location}/${pname}.zip + cp -R ${pname}/ $out/ + + runHook postInstall + ''; + }); +in +lib.makeScope newScope (self: { + punkt = makeNltkDataPackage ({ + pname = "punkt"; + location = "packages/tokenizers"; + hash = "sha256-rMkgn3xzmSJNv8//kqbPF2Xq3Gf16lgA1Wx8FPYbaQo="; + }); + averaged_perceptron_tagger = makeNltkDataPackage ({ + pname = "averaged_perceptron_tagger"; + location = "packages/taggers"; + hash = "sha256-ilTs4HWPUoHxQb4kWEy3wJ6QsE/98+EQya44gtV2inw="; + }); +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ce71f677689..93af8d9b6834 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5971,6 +5971,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + nltk-data = callPackage ../tools/text/nltk_data { }; + nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; From 0e0f04c01915d3499776e487bff6b99a8f6869fc Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 14 Aug 2023 12:25:02 +0800 Subject: [PATCH 117/189] gptman: 0.8.3 -> 1.0.1 --- pkgs/tools/system/gptman/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/tools/system/gptman/default.nix index db15f8b02522..8c4d65010535 100644 --- a/pkgs/tools/system/gptman/default.nix +++ b/pkgs/tools/system/gptman/default.nix @@ -1,23 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, testers, gptman }: rustPlatform.buildRustPackage rec { pname = "gptman"; - version = "0.8.3"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "cecton"; + owner = "rust-disk-partition-management"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hI3F1E1vdbNDEeJ4FrU0EvR0t64svzUIpI6zaf0CquM="; + hash = "sha256-sDRnvF/XPXgWIIIrOmnEuktP8XvZxPahF2n4h8RCX+o="; }; - cargoSha256 = "sha256-3PRGPZGymccRo9dtQZgMMEL29x+GiUkTzgc8uAB/ocQ="; + cargoHash = "sha256-voslPSh7n31cGTKaayKXomgiXWVTutuc4FxfnZUDejc="; buildInputs = lib.optional stdenv.isDarwin libiconv; + buildFeatures = [ "cli" ]; + + passthru.tests.version = testers.testVersion { + package = gptman; + }; + meta = with lib; { - description = "A CLI tool for Linux to copy a partition from one disk to another and more."; - homepage = "https://github.com/cecton/gptman"; + description = "A GPT manager that allows you to copy partitions from one disk to another and more"; + homepage = "https://github.com/rust-disk-partition-management/gptman"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ akshgpt7 ]; }; From d2a462ababf64b2f4f36267eb1ed1e3749fb2fde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 03:32:56 +0000 Subject: [PATCH 118/189] python310Packages.mashumaro: 3.8.1 -> 3.9 --- pkgs/development/python-modules/mashumaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index f7c47b25401e..13bee5c38958 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.8.1"; + version = "3.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WDKohmcdVlQR/6AMSISN0y6UQx4tmOf1fANCPLRYiqI="; + hash = "sha256-oH44poFVnoM831dJuA9KcHCsuW6gh5B2EHrnKwza6A4="; }; nativeBuildInputs = [ From 4cb22d235126844b310f6244a675800aa105835e Mon Sep 17 00:00:00 2001 From: 1sixth <1sixth@shinta.ro> Date: Tue, 15 Aug 2023 11:45:29 +0800 Subject: [PATCH 119/189] waybar: 0.9.20 -> 0.9.21 --- pkgs/applications/misc/waybar/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 7c0c88bb6d87..b2e0f0545a59 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -38,30 +38,30 @@ let # Derived from subprojects/cava.wrap libcava = rec { - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "LukashonakV"; repo = "cava"; rev = version; - hash = "sha256-66uc0CEriV9XOjSjFTt+bxghEXY1OGrpjd+7d6piJUI="; + hash = "sha256-b/XfqLh8PnW018sGVKRRlFvBpo2Ru1R2lUeTR7pugBo="; }; }; in stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.20"; + version = "0.9.21"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - hash = "sha256-xLcoysnCPB9+jI5cZokWWIvXM5wo3eXOe/hXfuChBR4="; + hash = "sha256-VvQTRo2MuJ475lKrExVhzi74fb1wAw0gHD1v4rcWIDk="; }; postUnpack = lib.optional cavaSupport '' ( cd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.4 + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.5 patchShebangs . ) ''; From fac26076f8cafc335a421103d3c4ae426151802a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 04:17:40 +0000 Subject: [PATCH 120/189] opensearch: 2.8.0 -> 2.9.0 --- pkgs/servers/search/opensearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 8e4514eb0bc2..e6132c043763 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -13,11 +13,11 @@ stdenvNoCC.mkDerivation rec { pname = "opensearch"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz"; - hash = "sha256-64vWis+YQfjOw8eaYi1nggq/Q2ErqqcEuISXPGROypc="; + hash = "sha256-A9YjwtmacQDC8PrdyP/ai6J+roqmP/bz99rSM3votow="; }; nativeBuildInputs = [ makeWrapper ]; From 7831b931a855bc5b558c6c24f1464b5c98645e52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 04:47:58 +0000 Subject: [PATCH 121/189] qpwgraph: 0.5.1 -> 0.5.2 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index c4955e15e894..a2eed4be20dd 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-HVeuqgqYf/gO1KdteXV4dWd13Q58GqHUz8CAYpruc18="; + sha256 = "sha256-qcd19YI2RDoh+vjeelxNajWsUwVokLu0kh35a4oezKA="; }; nativeBuildInputs = [ cmake pkg-config ]; From ea87ec9bed0267625a0ca4ccb02b3d03d2bb84da Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 15 Aug 2023 13:07:42 +0800 Subject: [PATCH 122/189] rspamd: add patch fixing memory leak --- pkgs/servers/mail/rspamd/default.nix | 32 +++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 579a664e6370..eb96fa9738e3 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,6 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, cmake, perl -, glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu -, hyperscan, jemalloc, blas, lapack, lua, libsodium +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch2 +, cmake +, perl +, glib +, luajit +, openssl +, pcre +, pkg-config +, sqlite +, ragel +, icu +, hyperscan +, jemalloc +, blas +, lapack +, lua +, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 , withLuaJIT ? stdenv.isx86_64 @@ -20,6 +37,15 @@ stdenv.mkDerivation rec { hash = "sha256-GuWuJK73RE+cS8451m+bcmpZNQEzmZtexm19xgdDQeU="; }; + patches = [ + # Fix leak in `gzip` function + # https://github.com/rspamd/rspamd/issues/4564 + (fetchpatch2 { + url = "https://github.com/rspamd/rspamd/commit/ffbab4fbf218514845b8e5209aec044621b1f460.patch"; + hash = "sha256-ltkC/mZcYmGoSFILaTTRB/UWSn36flEbuJP4Buys05Y="; + }) + ]; + hardeningEnable = [ "pie" ]; nativeBuildInputs = [ cmake pkg-config perl ]; From 624607b3a5cfa1d1e68b7b768ad925da142630b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 05:08:12 +0000 Subject: [PATCH 123/189] postgresql11JitPackages.plr: 8.4.5 -> 8.4.6 --- pkgs/servers/sql/postgresql/ext/plr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index 68faa58b2e83..7dcb3c0c4660 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plr"; - version = "8.4.5"; + version = "8.4.6"; src = fetchFromGitHub { owner = "postgres-plr"; repo = "plr"; rev = "REL${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-G/V3I1JI6dWto/hK6lfOTBYEvbmkovvnvk2TwSQq4no="; + sha256 = "sha256-c+wKWL66pulihVQnhdbzivrZOMD1/FfOpb+vFoHgqVg="; }; nativeBuildInputs = [ pkg-config ]; From 2501addf2d61a3052128659883fee33435edd669 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sun, 13 Aug 2023 16:49:04 -0700 Subject: [PATCH 124/189] nix-doc: 0.5.9 -> 0.5.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://github.com/NixOS/nixpkgs/issues/237637 and its entire class of problems by making nix-doc save the version it was built for in the library and then bail harmlessly if it is mismatched. ``` dev/nixpkgs2 » nix-build -A nix-doc /nix/store/wv9nm47lplyz4b0pa4549zwrnsp3zvaf-nix-doc-0.5.10 dev/nixpkgs2 » nix-build -A nixVersions.nix_2_14 -o result2 /nix/store/ka0ygdzl9jd0j77y7ls6shngdz9vvqpn-nix-2.14.1 dev/nixpkgs2 » ./result2/bin/nix --plugin-files ./result/lib/libnix_doc_plugin.so repl nix-doc warning: mismatched nix version, not loading Welcome to Nix 2.14.1. Type :? for help. nix-repl> ``` --- .../package-management/nix-doc/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index ba5da3595657..f3983b0cd760 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -1,14 +1,14 @@ -{ lib, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-uilVJz1MnMF3i/ZXY0bIoSK3uAzfxWuHfhoOSmQgY/I="; + sha256 = "sha256-+T4Bz26roTFiXTM8P8FnJLSdFY2hP26X4nChWWUACN8="; }; doCheck = true; @@ -16,7 +16,20 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config nix ]; - cargoSha256 = "sha256-02noJcbtml4MxRCjaWtjOWLTUNOQnKy3GCsil31J6F8="; + # Packaging support for making the nix-doc plugin load cleanly as a no-op on + # the wrong Nix version (disabling bindnow permits loading libraries + # requiring unavailable symbols if they are unreached) + hardeningDisable = [ "bindnow" ]; + # Due to a Rust bug, setting -Z relro-level to anything including "off" on + # macOS will cause link errors + env = lib.optionalAttrs stdenv.isLinux { + # nix-doc does not use nightly features, however, there is no other way to + # set relro-level + RUSTC_BOOTSTRAP = 1; + RUSTFLAGS = "-Z relro-level=partial"; + }; + + cargoSha256 = "sha256-GylSWo4LIsjKnJE9H6iJHZ99UI6UPhAOnAGXk+v8bko="; meta = with lib; { description = "An interactive Nix documentation tool"; From 7524f7a7b458bd13cf8fee45a6a64a395aad4ec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 05:20:25 +0000 Subject: [PATCH 125/189] sqlc: 1.19.1 -> 1.20.0 --- pkgs/development/tools/database/sqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index 0fac85bcad94..dfe0cac81f89 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.19.1"; + version = "1.20.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-xZogHQ44amdhFewovFd1TWrul0wlofUqo46Ay13Mnig="; + sha256 = "sha256-ITW5jIlNoiW7sl6s5jCVRELglauZzSPmAj3PXVpdIGA="; }; proxyVendor = true; - vendorHash = "sha256-owH+Gd6K+RzBRhWEs99qQLXV3UWysEkLinEFvzSzXIU="; + vendorHash = "sha256-5ZJPHdjg3QCB/hJ+C7oXSfzBfg0fZ+kFyMXqC7KpJmY="; subPackages = [ "cmd/sqlc" ]; From cc5b04d9d2bbdd4bd760b7f81b6c2a3d6c3cc507 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 06:01:06 +0000 Subject: [PATCH 126/189] python311Packages.nsz: 4.3.0 -> 4.4.0 --- pkgs/development/python-modules/nsz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index 88402b340a12..1a2a60802814 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nsz"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "nicoboss"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-azmUJ3ofLdNwNeIQL/TuPYE98FZ8yXwbJx3wHCo8lw4="; + hash = "sha256-glK4CK7D33FfLqHLxVr4kkb887/A9tqxPwWpcXYZu/0="; }; propagatedBuildInputs = [pycryptodome enlighten zstandard ] From d92248422a7caea4ca0c0d68f5b4b71c18ab7ec3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 06:22:15 +0000 Subject: [PATCH 127/189] python310Packages.pysigma-backend-elasticsearch: 1.0.4 -> 1.0.5 --- .../python-modules/pysigma-backend-elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 69bca8d73444..1bff99c95820 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.4"; + version = "1.0.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-HHg5WNnWm7/4yhKRNMxskZzOgyH5qTjRxh55g8nkCb8="; + hash = "sha256-a+2RW+S0Tpf1odfLi0JEdbxfJehF+HI/sHc4QX7lQ+4="; }; postPatch = '' From f8c4fe4df3a45837d14aeff8604de70aa32782ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 08:38:58 +0200 Subject: [PATCH 128/189] python311Packages.nsz: add changelog to meta --- pkgs/development/python-modules/nsz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index 1a2a60802814..3056f0dc4b38 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/nicoboss/nsz"; description = "NSZ - Homebrew compatible NSP/XCI compressor/decompressor"; + changelog = "https://github.com/nicoboss/nsz/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; From 1c537fc7a8a1fd87e960b48331fb8e55d9ca8afa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 08:41:22 +0200 Subject: [PATCH 129/189] python311Packages.nsz: add format - disable on unsupported Python releases - equalize content --- .../python-modules/nsz/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index 3056f0dc4b38..e9d6edbfa80a 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pycryptodome, enlighten, zstandard +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycryptodome +, pythonOlder +, enlighten +, zstandard , withGUI ? true , kivy }: @@ -6,6 +12,9 @@ buildPythonPackage rec { pname = "nsz"; version = "4.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nicoboss"; @@ -14,8 +23,11 @@ buildPythonPackage rec { hash = "sha256-glK4CK7D33FfLqHLxVr4kkb887/A9tqxPwWpcXYZu/0="; }; - propagatedBuildInputs = [pycryptodome enlighten zstandard ] - ++ lib.optional withGUI kivy; + propagatedBuildInputs = [ + pycryptodome + enlighten + zstandard + ] ++ lib.optional withGUI kivy; # do not check, as nsz requires producation keys # dumped from a Nintendo Switch. @@ -23,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/nicoboss/nsz"; - description = "NSZ - Homebrew compatible NSP/XCI compressor/decompressor"; + description = "Homebrew compatible NSP/XCI compressor/decompressor"; changelog = "https://github.com/nicoboss/nsz/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; From aefb8068bdd14e48b72719792c370ffd0a6f6d03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 09:28:04 +0200 Subject: [PATCH 130/189] python311Packages.pyipp: 0.14.2 -> 0.14.3 Diff: https://github.com/ctalkington/python-ipp/compare/0.14.2...0.14.3 Changelog: https://github.com/ctalkington/python-ipp/releases/tag/0.14.3 --- pkgs/development/python-modules/pyipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index de0bdc5f637e..c080d634b83b 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.14.2"; + version = "0.14.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-ipp"; rev = version; - hash = "sha256-IPmpup0VrilfLnYiigjVjL6oRwW4RPlgiafIy7yyckI="; + hash = "sha256-WbrAvIdFUPzSxGjIPzNny0V1W8S774vyREgylenJp24="; }; postPatch = '' From b08975e36bec7195551e20692a41482b0b6b3dc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 09:30:19 +0200 Subject: [PATCH 131/189] python311Packages.rokuecp: 0.18.0 -> 0.18.1 Changelog: https://github.com/ctalkington/python-rokuecp/releases/tag/0.18.1 --- pkgs/development/python-modules/rokuecp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index a6d9f2e8fa01..ac67ff88acb9 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-YvJ1+o7/S/QNROedYGsP8m99Dr+WpAkfe5YPEN+2ZhU="; + hash = "sha256-0ArnP9xITVpbIfDrsNK3ukmeJBdd6SE3tnDwCLWSHMo="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace " --cov" "" + --replace "--cov" "" ''; disabledTests = [ From 73fa5aca3ff613c75751318dbffcdcc9953f8f57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 03:06:08 +0000 Subject: [PATCH 132/189] terraform-providers.buildkite: 0.23.0 -> 0.24.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 509bd5d57810..d853c3cfdb86 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -182,13 +182,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-GRFthxNKWcdOdFL6gnI7Y3ehSzqt8ijzBe4eyRy0KcM=", + "hash": "sha256-rcklWodBh5iJjxIjGhEH0l3S9bXUWfBG52V/23o8JDM=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.23.0", + "rev": "v0.24.0", "spdx": "MIT", - "vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4=" + "vendorHash": "sha256-3BtXtXhFyTNQD0J/5hNi0JsPcaIDWUQNEgf6r0VIfMM=" }, "checkly": { "hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=", From d7e9196f8cf48680286a3153b9864777f47281d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 03:06:39 +0000 Subject: [PATCH 133/189] terraform-providers.cloudfoundry: 0.51.2 -> 0.51.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d853c3cfdb86..63273d8e6e18 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -227,13 +227,13 @@ "vendorHash": "sha256-VTSbi2pDllzyKDhWs5EpWSXO5oKl+khVqLg/Ro3x8ys=" }, "cloudfoundry": { - "hash": "sha256-hoX2KNUzC7G+bFxReTN/6IG8/P4rczHAYn2QQ2iOioc=", + "hash": "sha256-yEqsdgTSlwppt6ILRZQ6Epyh5WVN6Il3xsBOa/NfIdo=", "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.51.2", + "rev": "v0.51.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-FR0HnLLVv8H5jC3gRv8jk2VLsavlHNQny+UqZ00InTY=" + "vendorHash": "sha256-0hq4dR1KqnE2IXMwif2/NVKQKRO/QplW/A6sB4pJ+FM=" }, "cloudinit": { "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=", From af1a2828fea6e05c55c3d19fdae893a63a49eca9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 03:08:28 +0000 Subject: [PATCH 134/189] terraform-providers.heroku: 5.2.5 -> 5.2.6 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 63273d8e6e18..49c0a51ff2f3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -519,11 +519,11 @@ "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" }, "heroku": { - "hash": "sha256-tdaj6ZbVCvQTYblgpRC5GFoW8fbzTSHf0j6BM1tOlik=", + "hash": "sha256-PexzolGXe0dy+6vGXVDTqtHGjF66DTtt4/GUyx78RMQ=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.2.5", + "rev": "v5.2.6", "spdx": null, "vendorHash": null }, From aa5a5b433eda77053cf9d121ed051c8daf7c0981 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 03:08:38 +0000 Subject: [PATCH 135/189] terraform-providers.hcloud: 1.42.0 -> 1.42.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 49c0a51ff2f3..06aee7673ba5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -501,13 +501,13 @@ "vendorHash": null }, "hcloud": { - "hash": "sha256-TbEbqTgzp7pUXrhjxvs5hrFI5u//xIIniOvusZsseiE=", + "hash": "sha256-kuC4tm8ob9bg7iLcUaGEHMYh6XaZp4rQiVlnbo1Xzek=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.42.0", + "rev": "v1.42.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wrgGxCNa5xLdBEy6RNNCz8ZVracyVsHzHtaQse6Ph+E=" + "vendorHash": "sha256-r8njRjQGYESeHuD8pF6rRUe1j2VVMwoDITFi2StC5bk=" }, "helm": { "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=", From 77175475ff21e53fb0cab3c7434e954255d7de09 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 03:10:39 +0000 Subject: [PATCH 136/189] terraform-providers.newrelic: 3.26.0 -> 3.26.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 06aee7673ba5..d7a6118bee13 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -781,11 +781,11 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-6dQ0oJeYBmMhpldt8SyPL0VY4IM4n3Dpg62SYvCjigI=", + "hash": "sha256-tbXRo7VNwjidyg/KcnwqmrxbnplMsUkCQAAsQb0WxSE=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.26.0", + "rev": "v3.26.1", "spdx": "MPL-2.0", "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw=" }, From 963f2962cb444d41332addd8d91d96e1f601dff8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 03:11:51 +0000 Subject: [PATCH 137/189] terraform-providers.okta: 4.1.0 -> 4.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d7a6118bee13..e8e389e0b7f0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -836,13 +836,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-cNVHEZPUkpruM7EDrriKeefzsHhwC+vyadTztRyGCFA=", + "hash": "sha256-yoO8LDSB80GfEjPR3sf8JcciX+3gM1qtFBv/rFAzb6g=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.1.0", + "rev": "v4.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0KB2L7L6EWN2VMsTKXtWElzBRfmny+JjarhhzZtWxtA=" + "vendorHash": "sha256-tXVV8lcB8A66WtsWb2wDcJEERjzbHm/eqHyzIOrVk7E=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From 58c6633940a51b9e58eb651c825a396cc18b9599 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 03:12:16 +0000 Subject: [PATCH 138/189] terraform-providers.pagerduty: 2.15.2 -> 2.15.3 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e8e389e0b7f0..e7f3038f7a60 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -899,11 +899,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-vMMxSmfNz9FZtFyOMo6e5OHX6GWNVAP/X/ewJ0sUHb0=", + "hash": "sha256-pMim8Bjjtuysdd4LgsV4+JPjEMw+3bF8vOKIBJVSScY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.15.2", + "rev": "v2.15.3", "spdx": "MPL-2.0", "vendorHash": null }, From ff00450695507b343be5f59c2b2057d1e8803103 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 09:53:32 +0200 Subject: [PATCH 139/189] python311Packages.pandas-stubs: 1.5.3.230321 -> 2.0.3.230814 Diff: https://github.com/pandas-dev/pandas-stubs/compare/refs/tags/v1.5.3.230321...v2.0.3.230814 --- .../python-modules/pandas-stubs/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 0325217946e8..ef387df4f4c6 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "1.5.3.230321"; + version = "2.0.3.230814"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RjU762VyDPy86Cvmr8hfPkqLtmntB3F6tf2OAgqmnK4="; + hash = "sha256-V/igL+vPJADOL7LwBJljqs2a1BB3vDVYTWXIkK/ImYY="; }; nativeBuildInputs = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { # AttributeErrors, missing dependencies, error and warning checks "test_aggregate_frame_combinations" "test_aggregate_series_combinations" + "test_all_read_without_lxml_dtype_backend" "test_arrow_dtype" "test_attribute_conflict_warning" "test_categorical_conversion_warning" @@ -79,6 +80,8 @@ buildPythonPackage rec { "test_database_error" "test_dummies" "test_from_dummies_args" + "test_hdf_context_manager" + "test_hdfstore" "test_incompatibility_warning" "test_index_astype" "test_indexing_error" @@ -95,6 +98,9 @@ buildPythonPackage rec { "test_possible_precision_loss" "test_pyperclip_exception" "test_quantile_150_changes" + "test_read_hdf_iterator" + "test_read_sql_via_sqlalchemy_connection" + "test_read_sql_via_sqlalchemy_engine" "test_resample_150_changes" "test_reset_index_150_changes" "test_reset_index" @@ -107,8 +113,6 @@ buildPythonPackage rec { "test_types_rank" "test_undefined_variable_error" "test_value_label_type_mismatch" - "test_read_sql_via_sqlalchemy_connection" - "test_read_sql_via_sqlalchemy_engine" ] ++ lib.optionals stdenv.isDarwin [ "test_plotting" # Fatal Python error: Illegal instruction ]; From 655a04a8fa43507f1642be4732926b2d1cec5128 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 5 Mar 2023 16:53:26 +0100 Subject: [PATCH 140/189] nixos/kanidm: add package option Signed-off-by: h7x4 --- nixos/modules/services/security/kanidm.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 6fb9f71a489e..d8a99dee59f4 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -69,6 +69,8 @@ in enableServer = lib.mkEnableOption (lib.mdDoc "the Kanidm server"); enablePam = lib.mkEnableOption (lib.mdDoc "the Kanidm PAM and NSS integration"); + package = lib.mkPackageOptionMD pkgs "kanidm" {}; + serverSettings = lib.mkOption { type = lib.types.submodule { freeformType = settingsFormat.type; @@ -222,7 +224,7 @@ in } ]; - environment.systemPackages = lib.mkIf cfg.enableClient [ pkgs.kanidm ]; + environment.systemPackages = lib.mkIf cfg.enableClient [ cfg.package ]; systemd.services.kanidm = lib.mkIf cfg.enableServer { description = "kanidm identity management daemon"; @@ -237,7 +239,7 @@ in StateDirectory = "kanidm"; StateDirectoryMode = "0700"; RuntimeDirectory = "kanidmd"; - ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}"; + ExecStart = "${cfg.package}/bin/kanidmd server -c ${serverConfigFile}"; User = "kanidm"; Group = "kanidm"; @@ -270,7 +272,7 @@ in CacheDirectory = "kanidm-unixd"; CacheDirectoryMode = "0700"; RuntimeDirectory = "kanidm-unixd"; - ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd"; + ExecStart = "${cfg.package}/bin/kanidm_unixd"; User = "kanidm-unixd"; Group = "kanidm-unixd"; @@ -302,7 +304,7 @@ in partOf = [ "kanidm-unixd.service" ]; restartTriggers = [ unixConfigFile clientConfigFile ]; serviceConfig = { - ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd_tasks"; + ExecStart = "${cfg.package}/bin/kanidm_unixd_tasks"; BindReadOnlyPaths = [ "/nix/store" @@ -346,7 +348,7 @@ in }) ]; - system.nssModules = lib.mkIf cfg.enablePam [ pkgs.kanidm ]; + system.nssModules = lib.mkIf cfg.enablePam [ cfg.package ]; system.nssDatabases.group = lib.optional cfg.enablePam "kanidm"; system.nssDatabases.passwd = lib.optional cfg.enablePam "kanidm"; @@ -365,7 +367,7 @@ in description = "Kanidm server"; isSystemUser = true; group = "kanidm"; - packages = with pkgs; [ kanidm ]; + packages = [ cfg.package ]; }; }) (lib.mkIf cfg.enablePam { From ef77d0d273ccca115b05cff12840476b4a60f486 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 10:08:44 +0200 Subject: [PATCH 141/189] python311Packages.pdfplumber: remove coverage and lint parts --- .../python-modules/pdfplumber/default.nix | 54 ++++++++----------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index a4dbe9dfb184..a43eaae34a80 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -1,32 +1,22 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub -, pythonOlder -# build inputs -, pdfminer-six -, pillow -, wand -# check inputs -, pytestCheckHook -, pytest-cov -, pytest-parallel -, flake8 -, black -, isort -, pandas -, mypy -, pandas-stubs -, types-pillow , jupyterlab , nbexec +, pandas +, pandas-stubs +, pdfminer-six +, pillow +, pytest-parallel +, pytestCheckHook +, pythonOlder +, types-pillow +, wand }: -let + +buildPythonPackage rec { pname = "pdfplumber"; version = "0.9.0"; -in -buildPythonPackage { - inherit pname version; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,6 +28,11 @@ buildPythonPackage { hash = "sha256-cGTn1JTSp1YvksemjlvvToZcVauZ7GKINiNmG5f4zKg="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=pdfplumber --cov-report xml:coverage.xml --cov-report term" "" + ''; + propagatedBuildInputs = [ pdfminer-six pillow @@ -49,18 +44,13 @@ buildPythonPackage { ''; nativeCheckInputs = [ - pytestCheckHook - pytest-cov - pytest-parallel - flake8 - black - isort - pandas - mypy - pandas-stubs - types-pillow jupyterlab nbexec + pandas + pandas-stubs + pytest-parallel + pytestCheckHook + types-pillow ]; pythonImportsCheck = [ @@ -73,7 +63,7 @@ buildPythonPackage { ]; meta = with lib; { - description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables."; + description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables"; homepage = "https://github.com/jsvine/pdfplumber"; changelog = "https://github.com/jsvine/pdfplumber/releases/tag/v${version}"; license = licenses.mit; From 6a2f23dec73b29eaa290f9694dba118cc7dc9d20 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 15 Aug 2023 01:11:06 +0000 Subject: [PATCH 142/189] reindeer: unstable-2023-07-14 -> unstable-2023-08-14 Signed-off-by: Austin Seipp --- pkgs/development/tools/reindeer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index f2b934187e54..5d352ccca0b0 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "unstable-2023-07-14"; + version = "unstable-2023-08-14"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "381fe232bcab77b432e2f29dbbd685e013d19c76"; - sha256 = "sha256-xyoGmleJAZA/tdB2Q11vPe9rcn74SCBPiTR//Cpx1Lw="; + rev = "7ab6fc86006c3a9c7d46775d23474f86b1d29881"; + sha256 = "sha256-wn5MwBDOKnHIOVYZK68GOjvX7dkFaWJuLJOxgUR6bok="; }; - cargoSha256 = "sha256-GVOkZcleKakXE58LbJthAa5ZWArKkIok/RawLXcwGPw="; + cargoSha256 = "sha256-MVQVYiJ6512wahVG8ONtZB+jgXXEGGFnE89VHGa/77U="; nativeBuildInputs = [ pkg-config ]; buildInputs = From 39dd6ba1a3d89ef42e72f2c59c26c85bd684e139 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 15 Aug 2023 01:23:06 +0000 Subject: [PATCH 143/189] buck2: unstable-2023-08-01 -> unstable-2023-08-15 Signed-off-by: Austin Seipp --- .../development/tools/build-managers/buck2/default.nix | 4 ++-- .../development/tools/build-managers/buck2/hashes.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix index 17637f69790c..d307d848812e 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/development/tools/build-managers/buck2/default.nix @@ -33,7 +33,7 @@ let allHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - buck2-version = "2023-08-01"; + buck2-version = "2023-08-15"; src = let hash = allHashes."${stdenv.hostPlatform.system}"; @@ -41,7 +41,7 @@ let in fetchurl { inherit url hash; }; # compatible version of buck2 prelude; a git revision in the buck2-prelude repository - buck2-prelude = "acf49faaa61fd6ad9facd9e1418eed514bbb2ec8"; + buck2-prelude = "40d6fffd01f224d25a62d982f4a3f00b275a5677"; prelude-src = let hash = allHashes."_prelude"; diff --git a/pkgs/development/tools/build-managers/buck2/hashes.json b/pkgs/development/tools/build-managers/buck2/hashes.json index b4b1c3f73d48..3918b447ca98 100644 --- a/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,7 +1,7 @@ { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" -, "_prelude": "sha256-SkCsVymQL/i8tUvKoLVtOQRYRm3zuF+WOFnbCggQwes=" -, "x86_64-linux": "sha256-wZULK2FPZ4GtQ5MMQmgfmtbMHJ7sPbue2RdVY0dmRuE=" -, "x86_64-darwin": "sha256-FmayArw2gswKjAEv0AzpFZNiXNx3GmJnPwH9g+Y/BGU=" -, "aarch64-linux": "sha256-3M1dRIFU0CwoVCbmq3oghhz51wW37melzt9hdIHqzzY=" -, "aarch64-darwin": "sha256-UAe73UNDSLL8OHqzAd+NOwwtW4bpVBz/aL4wdy3VuYg=" +, "_prelude": "sha256-TaQ31JvG4ihVn3n1HLuxf9D6Kq5KOb6xRMVMt2odoqY=" +, "x86_64-linux": "sha256-3Ae0e/J4GI7qPZnN36Ss7qImY8JWmETkbSyKSuGbpbg=" +, "x86_64-darwin": "sha256-GOMuNFTwX8uf65OJ5o54u14T/47MSp/5g6crTJDa6mk=" +, "aarch64-linux": "sha256-4oZXiPDu0zlQtlFTH1uH7OHKaNVVUjiQeZYbtc39yi0=" +, "aarch64-darwin": "sha256-vPgK9cYjBz0d41n56Cxqjly5FAnr/vr0GsoqUuOIVQo=" } From 9412d184a9a11104582ab3b2ee7cb6b56d929463 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 14 Aug 2023 20:29:38 -0500 Subject: [PATCH 144/189] buck2: propagate name for fetchurl This makes names in the nix store more obvious, i.e. `buck2-prelude-$VERSION` when looking at the `buck2.prelude` passthru. Signed-off-by: Austin Seipp --- pkgs/development/tools/build-managers/buck2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix index d307d848812e..517ec878a05b 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/development/tools/build-managers/buck2/default.nix @@ -36,17 +36,19 @@ let buck2-version = "2023-08-15"; src = let + name = "buck2-${buck2-version}-${suffix}.zst"; hash = allHashes."${stdenv.hostPlatform.system}"; url = "https://github.com/facebook/buck2/releases/download/${buck2-version}/buck2-${suffix}.zst"; - in fetchurl { inherit url hash; }; + in fetchurl { inherit name url hash; }; # compatible version of buck2 prelude; a git revision in the buck2-prelude repository buck2-prelude = "40d6fffd01f224d25a62d982f4a3f00b275a5677"; prelude-src = let + name = "buck2-prelude-${buck2-version}.tar.gz"; hash = allHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${buck2-prelude}.tar.gz"; - in fetchurl { inherit url hash; }; + in fetchurl { inherit name url hash; }; in stdenv.mkDerivation rec { From 786318d798eff3da0a077e0b0874e6db5eb4833d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 14 Aug 2023 21:14:51 -0500 Subject: [PATCH 145/189] buck2: more cosmetic refactorings; NFC Signed-off-by: Austin Seipp --- .../tools/build-managers/buck2/default.nix | 100 +++++++++++------- .../tools/build-managers/buck2/update.sh | 4 +- 2 files changed, 61 insertions(+), 43 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix index 517ec878a05b..fef32f1015cb 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/development/tools/build-managers/buck2/default.nix @@ -2,58 +2,76 @@ , testers, buck2 # for passthru.tests }: +# NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the +# upstream codebase extensively uses unstable `rustc` nightly features, and as a +# result can't be built upstream in any sane manner. it is only ever tested and +# integrated against a single version of the compiler, which produces all usable +# binaries. you shouldn't try to workaround this or get clever and think you can +# patch it to work; just accept it for now. it is extremely unlikely buck2 will +# build with a stable compiler anytime soon; see related upstream issues: +# +# - NixOS/nixpkgs#226677 +# - NixOS/nixpkgs#232471 +# - facebook/buck2#265 +# - facebook/buck2#322 +# +# worth noting: it *is* possible to build buck2 from source using +# buildRustPackage, and it works fine, but only if you are using flakes and can +# import `rust-overlay` from somewhere else to vendor your compiler. See +# nixos/nixpkgs#226677 for more information about that. + +# NOTE (aseipp): this expression is mostly automated, and you are STRONGLY +# RECOMMENDED to use to nix-update for updating this expression when new +# releases come out, which runs the sibling `update.sh` script. +# +# from the root of the nixpkgs git repository, run: +# +# nix-shell maintainers/scripts/update.nix \ +# --argstr commit true \ +# --argstr package buck2 + let - # NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the - # upstream codebase extensively uses unstable `rustc` nightly features, and as - # a result can't be built upstream in any sane manner. it is only ever tested - # and integrated against a single version of the compiler, which produces all - # usable binaries. you shouldn't try to workaround this or get clever and - # think you can patch it to work; just accept it for now. it is extremely - # unlikely buck2 will build with a stable compiler anytime soon; see related - # upstream issues: - # - # - NixOS/nixpkgs#226677 - # - NixOS/nixpkgs#232471 - # - facebook/buck2#265 - # - facebook/buck2#322 - # - # worth noting: it *is* possible to build buck2 from source using - # buildRustPackage, and it works fine, but only if you are using flakes and - # can import `rust-overlay` from somewhere else to vendor your compiler. See - # nixos/nixpkgs#226677 for more information about that. - # map our platform name to the rust toolchain suffix - suffix = { - x86_64-darwin = "x86_64-apple-darwin"; - aarch64-darwin = "aarch64-apple-darwin"; - x86_64-linux = "x86_64-unknown-linux-musl"; - aarch64-linux = "aarch64-unknown-linux-musl"; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - allHashes = builtins.fromJSON (builtins.readFile ./hashes.json); + # build hashes, which correspond to the hashes of the precompiled binaries + # procued by GitHub Actions. this also includes the hash for a download of a + # compatible buck2-prelude + buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - buck2-version = "2023-08-15"; + version = "2023-08-15"; + + # the platform-specific, statically linked binary — which is also + # zstd-compressed src = let - name = "buck2-${buck2-version}-${suffix}.zst"; - hash = allHashes."${stdenv.hostPlatform.system}"; - url = "https://github.com/facebook/buck2/releases/download/${buck2-version}/buck2-${suffix}.zst"; + suffix = { + # map our platform name to the rust toolchain suffix + # NOTE (aseipp): must be synchronized with update.sh! + x86_64-darwin = "x86_64-apple-darwin"; + aarch64-darwin = "aarch64-apple-darwin"; + x86_64-linux = "x86_64-unknown-linux-musl"; + aarch64-linux = "aarch64-unknown-linux-musl"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + name = "buck2-${version}-${suffix}.zst"; + hash = buildHashes."${stdenv.hostPlatform.system}"; + url = "https://github.com/facebook/buck2/releases/download/${version}/buck2-${suffix}.zst"; in fetchurl { inherit name url hash; }; - # compatible version of buck2 prelude; a git revision in the buck2-prelude repository - buck2-prelude = "40d6fffd01f224d25a62d982f4a3f00b275a5677"; + # compatible version of buck2 prelude; this is exported via passthru.prelude + # for downstream consumers to use when they need to automate any kind of + # tooling prelude-src = let - name = "buck2-prelude-${buck2-version}.tar.gz"; - hash = allHashes."_prelude"; - url = "https://github.com/facebook/buck2-prelude/archive/${buck2-prelude}.tar.gz"; + prelude-hash = "40d6fffd01f224d25a62d982f4a3f00b275a5677"; + name = "buck2-prelude-${version}.tar.gz"; + hash = buildHashes."_prelude"; + url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; in fetchurl { inherit name url hash; }; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "buck2"; - version = "unstable-${buck2-version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made + version = "unstable-${version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made inherit src; nativeBuildInputs = [ zstd ]; @@ -90,9 +108,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, hermetic, multi-language build system"; homepage = "https://buck2.build"; - changelog = "https://github.com/facebook/buck2/releases/tag/${buck2-version}"; + changelog = "https://github.com/facebook/buck2/releases/tag/${version}"; license = with licenses; [ asl20 /* or */ mit ]; - mainProgram = pname; + mainProgram = "buck2"; maintainers = with maintainers; [ thoughtpolice ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/development/tools/build-managers/buck2/update.sh b/pkgs/development/tools/build-managers/buck2/update.sh index 8e142dd1c978..179ab6f3601d 100755 --- a/pkgs/development/tools/build-managers/buck2/update.sh +++ b/pkgs/development/tools/build-managers/buck2/update.sh @@ -41,11 +41,11 @@ done echo "}" >> "$HFILE" sed -i \ - 's/buck2-version\s*=\s*".*";/buck2-version = "'"$VERSION"'";/' \ + '0,/version\s*=\s*".*";/s//version = "'"$VERSION"'";/' \ "$NFILE" sed -i \ - 's/buck2-prelude\s*=\s*".*";/buck2-prelude = "'"$PRELUDE_HASH"'";/' \ + '0,/prelude-hash\s*=\s*".*";/s//prelude-hash = "'"$PRELUDE_HASH"'";/' \ "$NFILE" echo "Done; wrote $HFILE and updated version in $NFILE." From 08f9801576bb09ef476a1e2aa45a8f0678987ca7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 10:37:33 +0200 Subject: [PATCH 146/189] python311Packages.detectron2: add patch for Pillow>10 support --- pkgs/development/python-modules/detectron2/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix index cc750427dacb..e7870fbe4759 100644 --- a/pkgs/development/python-modules/detectron2/default.nix +++ b/pkgs/development/python-modules/detectron2/default.nix @@ -59,10 +59,16 @@ buildPythonPackage { src = fetchFromGitHub { owner = "facebookresearch"; repo = "detectron2"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf"; }; + postPatch = '' + # https://github.com/facebookresearch/detectron2/issues/5010 + substituteInPlace detectron2/data/transforms/transform.py \ + --replace "interp=Image.LINEAR" "interp=Image.BILINEAR" + ''; + nativeBuildInputs = [ pythonRelaxDepsHook ninja @@ -123,6 +129,8 @@ buildPythonPackage { "tests/structures/test_instances.py" # hangs for some reason "tests/modeling/test_model_e2e.py" + # KeyError: 'precision' + "tests/data/test_coco_evaluation.py" ]; disabledTests = [ From 1a3b7f61b254290c9a7f8faa8a38e255a4c9b53c Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Thu, 10 Aug 2023 15:59:15 +0200 Subject: [PATCH 147/189] nixos/invidious: generate hmac_key automatically This change also generates the invidious config by putting JSON snippets into a bash array and then using jq to merge them all into a single configuration where later elements override previous elements. --- nixos/modules/services/web-apps/invidious.nix | 64 +++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index 8823da010014..5603ef7392e8 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -7,6 +7,9 @@ let settingsFile = settingsFormat.generate "invidious-settings" cfg.settings; + generatedHmacKeyFile = "/var/lib/invidious/hmac_key"; + generateHmac = cfg.hmacKeyFile == null; + serviceConfig = { systemd.services.invidious = { description = "Invidious (An alternative YouTube front-end)"; @@ -14,22 +17,47 @@ let after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - script = - let - jqFilter = "." - + lib.optionalString (cfg.database.host != null) "[0].db.password = \"'\"'\"$(cat ${lib.escapeShellArg cfg.database.passwordFile})\"'\"'\"" - + " | .[0]" - + lib.optionalString (cfg.extraSettingsFile != null) " * .[1]"; - jqFiles = [ settingsFile ] ++ lib.optional (cfg.extraSettingsFile != null) cfg.extraSettingsFile; - in - '' - export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s "${jqFilter}" ${lib.escapeShellArgs jqFiles})" - exec ${cfg.package}/bin/invidious - ''; + preStart = lib.optionalString generateHmac '' + if [[ ! -e "${generatedHmacKeyFile}" ]]; then + ${pkgs.pwgen}/bin/pwgen 20 1 > "${generatedHmacKeyFile}" + chmod 0600 "${generatedHmacKeyFile}" + fi + ''; + + script = '' + configParts=() + '' + # autogenerated hmac_key + + lib.optionalString generateHmac '' + configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")") + '' + # generated settings file + + '' + configParts+=("$(< ${lib.escapeShellArg settingsFile})") + '' + # optional database password file + + lib.optionalString (cfg.database.host != null) '' + configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${lib.escapeShellArg cfg.database.passwordFile})") + '' + # optional extra settings file + + lib.optionalString (cfg.extraSettingsFile != null) '' + configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})") + '' + # explicitly specified hmac key file + + lib.optionalString (cfg.hmacKeyFile != null) '' + configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})") + '' + # merge all parts into a single configuration with later elements overriding previous elements + + '' + export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")" + exec ${cfg.package}/bin/invidious + ''; serviceConfig = { RestartSec = "2s"; DynamicUser = true; + StateDirectory = "invidious"; + StateDirectoryMode = "0750"; CapabilityBoundingSet = ""; PrivateDevices = true; @@ -171,6 +199,18 @@ in ''; }; + hmacKeyFile = lib.mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + A path to a file containing the `hmac_key`. If `null`, a key will be generated automatically on first + start. + + If non-`null`, this option overrides any `hmac_key` specified in {option}`services.invidious.settings` or + via {option}`services.invidious.extraSettingsFile`. + ''; + }; + extraSettingsFile = lib.mkOption { type = types.nullOr types.str; default = null; From 4c9ae26c42f1583730ae377d00b4564d50fcd094 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 07:34:15 +0000 Subject: [PATCH 148/189] python311Packages.txtai: 5.5.1 -> 6.0.0 --- pkgs/development/python-modules/txtai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index acf1db58d2a6..1d4413a6dce9 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -52,7 +52,7 @@ , unittestCheckHook }: let - version = "5.5.1"; + version = "6.0.0"; api = [ aiohttp fastapi uvicorn ]; # cloud = [ apache-libcloud ]; console = [ rich ]; @@ -104,8 +104,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "neuml"; repo = "txtai"; - rev = "v${version}"; - hash = "sha256-h6TwWzLYfFg5x2QMIstAZ5pkxfHobBU+b4gb0HiayzY="; + rev = "refs/tags/v${version}"; + hash = "sha256-lGRdSUSQGdxe+I4WrUkE4hIyyJ1HcFn3cXO3zd27fsM="; }; nativeBuildInputs = [ From 9e39dea660a80fb99e72cb87faeac1752fc6dad9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 10:55:36 +0200 Subject: [PATCH 149/189] python311Packages.fakeredis: 2.17.0 -> 2.18.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.17.0...v2.18.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.18.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index af8bc72fa51e..0ffe4d40195b 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.17.0"; + version = "2.18.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-nDxuXDWnTt/ljd/M4pElo4U8jn91l+J9fPAfYpS0mOc="; + hash = "sha256-+bJbtqBUgix4oIq49hQEk3/cNXfvXFXE/m/qR1zy8jo="; }; nativeBuildInputs = [ From a46e69e5afc2ee72dd603c100bcb4c0d5d8031e9 Mon Sep 17 00:00:00 2001 From: Gabriel Simmer Date: Tue, 15 Aug 2023 09:38:49 +0100 Subject: [PATCH 150/189] forgejo-actions-runner: 2.3.0 -> 2.4.0 2.4.0 addresses a bug when building with Go 1.20.6+, resulting in missing Docker headers. --- .../forgejo-actions-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix index 1a048de13429..8b9a108d3db5 100644 --- a/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "forgejo-actions-runner"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-ZIhUlTGeNuJSrBVXYjAz/YHYmkR3wg1LAe0uUabEQRQ="; + hash = "sha256-EEwXo2MvdBlSMho4rrYD4wXLccS/30NbCuxO0CUktgE="; }; - vendorHash = "sha256-OauNDA0mkarSWrZBfJE/SYspa3CTEYKpLRMvbPdIoRo="; + vendorHash = "sha256-FspNmiphGHSeZFmdlWIDsEUrCc8THfb0Wm67cMCTtHI="; ldflags = [ "-s" @@ -25,7 +25,7 @@ buildGoModule rec { "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=${src.rev}" ]; - doCheck = false; # Test try to lookuyp code.forgejo.org. + doCheck = false; # Test try to lookup code.forgejo.org. passthru.tests.version = testers.testVersion { package = forgejo-actions-runner; From 03865edfeee0e1d3d542bd1330ed429716a13cf2 Mon Sep 17 00:00:00 2001 From: Sven Mattsen Date: Tue, 15 Aug 2023 09:47:15 +0200 Subject: [PATCH 151/189] maintainers: add scm2342 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 27325e6132c5..ae644398d987 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15081,6 +15081,13 @@ fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970"; }]; }; + scm2342 = { + name = "Sven Mattsen"; + email = "nix@sven.cc"; + matrix = "@scm:matrix.sven.cc"; + github = "scm2342"; + githubId = 154108; + }; scode = { email = "peter.schuller@infidyne.com"; github = "scode"; From cc34e8af5712b881424feefbe22ab96870577f46 Mon Sep 17 00:00:00 2001 From: Sven Mattsen Date: Tue, 15 Aug 2023 09:48:16 +0200 Subject: [PATCH 152/189] kubectl-klock: init at 0.3.1 --- .../cluster/kubectl-klock/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubectl-klock/default.nix diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix new file mode 100644 index 000000000000..b6abac2fc960 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubectl-klock"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "jillejr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-zOdi2QUVvRPPiI22bm7Z5OeShslysjcnvkhroOjbZrU="; + }; + + vendorSha256 = "sha256-r4oAmD/7CXYiWEWR/FC/Ab0LNxehWv6oCWjQ/fGU2rU="; + + meta = with lib; { + description = "A kubectl plugin to render watch output in a more readable fashion"; + homepage = "https://github.com/jillejr/kubectl-klock"; + changelog = "https://github.com/jillejr/kubectl-klock/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.scm2342 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5275f1a3e0d..1de6efba3b2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33026,6 +33026,8 @@ with pkgs; kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; + kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { }; + kubectl-ktop = callPackage ../applications/networking/cluster/kubectl-ktop { }; kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { }; From 78188e2b616849d4e226c1d81fd0fa2af6196fe9 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Tue, 15 Aug 2023 11:33:57 +1200 Subject: [PATCH 153/189] geos: update meta attrs --- pkgs/development/libraries/geos/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index c3c5b17372e0..49dc54c20fd5 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "C++ port of the Java Topology Suite (JTS)"; - homepage = "https://trac.osgeo.org/geos"; + description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; + homepage = "https://libgeos.org"; license = licenses.lgpl21Only; maintainers = teams.geospatial.members; pkgConfigModules = [ "geos" ]; + mainProgram = "geosop"; }; }) From b11a36879f87250c59ac35108f3524a3b0e0dc86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 09:50:35 +0000 Subject: [PATCH 154/189] prometheus-smartctl-exporter: 0.9.1 -> 0.10.0 --- .../monitoring/prometheus/smartctl-exporter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix index df21ef09f9f1..c25882a201b6 100644 --- a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "smartctl_exporter"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fc1NZ5QwzR/jJkeaDm5PMT4wBFFlqZOXKTJMBJWKJJ8="; + hash = "sha256-M4d8l9EbOZsi2ubyRo7KSBYewcC9NidW/Rf1QVVIvo8="; }; - vendorSha256 = "sha256-lQKuT5dzjDHFpRSmcXpKD1RJDlEv+0kcxENkv3mT4FU="; + vendorHash = "sha256-0WLI+nLhRkf1CGhSer1Jkv1nUho5sxIbTE/Mf5JmX7U="; ldflags = [ "-X github.com/prometheus/common/version.Version=${version}" From c8cd773e729b016e5ab0f6196007f66a88c18d69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 09:58:59 +0000 Subject: [PATCH 155/189] appgate-sdp: 6.2.0 -> 6.2.1 --- pkgs/applications/networking/appgate-sdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index d5c779051e49..2acf0f010c4e 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-qs4hrhQGPMYfhz95y8lNECcDGbsvypVN5DPSKsHhiFs="; + sha256 = "sha256-TjwVUBSBYo67lJyTXeee1bSaCnYLGE/MKSt+YEV+/Hw="; }; # just patch interpreter From 6d00572038cd2ad1c1a0b92dceca1ee6da981b09 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 15 Aug 2023 16:44:59 +0800 Subject: [PATCH 156/189] tf-summarize: use sri hash --- .../applications/networking/cluster/tf-summarize/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tf-summarize/default.nix b/pkgs/applications/networking/cluster/tf-summarize/default.nix index 8cc48d7a2e8f..d4958d762b4f 100644 --- a/pkgs/applications/networking/cluster/tf-summarize/default.nix +++ b/pkgs/applications/networking/cluster/tf-summarize/default.nix @@ -13,10 +13,11 @@ buildGoModule rec { owner = "dineshba"; repo = "tf-summarize"; rev = "v${version}"; - sha256 = "0c6fcz0n22mq8bqr82h9lfxx4n1bk9gjlc7d131lpf14yiacih3p"; + hash = "sha256-d8DIVPQkuEvDCO0wKl+aK1jSu6MJCpTxQrgKYcFnzjA="; }; - vendorSha256 = "cnybdZth7qlP2BHK8uvLCoqJtggMIkvaL2+YugiUZRE="; + vendorHash = "sha256-cnybdZth7qlP2BHK8uvLCoqJtggMIkvaL2+YugiUZRE="; + ldflags = [ "-s" "-w" From f8a17e4200d3e79ef1e21d802af6eb4979c3e6b6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 15 Aug 2023 12:32:07 +0200 Subject: [PATCH 157/189] mailman/python: remove obsolete almebic override, add explanation why this empty overlay should be kept --- pkgs/servers/mail/mailman/python.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index be50e9be7e61..cd18fa161fac 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -3,10 +3,21 @@ python3.override { packageOverrides = lib.composeExtensions (self: super: { - # does not find tests - alembic = super.alembic.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); + /* + This overlay can be used whenever we need to override + dependencies specific to the mailman ecosystem: in the past + this was necessary for e.g. psycopg2[1] or sqlalchemy[2]. + + In such a large ecosystem this sort of issue is expected + to arise again. Since we don't want to clutter the python package-set + itself with version overrides and don't want to change the APIs + in here back and forth every time this comes up (and as a result + force users to change their code accordingly), this empty overlay + is kept on purpose. + + [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce + [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 + */ }) overlay; } From 02fc87d9639ee7d37afea9bfb1c1ec1e9379ece3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 10:54:45 +0000 Subject: [PATCH 158/189] python310Packages.casbin: 1.23.0 -> 1.23.1 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index bee1e89512c6..ce337cb8de3c 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.23.0"; + version = "1.23.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-CPbWPDimbarmltwren63hRj/B7LF9+5osiQAZ6sWsks="; + hash = "sha256-jL02G4Z2Lhy/02Lb7aSUDEKg2h34UXJbwMFaDSPgc+U="; }; propagatedBuildInputs = [ From 90da2c1223475ff186967c7ace807678ff0d5870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Sun, 30 Jul 2023 12:53:51 +0100 Subject: [PATCH 159/189] nixos/haproxy: allow to specify haproxy package --- nixos/modules/services/networking/haproxy.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index e0b686434b6e..208eb356d629 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -17,14 +17,9 @@ with lib; options = { services.haproxy = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to enable HAProxy, the reliable, high performance TCP/HTTP - load balancer. - ''; - }; + enable = mkEnableOption (lib.mdDoc "HAProxy, the reliable, high performance TCP/HTTP load balancer."); + + package = mkPackageOptionMD pkgs "haproxy" { }; user = mkOption { type = types.str; @@ -70,15 +65,15 @@ with lib; ExecStartPre = [ # when the master process receives USR2, it reloads itself using exec(argv[0]), # so we create a symlink there and update it before reloading - "${pkgs.coreutils}/bin/ln -sf ${pkgs.haproxy}/sbin/haproxy /run/haproxy/haproxy" + "${pkgs.coreutils}/bin/ln -sf ${lib.getExe cfg.package} /run/haproxy/haproxy" # when running the config test, don't be quiet so we can see what goes wrong "/run/haproxy/haproxy -c -f ${haproxyCfg}" ]; ExecStart = "/run/haproxy/haproxy -Ws -f /etc/haproxy.cfg -p /run/haproxy/haproxy.pid"; # support reloading ExecReload = [ - "${pkgs.haproxy}/sbin/haproxy -c -f ${haproxyCfg}" - "${pkgs.coreutils}/bin/ln -sf ${pkgs.haproxy}/sbin/haproxy /run/haproxy/haproxy" + "${lib.getExe cfg.package} -c -f ${haproxyCfg}" + "${pkgs.coreutils}/bin/ln -sf ${lib.getExe cfg.package} /run/haproxy/haproxy" "${pkgs.coreutils}/bin/kill -USR2 $MAINPID" ]; KillMode = "mixed"; From 0f35a0e354ea3f2c4e6057228bb397b68637d018 Mon Sep 17 00:00:00 2001 From: Yarek Date: Mon, 14 Aug 2023 10:22:08 +0100 Subject: [PATCH 160/189] teams-for-linux: 1.2.8 -> 1.3.2 --- .../instant-messengers/teams-for-linux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 792572e5c1c0..7f18d85e0ba0 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.2.8"; + version = "1.3.2"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-5OocTsQjmNZCnzAY1RfrxD6Ad/kZTIkFl/3OmeJl1oI="; + hash = "sha256-2WoTbkRGH9l6cQrveyxGvO/Dy+0NV4UTDaooYn8k06s="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-XUASMWrH8wWeYsr6gCdQGgV/7E6hLDWkJ0BXHZCepKQ="; + hash = "sha256-j5N6d270myUylDVDFQTScbsGp1wlpt5sISDJBRCV/GU="; }; patches = [ From fcd76c3953e1ef2025a508fb7f2c3b464c0f522e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 13:30:59 +0200 Subject: [PATCH 161/189] python311Packages.rns: 0.5.6 -> 0.5.7 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.5.6...0.5.7 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.5.7 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 84b8c975f15d..574af8aeecc9 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.5.6"; + version = "0.5.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-s/rOU9FEWdb0vmRsMq/yPkP/ZTNc5wjlfdB0V+ltryQ="; + hash = "sha256-0WNgJKhxK4WjYQ0n7ofqrRxf4m9uWn2ygcZiv3uhrhM="; }; propagatedBuildInputs = [ From 1c7b51880b3e7884aff5302aaa4dd521be1fdccd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 13:31:23 +0200 Subject: [PATCH 162/189] python311Packages.lxmf: 0.3.1 -> 0.3.2 Diff: https://github.com/markqvist/lxmf/compare/refs/tags/0.3.1...0.3.2 Changelog: https://github.com/markqvist/LXMF/releases/tag/0.3.2 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index f28b261f5099..af7ae5d6e87a 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-uz3IUUL5rdYwUsBNdHB+K/ZaCCnUE5EThFConVl8YgM="; + hash = "sha256-6ZnYI6GlFkMjBLsZhhFg8G9j3I/DfjLAnKsRFEua7uU="; }; propagatedBuildInputs = [ From f7a451fdfb5b5b0fe057627eb7f87ebeaa0a4dac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 13:31:36 +0200 Subject: [PATCH 163/189] python311Packages.nomadnet: 0.3.5 -> 0.3.6 Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.3.6 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 28410b313298..71070e2decd5 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.5"; + version = "0.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-SPQ/3ntdD+EBW2YZJKfg2lornlg1ktnvTd1PNAqNSIg="; + hash = "sha256-3b6uwojekWthH5AsAVfS/ue+yAoIMac1LQff1mrM9PM="; }; propagatedBuildInputs = [ From 1d6d2576e50b8ddc8916dfc9c76a62c5aaf7fa07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Tue, 15 Aug 2023 09:02:04 +0200 Subject: [PATCH 164/189] viceroy: 0.6.1 -> 0.7.0 --- pkgs/development/tools/viceroy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 0b2f219014a0..d33975a71f11 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-+vvlj8gGCHKQ2T245fwaZxCiglRnrDFwupQIh3I47Ys="; + hash = "sha256-ml9N4oxq80A1y7oFE98eifFIEtdcT9IRhXwDMEJ298k="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-0Qr40hMA59WaHinkUkebF0CwPy3aublgfzSz1er7Uws="; + cargoHash = "sha256-PC2StxMefsiKaY9fXIG4167G9SoWlbmJBDGwrFBa4os="; cargoTestFlags = [ "--package viceroy-lib" From 3c7232510686adcf66f5f416e7f35a0c9d35e042 Mon Sep 17 00:00:00 2001 From: Yarek Date: Tue, 15 Aug 2023 12:26:34 +0100 Subject: [PATCH 165/189] teams-for-linux: Remove wayland patch The issue was fixed upstream and confirmed working without the patch. --- .../teams-for-linux/default.nix | 5 ---- .../screensharing-wayland-hack-fix.patch | 28 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 7f18d85e0ba0..ec318aa3e18e 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -31,11 +31,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-j5N6d270myUylDVDFQTScbsGp1wlpt5sISDJBRCV/GU="; }; - patches = [ - # Can be removed once Electron upstream resolves https://github.com/electron/electron/issues/36660 - ./screensharing-wayland-hack-fix.patch - ]; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; configurePhase = '' diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch b/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch deleted file mode 100644 index 1ae26c06f097..000000000000 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/app/index.js b/app/index.js -index ea89608..98f4a90 100644 ---- a/app/index.js -+++ b/app/index.js -@@ -1,4 +1,4 @@ --const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor } = require('electron'); -+const { app, ipcMain, desktopCapturer, nativeImage, systemPreferences, powerMonitor } = require('electron'); - const path = require('path'); - const fs = require('fs'); - const { LucidLog } = require('lucid-log'); -@@ -97,7 +97,16 @@ if (!gotTheLock) { - ipcMain.handle('getSystemIdleState', handleGetSystemIdleState); - ipcMain.handle('getZoomLevel', handleGetZoomLevel); - ipcMain.handle('saveZoomLevel', handleSaveZoomLevel); -- ipcMain.handle('desktopCapturerGetSources', (event, opts) => desktopCapturer.getSources(opts)); -+ ipcMain.handle('desktopCapturerGetSources', (event, opts) => process.env.XDG_SESSION_TYPE == 'wayland' ? -+ // Port wayland electron 22+ screenshare "fix" from webcord -+ Promise.resolve([{ -+ id: "screen:1:0", -+ appIcon: nativeImage.createEmpty(), -+ display_id: "", -+ name: "Entire Screen", -+ thumbnail: nativeImage.createEmpty() -+ }]) -+ : desktopCapturer.getSources(opts)); - ipcMain.handle('getCustomBGList', handleGetCustomBGList); - ipcMain.on('play-notification-sound', playNotificationSound); - ipcMain.on('user-status-changed', userStatusChangedHandler); From e270bfe9147aa4cb7e1526abfd93645403641db2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Aug 2023 23:42:49 -0300 Subject: [PATCH 166/189] emacsPackages.power-mode: remove Because it was MELPA'd. --- .../emacs/elisp-packages/manual-packages.nix | 2 -- .../manual-packages/power-mode/default.nix | 22 ------------------- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/power-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 9ed5f23dead0..7f4aad5df872 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -65,8 +65,6 @@ in pod-mode = callPackage ./manual-packages/pod-mode { }; - power-mode = callPackage ./manual-packages/power-mode { }; - prisma-mode = callPackage ./manual-packages/prisma-mode { }; structured-haskell-mode = self.shm; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/power-mode/default.nix deleted file mode 100644 index bd6a2996d6e1..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/power-mode/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ trivialBuild -, fetchFromGitHub -, emacs -}: - -trivialBuild rec { - pname = "power-mode"; - version = "0.pre+unstable=2021-06-06"; - - src = fetchFromGitHub { - owner = "elizagamedev"; - repo = "power-mode.el"; - rev = "940e0aa36220f863e8f43840b4ed634b464fbdbb"; - hash = "sha256-Wy8o9QTWqvH9cP7xsTpF5QSd4mWNIPXJTadoADKeHWY="; - }; - - meta = { - homepage = "https://github.com/elizagamedev/power-mode.el"; - description = "Imbue Emacs with power!"; - inherit (emacs.meta) platforms; - }; -} From 68f38d4634b17281f03a18b5ea7e9be15561eeff Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Aug 2023 23:41:28 -0300 Subject: [PATCH 167/189] emacsPackages.consult-gh: init at 20230706.438 --- .../emacs/elisp-packages/manual-packages.nix | 2 + .../manual-packages/consult-gh/default.nix | 52 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 7f4aad5df872..5bb88c835610 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -17,6 +17,8 @@ in cask = callPackage ./manual-packages/cask { }; + consult-gh = callPackage ./manual-packages/consult-gh { }; + control-lock = callPackage ./manual-packages/control-lock { }; ebuild-mode = callPackage ./manual-packages/ebuild-mode { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix new file mode 100644 index 000000000000..64addcf38893 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix @@ -0,0 +1,52 @@ +{ lib +, melpaBuild +, fetchFromGitHub +, consult +, embark +, forge +, gh +, markdown-mode +, writeText +, unstableGitUpdater +}: + +let + commit = "1fe876d9552b6ec6af257a4299a34eca99b40539"; +in +melpaBuild { + pname = "consult-gh"; + version = "20230706.438"; + + inherit commit; + + src = fetchFromGitHub { + owner = "armindarvish"; + repo = "consult-gh"; + rev = commit; + hash = "sha256-bi+qlNvNMXbS4cXbXt01txwD2NAyAqJGNKeOtdtj7tg="; + }; + + packageRequires = [ + consult + embark + forge + gh + markdown-mode + ]; + + recipe = writeText "recipe" '' + (consult-gh + :repo "armindarvish/consult-gh" + :fetcher github + :files ("consult-gh-embark.el" "consult-gh-forge.el" "consult-gh.el")) + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/armindarvish/consult-gh"; + description = "A GitHub CLI client inside GNU Emacs using Consult"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} From 2b42b842edcdb0772a4e1566f6bf3e5abf154617 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 15 Aug 2023 15:44:45 +0200 Subject: [PATCH 168/189] nixos/prometheus-exporters: fix smartctl test --- nixos/tests/prometheus-exporters.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 64e2811beb06..d86f8ac634e8 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1200,7 +1200,7 @@ let }; exporterTest = '' wait_until_succeeds( - 'journalctl -eu prometheus-smartctl-exporter.service -o cat | grep "Device unavailable"' + 'journalctl -eu prometheus-smartctl-exporter.service -o cat | grep "Unable to detect device type"' ) ''; }; From 739ef72bff7214112b8c1f211b4a9e3062639167 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 15 Aug 2023 15:49:41 +0200 Subject: [PATCH 169/189] python311Packages.pytest-raises: disable failing tests --- .../python-modules/pytest-raises/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix index 68c23064afe9..1b7beb74c594 100644 --- a/pkgs/development/python-modules/pytest-raises/default.nix +++ b/pkgs/development/python-modules/pytest-raises/default.nix @@ -1,25 +1,44 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytest , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pytest-raises"; version = "0.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Lemmons"; repo = pname; - rev = version; - sha256 = "0gbb4kml2qv7flp66i73mgb4qihdaybb6c96b5dw3mhydhymcsy2"; + rev = "refs/tags/${version}"; + hash = "sha256-wmtWPWwe1sFbWSYxs5ZXDUZM1qvjRGMudWdjQeskaz0="; }; + buildInputs = [ + pytest + ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "pytest_raises" ]; + pythonImportsCheck = [ + "pytest_raises" + ]; + + disabledTests = [ + # Failed: nomatch: '*::test_pytest_mark_raises_unexpected_exception FAILED*' + # https://github.com/Lemmons/pytest-raises/issues/30 + "test_pytest_mark_raises_unexpected_exception" + "test_pytest_mark_raises_unexpected_match" + "test_pytest_mark_raises_parametrize" + ]; meta = with lib; { description = "An implementation of pytest.raises as a pytest.mark fixture"; From dd3e1cc80eb457137089fabf88b2b99009b4bfca Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 15 Aug 2023 08:20:45 -0600 Subject: [PATCH 170/189] matrix-synapse: 1.89.0 -> 1.90.0 https://github.com/matrix-org/synapse/releases/tag/v1.90.0 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 2d4455d322a7..ab7d92aef18c 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.89.0"; + version = "1.90.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-ywDXjwYYCR0ojemRnShDmeoeUlDkpFH/ajFxV2DrR70="; + hash = "sha256-VUbEERQ/UFCroSiz8Y8EsjB+uhFQXLAsK52kM6HTjjY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Atwa7yIA9kPsle0/DKQD30PJljVNArqWgau4Ueqzo94="; + hash = "sha256-t65rvhkLryzba6eZH1thBMzV7y0y5XMbdbrTxC91blQ="; }; postPatch = '' From d744230467cd0daa25ca1b025b16993477559e8c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 15 Aug 2023 16:38:04 +0200 Subject: [PATCH 171/189] btcpayserver: 1.11.1 -> 1.11.2 --- pkgs/applications/blockchains/btcpayserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 5a8ab4f0a44e..daa528e88d49 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-fKw1RKylpbejzSTO3Ti2toJiSwqtmNC1e2XDAYa9L/0="; + sha256 = "sha256-22JQ8GqMRNfBT2ynyGhJBeGgnyAVYVBa5tUGZsleDP0="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; From f0590235639927d26dee3f64573bcd34e1d77450 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 15 Aug 2023 19:08:03 +0200 Subject: [PATCH 172/189] opensearch: use `finalAttrs` pattern --- pkgs/servers/search/opensearch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index e6132c043763..d43d2450d894 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,12 +11,12 @@ , nixosTests }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; version = "2.9.0"; src = fetchurl { - url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz"; + url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; hash = "sha256-A9YjwtmacQDC8PrdyP/ai6J+roqmP/bz99rSM3votow="; }; @@ -56,4 +56,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ shyim ]; }; -} +}) From a66786ecba1381b70221c2ba3529c52d23e1de77 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 15 Aug 2023 19:10:20 +0200 Subject: [PATCH 173/189] opensearch: minor cleanup and reformat --- pkgs/servers/search/opensearch/default.nix | 31 ++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index d43d2450d894..d32d77f0ae49 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -1,14 +1,12 @@ -{ lib +{ coreutils +, fetchurl +, gnugrep +, jre_headless +, lib +, makeBinaryWrapper +, nixosTests , stdenv , stdenvNoCC -, fetchurl -, makeWrapper -, jre_headless -, gnugrep -, coreutils -, autoPatchelfHook -, zlib -, nixosTests }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -20,8 +18,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-A9YjwtmacQDC8PrdyP/ai6J+roqmP/bz99rSM3votow="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre_headless ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + buildInputs = [ + jre_headless + ]; installPhase = '' runHook preInstall @@ -48,12 +51,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Open Source, Distributed, RESTful Search Engine"; homepage = "https://github.com/opensearch-project/OpenSearch"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ shyim ]; + platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ shyim ]; }; }) From 817353588ebdbd7a50352d802fe370789c3a6b9b Mon Sep 17 00:00:00 2001 From: magnouvean Date: Tue, 15 Aug 2023 20:02:18 +0200 Subject: [PATCH 174/189] g4music: init at 3.2 --- pkgs/applications/audio/g4music/default.nix | 53 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/audio/g4music/default.nix diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix new file mode 100644 index 000000000000..3e45bf4d8752 --- /dev/null +++ b/pkgs/applications/audio/g4music/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitLab +, desktop-file-utils +, gobject-introspection +, gst_all_1 +, gtk4 +, libadwaita +, meson +, ninja +, pkg-config +, vala +, wrapGAppsHook4 +}: +stdenv.mkDerivation (finalAttrs: { + pname = "g4music"; + version = "3.2"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "neithern"; + repo = "g4music"; + rev = "v${finalAttrs.version}"; + hash = "sha256-BlHOYD4sOmJPNMzM5QA97Ah1N9tIat0Y6qxN6c5pmsw="; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + libadwaita + ] ++ (with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gstreamer + ]); + + meta = with lib; { + description = "A beautiful, fast, fluent, light weight music player written in GTK4"; + homepage = "https://gitlab.gnome.org/neithern/g4music"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ magnouvean ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b88360c2772..7ad5ed24be35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31560,6 +31560,8 @@ with pkgs; svox = callPackage ../applications/audio/svox { }; + g4music = callPackage ../applications/audio/g4music { }; + genesys = callPackage ../applications/misc/genesys { }; giada = callPackage ../applications/audio/giada { }; From 95a20b3f39beb94be92b88611c4ec5bd57a6afd1 Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Tue, 8 Aug 2023 21:45:30 +0200 Subject: [PATCH 175/189] u2ps: init at 1.2 --- pkgs/tools/text/u2ps/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/text/u2ps/default.nix diff --git a/pkgs/tools/text/u2ps/default.nix b/pkgs/tools/text/u2ps/default.nix new file mode 100644 index 000000000000..95d46db42ed2 --- /dev/null +++ b/pkgs/tools/text/u2ps/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, ghostscript_headless +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "u2ps"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "arsv"; + repo = "u2ps"; + rev = finalAttrs.version; + hash = "sha256-sa0CL47PwYVDykxzF8KeWhz7HXAX6jZ0AcfecD+aFyg="; + }; + + buildInputs = [ ghostscript_headless ]; + + meta = with lib; { + description = "Unicode text to postscript converter"; + homepage = "https://github.com/arsv/u2ps"; + license = licenses.gpl3Plus; + longDescription = '' + U2ps is a text to postscript converter similar to a2ps, + with emphasis on Unicode support. + ''; + mainProgram = "u2ps"; + maintainers = [ maintainers.athas ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b09fdb2ceb96..7e8d133538e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38190,6 +38190,8 @@ with pkgs; typespeed = callPackage ../games/typespeed { }; + u2ps = callPackage ../tools/text/u2ps { }; + uchess = callPackage ../games/uchess { }; ufoai = callPackage ../games/ufoai { }; From 80dcf0e37bd2e8f168e32149f24183f48c5e68d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 18:26:25 +0000 Subject: [PATCH 176/189] zef: 0.18.2 -> 0.18.3 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 37132f17c016..103f5c5afa8e 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-0EWajziWoxWLGaj54FfvEMNPPTc2Wb6O050o2qWGJ9c="; + sha256 = "sha256-/H8wHDMl2lJElsjNcNmTrijIeL1ohOkDzrO7LuOPhi4="; }; nativeBuildInputs = [ makeWrapper ]; From 9504c91c02ef50356b2b23ae460a28f96b51a67b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 18:51:26 +0000 Subject: [PATCH 177/189] cudatext: 1.196.0 -> 1.197.0 --- .../applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 3a178930f51b..38c553d160f7 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.196.0"; + version = "1.197.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-O037+Pm/aq/9ZPMYpWlNPa9tEilatN8OJ3oBAuk4UTs="; + hash = "sha256-960Ucp2iNDqK2n/sJSIyMWxgCCs0LVyafn8SRRhli4c="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index d7f06d94fc30..a76a1c80c42a 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -6,18 +6,18 @@ }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2022.06.14", - "hash": "sha256-3QhARraYURW5uCf2f4MZfUbxdbsg9h7BlXUxKcz4jwA=" + "rev": "2023.08.12", + "hash": "sha256-dEwz052aYcJtKpRcP8t7gE2RHuHPQ4T0zHFMv6zVZ6g=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-/CN6wa5XN5ERdFnqOXxxtT08ObtlToqe3YsLpiog40w=" + "rev": "2023.08.12", + "hash": "sha256-YBIuwiHE83mxxtl9PNrQN3LrEBFHvYY74zhV+UtAbZ4=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.07.05", - "hash": "sha256-+FZjmrB8t7WM3XALqT+jvTSbBYIVLav4zSSCvMr5r+U=" + "rev": "2023.08.12", + "hash": "sha256-hFDWb7gMQiTkItFC5KfSrpAW3FSkmAhxcc5GOdov3EE=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -31,8 +31,8 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.07.05", - "hash": "sha256-dvo4lariMl/FMSp6VJEAk/Zhaz2fdBxe7aKw229DxKw=" + "rev": "2023.08.12", + "hash": "sha256-cEu8qkmcsNwrLR5t3bfMHI9fd3wmAq/dI/iRM4I4wmQ=" }, "Python-for-Lazarus": { "owner": "Alexey-T", @@ -41,8 +41,8 @@ }, "Emmet-Pascal": { "owner": "Alexey-T", - "rev": "2022.09.18", - "hash": "sha256-Kutl4Jh/+KptGbqakzPJnIYlFtytXVlzKWulKt4Z+/g=" + "rev": "2023.08.12", + "hash": "sha256-s9ZKrL+XIWIwejnLz+uuyDbbDuOZLJhiuiMChKB4Reg=" }, "CudaText-lexers": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.5.4", - "hash": "sha256-Js7MQ1JYAl2cpnjgDOXeLcWBCrjjCnDORayRpSFoFhM=" + "rev": "v11.5.5", + "hash": "sha256-M4ql+9zk5AJfmmHb9EG0PsJZGWcMm9/Y0lrPQqnKqcU=" } } From 574d11f231f4e7b6953178eef2c1bf247da1268c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 15 Aug 2023 22:19:54 +0300 Subject: [PATCH 178/189] path-of-building: 2.31.0 -> 2.31.1 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 050961957ba7..ab48a12c8b35 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }: let - dataVersion = "2.31.0"; + dataVersion = "2.31.1"; frontendVersion = "unstable-2023-04-09"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${dataVersion}"; - hash = "sha256-romuFNd80TuskJUp/UqmI3hPjVMxE/xoBTpQVCu5MBI="; + hash = "sha256-K/u8NYUv4U/XgGP/LkYMRzwmw1LFn25OW6bmvqqRpVQ="; }; nativeBuildInputs = [ unzip ]; From d7fa28d7110e3e927fe87c7c1e4fdf709490f419 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 12 Aug 2023 12:40:23 +0400 Subject: [PATCH 179/189] =?UTF-8?q?agate:=203.3.0=20=E2=86=92=203.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/gemini/agate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index e3ddff2f9ed9..9bd994dd1ad5 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-B0hbXar/RulfBJUR1Jtczf3p1H6Zj5OVCXVCaj5zf/U="; + hash = "sha256-gU4Q45Sb+LOmcv0j9R8yw996NUpCOnxdwT6lyvNp2pg="; }; - cargoHash = "sha256-6Z+mcQAJwW7tm4SBbrHwHIwiqlFV+PIa5I2onU2rPts="; + cargoHash = "sha256-6jF4ayzBN4sSk81u3iX0CxMPAsL6D+wpXRYGjgntMUE="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 65cbebcb81ce2e076e70f599bf5cd8f55cf1f8f0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 14 Aug 2023 08:55:24 -0400 Subject: [PATCH 180/189] nix-plugins: 11.0.0 -> 12.0.0 --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 23cac5f0cfe9..6f285fdff367 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "11.0.0"; + version = "12.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-sJL8g+UVFvJTqujS9F6gy8tairYUztHCSILkQlwDADU"; + hash = "sha256-VJqLfOT7y32Jupl57YXxqeDPy0tOWi46tRLN1QUDIow="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d3fd4162c1a..d46ebed54a01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23985,7 +23985,7 @@ with pkgs; ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { }; nix-plugins = callPackage ../development/libraries/nix-plugins { - nix = nixVersions.nix_2_16; + nix = nixVersions.nix_2_17; }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; From 0570c3fdf64849f2bc5d127cb5d3c2f070ff3254 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 13 Aug 2023 23:02:49 -0500 Subject: [PATCH 181/189] gdal: introduce 'useMinimalFeatures' flag to reduce closure size Summary: GDAL has an atrociously large closure weighing in at over 1.3GiB. This makes many things such as packaging PostGIS/PostgreSQL inside Docker images, or even copying closures, perform pretty poorly. More importantly, adding unlimited surface area to GDAL is effectively a support and maintenance burden. This is one of the major motivators of this patch: to make it possible to reduce the number of supported raster formats and thus scope support and maintence to specific subsets of functionality. Signed-off-by: Austin Seipp --- pkgs/development/libraries/gdal/default.nix | 123 +++++++++++--------- pkgs/top-level/all-packages.nix | 4 + 2 files changed, 69 insertions(+), 58 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 4b29d8f61838..77763fe6ccda 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -3,6 +3,9 @@ , callPackage , fetchFromGitHub +, useMinimalFeatures ? false +, useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) + , bison , cmake , gtest @@ -55,7 +58,6 @@ , libspatialite , sqlite , libtiff -, useTiledb ? !(stdenv.isDarwin && stdenv.isx86_64) , tiledb , libwebp , xercesc @@ -101,63 +103,68 @@ stdenv.mkDerivation (finalAttrs: { "-DGDAL_USE_TILEDB=OFF" ]; - buildInputs = [ - armadillo - c-blosc - brunsli - cfitsio - crunch - curl - cryptopp - libdeflate - expat - libgeotiff - geos - giflib - libheif - dav1d # required by libheif - libaom # required by libheif - libde265 # required by libheif - rav1e # required by libheif - x265 # required by libheif - hdf4 - hdf5-cpp - libjpeg - json_c - libjxl - libhwy # required by libjxl - lerc - xz - libxml2 - lz4 - libmysqlclient - netcdf - openjpeg - openssl - pcre2 - libpng - poppler - postgresql - proj - qhull - libspatialite - sqlite - libtiff - gtest - ] ++ lib.optionals useTiledb [ - tiledb - ] ++ [ - libwebp - zlib - zstd - python3 - python3.pkgs.numpy - ] ++ lib.optionals (!stdenv.isDarwin) [ - # tests for formats enabled by these packages fail on macos - arrow-cpp - openexr - xercesc - ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = + let + tileDbDeps = lib.optionals useTiledb [ tiledb ]; + + darwinDeps = lib.optionals stdenv.isDarwin [ libiconv ]; + nonDarwinDeps = lib.optionals (!stdenv.isDarwin) [ + # tests for formats enabled by these packages fail on macos + arrow-cpp + openexr + xercesc + ]; + in [ + armadillo + c-blosc + brunsli + cfitsio + crunch + curl + cryptopp + libdeflate + expat + libgeotiff + geos + giflib + libheif + dav1d # required by libheif + libaom # required by libheif + libde265 # required by libheif + rav1e # required by libheif + x265 # required by libheif + hdf4 + hdf5-cpp + libjpeg + json_c + libjxl + libhwy # required by libjxl + lerc + xz + libxml2 + lz4 + libmysqlclient + netcdf + openjpeg + openssl + pcre2 + libpng + poppler + postgresql + proj + qhull + libspatialite + sqlite + libtiff + gtest + libwebp + zlib + zstd + python3 + python3.pkgs.numpy + ] ++ tileDbDeps + ++ darwinDeps + ++ nonDarwinDeps; postInstall = '' wrapPythonPrograms diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c7b699914d..b23a980005b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21330,6 +21330,10 @@ with pkgs; gdal = callPackage ../development/libraries/gdal { }; + gdalMinimal = callPackage ../development/libraries/gdal { + useMinimalFeatures = true; + }; + gdcm = callPackage ../development/libraries/gdcm { inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; From a62a25c2922f14728e0a7c82b509de45fd2b5f5d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 14 Aug 2023 17:29:39 -0500 Subject: [PATCH 182/189] gdalMinimal: make libheif optional Signed-off-by: Austin Seipp --- pkgs/development/libraries/gdal/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 77763fe6ccda..ebee9bb625b8 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -5,6 +5,7 @@ , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) +, useLibHEIF ? (!useMinimalFeatures) , bison , cmake @@ -106,6 +107,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = let tileDbDeps = lib.optionals useTiledb [ tiledb ]; + libHeifDeps = lib.optionals useLibHEIF [ + libheif + dav1d + libaom + libde265 + rav1e + x265 + ]; darwinDeps = lib.optionals stdenv.isDarwin [ libiconv ]; nonDarwinDeps = lib.optionals (!stdenv.isDarwin) [ @@ -127,12 +136,6 @@ stdenv.mkDerivation (finalAttrs: { libgeotiff geos giflib - libheif - dav1d # required by libheif - libaom # required by libheif - libde265 # required by libheif - rav1e # required by libheif - x265 # required by libheif hdf4 hdf5-cpp libjpeg @@ -163,6 +166,7 @@ stdenv.mkDerivation (finalAttrs: { python3 python3.pkgs.numpy ] ++ tileDbDeps + ++ libHeifDeps ++ darwinDeps ++ nonDarwinDeps; From 5a093929cf139b016ea24a461c6dc1987abdada3 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 14 Aug 2023 17:31:41 -0500 Subject: [PATCH 183/189] gdalMinimal: make database support optional Signed-off-by: Austin Seipp --- pkgs/development/libraries/gdal/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index ebee9bb625b8..fa89d4b726f4 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -6,6 +6,9 @@ , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) , useLibHEIF ? (!useMinimalFeatures) +, useLibJXL ? (!useMinimalFeatures) +, useMysql ? (!useMinimalFeatures) +, usePostgres ? (!useMinimalFeatures) , bison , cmake @@ -115,6 +118,12 @@ stdenv.mkDerivation (finalAttrs: { rav1e x265 ]; + libJxlDeps = lib.optionals useLibJXL [ + libjxl + libhwy + ]; + mysqlDeps = lib.optionals useMysql [ libmysqlclient ]; + postgresDeps = lib.optionals usePostgres [ postgresql ]; darwinDeps = lib.optionals stdenv.isDarwin [ libiconv ]; nonDarwinDeps = lib.optionals (!stdenv.isDarwin) [ @@ -140,20 +149,16 @@ stdenv.mkDerivation (finalAttrs: { hdf5-cpp libjpeg json_c - libjxl - libhwy # required by libjxl lerc xz libxml2 lz4 - libmysqlclient netcdf openjpeg openssl pcre2 libpng poppler - postgresql proj qhull libspatialite @@ -167,6 +172,9 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.numpy ] ++ tileDbDeps ++ libHeifDeps + ++ libJxlDeps + ++ mysqlDeps + ++ postgresDeps ++ darwinDeps ++ nonDarwinDeps; From 55f76104aae2015a07a2877fc26bad1c683c6082 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 14 Aug 2023 18:59:19 -0500 Subject: [PATCH 184/189] gdalMinimal: make poppler, arrow, and HDF optional Signed-off-by: Austin Seipp --- pkgs/development/libraries/gdal/default.nix | 22 +++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index fa89d4b726f4..76fa7773b777 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -9,6 +9,9 @@ , useLibJXL ? (!useMinimalFeatures) , useMysql ? (!useMinimalFeatures) , usePostgres ? (!useMinimalFeatures) +, usePoppler ? (!useMinimalFeatures) +, useArrow ? (!useMinimalFeatures) +, useHDF ? (!useMinimalFeatures) , bison , cmake @@ -124,14 +127,19 @@ stdenv.mkDerivation (finalAttrs: { ]; mysqlDeps = lib.optionals useMysql [ libmysqlclient ]; postgresDeps = lib.optionals usePostgres [ postgresql ]; + popplerDeps = lib.optionals usePoppler [ poppler ]; + arrowDeps = lib.optionals useArrow [ arrow-cpp ]; + hdfDeps = lib.optionals useHDF [ + hdf4 + hdf5-cpp + ]; darwinDeps = lib.optionals stdenv.isDarwin [ libiconv ]; - nonDarwinDeps = lib.optionals (!stdenv.isDarwin) [ + nonDarwinDeps = lib.optionals (!stdenv.isDarwin) ([ # tests for formats enabled by these packages fail on macos - arrow-cpp openexr xercesc - ]; + ] ++ arrowDeps); in [ armadillo c-blosc @@ -145,8 +153,6 @@ stdenv.mkDerivation (finalAttrs: { libgeotiff geos giflib - hdf4 - hdf5-cpp libjpeg json_c lerc @@ -158,7 +164,6 @@ stdenv.mkDerivation (finalAttrs: { openssl pcre2 libpng - poppler proj qhull libspatialite @@ -175,6 +180,9 @@ stdenv.mkDerivation (finalAttrs: { ++ libJxlDeps ++ mysqlDeps ++ postgresDeps + ++ popplerDeps + ++ arrowDeps + ++ hdfDeps ++ darwinDeps ++ nonDarwinDeps; @@ -229,6 +237,8 @@ stdenv.mkDerivation (finalAttrs: { "test_rda_download_queue" ] ++ lib.optionals (lib.versionOlder proj.version "8") [ "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" + ] ++ lib.optionals (!usePoppler) [ + "test_pdf_jpx_compression" ]; postCheck = '' popd # autotest From a93ab55b415e8c50f01cb6c9ebd705c458409d57 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 15 Aug 2023 13:06:36 -0500 Subject: [PATCH 185/189] gdal: make armadillo and netcdf optional Signed-off-by: Austin Seipp --- pkgs/development/libraries/gdal/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 76fa7773b777..36a49ad038f5 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -12,6 +12,8 @@ , usePoppler ? (!useMinimalFeatures) , useArrow ? (!useMinimalFeatures) , useHDF ? (!useMinimalFeatures) +, useNetCDF ? (!useMinimalFeatures) +, useArmadillo ? (!useMinimalFeatures) , bison , cmake @@ -133,6 +135,8 @@ stdenv.mkDerivation (finalAttrs: { hdf4 hdf5-cpp ]; + netCdfDeps = lib.optionals useNetCDF [ netcdf ]; + armadilloDeps = lib.optionals useArmadillo [ armadillo ]; darwinDeps = lib.optionals stdenv.isDarwin [ libiconv ]; nonDarwinDeps = lib.optionals (!stdenv.isDarwin) ([ @@ -141,7 +145,6 @@ stdenv.mkDerivation (finalAttrs: { xercesc ] ++ arrowDeps); in [ - armadillo c-blosc brunsli cfitsio @@ -159,7 +162,6 @@ stdenv.mkDerivation (finalAttrs: { xz libxml2 lz4 - netcdf openjpeg openssl pcre2 @@ -183,6 +185,8 @@ stdenv.mkDerivation (finalAttrs: { ++ popplerDeps ++ arrowDeps ++ hdfDeps + ++ netCdfDeps + ++ armadilloDeps ++ darwinDeps ++ nonDarwinDeps; From c88a504bb9169d3bc06914b417914c804cb71ae9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 08:36:47 +0000 Subject: [PATCH 186/189] debianutils: 5.7 -> 5.8 --- pkgs/tools/misc/debianutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 3b9051ae510e..58a05bc4d42e 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "sha256-J+yeDn5E3Iq2EapXYzBHG6ywfkSR/+zw06ppCckvkCI="; + sha256 = "sha256-WwhtJ+uQY95NdGdg0PrrQNlGT7hV/IqOf7k7A+/OxiI="; }; meta = with lib; { From e4c189435c89d0a7b5bc141c7f0c93b25a5178bc Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 15 Aug 2023 07:59:31 -0300 Subject: [PATCH 187/189] debianutils: refactor - one parameter per line - use rec-less, overlay-style overridable recursive attributes (in effect since https://github.com/NixOS/nixpkgs/pull/119942) - remove references to pname - use hash instead of sha256 - multiple outputs - remove with nesting (following https://nix.dev/anti-patterns/language#with-attrset-expression) - format meta - add myself as maintainer --- pkgs/tools/misc/debianutils/default.nix | 33 ++++++++++++++++--------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 58a05bc4d42e..4f5055cdc155 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,24 +1,33 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; version = "5.8"; src = fetchurl { - url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "sha256-WwhtJ+uQY95NdGdg0PrrQNlGT7hV/IqOf7k7A+/OxiI="; + url = "mirror://debian/pool/main/d/debianutils/debianutils_${finalAttrs.version}.orig.tar.gz"; + hash = "sha256-WwhtJ+uQY95NdGdg0PrrQNlGT7hV/IqOf7k7A+/OxiI="; }; - meta = with lib; { + outputs = [ "out" "man" ]; + + meta = { + homepage = "https://packages.debian.org/sid/debianutils"; description = "Miscellaneous utilities specific to Debian"; longDescription = '' - This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly. + This package provides a number of small utilities which are used + primarily by the installation scripts of Debian packages, although you + may use them directly. - The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which + The specific utilities included are: add-shell installkernel ischroot + remove-shell run-parts savelog tempfile which ''; - downloadPage = "https://packages.debian.org/sid/debianutils"; - license = with licenses; [ gpl2Plus publicDomain smail ]; - maintainers = []; - platforms = platforms.all; + license = with lib.licenses; [ gpl2Plus publicDomain smail ]; + mainProgram = "ischroot"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; -} +}) From 6f46c37d92fd95d6979cb0daeaaa8d6023f4a77e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 16 Aug 2023 01:26:54 +0400 Subject: [PATCH 188/189] nixosTests.agate: switch to using gemget --- nixos/tests/web-servers/agate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/web-servers/agate.nix b/nixos/tests/web-servers/agate.nix index e8d789a9ca44..0de27b6f7d8d 100644 --- a/nixos/tests/web-servers/agate.nix +++ b/nixos/tests/web-servers/agate.nix @@ -20,7 +20,7 @@ geminiserver.wait_for_open_port(1965) with subtest("check is serving over gemini"): - response = geminiserver.succeed("${pkgs.gmni}/bin/gmni -j once -i -N gemini://localhost:1965") + response = geminiserver.succeed("${pkgs.gemget}/bin/gemget --header -o - gemini://localhost:1965") print(response) assert "Hello NixOS!" in response ''; From 820d55bb16b96b94e719096733158cd2c5d5dc57 Mon Sep 17 00:00:00 2001 From: Frederick Schwalbe Date: Mon, 14 Aug 2023 19:23:47 +0200 Subject: [PATCH 189/189] helix: fix UB in diff gutter Applies https://github.com/helix-editor/helix/pull/7227 as a patch until the fix is included in the next release. --- pkgs/applications/editors/helix/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 53d9728ef004..b75a6b11f9e9 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: +{ fetchpatch, fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "helix"; @@ -14,6 +14,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-/LCtfyDAA2JuioBD/CDMv6OOxM0B9A3PpuVP/YY5oF0="; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/helix-editor/helix/pull/7227.patch"; + hash = "sha256-dObMKHNJfc5TODUjZ28TVxuTen02rl8HzcXpFWnhB1k="; + }) + ]; + nativeBuildInputs = [ git installShellFiles makeWrapper ]; postInstall = ''