From d9ee3bc94f1987ab095d819a6ef64a9db496d8c8 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Fri, 18 Aug 2023 14:17:07 +0200 Subject: [PATCH 01/56] yaml-cpp: 0.7.0 -> 0.8.0 --- .../libraries/yaml-cpp/default.nix | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix index c9468b10b99b..20d546e346b8 100644 --- a/pkgs/development/libraries/yaml-cpp/default.nix +++ b/pkgs/development/libraries/yaml-cpp/default.nix @@ -3,36 +3,19 @@ , fetchFromGitHub , gitUpdater , cmake -, fetchpatch }: stdenv.mkDerivation rec { pname = "yaml-cpp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; - rev = "yaml-cpp-${version}"; - hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; + rev = version; + hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI="; }; - patches = [ - # https://github.com/jbeder/yaml-cpp/issues/774 - # https://github.com/jbeder/yaml-cpp/pull/1037 - (fetchpatch { - name = "yaml-cpp-Fix-generated-cmake-config.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; - hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; - }) - # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available - (fetchpatch { - name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; - hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -47,9 +30,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - passthru.updateScript = gitUpdater { - rev-prefix = "yaml-cpp-"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A YAML parser and emitter for C++"; From 753b33c620fa97de5af74f4cee450b3a08c6a404 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 30 Oct 2023 16:57:12 +0000 Subject: [PATCH 02/56] =?UTF-8?q?prometheus-systemd-exporter:=200.5.0=20?= =?UTF-8?q?=E2=86=92=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/monitoring/prometheus/systemd-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index 767f6ebd61d5..7abe243d3036 100644 --- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "systemd_exporter"; - version = "0.5.0"; + version = "0.6.0"; - vendorHash = "sha256-XkwBhj2M1poirPkWzS71NbRTshc8dTKwaHoDfFxpykU="; + vendorHash = "sha256-D5ASUP6XHNeHZqH/ui5GvxWis/NQrRpN/+wkO4fKkA8="; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q6rnD8JCtB1zTkUfZt6f2Uyo91uFi3HYI7WFlZdzpBM="; + sha256 = "sha256-zLg4cOZUh50OFPp4mKR/FY0JfzVmXmDFcKkhB6DalGc="; }; ldflags = [ From 67b0da8f517c8b5acf47ad23eeaab9c8b346d797 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 15:57:12 +0000 Subject: [PATCH 03/56] freshrss: 1.21.0 -> 1.22.1 --- pkgs/servers/web-apps/freshrss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 2aa727ca2d14..59eb56bcb830 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.21.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-0+fMZ5ps0CkBbS+fcxlYrrkQi28tmrKTyl3kPuofqyI="; + hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU="; }; passthru.tests = { From 29d41b7fd2ccc09a103e401ab00699eb0cdbbd23 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 24 Oct 2023 21:19:42 +0200 Subject: [PATCH 04/56] nixos/freshrss: migrate to DATA_PATH --- nixos/modules/services/web-apps/freshrss.nix | 6 +++--- pkgs/servers/web-apps/freshrss/default.nix | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index ffc05d0e41f8..8b4ea2aa53c9 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -220,7 +220,7 @@ in "catch_workers_output" = true; }; phpEnv = { - FRESHRSS_DATA_PATH = "${cfg.dataDir}"; + DATA_PATH = "${cfg.dataDir}"; }; }; }; @@ -267,7 +267,7 @@ in WorkingDirectory = cfg.package; }; environment = { - FRESHRSS_DATA_PATH = cfg.dataDir; + DATA_PATH = cfg.dataDir; }; script = @@ -302,7 +302,7 @@ in wantedBy = [ "multi-user.target" ]; startAt = "*:0/5"; environment = { - FRESHRSS_DATA_PATH = cfg.dataDir; + DATA_PATH = cfg.dataDir; }; serviceConfig = defaultServiceConfig //{ ExecStart = "${cfg.package}/app/actualize_script.php"; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 59eb56bcb830..8a8502ad823b 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -26,12 +26,6 @@ stdenvNoCC.mkDerivation rec { # There's nothing to build. dontBuild = true; - # the data folder is no in this package and thereby declared by an env-var - overrideConfig = pkgs.writeText "constants.local.php" '' - Date: Wed, 1 Nov 2023 14:14:37 +0100 Subject: [PATCH 05/56] poppler: 23.08.0 -> 23.10.0 https://lists.freedesktop.org/archives/poppler/2023-September/015569.html https://lists.freedesktop.org/archives/poppler/2023-October/015576.html Remove references to TeXLive, as it no longer depends on Poppler.[1] In 23.06.0, Poppler added a GPGME-based[2] backend for signature handling as an alternative to NSS.[3] The dependency on GPGME has been made soft-mandatory in 23.10.0[4], so we have to either provide it or disable it at compile time. Since the feature sets provided by both backends are almost identical so far, it has been decided to make GPGME support opt-in for now.[5] [1] https://github.com/NixOS/nixpkgs/commit/7bf9a3b2505af37213753b062dd594b91ee513bb [2] https://gnupg.org/software/gpgme/index.html [3] https://lists.freedesktop.org/archives/poppler/2023-June/015510.html [4] https://gitlab.freedesktop.org/poppler/poppler/-/commit/8646a6aa2cb60644b56dc6e6e3b3af30ba920245#9a2aa4db38d3115ed60da621e012c0efc0172aae_80_82 [5] https://github.com/NixOS/nixpkgs/pull/264817 --- .../development/libraries/poppler/default.nix | 24 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3774a3e05dcf..06a110680ebb 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -25,6 +25,7 @@ , withData ? true, poppler_data , qt5Support ? false, qt6Support ? false, qtbase ? null , introspectionSupport ? false, gobject-introspection ? null +, gpgmeSupport ? false, gpgme ? null , utils ? false, nss ? null , minimal ? false , suffix ? "glib" @@ -47,13 +48,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.10.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg="; + hash = "sha256-MaPf3qefSSJALTE3N0FaRNRNwU1rMX+VmnfFu6Bkfdk="; }; nativeBuildInputs = [ @@ -88,6 +89,8 @@ stdenv.mkDerivation (finalAttrs: rec { qtbase ] ++ lib.optionals introspectionSupport [ gobject-introspection + ] ++ lib.optionals gpgmeSupport [ + gpgme ]; cmakeFlags = [ @@ -95,9 +98,13 @@ stdenv.mkDerivation (finalAttrs: rec { (mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "CPP") (mkFlag (!minimal) "LIBCURL") + (mkFlag (!minimal) "LCMS") + (mkFlag (!minimal) "LIBTIFF") + (mkFlag (!minimal) "NSS3") (mkFlag utils "UTILS") (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") + (mkFlag gpgmeSupport "GPGME") ] ++ lib.optionals finalAttrs.doCheck [ "-DTESTDATADIR=${testData}" ]; @@ -110,13 +117,24 @@ stdenv.mkDerivation (finalAttrs: rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + # Work around gpgme trying to write to $HOME during qt5 and qt6 tests: + preCheck = lib.optionalString gpgmeSupport '' + HOME_orig="$HOME" + export HOME="$(mktemp -d)" + ''; + + postCheck = lib.optionalString gpgmeSupport '' + export HOME="$HOME_orig" + unset -v HOME_orig + ''; + doCheck = true; passthru = { inherit testData; tests = { # These depend on internal poppler code that frequently changes. - inherit inkscape cups-filters texlive scribus; + inherit inkscape cups-filters scribus; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9075cbd98fdc..3dfd44cf2f29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24548,7 +24548,6 @@ with pkgs; }); poppler_min = poppler.override { # TODO: maybe reduce even more - # this is currently only used by texlive.bin. minimal = true; suffix = "min"; }; From 2eb4da810ff71af2d236e7b5d21a6042faa0405d Mon Sep 17 00:00:00 2001 From: 6t8k <58048945+6t8k@users.noreply.github.com> Date: Thu, 2 Nov 2023 19:25:32 +0100 Subject: [PATCH 06/56] poppler: 23.10.0 -> 23.11.0 https://lists.freedesktop.org/archives/poppler/2023-November/015580.html --- 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 06a110680ebb..25a26e7fd2c6 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -48,13 +48,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.10.0"; # beware: updates often break cups-filters build, check scribus too! + version = "23.11.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-MaPf3qefSSJALTE3N0FaRNRNwU1rMX+VmnfFu6Bkfdk="; + hash = "sha256-+ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w="; }; nativeBuildInputs = [ From 36ed40c632dfda755121c74c1efb6c994b967517 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 19:11:20 +0000 Subject: [PATCH 07/56] pokeget-rs: 1.3.0 -> 1.4.0 --- pkgs/tools/misc/pokeget-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pokeget-rs/default.nix b/pkgs/tools/misc/pokeget-rs/default.nix index 9dcd70219a44..d6e790595c5d 100644 --- a/pkgs/tools/misc/pokeget-rs/default.nix +++ b/pkgs/tools/misc/pokeget-rs/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "pokeget-rs"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "talwat"; repo = "pokeget-rs"; rev = version; - hash = "sha256-UAkSMdHukwxDzOU/sIOuTazBbD68ORIGAWuwRxoC+EY="; + hash = "sha256-C7pEe9nScJ/ORJJrUDo6pADKceKoagHGP/X/asR1PcM="; fetchSubmodules = true; }; - cargoHash = "sha256-A5bDZU/L3G2RWbc3Y6KEQAmLS4RuNSG+ROypxINlwLk="; + cargoHash = "sha256-gPPtVFSaaSL0QBXxHpslVdon3XVCVx1E5cfEP1Ffa9g="; meta = with lib; { description = "A better rust version of pokeget"; From 093f7851f2fb29aa2f21e6aae9a7f9597862a6f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 20:09:45 +0000 Subject: [PATCH 08/56] process-compose: 0.65.1 -> 0.69.0 --- pkgs/applications/misc/process-compose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 8ec268c212de..25ff9aed3b74 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.65.1"; + version = "0.69.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-wlsZV9yE9486EBbIwVOcA4KBf9tfI0Ao1JSIPjJAcEU="; + hash = "sha256-YVNcr8oYEOsy0KLOsPdWTZcXYTqyz4RYG9MCEngLn7c="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-Z5vCxzdpd2OmlZ/woHhlLN2QMgqa9mm873QGuqDToiM="; + vendorHash = "sha256-lU21nRfIi4/eobnHhX/fCWnWtoiQBiWvTUOjBL0I4X4="; doCheck = false; From af98b9a962e8126d161a2ccd3e445dc98989317c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 21:26:43 +0000 Subject: [PATCH 09/56] pyrosimple: 2.11.4 -> 2.12.0 --- pkgs/applications/networking/p2p/pyrosimple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 9e3ce81e3392..59cf07d695ad 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.11.4"; + version = "2.12.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jzLckRFdjivWcyM3NWSVBauT5/7A1jTICtK2j65Wojo="; + hash = "sha256-6TDfNkEqtSrPpyExJ/68GAalIo9pSNiIDo7KdqwoulQ="; }; pythonRelaxDeps = [ From 2e2e672dc1e3c9b2391d41d6e62e6f9a75742f08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 23:01:47 +0100 Subject: [PATCH 10/56] python311Packages.stdlibs: 2022.10.9 -> 2023.11.2 Diff: https://github.com/omnilib/stdlibs/compare/refs/tags/v2022.10.9...v2023.11.2 Changelog: https://github.com/omnilib/stdlibs/blob/2023.11.2/CHANGELOG.md --- pkgs/development/python-modules/stdlibs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix index 4d3398d326c3..a7d3520e1ac2 100644 --- a/pkgs/development/python-modules/stdlibs/default.nix +++ b/pkgs/development/python-modules/stdlibs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "stdlibs"; - version = "2022.10.9"; + version = "2023.11.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "omnilib"; repo = "stdlibs"; rev = "refs/tags/v${version}"; - hash = "sha256-HkGZw58gQGd8mHnCP4aF6JWXxlpIIfe7B//HJiHVwA4="; + hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o="; }; nativeBuildInputs = [ From 56b570d6af3c4656c397f1d66ba81c84f63ad011 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 12:34:41 +0900 Subject: [PATCH 11/56] python311Packages.python-docs-theme: rename from python_docs_theme --- pkgs/development/interpreters/python/cpython/default.nix | 2 +- .../{python_docs_theme => python-docs-theme}/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{python_docs_theme => python-docs-theme}/default.nix (95%) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index eac1ba98beed..9ecc27fa1c72 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -581,7 +581,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version} ''; - nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ]; + nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python-docs-theme ]; }; tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/development/python-modules/python_docs_theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix similarity index 95% rename from pkgs/development/python-modules/python_docs_theme/default.nix rename to pkgs/development/python-modules/python-docs-theme/default.nix index 1a1a05733ad3..322cd38947a5 100644 --- a/pkgs/development/python-modules/python_docs_theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }: buildPythonPackage rec { - pname = "python_docs_theme"; + pname = "python-docs-theme"; version = "2023.9"; format = "pyproject"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc5788..ee2422199204 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -335,6 +335,7 @@ mapAliases ({ pytestrunner = pytest-runner; # added 2021-01-04 python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05 python-igraph = igraph; # added 2021-11-11 + python_docs_theme = python-docs-theme; # added 2023-11-04 python_keyczar = throw "python_keyczar has been removed because it's been archived upstream and deprecated"; # added 2023-05-16 python-lz4 = lz4; # added 2018-06-01 python_magic = python-magic; # added 2022-05-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228cabf855d1..970328b85d56 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8665,7 +8665,7 @@ self: super: with self; { pallets-sphinx-themes = callPackage ../development/python-modules/pallets-sphinx-themes { }; - python_docs_theme = callPackage ../development/python-modules/python_docs_theme { }; + python-docs-theme = callPackage ../development/python-modules/python-docs-theme { }; pamela = callPackage ../development/python-modules/pamela { }; From 41c2ee612c6f2c0f8637f1b4df14ae27294d8e81 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 12:47:00 +0900 Subject: [PATCH 12/56] python311Packages.radio-beam: rename from radio_beam --- .../python-modules/{radio_beam => radio-beam}/default.nix | 5 ++--- pkgs/development/python-modules/spectral-cube/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{radio_beam => radio-beam}/default.nix (91%) diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix similarity index 91% rename from pkgs/development/python-modules/radio_beam/default.nix rename to pkgs/development/python-modules/radio-beam/default.nix index 1a349736787a..ae76098a52e3 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -12,13 +12,12 @@ }: buildPythonPackage rec { - pname = "radio_beam"; + pname = "radio-beam"; version = "0.3.4"; format = "pyproject"; src = fetchPypi { - inherit version; - pname = "radio-beam"; + inherit pname version; sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; }; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index abeb5d0f9277..d1c85407fdd6 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -11,7 +11,7 @@ , pytest-astropy , pytestCheckHook , pythonOlder -, radio_beam +, radio-beam , setuptools-scm }: @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ astropy casa-formats-io - radio_beam + radio-beam joblib dask ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc5788..97474da3e010 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -359,6 +359,7 @@ mapAliases ({ Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 + radio_beam = radio-beam; # added 2023-11-04 ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228cabf855d1..7fb57545d582 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11987,7 +11987,7 @@ self: super: with self; { radian = callPackage ../development/python-modules/radian { }; - radio_beam = callPackage ../development/python-modules/radio_beam { }; + radio-beam = callPackage ../development/python-modules/radio-beam { }; radios = callPackage ../development/python-modules/radios { }; From 097a352b7083fdd7207efbe295ac830b059b3dff Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 13:03:25 +0900 Subject: [PATCH 13/56] python211Packages.radio-beam: refactor - use SRI hash - adopt pyproject instead of format - add pythonImportsCheck - remove unnecessary meta.platforms --- pkgs/development/python-modules/radio-beam/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/radio-beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index ae76098a52e3..7283bdf60b43 100644 --- a/pkgs/development/python-modules/radio-beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "radio-beam"; version = "0.3.4"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; + hash = "sha256-4DIlfxUBMDhz8lHADHSxGIGAeFx5Z3+0RDCY1ReFIwk="; }; nativeBuildInputs = [ @@ -38,11 +38,14 @@ buildPythonPackage rec { pytest-astropy ]; + pythonImportsCheck = [ + "radio_beam" + ]; + meta = { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io"; license = lib.licenses.bsd3; - platforms = lib.platforms.all; maintainers = with lib.maintainers; [ smaret ]; }; } From 056d3fba4bbd5bfa266882e800d54e7c70a3b722 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 13:05:27 +0900 Subject: [PATCH 14/56] python311Packages.radio-beam: 0.3.4 -> 0.3.6 Diff: https://github.com/radio-astro-tools/radio-beam/compare/v0.3.4...v0.3.6 --- pkgs/development/python-modules/radio-beam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radio-beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index 7283bdf60b43..78737edf0d76 100644 --- a/pkgs/development/python-modules/radio-beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "radio-beam"; - version = "0.3.4"; + version = "0.3.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4DIlfxUBMDhz8lHADHSxGIGAeFx5Z3+0RDCY1ReFIwk="; + hash = "sha256-U+IjOTt7x9uzUl7IcQRu2s+MBKF/OR+sLddvHmp9hqU="; }; nativeBuildInputs = [ From 3efcd3b8902a373e724f85b696a41f7968d17b87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 04:30:14 +0000 Subject: [PATCH 15/56] python310Packages.apipkg: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/apipkg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index efea1e3302f4..0edddd68be32 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apipkg"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; - rev = "v${version}"; - hash = "sha256-gf84SzfuKLGYfI88IzPRJCqMZWwowUR10FgIbwXjwuY="; + rev = "refs/tags/v${version}"; + hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 77083d8d513b1e553efa6203ef57b3df8ad72b8f Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 12 Oct 2023 09:07:46 +0200 Subject: [PATCH 16/56] opencolorio: 2.2 -> 2.3 --- .../broken-cmake-zlib-version.patch | 17 +++++++++++ .../libraries/opencolorio/default.nix | 30 ++++++++----------- 2 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch diff --git a/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch b/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch new file mode 100644 index 000000000000..e60ebc9e1efe --- /dev/null +++ b/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch @@ -0,0 +1,17 @@ +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index c122b013..04f36bf0 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -43,11 +43,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ + # ZLIB_VERSION_STRING is still available for backward compatibility. + # See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html + +- if (@ZLIB_VERSION@) # @ZLIB_VERSION@ +- find_dependency(ZLIB @ZLIB_VERSION@) +- else() +- find_dependency(ZLIB @ZLIB_VERSION_STRING@) +- endif() ++ find_dependency(ZLIB) + endif() + + if (NOT TARGET MINIZIP::minizip-ng) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 40a64077acc9..9b5018ef4182 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -27,32 +27,25 @@ stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-l5UUysHdP/gb4Mn5A64XEoHOkthl6Mlb95CuI0l4vXQ="; + sha256 = "sha256-E4TmMEFzI3nKqiDFaAkNx44uo84sacvZqjbfWe3A8fE="; }; patches = [ (fetchpatch { - name = "darwin-no-hidden-l.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch"; - revert = true; - sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; - }) - (fetchpatch { - name = "pkg-config-absolute-path.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch"; - sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM="; - }) - (fetchpatch { - name = "minizip-ng-4.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch"; - hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew="; + # Taken from https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1891. + name = "opencolorio-yaml-cpp-8.0-compat.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/e99b4afcf0408d8ec56fdf2b9380327c9284db00.patch"; + sha256 = "sha256-7eIvVWKcpE0lmuYdNqFQFHkW/sSSzQ//LNIMOC28KZg="; }) + # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. + # Needed for zlib >= 1.3 && cmake < 3.27.4. + ./broken-cmake-zlib-version.patch ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -81,14 +74,17 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + "-DOCIO_USE_SSE2NEON=OFF" # GPU test fails with: freeglut (GPU tests): failed to open display '' "-DOCIO_BUILD_GPU_TESTS=OFF" - "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include" + "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # precision issues on non-x86 doCheck = stdenv.isx86_64; + # Tends to fail otherwise. + enableParallelChecking = false; meta = with lib; { homepage = "https://opencolorio.org"; From 25fdcb4af94c094e5b29fa11a2e7b09dcefd9e4c Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 25 Oct 2023 05:53:12 +0200 Subject: [PATCH 17/56] olive-editor: patch for opencolorio-2.3 --- pkgs/applications/video/olive-editor/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index e90781c3d976..5daac65313e8 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , which , frei0r @@ -34,12 +35,19 @@ stdenv.mkDerivation { "-DBUILD_QT6=1" ]; + patches = [ + (fetchpatch { + # Taken from https://github.com/olive-editor/olive/pull/2294. + name = "olive-editor-openimageio-2.3-compat.patch"; + url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch"; + hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag="; + }) + ]; + # https://github.com/olive-editor/olive/issues/2200 - patchPhase = '' - runHook prePatch + postPatch = '' substituteInPlace ./app/node/project/serializer/serializer230220.cpp \ --replace 'QStringRef' 'QStringView' - runHook postPatch ''; nativeBuildInputs = [ From 8142c0c9006d290e701aa8a0917208a587657de6 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 25 Oct 2023 07:40:24 +0200 Subject: [PATCH 18/56] openimageio: fix build with zlib 1.3 --- pkgs/development/libraries/openimageio/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 610a458c071d..a0f520dcb6ce 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; }; + # Workaround broken zlib version detecion in CMake < 3.37. + postPatch = '' + substituteInPlace ./src/cmake/Config.cmake.in \ + --replace " @ZLIB_VERSION@" "" + ''; + outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ From b5cd2e5089992576cd433fcb89c3adb9a3885112 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 25 Oct 2023 07:40:52 +0200 Subject: [PATCH 19/56] krita: patch for opencolorio-2.3 --- pkgs/applications/graphics/krita/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 507aaf0f7686..ba53a94f7107 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -27,6 +27,12 @@ mkDerivation rec { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch"; hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw="; }) + (fetchpatch { + name = "krita-opencolorio-2.3-compat.patch"; + url = "https://invent.kde.org/graphics/krita/-/commit/520c633c2c868f2236d8e56eefecdcb6e3ebd840.patch"; + hash = "sha256-eXsgBN8OnKjZOQsOxViPypts6CVh3L+IYKMB/mDUcfQ="; + includes = [ "plugins/dockers/lut/ocio_display_filter_vfx2021.cpp" ]; + }) ]; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; From c84e70946bc296a6f5ef3d71992c67c8460175d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 07:31:59 +0000 Subject: [PATCH 20/56] python310Packages.bincopy: 19.1.0 -> 20.0.0 --- pkgs/development/python-modules/bincopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index 1bb3a5b46eb4..25e537203266 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bincopy"; - version = "19.1.0"; + version = "20.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-aDVkrTBEhrTP1Oc/kiE9ZsJ+8fDGXcb2+FSMQP0X0lY="; + hash = "sha256-FM+0z5cie/Kx9bhWI99MdnrSGa/cn+BzLdLP3/RGr98="; }; propagatedBuildInputs = [ From d778d86bb7a748590134195ee2652141d25b31e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 07:41:55 +0000 Subject: [PATCH 21/56] python310Packages.bip-utils: 2.7.1 -> 2.8.0 --- pkgs/development/python-modules/bip-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index b7337c064277..937ca850eb5a 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bip-utils"; - version = "2.7.1"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = "bip_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-QrCkLiGBdZTQCnbWSTN0PeoAsQfg2CoSGdZcbhqTvOk="; + hash = "sha256-FW3ni7kPB0VeVK/uWjDEeWgilP9dNiuvSaboUpG5DLo="; }; postPatch = '' From 869d4ec9ef1c04a902bd80a706be0f37f1568bf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 08:09:04 +0000 Subject: [PATCH 22/56] python310Packages.boilerpy3: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/boilerpy3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boilerpy3/default.nix b/pkgs/development/python-modules/boilerpy3/default.nix index 49573b94ae81..ef2980959d0b 100644 --- a/pkgs/development/python-modules/boilerpy3/default.nix +++ b/pkgs/development/python-modules/boilerpy3/default.nix @@ -6,7 +6,7 @@ let pname = "boilerpy3"; - version = "1.0.6"; + version = "1.0.7"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "jmriebold"; repo = "BoilerPy3"; rev = "refs/tags/v${version}"; - hash = "sha256-hl2+XpSvVaHpq9RGMnSzWHCA8TtBQnYwDtEOia1Rl/A="; + hash = "sha256-dhAB0VbBGsSrgYGUlZEYaKA6sQB/f9Bb3alsRuQ8opo="; }; postPatch = '' From 1bc4c2ff6bfc6b04bb435e8a2a0cce988a31a657 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 09:01:53 +0000 Subject: [PATCH 23/56] python310Packages.bsdiff4: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/bsdiff4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index 3c8df0a17855..f65fe77af252 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G5XOk7nzBoRvbJHJ0OPrZZCkyFrCu+crX2DZ24KtKhw="; + hash = "sha256-HXEpqBIYYHMejM4pAdMYPhSuxwJE9k6PdFYyddw4gGc="; }; pythonImportsCheck = [ From f1f50a29e97d026a03607e5a337ea9ce774e9dcd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:33:23 +0100 Subject: [PATCH 24/56] python311Packages.bincopy: add format - disable on unsupported Python releases --- .../python-modules/bincopy/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index 25e537203266..67b64e2a71af 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -1,8 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, argparse-addons, humanfriendly, pyelftools }: +{ lib +, buildPythonPackage +, fetchPypi +, argparse-addons +, humanfriendly +, pyelftools +, pythonOlder +}: buildPythonPackage rec { pname = "bincopy"; version = "20.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -15,7 +25,9 @@ buildPythonPackage rec { pyelftools ]; - pythonImportsCheck = [ "bincopy" ]; + pythonImportsCheck = [ + "bincopy" + ]; meta = with lib; { description = "Mangling of various file formats that conveys binary information (Motorola S-Record, Intel HEX, TI-TXT, ELF and binary files)"; From 6ad46a3ae231c2b6ceea1c9ef23bff157434ec2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:34:20 +0100 Subject: [PATCH 25/56] python310Packages.bip-utils: update disabled --- pkgs/development/python-modules/bip-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index 937ca850eb5a..829bb082784d 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "2.8.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ebellocchia"; From 81c1fea9d556684d62a61a8b585e7468cd29e7d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:38:49 +0100 Subject: [PATCH 26/56] python311Packages.bip-utils: remove postPatch section --- .../python-modules/bip-utils/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index 829bb082784d..1608ecdf89f1 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -1,16 +1,16 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonOlder -, ecdsa -, coincurve -, pynacl -, crcmod -, ed25519-blake2b -, py-sr25519-bindings , cbor2 +, coincurve +, crcmod +, ecdsa +, ed25519-blake2b +, fetchFromGitHub +, py-sr25519-bindings , pycryptodome +, pynacl , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -27,11 +27,6 @@ buildPythonPackage rec { hash = "sha256-FW3ni7kPB0VeVK/uWjDEeWgilP9dNiuvSaboUpG5DLo="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "coincurve>=15.0.1,<18.0.0" "coincurve" - ''; - propagatedBuildInputs = [ ecdsa cbor2 From e25e4aee789507559ba25546f25e774ab79278cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:42:21 +0100 Subject: [PATCH 27/56] python311Packages.radio-beam: add changelog to meta - use with lib for meta --- pkgs/development/python-modules/radio-beam/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/radio-beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index 78737edf0d76..41653caaa3e0 100644 --- a/pkgs/development/python-modules/radio-beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -42,11 +42,12 @@ buildPythonPackage rec { "radio_beam" ]; - meta = { + meta = with lib; { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ smaret ]; + changelog = "https://github.com/radio-astro-tools/radio-beam/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ smaret ]; }; } From 04a686d5bde123e3ab7d66c2ddc79fe45392fd46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:45:40 +0100 Subject: [PATCH 28/56] python311Packages.python-docs-theme: add changelog to meta --- pkgs/development/python-modules/python-docs-theme/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 322cd38947a5..8eb32ed32557 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python/python-docs-theme"; description = "Sphinx theme for CPython project"; + changelog = "https://github.com/python/python-docs-theme/blob/${version}/CHANGELOG.rst"; license = licenses.psfl; maintainers = with maintainers; [ kaction ]; }; From 30cfc4752d67ec855c21078f164e333de75d7e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Sat, 4 Nov 2023 10:46:17 +0100 Subject: [PATCH 29/56] symfony-cli: 5.6.0 -> 5.7.0 --- .../development/tools/symfony-cli/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 4f7dd010b844..c6ae034d509f 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -1,15 +1,20 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule +, fetchFromGitHub +, lib +, testers +, symfony-cli +}: buildGoModule rec { pname = "symfony-cli"; - version = "5.6.0"; - vendorHash = "sha256-1BqgnWFMk8hWwra75a5o6Rwbj5wiCUIdSnsAcB+7Mno="; + version = "5.7.0"; + vendorHash = "sha256-Sq3Cr/iVW3OSHLujnR2fE5ZtJhYLiobkmKXKz8hjSus="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-AtHRuzpKXp+WlFser0J5MR63rbO0xO4N/L3U0Q3iax8="; + hash = "sha256-wq+4czVQXQHV2Ci0zUV66+RiRREWawjH4i1i18T8RrA="; }; ldflags = [ @@ -23,11 +28,16 @@ buildGoModule rec { ''; # Tests requires network access - checkPhase = '' - $GOPATH/bin/symfony-cli - ''; + doCheck = false; + + passthru.tests.version = testers.testVersion { + inherit version; + package = symfony-cli; + command = "symfony version --no-ansi"; + }; meta = { + changelog = "https://github.com/symfony-cli/symfony-cli/releases/tag/v${version}"; description = "Symfony CLI"; homepage = "https://github.com/symfony-cli/symfony-cli"; license = lib.licenses.agpl3Plus; From 5dfa3bc7003fbedb6ac2c3a262242d995c0f8296 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:47:35 +0100 Subject: [PATCH 30/56] python311Packages.python-docs-theme: equalize content --- .../python-docs-theme/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 8eb32ed32557..86b858ecd30a 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -1,26 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, sphinx +}: buildPythonPackage rec { pname = "python-docs-theme"; version = "2023.9"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "python"; repo = "python-docs-theme"; rev = "refs/tags/${version}"; - sha256 = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno="; + hash = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno="; }; - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; - propagatedBuildInputs = [ sphinx ]; + propagatedBuildInputs = [ + sphinx + ]; - pythonImportsCheck = [ "python_docs_theme" ]; + pythonImportsCheck = [ + "python_docs_theme" + ]; meta = with lib; { - homepage = "https://github.com/python/python-docs-theme"; description = "Sphinx theme for CPython project"; + homepage = "https://github.com/python/python-docs-theme"; changelog = "https://github.com/python/python-docs-theme/blob/${version}/CHANGELOG.rst"; license = licenses.psfl; maintainers = with maintainers; [ kaction ]; From 99102ce18531832aa54223be7a09023c09c8cf95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:48:39 +0100 Subject: [PATCH 31/56] python311Packages.python-docs-theme: disable on unsupported Python releases --- pkgs/development/python-modules/python-docs-theme/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 86b858ecd30a..464697c35bfa 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , flit-core +, pythonOlder , sphinx }: @@ -10,6 +11,8 @@ buildPythonPackage rec { version = "2023.9"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "python"; repo = "python-docs-theme"; From 87c1b963b54b6bba5ba7358685aaddd57dff6656 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 10:50:38 +0100 Subject: [PATCH 32/56] python311Packages.stdlibs: update disabled --- pkgs/development/python-modules/stdlibs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix index a7d3520e1ac2..1b2f80da245d 100644 --- a/pkgs/development/python-modules/stdlibs/default.nix +++ b/pkgs/development/python-modules/stdlibs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "2023.11.2"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "omnilib"; From 042965d7420d157dca4e2d378dc9d5db81cfaa7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 11:03:56 +0100 Subject: [PATCH 33/56] python311Packages.ical: 5.1.0 -> 5.1.1 Diff: https://github.com/allenporter/ical/compare/refs/tags/5.1.0...5.1.1 Changelog: https://github.com/allenporter/ical/releases/tag/5.1.1 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index c69df0352c2a..8da513c5b787 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ical"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ffNgYtwErt9tzfDWQnt0h7QHQL+gMvFpP8zH6FSoHEM="; + hash = "sha256-ewKQzjtVgx9c6h67epgFNhY4MjR7kFNCr4EKZ+UF2xA="; }; nativeBuildInputs = [ From f3049bd1ea9f05a545e94a6394b7b38cb2542880 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Nov 2023 11:07:23 +0100 Subject: [PATCH 34/56] python311Packages.publicsuffixlist: 0.10.0.20231030 -> 0.10.0.20231104 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 00edd1433813..78ffc8ebed80 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231030"; + version = "0.10.0.20231104"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1yRv6zg9mKJTinR57QHvCx/0mi0b2O3CkcoH1v4QuNo="; + hash = "sha256-p+sOaRfp2IDdXL6eotCrSHu91i+mAwavmqELa5nDB7c="; }; nativeBuildInputs = [ From c9ba79c872ffd600f98153f0de3a1ccb5b1691f0 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Sat, 4 Nov 2023 11:28:01 +0100 Subject: [PATCH 35/56] appflowy: 0.3.6 -> 0.3.7 --- pkgs/applications/office/appflowy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index a0e95b62edfe..dfa19511327d 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.6"; + version = "0.3.7"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-MH5NLppwe/W5d0duNwyQtUBryqDzfV3u0LqWI40GqLQ="; + hash = "sha256-Z2iNYNpf0a3kXBLaJeGVYIW5EGiBuMPdFNK2jSpnmws="; stripRoot = false; }; From 6088b00a14a5b831aff9dabe0198759847db7ac3 Mon Sep 17 00:00:00 2001 From: itstarsun Date: Sat, 4 Nov 2023 11:13:28 +0000 Subject: [PATCH 36/56] ktlint: add meta.mainProgram --- pkgs/development/tools/ktlint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 4c122db6f340..0b64b59467b7 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; + mainProgram = "ktlint"; }; } From 93bc0e8f90358ab39983736ee9382e6bf1d3b11e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 11:23:05 +0000 Subject: [PATCH 37/56] python310Packages.clarifai-grpc: 9.9.3 -> 9.10.0 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index b4d0c4b40765..e6bff88f4321 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.9.3"; + version = "9.10.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9h/d1w5toxWMHMvVkQiuHySf3+IjeumD4EipgI1kaEs="; + hash = "sha256-8jx2OP1VcQtGmen58r1k/w7srjSJC/53sNxFrRm7IXs="; }; propagatedBuildInputs = [ From c216797586dde91cf56a2b111b5353c5a93e8380 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Fri, 3 Nov 2023 18:59:29 +0000 Subject: [PATCH 38/56] cloudlog: 2.4.11 -> 2.5.0 --- pkgs/applications/radio/cloudlog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 4814672bfa3c..073909b80e5c 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,16 +8,16 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4.11"; + version = "2.5.0"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-w1QCEow0K8uzbHlyASCggw2U+1RXjPbmxd5XRSdp6yE="; + hash = "sha256-4+aP+y7TNCq7zGOK3HCrl1NQOmpOHezfbL9B1vW2AUo="; }; - postPath = '' + postPatch = '' substituteInPlace index.php \ --replace "define('ENVIRONMENT', 'development');" "define('ENVIRONMENT', 'production');" ''; From 9a6e1ee7f65c9c33a3764cb600740eb18f8e25a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 13:47:08 +0000 Subject: [PATCH 39/56] jql: 7.0.4 -> 7.0.5 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 4d980d521d62..c5624f2c49b3 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-Qy4ozTRdDF8ENyk4AB2a/4AuMSLJd/3w/q9TjGgrkPE="; + hash = "sha256-D+69R63er4OIMOdyoCuGVvVcUlM2PhLKEyUat1yEmLU="; }; - cargoHash = "sha256-or69dz+wMhp8CPLzip6c6S7HpilAE2DAVkv/3IJMJWQ="; + cargoHash = "sha256-2/0gUavyrNxhc2j+ECPsvMLKCkZdSClivEcJVE1zFgA="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From 5ae713a2e4d40bdac6e240031f691dc157ee8e03 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Sat, 4 Nov 2023 21:22:30 +0900 Subject: [PATCH 40/56] foot: 1.16.1 -> 1.16.2 --- pkgs/applications/terminal-emulators/foot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 380659e71faa..ad9487b082c8 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.16.1"; + version = "1.16.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-laE4Ytt64ao1vvF05g4l1AkEnKPwKRYCVCybsX1Ae9U="; + hash = "sha256-hT+btlfqfwGBDWTssYl8KN6SbR9/Y2ors4ipECliigM="; }; separateDebugInfo = true; From 28c2e442b93ea2bfcc67b96e645e9f4c4faa8b21 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 4 Nov 2023 22:22:25 +0800 Subject: [PATCH 41/56] dt: 1.2.5 -> 1.3.1 --- pkgs/tools/text/dt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index 303feb0fe942..aa478b16dd69 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dt"; - version = "1.2.5"; + version = "1.3.1"; src = fetchFromGitHub { owner = "so-dang-cool"; repo = "dt"; rev = "v${finalAttrs.version}"; - hash = "sha256-i8oMrsPcINVK5kXzrN+lcPqBfxIeed8W+NF7Qd0crrk="; + hash = "sha256-qHfvHf4T0wWnzqp5FfLg7n7te24xc2aMEdTK3Iia8Q0="; }; nativeBuildInputs = [ zig_0_11.hook ]; From dee9519abe3a91417886cb912a50b3ad43bd7d67 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 4 Nov 2023 16:33:38 +0100 Subject: [PATCH 42/56] nixos/plasma5: fix mismatch between nix and module system In https://github.com/NixOS/nixpkgs/pull/254071, a mismatch between usage of the Nix language and the NixOS module system was introduced. By merging the kwin_wayland wrapper attrset into the mkIf representation, the former was effectively ignored. As a result, the capability wrapper for kwin_wayland stopped being installed, leading to realtime scheduling being disabled. The issue was not detected because the behavioral change is very subtle. By consistently using language-level constructs, this mismatch is resolved. The capability wrapper is thus installed again and realtime scheduling is restored. --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 282a34f6b011..7beac35d449e 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -29,7 +29,7 @@ let libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; inherit (lib) - getBin optionalString literalExpression + getBin optionalAttrs optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule mkDefault mkIf mkMerge mkOption mkPackageOptionMD types; @@ -178,7 +178,7 @@ in capabilities = "cap_sys_nice+ep"; source = "${getBin plasma5.kwin}/bin/kwin_wayland"; }; - } // mkIf (!cfg.runUsingSystemd) { + } // optionalAttrs (!cfg.runUsingSystemd) { start_kdeinit = { setuid = true; owner = "root"; From 405f9020217cb7508e5325c7c6e8bdb5cceec2ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Nov 2023 07:43:11 +0000 Subject: [PATCH 43/56] detekt: 1.23.1 -> 1.23.3 --- pkgs/development/tools/detekt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix index 27e11032d939..cf446008928a 100644 --- a/pkgs/development/tools/detekt/default.nix +++ b/pkgs/development/tools/detekt/default.nix @@ -1,13 +1,13 @@ { detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: stdenv.mkDerivation rec { pname = "detekt"; - version = "1.23.1"; + version = "1.23.3"; jarfilename = "${pname}-${version}-executable.jar"; src = fetchurl { url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; - sha256 = "sha256-CJwVQF7FVjrbooXQnOzP8Efrx4iLi7w6OGu8bGdE14g="; + sha256 = "sha256-Lm9z8XB7BdB7ikiyJyuVtV8eqlPucxmMNNC90E99qpA="; }; dontUnpack = true; From 09575c6c9cfb104e872bb7a9511bc40ed6ee1871 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Nov 2023 10:13:45 +0000 Subject: [PATCH 44/56] tengine: 3.0.0 -> 3.1.0 --- pkgs/servers/http/tengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index e80185ac5cbb..b03a285a1d02 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.1.0"; pname = "tengine"; src = fetchFromGitHub { owner = "alibaba"; repo = pname; rev = version; - hash = "sha256-nUwPT7374dfE/T6yuCUynObq6LxBHDp90Dj2JGwJ4+M="; + hash = "sha256-cClSNBlresMHqJrqSFWvUo589TlwJ2tL5FWJG9QBuis="; }; buildInputs = From ade970b8eabe56e721f2c56e0dd4df0f525ccad1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Oct 2023 03:24:05 +0000 Subject: [PATCH 45/56] mautrix-discord: 0.6.2 -> 0.6.3 --- pkgs/servers/mautrix-discord/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/servers/mautrix-discord/default.nix index f2273fa0ec0a..d7be9a051d31 100644 --- a/pkgs/servers/mautrix-discord/default.nix +++ b/pkgs/servers/mautrix-discord/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-194AB7r63gijTyeh8mn5N/AgVBeh39YMwdmvuAi3c9k="; + hash = "sha256-hksnD1RWK83JjVIZsKeK8bQobNmzIbm9drgU0VjiqLs="; }; - vendorHash = "sha256-389ewqgpdFNRGAyka+oumx0RVadCSt1BXsXxIGTQwW0="; + vendorHash = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU="; ldflags = [ "-s" "-w" ]; From 8cf210a55e1811e17a33574d9f59e36653089263 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Nov 2023 04:42:40 +0000 Subject: [PATCH 46/56] cudatext-qt: 1.200.0 -> 1.201.0 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 9eed461413a6..84df7d5b0c27 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.200.0"; + version = "1.201.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0="; + hash = "sha256-Do2JPNZtoi7zbUnJomQAZ8zR/WPB6+G051xZWmeUBP4="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 52a333495ef6..e2c4746735df 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.10.02", - "hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q=" + "rev": "2023.10.30", + "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.10.03", - "hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo=" + "rev": "2023.10.30", + "hash": "sha256-xsJ02zGzi7ByFBXql4lLWWLiPVWwtOLXzixmv4AeC2I=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -36,7 +36,7 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2023.06.29", + "rev": "2023.06.30", "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" }, "Emmet-Pascal": { From 26f5c2ba0b93e1133d1f2ab87cce549ce8a69764 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Nov 2023 06:27:21 +0000 Subject: [PATCH 47/56] intel-gmmlib: 22.3.11 -> 22.3.12 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 331198e975ed..b909051aa77b 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.11"; + version = "22.3.12"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-pweKUf/KW64neJkEZwjePh7ft8KEBu1I9zCIx/lMQT8="; + sha256 = "sha256-BfMH3gFInWiBCuFZC0bZzpoZCEQzv/+tMvRH9ep5rLk="; }; nativeBuildInputs = [ cmake ]; From c6d4050dd5630dd0ea4210e0433baf46e6cba931 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Oct 2023 03:29:53 +0000 Subject: [PATCH 48/56] mdbook-admonish: 1.13.0 -> 1.13.1 --- pkgs/tools/text/mdbook-admonish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index cc84b33b9f65..dcea374bffe7 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; rev = "v${version}"; - hash = "sha256-jr77WC6b5PrPANivd6diAFfVqudtviIWBE7I8eFmCfs="; + hash = "sha256-wRRBasHnTelLCiHjjrMmXv/2V3P91n4kZ1aAt1tZx/Y="; }; - cargoHash = "sha256-gBkRA8QRha46y5cp5aY2R+ekdfjUX5tDuNawCwzKFi4="; + cargoHash = "sha256-KAcZyHanmbOKK+55dkINss9uOxk6P+r38M6qftYQwpw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From ad8de2dade265f4774f8e940f46b963a16c92838 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Oct 2023 12:23:49 +0000 Subject: [PATCH 49/56] flannel: 0.22.3 -> 0.23.0 --- pkgs/tools/networking/flannel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 0d7b5be4b5a2..bf0365b39919 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.22.3"; + version = "0.23.0"; rev = "v${version}"; - vendorHash = "sha256-2P9gEbItK7rCtveXIZkFMcvppjK4GLzTSoLrkMPeCig="; + vendorHash = "sha256-U4mFFxVVLHvgY2YQN1nEsFiTpfBpmhftLoVoGEzb2Fs="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-sO3iFs6pAmnqpc9+hxx2WZQWOP37/4XS1m5U4nerVLI="; + sha256 = "sha256-8KUfmnDShhb8eFukU/dUo/PCrFlQDBh+gAV2rqqB7mE="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; From 35d4ca4f342e7a182dd08b9137967431d5507596 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Oct 2023 21:03:06 +0000 Subject: [PATCH 50/56] mediastreamer: 5.2.98 -> 5.2.109 --- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 34082407c21f..49357dc02bbe 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.2.98"; + version = "5.2.109"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-02e1nGSwlhEHwQH6WqBSKBlWQWAYa7lKdZaZ8/0SAxs="; + hash = "sha256-uiuT53mM/dUw5tOYKsBEqEbvYRFKEyyTDKCLYaQvMAs="; }; patches = [ From 32bda178aaa8f0aa6f64b11b7e0c33a87ce582c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Oct 2023 03:38:26 +0000 Subject: [PATCH 51/56] gnustep.back: 0.29.0 -> 0.30.0 --- pkgs/desktops/gnustep/back/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 643b7ddecc26..867c82881c1a 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -11,11 +11,11 @@ gsmakeDerivation rec { pname = "gnustep-back"; - version = "0.29.0"; + version = "0.30.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; - sha256 = "sha256-4n2SC68G0dpSz9nqCL5Kz76nyoRxWcRTWDwZsnMoHSM="; + sha256 = "sha256-HD4PLdkE573nPWqFwffUmcHw8VYIl5rLiPKWrbnwpCI="; }; nativeBuildInputs = [ pkg-config ]; From 7542b1105243a593c8ad79feb593a0f7178130b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Oct 2023 02:39:57 +0000 Subject: [PATCH 52/56] freetds: 1.4.2 -> 1.4.6 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index d05605455483..97c356a3aa4e 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.2"; + version = "1.4.6"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-is0TOZicZHCYA+In0ggretJkvmauvU26LGmnaKy4ZxM="; + hash = "sha256-gTgCoca8Av4WlrbqMapTUiVxl3dza1v8I6OheFiVasA="; }; buildInputs = [ From c526304148df4dd5f41c79b79ebd49b31260d1fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Nov 2023 03:52:48 +0000 Subject: [PATCH 53/56] uhdm: 1.76 -> 1.77 --- pkgs/applications/science/logic/uhdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 7312f989cb66..ec25d58efcbf 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; # When updating this package, also consider updating science/logic/surelog - version = "1.76"; + version = "1.77"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-Q/u5lvILYDT5iScES3CTPIm/B5apoOHXOQmCsZ73NlU="; + hash = "sha256-JKhpcPG4hWlcn2C+Wlx7yNIMXXurAMxLSK4xWN2akMQ="; fetchSubmodules = false; # we use all dependencies from nix }; From 859dcdb5fa685d2ab23fc435054594f3b666bef0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Oct 2023 23:34:49 +0000 Subject: [PATCH 54/56] containerd: 1.7.7 -> 1.7.8 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 2370eda34b64..3ff03781732b 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-5Tw7xltrsp+yGrdJ0O4MoFUvIaEiCQpMip5X1kfV/iM="; + hash = "sha256-p16qHJD0i0ZNEFGEbfmbxiedX9/uHkZxhCeB3x/5iLM="; }; vendorHash = null; From f0ae83ce523db9f6229828a15e8198f4b57542d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Nov 2023 05:32:16 +0000 Subject: [PATCH 55/56] gwyddion: 2.63 -> 2.64 --- pkgs/applications/science/chemistry/gwyddion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index d6d371bf5054..89fb3534c607 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -21,10 +21,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.63"; + version = "2.64"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-FSs/Dbnr1shEw/W51DhUFPb61tM+0atc6wxY81EiTdM="; + sha256 = "sha256-FDL4XDHH6WYF47OsnhxpM7s7YadutiCDjcJKCF8ZlCw="; }; nativeBuildInputs = [ pkg-config file ]; From c0a59102299f7798b05040be8f8eee1ba50e7f15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Oct 2023 03:50:49 +0000 Subject: [PATCH 56/56] gnustep.make: 2.9.0 -> 2.9.1 --- pkgs/desktops/gnustep/make/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index def8e297b552..f9b4ae553c85 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnustep-make"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "sha256-oLBmwRJXh5x8hTEd6mnGf23HQe8znbZRT4W2SZLEDSo="; + sha256 = "sha256-w9bnDPFWsn59HtJQHFffP5bidIjOLzUbk+R5xYwB6uc="; }; configureFlags = [