diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 55b1ad758c92..f1c21539cd09 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -119,7 +119,7 @@ lusc_luv,,,,,, lush.nvim,,,https://luarocks.org/dev,,,teto luuid,,,,20120509-2,, lyaml,,,,,,lblasc -lz.n,,,,,,mrcjkb +lz.n,,,,,5.1,mrcjkb lze,,,,,,birdee lzextras,,,,,,birdee lzn-auto-require,,,,,,mrcjkb diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 91df1388a191..9785fe358d7c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -843,10 +843,13 @@ in cfgZfs.package pkgs.coreutils pkgs.curl + pkgs.diffutils + pkgs.findutils pkgs.gawk pkgs.gnugrep pkgs.gnused pkgs.hostname-debian + pkgs.logger pkgs.util-linux ]; }; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index fc5eb975226c..6c7672ae5dba 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -314,4 +314,47 @@ in exit(1) ''; }; + + zfs-mount-generator = runTest { + name = "zfs-mount-generator"; + nodes.machine = + { ... }: + { + boot.supportedFilesystems = [ "zfs" ]; + networking.hostId = "00000000"; + virtualisation = { + emptyDiskImages = [ 4096 ]; + }; + }; + + testScript = '' + from datetime import timedelta + + machine.wait_for_unit("multi-user.target") + + machine.succeed( + "zpool create -O mountpoint=none test /dev/vdb", + + # Enable list caching for the test pool. + "mkdir /etc/zfs/zfs-list.cache", + "touch /etc/zfs/zfs-list.cache/test", + + # Trigger the zedlet. + "zfs create -o mountpoint=/tmp/foo test/foo", + ) + + # Wait for the zedlet to update the cache with the new dataset. + machine.wait_until_succeeds( + "grep -F test/foo /etc/zfs/zfs-list.cache/test", + timeout=timedelta(seconds=120) + ) + + machine.succeed( + # Rerun systemd generators. + "systemctl daemon-reload", + "systemctl cat tmp-foo.mount | grep zfs-mount-generator", + "systemctl is-active tmp-foo.mount", + ) + ''; + }; } diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index f9ecdd62419c..520cbc83999f 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -191,6 +191,8 @@ stdenv.mkDerivation { src = fetchurl { inherit (archive) url sha256; }; + sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "${darwinApp}.app"; + dontConfigure = true; dontBuild = true; dontPatchELF = true; diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix index 2686c475979e..5514c3383e6f 100644 --- a/pkgs/by-name/bu/buildah-unwrapped/package.nix +++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix @@ -18,13 +18,13 @@ buildGoModule (finalAttrs: { pname = "buildah"; - version = "1.45.0"; + version = "1.45.1"; src = fetchFromGitHub { owner = "podman-container-tools"; repo = "buildah"; tag = "v${finalAttrs.version}"; - hash = "sha256-s+94gep69JEJCeS+HuPt2VuK64QzH/Gc1v8sFeyaIjw="; + hash = "sha256-WQiTHyRparVxYavnh7j/BHQGgg7ApClABMzmp6KzGO4="; }; outputs = [ diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix index 3d339e1f95a2..e521bc061e8e 100644 --- a/pkgs/by-name/co/codex-acp/package.nix +++ b/pkgs/by-name/co/codex-acp/package.nix @@ -10,16 +10,16 @@ buildNpmPackage (finalAttrs: { pname = "codex-acp"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "agentclientprotocol"; repo = "codex-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-D8uYd30NRXQYUSBFCi66Oq0iRZXpl8P7nWv2m3+KBig="; + hash = "sha256-GIMJm+kifPEMb7XLPSssUu87eEE+aaBr2jZUk8aPD2s="; }; - npmDepsHash = "sha256-df1/kPiZFBEq9Um26Qbo9XaYj2J8BOXQmunCQWquDTo="; + npmDepsHash = "sha256-BeRj6LpIpGV4ONEHE//nYXTfkB1nfVQpPeJF3LRlyRM="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix index 0c5769ff4b0d..dad8b9f33752 100644 --- a/pkgs/by-name/do/dosbox-x/package.nix +++ b/pkgs/by-name/do/dosbox-x/package.nix @@ -2,8 +2,8 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, gitUpdater, + writers, alsa-lib, autoreconfHook, ffmpeg, @@ -28,27 +28,25 @@ zlib, }: +let + check-dosbox-conf = writers.writeText "check-dosbox.conf" '' + [autoexec] + MOUNT C . + + VER > C:\BLUB + ''; +in stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2026.08.02"; + version = "2026.08.31"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-zipg/eTz/k6IQeUovgpZ/ezOJNEjSQwHpkpGYOtdpS0="; + hash = "sha256-RYnepkAHwLOQFBXNZSPkH4L9bi3BkVC2RKd+YReGMqU="; }; - patches = [ - # https://github.com/joncampbell123/dosbox-x/issues/6446 - # Remove when version > 2026.08.02 - (fetchpatch { - name = "0001-dosbox-x-Fix-FFmpeg-9-compat.patch"; - url = "https://github.com/joncampbell123/dosbox-x/commit/18062c0ffb33db35fa52ce937ce25223140c0293.patch"; - hash = "sha256-S6DMmofFBloZFut0M3ZVAV/awG8Af9xjO2AcfVusOdg="; - }) - ]; - # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants # iconutil is unavailable, replace with png2icns from libicns # Patch bad hardcoded compiler @@ -122,6 +120,26 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x $out/bin/dosbox-x ''; + # Can't personally check Darwin anymore + doInstallCheck = !stdenv.hostPlatform.isDarwin; + + installCheckPhase = '' + runHook preInstallCheck + + env \ + SDL_AUDIODRIVER=dummy \ + SDL_VIDEODRIVER=dummy \ + $out/bin/dosbox-x \ + -nopromptfolder -nogui \ + -exit \ + -machine pc98 \ + -conf ${check-dosbox-conf} + + grep -q 'Reported DOS version' BLUB + + runHook postInstallCheck + ''; + passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 6fd7a9f2983c..dbc38cd5d6df 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -11,17 +11,17 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "15.28.2"; + version = "15.30.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-19cIgkZ0luZYYx+9Cs077b5Q+sLxf+4ahwWO6hspxDw="; + hash = "sha256-pnEdnZWI9osazHlEBCnbqisvxHq3RbfKtJl7u6RxNdQ="; }; - npmDepsHash = "sha256-ZcI4Do4NcTIhJx1o/Hb9fZysv7WyGMLOUKMb4SUbeTY="; + npmDepsHash = "sha256-bHXyMeyzatoW+BHRWNNXYi/aeCdVWbGozHhDfPhNTd4="; # No more package-lock.json in upstream src postPatch = '' diff --git a/pkgs/by-name/go/goawk/package.nix b/pkgs/by-name/go/goawk/package.nix index c2b16b871448..a65a11088667 100644 --- a/pkgs/by-name/go/goawk/package.nix +++ b/pkgs/by-name/go/goawk/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "goawk"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${finalAttrs.version}"; - hash = "sha256-Luz6boPGIJqF/PJHZmnu3zChT5g8Wt37eOMtFS7j2pI="; + hash = "sha256-eYybVWqaN9iSoMe2HG0dOyzaYZOmYJsV8RN1Q2w2L6w="; }; vendorHash = null; diff --git a/pkgs/by-name/gr/graphite/package.nix b/pkgs/by-name/gr/graphite/package.nix index e875cb89eaa0..c478036a63cd 100644 --- a/pkgs/by-name/gr/graphite/package.nix +++ b/pkgs/by-name/gr/graphite/package.nix @@ -29,13 +29,13 @@ }: let - version = "0-unstable-2026-08-25"; - rev = "404d9f3047711d900e04573548745b869946f240"; + version = "0-unstable-2026-09-15"; + rev = "fdf6cfe296e308c45aa5696a88a947feec2fe67a"; - srcHash = "sha256-FdLdro7T8hyoNUT8dCd/ilZEUARPnFxqztbtxaNk9ws="; - shaderHash = "sha256-9yr//4t8k8Ncdli9AyBnkB2Pz9GgNhoumpdOv2uqL3k="; - cargoHash = "sha256-BHuYW90vTtDbfre6br7nTFa3VWgX01AlalXKwjiSSnA="; - npmHash = "sha256-Rb0bLPk54QigNp7TkDkJJy/TEJXAhlXOCruckwvdXks="; + srcHash = "sha256-k0C6ocP0lHwG402pmDHO0BLQ6DsK0Y4NqXLMJHHnBao="; + shaderHash = "sha256-LReut68Cwoz/YmXaLiVnccg+RerMrKqEWhiWGyx5k+Q="; + cargoHash = "sha256-/XEsrJed6rdsOpWFq6+trK9ylcH7v8g2XCExEI335jY="; + npmHash = "sha256-Cay+aZcZGAU2vKAs7nub/YVcQ/sxsruWhjZ9KkqXHuc="; brandingRev = "6687dc6d3d8552948458d00d35e2bee3a40ab66b"; brandingHash = "sha256-yD4O50gz2mtby1h4o+9PqjMfYmTbBOX6XDc5Ez5fgnY="; diff --git a/pkgs/by-name/li/libsupermesh/package.nix b/pkgs/by-name/li/libsupermesh/package.nix index e523f9a89026..9bdf00abab6a 100644 --- a/pkgs/by-name/li/libsupermesh/package.nix +++ b/pkgs/by-name/li/libsupermesh/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsupermesh"; - version = "2026.0"; + version = "2026.3"; src = fetchFromGitHub { owner = "firedrakeproject"; repo = "libsupermesh"; tag = finalAttrs.version; - hash = "sha256-f/5y3XherRbN/Eq3tfivrOHByF8LAXtYN3v9Vx82m8Q="; + hash = "sha256-YhidGtrx7XaaypGgdXfVX7/PpGvS6ZUEIeY+88DWLNA="; }; strictDeps = true; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index c0228e481b55..462090b18faf 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "12.7.0"; + version = "12.9.0"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-nun1IDdh9RE0Dx7RG6qaqGUma7ZXJQCdxtLYgo/3AxI="; + hash = "sha256-reqSKvO5yBeaRna87Mjk3y8+9yrTaz9K+rRMv18mXjY="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/pa/panache/package.nix b/pkgs/by-name/pa/panache/package.nix index 3db3650ed57d..8617cf4a8be2 100644 --- a/pkgs/by-name/pa/panache/package.nix +++ b/pkgs/by-name/pa/panache/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "panache"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "jolars"; repo = "panache"; tag = "v${finalAttrs.version}"; - hash = "sha256-6BNdRhBeRLxWof0Dq9vVP2Qae8pwCwYHyUePSn/GhI0="; + hash = "sha256-13v2J7qRgkX55vjFt0daU26J/IhmECCr1H0fVEW72rk="; }; - cargoHash = "sha256-xdykhQiZPPdKOjVoQbBbVw5TfNF2X2DFqzryvDG4Kt4="; + cargoHash = "sha256-D8SfoPjfIHnrvjYG6lJbqAHL1jkAI5st2105OP9md6s="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 770d1f94a371..73e8f36246b2 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -109,11 +109,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "petsc"; - version = "3.25.4"; + version = "3.25.5"; src = fetchzip { url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz"; - hash = "sha256-iF8HPlqhSkOUkAWDTMOUfWSFsLHMASeOeTXJw7qqgYQ="; + hash = "sha256-atNPjeL59fJqPMJ4LVS2goh1riyA3ewwMynUA+YPVd4="; }; postPatch = '' diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 7030d9410e40..1be0777f46dd 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.16.1"; + version = "0.16.2"; __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-FvYW41/yuGHihI0bf+fq0JG/antsVYVXwhKlKiGNN10="; + hash = "sha256-fuHTgU6S+goaih0rwY1JkDTR95fcRws3o9wHJWyy8vM="; }; - cargoHash = "sha256-9Lu7NGLNSDQH2T5ikc3rc+/oc67N8QcniooXPyxKsOA="; + cargoHash = "sha256-kaVmmroa3IADmnzdc4w/kxxloXgMsX6Xy1iAWOJoAR0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/so/sonarqube-cli/package.nix b/pkgs/by-name/so/sonarqube-cli/package.nix index 30ac5153c548..af052826de74 100644 --- a/pkgs/by-name/so/sonarqube-cli/package.nix +++ b/pkgs/by-name/so/sonarqube-cli/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; pname = "sonarqube-cli"; - version = "1.7.0.4638"; + version = "1.8.0.5274"; src = let @@ -18,15 +18,15 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = fetchurl { url = "${baseUrl}/linux/sonarqube-cli-${finalAttrs.version}-linux-x86-64.bin"; - hash = "sha256-QrndYxEguHds1j2q/Rjbji0SKf3N4qPObvJYWA62Oow="; + hash = "sha256-+/05s3mNfBGhxcgTdzUfgrqK5r5lM1JD8Ls8keepIdE="; }; aarch64-linux = fetchurl { url = "${baseUrl}/linux/sonarqube-cli-${finalAttrs.version}-linux-arm64.bin"; - hash = "sha256-9Kacx/nBMSVnVy9nTkNDCU5jJeHBQtBdPkkUgtiXkyk="; + hash = "sha256-Uy5x5IuRDFh0H5EYzehFhUweSoIe0PUOFQLwbNo8m7U="; }; aarch64-darwin = fetchurl { url = "${baseUrl}/macos/sonarqube-cli-${finalAttrs.version}-macos-arm64.bin"; - hash = "sha256-ikYRsomdr+7yvmwtggs9LABKAqzQEr97Dx/QjKkZNlk="; + hash = "sha256-uk+y6o6YdC2zYRYuyEVCOdXWLIy6imxBMEytt/IVFWA="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/to/topcoat-cli/package.nix b/pkgs/by-name/to/topcoat-cli/package.nix index af85625af884..87b3d209604e 100644 --- a/pkgs/by-name/to/topcoat-cli/package.nix +++ b/pkgs/by-name/to/topcoat-cli/package.nix @@ -5,7 +5,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "topcoat-cli"; - version = "0.8.0"; + version = "0.8.1"; __structuredAttrs = true; @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "tokio-rs"; repo = "topcoat"; tag = "v${finalAttrs.version}"; - hash = "sha256-op1pZ5FQHqNNGg7utANADV55pngivhP7I/cLI/I20Us="; + hash = "sha256-xRzxqaQ73wd7uUPffaaiH9EdPm10i4AM3Ml7N0OrjQg="; }; - cargoHash = "sha256-PuPu2mArS4LeIfwcDAJrqGB9mAqlRdeCMeqCkd22UW4="; + cargoHash = "sha256-btOlK33JgogZRy6cRwVJKYPBtAWtyNCf0pfqwtMRylQ="; cargoBuildFlags = [ "-p" diff --git a/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/pkgs/desktops/lomiri/development/libusermetrics/default.nix index 0acf1b82849f..97106732a82d 100644 --- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix +++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, testers, cmake, @@ -42,6 +43,22 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; + patches = [ + # Upstream switched to building qdjango statically so users don't have to build & install a dead project. + # Maybe https://gitlab.com/ubports/development/core/libusermetrics/-/merge_requests/24 will get rid of it for good. + # Until then, undo & link against our system-installed build. + (fetchpatch { + name = "0001-libusermetrics-revert-qdjango-vendoring.patch"; + url = "https://gitlab.com/ubports/development/core/libusermetrics/-/commit/87f83dd4711bfb4e94fd87bc68403a9bd5cfef2a.patch"; + revert = true; + includes = [ + "CMakeLists.txt" + "src/usermetricsservice/CMakeLists.txt" + ]; + hash = "sha256-OPTQPRr10I7bk7dQ/9x17mv42pKc8yIQUGEGak01Hic="; + }) + ]; + postPatch = '' # Tries to query QMake for QT_INSTALL_QML variable, would return broken paths into /build/qtbase- even if qmake was available substituteInPlace src/modules/UserMetrics/CMakeLists.txt \ diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index 23dea04b6b0d..48f965ac45a2 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -74,13 +74,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-ui-toolkit"; - version = "1.3.5907"; + version = "1.3.5908"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-ui-toolkit"; rev = finalAttrs.version; - hash = "sha256-hI04qw2r88862PB9sUJTiFi8ZM1iZ9rQXuoO9iEjViU="; + hash = "sha256-WZ8qWHQJr66EX5TCb5ztwRJ9DzclY0Wnym2yYBrphVE="; }; outputs = [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index ac59b5ee4801..bf97d961b2e0 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4483,25 +4483,25 @@ final: prev: { buildLuarocksPackage, fetchurl, fetchzip, - luaOlder, + lua, }: buildLuarocksPackage { pname = "lz.n"; - version = "2.11.3-1"; + version = "3.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-2.11.3-1.rockspec"; - sha256 = "0fg256gwa7444fh7wivasi77x7qgxx4r3hjqw90qa1kav10np88n"; + url = "mirror://luarocks/lz.n-3.1.0-1.rockspec"; + sha256 = "0b6d61r0x9x0f03f9mx4l0na9jphlkihizvh7f29xfxvk9khgfp6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v2.11.3.zip"; - sha256 = "0vnr1iiq4z3q7s3qylfmvcclmspydg8ll4p75jilcx9d114v7wwc"; + url = "https://github.com/lumen-oss/lz.n/archive/v3.1.0.zip"; + sha256 = "00xc3k6pcihz1cznmj4lsjwlcb54k0m5iv4x6zqkqkgwavsv62iw"; }; - disabled = luaOlder "5.1"; + disabled = lua.luaversion != "5.1"; meta = { - homepage = "https://github.com/nvim-neorocks/lz.n"; + homepage = "https://github.com/lumen-oss/lz.n"; maintainers = with lib.maintainers; [ mrcjkb ]; license = lib.licenses.gpl2Plus; description = "🦥 A dead simple lazy-loading Lua library for Neovim plugins."; @@ -4590,15 +4590,15 @@ final: prev: { }: buildLuarocksPackage { pname = "lzn-auto-require"; - version = "0.2.0-1"; + version = "1.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lzn-auto-require-0.2.0-1.rockspec"; - sha256 = "02w8pvyhnlbsz56rhgjql13qkh7fk05ai1qkqvk90a8ni8w48hh3"; + url = "mirror://luarocks/lzn-auto-require-1.0.0-1.rockspec"; + sha256 = "1glmbikz8vhwavrqpxibxj31k8x59pl7mr76b9k36nk217g7irln"; }).outPath; src = fetchzip { - url = "https://github.com/horriblename/lzn-auto-require/archive/v0.2.0.zip"; - sha256 = "1mgka1mmvpd2gfya898qdbbwrp5rpqds8manjs1s7g5x63xp6b98"; + url = "https://github.com/horriblename/lzn-auto-require/archive/v1.0.0.zip"; + sha256 = "07sv61bcg6p1039vbh9fdzdsc3x4fadq5j6c5hv3qf4sdzigpdjh"; }; disabled = luaOlder "5.1"; @@ -4607,7 +4607,7 @@ final: prev: { meta = { homepage = "https://github.com/horriblename/lzn-auto-require"; maintainers = with lib.maintainers; [ mrcjkb ]; - license = lib.licenses.gpl2Only; + license.fullName = "GPL-2.0"; description = "Auto load optional plugins via lua modules with lz.n"; }; } diff --git a/pkgs/development/python-modules/doublemetaphone/default.nix b/pkgs/development/python-modules/doublemetaphone/default.nix index a5fe45fea786..9613e338b767 100644 --- a/pkgs/development/python-modules/doublemetaphone/default.nix +++ b/pkgs/development/python-modules/doublemetaphone/default.nix @@ -41,6 +41,9 @@ buildPythonPackage rec { "doublemetaphone" ]; + # packaging.version.InvalidVersion: Invalid version: '1.2i' + dontCheckPythonMetadata = true; + meta = { description = "Python wrapper for Double Metaphone phonetic encoding algorithm"; homepage = "https://github.com/dedupeio/doublemetaphone"; diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix deleted file mode 100644 index ef28ecfe3b36..000000000000 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - arrow, - buildPythonPackage, - fetchFromGitHub, - freetype, - glibcLocales, - libjpeg, - pillow, - pocket, - pyfiglet, - pysocks, - python, - python-dateutil, - requests, - twitter, - zlib, -}: - -buildPythonPackage { - pname = "rainbowstream"; - version = "1.5.5"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "orakaro"; - repo = "rainbowstream"; - # Request for tagging, https://github.com/orakaro/rainbowstream/issues/314 - rev = "96141fac10675e0775d703f65a59c4477a48c57e"; - sha256 = "0j0qcc428lk9b3l0cr2j418gd6wd5k4160ham2zn2mmdmxn5bldg"; - }; - - buildInputs = [ - freetype - glibcLocales - libjpeg - zlib - ]; - - propagatedBuildInputs = [ - arrow - pillow - pocket - pyfiglet - pysocks - python-dateutil - requests - twitter - ]; - - patches = [ ./image.patch ]; - - postPatch = '' - clib=$out/${python.sitePackages}/rainbowstream/image.so - substituteInPlace rainbowstream/c_image.py \ - --replace @CLIB@ $clib - sed -i 's/requests.*"/requests"/' setup.py - ''; - - env.LC_ALL = "en_US.UTF-8"; - - postInstall = '' - mkdir -p $out/lib - cc -fPIC -shared -o $clib rainbowstream/image.c - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ "rainbowstream" ]; - - meta = { - description = "Streaming command-line twitter client"; - mainProgram = "rainbowstream"; - homepage = "https://github.com/orakaro/rainbowstream"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/python-modules/rainbowstream/image.patch b/pkgs/development/python-modules/rainbowstream/image.patch deleted file mode 100644 index 215152ae4fb1..000000000000 --- a/pkgs/development/python-modules/rainbowstream/image.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py -index f050150..a0fb77d 100644 ---- a/rainbowstream/c_image.py -+++ b/rainbowstream/c_image.py -@@ -12,11 +12,7 @@ def call_c(): - """ - Call the C program for converting RGB to Ansi colors - """ -- library = expanduser('~/.image.so') -- sauce = join(dirname(__file__), 'image.c') -- if not exists(library) or getmtime(sauce) > getmtime(library): -- build = "cc -fPIC -shared -o %s %s" % (library, sauce) -- os.system(build + " >/dev/null 2>&1") -+ library = '@CLIB@' - image_c = ctypes.cdll.LoadLibrary(library) - image_c.init() - return image_c.rgb_to_ansi - diff --git a/pkgs/development/python-modules/syrupy/6.nix b/pkgs/development/python-modules/syrupy/6.nix index 11efd8b12cb3..90366db56a9c 100644 --- a/pkgs/development/python-modules/syrupy/6.nix +++ b/pkgs/development/python-modules/syrupy/6.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "syrupy"; - version = "6.0.0"; + version = "6.1.1"; pyproject = true; src = fetchFromGitHub { owner = "syrupy-project"; repo = "syrupy"; tag = "v${finalAttrs.version}"; - hash = "sha256-dpGEX0abz20sI+tVSRXQRbFTz/EOQEwbduOdtLZS/AQ="; + hash = "sha256-+WuG0UDxbAIVci+/IfRqvKr4YM3ewzvEAtk6PEiBcpw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 1e5177b27d23..d6f6d2b2730c 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "transaction"; - version = "5.0"; + version = "5.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "transaction"; tag = version; - hash = "sha256-8yvA2dvB69+EqsAa+hc93rgg6D64lcajl6JgFabhjwY="; + hash = "sha256-db6oEea+sIK9SN7fDP19qYgUgbeH9bv3vuQdssq78vo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" + --replace-fail "setuptools >= 78.1.1,< 81" "setuptools" ''; build-system = [ diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix deleted file mode 100644 index 8560861855dd..000000000000 --- a/pkgs/development/python-modules/twitter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools-scm, - certifi, -}: - -buildPythonPackage rec { - pname = "twitter"; - version = "1.19.6"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-gN3WmuLuuIMT/u3uoxvxGf1ueVQe5bN6u5xD0jMZThA="; - }; - - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ certifi ]; - - doCheck = false; - - pythonImportsCheck = [ "twitter" ]; - - meta = { - description = "Twitter API library"; - homepage = "https://mike.verdone.ca/twitter/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/python-modules/wsme/default.nix b/pkgs/development/python-modules/wsme/default.nix index 160779366f00..12782f8b3a28 100644 --- a/pkgs/development/python-modules/wsme/default.nix +++ b/pkgs/development/python-modules/wsme/default.nix @@ -3,56 +3,48 @@ buildPythonPackage, fetchPypi, pbr, - setuptools, - importlib-metadata, + webob, simplegeneric, netaddr, + importlib-metadata, # Test inputs - flask, - flask-restful, + transaction, pecan, sphinx, - transaction, + flask, + flask-restful, webtest, pytestCheckHook, }: buildPythonPackage (finalAttrs: { pname = "wsme"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; src = fetchPypi { - pname = "WSME"; + pname = "wsme"; inherit (finalAttrs) version; - hash = "sha256-m36yJErzxwSskUte0iGVS7aK3QqLKy84okSwZ7M3mS0="; + hash = "sha256-W/MgEO2UPs+z8IeVpGAuJoPfXV6ozHHq8evj9EnzmDM="; }; - build-system = [ setuptools ]; - - nativeBuildInputs = [ pbr ]; + build-system = [ pbr ]; dependencies = [ - importlib-metadata + webob simplegeneric netaddr + importlib-metadata ]; nativeCheckInputs = [ - pytestCheckHook - flask - flask-restful + transaction pecan sphinx - transaction + flask + flask-restful webtest - ]; - - enabledTestPaths = [ - "wsme/tests" - "tests/pecantest" - "tests/test_sphinxext.py" - "tests/test_flask.py" + pytestCheckHook ]; meta = { diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 512fdcfaf873..83c01d226727 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -205,7 +205,7 @@ let "--with-udevdir=$(out)/lib/udev" "--with-systemdunitdir=$(out)/etc/systemd/system" "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" - "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator" + "--with-systemdgeneratordir=$(out)/lib/systemd/system-generators" "--with-mounthelperdir=$(out)/bin" "--libexecdir=$(out)/libexec" "--sysconfdir=/etc" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b3b0090347e4..dc8e3166680e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2205,6 +2205,7 @@ mapAliases { radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27 ragnarwm = throw "'ragnarwm' has been removed as it was broken"; # Added 2026-04-21 railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27 + rainbowstream = throw "'rainbowstream' has been removed because the Twitter streaming API it depends on was retired"; # Added 2026-09-06 rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27 rapidjson-unstable = throw "'rapidjson-unstable' has been renamed to/replaced by 'rapidjson'"; # Converted to throw 2025-10-27 rapidsvn = throw "'rapidsvn' has been removed because upstream archived the project after development stopped in August 2021"; # Added 2026-09-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6359ba000d22..4b1d9c641c95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2761,8 +2761,6 @@ with pkgs; quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota; - rainbowstream = with python3.pkgs; toPythonApplication rainbowstream; - rapidgzip = with python3Packages; toPythonApplication rapidgzip; ratarmount = with python3Packages; toPythonApplication ratarmount; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 13446a0d3bbc..666ce94a0736 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -652,6 +652,7 @@ mapAliases { radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02 radicale_infcloud = throw "'radicale_infcloud' has been renamed to/replaced by 'radicale-infcloud'"; # Converted to throw 2025-10-29 radio_beam = throw "'radio_beam' has been renamed to/replaced by 'radio-beam'"; # Converted to throw 2025-10-29 + rainbowstream = throw "'rainbowstream' has been removed because the Twitter streaming API it depends on was retired"; # Added 2026-09-06 random-user-agent = throw "random-user-agent has been removed as it was abandoned upstream in 2018; use fake-useragent instead"; # Added 2025-10-17 raylib-python-cffi = raylib; # added 2026-09-07 readme_renderer = throw "'readme_renderer' has been renamed to/replaced by 'readme-renderer'"; # Converted to throw 2025-10-29 @@ -762,6 +763,7 @@ mapAliases { trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-29 tvdb_api = throw "'tvdb_api' has been renamed to/replaced by 'tvdb-api'"; # Converted to throw 2025-10-29 tweedledum = throw "'tweedledum' has been removed due to lack of upstream maintenance."; # Added 2025-11-22 + twitter = throw "'twitter' has been removed because it was archived upstream"; # Added 2026-09-06 typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24 typedmonarchmoney = throw "'typedmonarchmoney' was removed because Home Assistant switched to 'monarchmoneycommunity'"; # added 2026-08-05 typer-slim = warnAlias "typer-slim was an alias package of typer that only depended on it and has been removed." typer; # added 2026-02-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e93e2dfef94..c0bfde2d0bc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17736,8 +17736,6 @@ self: super: with self; { railroad-diagrams = callPackage ../development/python-modules/railroad-diagrams { }; - rainbowstream = callPackage ../development/python-modules/rainbowstream { }; - raincloudy = callPackage ../development/python-modules/raincloudy { }; ramlfications = callPackage ../development/python-modules/ramlfications { }; @@ -21284,8 +21282,6 @@ self: super: with self; { twitchapi = callPackage ../development/python-modules/twitchapi { }; - twitter = callPackage ../development/python-modules/twitter { }; - twitterapi = callPackage ../development/python-modules/twitterapi { }; twofish = callPackage ../development/python-modules/twofish { };