From 68fccae63d8f6d9bb6e482e1e0c5d7390a87553e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Sep 2024 12:41:07 +0000 Subject: [PATCH 001/123] octavePackages.netcdf: 1.0.17 -> 1.0.18 --- pkgs/development/octave-modules/netcdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix index 280819806838..c07321529934 100644 --- a/pkgs/development/octave-modules/netcdf/default.nix +++ b/pkgs/development/octave-modules/netcdf/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "netcdf"; - version = "1.0.17"; + version = "1.0.18"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-uuFD8VNeWbyHFyWMDMzWDd2n+dG9EFmc/JnZU2tx+Uk="; + sha256 = "sha256-ydgcKFh4uWuSlr7zw+k1JFUSzGm9tiWmOHV1IWvlgwk="; }; buildInputs = [ From fcb8b742109b844fd4c24645f3805c680672a924 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Wed, 25 Sep 2024 10:08:28 -0500 Subject: [PATCH 002/123] octavePackages.netcdf: Propagate netcdf library to octave environment --- pkgs/development/octave-modules/netcdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix index c07321529934..13ace6249c12 100644 --- a/pkgs/development/octave-modules/netcdf/default.nix +++ b/pkgs/development/octave-modules/netcdf/default.nix @@ -13,7 +13,7 @@ buildOctavePackage rec { sha256 = "sha256-ydgcKFh4uWuSlr7zw+k1JFUSzGm9tiWmOHV1IWvlgwk="; }; - buildInputs = [ + propagatedBuildInputs = [ netcdf ]; From ae2d745af610347cb27bfa0125bfce399f463279 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 7 Nov 2024 23:22:53 +0100 Subject: [PATCH 003/123] doc/stdenv: accurately describe propagatedNativeBuildInputs --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 1c6391472735..ddeb32910449 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -408,7 +408,7 @@ The propagated equivalent of `depsBuildBuild`. This perhaps never ought to be us ##### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs} -The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets. +The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. Note that if instead, package `Z` has `nativeBuildInputs = [Y]`, then `X` will not be included at all. ##### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated} From 67a5661a6a46f724aee29004fa3d9547d8eaabbb Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 25 Nov 2024 14:58:39 -0600 Subject: [PATCH 004/123] octavePackages: Ensure locales are found and present in final env Add locale as buildInput to Octave packages buildEnv Some Octave packages use a Perl script to translate their documentation to other languages, which shells out to the locale program. Before, this would error every time locale was called (which is on every file), and would lead to a large number of what looked like errors being printed out. Set the path to the glibc locales using LOCALE_ARCHIVE in the makeWrapper invocation, so the wrapped program knows where to find locales for translations at run-time. --- pkgs/development/interpreters/octave/build-env.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index 8e81d7eebc38..1b5849a68eb3 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -1,5 +1,6 @@ { lib, stdenv, octave, buildEnv -, makeWrapper, texinfo +, makeWrapper +, locale, texinfo, glibcLocalesUtf8 , wrapOctave , computeRequiredOctavePackages , extraLibs ? [] @@ -20,7 +21,7 @@ in buildEnv { extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ texinfo wrapOctave ]; + buildInputs = [ locale texinfo wrapOctave ]; # During "build" we must first unlink the /share symlink to octave's /share # Then, we can re-symlink the all of octave/share, except for /share/octave @@ -33,7 +34,9 @@ in buildEnv { cd "${octave}/bin" for prg in *; do if [ -x $prg ]; then - makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" + makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" \ + --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" \ + --set LOCALE_ARCHIVE "${glibcLocalesUtf8}/lib/locale/locale-archive" fi done cd $out From a1436e5414bb84c75a11f498e4e8c8cae30c9574 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 00:42:04 +0000 Subject: [PATCH 005/123] epubcheck: 5.1.0 -> 5.2.0 --- pkgs/by-name/ep/epubcheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ep/epubcheck/package.nix b/pkgs/by-name/ep/epubcheck/package.nix index d3426983efa1..1619d621f0e0 100644 --- a/pkgs/by-name/ep/epubcheck/package.nix +++ b/pkgs/by-name/ep/epubcheck/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "5.1.0"; + version = "5.2.0"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "sha256-gskQ02lGka3nBHSDXO3TpKSQzaoaJUQY9AvWG7L+1YM="; + sha256 = "sha256-7Vfbs0lqrm/YDSfvMxaQu9IsYx1PugpbsDYLU2fIC6U="; }; nativeBuildInputs = [ makeWrapper ]; From 36f31957fab19a906a55acda328db7f2ec162b45 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 6 Jan 2025 20:57:52 +0800 Subject: [PATCH 006/123] python313Packages.mlxtend: fix build --- ...test-replace-np.float_-to-np.float64.patch | 109 ++++++++++++++++++ .../python-modules/mlxtend/default.nix | 15 ++- 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch diff --git a/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch b/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch new file mode 100644 index 000000000000..c196d2bb5035 --- /dev/null +++ b/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch @@ -0,0 +1,109 @@ +From 360cb75317aecaf6b9abcf24f0577afef75c464e Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 6 Jan 2025 20:41:27 +0800 +Subject: [PATCH] fix(test): replace np.float_ to np.float64 + +--- + mlxtend/_base/_regressor.py | 2 +- + mlxtend/_base/tests/test_classifier.py | 2 +- + mlxtend/_base/tests/test_cluster.py | 2 +- + mlxtend/classifier/multilayerperceptron.py | 2 +- + mlxtend/classifier/softmax_regression.py | 2 +- + mlxtend/math/linalg.py | 2 +- + mlxtend/plotting/tests/test_decision_regions.py | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/mlxtend/_base/_regressor.py b/mlxtend/_base/_regressor.py +index e3d0a1d..1d3a5d6 100644 +--- a/mlxtend/_base/_regressor.py ++++ b/mlxtend/_base/_regressor.py +@@ -16,7 +16,7 @@ class _Regressor(object): + pass + + def _check_target_array(self, y, allowed=None): +- if not isinstance(y[0], (float, np.float_)): ++ if not isinstance(y[0], (float, np.float64)): + raise AttributeError("y must be a float array.\nFound %s" % y.dtype) + + def fit(self, X, y, init_params=True): +diff --git a/mlxtend/_base/tests/test_classifier.py b/mlxtend/_base/tests/test_classifier.py +index f77f74d..1bbac6d 100644 +--- a/mlxtend/_base/tests/test_classifier.py ++++ b/mlxtend/_base/tests/test_classifier.py +@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1(): + + + def test_check_labels_integer_notok(): +- y = np.array([1.0, 2.0], dtype=np.float_) ++ y = np.array([1.0, 2.0], dtype=np.float64) + cl = BlankClassifier(print_progress=0, random_seed=1) + with pytest.raises(AttributeError) as excinfo: + cl._check_target_array(y) +diff --git a/mlxtend/_base/tests/test_cluster.py b/mlxtend/_base/tests/test_cluster.py +index 6da1a9d..54c2526 100644 +--- a/mlxtend/_base/tests/test_cluster.py ++++ b/mlxtend/_base/tests/test_cluster.py +@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1(): + + + def test_check_labels_integer_notok(): +- y = np.array([1.0, 2.0], dtype=np.float_) ++ y = np.array([1.0, 2.0], dtype=np.float64) + cl = BlankClassifier(print_progress=0, random_seed=1) + with pytest.raises(AttributeError) as excinfo: + cl._check_target_array(y) +diff --git a/mlxtend/classifier/multilayerperceptron.py b/mlxtend/classifier/multilayerperceptron.py +index 770dab9..05416c3 100644 +--- a/mlxtend/classifier/multilayerperceptron.py ++++ b/mlxtend/classifier/multilayerperceptron.py +@@ -143,7 +143,7 @@ class MultiLayerPerceptron( + prev_grad_b_out = np.zeros(shape=self.b_["out"].shape) + prev_grad_w_out = np.zeros(shape=self.w_["out"].shape) + +- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_) ++ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64) + + self.init_time_ = time() + +diff --git a/mlxtend/classifier/softmax_regression.py b/mlxtend/classifier/softmax_regression.py +index 56444e5..173154e 100644 +--- a/mlxtend/classifier/softmax_regression.py ++++ b/mlxtend/classifier/softmax_regression.py +@@ -141,7 +141,7 @@ class SoftmaxRegression(_BaseModel, _IterativeModel, _Classifier, _MultiClass): + ) + self.cost_ = [] + +- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_) ++ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64) + + self.init_time_ = time() + rgen = np.random.RandomState(self.random_seed) +diff --git a/mlxtend/math/linalg.py b/mlxtend/math/linalg.py +index 02600f1..ece4c3c 100644 +--- a/mlxtend/math/linalg.py ++++ b/mlxtend/math/linalg.py +@@ -45,7 +45,7 @@ def vectorspace_orthonormalization(ary, eps=1e-13): # method='gram-schmidt', + # 2c) Normalize if linearly independent, + # and set to zero otherwise + +- arr = ary.astype(np.float_).copy() ++ arr = ary.astype(np.float64).copy() + + for i in range(arr.shape[1]): + for j in range(i): +diff --git a/mlxtend/plotting/tests/test_decision_regions.py b/mlxtend/plotting/tests/test_decision_regions.py +index fba2255..aad63ff 100644 +--- a/mlxtend/plotting/tests/test_decision_regions.py ++++ b/mlxtend/plotting/tests/test_decision_regions.py +@@ -94,7 +94,7 @@ def test_y_int_ary(): + "Try passing the array as y.astype(np.int_)", + plot_decision_regions, + X[:, :2], +- y.astype(np.float_), ++ y.astype(np.float64), + sr, + ) + +-- +2.47.0 + diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 361aea5cb9bf..1ee22516471f 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -7,6 +7,7 @@ pytestCheckHook, scipy, numpy, + numpy_1, scikit-learn, pandas, matplotlib, @@ -22,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasbt"; - repo = pname; + repo = "mlxtend"; tag = "v${version}"; hash = "sha256-c6I0dwu4y/Td2G6m2WP/52W4noQUmQMDvpzXA9RZauo="; }; @@ -38,10 +39,22 @@ buildPythonPackage rec { joblib ]; + patches = [ + # https://github.com/rasbt/mlxtend/pull/1119 + ./0001-fix-test-replace-np.float_-to-np.float64.patch + ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "-sv" ]; + disabledTests = [ + # Type changed in numpy2 test should be updated + "test_invalid_labels_1" + "test_default" + "test_nullability" + ]; + disabledTestPaths = [ "mlxtend/evaluate/f_test.py" # need clean "mlxtend/evaluate/tests/test_feature_importance.py" # urlopen error From 6af01120a6e861527d5a8a3e4fc3f875730ac1ea Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 10 Jan 2025 13:34:16 +0100 Subject: [PATCH 007/123] postgresql: fix build if pythonSupport is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since https://github.com/NixOS/nixpkgs/commit/445371f309a62e9107ad78fb3c65fff768efb43c (which added `strictDeps = true;`) the build of PostgreSQL is broken if python support is enabled (via argument `pythonSupport = true`). The problem seems to be that PostgreSQL’s build system is unable to find the supplied Python installation. This commit fixes the build by setting the `PYTHON` environment variable within the build environment, as document here: https://www.postgresql.org/docs/current/install-make.html#CONFIGURE-ENVVARS-PYTHON Closes #372333 --- pkgs/servers/sql/postgresql/generic.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 2effd687e8e4..a6bbe3871dc3 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -247,9 +247,11 @@ let # flags will remove unused sections from all shared libraries and binaries - including # those paths. This avoids a lot of circular dependency problems with different outputs, # and allows splitting them cleanly. - env.CFLAGS = - "-fdata-sections -ffunction-sections" - + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections"); + env = { + CFLAGS = + "-fdata-sections -ffunction-sections" + + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections"); + } // lib.optionalAttrs pythonSupport { PYTHON = "${python3}/bin/python"; }; configureFlags = let From 73936470d038985ca1e852783e1e8f6b5dceabfd Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 008/123] uhd: pin Boost 1.86 --- pkgs/applications/radio/uhd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index c69de023e25f..b6860396b0d3 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -6,7 +6,8 @@ cmake, pkg-config, # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations - boost, + # Pin Boost 1.86 due to use of boost::asio::io_service. + boost186, ncurses, enableCApi ? true, enablePythonApi ? true, @@ -162,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = finalAttrs.pythonPath ++ [ - boost + boost186 libusb1 ] ++ optionals (enableExamples) [ From 76922c7b0d9383a38dcb45f4981193d9c6b41201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Jan 2025 10:16:37 -0800 Subject: [PATCH 009/123] python313Packages.libcst: 1.5.1 -> 1.6.0 Diff: https://github.com/Instagram/LibCST/compare/refs/tags/v1.5.1...v1.6.0 Changelog: https://github.com/Instagram/LibCST/blob/v1.6.0/CHANGELOG.md --- pkgs/development/python-modules/libcst/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index af3621b4e18b..6abcf4ed9cae 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.5.1"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,14 +32,13 @@ buildPythonPackage rec { owner = "Instagram"; repo = "LibCST"; tag = "v${version}"; - hash = "sha256-fveY4ah94pv9ImI36MNrrxTpZv/DtLb45pXm67L8/GA="; + hash = "sha256-OuokZvdaCTgZI1VoXInqs6YNLsVUohaat5IjYYvUeVE="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit pname version src; sourceRoot = "${src.name}/${cargoRoot}"; - name = "${pname}-${version}"; - hash = "sha256-TcWGW1RF2se89BtvQHO+4BwnRMZ8ygqO3du9Q/gZi/Q="; + hash = "sha256-+sCBkCR2CxgG/NuWch8sZTCitKynZmF221mR16TbQKI="; }; cargoRoot = "native"; From 9e01b88f90de85046345e267547df4d94320374c Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 12 Jan 2025 19:35:34 +0800 Subject: [PATCH 010/123] python313Packages.fireflyalgorithm: 0.4.5 -> 0.4.6 --- .../fireflyalgorithm/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix index a8ea25eec58c..934354dfbb18 100644 --- a/pkgs/development/python-modules/fireflyalgorithm/default.nix +++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fireflyalgorithm"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,23 +19,28 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "FireflyAlgorithm"; tag = version; - hash = "sha256-dJnjeJN9NI8G/haYeOiMtAl56cExqMk0iTWpaybl4nE="; + hash = "sha256-NMmwjKtIk8KR0YXXSXkJhiQsbjMusaLnstUWx0izCNA="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'numpy = "^1.26.1"' "" + ''; - propagatedBuildInputs = [ numpy ]; + build-system = [ poetry-core ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "fireflyalgorithm" ]; - meta = with lib; { + meta = { description = "Implementation of the stochastic nature-inspired algorithm for optimization"; mainProgram = "firefly-algorithm"; homepage = "https://github.com/firefly-cpp/FireflyAlgorithm"; changelog = "https://github.com/firefly-cpp/FireflyAlgorithm/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ firefly-cpp ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ firefly-cpp ]; }; } From be81e03dd41f23b5f0135aad93d416bcad2ad238 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 12 Jan 2025 19:57:02 +0800 Subject: [PATCH 011/123] python313Packages.formencode: fix build --- .../python-modules/formencode/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/formencode/default.nix b/pkgs/development/python-modules/formencode/default.nix index 216e48dd1ff2..09a803e2c7f3 100644 --- a/pkgs/development/python-modules/formencode/default.nix +++ b/pkgs/development/python-modules/formencode/default.nix @@ -6,6 +6,7 @@ setuptools-scm, six, dnspython, + legacy-cgi, pycountry, pytestCheckHook, }: @@ -27,9 +28,12 @@ buildPythonPackage rec { sed -i '/setuptools_scm_git_archive/d' setup.py ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ six ]; + dependencies = [ + six + legacy-cgi + ]; nativeCheckInputs = [ dnspython @@ -43,10 +47,10 @@ buildPythonPackage rec { "test_unicode_ascii_subgroup" ]; - meta = with lib; { + meta = { description = "FormEncode validates and converts nested structures"; homepage = "http://formencode.org"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From 3c0f2224f33b9d5d08ef6d412722b4d10fd39ad5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Jan 2025 13:27:55 +0100 Subject: [PATCH 012/123] p Date: Thu, 21 Nov 2024 20:26:50 +0000 Subject: [PATCH 013/123] nixos/pay-respects: add runtimeRules option Signed-off-by: Fernando Rodrigues --- nixos/modules/programs/pay-respects.nix | 48 +++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix index 83822cdc2c7f..96f56a7ce576 100644 --- a/nixos/modules/programs/pay-respects.nix +++ b/nixos/modules/programs/pay-respects.nix @@ -7,16 +7,22 @@ let inherit (lib) getExe + literalExpression maintainers mkEnableOption mkIf + mkMerge mkOption optionalString types ; - inherit (types) str; + inherit (types) listOf str; + cfg = config.programs.pay-respects; + settingsFormat = pkgs.formats.toml { }; + inherit (settingsFormat) generate type; + initScript = shell: if (shell != "fish") then @@ -41,11 +47,49 @@ in The default value is `f`, but you can use anything else as well. ''; }; + runtimeRules = mkOption { + type = listOf type; + default = [ ]; + example = literalExpression '' + [ + { + command = "xl"; + match_err = [ + { + pattern = [ + "Permission denied" + ]; + suggest = [ + ''' + #[executable(sudo), !cmd_contains(sudo), err_contains(libxl: error:)] + sudo {{command}} + ''' + ]; + } + ]; + } + ]; + ''; + description = '' + List of rules to be added to `/etc/xdg/pay-respects/rules`. + `pay-respects` will read the contents of these generated rules to recommend command corrections. + Each rule module should start with the `command` attribute that specifies the command name. See the [upstream documentation](https://codeberg.org/iff/pay-respects/src/branch/main/rules.md) for more information. + ''; + }; }; }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.pay-respects ]; + environment = mkMerge ( + [ + { + systemPackages = [ pkgs.pay-respects ]; + } + ] + ++ map (rule: { + etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule; + }) cfg.runtimeRules + ); programs = { bash.interactiveShellInit = initScript "bash"; From fd946aa774c3373e7a59a3feb8b0938ecf60b7e9 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 11 Dec 2024 13:09:30 -0300 Subject: [PATCH 014/123] nixos/pay-respects: add package option Signed-off-by: Fernando Rodrigues --- nixos/modules/programs/pay-respects.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix index 96f56a7ce576..1e40b5db1aa2 100644 --- a/nixos/modules/programs/pay-respects.nix +++ b/nixos/modules/programs/pay-respects.nix @@ -13,6 +13,7 @@ let mkIf mkMerge mkOption + mkPackageOption optionalString types ; @@ -27,11 +28,11 @@ let shell: if (shell != "fish") then '' - eval $(${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias}) + eval $(${getExe cfg.package} ${shell} --alias ${cfg.alias}) '' else '' - ${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias} | source + ${getExe cfg.package} ${shell} --alias ${cfg.alias} | source ''; in { @@ -39,6 +40,8 @@ in programs.pay-respects = { enable = mkEnableOption "pay-respects, an app which corrects your previous console command"; + package = mkPackageOption pkgs "pay-respects" { }; + alias = mkOption { default = "f"; type = str; @@ -83,7 +86,7 @@ in environment = mkMerge ( [ { - systemPackages = [ pkgs.pay-respects ]; + systemPackages = [ cfg.package ]; } ] ++ map (rule: { From 0b329e444e0986768afaa0bd739242fcf15458c1 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Thu, 2 Jan 2025 20:56:00 -0300 Subject: [PATCH 015/123] nixos/pay-respects: add aiIntegration option Signed-off-by: Fernando Rodrigues --- nixos/modules/programs/pay-respects.nix | 94 +++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix index 1e40b5db1aa2..fe4a2610903b 100644 --- a/nixos/modules/programs/pay-respects.nix +++ b/nixos/modules/programs/pay-respects.nix @@ -7,6 +7,7 @@ let inherit (lib) getExe + isBool literalExpression maintainers mkEnableOption @@ -15,24 +16,54 @@ let mkOption mkPackageOption optionalString + replaceChars + substring + toLower types ; - inherit (types) listOf str; + inherit (types) + bool + either + listOf + str + submodule + ; cfg = config.programs.pay-respects; settingsFormat = pkgs.formats.toml { }; inherit (settingsFormat) generate type; + finalPackage = + if cfg.aiIntegration != true then + (pkgs.runCommand "pay-respects-wrapper" + { + nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; + inherit (cfg.package) meta; + } + '' + mkdir -p $out/bin + makeWrapper ${getExe cfg.package} $out/bin/${cfg.package.meta.mainProgram} \ + ${optionalString (cfg.aiIntegration == false) "--set _PR_AI_DISABLE true"} + ${optionalString (cfg.aiIntegration != false) '' + --set _PR_AI_URL ${cfg.aiIntegration.url} \ + --set _PR_AI_MODEL ${cfg.aiIntegration.model} \ + --set _PR_AI_LOCALE ${cfg.aiIntegration.locale} + ''} + '' + ) + else + cfg.package; + initScript = shell: if (shell != "fish") then '' - eval $(${getExe cfg.package} ${shell} --alias ${cfg.alias}) + eval $(${getExe finalPackage} ${shell} --alias ${cfg.alias}) '' else '' - ${getExe cfg.package} ${shell} --alias ${cfg.alias} | source + ${getExe finalPackage} ${shell} --alias ${cfg.alias} | source ''; in { @@ -79,14 +110,69 @@ in Each rule module should start with the `command` attribute that specifies the command name. See the [upstream documentation](https://codeberg.org/iff/pay-respects/src/branch/main/rules.md) for more information. ''; }; + aiIntegration = mkOption { + default = false; + example = { + url = "http://127.0.0.1:11434/v1/chat/completions"; + model = "llama3"; + locale = "nl-be"; + }; + description = '' + Whether to enable `pay-respects`' LLM integration. When there is no rule for a given error, `pay-respects` can query an OpenAI-compatible API endpoint for command corrections. + + - If this is set to `false`, all LLM-related features are disabled. + - If this is set to `true`, the default OpenAI endpoint will be used, using upstream's API key. This default API key may be rate-limited. + - You can also set a custom API endpoint, large language model and locale for command corrections. Simply access the `aiIntegration.url`, `aiIntegration.model` and `aiIntegration.locale` options, as described in the example. + - Take a look at the [services.ollama](#opt-services.ollama.enable) NixOS module if you wish to host a local large language model for `pay-respects`. + + For all of these methods, you can set a custom secret API key by using the `_PR_AI_API_KEY` environment variable. + ''; + type = either bool (submodule { + options = { + url = mkOption { + default = ""; + example = "https://api.openai.com/v1/chat/completions"; + type = str; + description = "The OpenAI-compatible API endpoint that `pay-respects` will query for command corrections."; + }; + model = mkOption { + default = ""; + example = "llama3"; + type = str; + description = "The model used by `pay-respects` to generate command corrections."; + }; + locale = mkOption { + default = toLower (replaceChars [ "_" ] [ "-" ] (substring 0 5 config.i18n.defaultLocale)); + example = "nl-be"; + type = str; + description = '' + The locale to be used for LLM responses. + The accepted format is a lowercase [`ISO 639-1` language code](https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes), followed by a dash '-', followed by a lowercase [`ISO 3166-1 alpha-2` country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). + ''; + }; + }; + }); + }; }; }; config = mkIf cfg.enable { + assertions = + map + (attr: { + assertion = (!isBool cfg.aiIntegration) -> (cfg.aiIntegration.${attr} != ""); + message = '' + programs.pay-respects.aiIntegration is configured as a submodule, but you have not configured a value for programs.pay-respects.aiIntegration.${attr}! + ''; + }) + [ + "url" + "model" + ]; environment = mkMerge ( [ { - systemPackages = [ cfg.package ]; + systemPackages = [ finalPackage ]; } ] ++ map (rule: { From 959f7e99543a6577ec7e849319343f154284989a Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 13 Jan 2025 05:29:08 +0000 Subject: [PATCH 016/123] xygrib: unpin proj_7 the current unstable version of xygrib builds fine on proj `https://github.com/opengribs/XyGrib/pull/289` --- pkgs/applications/misc/xygrib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 72a5f47d9053..a1cfab39320c 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -8,7 +8,7 @@ qtbase, qttools, libnova, - proj_7, + proj, libpng, openjpeg, }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { bzip2 qtbase libnova - proj_7 + proj openjpeg libpng ]; From 8b708df01aac94a650ca4a74d1d58a834a098ede Mon Sep 17 00:00:00 2001 From: Eloy Coto Date: Tue, 14 Jan 2025 12:17:47 +0100 Subject: [PATCH 017/123] espflash: 3.2.0 -> 3.3.0 Added new version of espflash, there is a issue with a docstring, with the args[1] when is called using cargo test, so skipping that test and I'll submit the change upstream. Test issue: https://github.com/esp-rs/espflash/blob/3c5de2b996db21defec41c1b912a481e1133d501/espflash/src/cli/monitor/external_processors.rs#L22 Release: https://github.com/esp-rs/espflash/releases/tag/v3.3.0 Signed-off-by: Eloy Coto --- pkgs/by-name/es/espflash/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index cacf6c09070a..30974ff77b20 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "espflash"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espflash"; tag = "v${version}"; - hash = "sha256-X9VTwXk/6zAkQb5P9Wz8Pt4oIt2xXfff9dhGb8wauG4="; + hash = "sha256-8qFq+OyidW8Bwla6alk/9pXLe3zayHkz5LsqI3jwgY0="; }; nativeBuildInputs = [ @@ -43,7 +43,10 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-3xUDsznzIRlfGwVuIH1+Ub5tE/ST981KZS/2TAKaBAE="; + cargoHash = "sha256-04bBLTpsQNDP0ExvAOjwp3beOktC8rQqFtfEu6d+DWY="; + checkFlags = [ + "--skip cli::monitor::external_processors" + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd espflash \ From b2e32169192009fde6fff103a26b9f76164c36e4 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Mon, 13 Jan 2025 12:38:31 +0100 Subject: [PATCH 018/123] python313Packages.beartype: disable broken test --- pkgs/development/python-modules/beartype/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index a99da96fff26..dd1a4268a4aa 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, hatchling, pytestCheckHook, + pythonAtLeast, typing-extensions, }: @@ -29,6 +30,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "beartype" ]; + # this test is not run upstream, and broke in 3.13 (_nparams removed) + disabledTests = lib.optionals (pythonAtLeast "3.13") [ + "test_door_is_subhint" + ]; + meta = { description = "Fast runtime type checking for Python"; homepage = "https://github.com/beartype/beartype"; From 903a0883ca0a4f23609e5fef782ab99ed689b9f0 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 14 Jan 2025 20:05:34 -0500 Subject: [PATCH 019/123] warp: 0.8.0 -> 0.8.1 Diff: https://gitlab.gnome.org/World/warp/-/compare/v0.8.0...v0.8.1 Changelog: https://gitlab.gnome.org/World/warp/-/releases/v0.8.1 --- pkgs/by-name/wa/warp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/warp/package.nix b/pkgs/by-name/wa/warp/package.nix index 785bc4408504..b82f974738e6 100644 --- a/pkgs/by-name/wa/warp/package.nix +++ b/pkgs/by-name/wa/warp/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "warp"; rev = "v${version}"; - hash = "sha256-BUCkENpL1soiYrM1vPNQAZGUbRj1KxWbbgXR0575zGU="; + hash = "sha256-RmihaFv+U11CAa5ax53WzpwYJ2PFOrhYt4w2iboW4m8="; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-afRGCd30qJMqQeEOLDBRdVNJLMfa8/F9BO4Ib/OTtvI="; + hash = "sha256-w3gQhyRpma+aJY7IC9Vb3FdIECHZBJoSjiPmKpJ2nM8="; }; nativeBuildInputs = [ From 7ebad821473c78c7cfdf17ecf9f9be91d2455d81 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Tue, 14 Jan 2025 22:03:44 -0600 Subject: [PATCH 020/123] owntracks-recorder: Install htdocs, not just binaries The ot-recorder binary expects to have the htdocs available to serve if the web frontend is active, so those are added here, and the binary is configured to point to the correct location by default. (The docroot can still be overridden, e.g. to use https://github.com/owntracks/frontend, with the `--doc-root` flag at runtime.) --- pkgs/by-name/ow/owntracks-recorder/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ow/owntracks-recorder/package.nix b/pkgs/by-name/ow/owntracks-recorder/package.nix index d164ac388aa5..7f11113a5a2c 100644 --- a/pkgs/by-name/ow/owntracks-recorder/package.nix +++ b/pkgs/by-name/ow/owntracks-recorder/package.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace config.mk \ --replace "INSTALLDIR = /usr/local" "INSTALLDIR = $out" \ + --replace "DOCROOT = /var/spool/owntracks/recorder/htdocs" "DOCROOT = $out/htdocs" \ --replace "WITH_LUA ?= no" "WITH_LUA ?= yes" \ --replace "WITH_ENCRYPT ?= no" "WITH_ENCRYPT ?= yes" @@ -62,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { install -m 0755 ot-recorder $out/bin install -m 0755 ocat $out/bin + cp -r docroot $out/htdocs + runHook postInstall ''; From 4223750bceef1f9e93f2061d5366dbbb3c6906f8 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 021/123] libabw: fix cross build --- pkgs/by-name/li/libabw/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libabw/package.nix b/pkgs/by-name/li/libabw/package.nix index 083e4ad7be0a..a6c8be817e80 100644 --- a/pkgs/by-name/li/libabw/package.nix +++ b/pkgs/by-name/li/libabw/package.nix @@ -27,14 +27,16 @@ stdenv.mkDerivation rec { sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost + nativeBuildInputs = [ doxygen gperf + perl + pkg-config + ]; + buildInputs = [ + boost librevenge libxml2 - perl zlib ]; From b6773ad79eb3bc735e3a8d6c230240b327d1254c Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 10 Jan 2025 13:36:28 +0100 Subject: [PATCH 022/123] postgresql: add PYTHONPATH via wrapProgram Currently `PYTHONPATH` is not set when building PostgreSQL. This results in Python modules not being available within `pl/python3u`. This commit adds `PYTHONPATH` of the supplied `python3` via `wrapProgram`, which is especially useful when supplying a custom Python env. --- pkgs/servers/sql/postgresql/generic.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index a6bbe3871dc3..82ae3d4ac21f 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -380,10 +380,14 @@ let --replace-fail '-bundle_loader $(bindir)/postgres' "-bundle_loader $out/bin/postgres" ''; - postFixup = lib.optionalString stdenv'.hostPlatform.isGnu '' - # initdb needs access to "locale" command from glibc. - wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin - ''; + postFixup = + lib.optionalString stdenv'.hostPlatform.isGnu '' + # initdb needs access to "locale" command from glibc. + wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin + '' + + lib.optionalString pythonSupport '' + wrapProgram "$out/bin/postgres" --set PYTHONPATH "${python3}/${python3.sitePackages}" + ''; # Running tests as "install check" to work around SIP issue on macOS: # https://www.postgresql.org/message-id/flat/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com From 1ad887fde61d0b30c7a0899b51933719507bc7cf Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 15 Jan 2025 14:31:27 +0100 Subject: [PATCH 023/123] cosmic-panel: unstable-2023-11-13 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-panel/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index f7502bca95a2..d04d0e00206b 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage { pname = "cosmic-panel"; - version = "unstable-2023-11-13"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; - rev = "f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c"; - hash = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE="; + rev = "epoch-1.0.0-alpha.5.1"; + hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1XtW72KPdRM5gHIM3Fw2PZCobBXYDMAqjZ//Ebr51tc="; + cargoHash = "sha256-EIp9s42deMaB7BDe7RAqj2+CnTXjHCtZjS5Iq8l46A4="; nativeBuildInputs = [ just From 430d55bf891986aab8e190d0bfb73272bc5d51e5 Mon Sep 17 00:00:00 2001 From: kenji Date: Wed, 15 Jan 2025 16:23:24 +0100 Subject: [PATCH 024/123] cosmic-panel: Use `tag` in `fetchFromGitHub` Co-authored-by: Nick Cao --- pkgs/by-name/co/cosmic-panel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index d04d0e00206b..4d23173862f8 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,14 +11,14 @@ wayland, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "cosmic-panel"; version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; - rev = "epoch-1.0.0-alpha.5.1"; + tag = "epoch-${version}"; hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow="; }; From c09f7b4ef1773d967bd6d74f71fa9e1e4db5d60c Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 15 Jan 2025 16:27:01 +0100 Subject: [PATCH 025/123] cosmic-panel: Remove unused `rust` attribute --- pkgs/by-name/co/cosmic-panel/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 4d23173862f8..951c3ef3869f 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, just, pkg-config, - rust, rustPlatform, libglvnd, libxkbcommon, From c1ebcc6f384bfc016b551cae30eae3d302e938e7 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 16 Jan 2025 01:14:36 +0100 Subject: [PATCH 026/123] ytdl-sub: refactor --- pkgs/by-name/yt/ytdl-sub/package.nix | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 001ec595929d..ab4a81bc9f78 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -1,23 +1,28 @@ { python3Packages, - fetchPypi, + fetchFromGitHub, ffmpeg, lib, + versionCheckHook, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; version = "2024.12.27"; pyproject = true; - src = fetchPypi { - inherit version; - pname = "ytdl_sub"; - hash = "sha256-7XZlKGzDLG/MVw198Ii+l29F+Lt53MY5QtHU8k9xJWA="; + src = fetchFromGitHub { + owner = "jmbannon"; + repo = "ytdl-sub"; + tag = version; + hash = "sha256-PmkBZl4aUw5Wgr83Nyyv54Rra/rDDm04B9bt6Xl+AzE="; }; - pythonRelaxDeps = [ - "yt-dlp" - ]; + postPatch = '' + echo '__pypi_version__ = "${version}"; __local_version__ = "${version}"' > src/ytdl_sub/__init__.py + ''; + + pythonRelaxDeps = [ "yt-dlp" ]; build-system = with python3Packages; [ setuptools @@ -37,6 +42,11 @@ python3Packages.buildPythonApplication rec { "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}" ]; + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/jmbannon/ytdl-sub"; description = "Lightweight tool to automate downloading and metadata generation with yt-dlp"; @@ -47,6 +57,7 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ loc + defelo ]; mainProgram = "ytdl-sub"; }; From 458c4dfad9fe5927a1dcce13db5de44cb15317d7 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 16 Jan 2025 01:15:24 +0100 Subject: [PATCH 027/123] ytdl-sub: 2024.12.27 -> 2025.01.15 --- pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index ab4a81bc9f78..1bc1c30ae0c5 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -8,14 +8,14 @@ }: python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2024.12.27"; + version = "2025.01.15"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-PmkBZl4aUw5Wgr83Nyyv54Rra/rDDm04B9bt6Xl+AzE="; + hash = "sha256-UjCs71nXi77yvB9BhYxT+2G9I+qHEB5Jnhe+GJuppdY="; }; postPatch = '' From 77f5bc7d6630dc84fb27ccd1f94873e71dcf6e76 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Jan 2025 17:12:03 +0800 Subject: [PATCH 028/123] deepin.deepin-movie-reborn: remove --- .../apps/deepin-movie-reborn/default.nix | 126 ------------------ .../deepin-movie-reborn/dont_use_libPath.diff | 108 --------------- pkgs/desktops/deepin/default.nix | 2 +- 3 files changed, 1 insertion(+), 235 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix deleted file mode 100644 index bc98fa4e4e4f..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - gsettings-qt, - elfutils, - ffmpeg_6, - ffmpegthumbnailer, - mpv, - xorg, - pcre, - libdvdread, - libdvdnav, - libunwind, - libva, - zstd, - glib, - gst_all_1, - gtest, - libpulseaudio, -}: - -stdenv.mkDerivation rec { - pname = "deepin-movie-reborn"; - version = "6.0.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ="; - }; - - patches = [ ./dont_use_libPath.diff ]; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - qt5integration - qt5platform-plugins - libsForQt5.qtx11extras - libsForQt5.qtmultimedia - libsForQt5.qtdbusextended - libsForQt5.qtmpris - gsettings-qt - elfutils - ffmpeg_6 - ffmpegthumbnailer - xorg.libXtst - xorg.libXdmcp - xorg.xcbproto - pcre.dev - libdvdread - libdvdnav - libunwind - libva - zstd - mpv - gtest - libpulseaudio - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - propagatedBuildInputs = [ - libsForQt5.qtmultimedia - libsForQt5.qtx11extras - ffmpegthumbnailer - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" - "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - mpv - ffmpeg_6 - ffmpegthumbnailer - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] - }" - ]; - - preFixup = '' - glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = with lib; { - description = "Full-featured video player supporting playing local and streaming media in multiple video formats"; - mainProgram = "deepin-movie"; - homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - broken = true; # Crash when playing any video - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff deleted file mode 100644 index 7ea1f0da1b23..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/src/backends/mpv/mpv_proxy.h b/src/backends/mpv/mpv_proxy.h -index 1256a06..d76d1c0 100644 ---- a/src/backends/mpv/mpv_proxy.h -+++ b/src/backends/mpv/mpv_proxy.h -@@ -38,6 +38,7 @@ typedef void (*mpv_terminateDestroy)(mpv_handle *ctx); - - static QString libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/common/hwdec_probe.cpp b/src/common/hwdec_probe.cpp -index d70ed0c..ac2516d 100644 ---- a/src/common/hwdec_probe.cpp -+++ b/src/common/hwdec_probe.cpp -@@ -83,6 +83,7 @@ bool HwdecProbe::isFileCanHwdec(const QUrl& url, QList& hwList) - - static QString libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/common/platform/platform_thumbnail_worker.cpp b/src/common/platform/platform_thumbnail_worker.cpp -index 17b2bdd..82db2b9 100644 ---- a/src/common/platform/platform_thumbnail_worker.cpp -+++ b/src/common/platform/platform_thumbnail_worker.cpp -@@ -88,6 +88,7 @@ Platform_ThumbnailWorker::Platform_ThumbnailWorker() - - QString Platform_ThumbnailWorker::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString lib_path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(lib_path); -diff --git a/src/common/thumbnail_worker.cpp b/src/common/thumbnail_worker.cpp -index 2ba2888..c34841e 100644 ---- a/src/common/thumbnail_worker.cpp -+++ b/src/common/thumbnail_worker.cpp -@@ -88,6 +88,7 @@ ThumbnailWorker::ThumbnailWorker() - - QString ThumbnailWorker::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString lib_path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(lib_path); -diff --git a/src/libdmr/compositing_manager.cpp b/src/libdmr/compositing_manager.cpp -index 9b117fc..28a11ec 100644 ---- a/src/libdmr/compositing_manager.cpp -+++ b/src/libdmr/compositing_manager.cpp -@@ -237,6 +237,7 @@ bool CompositingManager::isCanHwdec() - - QString CompositingManager::libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/libdmr/filefilter.cpp b/src/libdmr/filefilter.cpp -index 6691df0..b620a62 100644 ---- a/src/libdmr/filefilter.cpp -+++ b/src/libdmr/filefilter.cpp -@@ -72,6 +72,7 @@ FileFilter::FileFilter() - - QString FileFilter::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/libdmr/playlist_model.cpp b/src/libdmr/playlist_model.cpp -index 18a8095..9ea4abf 100644 ---- a/src/libdmr/playlist_model.cpp -+++ b/src/libdmr/playlist_model.cpp -@@ -449,6 +449,7 @@ PlaylistModel::PlaylistModel(PlayerEngine *e) - - QString PlaylistModel::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/widgets/platform/platform_toolbox_proxy.cpp b/src/widgets/platform/platform_toolbox_proxy.cpp -index 570acac..9da0f97 100644 ---- a/src/widgets/platform/platform_toolbox_proxy.cpp -+++ b/src/widgets/platform/platform_toolbox_proxy.cpp -@@ -709,6 +709,7 @@ private: - - static QString libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/widgets/toolbox_proxy.cpp b/src/widgets/toolbox_proxy.cpp -index 05cbc2c..54731bf 100644 ---- a/src/widgets/toolbox_proxy.cpp -+++ b/src/widgets/toolbox_proxy.cpp -@@ -760,6 +760,7 @@ private: - - static QString libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index df3b8e7f3fc0..19a3eeb9967b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -73,7 +73,6 @@ let deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; - deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; deepin-music = callPackage ./apps/deepin-music { }; deepin-picker = callPackage ./apps/deepin-picker { }; deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { }; @@ -116,6 +115,7 @@ let go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs"; # added 2025-01-16; }; in lib.makeScope pkgs.newScope packages From 605fb1e640131d3b46064ebb05abcfb8c36bde09 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Wed, 15 Jan 2025 11:48:14 +1300 Subject: [PATCH 029/123] aerc: 0.18.2 -> 0.19.0 --- pkgs/by-name/ae/aerc/package.nix | 13 ++-- pkgs/by-name/ae/aerc/runtime-libexec.patch | 79 ++++++++++++++++++---- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index 4fae126d3c0d..7229e439666b 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -14,17 +14,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-J4W7ynJ5DpE97sILENNt6eya04aiq9DWBhlytsVmZHg="; + hash = "sha256-YlpR85jB6Il3UW4MTaf8pkilRVjkO0q/D/Yu+OiBX6Y="; }; proxyVendor = true; - vendorHash = "sha256-STQzc25gRozNHKjjYb8J8CL5WMhnx+nTJOGbuFmUYSU="; + vendorHash = "sha256-WowRlAzyrfZi27JzskIDberiYt9PQkuS6H3hKqUP9qo="; nativeBuildInputs = [ scdoc @@ -33,18 +33,13 @@ buildGoModule rec { patches = [ ./runtime-libexec.patch - - # patch to fix a encoding problem with gpg signed messages - (fetchpatch { - url = "https://git.sr.ht/~rjarry/aerc/commit/7346d20.patch"; - hash = "sha256-OCm8BcovYN2IDSgslZklQxkGVkSYQ8HLCrf2+DRB2mM="; - }) ]; postPatch = '' substituteAllInPlace config/aerc.conf substituteAllInPlace config/config.go substituteAllInPlace doc/aerc-config.5.scd + substituteAllInPlace doc/aerc-templates.7.scd # Prevent buildGoModule from trying to build this rm contrib/linters.go diff --git a/pkgs/by-name/ae/aerc/runtime-libexec.patch b/pkgs/by-name/ae/aerc/runtime-libexec.patch index f8e8d0747048..684c0c26e8ea 100644 --- a/pkgs/by-name/ae/aerc/runtime-libexec.patch +++ b/pkgs/by-name/ae/aerc/runtime-libexec.patch @@ -1,8 +1,8 @@ diff --git a/config/aerc.conf b/config/aerc.conf -index 7d33b43..4315f0e 100644 +index fbc1f3ba..9eea2b81 100644 --- a/config/aerc.conf +++ b/config/aerc.conf -@@ -202,8 +202,7 @@ +@@ -301,8 +301,7 @@ # # ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets # ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -12,7 +12,18 @@ index 7d33b43..4315f0e 100644 # #stylesets-dirs= -@@ -547,8 +546,7 @@ message/rfc822=colorize +@@ -741,8 +740,8 @@ + # ${XDG_DATA_HOME:-~/.local/share}/aerc/filters + # $PREFIX/libexec/aerc/filters + # $PREFIX/share/aerc/filters +-# /usr/libexec/aerc/filters +-# /usr/share/aerc/filters ++# @out@/libexec/aerc/filters ++# @out@/share/aerc/filters + # + # If you want to run a program in your default $PATH which has the same name + # as a builtin filter (e.g. /usr/bin/colorize), use its absolute path. +@@ -845,8 +844,7 @@ text/html=! html # # ${XDG_CONFIG_HOME:-~/.config}/aerc/templates # ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -23,10 +34,10 @@ index 7d33b43..4315f0e 100644 #template-dirs= diff --git a/config/config.go b/config/config.go -index d70bcfe..c19e59a 100644 +index 14c4b233..9f305ffd 100644 --- a/config/config.go +++ b/config/config.go -@@ -54,10 +54,8 @@ func buildDefaultDirs() []string { +@@ -46,10 +46,8 @@ func buildDefaultDirs() []string { } // Add fixed fallback locations @@ -40,10 +51,19 @@ index d70bcfe..c19e59a 100644 return defaultDirs } diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd -index 9e1f8a3..694abbc 100644 +index 1e3daaa9..cd118be0 100644 --- a/doc/aerc-config.5.scd +++ b/doc/aerc-config.5.scd -@@ -300,8 +300,7 @@ These options are configured in the *[ui]* section of _aerc.conf_. +@@ -13,7 +13,7 @@ _aerc_, which defaults to _~/.config/aerc_. Alternate files can be specified via + command line arguments, see *aerc*(1). + + Examples of these config files are typically included with your installation of +-aerc and are usually installed in _/usr/share/aerc_. ++aerc and are usually installed in _@out@/share/aerc_. + + Each file uses the ini format, and consists of sections with keys and values. + A line beginning with _#_ is considered a comment and ignored, as are empty +@@ -386,8 +386,7 @@ These options are configured in the *[ui]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -53,7 +73,36 @@ index 9e1f8a3..694abbc 100644 ``` *styleset-name* = __ -@@ -900,8 +899,7 @@ These options are configured in the *[templates]* section of _aerc.conf_. +@@ -1019,7 +1018,7 @@ will be set to the terminal TTY. The filter is expected to implement its own + paging. + + aerc ships with some default filters installed in the libexec directory (usually +-_/usr/libexec/aerc/filters_). Note that these may have additional dependencies ++_@out@/libexec/aerc/filters_). Note that these may have additional dependencies + that aerc does not have alone. + + The filter commands are invoked with _sh -c command_. The following folders are +@@ -1031,8 +1030,8 @@ ${XDG_CONFIG_HOME:-~/.config}/aerc/filters + ${XDG_DATA_HOME:-~/.local/share}/aerc/filters + $PREFIX/libexec/aerc/filters + $PREFIX/share/aerc/filters +-/usr/libexec/aerc/filters +-/usr/share/aerc/filters ++@out@/libexec/aerc/filters ++@out@/share/aerc/filters + ``` + + If you want to run a program in your default *$PATH* which has the same +@@ -1370,7 +1369,7 @@ of the template name. The available symbols and functions are described in + *aerc-templates*(7). + + aerc ships with some default templates installed in the share directory (usually +-_/usr/share/aerc/templates_). ++_@out@/share/aerc/templates_). + + These options are configured in the *[templates]* section of _aerc.conf_. + +@@ -1382,8 +1381,7 @@ These options are configured in the *[templates]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/templates ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -64,19 +113,19 @@ index 9e1f8a3..694abbc 100644 *new-message* = __ diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd -index ae9bc6d..5f42b14 100644 +index a6deb584..4f91869c 100644 --- a/doc/aerc-templates.7.scd +++ b/doc/aerc-templates.7.scd -@@ -319,7 +319,7 @@ aerc provides the following additional functions: - Execute external command, provide the second argument to its stdin. +@@ -398,7 +398,7 @@ aerc provides the following additional functions: + Attaches a file to the message being composed. ``` -- {{exec `/usr/libexec/aerc/filters/html` .OriginalText}} -+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText}} +- {{.Attach '/usr/libexec/aerc/filters/html'}} ++ {{.Attach '@out@/libexec/aerc/filters/html'}} ``` - *.Local* -@@ -425,7 +425,7 @@ aerc provides the following additional functions: + *exec* +@@ -581,7 +581,7 @@ aerc provides the following additional functions: ``` {{if eq .OriginalMIMEType "text/html"}} From 855c7aa6176a3f5c43da8c8a5261df3caaeb7c1a Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Jan 2025 17:19:32 +0800 Subject: [PATCH 030/123] deepin.deepin-album: remove --- .../deepin/apps/deepin-album/default.nix | 62 ------------------- pkgs/desktops/deepin/default.nix | 4 +- 2 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-album/default.nix diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix deleted file mode 100644 index 5e4cbf659bc2..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - dtkdeclarative, - qt5integration, - qt5platform-plugins, - udisks2-qt5, - gio-qt, - freeimage, - ffmpeg_6, - ffmpegthumbnailer, -}: - -stdenv.mkDerivation rec { - pname = "deepin-album"; - version = "6.0.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-kTcVmROsqLH8GwJzAf3zMq/wGYWNvhFBiHODaROt7Do="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - dtkdeclarative - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - udisks2-qt5 - gio-qt - freeimage - ffmpeg_6 - ffmpegthumbnailer - ]; - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = with lib; { - description = "Fashion photo manager for viewing and organizing pictures"; - homepage = "https://github.com/linuxdeepin/deepin-album"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 19a3eeb9967b..9b442f50d282 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -66,7 +66,6 @@ let dde-api-proxy = callPackage ./core/dde-api-proxy { }; #### Dtk Application - deepin-album = callPackage ./apps/deepin-album { }; deepin-calculator = callPackage ./apps/deepin-calculator { }; deepin-camera = callPackage ./apps/deepin-camera { }; deepin-compressor = callPackage ./apps/deepin-compressor { }; @@ -115,7 +114,8 @@ let go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs"; # added 2025-01-16; + deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16; + deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages From 6ddb842a691f7217d7e9abfeb65a3b4f963c1801 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Jan 2025 17:26:45 +0800 Subject: [PATCH 031/123] deepin.deepin-voice-note: remove --- .../deepin/apps/deepin-voice-note/default.nix | 89 ------------------- .../use_v23_dbus_interface.diff | 13 --- pkgs/desktops/deepin/default.nix | 2 +- 3 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-voice-note/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix deleted file mode 100644 index 46a35db365c2..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - deepin-movie-reborn, - libvlc, - gst_all_1, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "deepin-voice-note"; - version = "6.0.18"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-GbSYXwJoNfbg+31454GjMbXRqrtk2bSZJCk18ILfAn4="; - }; - - patches = [ ./use_v23_dbus_interface.diff ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "/usr" "$out" - substituteInPlace src/common/audiowatcher.cpp \ - --replace "/usr/share" "$out/share" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - libsForQt5.qtbase - libsForQt5.qtsvg - dtkwidget - qt5integration - qt5platform-plugins - dde-qt-dbus-factory - deepin-movie-reborn - libsForQt5.qtmultimedia - libsForQt5.qtwebengine - libvlc - gtest - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Simple memo software with texts and voice recordings"; - mainProgram = "deepin-voice-note"; - homepage = "https://github.com/linuxdeepin/deepin-voice-note"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff b/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff deleted file mode 100644 index 213b73e36b41..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e7bfb81..f56f11a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -103,7 +103,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all") - execute_process(COMMAND cat /etc/os-version OUTPUT_VARIABLE OS_INFO_STR) - string(REGEX MATCHALL "MajorVersion=[0-9]+" MAJOR_STR "${OS_INFO_STR}") - string(REGEX MATCH "[0-9]+" MAJOR_VERSION "${MAJOR_STR}") --if (MAJOR_VERSION MATCHES "23") -+if (TRUE) - message("--------------------- OS_BUILD_V23 on") - add_definitions(-DOS_BUILD_V23) - endif() diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 9b442f50d282..1719ed127fc1 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -79,7 +79,6 @@ let deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; deepin-reader = callPackage ./apps/deepin-reader { }; - deepin-voice-note = callPackage ./apps/deepin-voice-note { }; deepin-screensaver = callPackage ./apps/deepin-screensaver { }; #### Go Packages @@ -116,6 +115,7 @@ let go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16; deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 + deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages From ecf338dbb4b4422d0f889eea2af5fa409d786be4 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Jan 2025 17:31:05 +0800 Subject: [PATCH 032/123] deepin.deepin-screen-recorder: remove --- .../apps/deepin-screen-recorder/default.nix | 105 ------------------ .../dont_use_libPath.diff | 36 ------ pkgs/desktops/deepin/default.nix | 2 +- 3 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix deleted file mode 100644 index 33d514f48c25..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - dde-qt-dbus-factory, - image-editor, - gsettings-qt, - xorg, - libusb1, - libv4l, - ffmpeg, - ffmpegthumbnailer, - portaudio, - dwayland, - udev, - gst_all_1, -}: - -stdenv.mkDerivation rec { - pname = "deepin-screen-recorder"; - version = "6.0.6"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko="; - }; - - patches = [ ./dont_use_libPath.diff ]; - - # disable dock plugins, it's part of dde-shell now - postPatch = '' - substituteInPlace screen_shot_recorder.pro \ - --replace-fail " src/dde-dock-plugins" "" - ( - shopt -s globstar - substituteInPlace **/*.pro **/*.service **/*.desktop \ - --replace-quiet "/usr/" "$out/" - ) - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - dde-qt-dbus-factory - qt5integration - libsForQt5.qtbase - libsForQt5.qtmultimedia - libsForQt5.qtx11extras - image-editor - gsettings-qt - xorg.libXdmcp - xorg.libXtst - xorg.libXcursor - libusb1 - libv4l - ffmpeg - ffmpegthumbnailer - portaudio - dwayland - udev - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - udev - gst_all_1.gstreamer - libv4l - ffmpeg - ffmpegthumbnailer - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Screen recorder application for dde"; - homepage = "https://github.com/linuxdeepin/deepin-screen-recorder"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - broken = true; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff deleted file mode 100644 index be3ba3267cbf..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp -index 165a7ce..e1574a5 100644 ---- a/src/gstrecord/gstinterface.cpp -+++ b/src/gstrecord/gstinterface.cpp -@@ -49,6 +49,7 @@ gstInterface::gstInterface() - } - QString gstInterface::libPath(const QString &sLib) - { -+ return sLib; - qInfo() << "gstreamer lib name is " << sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); -diff --git a/src/main_window.cpp b/src/main_window.cpp -index e0f6bc5..757abad 100755 ---- a/src/main_window.cpp -+++ b/src/main_window.cpp -@@ -559,6 +559,7 @@ void MainWindow::initDynamicLibPath() - } - QString MainWindow::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp -index b4145fa..97a3f5c 100644 ---- a/src/waylandrecord/avlibinterface.cpp -+++ b/src/waylandrecord/avlibinterface.cpp -@@ -105,6 +105,7 @@ avlibInterface::avlibInterface() - - QString avlibInterface::libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 1719ed127fc1..918bc842c50b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -74,7 +74,6 @@ let deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; deepin-music = callPackage ./apps/deepin-music { }; deepin-picker = callPackage ./apps/deepin-picker { }; - deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { }; deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; @@ -116,6 +115,7 @@ let deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16; deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16 + deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages From f4d612494eb194df22c4c11757dc16d1770324d7 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Jan 2025 17:37:00 +0800 Subject: [PATCH 033/123] deepin.deepin-ocr-plugin-manager: remove --- pkgs/desktops/deepin/default.nix | 2 +- .../deepin-ocr-plugin-manager/default.nix | 59 ------------------- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 918bc842c50b..1b25f3d2d7bc 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -21,7 +21,6 @@ let qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; qt5integration = callPackage ./library/qt5integration { }; deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; - deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { }; dwayland = callPackage ./library/dwayland { }; dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; disomaster = callPackage ./library/disomaster { }; @@ -116,6 +115,7 @@ let deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16 deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16 + deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix deleted file mode 100644 index 26549922bd8d..000000000000 --- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - cmake, - libsForQt5, - ncnn, - opencv, - vulkan-headers, -}: - -stdenv.mkDerivation rec { - pname = "deepin-ocr-plugin-manager"; - version = "unstable-2023-07-10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = "9b5c9e57c83b5adde383ed404b73f9dcbf5e6a48"; - hash = "sha256-U5lxAKTaQvvlqbqRezPIcBGg+DpF1hZ204Y1+8dt14U="; - }; - - # don't use vendored opencv - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "opencv_mobile" "opencv4" - substituteInPlace src/paddleocr-ncnn/paddleocr.cpp \ - --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - ncnn - opencv - vulkan-headers - ]; - - strictDeps = true; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - meta = with lib; { - description = "Plugin manager of optical character recognition for DDE"; - homepage = "https://github.com/linuxdeepin/deepin-ocr-plugin-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} From e5b1713132c7d6dc6e0d9be3f2d9257967e57667 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Jan 2025 17:52:24 +0800 Subject: [PATCH 034/123] deepin.deepin-camera: remove --- .../deepin/apps/deepin-camera/default.nix | 111 ------------------ .../apps/deepin-camera/dont_use_libPath.diff | 24 ---- pkgs/desktops/deepin/default.nix | 2 +- 3 files changed, 1 insertion(+), 136 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-camera/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix deleted file mode 100644 index 750696aee61a..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - wayland, - dwayland, - qt5integration, - qt5platform-plugins, - image-editor, - ffmpeg_6, - ffmpegthumbnailer, - libusb1, - libpciaccess, - portaudio, - libv4l, - gst_all_1, - systemd, -}: - -stdenv.mkDerivation rec { - pname = "deepin-camera"; - version = "6.0.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE="; - }; - - # QLibrary and dlopen work with LD_LIBRARY_PATH - patches = [ ./dont_use_libPath.diff ]; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \ - --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0" - substituteInPlace src/com.deepin.Camera.service \ - --replace "/usr/bin/qdbus" "${lib.getBin libsForQt5.qttools}/bin/qdbus" \ - --replace "/usr/share" "$out/share" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - wayland - dwayland - qt5integration - qt5platform-plugins - image-editor - libsForQt5.qtbase - libsForQt5.qtmultimedia - ffmpeg_6 - ffmpegthumbnailer - libusb1 - libpciaccess - portaudio - libv4l - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - env.NIX_CFLAGS_COMPILE = toString [ - "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" - "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" - ]; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - ffmpeg_6 - ffmpegthumbnailer - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libusb1 - libv4l - portaudio - systemd - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Tool to view camera, take photo and video"; - homepage = "https://github.com/linuxdeepin/deepin-camera"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff deleted file mode 100644 index f8e005f577a3..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp -index c96c8b0..fcc11da 100644 ---- a/src/src/gstvideowriter.cpp -+++ b/src/src/gstvideowriter.cpp -@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps() - - QString GstVideoWriter::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp -index d3c6c24..6d313a6 100644 ---- a/src/src/mainwindow.cpp -+++ b/src/src/mainwindow.cpp -@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog() - - QString CMainWindow::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 1b25f3d2d7bc..b80a0353b20b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -66,7 +66,6 @@ let #### Dtk Application deepin-calculator = callPackage ./apps/deepin-calculator { }; - deepin-camera = callPackage ./apps/deepin-camera { }; deepin-compressor = callPackage ./apps/deepin-compressor { }; deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; @@ -116,6 +115,7 @@ let deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16 deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16 deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16 + deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages From 6019cb8c61e077f2487b40b4ed4a35c02c48f7f5 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Jan 2025 17:55:54 +0800 Subject: [PATCH 035/123] deepin.deepin-image-viewer: remove --- pkgs/by-name/li/libraw/package.nix | 2 - .../apps/deepin-image-viewer/default.nix | 63 ------------------- pkgs/desktops/deepin/default.nix | 2 +- 3 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix index 7b63fb45435e..700092119a7e 100644 --- a/pkgs/by-name/li/libraw/package.nix +++ b/pkgs/by-name/li/libraw/package.nix @@ -7,7 +7,6 @@ pkg-config, # for passthru.tests - deepin, freeimage, hdrmerge, imagemagick, @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { passthru.tests = { inherit imagemagick hdrmerge freeimage; - inherit (deepin) deepin-image-viewer; inherit (python3.pkgs) rawkit; }; diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix deleted file mode 100644 index 8f15c0895182..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - libsForQt5, - qt5platform-plugins, - dtkwidget, - dtkdeclarative, - deepin-ocr-plugin-manager, - libraw, - freeimage, -}: - -stdenv.mkDerivation rec { - pname = "deepin-image-viewer"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA="; - }; - - patches = [ - (fetchpatch { - name = "fix-build-with-libraw-0_21.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch"; - hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - qt5platform-plugins - dtkwidget - dtkdeclarative - deepin-ocr-plugin-manager - libraw - freeimage - ]; - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = with lib; { - description = "Image viewing tool with fashion interface and smooth performance"; - homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index b80a0353b20b..a83335c7a08e 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -69,7 +69,6 @@ let deepin-compressor = callPackage ./apps/deepin-compressor { }; deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; - deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; deepin-music = callPackage ./apps/deepin-music { }; deepin-picker = callPackage ./apps/deepin-picker { }; deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; @@ -116,6 +115,7 @@ let deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16 deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16 deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16 + deepin-image-viewer = throw "'deepin.deepin-image-viewer' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages From 3021e6d66832a92704f7f24d060cf1e846ce9887 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 17 Jan 2025 09:48:42 +0800 Subject: [PATCH 036/123] deepin.image-editor: remove --- pkgs/desktops/deepin/default.nix | 2 +- .../deepin/library/image-editor/default.nix | 57 ------------------- pkgs/top-level/release-cuda.nix | 1 - 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/desktops/deepin/library/image-editor/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index a83335c7a08e..a7e01c215d11 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -26,7 +26,6 @@ let disomaster = callPackage ./library/disomaster { }; docparser = callPackage ./library/docparser { }; gio-qt = callPackage ./library/gio-qt { }; - image-editor = callPackage ./library/image-editor { }; udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; util-dfm = callPackage ./library/util-dfm { }; dtk6core = callPackage ./library/dtk6core { }; @@ -116,6 +115,7 @@ let deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16 deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16 deepin-image-viewer = throw "'deepin.deepin-image-viewer' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 + image-editor = throw "'deepin.image-editor' has been removed as it was unmaintained in nixpkgs"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix deleted file mode 100644 index 1154b5e0e89c..000000000000 --- a/pkgs/desktops/deepin/library/image-editor/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - cmake, - libsForQt5, - pkg-config, - opencv, - freeimage, - libmediainfo, - ffmpegthumbnailer, - pcre, -}: - -stdenv.mkDerivation rec { - pname = "image-editor"; - version = "1.0.41"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-9V9B0YSUTWv/4IbTRtKJSVrZx6j8jqJxIIR9TwUZ0U0="; - }; - - postPatch = '' - substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out' - substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out' - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - opencv - freeimage - libmediainfo - ffmpegthumbnailer - pcre - ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - meta = with lib; { - description = "Image editor lib for dtk"; - homepage = "https://github.com/linuxdeepin/image-editor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 819f694fbd11..e04a1f4a2ab8 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -89,7 +89,6 @@ let cholmod-extra = linux; colmap = linux; ctranslate2 = linux; - deepin.image-editor = linux; ffmpeg-full = linux; gimp = linux; gpu-screen-recorder = linux; From 3d4e35496c113b8eef60599deaf9a22b20dd95dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 05:27:44 +0000 Subject: [PATCH 037/123] python312Packages.python-otbr-api: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/python-otbr-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index c312fe60eefd..e4239037bb9f 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-otbr-api"; tag = version; - hash = "sha256-RMj4NdEbMIxh2PDzbhUWgmcdzRXY8RxcQNN/bbGOW5Q="; + hash = "sha256-irQ4QvpGIAYYKq0UqLuo7Nrnde905+GJFd4HkxsCDmQ="; }; nativeBuildInputs = [ setuptools ]; From fb4c259770307a8565aed695eb19371a583dd242 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 17 Jan 2025 08:57:41 +0100 Subject: [PATCH 038/123] python312Packages.python-otbr-api: refactor --- pkgs/development/python-modules/python-otbr-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index e4239037bb9f..1df8ad5f9c00 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -26,9 +26,9 @@ buildPythonPackage rec { hash = "sha256-irQ4QvpGIAYYKq0UqLuo7Nrnde905+GJFd4HkxsCDmQ="; }; - nativeBuildInputs = [ setuptools ]; + build-setup = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp bitstruct cryptography From db43a27dfd09ba610528d2c6772b4500a7bb412e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 14:55:33 +0000 Subject: [PATCH 039/123] python312Packages.sphinx-codeautolink: 0.15.2 -> 0.16.2 --- .../python-modules/sphinx-codeautolink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix index 4947d86ce0bb..8ed38bddce3e 100644 --- a/pkgs/development/python-modules/sphinx-codeautolink/default.nix +++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sphinx-codeautolink"; - version = "0.15.2"; + version = "0.16.2"; format = "pyproject"; outputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "felix-hilden"; repo = "sphinx-codeautolink"; tag = "v${version}"; - hash = "sha256-h1lteF5a3ga1VlhXCz2biydli3sg3ktPbz0O5n0eeFI="; + hash = "sha256-pHo7uA7TXmNdSU8CFRO0heI5rYBw+JeQ2NijmirhhHk="; }; nativeBuildInputs = [ From 91a58602e06fa79547d96291a9ba6d7fc2a29fe9 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Fri, 17 Jan 2025 23:28:13 +0800 Subject: [PATCH 040/123] taskchampion-sync-server: 0.4.1-unstable-2024-08-20 -> 0.5.0 --- pkgs/by-name/ta/taskchampion-sync-server/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/taskchampion-sync-server/package.nix b/pkgs/by-name/ta/taskchampion-sync-server/package.nix index 7782f7b38694..36a008ee2af7 100644 --- a/pkgs/by-name/ta/taskchampion-sync-server/package.nix +++ b/pkgs/by-name/ta/taskchampion-sync-server/package.nix @@ -5,19 +5,15 @@ }: rustPlatform.buildRustPackage rec { pname = "taskchampion-sync-server"; - version = "0.4.1-unstable-2024-08-20"; + version = "0.5.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskchampion-sync-server"; - rev = "af918bdf0dea7f7b6e920680c947fc37b37ffffb"; - fetchSubmodules = false; - hash = "sha256-BTGD7hZysmOlsT2W+gqj8+Sj6iBN9Jwiyzq5D03PDzM="; + tag = "v${version}"; + hash = "sha256-uOlubcQ5LAECvQEqgUR/5aLuDGQrdHy+K6vSapACmoo="; }; - cargoHash = "sha256-/HfkE+R8JoNGkCCNQpE/JjGSqPHvjCPnTjOFPCFfJ7A="; - - # cargo tests fail when checkType="release" (default) - checkType = "debug"; + cargoHash = "sha256-Erhr5NduvQyUJSSurKqcZXJe4ExP68t8ysn7hZLAgP4="; meta = { description = "Sync server for Taskwarrior 3"; From 322a1d3241eec088503fab66094ef1ae7a1accb2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 17 Jan 2025 17:25:12 +0100 Subject: [PATCH 041/123] famistudio: 4.3.1 -> 4.3.2 --- pkgs/by-name/fa/famistudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 57e41b238b67..76b1bb156199 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -28,13 +28,13 @@ let in buildDotnetModule (finalAttrs: { pname = "famistudio"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; tag = finalAttrs.version; - hash = "sha256-ISOMsnsvsO3wOp9J/CilCr4wBgkHc29od2a2sBssN7k="; + hash = "sha256-on1x7wrcol8rlGWZs+/DndxjhqotDiTXXEbCZx7a3Bw="; }; postPatch = From 3252fed91a53d07a444dd76d326cb15090c6ebed Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 17 Jan 2025 18:58:44 +0100 Subject: [PATCH 042/123] nixos/engelsystem: fix typo in docs --- nixos/modules/services/web-apps/engelsystem.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/engelsystem.nix b/nixos/modules/services/web-apps/engelsystem.nix index 07e1d8c735e9..887bee6f292a 100644 --- a/nixos/modules/services/web-apps/engelsystem.nix +++ b/nixos/modules/services/web-apps/engelsystem.nix @@ -43,7 +43,7 @@ in default = true; description = '' Whether to create a local database automatically. - This will override every database setting in {option}`services.engelsystem.config`. + This will override every database setting in {option}`services.engelsystem.settings`. ''; }; From 80a399ba1b66acfe0439682a41ce7f6960e82572 Mon Sep 17 00:00:00 2001 From: Quentin Frey <51170829+Limosine@users.noreply.github.com> Date: Fri, 17 Jan 2025 19:22:02 +0100 Subject: [PATCH 043/123] davis: 4.4.4 -> 5.0.2 --- nixos/tests/davis.nix | 2 +- pkgs/by-name/da/davis/package.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/davis.nix b/nixos/tests/davis.nix index 68958cee7a43..0fb80d0e7e20 100644 --- a/nixos/tests/davis.nix +++ b/nixos/tests/davis.nix @@ -48,7 +48,7 @@ import ./make-test-python.nix ( "curl -c /tmp/cookies -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'" ) r = machine.succeed( - f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F username=admin -F password=nixos -F _csrf_token={csrf_token.strip()} -D headers" + f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F _username=admin -F _password=nixos -F _csrf_token={csrf_token.strip()} -D headers" ) print(r) machine.succeed( diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix index 1fa809859387..dc5a845b663f 100644 --- a/pkgs/by-name/da/davis/package.nix +++ b/pkgs/by-name/da/davis/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject (finalAttrs: { pname = "davis"; - version = "4.4.4"; + version = "5.0.2"; src = fetchFromGitHub { owner = "tchapi"; repo = "davis"; - rev = "v${finalAttrs.version}"; - hash = "sha256-nQkyNs718Zrc2BiTNXSXPY23aiviJKoBJeuoSm5ISOI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Zl+6nrgspyg6P9gqYwah81Z6Mtni6nUlCp4gTjJWn9M="; }; - vendorHash = "sha256-zZlDonCwb9tJyckounv96eF4cx6Z/LBoAdB/r600HM4="; + vendorHash = "sha256-ZV5GNNtex+yKaMP5KaQkx5EaJRAJSwJjIZOCcXlnVW4="; postInstall = '' # Only include the files needed for runtime in the derivation From 33747f4edd7143085c26abdc55fc5d4d9bc28f4b Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sat, 18 Jan 2025 02:29:16 +0800 Subject: [PATCH 044/123] ast-grep: add updateScript --- pkgs/by-name/as/ast-grep/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 4dc3ff39490c..93ffe79dc217 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -6,6 +6,7 @@ installShellFiles, buildPackages, versionCheckHook, + nix-update-script, enableLegacySg ? false, }: @@ -72,6 +73,8 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = with lib; { mainProgram = "ast-grep"; description = "Fast and polyglot tool for code searching, linting, rewriting at large scale"; From aea7cb723c8e5febe82601949918692af38100f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 17 Jan 2025 21:49:28 +0100 Subject: [PATCH 045/123] dnscontrol: 4.15.3 -> 4.15.4 Diff: https://github.com/StackExchange/dnscontrol/compare/v4.15.3...v4.15.4 Changelog: https://github.com/StackExchange/dnscontrol/releases/tag/v4.15.4 --- pkgs/by-name/dn/dnscontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index 7fc8848217d2..7ec9da1608a5 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.15.3"; + version = "4.15.4"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-0vg3y/bUp5BTFhJbIdohvuj1DNu9bykDwMM3bWnKvNU="; + hash = "sha256-Jwv8gIcQD62OV8i5DvIcurcsc6Wkis+kl95lnj8NXds="; }; - vendorHash = "sha256-JMi4FDgZT94KyqDR57xgp1vnP7Htdn/bksntbQdGyZ0="; + vendorHash = "sha256-x/FxspmR89Q2yZI0sP1D9OVUFEjMlpT/0IPusy5zHuo="; nativeBuildInputs = [ installShellFiles ]; From 448b42d0ff9641ea7f15c192ad42c5a96c8df641 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 21:20:49 +0000 Subject: [PATCH 046/123] python312Packages.softlayer: 6.2.5 -> 6.2.6 --- pkgs/development/python-modules/softlayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 49550048e359..1ff4abf9a06d 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.2.5"; + version = "6.2.6"; pyproject = true; src = fetchFromGitHub { owner = "softlayer"; repo = "softlayer-python"; tag = "v${version}"; - hash = "sha256-wDLMVonPUexoaZ60kRBILmr5l46yajzACozCp6uETGY="; + hash = "sha256-qBhnHFFlP4pqlN/SETXEqYyre/ap60wHe9eCfyiB+kA="; }; build-system = [ From e81a9b360965a66b3a0894fa63ccd23f0ef5577c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Jan 2025 23:05:58 +0100 Subject: [PATCH 047/123] python3Packages.zenoh: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/zenoh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix index d6bbfdeef960..981dd8ac6023 100644 --- a/pkgs/development/python-modules/zenoh/default.nix +++ b/pkgs/development/python-modules/zenoh/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "zenoh"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-python"; rev = version; - hash = "sha256-DO5AZDS7XvExxATtbkFOLG66zQOZu4gE6VWOG7C3qGA="; + hash = "sha256-pLdAlQBq/d9fohkPgGV/bR7rOl4RreenbHXYdde8q/0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-GolnCEsqCGxjrKl2qXVRi9+d8hwXNsRVdfI7Cf60/jg="; + hash = "sha256-R6Vux4cNL9/Fxi7UvItZT8E539cz5cAupT9X0UkdwR4="; }; build-system = [ From be2921fec6e239028a958512b8c76d2503592817 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 17 Jan 2025 18:12:23 -0500 Subject: [PATCH 048/123] forgejo: 9.0.3 -> 10.0.0 https://forgejo.org/2025-01-release-v10-0/ https://codeberg.org/forgejo/forgejo/milestone/8377 --- pkgs/by-name/fo/forgejo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index f4814467ee61..3d09cde6934a 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "9.0.3"; - hash = "sha256-Ig4iz/ZoRj4lyod73GWY2oRV3E3tx3S4rNqQtsTonzQ="; - npmDepsHash = "sha256-yDNlD1l5xuLkkp6LbOlWj9OYHO+WtiAeiu9oIoQLFL8="; - vendorHash = "sha256-JLruZi8mXR1f+o9Olhbz44ieEXVGinUNmVi24VEYj28="; + version = "10.0.0"; + hash = "sha256-FcXL+lF2B+EUUEbdD31b1pV7GWbYxk6ewljAXuiV8QY="; + npmDepsHash = "sha256-YQDTw5CccnR7zJpvvEcmHZ2pLLNGYEg/mvncNYzcYY8="; + vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0="; lts = false; nixUpdateExtraArgs = [ "--override-filename" From 4be9a89a7f2b2f6ac5f39c8ae24ac049288bd4c0 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 17 Jan 2025 18:13:15 -0500 Subject: [PATCH 049/123] forgejo-runner: add adamcstephens as maintainer --- pkgs/by-name/fo/forgejo-runner/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 270ad38eabf2..46d9a2d653d3 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -57,6 +57,7 @@ buildGoModule rec { changelog = "https://code.forgejo.org/forgejo/runner/src/tag/${src.rev}/RELEASE-NOTES.md"; license = licenses.mit; maintainers = with maintainers; [ + adamcstephens kranzes emilylange christoph-heiss From d174a6cce24f8b39861f111caaf97f582c88b362 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 23:22:55 +0000 Subject: [PATCH 050/123] mpvScripts.modernz: 0.2.3 -> 0.2.4 --- pkgs/applications/video/mpv/scripts/modernz.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/modernz.nix b/pkgs/applications/video/mpv/scripts/modernz.nix index adade1bfac91..a459aa6ad851 100644 --- a/pkgs/applications/video/mpv/scripts/modernz.nix +++ b/pkgs/applications/video/mpv/scripts/modernz.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx"; - version = "0.2.3"; + version = "0.2.4"; scriptPath = "modernz.lua"; src = fetchFromGitHub { owner = "Samillion"; repo = "ModernZ"; rev = "v${finalAttrs.version}"; - hash = "sha256-yjxMBGXpu7Uyt0S9AW8ewGRNzbdu2S8N0st7VSKlqcc="; + hash = "sha256-njFVAxrO5mGaf5zSA4EZN31SakWcroBZuGXYvTnqi68="; }; postInstall = '' From 9ca3ca30d3ffd7f3c078cf5314c2400f9389b07e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Jan 2025 00:39:14 +0100 Subject: [PATCH 051/123] esphome: 2024.12.2 -> 2024.12.4 https://github.com/esphome/esphome/releases/tag/2024.12.3 https://github.com/esphome/esphome/releases/tag/2024.12.4 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 3eca45c43409..45a2367e42ed 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.12.2"; + version = "2024.12.4"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; tag = version; - hash = "sha256-VW9p3VNVJOw5vkjCU4fujG0ie4N2D2QLidBANPV512U="; + hash = "sha256-Ff3NuLHKRLoBbjqb92vvDcSbSJnjCwm5FmSDwnEI0p4="; }; build-systems = with python.pkgs; [ From 746241b5b2b22d38f95f64bd2929a5da8e37011f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 23:39:41 +0000 Subject: [PATCH 052/123] python312Packages.python-gnupg: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/python-gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 77a960e88958..532a45a4c360 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-KQ2N25zWPfls/pKEubJl8Z/W4UXlWC3Fj9cnHwJtCkc="; + hash = "sha256-8v21+ylhXHfCdD4cs9kxQ1Om6HsQw30jjZGuHG/q4IY="; }; postPatch = '' From 0559a979b9ada1623af75282085e88a1fdd13fee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 00:13:45 +0000 Subject: [PATCH 053/123] python312Packages.griffe: 1.5.4 -> 1.5.5 --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 524e77f9ea72..76f2cfd98b6e 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; tag = version; - hash = "sha256-F1/SjWy32d/CU86ZR/PK0QPiRMEbUNNeomZOBP/3K/k="; + hash = "sha256-SyyyNBhJVVKAzPl288B7E2PoqNd9Pp9VmSJASYez6Gs="; }; build-system = [ pdm-backend ]; From e22ee34960b189c8b66a88c50ed3e16923095b7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 00:15:49 +0000 Subject: [PATCH 054/123] broot: 1.44.5 -> 1.44.6 --- pkgs/by-name/br/broot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 59d112b4b5d7..103289528cca 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.44.5"; + version = "1.44.6"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-lLhf83srTHs7jIMiNshcGwue60F5zgbsJOO+w+3S9PU="; + hash = "sha256-cvrWcfQj5Pc2tyaQjhhTK9Ko240Bz6dbUe+OFLTz/+M="; }; - cargoHash = "sha256-nQFC9sZoGuAjKT8agDHVtYNOgKMMHzwQ0GY4uoaJHTU="; + cargoHash = "sha256-EhcaIkaFPisRKagN8xDMmGrcH9vfMZcj/w53sDQcOp8="; nativeBuildInputs = [ installShellFiles From 5347875c3df552e3ec0c6354ef86e2e46cb0bd57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 00:29:26 +0000 Subject: [PATCH 055/123] python312Packages.niaarm: 0.3.12 -> 0.3.13 --- pkgs/development/python-modules/niaarm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 0f96ca82471d..721038c0be29 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "niaarm"; - version = "0.3.12"; + version = "0.3.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; tag = version; - hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y="; + hash = "sha256-nDgGX5KbthOBXX5jg99fGT28ZuBx0Hxb+aHak3Uvjoc="; }; pythonRelaxDeps = [ From 51fe00b44ebc754a635634a399be6da8885672f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 00:39:05 +0000 Subject: [PATCH 056/123] kodiPackages.visualization-projectm: 21.0.1 -> 21.0.2 --- .../video/kodi/addons/visualization-projectm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix index 38ab9d308762..f9fb728c73d3 100644 --- a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "visualization-projectm"; namespace = "visualization.projectm"; - version = "21.0.1"; + version = "21.0.2"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-wjSQmOtQb4KjY3iH3Xh7AdQwE6ked+cpW6/gdNYS+NA="; + hash = "sha256-M+sHws9wp0sp1PnYXCLMZ9w48tJkG159XkyNvzHJNYo="; }; extraBuildInputs = [ pkg-config libGL projectm ]; From 0bd799225e5c2246aac197a5497baa7df385965c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 00:41:22 +0000 Subject: [PATCH 057/123] blocky: 0.24 -> 0.25 --- pkgs/by-name/bl/blocky/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/blocky/package.nix b/pkgs/by-name/bl/blocky/package.nix index fdf27dffb6a2..e2a39acd6905 100644 --- a/pkgs/by-name/bl/blocky/package.nix +++ b/pkgs/by-name/bl/blocky/package.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.24"; + version = "0.25"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - hash = "sha256-K+Zdb6l2WUhxVm/gi9U2vVR69bxr2ntLyIrkwTuc0Do="; + hash = "sha256-yd9qncTuzf7p1hIYHzzXyxAx1C1QiuQAIYSKcjCiF0E="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorHash = "sha256-I4UXTynulsRuu9U8tsLbPQO1MMPfUC5dAZE420sW1sU="; + vendorHash = "sha256-Ck80ym64RIubtMHKkXsbN1kFrB6F9G++0U98jPvyoHw="; ldflags = [ "-s" From 4ab816528278375e065cfd4b2723c2d0f0b4f1ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 02:36:11 +0000 Subject: [PATCH 058/123] qtractor: 1.5.1 -> 1.5.2 --- pkgs/by-name/qt/qtractor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix index e107adce1fea..aa0891ab555e 100644 --- a/pkgs/by-name/qt/qtractor/package.nix +++ b/pkgs/by-name/qt/qtractor/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz"; - hash = "sha256-jBJ8qruWBeukuW7zzi9rRayJL+FC1e3f+O3cb6QfdiE="; + hash = "sha256-Z32fOS8Um7x2iFy+2SlmsU8mrDLwboNSI4dm0RligBo="; }; nativeBuildInputs = [ From 6ef690b4f1a1693c112b2073203bc46170240625 Mon Sep 17 00:00:00 2001 From: Eric Rauer Date: Fri, 17 Jan 2025 18:37:55 -0800 Subject: [PATCH 059/123] enpass: 6.10.1.1661 -> 6.11.6.1833 --- pkgs/by-name/en/enpass/data.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/en/enpass/data.json b/pkgs/by-name/en/enpass/data.json index deb670846b53..412718362961 100644 --- a/pkgs/by-name/en/enpass/data.json +++ b/pkgs/by-name/en/enpass/data.json @@ -1,8 +1,8 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_6.10.1.1661_amd64.deb", - "sha256": "52e9a6819b186b83eb8d8b9e2d5d4f62dedbb24382819738c18cb28976e8b07b", - "version": "6.10.1.1661" + "path": "pool/main/e/enpass/enpass_6.11.6.1833_amd64.deb", + "sha256": "91a7f4ac1bee55106edc6f3e8236b8ef8ed985926482b058899e0c73075f0d56", + "version": "6.11.6.1833" }, "i386": { "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", From 53223c213397d39acb30414c693b8ebf8363a967 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 03:33:52 +0000 Subject: [PATCH 060/123] python312Packages.pycron: 3.1.1 -> 3.1.2 --- pkgs/development/python-modules/pycron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index c8640cec9d75..121f69d3803d 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pycron"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "kipe"; repo = "pycron"; tag = version; - hash = "sha256-t53u18lCk6tF4Hr/BrEM2gWG+QOFIEkjyEKNXIr3ibs="; + hash = "sha256-WnaQfS3VzF9fZHX9eNRjih/U7SgWeWVynLdwPZgF950="; }; build-system = [ poetry-core ]; From 47db67aadc96c258a80c748a2c9b88e3d0c35ed1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 04:26:35 +0000 Subject: [PATCH 061/123] matcha-rss-digest: 0.7.0 -> 0.7.1 --- pkgs/by-name/ma/matcha-rss-digest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/matcha-rss-digest/package.nix b/pkgs/by-name/ma/matcha-rss-digest/package.nix index 02a0a7513bf7..bdc81f69f977 100644 --- a/pkgs/by-name/ma/matcha-rss-digest/package.nix +++ b/pkgs/by-name/ma/matcha-rss-digest/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "matcha-rss-digest"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "piqoni"; repo = "matcha"; rev = "v${version}"; - hash = "sha256-eexDPewRbAxrMVE7m4WHxeBgRl8xKVdtIpCbYPfp24w="; + hash = "sha256-Zs6Och5CsqN2mpnCLgV1VkH4+CV1fklfP20A22rE5y0="; }; vendorHash = "sha256-CURFy92K4aNF9xC8ik6RDadRAvlw8p3Xc+gWE2un6cc="; From f9fbf377b2dd982759c74773dc28f030edb6695a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 04:34:08 +0000 Subject: [PATCH 062/123] python312Packages.pyscard: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/pyscard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 7f8e0575e96f..8186c89b7b27 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -18,14 +18,14 @@ in buildPythonPackage rec { pname = "pyscard"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "pyscard"; tag = version; - hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0="; + hash = "sha256-RXCz6Npb/MrykHxtUsYlghCPeTwjDC6s9258iLA7OKs="; }; build-system = [ setuptools ]; From 72be6fa8753073cb67a814b084ff0ba0686cab19 Mon Sep 17 00:00:00 2001 From: Gopi Krishna Menon Date: Sat, 18 Jan 2025 12:21:20 +0530 Subject: [PATCH 063/123] vimPlugins.pomo-nvim: init at 2024-07-30 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c8a41ce8e821..031e690ece6e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10771,6 +10771,18 @@ final: prev: meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/"; }; + pomo-nvim = buildVimPlugin { + pname = "pomo.nvim"; + version = "2024-07-30"; + src = fetchFromGitHub { + owner = "epwalsh"; + repo = "pomo.nvim"; + rev = "aa8decc421d89be0f10b1fc6a602cdd269f350ff"; + sha256 = "1drld6dmibkg4b35n181v98gwfi8yhshx1gfkg82k72a5apr77dl"; + }; + meta.homepage = "https://github.com/epwalsh/pomo.nvim/"; + }; + pony-vim-syntax = buildVimPlugin { pname = "pony-vim-syntax"; version = "2017-09-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7a51279ed415..0a373bd6064a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -892,6 +892,7 @@ https://github.com/aklt/plantuml-syntax/,, https://github.com/nvim-treesitter/playground/,, https://github.com/nvim-lua/plenary.nvim/,, https://github.com/olivercederborg/poimandres.nvim/,HEAD, +https://github.com/epwalsh/pomo.nvim/,HEAD, https://github.com/dleonard0/pony-vim-syntax/,, https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, From 7a2e95924b13b7ba5d439be31e30354eba086524 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 06:53:42 +0000 Subject: [PATCH 064/123] python312Packages.pycaption: 2.2.15 -> 2.2.16 --- pkgs/development/python-modules/pycaption/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index d8a29fa08fb7..438fe2ee5bfc 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.15"; + version = "2.2.16"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; tag = version; - hash = "sha256-07Llsp2Cvvo9WueeTBJnAos3uynhYL0gT5U21EI9dHY="; + hash = "sha256-w617mOxvL1alj7jauH4TVsYO0wxMHIFjevdhb4+542s="; }; build-system = [ setuptools ]; From d22ecc76fe34b41d2758fa0b59b8a36340024235 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 07:31:16 +0000 Subject: [PATCH 065/123] komga: 1.16.0 -> 1.18.0 --- pkgs/by-name/ko/komga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index af3701444243..cb99bd032eb5 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-6q7ZtTdbH2nIPIm6gNQZz2QxHlbWULsflhWJ0aDMFH4="; + sha256 = "sha256-I0xJfX0f1srIjiitBt5EN6j/pOCvfGUIwxCt5sT2UuY="; }; nativeBuildInputs = [ From 8ada0d00606b96975543ddfe3a0114f8a412a373 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:06:14 +0100 Subject: [PATCH 066/123] python312Packages.sphinx-codeautolink: add changelog to meta --- pkgs/development/python-modules/sphinx-codeautolink/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix index 8ed38bddce3e..9c80e6caebef 100644 --- a/pkgs/development/python-modules/sphinx-codeautolink/default.nix +++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension that makes code examples clickable"; homepage = "https://github.com/felix-hilden/sphinx-codeautolink"; + changelog = "https://github.com/felix-hilden/sphinx-codeautolink/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; }; From 5b043b36c7af2a903e84a891b2f8d4a7b9be13f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:07:52 +0100 Subject: [PATCH 067/123] python312Packages.sphinx-codeautolink: refactor --- .../python-modules/sphinx-codeautolink/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix index 9c80e6caebef..d02867e3189a 100644 --- a/pkgs/development/python-modules/sphinx-codeautolink/default.nix +++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sphinx-codeautolink"; version = "0.16.2"; - format = "pyproject"; + pyproject = true; outputs = [ "out" @@ -32,8 +32,9 @@ buildPythonPackage rec { hash = "sha256-pHo7uA7TXmNdSU8CFRO0heI5rYBw+JeQ2NijmirhhHk="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ - setuptools sphinxHook sphinx-rtd-theme matplotlib @@ -42,7 +43,7 @@ buildPythonPackage rec { sphinxRoot = "docs/src"; - propagatedBuildInputs = [ + dependencies = [ sphinx beautifulsoup4 ]; From 51b5a56827d96f80112a47688c6470828174c1ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:11:25 +0100 Subject: [PATCH 068/123] python312Packages.python-otbr-api: fix build --- pkgs/development/python-modules/python-otbr-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index 1df8ad5f9c00..ac723db320d5 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-irQ4QvpGIAYYKq0UqLuo7Nrnde905+GJFd4HkxsCDmQ="; }; - build-setup = [ setuptools ]; + build-system = [ setuptools ]; dependencies = [ aiohttp From 79591416e7bfde1766b9d26dd087071c2f436dbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:13:28 +0100 Subject: [PATCH 069/123] python313Packages.tencentcloud-sdk-python: 3.0.1304 -> 3.0.1305 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1304...3.0.1305 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1305/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 57ab8522e78a..bdae89164f45 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1304"; + version = "3.0.1305"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-51tRvvavAYGa6XTyB6bL9a7TOZsv6DvVrFgrma5aJq8="; + hash = "sha256-uvGhUwiG3AsKpJrm6vYuhzv7rn9Sq1564IXY4fCa8H8="; }; build-system = [ setuptools ]; From e9a31eadbcc8560c93468daa392f6f1d6809a3de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:13:49 +0100 Subject: [PATCH 070/123] python313Packages.boto3-stubs: 1.36.0 -> 1.36.2 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 7dd49e5c2fa1..9c5aa855cec4 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.0"; + version = "1.36.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-L3Zss6EAAMCEZPSJTM5gf2VwRhnJaXGXD9SaaB0IdbM="; + hash = "sha256-9AHlhcx99N37PgL7lcXs+G59QVYcPvuAK6RgjhrUtmA="; }; build-system = [ setuptools ]; From 1382b11fee7a02fb20d0a83e60c4a3943a24c049 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:13:52 +0100 Subject: [PATCH 071/123] python313Packages.botocore-stubs: 1.36.0 -> 1.36.2 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index aa3ec95ab67c..12f96cf321c5 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.0"; + version = "1.36.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-cfDQdIZk25v4TMo0Zq7SQnzEao3eN1OVMIsPJxoecZs="; + hash = "sha256-yWCewYS9RFEhq1UpZCv3c9Qgzcckfy0HqAghr+mj9nA="; }; nativeBuildInputs = [ setuptools ]; From 7a499ee138b93fe079a2c74801543c9b6632d65b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:14:22 +0100 Subject: [PATCH 072/123] python313Packages.publicsuffixlist: 1.0.2.20250111 -> 1.0.2.20250117 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250117-gha/CHANGES.md --- 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 c7749f437f91..fa097d9cc7d0 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250111"; + version = "1.0.2.20250117"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ul/bjvMgjBzNVyWV4o11CzMD6LT55+baTzITVt8H7wc="; + hash = "sha256-7jkUrZDmx9umNrUlzzXDdJWsDtfHKg/u8dfDNtVgiCU="; }; build-system = [ setuptools ]; From d1d605489c36b82c131d5059a24ee13259114d4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:15:23 +0100 Subject: [PATCH 073/123] python312Packages.mypy-boto3-detective: 1.36.0 -> 1.36.2 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index c70ce08f1362..4c612021124b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -390,8 +390,8 @@ rec { "sha256-UkuWWk99OTXMMhYMuAby9rbJjlhYBI0WwA9clnz4U9A="; mypy-boto3-detective = - buildMypyBoto3Package "detective" "1.36.0" - "sha256-qumyLsWuOFuwiBK1XN558ag8LlEA5jfHofy5dKK+Gbw="; + buildMypyBoto3Package "detective" "1.36.2" + "sha256-91C7CVfMmGvvfm4GdnDuWzSXi1sDsL5qj8YLC17loiI="; mypy-boto3-devicefarm = buildMypyBoto3Package "devicefarm" "1.36.0" From f988fcf60ca7f36b57811780b262b76b587f3167 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:15:29 +0100 Subject: [PATCH 074/123] python312Packages.mypy-boto3-ec2: 1.36.0 -> 1.36.2 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4c612021124b..e4846c8953bc 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -446,8 +446,8 @@ rec { "sha256-YrzTW5fEsZPDu4p84jhY4avS/wM01XybrvGCOtF48cQ="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.36.0" - "sha256-/dFXF0dKEF0wPQoh04dY9X0x8JqaxgFLtOYJocBwshA="; + buildMypyBoto3Package "ec2" "1.36.2" + "sha256-IwQg73lI34QtCjedW3ctRC0tzNAOXvgJl2s09GV6Zg0="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.36.0" From ce3f8254484bda35f46f82dc391847201c19bc89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:15:31 +0100 Subject: [PATCH 075/123] python312Packages.mypy-boto3-ecs: 1.36.0 -> 1.36.1 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e4846c8953bc..605b343e7655 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -462,8 +462,8 @@ rec { "sha256-ezh5me1scgEEH0I/19CSVDstsLkwYgdVhwPuVivbKWk="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.36.0" - "sha256-uO/y0aDNH4aayyvRDFH/WedHTku0A8QRvrzCe34P6gY="; + buildMypyBoto3Package "ecs" "1.36.1" + "sha256-bpE0iwtVksX2ByM7DSV+Y81ev8Ml896Wc9FciZEmjdA="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.36.0" From 1594522d2b5359978f3adaed47a3c0f150904273 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:16:22 +0100 Subject: [PATCH 076/123] python312Packages.mypy-boto3-sagemaker: 1.36.0 -> 1.36.2 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 605b343e7655..8ff080528044 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1174,8 +1174,8 @@ rec { "sha256-oLFs4pHfXJbG5cenQi83ur7ZaMfPLYzqp4AvvAadg+k="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.36.0" - "sha256-FogxXsF3rVx33QF9Mo6RJhjsbgrEVLR037Js+SIYczI="; + buildMypyBoto3Package "sagemaker" "1.36.2" + "sha256-M4H/GVm8hLISSyKR6VtpUzTBOtRiaIr5DY5ZkM9mhk4="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.36.0" From 6e1067c8537b959940b29fe563353b16c8c6f170 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:19:09 +0100 Subject: [PATCH 077/123] python313Packages.aiohomeconnect: 0.11.0 -> 0.11.2 Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/refs/tags/v0.11.0...v0.11.2 Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/refs/tags/v0.11.2/CHANGELOG.md --- pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index 6e307ef3d118..ffa755c21533 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.11.0"; + version = "0.11.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${version}"; - hash = "sha256-fg3WusrONJtPO/IpHlXzO17C2OuQe28kprXrBG9PqMY="; + hash = "sha256-YnQypKeVYoHD445fv9n643qIqjTCInCfbTHPUrMePJI="; }; pythonRelaxDeps = [ "httpx" ]; From ceba93b5c8fc8098751337d7bd01ffaba054fd15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:19:36 +0100 Subject: [PATCH 078/123] python313Packages.cyclopts: 3.2.0 -> 3.2.1 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.2.0...v3.2.1 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.2.1 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 71dea8620e2d..cbc291516d53 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-U2H/SyVqoNlKAiim6FieEQw0SKK/b9diP9AjXb8PZjg="; + hash = "sha256-dHmoO9agZBhDviowtvuAox8hJsHcxgQTRxpaYmy50Dk="; }; build-system = [ From 15c3dd5f5a12b5ad8be132943472d2d12dac19ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 08:23:10 +0000 Subject: [PATCH 079/123] python312Packages.aioairzone: 0.9.7 -> 0.9.8 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 53049d5ba648..c2ada2f5efe0 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.7"; + version = "0.9.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; tag = version; - hash = "sha256-ZD/lJwYiggE7fUVGjimgGQ+H8zCtOZrZRElc0crrKhw="; + hash = "sha256-wqJpdD4zd5hToZJaacjhoHEC+rSyLjPs7vwwAN92xHM="; }; build-system = [ setuptools ]; From bc1c633692936cadfd9ac232756e06fec8892012 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 16:40:51 +0000 Subject: [PATCH 080/123] python312Packages.skorch: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/skorch/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 3e139d4714a8..a5ad7782882b 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -11,6 +11,7 @@ torch, tqdm, flaky, + llvmPackages, pandas, pytestCheckHook, safetensors, @@ -19,15 +20,15 @@ buildPythonPackage rec { pname = "skorch"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JcplwaeYlGRAJXRNac1Ya/hgWoHE+NWjZhCU9eaSyRQ="; + hash = "sha256-AguMhI/MO4DNexe5azVEXOw7laTRBN0ecFW81qqh0rY="; }; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; propagatedBuildInputs = [ numpy @@ -53,6 +54,8 @@ buildPythonPackage rec { --replace "--cov-config .coveragerc" "" ''; + checkInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + disabledTests = [ # on CPU, these expect artifacts from previous GPU run From a3d4df616ffc2670857cf4c2f315ec8e34aa4278 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 15:40:02 +0900 Subject: [PATCH 081/123] python312Packages.skorch: refactor --- .../python-modules/skorch/default.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index a5ad7782882b..1ed7419733f3 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -7,12 +7,14 @@ numpy, scikit-learn, scipy, + setuptools, tabulate, torch, tqdm, flaky, llvmPackages, pandas, + pytest-cov-stub, pytestCheckHook, safetensors, pythonAtLeast, @@ -21,7 +23,7 @@ buildPythonPackage rec { pname = "skorch"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -30,30 +32,25 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scikit-learn scipy tabulate - torch + torch # implicit dependency tqdm ]; nativeCheckInputs = [ flaky pandas + pytest-cov-stub pytestCheckHook safetensors ]; - # patch out pytest-cov dep/invocation - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=skorch" "" \ - --replace "--cov-report=term-missing" "" \ - --replace "--cov-config .coveragerc" "" - ''; - checkInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; disabledTests = @@ -66,11 +63,6 @@ buildPythonPackage rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # there is a problem with the compiler selection "test_fit_and_predict_with_compile" - ] - ++ lib.optionals (pythonAtLeast "3.11") [ - # Python 3.11+ not yet supported for torch.compile - # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/_dynamo/eval_frame.py#L376-L377 - "test_fit_and_predict_with_compile" ]; disabledTestPaths = @@ -86,11 +78,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "skorch" ]; - meta = with lib; { + meta = { description = "Scikit-learn compatible neural net library using Pytorch"; homepage = "https://skorch.readthedocs.io"; changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From 22c57a0b75f0ea145c4cd74c688ee761890b1487 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 Jan 2025 15:51:38 +0900 Subject: [PATCH 082/123] python313Packages.skorch: disabled --- pkgs/development/python-modules/skorch/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 1ed7419733f3..76b9b7ef2994 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -30,7 +30,9 @@ buildPythonPackage rec { hash = "sha256-AguMhI/MO4DNexe5azVEXOw7laTRBN0ecFW81qqh0rY="; }; - disabled = pythonOlder "3.9"; + # AttributeError: 'NoneType' object has no attribute 'span' with Python 3.13 + # https://github.com/skorch-dev/skorch/issues/1080 + disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; build-system = [ setuptools ]; From 2de545570b2efe1b1c310d726cf26d477568ec75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:39:12 +0100 Subject: [PATCH 083/123] python312Packages.django-environ: 0.11.2 -> 0.12.0 Changelog: https://github.com/joke2k/django-environ/releases/tag/v0.12.0 --- .../python-modules/django-environ/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-environ/default.nix b/pkgs/development/python-modules/django-environ/default.nix index 4820a064658e..47d4cf94731f 100644 --- a/pkgs/development/python-modules/django-environ/default.nix +++ b/pkgs/development/python-modules/django-environ/default.nix @@ -1,31 +1,39 @@ { lib, buildPythonPackage, - fetchPypi, django, - six, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-environ"; - version = "0.11.2"; - format = "setuptools"; + version = "0.12.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-8yqHqgiZiUwn1OF3b6a0d+gWTtf2s+QQpiptcsqvZL4="; + pname = "django_environ"; + inherit version; + hash = "sha256-In3IkUU91b3nacNEnPSnS28u6PerI2HJOgcGj0F5BBo="; }; + build-system = [ setuptools ]; + + buildInputs = [ django ]; + # The testsuite fails to modify the base environment doCheck = false; - propagatedBuildInputs = [ - django - six - ]; + + pythonImportsCheck = [ "environ" ]; meta = with lib; { description = "Utilize environment variables to configure your Django application"; homepage = "https://github.com/joke2k/django-environ/"; + changelog = "https://github.com/joke2k/django-environ/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 0303919039ea5f6f2d702464a189cefeae9524a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:49:09 +0100 Subject: [PATCH 084/123] python312Packages.django-import-export: 4.3.3 -> 4.3.4 Diff: https://github.com/django-import-export/django-import-export/compare/refs/tags/4.3.3...4.3.4 Changelog: https://github.com/django-import-export/django-import-export/blob/4.3.4/docs/changelog.rst --- .../python-modules/django-import-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 9f531debca89..276d60fc3f93 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.3.3"; + version = "4.3.4"; pyproject = true; src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; tag = version; - hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc="; + hash = "sha256-o21xT+gu1vuar/QJbXhg2hpHkrBCVOMhGAFngi32d10="; }; pythonRelaxDeps = [ "tablib" ]; From dae68ef3287d2f2d5651fd7acb5d4bb8ecaabadb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:54:29 +0100 Subject: [PATCH 085/123] python313Packages.django-taggit: 5.0.1 -> 6.1.0 Diff: https://github.com/jazzband/django-taggit/compare/refs/tags/5.0.1...6.1.0 Changelog: https://github.com/jazzband/django-taggit/blob/6.1.0/CHANGELOG.rst --- .../python-modules/django-taggit/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index 20f65e36f465..b6c3e021185c 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -1,37 +1,42 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, django, djangorestframework, + fetchFromGitHub, python, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-taggit"; - version = "5.0.1"; - format = "setuptools"; + version = "6.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7c19seDzXDBOCCovYx3awuFu9SlgKVJOt5KvdDDKtMw="; + src = fetchFromGitHub { + owner = "jazzband"; + repo = "django-taggit"; + tag = version; + hash = "sha256-QLJhO517VONuf+8rrpZ6SXMP/WWymOIKfd4eyviwCsU="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ "taggit" ]; + buildInputs = [ django ]; nativeCheckInputs = [ djangorestframework ]; + pythonImportsCheck = [ "taggit" ]; + checkPhase = '' # prove we're running tests against installed package, not build dir rm -r taggit # Replace directory of locale - substituteInPlace ./tests/test_utils.py \ - --replace 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\"" + substituteInPlace tests/test_utils.py \ + --replace-fail 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\"" ${python.interpreter} -m django test --settings=tests.settings ''; From e8ab8d19f6f435a92095a84fa418225c5bf37390 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:59:23 +0100 Subject: [PATCH 086/123] python312Packages.django-htmx: 1.19.0 -> 1.21.0 Diff: https://github.com/adamchainz/django-htmx/compare/1.19.0...1.21.0 Changelog: https://github.com/adamchainz/django-htmx/blob/1.21.0/docs/changelog.rst --- .../python-modules/django-htmx/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix index 0e60a5ae5aef..51e6f62fecf2 100644 --- a/pkgs/development/python-modules/django-htmx/default.nix +++ b/pkgs/development/python-modules/django-htmx/default.nix @@ -1,32 +1,34 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, asgiref, + buildPythonPackage, django, - pytestCheckHook, + fetchFromGitHub, pytest-django, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-htmx"; - version = "1.19.0"; + version = "1.21.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "adamchainz"; repo = "django-htmx"; rev = version; - hash = "sha256-nSutErUkFafKjBswhC+Lrn39MgCbCrzttAx1a+qt1so="; + hash = "sha256-2zmCJ+oHvw21lvCgAFja2LRPA6LNWep4uRor0z1Ft6g="; }; build-system = [ setuptools ]; - dependencies = [ - asgiref - django - ]; + buildInputs = [ django ]; + + dependencies = [ asgiref ]; nativeCheckInputs = [ pytestCheckHook @@ -38,6 +40,7 @@ buildPythonPackage rec { meta = { description = "Extensions for using Django with htmx"; homepage = "https://github.com/adamchainz/django-htmx"; + changelog = "https://github.com/adamchainz/django-htmx/blob/${version}/docs/changelog.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ minijackson ]; }; From c8221984a731199bc50d75f1eab6eca46859f784 Mon Sep 17 00:00:00 2001 From: Johannes Maier Date: Sat, 18 Jan 2025 10:26:42 +0100 Subject: [PATCH 087/123] gcli: 2.2.0 -> 2.6.0 --- pkgs/by-name/gc/gcli/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix index d6a69fa6da01..fc9b54a84b27 100644 --- a/pkgs/by-name/gc/gcli/package.nix +++ b/pkgs/by-name/gc/gcli/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, stdenv, curl, - autoreconfHook, pkg-config, byacc, flex, @@ -11,17 +10,16 @@ stdenv.mkDerivation rec { pname = "gcli"; - version = "2.2.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "herrhotzenplotz"; repo = "gcli"; - rev = version; - hash = "sha256-extVTaTWVFXSTiXlZ/MtiiFdc/KZEDkc+A7xxylJaM4="; + rev = "v${version}"; + hash = "sha256-60B1XRoeSjSEo5nxrCJL9lizq7ELGe8+hdmC4lkMhis="; }; nativeBuildInputs = [ - autoreconfHook pkg-config byacc flex From 680ecdb8b455ebc5ab682a127024495b3acb8a46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 10:03:14 +0000 Subject: [PATCH 088/123] der-ascii: 0.3.0 -> 0.5.0 --- pkgs/by-name/de/der-ascii/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix index 212f190b2777..ed786156a88d 100644 --- a/pkgs/by-name/de/der-ascii/package.nix +++ b/pkgs/by-name/de/der-ascii/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "der-ascii"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LgxGSZQNxwx08mK9G8mSuBFTOd3pC1mvz3Wz7Y+6XR4="; + sha256 = "sha256-yUHVPBUW1Csn3W5K9S2TWOq4aovzpaBK8BC0t8zkj3g="; }; vendorHash = null; From 32d96956a665debd26c80f60f159751ebf7531e9 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 18 Jan 2025 06:21:11 -0500 Subject: [PATCH 089/123] nixos/wyoming-faster-whisper: fix module prevent the error expected a list but got a string "" --- .../modules/services/home-automation/wyoming/faster-whisper.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index 7d92501821a5..018bd5f5c1cc 100644 --- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -10,7 +10,6 @@ let cfg = config.services.wyoming.faster-whisper; inherit (lib) - escapeShellArgs mkOption mkEnableOption mkPackageOption @@ -240,7 +239,6 @@ in description = '' Extra arguments to pass to the server commandline. ''; - apply = escapeShellArgs; }; }; } From e1f4f86f210565088a9774f067594dd8edd4a86e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 11:27:45 +0000 Subject: [PATCH 090/123] python312Packages.python-engineio: 4.11.1 -> 4.11.2 --- pkgs/development/python-modules/python-engineio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index f88ba57d9331..8448b656ce1d 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.11.1"; + version = "4.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; tag = "v${version}"; - hash = "sha256-6gSpnBXznpWDtGEdV6PDtQvRodAz4jqOY+zGT2+NUj0="; + hash = "sha256-3yCT9u3Bz5QPaDtPe1Ezio+O+wWjQ+4pLh55sYAfnNc="; }; build-system = [ setuptools ]; From a656e23d6cd10d79d3c0091deeabe39111386051 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 18 Jan 2025 12:49:27 +0100 Subject: [PATCH 091/123] google-chrome: 131.0.6778.264 -> 132.0.6834.84 Fixes: * CVE-2025-0434 * CVE-2025-0435 * CVE-2025-0436 * CVE-2025-0437 * CVE-2025-0438 * CVE-2025-0439 * CVE-2025-0440 * CVE-2025-0441 * CVE-2025-0442 * CVE-2025-0443 * CVE-2025-0446 * CVE-2025-0447 * CVE-2025-0448 https://chromereleases.googleblog.com/2025/01/stable-channel-update-for-desktop_14.html --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 90ec7681d8c4..e2f36205960d 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.264"; + version = "132.0.6834.83"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-zfPXkfjnvVGO09X4eqTii7rPwieMEsQMy9p9tXb5fDU="; + hash = "sha256-qufv7m7iQ8yX6WeNajTbPELCmRhr4GGBa8Wzy+iMFhg="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.265"; + version = "132.0.6834.84"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/accjagybvz5mf6voljw3khsklaaa_131.0.6778.265/GoogleChrome-131.0.6778.265.dmg"; - hash = "sha256-mHfBmBJVlUYQf8UnCBBTbgizTuV/IucXg2H+i4zhnPU="; + url = "http://dl.google.com/release2/chrome/acpvuq6jnnfhesngduj6lnfmy3zq_132.0.6834.84/GoogleChrome-132.0.6834.84.dmg"; + hash = "sha256-SX8IUdTnIJHwfF9ZwIHZwGZUncJ/NLQpuEL/X8p1KJo="; }; dontPatch = true; From e4b6ebec9b424e2603899572d81c6142bf396e7e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 18 Jan 2025 12:00:25 +0000 Subject: [PATCH 092/123] nixos/doc/rl-2505: fix release notes for `nixos-rebuild build-image` --- nixos/doc/manual/release-notes/rl-2505.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index b41b90be7b73..908cd9a7f1b4 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -25,12 +25,12 @@ - `services.dex` now restarts upon changes to the `.environmentFile` or entries in `.settings.staticClients[].secretFile` when the entry is a `path` type. - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. + - A `nixos-rebuild build-image` sub-command has been added. + It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). - `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`. - It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). - ## New Modules {#sec-release-25.05-new-modules} From cb0e16df96505fecd0dc54c8e6421ceedc7f2193 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 18 Jan 2025 12:04:09 +0000 Subject: [PATCH 093/123] nixos/doc/rl-2505: `build-image` is also available for `nixos-rebuild-ng` --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 908cd9a7f1b4..c1cbe7a66318 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -27,7 +27,7 @@ - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. - A `nixos-rebuild build-image` sub-command has been added. - It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). + It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`. - `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`. From 2deb996fb6e6fd599a9e9562d8f0cb6cd4f27d5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 12:33:02 +0000 Subject: [PATCH 094/123] ingress2gateway: 0.3.0 -> 0.4.0 --- pkgs/by-name/in/ingress2gateway/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix index 03799ae2faf5..33ac44c47dc3 100644 --- a/pkgs/by-name/in/ingress2gateway/package.nix +++ b/pkgs/by-name/in/ingress2gateway/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ingress2gateway"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - hash = "sha256-xAoJREGktbSNGYdrmPuYG2G+xaQ+kReSSA1JBgWaPVY="; + hash = "sha256-0w2ZM1g2rr46bN8BNgrkmb3tOQw0FZTMLp/koW01c5I="; }; - vendorHash = "sha256-T6I8uYUaubcc1dfDu6PbQ9bDDLqGuLGXWnCZhdvkycE="; + vendorHash = "sha256-7b247/9/9kdNIYuaLvKIv3RK/nzQzruMKZeheTag2sA="; ldflags = [ "-s" From a36a4876506364a28f362c3acd4fa74cac5a1caa Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 18 Jan 2025 20:39:13 +0800 Subject: [PATCH 095/123] qq: 3.2.15-2024.12.24 -> 3.2.15-2025.1.10 --- pkgs/by-name/qq/qq/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index e35d29f22629..20ad0459de18 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-12-30 +# Last updated: 2025-01-18 { - version = "3.2.15-2024.12.24"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_arm64_01.deb"; - arm64_hash = "sha256-2+IT7XsK5ziyG9/rihfDhTADwzJ8QDMBz0NyMjZHmzE="; - amd64_hash = "sha256-iBiyFK8sKmWUxntZREwdxWCXSSLB8jxiL4eqo2Qy0is="; + version = "3.2.15-2025.1.10"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_arm64_01.deb"; + arm64_hash = "sha256-F2R5j0x2BnD9/kIsiUe+IbZpAKDOQdjxwOENzzb4RJo="; + amd64_hash = "sha256-hDfaxxXchdZons8Tb5I7bsd7xEjiKpQrJjxyFnz3Y94="; } From e3d925f62c6ad3f7723215c274c911118baec5c7 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 18 Jan 2025 20:42:03 +0800 Subject: [PATCH 096/123] python313Packages.globus-sdk: 3.49.0 -> 3.50.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 7de7ccc12cec..a485d3015f6d 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.49.0"; + version = "3.50.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; tag = version; - hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0="; + hash = "sha256-gjctcpaV9L8x4ubS4Ox6kyNG7/kl7tZt9c9/7SWVXkg="; }; build-system = [ setuptools ]; From 01d11a936925157c54bae7b91143ae1f2b05d242 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 12:49:02 +0000 Subject: [PATCH 097/123] ttdl: 4.7.0 -> 4.8.0 --- pkgs/by-name/tt/ttdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 3cac311e475f..177f8e59d3ed 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-ugg6ZrrEAsfgeXBBKrU30orVkcWJV4MgZIVshAv8ys8="; + sha256 = "sha256-RHmKCayouxtlbp/dpZlC9d9OuUXHDLVWucnuIP3rEhA="; }; - cargoHash = "sha256-jjkHnxK15WSlhgPpqpU7KNM2KcEi81TrcvIi9gq4YHU="; + cargoHash = "sha256-DR0dAaSLQtWcCcCYXPb4vMDzjct0oNk7GMT5BbZuMlE="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; From 9c414926c84ecbcb3406e30f94ec821ac59b5328 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Fri, 17 Jan 2025 18:30:12 +0000 Subject: [PATCH 098/123] ast-grep: 0.33.0 -> 0.33.1 --- pkgs/by-name/as/ast-grep/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 93ffe79dc217..8cd89f3f13cb 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; - rev = version; - hash = "sha256-oqG76KzyN5TnE27yxrHeEYjLwrnDMvwbOzOnN6TWvxc="; + tag = version; + hash = "sha256-p7SJhkCoo4jBDyr+Z2+qxjUwWXWpVMuXd2/DDOM7Z/Q="; }; - cargoHash = "sha256-O3FKn90QVDk1TXJtjmaiDuXr+pwIjsAmadi+aypXeLA="; + cargoHash = "sha256-aCBEL+Jx4Kk7PWsxIgpdRdI7AnUAUEtRU4+JMxQ4Swk="; nativeBuildInputs = [ installShellFiles ]; @@ -75,13 +75,13 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { mainProgram = "ast-grep"; description = "Fast and polyglot tool for code searching, linting, rewriting at large scale"; homepage = "https://ast-grep.github.io/"; changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe montchr lord-valen From 24f757cf67b03c57df8a11c4f2644da1f4e49da9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 13:22:01 +0000 Subject: [PATCH 099/123] helmfile: 0.169.2 -> 0.170.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index affa96aadbdd..347c15a2e25b 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.169.2"; + version = "0.170.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-OoCLFhGeciCUC7Tb6+Md8tmamc/j0AeSlu5Krmkhxyc="; + hash = "sha256-HlSpY7+Qct2vxtAejrwmmWhnWq+jVycjuxQ42KScpSs="; }; - vendorHash = "sha256-VBgWnDi0jaZ+91kkYeX9QyNBrP9W+mSMjexwzZiKZWs="; + vendorHash = "sha256-BmEtzUUORY/ck158+1ItVeiG9mzXdikjjUX7XwQ7xoo="; proxyVendor = true; # darwin/linux hash mismatch From 02ce6c579463a506772702e3fd7144fcdf55fac5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 13:39:11 +0000 Subject: [PATCH 100/123] gh-poi: 0.12.0 -> 0.13.0 --- pkgs/by-name/gh/gh-poi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix index 522d3431280f..c032eaf3c222 100644 --- a/pkgs/by-name/gh/gh-poi/package.nix +++ b/pkgs/by-name/gh/gh-poi/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gh-poi"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "seachicken"; repo = "gh-poi"; rev = "v${version}"; - hash = "sha256-GRTBYwphw5rpwFzLrBRpzz6z6udNCdPn3vanfMvBtGI="; + hash = "sha256-foUv6+QIfPlYwgTwxFvEgGeOw/mpC80+ntHo29LQbB8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0="; # Skip checks because some of test suites require fixture. - # See: https://github.com/seachicken/gh-poi/blob/v0.12.0/.github/workflows/contract-test.yml#L28-L29 + # See: https://github.com/seachicken/gh-poi/blob/v0.13.0/.github/workflows/contract-test.yml#L28-L29 doCheck = false; meta = with lib; { From 5555ef257dd2865fcbeb38c461eb6a4f53253a24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 13:50:51 +0000 Subject: [PATCH 101/123] lxgw-wenkai: 1.501 -> 1.510 --- pkgs/by-name/lx/lxgw-wenkai/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxgw-wenkai/package.nix b/pkgs/by-name/lx/lxgw-wenkai/package.nix index adf23d18e9c6..ac3c25155883 100644 --- a/pkgs/by-name/lx/lxgw-wenkai/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.501"; + version = "1.510"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-7BBg6TGJzTVgBHPyzTYGFjXmidvAzOVCWAU11LylmBI="; + hash = "sha256-RZ+vcFDKMW63oYz4meNvNSIyEdY9I5sKhqOAPKlPP4Q="; }; installPhase = '' From a9d65f88ff321d8ea44a3ac3657243e77f8ebc3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 13:51:17 +0000 Subject: [PATCH 102/123] kdePackages.karousel: 0.10 -> 0.11 --- pkgs/kde/third-party/karousel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix index d197dbcf5a60..66ae5758b0f8 100644 --- a/pkgs/kde/third-party/karousel/default.nix +++ b/pkgs/kde/third-party/karousel/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "karousel"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "peterfajdiga"; repo = "karousel"; rev = "v${finalAttrs.version}"; - hash = "sha256-lI3VaCd4eYhWbnYLEIeFiB88SWjd/DF8CUGFmxEXDXo="; + hash = "sha256-KAbOOOF8rMA6lwgn0gUQleh5EF7ISIvvi3OubuM/50w="; }; postPatch = '' From e3093dd600ebc54880499f3de26412837f419027 Mon Sep 17 00:00:00 2001 From: Valentino <65391343+luftmensch-luftmensch@users.noreply.github.com> Date: Sat, 18 Jan 2025 14:57:33 +0100 Subject: [PATCH 103/123] eww: 0.6.0-unstable-2024-07-05 -> 0.6.0-unstable-2025-01-14 (#374315) eww 0.6.0-unstable-2024-07-05 -> 0.6.0-unstable-2025-01-14 --- pkgs/by-name/ew/eww/lockfile.patch | 37 ------------------------------ pkgs/by-name/ew/eww/package.nix | 13 ++++------- 2 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 pkgs/by-name/ew/eww/lockfile.patch diff --git a/pkgs/by-name/ew/eww/lockfile.patch b/pkgs/by-name/ew/eww/lockfile.patch deleted file mode 100644 index 1edc62c66a45..000000000000 --- a/pkgs/by-name/ew/eww/lockfile.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 5d94bd4..acd2c8d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1676,7 +1676,7 @@ dependencies = [ - "libm", - "log", - "regex", -- "time 0.3.34", -+ "time 0.3.36", - "urlencoding", - ] - -@@ -2893,9 +2893,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.34" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -@@ -2914,9 +2914,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ - "num-conv", - "time-core", diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index f9882eacf2f4..0d45e0045708 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -15,21 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.6.0-unstable-2024-07-05"; + version = "0.6.0-unstable-2025-01-14"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - # FIXME: change to a release tag once a new release is available - # https://github.com/elkowar/eww/pull/1084 - # using the revision to fix string truncation issue in eww config - rev = "4d55e9ad63d1fae887726dffcd25a32def23d34f"; - hash = "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o="; + rev = "593a4f4666f0bc42790d6d033e64a2b38449090f"; + hash = "sha256-DbXsiqMyZKNSFmL5aEJwJr+cPnz8qaWe5lNDoovOX/g="; }; - # needed to fix build errors with rust 1.80 due to outdated time crate - cargoPatches = [ ./lockfile.patch ]; - cargoHash = "sha256-55lmQl5pJwrEj5RlSG8b0PqtZVrASxTmX4Qdk090DZo="; + cargoHash = "sha256-hS8uNqT37z/89Q5pqfWKm/wijgMyrU8uDT5exn0NZNU="; nativeBuildInputs = [ installShellFiles From 91cffe8ea88edd78ab22346c35f33b37f97f927f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 14:02:25 +0000 Subject: [PATCH 104/123] live-server: 0.9.0 -> 0.9.1 --- pkgs/by-name/li/live-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 932569f8d629..68b3bc24530c 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "live-server"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "lomirus"; repo = "live-server"; rev = "v${version}"; - hash = "sha256-0XZ7ABR2xSVbixXbjdKiUTcQ7TqAZGyVpWqzMx5kR2g="; + hash = "sha256-9NULpK48svCMTx1OeivS+LHVGUGFObg4pBr/V0yIuwM="; }; - cargoHash = "sha256-lMRj+8D5jigCNXld4QfXy3QpRQo4ecCByqoDGC8no1w="; + cargoHash = "sha256-QB03sXAGNHu+Yc/UYcmOqYBS/LNbKSoT9PZa11prNtA="; nativeBuildInputs = [ pkg-config ]; From d804047f86641508dd4813e568f333f4e2dc70a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 15:23:33 +0000 Subject: [PATCH 105/123] zwave-js-ui: 9.27.8 -> 9.29.1 --- pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 7beef4bad52c..d9bd84a12c11 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "9.27.8"; + version = "9.29.1"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-6Twyzt2BMozph39GMG3JghA54LYi40c1+WfSbAAO2oM="; + hash = "sha256-uP0WUPhPvjy6CfK0MjLzQGjtRAlDKONXQH8WtW1vJDw="; }; - npmDepsHash = "sha256-2cDuRCxyn/wNgZks2Qg+iwqRX8CVRz8qVYh4ZlCR55I="; + npmDepsHash = "sha256-wRU5CTiwgPvy6exU3/iiuH0fkns+fX7/o0kc0c6VpeU="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; From 00b6db5736b4bfca991cfa8802c9120190c23bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Sep 2024 06:58:15 +0200 Subject: [PATCH 106/123] switch-to-configuration-ng: add devshell --- pkgs/by-name/sw/switch-to-configuration-ng/.envrc | 1 + pkgs/by-name/sw/switch-to-configuration-ng/README.md | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 pkgs/by-name/sw/switch-to-configuration-ng/.envrc diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/.envrc b/pkgs/by-name/sw/switch-to-configuration-ng/.envrc new file mode 100644 index 000000000000..9a9a563f9202 --- /dev/null +++ b/pkgs/by-name/sw/switch-to-configuration-ng/.envrc @@ -0,0 +1 @@ +use nix ../../../.. -A switch-to-configuration-ng diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/README.md b/pkgs/by-name/sw/switch-to-configuration-ng/README.md index 8230b47c9651..c930d8fce97d 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/README.md +++ b/pkgs/by-name/sw/switch-to-configuration-ng/README.md @@ -1,3 +1,12 @@ # switch-to-configuration-ng This program is a reimplementation of [switch-to-configuration](/nixos/modules/system/activation/switch-to-configuration.pl) in Rust. The goal is to be compatible in as many ways as possible to the original implementation, at least as long as the original is still in nixpkgs. Any behavioral modifications to this program should also be implemented in the original, and vice versa. + +## Build in a devshell + +``` +cd ./pkgs/by-name/sw/switch-to-configuration-ng +nix-shell ../../../.. -A switch-to-configuration-ng +cd ./src +cargo build +``` From fb069083c32be824c8d105d1e2ea5ebe97335e2b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 02:00:59 +1000 Subject: [PATCH 107/123] python312Packages.fedora-messaging: 3.6.0 -> 3.7.0 (#374794) https://github.com/fedora-infra/fedora-messaging/releases/tag/v3.7.0 --- pkgs/development/python-modules/fedora-messaging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix index f479665de92f..9c94ddbcebe3 100644 --- a/pkgs/development/python-modules/fedora-messaging/default.nix +++ b/pkgs/development/python-modules/fedora-messaging/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fedora-messaging"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "fedora-infra"; repo = "fedora-messaging"; tag = "v${version}"; - hash = "sha256-t5jwEgKLSB8APie+TD3WpgPYcAAPzEQLA+jXGlWVuNU="; + hash = "sha256-MBvFrOUrcPhsFR9yD7yqRM4Yf2StcNvL3sqFIn6XbMc="; }; build-system = [ poetry-core ]; From b6d3a89c5537693dd1a080f99189ee0e63dfa1cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 02:01:46 +1000 Subject: [PATCH 108/123] python312Packages.marshmallow-sqlalchemy: 1.1.0 -> 1.3.0 (#374781) https://github.com/marshmallow-code/marshmallow-sqlalchemy/blob/1.3.0/CHANGELOG.rst --- .../python-modules/marshmallow-sqlalchemy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index ae7e59177af8..c91d0dcc95e0 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "1.1.0"; + version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "marshmallow_sqlalchemy"; inherit version; - hash = "sha256-KrCS2iadr6igXVGlhAmvcajSGDlYukcUMSfdI54DWdg="; + hash = "sha256-Xd9YPddf31qzHfdph82iupGUKZa6XVd+ktZ0j6k6X1I="; }; build-system = [ flit-core ]; From 06e8e56411cd589de401887aa850991724b9234d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 02:02:22 +1000 Subject: [PATCH 109/123] python312Packages.ibm-cloud-sdk-core: 3.22.0 -> 3.22.1 (#374737) https://github.com/IBM/python-sdk-core/blob/v3.22.1/CHANGELOG.md --- .../python-modules/ibm-cloud-sdk-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 37b9fd69df5a..a89c1d4c5271 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.22.0"; + version = "3.22.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "IBM"; repo = "python-sdk-core"; tag = "v${version}"; - hash = "sha256-gNEd79kOtDlFJg3Ji9kO6VGGsy/VGxd6GzC/cuen9M0="; + hash = "sha256-wXffw+/esHvWxrNdlnYLTPflgOaRyIdf0hxI4M12Xdc="; }; pythonRelaxDeps = [ "requests" ]; From 84d76b4e5eb3c561b34810fb4ceef98ed797d045 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 02:04:21 +1000 Subject: [PATCH 110/123] python312Packages.autopep8: 2.3.1 -> 2.3.2 (#374720) https://github.com/hhatto/autopep8/releases/tag/v2.3.2 --- pkgs/development/python-modules/autopep8/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 3f60a9f48bfb..639ca2e8873a 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.3.1"; + version = "2.3.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hhatto"; repo = "autopep8"; tag = "v${version}"; - hash = "sha256-znZw9SnnVMN8XZjko11J5GK/LAk+gmRkTgPEO9+ntJ8="; + hash = "sha256-9OJ5XbzpHMHsFjf5oVyHjn5zqmAxRuSItWP4sQx8jD4="; }; build-system = [ setuptools ]; From 4854bedee5f53cb673ebf99a6d5641fb327c6bd3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 02:05:28 +1000 Subject: [PATCH 111/123] python312Packages.asf-search: 8.0.1 -> 8.1.1 (#374646) https://github.com/asfadmin/Discovery-asf_search/blob/v8.1.1/CHANGELOG.md --- pkgs/development/python-modules/asf-search/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 72db292342b5..5fa3f4f7cb2b 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "asf-search"; - version = "8.0.1"; + version = "8.1.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "asfadmin"; repo = "Discovery-asf_search"; tag = "v${version}"; - hash = "sha256-mOhY64Csxdc/DYS1OlbstxYEodtpXTVyPwd4B1jrDK8="; + hash = "sha256-9NyBDpCIsRBPN2965SR106h6hxwML7kXv6sY3YlPseA="; }; pythonRelaxDeps = [ "tenacity" ]; From 74de1cde51ee5225045681025a7ae091db239e69 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 18 Jan 2025 08:06:05 -0800 Subject: [PATCH 112/123] nixos/borgbackup: fix typo in example --- nixos/modules/services/backup/borgbackup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/borgbackup.md b/nixos/modules/services/backup/borgbackup.md index 2c91174732e1..8ae869308bb8 100644 --- a/nixos/modules/services/backup/borgbackup.md +++ b/nixos/modules/services/backup/borgbackup.md @@ -23,7 +23,7 @@ A complete list of options for the Borgbase module may be found A very basic configuration for backing up to a locally accessible directory is: ```nix { - opt.services.borgbackup.jobs = { + services.borgbackup.jobs = { rootBackup = { paths = "/"; exclude = [ "/nix" "/path/to/local/repo" ]; From b1d65bff40e3d3fa62a836f4cba2a08365a78d44 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Sun, 22 Dec 2024 18:00:29 +0100 Subject: [PATCH 113/123] Add missing mlPlugin They now seem necessary with Coq master (future Rocq 9.0), maybe linked to the now mandatory use of ocamlfind to load plugins. --- pkgs/development/coq-modules/CoLoR/default.nix | 2 ++ pkgs/development/coq-modules/coqprime/default.nix | 2 ++ pkgs/development/coq-modules/corn/default.nix | 2 ++ pkgs/development/coq-modules/math-classes/default.nix | 2 ++ 4 files changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 3576fbe17270..3677f65625bb 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -47,6 +47,8 @@ mkCoqDerivation { release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a"; release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm"; + mlPlugin = true; /* uses coq-bignums.plugin */ + propagatedBuildInputs = [ bignums ]; enableParallelBuilding = false; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 1373a05b00ec..16d89a49d412 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -46,6 +46,8 @@ mkCoqDerivation { release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; releaseRev = v: "v${v}"; + mlPlugin = true; /* uses coq-bignums.plugin */ + propagatedBuildInputs = [ bignums ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index 9689d4d5eaf2..d23217086622 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -46,6 +46,8 @@ mkCoqDerivation rec { configureScript = "./configure.sh"; dontAddPrefix = true; + mlPlugin = true; /* uses coq-bignums.plugin */ + propagatedBuildInputs = [ bignums math-classes diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 246ac5c617ab..292b5fa5fdc3 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -37,6 +37,8 @@ mkCoqDerivation { release."8.18.0".sha256 = "sha256-0WwPss8+Vr37zX616xeuS4TvtImtSbToFQkQostIjO8="; release."8.19.0".sha256 = "sha256-rsV96W9MPFi/DKsepNPm1QnC2DMemio+uALIgzVYw0w="; + mlPlugin = true; /* uses coq-bignums.plugin */ + propagatedBuildInputs = [ bignums ]; meta = { From a9c0c91c72444151bfa2a3b785ed0568ad44b4d2 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Sun, 22 Dec 2024 18:41:04 +0100 Subject: [PATCH 114/123] coqPackages.itauto: add missing stdlib dependency --- pkgs/development/coq-modules/itauto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 22f3eb2d9f21..ede84f75f6a7 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -75,7 +75,7 @@ ( o: lib.optionalAttrs (o.version == "dev" || lib.versionAtLeast o.version "8.16") { - propagatedBuildInputs = [ coq.ocamlPackages.findlib ]; + propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.findlib ]; } // lib.optionalAttrs (o.version == "dev" || lib.versionAtLeast o.version "8.18") { nativeBuildInputs = with coq.ocamlPackages; [ From 2444d7872a81264be1d8fe0d350ad8feae5e5be4 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 23 Dec 2024 12:35:52 +0100 Subject: [PATCH 115/123] coqPackages.corn: missing coq-elpi dependency for master (> 8.19.0) --- pkgs/development/coq-modules/corn/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index d23217086622..05da9b148cb5 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -4,10 +4,11 @@ coq, bignums, math-classes, + coq-elpi, version ? null, }: -mkCoqDerivation rec { +(mkCoqDerivation rec { pname = "corn"; inherit version; defaultVersion = @@ -59,4 +60,9 @@ mkCoqDerivation rec { description = "Coq library for constructive analysis"; maintainers = [ maintainers.vbgl ]; }; -} +}).overrideAttrs + (o: { + propagatedBuildInputs = + o.propagatedBuildInputs + ++ lib.optional (lib.versions.isGt "8.19.0" o.version || o.version == "dev") coq-elpi; + }) From 1e9e13f437c598417de39b4816f0c42346ddcd94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 02:13:21 +1000 Subject: [PATCH 116/123] python312Packages.pwntools: 4.13.1 -> 4.14.0 (#374798) https://github.com/Gallopsled/pwntools/releases/tag/4.14.0 --- pkgs/development/python-modules/pwntools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 228b89890f96..1ab82189326f 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -33,12 +33,12 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.13.1"; + version = "4.14.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-szInJftQMdwwll44VQc2CNmr900qv5enLGfUSq3843w="; + hash = "sha256-g7MkfeCD3/r6w79A9NFFVzLxbiXOMQX9CbVawPDRLoM="; }; postPatch = '' From c875c3386711f724ca67fdb5fa3046caa7b6d4af Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 17 Jan 2025 21:29:18 +0100 Subject: [PATCH 117/123] scalpel: fix cross build --- pkgs/by-name/sc/scalpel/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sc/scalpel/package.nix b/pkgs/by-name/sc/scalpel/package.nix index e481d9e22243..7cbdd41caa4f 100644 --- a/pkgs/by-name/sc/scalpel/package.nix +++ b/pkgs/by-name/sc/scalpel/package.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation (finalAttrs: { autoconf automake libtool + ]; + + buildInputs = [ tre ]; From 431e18ae5ba957a23c2db5b326cca52dede9aed4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Jan 2025 09:19:36 +0100 Subject: [PATCH 118/123] python313Packages.cyclopts: 3.2.0 -> 3.2.1 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.2.0...v3.2.1 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.2.1 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 71dea8620e2d..cbc291516d53 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-U2H/SyVqoNlKAiim6FieEQw0SKK/b9diP9AjXb8PZjg="; + hash = "sha256-dHmoO9agZBhDviowtvuAox8hJsHcxgQTRxpaYmy50Dk="; }; build-system = [ From b7066ff12f8379abc26fef6f46d67a0920cc39b8 Mon Sep 17 00:00:00 2001 From: Edwin Mackenzie-Owen Date: Sat, 18 Jan 2025 14:54:07 +0100 Subject: [PATCH 119/123] waypipe: add missing runtime dependencies Waypipe dynamically loads ffmpeg[^1] and libgbm[^2] at runtime, therefore their library paths need to be included in the binary's RUNPATH. libvulkan.so.1 also needs to be in the RUNPATH, because the ash Rust crate used by Waypipe loads it dynamically at runtime[^3]. https://github.com/NixOS/nixpkgs/pull/374615 removed all runtimeDependencies and the autoPatchelfHook that adds them to the RUNPATH. This commit readds the autoPatchelfHook and adds the three dynamically loaded libraries to the runtimeDependencies. In addition, it replaces the mesa buildInput with libgbm (which was used before https://github.com/NixOS/nixpkgs/pull/373212) because Waypipe depends only on libgbm. Resolves https://github.com/NixOS/nixpkgs/issues/374595 [^1]: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/blob/cb53f342af8a3009561e0566ed81962acbde6fc0/wrap-ffmpeg/build.rs#L110-111 [^2]: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/blob/cb53f342af8a3009561e0566ed81962acbde6fc0/wrap-gbm/build.rs#L76-77l [^3]: https://github.com/ash-rs/ash?tab=readme-ov-file#optional-linking --- pkgs/by-name/wa/waypipe/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 0ed176805199..d58ed7329061 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -6,7 +6,7 @@ ninja, pkg-config, scdoc, - mesa, + libgbm, lz4, zstd, ffmpeg, @@ -55,11 +55,12 @@ llvmPackages.stdenv.mkDerivation rec { rustc wayland-scanner rustPlatform.cargoSetupHook + autoPatchelfHook rust-bindgen ]; buildInputs = [ - mesa + libgbm lz4 zstd ffmpeg @@ -67,6 +68,12 @@ llvmPackages.stdenv.mkDerivation rec { vulkan-loader ]; + runtimeDependencies = [ + libgbm + ffmpeg.lib + vulkan-loader + ]; + meta = with lib; { description = "Network proxy for Wayland clients (applications)"; longDescription = '' From 52b9eff35181c2d4b0b79a737f27d2f06eebe75f Mon Sep 17 00:00:00 2001 From: Edwin Mackenzie-Owen Date: Sat, 18 Jan 2025 17:17:18 +0100 Subject: [PATCH 120/123] waypipe: remove unused arguments --- pkgs/by-name/wa/waypipe/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index d58ed7329061..c88051e51496 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -10,20 +10,15 @@ lz4, zstd, ffmpeg, - libva, cargo, rustc, - git, vulkan-headers, vulkan-loader, shaderc, - vulkan-tools, llvmPackages, autoPatchelfHook, - wayland, wayland-scanner, rust-bindgen, - egl-wayland, }: llvmPackages.stdenv.mkDerivation rec { pname = "waypipe"; From 79bb80e69e08ca9f082941378aee3cba32f69b7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 02:42:23 +1000 Subject: [PATCH 121/123] python312Packages.nitransforms: 24.1.0 -> 24.1.1 (#374767) https://github.com/nipy/nitransforms/releases/tag/24.1.1 --- pkgs/development/python-modules/nitransforms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 11edc89909b7..068497e585ee 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "24.1.0"; + version = "24.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QOOc3A/oADnjOtxgLqArwXIikwNDApVY4yHAYt9ENRU="; + hash = "sha256-U2lWxYDuA+PpMEMgjanq/JILWTTH5+DEx9dZ/KCWNjM="; }; build-system = [ From 93d6bb5a0d5bb854e8af0ef5e5f21fbe02bfcae2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 02:53:01 +1000 Subject: [PATCH 122/123] python312Packages.accelerate: 1.2.1 -> 1.3.0 (#374761) https://github.com/huggingface/accelerate/releases/tag/v1.3.0 --- pkgs/development/python-modules/accelerate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index dd2f90f912e1..ca17eda23dcb 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "accelerate"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; tag = "v${version}"; - hash = "sha256-KnFf6ge0vUR/C7Rh/c6ZttCGKo9OUIWCUYxk5O+OW7c="; + hash = "sha256-HcbvQL8nASsZcfjAoPbQKNoEkSLp5Vmus2MEa3Dv6Po="; }; buildInputs = [ llvmPackages.openmp ]; From 4d2949e87abb008b2acf33dd77408f063cac7015 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Jan 2025 03:13:19 +1000 Subject: [PATCH 123/123] python312Packages.gotenberg-client: 0.8.2 -> 0.9.0 (#374756) https://github.com/stumpylog/gotenberg-client/blob/0.9.0/CHANGELOG.md --- pkgs/development/python-modules/gotenberg-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index 7d5785eb90bd..2b4170463262 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.8.2"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; tag = version; - hash = "sha256-EMukzSY8nfm1L1metGhiEc9VqnI/vaLz7ITgbZi0fBw="; + hash = "sha256-4tIkwfqFKERVQMB9nGwGfdMtxCWm3q4hrSWnEqA0qd8="; }; nativeBuildInputs = [ hatchling ];