From 260439d50c66fc45bba0da5b754c1b943955cf9b Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Wed, 1 Oct 2025 10:18:17 +0200 Subject: [PATCH 01/28] woodpecker: add marcusramberg to maintainers --- .../tools/continuous-integration/woodpecker/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index daa6598b0184..265ce7bf2275 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -44,6 +44,7 @@ in license = licenses.asl20; maintainers = with maintainers; [ ambroisie + marcusramberg techknowlogick ]; }; From 7d76e6467629aa4c9ef911a6524ce7cc7d33557b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Oct 2025 00:31:53 +0000 Subject: [PATCH 02/28] tremotesf: 2.8.2 -> 2.9.0 --- pkgs/by-name/tr/tremotesf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/tremotesf/package.nix b/pkgs/by-name/tr/tremotesf/package.nix index 155e85c8ea34..8edfd17f6c6b 100644 --- a/pkgs/by-name/tr/tremotesf/package.nix +++ b/pkgs/by-name/tr/tremotesf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tremotesf"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "equeim"; repo = "tremotesf2"; tag = finalAttrs.version; - hash = "sha256-o6GSuRKO2LNpaFUuSu6VUeZN/blfpsz/piE7RZ47YfI="; + hash = "sha256-0nqdCf0rRPEf8O5ZuC2uYLSJavXIDhhiB3sNMryP3Jg="; # We need this for src/libtremotesf fetchSubmodules = true; }; From f8b2809cc50ceb5eb3bfe52d53d82671d07f3c45 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sun, 28 Sep 2025 16:13:09 +0200 Subject: [PATCH 03/28] mapnik: 4.1.1 -> 4.1.2 --- pkgs/by-name/ma/mapnik/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix index 974fa8c03a9a..1c96078be752 100644 --- a/pkgs/by-name/ma/mapnik/package.nix +++ b/pkgs/by-name/ma/mapnik/package.nix @@ -12,6 +12,7 @@ gdal, harfbuzz, icu, + libavif, libjpeg, libpng, libtiff, @@ -25,17 +26,18 @@ libpq, protozero, sparsehash, + openssl, }: stdenv.mkDerivation (finalAttrs: { pname = "mapnik"; - version = "4.1.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; tag = "v${finalAttrs.version}"; - hash = "sha256-+PCN3bjLGqfK4MF6fWApnSua4Pn/mKo2m9CY8/c5xC4="; + hash = "sha256-jbtVJHTAeKGpb6PtcK9Tt4qA6dsECwLSQG9JGsHJjvY="; fetchSubmodules = true; }; @@ -73,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { gdal (harfbuzz.override { withIcu = true; }) icu + libavif libjpeg libpng libtiff @@ -85,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { libpq protozero sparsehash + openssl ]; cmakeFlags = [ From bbfca0cdb7e4cf0f6b9a0e69fa030fc36ed86728 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sun, 5 Oct 2025 16:20:45 +0200 Subject: [PATCH 04/28] python3Packages.python-mapnik: update, but also mark as broken --- .../python-modules/python-mapnik/default.nix | 12 +- .../python-mapnik/find-libmapnik.patch | 35 ++-- .../python-mapnik_std_optional.patch | 176 ------------------ 3 files changed, 24 insertions(+), 199 deletions(-) delete mode 100644 pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 5fd085781c54..5a37c6cc8d32 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -24,18 +24,19 @@ sqlite, pytestCheckHook, sparsehash, + pybind11, }: buildPythonPackage rec { pname = "python-mapnik"; - version = "3.0.16-unstable-2024-02-22"; + version = "4.1.3.unstable-2025-09-25"; pyproject = true; src = fetchFromGitHub { owner = "mapnik"; repo = "python-mapnik"; - rev = "5ab32f0209909cc98c26e1d86ce0c8ef29a9bf3d"; - hash = "sha256-OqijA1WcyBcyWO8gntqp+xNIaV1Jqa0n1eMDip2OCvY="; + rev = "4b51d57911dc6a1a9f35c62c681fbdeb56fc69d4"; + hash = "sha256-oXxfLvmptW1v19vaUj11nGEcTHOrneBIea2+GB6uK48="; # Only needed for test data fetchSubmodules = true; }; @@ -46,9 +47,6 @@ buildPythonPackage rec { (replaceVars ./find-libmapnik.patch { libmapnik = "${mapnik}/lib"; }) - # Use `std::optional` rather than `boost::optional` - # https://github.com/mapnik/python-mapnik/commit/e9f88a95a03dc081826a69da67bbec3e4cccd5eb - ./python-mapnik_std_optional.patch ]; stdenv = python.stdenv; @@ -58,6 +56,7 @@ buildPythonPackage rec { nativeBuildInputs = [ mapnik # for mapnik_config pkg-config + pybind11 ]; dependencies = [ @@ -131,5 +130,6 @@ buildPythonPackage rec { homepage = "https://mapnik.org"; license = lib.licenses.lgpl21Plus; teams = [ lib.teams.geospatial ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/python-mapnik/find-libmapnik.patch b/pkgs/development/python-modules/python-mapnik/find-libmapnik.patch index cec557a2940a..c5a7477290f4 100644 --- a/pkgs/development/python-modules/python-mapnik/find-libmapnik.patch +++ b/pkgs/development/python-modules/python-mapnik/find-libmapnik.patch @@ -1,11 +1,12 @@ -diff --git a/build.py b/build.py -index 0f94826b6..3cceb4546 100644 ---- a/build.py -+++ b/build.py -@@ -110,8 +110,8 @@ py_env.AppendUnique(LIBS='mapnik-wkt') +diff --git i/build.py w/build.py +index 0f94826b6..5e91793f2 100644 +--- i/build.py ++++ w/build.py +@@ -109,9 +109,8 @@ py_env.AppendUnique(LIBS='mapnik-wkt') + _mapnik = py_env.LoadableModule('mapnik/_mapnik', sources, LDMODULEPREFIX='', LDMODULESUFFIX='.so') - Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) +-Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) -Depends(_mapnik, env.subst('../../src/json/libmapnik-json${LIBSUFFIX}')) -Depends(_mapnik, env.subst('../../src/wkt/libmapnik-wkt${LIBSUFFIX}')) +Depends(_mapnik, env.subst('@libmapnik@/libmapnikjson${LIBSUFFIX}')) @@ -13,18 +14,18 @@ index 0f94826b6..3cceb4546 100644 if 'uninstall' not in COMMAND_LINE_TARGETS: pymapniklib = env.Install(target_path,_mapnik) -diff --git a/setup.py b/setup.py -index 9985da5a2..5a03a1ec8 100755 ---- a/setup.py -+++ b/setup.py -@@ -118,8 +118,8 @@ linkflags.extend(check_output([mapnik_config, '--libs']).split(' ')) +diff --git i/setup.py w/setup.py +index 24ca0ec5e..bc2b1e0e0 100755 +--- i/setup.py ++++ w/setup.py +@@ -19,8 +19,8 @@ linkflags.extend(check_output([mapnik_config, '--libs']).split(' ')) linkflags.extend(check_output([mapnik_config, '--ldflags']).split(' ')) linkflags.extend(check_output([mapnik_config, '--dep-libs']).split(' ')) linkflags.extend([ --'-lmapnik-wkt', --'-lmapnik-json', -+'-lmapnikwkt', -+'-lmapnikjson', - ] + ['-l%s' % i for i in get_boost_library_names()]) +- '-lmapnik-wkt', +- '-lmapnik-json', ++ '-lmapnikwkt', ++ '-lmapnikjson', + ]) - # Dynamically make the mapnik/paths.py file + # Remove symlinks diff --git a/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch b/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch deleted file mode 100644 index c285e77ca57b..000000000000 --- a/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp -index 9add692c9..488427b56 100644 ---- a/src/mapnik_image.cpp -+++ b/src/mapnik_image.cpp -@@ -230,7 +230,7 @@ unsigned get_type(mapnik::image_any & im) - - std::shared_ptr open_from_file(std::string const& filename) - { -- boost::optional type = type_from_filename(filename); -+ auto type = type_from_filename(filename); - if (type) - { - std::unique_ptr reader(get_image_reader(filename,*type)); -diff --git a/src/mapnik_layer.cpp b/src/mapnik_layer.cpp -index 4fc7ea579..fbd277a81 100644 ---- a/src/mapnik_layer.cpp -+++ b/src/mapnik_layer.cpp -@@ -95,7 +95,7 @@ struct layer_pickle_suite : boost::python::pickle_suite - - std::vector & (mapnik::layer::*_styles_)() = &mapnik::layer::styles; - --void set_maximum_extent(mapnik::layer & l, boost::optional > const& box) -+void set_maximum_extent(mapnik::layer & l, std::optional > const& box) - { - if (box) - { -@@ -107,7 +107,7 @@ void set_maximum_extent(mapnik::layer & l, boost::optional - } - } - --void set_buffer_size(mapnik::layer & l, boost::optional const& buffer_size) -+void set_buffer_size(mapnik::layer & l, std::optional const& buffer_size) - { - if (buffer_size) - { -@@ -121,7 +121,7 @@ void set_buffer_size(mapnik::layer & l, boost::optional const& buffer_size) - - PyObject * get_buffer_size(mapnik::layer & l) - { -- boost::optional buffer_size = l.buffer_size(); -+ std::optional buffer_size = l.buffer_size(); - if (buffer_size) - { - #if PY_VERSION_HEX >= 0x03000000 -diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp -index 3587e5d8a..cfa523b03 100644 ---- a/src/mapnik_map.cpp -+++ b/src/mapnik_map.cpp -@@ -105,7 +105,7 @@ mapnik::featureset_ptr query_map_point(mapnik::Map const& m, int index, double x - return m.query_map_point(idx, x, y); - } - --void set_maximum_extent(mapnik::Map & m, boost::optional > const& box) -+void set_maximum_extent(mapnik::Map & m, std::optional > const& box) - { - if (box) - { -diff --git a/src/python_optional.hpp b/src/python_optional.hpp -index d690b7c51..9d86c340e 100644 ---- a/src/python_optional.hpp -+++ b/src/python_optional.hpp -@@ -28,7 +28,7 @@ - #include - #pragma GCC diagnostic pop - --// boost::optional to/from converter from John Wiegley -+// std::optional to/from converter from John Wiegley - - template - struct object_from_python -@@ -54,7 +54,7 @@ struct python_optional : public mapnik::util::noncopyable - { - struct optional_to_python - { -- static PyObject * convert(const boost::optional& value) -+ static PyObject * convert(const std::optional& value) - { - return (value ? boost::python::to_python_value()(*value) : - boost::python::detail::none()); -@@ -90,9 +90,9 @@ struct python_optional : public mapnik::util::noncopyable - data)->storage.bytes; - - if (data->convertible == source) // == None -- new (storage) boost::optional(); // A Boost uninitialized value -+ new (storage) std::optional(); // A Boost uninitialized value - else -- new (storage) boost::optional(*static_cast(data->convertible)); -+ new (storage) std::optional(*static_cast(data->convertible)); - - data->convertible = storage; - } -@@ -100,18 +100,18 @@ struct python_optional : public mapnik::util::noncopyable - - explicit python_optional() - { -- register_python_conversion, -+ register_python_conversion, - optional_to_python, optional_from_python>(); - } - }; - --// to/from boost::optional -+// to/from std::optional - template <> - struct python_optional : public mapnik::util::noncopyable - { - struct optional_to_python - { -- static PyObject * convert(const boost::optional& value) -+ static PyObject * convert(const std::optional& value) - { - return (value ? PyFloat_FromDouble(*value) : - boost::python::detail::none()); -@@ -133,30 +133,30 @@ struct python_optional : public mapnik::util::noncopyable - boost::python::converter::rvalue_from_python_stage1_data * data) - { - using namespace boost::python::converter; -- void * const storage = ((rvalue_from_python_storage > *) -+ void * const storage = ((rvalue_from_python_storage > *) - data)->storage.bytes; - if (source == Py_None) // == None -- new (storage) boost::optional(); // A Boost uninitialized value -+ new (storage) std::optional(); // A Boost uninitialized value - else -- new (storage) boost::optional(PyFloat_AsDouble(source)); -+ new (storage) std::optional(PyFloat_AsDouble(source)); - data->convertible = storage; - } - }; - - explicit python_optional() - { -- register_python_conversion, -+ register_python_conversion, - optional_to_python, optional_from_python>(); - } - }; - --// to/from boost::optional -+// to/from std::optional - template <> - struct python_optional : public mapnik::util::noncopyable - { - struct optional_to_python - { -- static PyObject * convert(const boost::optional& value) -+ static PyObject * convert(const std::optional& value) - { - if (value) - { -@@ -181,13 +181,13 @@ struct python_optional : public mapnik::util::noncopyable - boost::python::converter::rvalue_from_python_stage1_data * data) - { - using namespace boost::python::converter; -- void * const storage = ((rvalue_from_python_storage > *) -+ void * const storage = ((rvalue_from_python_storage > *) - data)->storage.bytes; - if (source == Py_None) // == None -- new (storage) boost::optional(); // A Boost uninitialized value -+ new (storage) std::optional(); // A Boost uninitialized value - else - { -- new (storage) boost::optional(source == Py_True ? true : false); -+ new (storage) std::optional(source == Py_True ? true : false); - } - data->convertible = storage; - } -@@ -195,7 +195,7 @@ struct python_optional : public mapnik::util::noncopyable - - explicit python_optional() - { -- register_python_conversion, -+ register_python_conversion, - optional_to_python, optional_from_python>(); - } - }; From 290009efa068a8de914f6cb83ecb4845195fcbdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Oct 2025 07:14:15 +0000 Subject: [PATCH 05/28] python3Packages.google-cloud-audit-log: 0.3.2 -> 0.3.3 --- .../python-modules/google-cloud-audit-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 23d6c539ae75..9030ad546d59 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_audit_log"; inherit version; - hash = "sha256-JZjxUzp9fN1se/RIwS5VGcHVMWLXh4ThC83R32d5G8M="; + hash = "sha256-zKeB4fG1SY3xgyoLaDqZ6GwAsxAVu77vMAI4H3qWpj8="; }; build-system = [ setuptools ]; From 0a85182b8ee5b1b638e6b4098a336a61d648d7d9 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 24 Sep 2025 15:34:27 +0000 Subject: [PATCH 06/28] radarr: 5.26.2.10099 -> 5.28.0.10274 --- pkgs/by-name/ra/radarr/deps.json | 20 ++++++++++---------- pkgs/by-name/ra/radarr/package.nix | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ra/radarr/deps.json b/pkgs/by-name/ra/radarr/deps.json index 1e6e67cd9b4a..1ee2e50d8f9a 100644 --- a/pkgs/by-name/ra/radarr/deps.json +++ b/pkgs/by-name/ra/radarr/deps.json @@ -98,13 +98,13 @@ }, { "pname": "Microsoft.AspNetCore.Cryptography.Internal", - "version": "8.0.16", - "hash": "sha256-uw/5GAPpefPeMrfG69EBOVciSHxBKs0E8Txkf+rttzs=" + "version": "8.0.17", + "hash": "sha256-CS/I8fajxwimZC2WNpN5ai/hEVU6Pk4El8hKNr/QgfU=" }, { "pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation", - "version": "8.0.16", - "hash": "sha256-Zpt7vlY0xdrk/6XDRtXb0t9MK6SiPP6sr3fC6gQ1/YQ=" + "version": "8.0.17", + "hash": "sha256-fXjTm7dua1WoGVSkGX6swTFvsNwdhAJvI3Y6onrR3p4=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -599,8 +599,8 @@ }, { "pname": "Polly", - "version": "8.5.2", - "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA=" + "version": "8.6.0", + "hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk=" }, { "pname": "Polly.Contrib.WaitAndRetry", @@ -609,8 +609,8 @@ }, { "pname": "Polly.Core", - "version": "8.5.2", - "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk=" + "version": "8.6.0", + "hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8=" }, { "pname": "RestSharp", @@ -970,8 +970,8 @@ }, { "pname": "SixLabors.ImageSharp", - "version": "3.1.9", - "hash": "sha256-sB1wGc419iqT+Stm+RFMFhBy3LM0YnHhrgmhYiGlf4Q=" + "version": "3.1.11", + "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA=" }, { "pname": "Swashbuckle.AspNetCore.Annotations", diff --git a/pkgs/by-name/ra/radarr/package.nix b/pkgs/by-name/ra/radarr/package.nix index aa83432435fd..e01f9f751848 100644 --- a/pkgs/by-name/ra/radarr/package.nix +++ b/pkgs/by-name/ra/radarr/package.nix @@ -21,7 +21,7 @@ applyPatches, }: let - version = "5.26.2.10099"; + version = "5.28.0.10274"; # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass # the already patched lockfile to `fetchYarnDeps`. src = applyPatches { @@ -29,7 +29,7 @@ let owner = "Radarr"; repo = "Radarr"; tag = "v${version}"; - hash = "sha256-7tU9oxE1F/dcR5bwb/qHyux3WA6lEwdozLloDgOMVbU="; + hash = "sha256-iETtSByI9VjZdVjFHdfDcfSHUGz5Es8K8/HiB99KUqc="; }; postPatch = '' mv src/NuGet.config NuGet.Config @@ -41,12 +41,12 @@ let # However, the patches cleanly apply to v5 as well. (fetchpatch { name = "dotnet8-compatibility"; - url = "https://github.com/Radarr/Radarr/commit/490891c63de589604bdc3373cfc85068c3826648.patch"; - hash = "sha256-SCP7MPUkEZLSrls8ouekSXpXdgAJTwNFPirHjaMkQ6s="; + url = "https://github.com/Radarr/Radarr/commit/2235823af313ea1f39fd1189b69a75fc5d380c41.patch"; + hash = "sha256-3YgQV4xc2i5DNWp2KxVz6M5S8n//a/Js7pckGZ06fWc="; }) (fetchpatch { name = "dotnet8-darwin-compatibility"; - url = "https://github.com/Radarr/Radarr/commit/f38a129289c49a242d8901dc2f041f9dc8bfc303.patch"; + url = "https://github.com/Radarr/Radarr/commit/2a886fb26a70b4d48a4ad08d7ee23e5e4d81f522.patch"; hash = "sha256-SAMUHqlSj8FPq20wY8NWbRytVZXTPtMXMfM3CoM8kSA="; }) ]; From 35e6c18779d2d7dd38857488beca575ced2b6835 Mon Sep 17 00:00:00 2001 From: Jaco Malan Date: Fri, 10 Oct 2025 10:25:51 +0200 Subject: [PATCH 07/28] monero-cli: 0.18.4.2 -> 0.18.4.3 --- pkgs/by-name/mo/monero-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix index 10734346d211..4ee8dbcf918a 100644 --- a/pkgs/by-name/mo/monero-cli/package.nix +++ b/pkgs/by-name/mo/monero-cli/package.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.4.2"; + version = "0.18.4.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - hash = "sha256-ibwcvEHlJkMjXoJQMPVrlir5irdclJsmV7aBB4/m190="; + hash = "sha256-tu8PHTiz3ScJ0uQh1ztkFmEthjb+BERtPMxCyQhuZPw="; }; patches = [ From 7d07fbe6b3a97bf5f7ca82dad6cb236cb4c8cd98 Mon Sep 17 00:00:00 2001 From: Jaco Malan Date: Fri, 10 Oct 2025 10:31:27 +0200 Subject: [PATCH 08/28] monero-gui: 0.18.4.2 -> 0.18.4.3 --- pkgs/by-name/mo/monero-gui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix index 4d56bd6bec84..a607427dda0e 100644 --- a/pkgs/by-name/mo/monero-gui/package.nix +++ b/pkgs/by-name/mo/monero-gui/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.4.2"; + version = "0.18.4.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - hash = "sha256-FKQrB47q791lDaomI5A10qw1oGh5zp9TFPpFoX2ZAmc="; + hash = "sha256-uByiwIyR1pVmIrmu0Jdwb7aZE07hop4bP+PuEvJaIrE="; }; nativeBuildInputs = [ From 110a0716436fc289ed97d6e31af0da8a7761e8b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Oct 2025 21:33:54 +0200 Subject: [PATCH 09/28] python313Packages.google-cloud-audit-log: remove disabled --- .../python-modules/google-cloud-audit-log/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 9030ad546d59..8d86a1a35601 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -4,7 +4,6 @@ fetchPypi, googleapis-common-protos, protobuf, - pythonOlder, setuptools, }: @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "0.3.3"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "google_cloud_audit_log"; inherit version; From ab469756cd796eea820a1ed0f6488347d9316e7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Oct 2025 02:40:29 +0000 Subject: [PATCH 10/28] git-statuses: 0.6.1 -> 0.6.2 --- pkgs/by-name/gi/git-statuses/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-statuses/package.nix b/pkgs/by-name/gi/git-statuses/package.nix index 52d66ddce23b..530328726196 100644 --- a/pkgs/by-name/gi/git-statuses/package.nix +++ b/pkgs/by-name/gi/git-statuses/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-statuses"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "bircni"; repo = "git-statuses"; tag = finalAttrs.version; - hash = "sha256-phGEp9wo46owe47H+XjfDD5OlcN8cGr1oaeYMpkWies="; + hash = "sha256-ZjlLpPFd+T3NIK2lrzaCfNI7308n3wOco+scGJhxFNI="; }; - cargoHash = "sha256-yG5oSwnhoFVbwdTteRgW1ljVmTnxoh8l4gG/pGuRmic="; + cargoHash = "sha256-30WX9dCvrjvPUhn2oIn6unAWEkTB8U2mCEXmixYVIkk="; # Needed to get openssl-sys to use pkg-config. env.OPENSSL_NO_VENDOR = 1; From e3b332a1ab4c840746d8dcdee46fc4a770048280 Mon Sep 17 00:00:00 2001 From: Minegame YTB <53137994+minegameYTB@users.noreply.github.com> Date: Sun, 12 Oct 2025 14:07:08 +0200 Subject: [PATCH 11/28] tagainijisho: fix build with cmake 4 --- .../office/tagainijisho/0000-fix-cmake-min.patch | 15 +++++++++++++++ pkgs/applications/office/tagainijisho/default.nix | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/office/tagainijisho/0000-fix-cmake-min.patch diff --git a/pkgs/applications/office/tagainijisho/0000-fix-cmake-min.patch b/pkgs/applications/office/tagainijisho/0000-fix-cmake-min.patch new file mode 100644 index 000000000000..2c29318ae69e --- /dev/null +++ b/pkgs/applications/office/tagainijisho/0000-fix-cmake-min.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3816f7..81116dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,8 +19,8 @@ set(VERSION 1.2.2) + set(QTVERSION 5.12) + set(CMAKE_AUTOMOC ON) + +-cmake_minimum_required(VERSION 2.8.12) +-cmake_policy(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.10) ++cmake_policy(VERSION 3.10) + + find_package(Qt5 ${QTVERSION} REQUIRED COMPONENTS Core Widgets PrintSupport Network LinguistTools) + diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 6915ded792e5..810b2ece536d 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94="; }; + patches = [ + ### Fix cmake minimum version + ./0000-fix-cmake-min.patch + ]; + nativeBuildInputs = [ qttools cmake From 679cb08da2f33b4c196551d89f7e2d816dee6382 Mon Sep 17 00:00:00 2001 From: azahi Date: Sun, 12 Oct 2025 18:47:22 +0300 Subject: [PATCH 12/28] opengothic: fix build with cmake4 --- pkgs/by-name/op/opengothic/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/op/opengothic/package.nix b/pkgs/by-name/op/opengothic/package.nix index b7871008cd5d..5a4392008424 100644 --- a/pkgs/by-name/op/opengothic/package.nix +++ b/pkgs/by-name/op/opengothic/package.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "-Werror" "" ''; + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; + postFixup = '' wrapProgram $out/bin/Gothic2Notr \ --set LD_PRELOAD "${lib.getLib alsa-lib}/lib/libasound.so.2" From 3d3e330ee7f718311a1a89c980d605f1f29827d4 Mon Sep 17 00:00:00 2001 From: Minegame YTB <53137994+minegameYTB@users.noreply.github.com> Date: Sun, 12 Oct 2025 19:03:22 +0200 Subject: [PATCH 13/28] dreamchess: fix build with cmake 4 --- pkgs/by-name/dr/dreamchess/0000-fix-cmake-min.patch | 10 ++++++++++ pkgs/by-name/dr/dreamchess/package.nix | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/by-name/dr/dreamchess/0000-fix-cmake-min.patch diff --git a/pkgs/by-name/dr/dreamchess/0000-fix-cmake-min.patch b/pkgs/by-name/dr/dreamchess/0000-fix-cmake-min.patch new file mode 100644 index 000000000000..c818cfadb3ac --- /dev/null +++ b/pkgs/by-name/dr/dreamchess/0000-fix-cmake-min.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a007f60..a993999 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.2) ++cmake_minimum_required(VERSION 3.10) + project(DreamChess VERSION 0.3.0) + + set(DREAMCHESS_RELEASE TRUE) diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix index 25ad30bef91b..d53a874d8d91 100644 --- a/pkgs/by-name/dr/dreamchess/package.nix +++ b/pkgs/by-name/dr/dreamchess/package.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-qus/RjwdAl9SuDXfLVKTPImqrvPF3xSDVlbXYLM3JNE="; }; + patches = [ + ### Fix cmake minimum version + ./0000-fix-cmake-min.patch + ]; + buildInputs = [ SDL2 SDL2_image From b3c05dcce970bbcc4ed9fce0efa19777067ea598 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Oct 2025 19:58:46 +0200 Subject: [PATCH 14/28] python313Packages.iamdata: 0.1.202510101 -> 0.1.202510121 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510101...v0.1.202510121 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202510121 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index f94cd8aa7e1e..e2a88bdd2ddd 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202510101"; + version = "0.1.202510121"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-/w2DDDjrEGwskvtP0v3w+xKNDCoJpeVQpHS38jFnfE8="; + hash = "sha256-JmVT8miQXDV9QZCj3IhYNFY5Bdn8Du13vM6jtiENYO4="; }; build-system = [ hatchling ]; From 4f593430f3b65dd235db3caea4ea51acd0eac242 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 18:33:55 +0000 Subject: [PATCH 15/28] quarkus: 3.28.2 -> 3.28.3 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index fc557f4fa5e8..b86793c4208e 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.28.2"; + version = "3.28.3"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-d5OrUShc8TKJAcFd0Y3Cu1nkuj+dJBOg5uCrEbssNyw="; + hash = "sha256-ulB6jy3J1vKe1rO17p8Vw0V8C/sDcXYcuu6b2e3L6Ps="; }; nativeBuildInputs = [ makeWrapper ]; From 08fc37d4f44a6e3a08e6ebbceb83451ec639900a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 21:20:18 +0000 Subject: [PATCH 16/28] postgresqlPackages.pg_partman: 5.2.4 -> 5.3.0 --- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 34bc3ae934c6..0fee40dfa741 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_partman"; - version = "5.2.4"; + version = "5.3.0"; src = fetchFromGitHub { owner = "pgpartman"; repo = "pg_partman"; tag = "v${finalAttrs.version}"; - hash = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w="; + hash = "sha256-Lib7UY06qjv95ndwx3sjPBcL5MtsLNx8IVOpZ1CgDG8="; }; meta = { From 82a8b2ccc47db01908b316565fb96828d8020bdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 22:02:22 +0000 Subject: [PATCH 17/28] werf: 2.47.8 -> 2.49.0 --- pkgs/by-name/we/werf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index c05ac0118f50..60ff9bb9cdc4 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.47.8"; + version = "2.49.0"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-1F/Gy5bKq+08aJaNM5XdI8/z2A6p+4UL+Rf/NXhtWlU="; + hash = "sha256-K999EgTbyQeLO1xm94WeOAQ5Ld3stOuAI4LGs4fSU5g="; }; proxyVendor = true; - vendorHash = "sha256-bmHnpADqmJXMJvPRv7WpnafgPg+ZlwfsvXKdAxW5Ovg="; + vendorHash = "sha256-Vjce/pmFRusBOJEQjgrlhS4LPlOy4nOWwCm7o5BB+OQ="; subPackages = [ "cmd/werf" ]; From 4d353ebade5b31bab6851ec389da97a427544b78 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 13 Oct 2025 00:12:11 +0200 Subject: [PATCH 18/28] ballerbug: 1.2.0 -> 1.2.3 --- pkgs/by-name/ba/ballerburg/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/ballerburg/package.nix b/pkgs/by-name/ba/ballerburg/package.nix index 67a6d9e1a825..b6672185b6dc 100644 --- a/pkgs/by-name/ba/ballerburg/package.nix +++ b/pkgs/by-name/ba/ballerburg/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchgit, cmake, SDL, makeDesktopItem, @@ -19,11 +20,12 @@ let in stdenv.mkDerivation rec { pname = "ballerburg"; - version = "1.2.0"; + version = "1.2.3"; - src = fetchurl { - url = "https://download.tuxfamily.org/baller/ballerburg-${version}.tar.gz"; - sha256 = "sha256-BiX0shPBGA8sshee8rxs41x+mdsrJzBqhpDDic6sYwA="; + src = fetchgit { + url = "https://framagit.org/baller/ballerburg.git"; + tag = "v${version}"; + hash = "sha256-4rO7ixLE+EV6zd0EryHU6QZeVoa6N4fvxwoJWa0aO70="; }; nativeBuildInputs = [ From 6853f4a2b4331acf09abfc1d96e9f8512a98df97 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 13 Oct 2025 00:13:33 +0200 Subject: [PATCH 19/28] ballerbug: modernize --- pkgs/by-name/ba/ballerburg/package.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ba/ballerburg/package.nix b/pkgs/by-name/ba/ballerburg/package.nix index b6672185b6dc..1c3a003b68aa 100644 --- a/pkgs/by-name/ba/ballerburg/package.nix +++ b/pkgs/by-name/ba/ballerburg/package.nix @@ -11,20 +11,18 @@ }: let - icon = fetchurl { url = "https://baller.tuxfamily.org/king.png"; - sha256 = "1xq2h87s648wjpjl72ds3xnnk2jp8ghbkhjzh2g4hpkq2zdz90hy"; + hash = "sha256-HoL02xd4XkiegF/CueBDV4ppbR+6iUPllRwRow+CAvc="; }; - in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ballerburg"; version = "1.2.3"; src = fetchgit { url = "https://framagit.org/baller/ballerburg.git"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4rO7ixLE+EV6zd0EryHU6QZeVoa6N4fvxwoJWa0aO70="; }; @@ -41,7 +39,7 @@ stdenv.mkDerivation rec { name = "Ballerburg"; desktopName = "Ballerburg SDL"; exec = "_NET_WM_ICON=ballerburg ballerburg"; - comment = meta.description; + comment = finalAttrs.meta.description; icon = "ballerburg"; categories = [ "Game" ]; }) @@ -57,15 +55,15 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "Classic cannon combat game"; mainProgram = "ballerburg"; longDescription = '' Two castles, separated by a mountain, try to defeat each other with their cannonballs, either by killing the opponent's king or by weakening the opponent enough so that the king capitulates.''; homepage = "https://baller.tuxfamily.org/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.j0hax ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ j0hax ]; + platforms = lib.platforms.all; }; -} +}) From 7d261be146eeb33bd4a2ff528c7f46edc0fcc74b Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Wed, 1 Oct 2025 10:18:52 +0200 Subject: [PATCH 20/28] woodpecker-plugin-git: add marcusramberg to maintainers --- pkgs/by-name/wo/woodpecker-plugin-git/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix index 74e6a9efcad7..c36584680e10 100644 --- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix +++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix @@ -38,6 +38,9 @@ buildGoModule rec { changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}"; license = lib.licenses.asl20; mainProgram = "plugin-git"; - maintainers = with lib.maintainers; [ ambroisie ]; + maintainers = with lib.maintainers; [ + ambroisie + marcusramberg + ]; }; } From 5269799dae898cd81cf264d8aeede13f11301b50 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Wed, 1 Oct 2025 10:19:07 +0200 Subject: [PATCH 21/28] nixos/woodpecker: add marcusramberg to maintainers --- .../services/continuous-integration/woodpecker/agents.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/woodpecker/agents.nix b/nixos/modules/services/continuous-integration/woodpecker/agents.nix index 2d345417e118..843ed362a7a9 100644 --- a/nixos/modules/services/continuous-integration/woodpecker/agents.nix +++ b/nixos/modules/services/continuous-integration/woodpecker/agents.nix @@ -110,7 +110,10 @@ let }; in { - meta.maintainers = with lib.maintainers; [ ambroisie ]; + meta.maintainers = with lib.maintainers; [ + ambroisie + marcusramberg + ]; options = { services.woodpecker-agents = { From 2f0b2a342efd4da6ae8ff1e1e3102f30b56f40de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 23:47:06 +0000 Subject: [PATCH 22/28] vimPlugins.avante-nvim: 0.0.27-unstable-2025-10-06 -> 0.0.27-unstable-2025-10-12 --- .../vim/plugins/non-generated/avante-nvim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 3306f40022b8..daf7f0cfd8f5 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2025-10-06"; + version = "0.0.27-unstable-2025-10-12"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "a7052aca0bdfb93e524f0536ac80e6c542962f47"; - hash = "sha256-crtzBzRcpuqQdqymUJMAxky1Lfk+6YY0YifThHXz7Rw="; + rev = "f092bb3ec0acf87b838e082209b6a7eddcbf5940"; + hash = "sha256-zKDp9It/VgUD8BN5ktTmfbQX0s3SBo20T8no8nwsyfY="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; From bc72af44985db5d3c88ffbe12f1910525f259e0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 00:35:48 +0000 Subject: [PATCH 23/28] python3Packages.ultralytics: 8.3.205 -> 8.3.213 --- pkgs/development/python-modules/ultralytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index c7f020721ec4..3bba38a94899 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "ultralytics"; - version = "8.3.205"; + version = "8.3.213"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "ultralytics"; tag = "v${version}"; - hash = "sha256-+vJMSqJYUHNEFJhK0BUC2NkKwhady3gYdASGkbwZRxY="; + hash = "sha256-xlsC+sENv4xhKf0H+h1Kd9AyRE2KEVCRL91BMhH1wA4="; }; build-system = [ setuptools ]; From ca5d447ca9c6495ea7398f7d59aef981da39fc78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 01:03:40 +0000 Subject: [PATCH 24/28] sgt-puzzles: 20250926.e00cb46 -> 20251011.d928126 --- pkgs/by-name/sg/sgt-puzzles/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix index 268180b5fdda..d4922c96a5b9 100644 --- a/pkgs/by-name/sg/sgt-puzzles/package.nix +++ b/pkgs/by-name/sg/sgt-puzzles/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sgt-puzzles"; - version = "20250926.e00cb46"; + version = "20251011.d928126"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz"; - hash = "sha256-CsMrhYpaTRMz364kt5b/bCY67PCoYwS50Fxw8mi2QCY="; + hash = "sha256-/Iazd5voyNRocz68qILv5NoytZehKFX40a2vr+7YKqE="; }; sgt-puzzles-menu = fetchurl { From d443501cb0c57c5604aef8c0bfb39c91ebadb440 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Sun, 12 Oct 2025 22:31:28 -0700 Subject: [PATCH 25/28] pgit: init at 1.1.0 --- pkgs/by-name/pg/pgit/package.nix | 49 ++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/pg/pgit/package.nix diff --git a/pkgs/by-name/pg/pgit/package.nix b/pkgs/by-name/pg/pgit/package.nix new file mode 100644 index 000000000000..e464b2e6a53d --- /dev/null +++ b/pkgs/by-name/pg/pgit/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + runCommand, + git, # for passthru tests + pgit, # for passthru tests +}: + +buildGoModule (finalAttrs: { + pname = "pgit"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "picosh"; + repo = "pgit"; + rev = "v${finalAttrs.version}"; + hash = "sha256-81ZiaY973+mGnYbDX+6fhe9NTYjQhWsvdpW0v42pasw="; + }; + + vendorHash = "sha256-in8GVcOlGsvmcbegJmYwvE0AVJhVJ83x1v3ymV0uTpg="; + + passthru.tests.smoke = + runCommand "pgit-smoke-test" + { + buildInputs = [ git ]; + } + '' + ${lib.getExe git} init -b smoke + ${lib.getExe git} config --local user.name "Nick Spackages" + ${lib.getExe git} config --local user.email "nixbld@localhost" + echo "Read me please" > README + ${lib.getExe git} add README + ${lib.getExe git} commit -m "First commit" + ${lib.getExe pgit} -desc "The description" -revs smoke -repo . -out ./public + grep "The description" ./public/index.html + grep "First commit" ./public/logs/smoke/index.html + grep "Read me please" ./public/tree/smoke/item/README.html + touch $out + ''; + + meta = with lib; { + description = "static site generator for git"; + homepage = "https://pgit.pico.sh/"; + license = licenses.mit; + mainProgram = "pgit"; + maintainers = with maintainers; [ jaculabilis ]; + }; +}) From 5185ee5209f2e890b540feae88faf5cbdae87cb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 05:47:54 +0000 Subject: [PATCH 26/28] python3Packages.pyoverkiz: 1.18.2 -> 1.19.0 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 11c9d59b119f..2ecc7ceaf856 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.18.2"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; tag = "v${version}"; - hash = "sha256-kGcDZp1oLkjHy/+iAdnsAceSY+jX9+hw3mFxCaT18YA="; + hash = "sha256-Iur39lUkHBd0VaP5YB36o04D8aY371BeSZ07iN7A9Wk="; }; build-system = [ hatchling ]; From 4fce4c99f7b607a034f7b195465f16ab093fbcef Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 8 Oct 2025 16:06:50 +0200 Subject: [PATCH 27/28] ruby: disable yjit on cross MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix `nix build .#pkgsCross.aarch64-multiplatform.ruby` failing with: ``` partial linking yjit/target/release/libyjit.a into yjit/target/release/libyjit.o /nix/store/…/bin/aarch64-unknown-linux-gnu-ld: yjit/target/release/libyjit.a(yjit.1fllkjkj80qowi7xzzkaw1xy8.rcgu.o): Relocations in generic ELF (EM: 62) /nix/store/…/bin/aarch64-unknown-linux-gnu-ld: yjit/target/release/libyjit.a(yjit.1fllkjkj80qowi7xzzkaw1xy8.rcgu.o): Relocations in generic ELF (EM: 62) /nix/store/…/bin/aarch64-unknown-linux-gnu-ld: yjit/target/release/libyjit.a(yjit.1fllkjkj80qowi7xzzkaw1xy8.rcgu.o): error adding symbols: file in wrong format ``` Co-authored-by: Sandro --- pkgs/development/interpreters/ruby/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d01980ee3a91..17f0f3df04e1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -57,9 +57,13 @@ let }: let ver = version; + isCross = stdenv.buildPlatform != stdenv.hostPlatform; # https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21 yjitSupported = - stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64); + !isCross + && ( + stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64) + ); rubyDrv = lib.makeOverridable ( { stdenv, From bd94f7510917bdcb974d2d68c72382cc569a610f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 07:10:56 +0000 Subject: [PATCH 28/28] zapret: 71.4 -> 72 --- pkgs/by-name/za/zapret/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 9908898a71ef..1bb54c54e980 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret"; - version = "71.4"; + version = "72"; src = fetchFromGitHub { owner = "bol-van"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; tag = "v${finalAttrs.version}"; - hash = "sha256-n7UasKtoQ4zfy2ho2vOREb0RPrDnhjYYbXcXTjelDvg="; + hash = "sha256-u9vtxkFxh7JK6Zb/IuS4qldf8ysDYospqOEuPObGyps="; }; buildInputs = [