diff --git a/default.nix b/default.nix index bdab048245e2..afba797b01fc 100644 --- a/default.nix +++ b/default.nix @@ -6,7 +6,8 @@ if !builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.n abort '' - This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade: + This version of Nixpkgs requires Nix >= ${requiredVersion} but it is being + evaluated with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade: - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system. diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 9d352ac3c106..f64c5c024273 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -132,6 +132,8 @@ recommendation](https://clickhouse.com/docs/faq/operations/production). Users can continue to use the `clickhouse-lts` package if desired. +- `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support. + ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib} diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 6b6cdbcc1d2e..9b9a91032384 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -17,13 +17,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-7PgE1KrKmSBWzzi6tZp1Pou/82P1mPX8iE/IQlBi1Cc="; + sha256 = "sha256-/kolXnYO+wo6z7ucCXvxwjsiflvusKJ3qTWxm1YZMfU="; }; nativeBuildInputs = [ python ]; diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index cdbab8d18f13..301bb8ae675b 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20250514.0"; + version = "20250814.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; rev = "refs/tags/${version}"; - hash = "sha256-t0+YlITnxgnLrK/SN0bSmMIv3djR9DKMlnFrR9Btwx8="; + hash = "sha256-WQsyv3s3LKKOwYEkX5GcAPnbH061q1ts7TU4HU6I8CI="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-Uiz26kPxoz32t/GRppiYiVBVwWcQqUzPr0kScVUZak8="; + hash = "sha256-ShuJPS7qP2XZ3lwJrFeKRkQwX7tvyiC/0L7sGn0cMn8="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/es/esphome/esp32-post-build-esptool-reference.patch b/pkgs/by-name/es/esphome/esp32-post-build-esptool-reference.patch new file mode 100644 index 000000000000..6f323145e85f --- /dev/null +++ b/pkgs/by-name/es/esphome/esp32-post-build-esptool-reference.patch @@ -0,0 +1,13 @@ +diff --git a/esphome/components/esp32/post_build.py.script b/esphome/components/esp32/post_build.py.script +index c99521423..e29821d7e 100644 +--- a/esphome/components/esp32/post_build.py.script ++++ b/esphome/components/esp32/post_build.py.script +@@ -88,8 +88,6 @@ def merge_factory_bin(source, target, env): + output_path = firmware_path.with_suffix(".factory.bin") + python_exe = f'"{env.subst("$PYTHONEXE")}"' + cmd = [ +- python_exe, +- "-m", + "esptool", + "--chip", + chip, diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 2fcd40ed1bcc..1cb87cff635e 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -34,16 +34,24 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.7.5"; + version = "2025.8.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = version; - hash = "sha256-f6HBgjg6yiFCQk6hIvQMYw+5/KjIVvUJaK+c/xmIseM="; + hash = "sha256-LOHsiSiqeCLrKLcVfAiPZl54aDTaYuKw073h0XMDiTE="; }; + patches = [ + # Use the esptool executable directly in the ESP32 post build script, that + # gets executed by platformio. This is required, because platformio uses its + # own python environment through `python -m esptool` and then fails to find + # the esptool library. + ./esp32-post-build-esptool-reference.patch + ]; + build-system = with python.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/go/golines/package.nix b/pkgs/by-name/go/golines/package.nix index a978a7ded4f8..4ccb3c97d892 100644 --- a/pkgs/by-name/go/golines/package.nix +++ b/pkgs/by-name/go/golines/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "golines"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "golines"; rev = "v${version}"; - sha256 = "sha256-D0gI9BA0vgM1DBqwolNTfPsTCWuOGrcu5gAVFEdyVGg="; + sha256 = "sha256-Y4q3xpGw8bAi87zJ48+LVbdgOc7HB1lRdYhlsF1YcVA="; }; - vendorHash = "sha256-jI3/m1UdZMKrS3H9jPhcVAUCjc1G/ejzHi9SCTy24ak="; + vendorHash = "sha256-94IXh9iBAE0jJXovaElY8oFdXE6hxYg0Ww0ZEHLnEwc="; meta = with lib; { description = "Golang formatter that fixes long lines"; diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 118caa293582..1c5d33ca86a4 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.29.3"; + version = "1.30.0"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; tag = "v${version}"; - hash = "sha256-ySo+qAeNhMwOdCe5jrKtMsEWofYQ8mqTMEl9059vpns="; + hash = "sha256-FuN2+ukQ9Kf/Eu7M63wrBIh31O64HZVqtC78vzKioNE="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix index 5ab082ac736e..629995b2484a 100644 --- a/pkgs/by-name/jo/jocalsend/package.nix +++ b/pkgs/by-name/jo/jocalsend/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jocalsend"; - version = "1.6.1803"; + version = "1.6.18033"; src = fetchFromGitea { domain = "git.kittencollective.com"; owner = "nebkor"; repo = "joecalsend"; tag = finalAttrs.version; - hash = "sha256-nrXUZb4Yi1ttEltzqKUnMLLr5cvhqCxW1iJyo1ErG0w="; + hash = "sha256-q2fzi0NKfkjCwV7FD0PqXSHtJWQtvdvKx4WmhnZpKvg="; }; - cargoHash = "sha256-0yFKJtwQikP6WRDVWgv7b9e0iUS9AdKpx6VTeNAQ4zs="; + cargoHash = "sha256-u9Ev/Qr/WN6OOaMXPesA3nmV3efKJA3/2YWm8S60PjU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index 7d16b8fa3317..7fa3a6cf5139 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "k6"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "grafana"; repo = "k6"; rev = "v${version}"; - hash = "sha256-5KOJfGqZbh6+oVfuayg3s4ldSgC0oi9Qv3/bqDK2Zpc="; + hash = "sha256-RJZD8TwPE5FzIWgtgjEMc2ATxH17LCbaLDfIIDh1ruY="; }; subPackages = [ "./" ]; diff --git a/pkgs/by-name/ma/magnetico/package.nix b/pkgs/by-name/ma/magnetico/package.nix index a002f229c57a..f3106dd91a3d 100644 --- a/pkgs/by-name/ma/magnetico/package.nix +++ b/pkgs/by-name/ma/magnetico/package.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "magnetico"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitea { domain = "maxwell.eurofusion.eu/git"; owner = "rnhmjoj"; repo = "magnetico"; rev = "v${version}"; - hash = "sha256-cO5TVtQ1jdW1YkFtj35kmRfJG46/lXjXyz870NCPT0g="; + hash = "sha256-TqzsgUSPIBQT+k+ZrJPkF7uIt8o018ZN5p8nHom8cXM="; }; - vendorHash = "sha256-jIVMQtPCq9RYaYsH4LSZJFspH6TpCbgzHN0GX8cM/CI="; + vendorHash = "sha256-ZUtmQib6BD7P07ALYXKp/JAQodYnQCuvWZnWl9888Mg="; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/np/npingler/package.nix b/pkgs/by-name/np/npingler/package.nix new file mode 100644 index 000000000000..6223a0eaac79 --- /dev/null +++ b/pkgs/by-name/np/npingler/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage { + pname = "npingler"; + version = "unstable-2025-08-21"; + + src = fetchFromGitHub { + owner = "9999years"; + repo = "npingler"; + rev = "de47bb5c5c188ba3b36958c2284dbc6d24f2687f"; + hash = "sha256-4Q8oG2iem9dgsTTEFfhyw2rPAxtXdGx+Uhb/9uAdUy4="; + }; + + cargoHash = "sha256-wTW0cwi6C2WRlH2ifPMTdLAEZg4VbE5Jr5Mh+e+SjaM="; + + meta = { + description = "Nix profile manager for use with npins"; + homepage = "https://github.com/9999years/npingler"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers._9999years + ]; + mainProgram = "npingler"; + }; + + passthru.updateScript = nix-update-script { }; +} diff --git a/pkgs/by-name/sk/skeema/package.nix b/pkgs/by-name/sk/skeema/package.nix index a9a84e9c9517..0341610ff3dd 100644 --- a/pkgs/by-name/sk/skeema/package.nix +++ b/pkgs/by-name/sk/skeema/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "skeema"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; tag = "v${finalAttrs.version}"; - hash = "sha256-3sxUy/TkacuRN8UDGgrvkdUQi//6VufoYoVFN1+X3BM="; + hash = "sha256-rTfB34ELNSJ3VX7cJednWnjx0OGm2r120r5KILFVTUo="; }; vendorHash = null; diff --git a/pkgs/by-name/sl/slsk-batchdl/deps.json b/pkgs/by-name/sl/slsk-batchdl/deps.json new file mode 100644 index 000000000000..e2c86476f9d0 --- /dev/null +++ b/pkgs/by-name/sl/slsk-batchdl/deps.json @@ -0,0 +1,217 @@ +[ + { + "pname": "AngleSharp", + "version": "1.2.0", + "hash": "sha256-l8+Var9o773VL6Ybih3boaFf9sYjS7eqtLGd8DCIPsk=" + }, + { + "pname": "EmbedIO", + "version": "3.5.2", + "hash": "sha256-e6GfVHXxYeUw3ntCrHokNoAS6mXArO7+vdMeUFnsSo8=" + }, + { + "pname": "Goblinfactory.ProgressBar", + "version": "1.0.0", + "hash": "sha256-tV3Fw792zfYhB2dN97VKXBwS5eypqKExgAJy+bcDo8I=" + }, + { + "pname": "Google.Apis", + "version": "1.69.0", + "hash": "sha256-/9JN0CZIFZnmGS69ki38RlNzQiwp4yO0MFDeRk1slsg=" + }, + { + "pname": "Google.Apis.Auth", + "version": "1.69.0", + "hash": "sha256-T6n3hc+KpgHNqQQeJLOmgHQWkjBvnhIob5giHabREV8=" + }, + { + "pname": "Google.Apis.Core", + "version": "1.69.0", + "hash": "sha256-IW1AOY8o6hHkrc/tINsS/VCOUrOSoXb6OCSEF6gamkc=" + }, + { + "pname": "Google.Apis.YouTube.v3", + "version": "1.69.0.3680", + "hash": "sha256-3aNScBqmchnDkLejK5HYHiLVVDexrFUtZ6xe8cGP28M=" + }, + { + "pname": "HtmlAgilityPack", + "version": "1.11.72", + "hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k=" + }, + { + "pname": "Microsoft.ApplicationInsights", + "version": "2.22.0", + "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "9.0.1", + "hash": "sha256-A3W2Hvhlf1ODx1NYWHwUyziZOGMaDPvXHZ/ubgNLYJA=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.9.0", + "hash": "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.9.0", + "hash": "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI=" + }, + { + "pname": "Microsoft.Testing.Extensions.Telemetry", + "version": "1.5.3", + "hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU=" + }, + { + "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", + "version": "1.5.3", + "hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc=" + }, + { + "pname": "Microsoft.Testing.Extensions.VSTestBridge", + "version": "1.5.3", + "hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g=" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.5.3", + "hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM=" + }, + { + "pname": "Microsoft.Testing.Platform.MSBuild", + "version": "1.5.3", + "hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.12.0", + "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.9.0", + "hash": "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.9.0", + "hash": "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU=" + }, + { + "pname": "MSTest.Analyzers", + "version": "3.7.3", + "hash": "sha256-6mNfHtx9FBWA6/QrRUepwbxXWG/54GRyeZYazDiMacg=" + }, + { + "pname": "MSTest.TestAdapter", + "version": "3.7.3", + "hash": "sha256-3O/AXeS+3rHWstinivt73oa0QDp+xQpTc9p46EF+Mtc=" + }, + { + "pname": "MSTest.TestFramework", + "version": "3.7.3", + "hash": "sha256-RweCMMf14GI6HqjDIP68JM67IaJKYQTZy0jk5Q4DFxs=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "SmallestCSVParser", + "version": "1.1.1", + "hash": "sha256-64E87w+4FcQtYsFIOMGGmYmjXVGBwsBqgLVb7p0wc04=" + }, + { + "pname": "Soulseek", + "version": "7.1.0", + "hash": "sha256-n6LUNuPmmy9QYNNALR0ObYyR9LJalf0H8P+SKnoqfFc=" + }, + { + "pname": "SpotifyAPI.Web", + "version": "7.2.1", + "hash": "sha256-gbTLJaj7DSXZQlo0xpegZ8HLruMe6WmDyD8+l6YE3hg=" + }, + { + "pname": "SpotifyAPI.Web.Auth", + "version": "7.2.1", + "hash": "sha256-uzpyPlXNCuSHrcK4SKH0ydY2HlDKXU51W5ahk2Oqu98=" + }, + { + "pname": "System.CodeDom", + "version": "7.0.0", + "hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "5.0.0", + "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.1", + "hash": "sha256-CnmDanknCGbNnoDjgZw62M/Grg8IMTJDa8x3P07UR2A=" + }, + { + "pname": "System.Management", + "version": "7.0.2", + "hash": "sha256-bJ21ILQfbHb8mX2wnVh7WP/Ip7gdVPIw+BamQuifTVY=" + }, + { + "pname": "System.Memory", + "version": "4.6.0", + "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.1", + "hash": "sha256-iuAVcTiiZQLCZjDfDqdLLPHqZdZqvFabwLFHiVYdRJo=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.1", + "hash": "sha256-2dqE+Mx5eJZ8db74ofUiUXHOSxDCmXw5n9VC9w4fUr0=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.6.0", + "hash": "sha256-OwIB0dpcdnyfvTUUj6gQfKW2XF2pWsQhykwM1HNCHqY=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "TagLibSharp", + "version": "2.3.0", + "hash": "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w=" + }, + { + "pname": "Unosquare.Swan.Lite", + "version": "3.1.0", + "hash": "sha256-PL8N3CqIz/wku8/mkRMC3X868Byv47C20/rBLBhkS3o=" + }, + { + "pname": "YoutubeExplode", + "version": "6.5.4", + "hash": "sha256-5sexIiBj5XP9rP5DA0NQ+vHJ9lpjwp00EvVux901WLc=" + } +] diff --git a/pkgs/by-name/sl/slsk-batchdl/package.nix b/pkgs/by-name/sl/slsk-batchdl/package.nix new file mode 100644 index 000000000000..5967bd8ed2ee --- /dev/null +++ b/pkgs/by-name/sl/slsk-batchdl/package.nix @@ -0,0 +1,58 @@ +{ + lib, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + nix-update-script, +}: +buildDotnetModule (finalAttrs: { + pname = "slsk-batchdl"; + version = "2.4.7"; + + src = fetchFromGitHub { + owner = "fiso64"; + repo = "slsk-batchdl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-P7V7YJUA1bkfp13Glb1Q+NJ7iTya/xgO1TM88z1Nddc="; + }; + + postPatch = '' + # .NET 6 is EOL, .NET 8 works fine modulo the trimming flag. + # See: https://github.com/fiso64/slsk-batchdl/issues/112 + substituteInPlace \ + slsk-batchdl/slsk-batchdl.csproj \ + slsk-batchdl.Tests/slsk-batchdl.Tests.csproj \ + --replace-fail "net6.0" "net8.0" + ''; + + projectFile = "slsk-batchdl/slsk-batchdl.csproj"; + + # Tests fail to build. + # See: https://github.com/fiso64/slsk-batchdl/issues/111 + # testProjectFile = "slsk-batchdl.Tests/slsk-batchdl.Tests.csproj"; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + nugetDeps = ./deps.json; + executables = [ "sldl" ]; + + dotnetFlags = [ + "--property:PublishSingleFile=true" + # Note: This breaks Spotify authentication! + # See: https://github.com/fiso64/slsk-batchdl/issues/112 + # "--property:PublishTrimmed=true" + ]; + + selfContainedBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/fiso64/slsk-batchdl"; + description = "Advanced download tool for Soulseek"; + license = lib.licenses.gpl3Only; + maintainers = [ + lib.maintainers._9999years + ]; + mainProgram = "sldl"; + }; +}) diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix index 17ee971bc351..956002f5a0e7 100644 --- a/pkgs/by-name/t4/t4kcommon/package.nix +++ b/pkgs/by-name/t4/t4kcommon/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - fetchurl, + fetchpatch, cmake, pkg-config, SDL, @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { patches = [ # patch from debian to support libpng16 instead of libpng12 - (fetchurl { + (fetchpatch { url = "https://salsa.debian.org/tux4kids-pkg-team/t4kcommon/raw/f7073fa384f5a725139f54844e59b57338b69dc7/debian/patches/libpng16.patch"; - sha256 = "1lcpkdy5gvxgljg1vkrxych74amq0gramb1snj2831dam48is054"; + hash = "sha256-auQ8VvOyvLE1PD2dfeHZJV+MzIt1OtUa7OcOqsXTAYI="; }) ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { description = "Library of code shared between tuxmath and tuxtype"; homepage = "https://github.com/tux4kids/t4kcommon"; license = licenses.gpl3Plus; - maintainers = [ maintainers.aanderse ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix index 9391a437a739..79439f3a1d25 100644 --- a/pkgs/by-name/to/topiary/package.nix +++ b/pkgs/by-name/to/topiary/package.nix @@ -8,22 +8,21 @@ versionCheckHook, nix-update-script, }: - rustPlatform.buildRustPackage rec { pname = "topiary"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "tweag"; repo = "topiary"; tag = "v${version}"; - hash = "sha256-nRVxjdEtYvgF8Vpw0w64hUd1scZh7f+NjFtbTg8L5Qc="; + hash = "sha256-CyqZhkzAOqC3xWhwUzCpkDO0UFsO0S4/3sV7zIILiVg="; }; nativeBuildInputs = [ installShellFiles ]; nativeInstallCheckInputs = [ versionCheckHook ]; - cargoHash = "sha256-EqalIF1wx3F/5CiD21IaYsPdks6Mv1VfwL8OTRWsWaU="; + cargoHash = "sha256-akAjn9a7dMwjPSNveDY2KJ62evjHCAWpRR3A7Ghkb5A="; # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786 depsExtraArgs.postBuild = '' @@ -42,6 +41,31 @@ rustPlatform.buildRustPackage rec { # Skip tests that cannot be executed in sandbox (operation not permitted) checkFlags = [ + "--skip=formatted_query_tester" + "--skip=test_coverage::coverage_input_bash" + "--skip=test_coverage::coverage_input_css" + "--skip=test_coverage::coverage_input_json" + "--skip=test_coverage::coverage_input_nickel" + "--skip=test_coverage::coverage_input_ocaml" + "--skip=test_coverage::coverage_input_ocamllex" + "--skip=test_coverage::coverage_input_openscad" + "--skip=test_coverage::coverage_input_sdml" + "--skip=test_coverage::coverage_input_toml" + "--skip=test_coverage::coverage_input_tree_sitter_query" + "--skip=test_coverage::coverage_input_wit" + "--skip=test_fmt::fmt_input_bash" + "--skip=test_fmt::fmt_input_css" + "--skip=test_fmt::fmt_input_json" + "--skip=test_fmt::fmt_input_nickel" + "--skip=test_fmt::fmt_input_ocaml" + "--skip=test_fmt::fmt_input_ocaml_interface" + "--skip=test_fmt::fmt_input_ocamllex" + "--skip=test_fmt::fmt_input_openscad" + "--skip=test_fmt::fmt_input_sdml" + "--skip=test_fmt::fmt_input_toml" + "--skip=test_fmt::fmt_input_tree_sitter_query" + "--skip=test_fmt::fmt_input_wit" + "--skip=test_fmt::fmt_queries" "--skip=test_fmt_dir" "--skip=test_fmt_files" "--skip=test_fmt_files_query_fallback" @@ -50,9 +74,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_fmt_stdin_query" "--skip=test_fmt_stdin_query_fallback" "--skip=test_vis" - "--skip=formatted_query_tester" - "--skip=input_output_tester" - "--skip=coverage_tester" + "--skip=test_vis_invalid" ]; env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries"; diff --git a/pkgs/by-name/tu/tuxtype/package.nix b/pkgs/by-name/tu/tuxtype/package.nix index 3a30f42e1388..b16b77d8d6f7 100644 --- a/pkgs/by-name/tu/tuxtype/package.nix +++ b/pkgs/by-name/tu/tuxtype/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { mainProgram = "tuxtype"; homepage = "https://github.com/tux4kids/tuxtype"; license = licenses.gpl3Plus; - maintainers = [ maintainers.aanderse ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index 7574a27ce328..a1c942d6bda0 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.5.3735.58"; + version = "7.5.3735.64"; suffix = { @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-/S1vN8JakjRuB8s9SrDfA8wTwKu1tSs/+g7IoYglSmg="; - x86_64-linux = "sha256-5dNdJuApccRQDiZOF2+a8sTqJJLIGLpUPevPVx7Fyfw="; + aarch64-linux = "sha256-qcgbzxJiyIWVTFbhJYd4SrlK6ybjXuTG09LowoDP0LE="; + x86_64-linux = "sha256-cIVQiow/m2EMok1COeyo9v/1HCKStTnDt/StldXk/oo="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index 9638843ed8b7..bd7a4cee09ee 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -14,12 +14,12 @@ let pname = "ex_doc"; - version = "0.38.2"; + version = "0.38.3"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-Qv1vDfDGquWoem42IqA8lDiFWEtznT7ONIXSOCvn39g="; + hash = "sha256-mi8AE9LfmWtgiVvoaH7aZy0/KlUvneiyEqop6015b2E="; }; in mixRelease { diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 541c119f3051..f0afbb6b5642 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -72,6 +72,7 @@ buildPythonApplication rec { click click-completion colorama + esp-idf-size git intelhex lockfile @@ -81,6 +82,7 @@ buildPythonApplication rec { pyserial pyyaml requests + rich-click semantic-version setuptools spdx-license-list-data.json diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3636e96c19da..985e291c0cf6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -354,6 +354,10 @@ builtins.intersectAttrs super { (overrideCabal (old: { # Doesn't declare boost dependency pkg-configDepends = (old.pkg-configDepends or [ ]) ++ [ pkgs.boost.dev ]; + + passthru = old.passthru or { } // { + tests.lix = pkgs.lixPackageSets.stable.nix-serve-ng; + }; })) ]; diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 9d392bfcb95a..e634df7a1e96 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -10,7 +10,7 @@ # Whether the derivation provides a Python module or not. toPythonModule, namePrefix, - update-python-libraries, + nix-update-script, setuptools, pypaBuildHook, pypaInstallHook, @@ -399,14 +399,7 @@ let inherit disabled; } // { - updateScript = - let - filename = head (splitString ":" finalAttrs.finalPackage.meta.position); - in - [ - update-python-libraries - filename - ]; + updateScript = nix-update-script { }; } // optionalAttrs (dependencies != [ ]) { inherit dependencies; diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix index dd636bfcfbad..6122a3431cff 100644 --- a/pkgs/development/python-modules/aiorussound/default.nix +++ b/pkgs/development/python-modules/aiorussound/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiorussound"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; # requires newer f-strings introduced in 3.12 @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiorussound"; tag = version; - hash = "sha256-JKHuCDabW/OuwM+Kcm8lkLqgql8fhEuTL5pVEGibwzY="; + hash = "sha256-LagnFE5aWEoNYbthE01cM0fQBEGDF0ReJzSTvteg2BU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/esp-idf-size/default.nix b/pkgs/development/python-modules/esp-idf-size/default.nix new file mode 100644 index 000000000000..71b492d97f74 --- /dev/null +++ b/pkgs/development/python-modules/esp-idf-size/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + pyyaml, + rich, + + # tests + esptool, + jsonschema, + pytestCheckHook, + distutils, +}: + +buildPythonPackage rec { + pname = "esp-idf-size"; + version = "1.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "espressif"; + repo = "esp-idf-size"; + tag = "v${version}"; + hash = "sha256-dgvmrwnaipudKyNJ/xFAwvfjGmtDRnFbXxI2VuC/SKo="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyyaml + rich + ]; + + doCheck = false; # requires ESP-IDF + + nativeCheckInputs = [ + distutils + esptool + jsonschema + pytestCheckHook + ]; + + pythonImportsCheck = [ + "esp_idf_size" + ]; + + meta = { + description = ""; + homepage = "https://github.com/espressif/esp-idf-size"; + changelog = "https://github.com/espressif/esp-idf-size/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 7afb8627a7af..5465d5437d5c 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -59,14 +59,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.55.2"; + version = "4.55.3"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${version}"; - hash = "sha256-6cYZFFmwtPzResNB0q6yg/Lvclef4fAUqNxkSh+y+iU="; + hash = "sha256-wvcAKcEQ2dU/7IfCB0AH45ZdpiL5ib7kPPjFRhv4Z+0="; }; build-system = [ setuptools ]; diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index efc0ef628b0a..0d0eabfc4001 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -17,6 +17,8 @@ nixpkgs-review, nix-direnv, nix-fast-build, + haskell, + nix-serve-ng, colmena, storeDir ? "/nix/store", @@ -110,6 +112,15 @@ let inherit (self) nix-eval-jobs; }; + nix-serve-ng = lib.pipe (nix-serve-ng.override { nix = self.lix; }) [ + (haskell.lib.compose.enableCabalFlag "lix") + (haskell.lib.compose.overrideCabal (drv: { + # https://github.com/aristanetworks/nix-serve-ng/issues/46 + # Resetting (previous) broken flag since it may be related to C++ Nix + broken = lib.versionAtLeast self.lix.version "2.93"; + })) + ]; + colmena = colmena.override { nix = self.lix; inherit (self) nix-eval-jobs; @@ -291,9 +302,7 @@ lib.makeExtensible (self: { latest = self.lix_2_93; - # Note: This is not yet 2.92 because of a non-deterministic `curl` error. - # See: https://git.lix.systems/lix-project/lix/issues/662 - stable = self.lix_2_91; + stable = self.lix_2_93; # Previously, `nix-eval-jobs` was not packaged here, so we export an # attribute with the previously-expected structure for compatibility. This diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebb6024432bc..bdb53d489c8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4731,6 +4731,8 @@ self: super: with self; { esig = callPackage ../development/python-modules/esig { }; + esp-idf-size = callPackage ../development/python-modules/esp-idf-size { }; + espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { }; esper = callPackage ../development/python-modules/esper { };