From 873854efc03f13f9cff80963a5b4d483934a81e1 Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 5 Sep 2025 01:47:00 +0000 Subject: [PATCH 01/24] flutter335: 3.35.2 -> 3.35.3 --- .../compilers/flutter/versions/3_35/data.json | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json index 94de9bf9b4d5..fd02a6dbb4a9 100644 --- a/pkgs/development/compilers/flutter/versions/3_35/data.json +++ b/pkgs/development/compilers/flutter/versions/3_35/data.json @@ -1,73 +1,73 @@ { - "version": "3.35.2", - "engineVersion": "a8bfdfc394deaed5c57bd45a64ac4294dc976a72", + "version": "3.35.3", + "engineVersion": "ddf47dd3ff96dbde6d9c614db0d7f019d7c7a2b7", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY=", - "x86_64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY=" + "aarch64-linux": "sha256-f5RFYSG6LLz1Yt6EE7ETpcLDxlQ0Bm6b5FiLh39lbpY=", + "x86_64-linux": "sha256-f5RFYSG6LLz1Yt6EE7ETpcLDxlQ0Bm6b5FiLh39lbpY=" }, "x86_64-linux": { - "aarch64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w=", - "x86_64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w=" + "aarch64-linux": "sha256-vwEIm64Dwwhmo6L2fKKDNWa/uIyVfL/eCLJK7eob6lQ=", + "x86_64-linux": "sha256-vwEIm64Dwwhmo6L2fKKDNWa/uIyVfL/eCLJK7eob6lQ=" } }, - "dartVersion": "3.9.0", + "dartVersion": "3.9.2", "dartHash": { - "x86_64-linux": "sha256-25hZuxVDfu5/8PIlfHKoeLXpESBtoGc9F3kSV56E7UA=", - "aarch64-linux": "sha256-EbxZlvvjxDUskxH0Rtxd8KOLakguucFjI7+A5Z28V+w=", - "x86_64-darwin": "sha256-JNN27p/a9+7xcIkrLLM2Tuyih5R2Q0YibXqcm3QXc8U=", - "aarch64-darwin": "sha256-VG0o4b0dPTXQmABr3+iO+xv/2IcXFt018CQYnD4kXAs=" + "x86_64-linux": "sha256-ZJcii2WBCE4PNt5+S2nH4hj+WoZuhRLFkzMlSZEa01Y=", + "aarch64-linux": "sha256-EzNApYsHor1suB9dFgJuewMqa0v7cADKLUzLym5GLOY=", + "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=", + "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw=" }, - "flutterHash": "sha256-g9g10WVf7CNoXYN8DVsWRK9N2Gz/2iQufMiQkJC35ZA=", + "flutterHash": "sha256-OXyciVucxYnb+d8IO1Sb0/47hlygnSoA+N8YtJw7ES8=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=", - "aarch64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY=", - "x86_64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=", - "x86_64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY=" + "aarch64-darwin": "sha256-j07VOm7nabzb9nA0L3I/Ojc0murKgIrX+n4t8CaOWUU=", + "aarch64-linux": "sha256-p0DktS367Iof8Wpy4ODojQBIeVyKClWnh0WjjUUbl+E=", + "x86_64-darwin": "sha256-j07VOm7nabzb9nA0L3I/Ojc0murKgIrX+n4t8CaOWUU=", + "x86_64-linux": "sha256-p0DktS367Iof8Wpy4ODojQBIeVyKClWnh0WjjUUbl+E=" }, "fuchsia": { - "aarch64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=", - "aarch64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=", - "x86_64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=", - "x86_64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=" + "aarch64-darwin": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=", + "aarch64-linux": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=", + "x86_64-darwin": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=", + "x86_64-linux": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=" }, "ios": { - "aarch64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=", - "aarch64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=", - "x86_64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=", - "x86_64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=" + "aarch64-darwin": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=", + "aarch64-linux": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=", + "x86_64-darwin": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=", + "x86_64-linux": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=" }, "linux": { - "aarch64-darwin": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=", - "aarch64-linux": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=", - "x86_64-darwin": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI=", - "x86_64-linux": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI=" + "aarch64-darwin": "sha256-IjaOmgSzh5bt2IPgrFKBCptToAFS68Lb/6JUib3efXE=", + "aarch64-linux": "sha256-IjaOmgSzh5bt2IPgrFKBCptToAFS68Lb/6JUib3efXE=", + "x86_64-darwin": "sha256-TSkUrQPG6B9vUevlhB7fQfslSGTIY+epzwRM8l72hYc=", + "x86_64-linux": "sha256-TSkUrQPG6B9vUevlhB7fQfslSGTIY+epzwRM8l72hYc=" }, "macos": { - "aarch64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=", - "aarch64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=", - "x86_64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=", - "x86_64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=" + "aarch64-darwin": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=", + "aarch64-linux": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=", + "x86_64-darwin": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=", + "x86_64-linux": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=" }, "universal": { - "aarch64-darwin": "sha256-Nv36HXVFlpGTmWlobDiMJczVIgUShvoVi8dqAWpbkJM=", - "aarch64-linux": "sha256-SlB09ZiXtz3DJSiv9gTy4ogHpJ9JRVzgy2nmqqmGMYs=", - "x86_64-darwin": "sha256-yZbzy+DNREPxzZ/F6BdjmQoOrUE+5rIw6E4CuUePPWQ=", - "x86_64-linux": "sha256-AdA1xjD5nkBTzp7k1FLe218FD9o1aSJHZx1nOyhneGY=" + "aarch64-darwin": "sha256-QB6x399cf7FI5xJS25D3xQsprYMvqdOqs3R2GQwzB0I=", + "aarch64-linux": "sha256-ywTLTRvqZgLqSXSTS/axyGGWsUvMd76KQmz5p/cZhSY=", + "x86_64-darwin": "sha256-mCmTvirTGovEAaYKgYYkK8WJ9ntZMLshDLNrViPxf8U=", + "x86_64-linux": "sha256-hfngQ8yKVEgRDnE1JfBGUPf11u3IKNgag3Yx1/AWfSQ=" }, "web": { - "aarch64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=", - "aarch64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=", - "x86_64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=", - "x86_64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=" + "aarch64-darwin": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=", + "aarch64-linux": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=", + "x86_64-darwin": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=", + "x86_64-linux": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=" }, "windows": { - "x86_64-darwin": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o=", - "x86_64-linux": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o=" + "x86_64-darwin": "sha256-SkBxiYhGp1EMQ8MH92QrDlbgrvsJLHuBs1NVaOxSAfc=", + "x86_64-linux": "sha256-SkBxiYhGp1EMQ8MH92QrDlbgrvsJLHuBs1NVaOxSAfc=" } }, "pubspecLock": { @@ -346,11 +346,11 @@ "dependency": "direct main", "description": { "name": "dwds", - "sha256": "b2f7e3241de2adbd5caa87ae9d05a0f9c59b9cbb8c77aeaeebf6c277821f25d5", + "sha256": "285736451c8e646ea99c50a6c47cde65d0eea55f0e1a995b5474b849d04af3ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "24.4.0+1" + "version": "24.4.0+2" }, "extension_discovery": { "dependency": "direct main", From 8a5c4598d8cbd0ea57bd37e0cd5141e7f3984b67 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 4 Sep 2025 12:46:36 +0200 Subject: [PATCH 02/24] lib/types: either allow unchecked values again This fixes a slight regression of the either type Where it allowed access to any value when used in freeformType --- lib/types.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 6b51f9254a00..c7136de7f2a6 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1453,7 +1453,12 @@ let headError = { message = "The option `${showOption loc}` is neither a value of type `${t1.description}` nor `${t2.description}`, Definition values: ${showDefs defs}"; }; - value = abort "(t.merge.v2 defs).value must only be accessed when `.headError == null`. This is a bug in code that consumes a module system type."; + value = lib.warn '' + One or more definitions did not pass the type-check of the 'either' type. + ${headError.message} + If `either`, `oneOf` or similar is used in freeformType, ensure that it is preceded by an 'attrsOf' such as: `freeformType = types.attrsOf (types.either t1 t2)`. + Otherwise consider using the correct type for the option `${showOption loc}`. This will be an error in Nixpkgs 26.06. + '' (mergeOneOption loc defs); }; in checkedAndMerged; From d4167f57ffab4f57127a7a2f58e0427b426c26a9 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 1 Sep 2025 11:22:30 +0200 Subject: [PATCH 03/24] lib/types: add deprecation note about freeform behavior of 'either' --- doc/release-notes/rl-2511.section.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index a62e6bc0c001..e538373e8e2c 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -176,8 +176,13 @@ ### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations} -- Create the first release note entry in this section! +- `types.either` silently accepted mismatching types when used in `freeformType`. Module maintainers should fix the used type + In most cases wrapping `either` with `attrsOf` should be sufficient. + Since types.either was used to bootstrap other types. This also affects the following types: + - `oneOf` + - `number` + - `numbers.*` ### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements} From b3cf9ce0f9d01b9c1dc4b7e04fb8b28f79ee68c4 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 5 Sep 2025 18:03:06 +0200 Subject: [PATCH 04/24] lib/types.either: add tests for warning in legacy case --- lib/tests/modules.sh | 22 ++++++++++++ lib/tests/modules/freeform-attrsof-either.nix | 14 ++++++++ .../freeform-deprecated-malicous-wrong.nix | 18 ++++++++++ .../freeform-deprecated-malicous-wrong2.nix | 19 +++++++++++ .../modules/freeform-deprecated-malicous.nix | 34 +++++++++++++++++++ 5 files changed, 107 insertions(+) create mode 100644 lib/tests/modules/freeform-attrsof-either.nix create mode 100644 lib/tests/modules/freeform-deprecated-malicous-wrong.nix create mode 100644 lib/tests/modules/freeform-deprecated-malicous-wrong2.nix create mode 100644 lib/tests/modules/freeform-deprecated-malicous.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index fbbccd8172f6..3b402b7d856c 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -550,6 +550,28 @@ checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freefo checkConfigOutput '^10$' config.free.xxx.foo ./freeform-submodules.nix checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix +# Regression of either, due to freeform not beeing checked previously +checkConfigOutput '^"foo"$' config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +checkConfigOutput '^"foo"$' config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +checkConfigOutput '^"foo"$' config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +checkConfigOutput '^"foo"$' config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix + +checkConfigOutput '^42$' config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +checkConfigOutput '^42$' config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +checkConfigOutput '^42$' config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +checkConfigOutput '^42$' config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +# Value OK: Fail if a warning is emitted +NIX_ABORT_ON_WARN=1 checkConfigOutput "^42$" config.number.int ./freeform-attrsof-either.nix + + ## types.anything # Check that attribute sets are merged recursively checkConfigOutput '^null$' config.value.foo ./types-anything/nested-attrs.nix diff --git a/lib/tests/modules/freeform-attrsof-either.nix b/lib/tests/modules/freeform-attrsof-either.nix new file mode 100644 index 000000000000..3d6ea05a88ef --- /dev/null +++ b/lib/tests/modules/freeform-attrsof-either.nix @@ -0,0 +1,14 @@ +{ lib, ... }: +let + inherit (lib) types mkOption; +in +{ + options.number = mkOption { + type = types.submodule ({ + freeformType = types.attrsOf (types.either types.int types.int); + }); + default = { + int = 42; + }; # should not emit a warning + }; +} diff --git a/lib/tests/modules/freeform-deprecated-malicous-wrong.nix b/lib/tests/modules/freeform-deprecated-malicous-wrong.nix new file mode 100644 index 000000000000..4d1e86cf5ae1 --- /dev/null +++ b/lib/tests/modules/freeform-deprecated-malicous-wrong.nix @@ -0,0 +1,18 @@ +# Obviously wrong typed +{ + config.either = { + int = "foo"; + }; + + config.eitherBehindNullor = { + int = "foo"; + }; + + config.oneOf = { + int = "foo"; + }; + + config.number = { + str = "foo"; + }; +} diff --git a/lib/tests/modules/freeform-deprecated-malicous-wrong2.nix b/lib/tests/modules/freeform-deprecated-malicous-wrong2.nix new file mode 100644 index 000000000000..62c2a7befeb5 --- /dev/null +++ b/lib/tests/modules/freeform-deprecated-malicous-wrong2.nix @@ -0,0 +1,19 @@ +# freeeformType should have been (attrsOf either) +# This should also print the warning +{ + config.either = { + int = 42; + }; + + config.eitherBehindNullor = { + int = 42; + }; + + config.oneOf = { + int = 42; + }; + + config.number = { + str = 42; + }; +} diff --git a/lib/tests/modules/freeform-deprecated-malicous.nix b/lib/tests/modules/freeform-deprecated-malicous.nix new file mode 100644 index 000000000000..47d5bd2f69dd --- /dev/null +++ b/lib/tests/modules/freeform-deprecated-malicous.nix @@ -0,0 +1,34 @@ +{ lib, ... }: +let + inherit (lib) types mkOption; +in +{ + options.either = mkOption { + type = types.submodule ({ + freeformType = (types.either types.int types.int); + }); + }; + + options.eitherBehindNullor = mkOption { + type = types.submodule ({ + freeformType = types.nullOr (types.either types.int types.int); + }); + }; + + options.oneOf = mkOption { + type = types.submodule ({ + freeformType = ( + types.oneOf [ + types.int + types.int + ] + ); + }); + }; + + options.number = mkOption { + type = types.submodule ({ + freeformType = (types.number); # either int float + }); + }; +} From 40acc6af1a141e20c6a083ca683f4bfb47ce349d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Sep 2025 10:02:59 -0700 Subject: [PATCH 05/24] python3Packages.bpython: add passthru.updateScript --- pkgs/development/python-modules/bpython/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 4635e357d368..fc685f744b68 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -14,6 +14,7 @@ setuptools, urwid, watchdog, + gitUpdater, }: buildPythonPackage rec { @@ -24,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bpython"; repo = "bpython"; - tag = version; + tag = "${version}-release"; hash = "sha256-p5+IQiHNRRazqr+WRdx3Yw+ImG25tdZGLXvMf7woD9w="; }; @@ -63,6 +64,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "bpython" ]; + passthru.updateScript = gitUpdater { + rev-suffix = "-release"; + }; + meta = with lib; { changelog = "https://github.com/bpython/bpython/blob/${src.tag}/CHANGELOG.rst"; description = "Fancy curses interface to the Python interactive interpreter"; From 2bc7f0fd88f4f518159e53639ec1c6b48abcaebe Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 11 Sep 2025 20:30:05 -0400 Subject: [PATCH 06/24] ovn: enable tests --- pkgs/by-name/ov/ovn/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index f5ccc3485ba9..effc66eb89cf 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -65,8 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # disable tests due to networking issues and because individual tests can't be skipped easily - doCheck = false; + doCheck = true; nativeCheckInputs = [ gnused From adff8f0a20256509e943ab60e8f2c3f02ab98c2c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 11 Sep 2025 22:24:24 -0400 Subject: [PATCH 07/24] ovn: fix test failure due to network sandbox --- pkgs/by-name/ov/ovn/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index effc66eb89cf..8624371c1ea1 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -45,6 +45,16 @@ stdenv.mkDerivation rec { xdp-tools ]; + postPatch = '' + # One test assumes that the test environment has a network route to + # 192.168.0.10 and fails in sandbox. Replace it with localhost. + # + # The test case checks behavior when the configured ovn-remote is down, so + # we can pick any "free" port here. + substituteInPlace tests/ovn-controller.at \ + --replace-fail 192.168.0.10:6642 127.0.0.1:9999 + ''; + # need to build the ovs submodule first preConfigure = '' pushd ovs From 468cd45f7254f4f046e35228cffae677d818bf82 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 11 Sep 2025 20:45:05 -0400 Subject: [PATCH 08/24] ovn: skip unstable tests --- pkgs/by-name/ov/ovn/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 8624371c1ea1..bf08bb388996 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -102,6 +102,10 @@ stdenv.mkDerivation rec { sed -i '/chown -R $INSTALL_USER:$INSTALL_GROUP $ovn_etcdir/d' $out/share/ovn/scripts/ovn-ctl ''; + env = { + SKIP_UNSTABLE = "yes"; + }; + # https://docs.ovn.org/en/latest/topics/testing.html preCheck = '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" From 3fdb462a11c7a34f885ef7081898f4e31a1d9fd9 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 11 Sep 2025 20:31:44 -0400 Subject: [PATCH 09/24] ovn: remove explicit gnused check dependency It's part of stdenv. --- pkgs/by-name/ov/ovn/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index bf08bb388996..f75291ab4fe0 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, autoreconfHook, - gnused, libbpf, libcap_ng, nix-update-script, @@ -78,7 +77,6 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ - gnused procps ]; From fe8004aed59cc42a332b7bad3dfa72127cbd395e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 11 Sep 2025 20:35:08 -0400 Subject: [PATCH 10/24] ovn: modernize --- pkgs/by-name/ov/ovn/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index f75291ab4fe0..4c7cec045fc0 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -15,14 +15,14 @@ xdp-tools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ovn"; version = "25.09.0"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DNaf3vWb6tlzViMEI02+3st/0AiMVAomSaiGplcjkIc="; fetchSubmodules = true; }; @@ -117,15 +117,15 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Open Virtual Network"; longDescription = '' OVN (Open Virtual Network) is a series of daemons that translates virtual network configuration into OpenFlow, and installs them into Open vSwitch. ''; - homepage = "https://github.com/ovn-org/ovn"; - changelog = "https://github.com/ovn-org/ovn/blob/${src.rev}/NEWS"; - license = licenses.asl20; - maintainers = with maintainers; [ adamcstephens ]; - platforms = platforms.linux; + homepage = "https://www.ovn.org"; + changelog = "https://github.com/ovn-org/ovn/blob/refs/tags/${finalAttrs.src.tag}/NEWS"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ adamcstephens ]; + platforms = lib.platforms.linux; }; -} +}) From 05fa15c83afb82a7115c07ffc9918b84c746f098 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 11 Sep 2025 20:35:38 -0400 Subject: [PATCH 11/24] ovn: add booxter as maintainer I'm interested in maintaining the package, and I'm a long time contributor to the upstream project and know how to deal with build system, test suite etc. --- pkgs/by-name/ov/ovn/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 4c7cec045fc0..f73fccecb873 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -125,7 +125,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.ovn.org"; changelog = "https://github.com/ovn-org/ovn/blob/refs/tags/${finalAttrs.src.tag}/NEWS"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = with lib.maintainers; [ + adamcstephens + booxter + ]; platforms = lib.platforms.linux; }; }) From 18f2b735d37f70f56b8d5e34afcd9c00776b9379 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 11 Sep 2025 23:01:25 -0400 Subject: [PATCH 12/24] pkgsStatic.ovn: add openssl to check deps openssl is used to generate certificates for test services. --- pkgs/by-name/ov/ovn/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index f73fccecb873..867fb1a5ae04 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; nativeCheckInputs = [ + openssl # used to generate certificates used for test services procps ]; From 22d8b2d665cecee1a45f250d239e164888ae7663 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 12 Sep 2025 03:21:49 +0000 Subject: [PATCH 13/24] pkgsStatic.ovn: build ovs lib with ssl support Before the patch, ovs lib was built without ssl support. It became apparent once we enabled tests - which now fail due to lack of ssl support in ovs services. --- pkgs/by-name/ov/ovn/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 867fb1a5ae04..ab38619a3ba9 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -14,7 +14,9 @@ unbound, xdp-tools, }: - +let + withOpensslConfigureFlag = "--with-openssl=${lib.getLib openssl.dev}"; +in stdenv.mkDerivation (finalAttrs: { pname = "ovn"; version = "25.09.0"; @@ -58,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' pushd ovs ./boot.sh - ./configure --with-dbdir=/var/lib/openvswitch + ./configure --with-dbdir=/var/lib/openvswitch ${lib.optionalString stdenv.hostPlatform.isStatic withOpensslConfigureFlag} make -j $NIX_BUILD_CORES popd ''; @@ -70,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { "--sbindir=$(out)/bin" "--enable-ssl" ] - ++ lib.optional stdenv.hostPlatform.isStatic "--with-openssl=${lib.getLib openssl.dev}"; + ++ lib.optional stdenv.hostPlatform.isStatic withOpensslConfigureFlag; enableParallelBuilding = true; From c87bf086885c14f53736469fb65d1a69954abbdc Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 11 Sep 2025 23:57:27 -0400 Subject: [PATCH 14/24] pkgsStatic.ovn: fix test failure; replace postPatch with a real patch --- ...pect-musl-error-string-for-EIO-errno.patch | 31 ++++++++++++++++ ...alhost-when-setting-wrong-ovn-remote.patch | 37 +++++++++++++++++++ pkgs/by-name/ov/ovn/package.nix | 19 +++++----- 3 files changed, 77 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/ov/ovn/0001-tests-Expect-musl-error-string-for-EIO-errno.patch create mode 100644 pkgs/by-name/ov/ovn/0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch diff --git a/pkgs/by-name/ov/ovn/0001-tests-Expect-musl-error-string-for-EIO-errno.patch b/pkgs/by-name/ov/ovn/0001-tests-Expect-musl-error-string-for-EIO-errno.patch new file mode 100644 index 000000000000..174421236802 --- /dev/null +++ b/pkgs/by-name/ov/ovn/0001-tests-Expect-musl-error-string-for-EIO-errno.patch @@ -0,0 +1,31 @@ +From d4ead86b2184d1fc2748ed2b6fae8c0dceaf76c8 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Thu, 11 Sep 2025 23:37:28 -0400 +Subject: [PATCH ovn 1/2] tests: Expect musl error string for EIO errno. + +Musl uses a slightly different string representation for the error, +which makes the test fail on cleanup because an unexpected warning is +observed in the service log. + +This patch will ignore both glibc and musl error messages. + +Signed-off-by: Ihar Hrachyshka +--- + tests/ovn-controller.at | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at +index 0b00906ae..bec06e527 100644 +--- a/tests/ovn-controller.at ++++ b/tests/ovn-controller.at +@@ -846,6 +846,7 @@ OVN_CLEANUP([hv1 + /Certificate must be configured to use SSL/d + /SSL_read: error/d + /receive error: Input/d ++/receive error: I\/O error/d + /connection dropped/d + ]) + AT_CLEANUP +-- +2.50.1 + diff --git a/pkgs/by-name/ov/ovn/0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch b/pkgs/by-name/ov/ovn/0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch new file mode 100644 index 000000000000..11efc948e361 --- /dev/null +++ b/pkgs/by-name/ov/ovn/0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch @@ -0,0 +1,37 @@ +From 44d9d58461e15314edf507d0379bff991d7e9964 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Thu, 11 Sep 2025 23:40:51 -0400 +Subject: [PATCH ovn 2/2] tests: Use localhost when setting "wrong" ovn-remote. + +In some isolated environments (e.g. in nixpkgs build sandbox), the +network namespace doesn't have any routes or interfaces but `lo`. In +this case, an attempt to connect to 192.168.0.10 results in ENETUNREACH, +producing an unexpected "Network unreachable" warning message in service +log file - breaking the test cleanup checks. + +Since the test case doesn't seem to care if the address is available, as +long as there is no SB database actually running at the configured +ovn-remote port, use the localhost address instead (which is always +present, even in the most isolated environments). + +Signed-off-by: Ihar Hrachyshka +--- + tests/ovn-controller.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at +index bec06e527..a8a9a2da2 100644 +--- a/tests/ovn-controller.at ++++ b/tests/ovn-controller.at +@@ -404,7 +404,7 @@ check_sbdb_connection () { + + OVS_WAIT_UNTIL([check_sbdb_connection connected]) + +-ovs-vsctl set open . external_ids:ovn-remote=tcp:192.168.0.10:6642 ++ovs-vsctl set open . external_ids:ovn-remote=tcp:127.0.0.1:12345 + OVS_WAIT_UNTIL([check_sbdb_connection 'not connected']) + + # reset the remote for clean-up +-- +2.50.1 + diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index ab38619a3ba9..286a3d54caf5 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -29,6 +29,15 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix test failure with musl libc. + # https://patchwork.ozlabs.org/project/ovn/patch/20250912035054.50593-1-ihar.hrachyshka@gmail.com/ + ./0001-tests-Expect-musl-error-string-for-EIO-errno.patch + # Fix sandbox test failure. + # https://patchwork.ozlabs.org/project/ovn/patch/20250912035054.50593-2-ihar.hrachyshka@gmail.com/ + ./0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -46,16 +55,6 @@ stdenv.mkDerivation (finalAttrs: { xdp-tools ]; - postPatch = '' - # One test assumes that the test environment has a network route to - # 192.168.0.10 and fails in sandbox. Replace it with localhost. - # - # The test case checks behavior when the configured ovn-remote is down, so - # we can pick any "free" port here. - substituteInPlace tests/ovn-controller.at \ - --replace-fail 192.168.0.10:6642 127.0.0.1:9999 - ''; - # need to build the ovs submodule first preConfigure = '' pushd ovs From 727cdba216369aa9e350f147c324ef693105a5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Sep 2025 14:38:52 -0700 Subject: [PATCH 15/24] libdeltachat: 2.13.0 -> 2.14.0 Diff: https://github.com/chatmail/core/compare/v2.13.0...v2.14.0 Changelog: https://github.com/chatmail/core/blob/v2.14.0/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 5ce43325ace3..8a2573f94548 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-ZKLdCyg0wypJA16QHLWENiE20hUzr53BPHuwjSIhSOc="; + hash = "sha256-oSTQcR7HE1YaVlNuSknG6JhoiiOjgNwAIaCecmLE7PY="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-swPk+KMOnvKcYznA6aHoQff6TRZ8npqfWmI/4Jr9fkw="; + hash = "sha256-9Dmll7os2cq3mxp30L9Nrx53QK1ZF7loozDg/XTs0UE="; }; nativeBuildInputs = [ From ccfbb6cb80e0512d82676214af1e1fc0b3aac36f Mon Sep 17 00:00:00 2001 From: thtrf Date: Sat, 13 Sep 2025 18:46:08 +0200 Subject: [PATCH 16/24] linuxPackages.rtl8852bu: fix build --- pkgs/os-specific/linux/rtl8852bu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8852bu/default.nix b/pkgs/os-specific/linux/rtl8852bu/default.nix index 8b317d655509..f71a6233fbff 100644 --- a/pkgs/os-specific/linux/rtl8852bu/default.nix +++ b/pkgs/os-specific/linux/rtl8852bu/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "morrownr"; repo = "rtl8852bu-20240418"; - rev = "42de963695ffc7929a4905aed5c5d7da7c1c2715"; - hash = "sha256-BvOw9MU4eibeMJEOkifKFatCUNGdujNUZav+4D9bYKY="; + rev = "1ef537712a55400aad637f53e45b60ed5ee621d7"; + hash = "sha256-8bO82ytorBYgIT0dNKRocOhiCrUhya7DkkMlJ1XM3Hk="; }; nativeBuildInputs = [ From 2fc628185b6a2b553bbba3f2163cf6a3928587da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 17:18:58 +0000 Subject: [PATCH 17/24] godns: 3.2.5 -> 3.3.3 --- pkgs/by-name/go/godns/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix index 3aafc48d52da..3868a2ebcfc4 100644 --- a/pkgs/by-name/go/godns/package.nix +++ b/pkgs/by-name/go/godns/package.nix @@ -10,19 +10,19 @@ buildGoModule rec { pname = "godns"; - version = "3.2.5"; + version = "3.3.3"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; tag = "v${version}"; - hash = "sha256-pe+A4n2IaiCOoDFc8NVk1NogNBqJ9Z4EnMBhiMbpkMU="; + hash = "sha256-go6LUVr53ioCpzWwShe7Ol2p57HH/cAcsD+g7I0ix2E="; }; - vendorHash = "sha256-ascWufBz1cp74g8QXJjEdF23WLZCwvxY+QUKMmfzhSM="; + vendorHash = "sha256-FHao4E0hhmnM224f8CowcHFAN2fmcR7TN08ldKZ5DUw="; npmDeps = fetchNpmDeps { src = "${src}/web"; - hash = "sha256-DqNgy/ZrSQPSCqZriKosSUybHq3PbuPOjIFqRW+Nu14="; + hash = "sha256-D0R9CUMlm+oesfD+Gr+Cqi37XETMhQ9n9MSKJOYqe9g="; }; npmRoot = "web"; From 6f5e6ff457d78ddd47e39b5490c3628d94a3c04a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 18:12:37 +0000 Subject: [PATCH 18/24] nak: 0.15.4 -> 0.16.2 --- pkgs/by-name/na/nak/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index 1da7c7b694ff..c7b7cd357616 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "nak"; - version = "0.15.4"; + version = "0.16.2"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "nak"; tag = "v${finalAttrs.version}"; - hash = "sha256-9Ap342HKD9byMGjFS8/3Ai14T5QJfsA5eYvUvqM02Gg="; + hash = "sha256-h/L2yIMfVR1Erk9nlDyNrepKL89ttOjdpsR6G1Ztu2g="; }; - vendorHash = "sha256-CoEwwxKyW2bYwVA6mpIdGjzEyN8m7K+1bODnPLajGJo="; + vendorHash = "sha256-w6j4Pd9t8a+xxhi9eYPrMTkg5YRGPaD1IDDSPDgBoaI="; ldflags = [ "-s" From b541b4ba1672a5f650d00734d7be7ba7453f7976 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 13 Sep 2025 22:36:51 +0200 Subject: [PATCH 19/24] floorp-bin: fix usage as `programs.firefox.package` Fixes #442254 [0]. Apparently, there is a big difference whether we `wrapFirefox` the package inside top-level/all-packages.nix or by-name/. With the latter, using something like programs.firefox = { enable = true; package = pkgs.floorp-bin; }; breaks with error: function 'anonymous lambda' called with unexpected arguments 'cfg', 'nativeMessagingHosts' and 'extraPrefsFiles' at /pkgs/by-name/fl/floorp-bin/package.nix:1:1: 1| { | ^ 2| wrapFirefox, [0] https://github.com/NixOS/nixpkgs/issues/442254 Signed-off-by: Christoph Heiss --- pkgs/by-name/fl/floorp-bin/package.nix | 8 -------- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 pkgs/by-name/fl/floorp-bin/package.nix diff --git a/pkgs/by-name/fl/floorp-bin/package.nix b/pkgs/by-name/fl/floorp-bin/package.nix deleted file mode 100644 index 0928354e1a39..000000000000 --- a/pkgs/by-name/fl/floorp-bin/package.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - wrapFirefox, - floorp-bin-unwrapped, -}: - -wrapFirefox floorp-bin-unwrapped { - pname = "floorp-bin"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b16ba063a8a..3e869a50d2c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11630,6 +11630,10 @@ with pkgs; ]; }; + floorp-bin = wrapFirefox floorp-bin-unwrapped { + pname = "floorp-bin"; + }; + formiko = with python3Packages; callPackage ../applications/editors/formiko { From 6d3ed0292a69ed02f3ad541f607e9f397466607e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 23:37:15 +0000 Subject: [PATCH 20/24] python3Packages.mplhep: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/mplhep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 1f35dee40c2f..5b086d8028d2 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "mplhep"; tag = "v${version}"; - hash = "sha256-VpdhgFUX1qUiUT5HlA2j3QQv7s3bF671e1I53MsML8w="; + hash = "sha256-Sx/VR573Vhxfv043mVdMpu/v6Ukv/JrVXBlpbILqGsI="; }; build-system = [ From e0c42831dd2bbcc397d8018bebd2ceb0246cb553 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 13 Sep 2025 21:34:43 -0400 Subject: [PATCH 21/24] frigate: fix incorrect patch for ffmpeg path This called on the class, so got the `property`, whereas we need to call on the instance. Without this, get `TypeError: expected str, bytes or os.PathLike object, not property`. --- pkgs/by-name/fr/frigate/ffmpeg.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fr/frigate/ffmpeg.patch b/pkgs/by-name/fr/frigate/ffmpeg.patch index 9a91f6ed74b6..e5e7c44121ae 100644 --- a/pkgs/by-name/fr/frigate/ffmpeg.patch +++ b/pkgs/by-name/fr/frigate/ffmpeg.patch @@ -41,7 +41,7 @@ index 0d3f96da..463bcff4 100644 seconds = int(diff % 60) ffmpeg_cmd = [ - "/usr/lib/ffmpeg/7.0/bin/ffmpeg", # hardcode path for exports thumbnail due to missing libwebp support -+ FfmpegConfig.ffmpeg_path, # hardcode path for exports thumbnail due to missing libwebp support ++ self.config.ffmpeg.ffmpeg_path, # hardcode path for exports thumbnail due to missing libwebp support "-hide_banner", "-loglevel", "warning", From c5fa28e43e0deccf33035be8ddec89de6525656c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 02:13:36 +0000 Subject: [PATCH 22/24] python3Packages.meshtastic: 2.7.1 -> 2.7.2 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 41cf201fc2ca..b8bfce96c5c9 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.7.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "python"; tag = version; - hash = "sha256-gIMn6rDcYloxD3G+rl40ZE+Cpi1UNGPwt10iCfYoqvg="; + hash = "sha256-8dNapcj4SW4fgbW48IxxrawyCuOayI/dxmVHQPshDp0="; }; pythonRelaxDeps = [ From 5054d428fbe778379cbb84983808d31b587b8a40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 02:59:48 +0000 Subject: [PATCH 23/24] sig: 0.1.4 -> 0.2.1 --- pkgs/by-name/si/sig/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix index c2509b2adc83..c4ac26e2dfeb 100644 --- a/pkgs/by-name/si/sig/package.nix +++ b/pkgs/by-name/si/sig/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "sig"; - version = "0.1.4"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ynqa"; repo = "sig"; rev = "v${version}"; - hash = "sha256-685VBQ64B+IbSSyqtVXtOgs4wY85WZ/OceHL++v5ip4="; + hash = "sha256-KxLSZ4/idlDrhRKFUsC3Ko0DcpSzwLWjees1jObC5KQ="; }; - cargoHash = "sha256-x4/vCFbC+kxhne4iRjuJy4L6QRpRKrJU3r+TPpDh4Pw="; + cargoHash = "sha256-nlW9pXgfn/8MjFFXs+HeIiBT9Ew8M1ETtuTZg5Qa4AE="; meta = { description = "Interactive grep (for streaming)"; From 4f0e50bed3dfdbed532f155b3ed980a3356de471 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 03:35:29 +0000 Subject: [PATCH 24/24] terraform-providers.google: 6.49.2 -> 7.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c915865d7c70..052638a5cafb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -525,13 +525,13 @@ "vendorHash": "sha256-v0nYsQinopJ9DXtkGFe3bIYXMBMsPDafn71Xfmvi2mo=" }, "google": { - "hash": "sha256-TInKyk82gwn3bGEPM6l9pGDmfMPskrMSSWNL0hDpnws=", + "hash": "sha256-BDMOYw/NPCBb5VuJZGNbACJ/dq2uh+wx/y0w6LGWgwE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v6.49.2", + "rev": "v7.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KWXHXLIt0fI9k3XRhch8VLLnVXwkSH2uUS5APfCcNdI=" + "vendorHash": "sha256-HavrYEqMGuJnZBQlVwZfZiXTISqALjjOHB8z1EpNkOE=" }, "google-beta": { "hash": "sha256-l08jmxkWsTrk32cJM28OuwSZgSKIB3EPODaUf7821uY=",