diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index c0b04270b3ec..c74d2f316a93 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -125,7 +125,10 @@ in lomiri-thumbnailer lomiri-url-dispatcher mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target - morph-browser + # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067 + # morph-browser + # Adding another browser that is known-working until Morph Browser can migrate to Qt6 + pkgs.epiphany qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session teleports ]); diff --git a/nixos/modules/services/scheduling/scx.nix b/nixos/modules/services/scheduling/scx.nix index 7f92587f75e1..2a83788adfd8 100644 --- a/nixos/modules/services/scheduling/scx.nix +++ b/nixos/modules/services/scheduling/scx.nix @@ -39,6 +39,8 @@ in scheduler = lib.mkOption { type = lib.types.enum [ "scx_bpfland" + "scx_chaos" + "scx_cosmos" "scx_central" "scx_flash" "scx_flatcg" @@ -46,14 +48,18 @@ in "scx_layered" "scx_mitosis" "scx_nest" + "scx_p2dq" "scx_pair" + "scx_prev" "scx_qmap" "scx_rlfifo" "scx_rustland" "scx_rusty" "scx_sdt" "scx_simple" + "scx_tickless" "scx_userland" + "scx_wd40" ]; default = "scx_rustland"; example = "scx_bpfland"; @@ -115,5 +121,7 @@ in ]; }; - meta.maintainers = with lib.maintainers; [ johnrtitor ]; + meta = { + inherit (pkgs.scx.full.meta) maintainers; + }; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 153ee54cb4b2..26ee1c46caf4 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -107,15 +107,16 @@ let # Maintaining state across reboots. "systemd-random-seed.service" ] - ++ (optional cfg.package.withBootloader "systemd-boot-random-seed.service") + ++ optionals cfg.package.withBootloader [ + "systemd-boot-random-seed.service" + "systemd-bless-boot.service" + ] ++ [ "systemd-backlight@.service" "systemd-rfkill.service" "systemd-rfkill.socket" - # Boot counting "boot-complete.target" - "systemd-bless-boot.service" # Hibernate / suspend. "hibernate.target" diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index d65682c8e2ee..0ac80f0dce38 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -431,15 +431,16 @@ in machine.send_key("alt-f4") # Morph is how we go online - with subtest("morph browser works"): - open_starter() - machine.send_chars("Morph\n") - wait_for_text(r"(Bookmarks|address|site|visited any)") - machine.screenshot("morph_open") - - # morph-browser has a separate VM test to test its basic functionalities - - machine.send_key("alt-f4") + # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067 + # with subtest("morph browser works"): + # open_starter() + # machine.send_chars("Morph\n") + # wait_for_text(r"(Bookmarks|address|site|visited any)") + # machine.screenshot("morph_open") + # + # # morph-browser has a separate VM test to test its basic functionalities + # + # machine.send_key("alt-f4") # LSS provides DE settings with subtest("system settings open"): @@ -613,14 +614,14 @@ in machine.send_key("ret") # Peers should be loaded - wait_for_text("Morph") # or Gallery, but Morph is already packaged + wait_for_text("Gallery") machine.screenshot("settings_lomiri-content-hub_peers") - # Select Morph as content source - mouse_click(340, 80) + # Select Gallery as content source + mouse_click(460, 80) - # Expect Morph to be brought into the foreground, with its Downloads page open - wait_for_text("No downloads") + # Expect Gallery to be brought into the foreground, with its sharing page open + wait_for_text("Photos") # If lomiri-content-hub encounters a problem, it may have crashed the original application issuing the request. # Check that it's still alive @@ -629,9 +630,10 @@ in machine.screenshot("lomiri-content-hub_exchange") # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign - machine.send_key("esc") + machine.send_key("tab") + machine.send_key("ret") - machine.sleep(2) # sleep a tiny bit so morph can close & the focus can return to LSS + machine.sleep(2) # sleep a tiny bit so gallery can close & the focus can return to LSS machine.send_key("alt-f4") ''; } diff --git a/nixos/tests/scx/default.nix b/nixos/tests/scx/default.nix index 67627d0ed3e3..d321314b4ef6 100644 --- a/nixos/tests/scx/default.nix +++ b/nixos/tests/scx/default.nix @@ -12,22 +12,32 @@ specialisation = { bpfland.configuration.services.scx.scheduler = "scx_bpfland"; - central.configuration.services.scx.scheduler = "scx_central"; + cosmos.configuration.services.scx.scheduler = "scx_cosmos"; + flash.configuration.services.scx.scheduler = "scx_flash"; + flatcg.configuration.services.scx.scheduler = "scx_flatcg"; lavd.configuration.services.scx.scheduler = "scx_lavd"; + nest.configuration.services.scx.scheduler = "scx_nest"; + p2dq.configuration.services.scx.scheduler = "scx_p2dq"; rlfifo.configuration.services.scx.scheduler = "scx_rlfifo"; rustland.configuration.services.scx.scheduler = "scx_rustland"; rusty.configuration.services.scx.scheduler = "scx_rusty"; + simple.configuration.services.scx.scheduler = "scx_simple"; }; }; testScript = '' specialisation = [ "bpfland", - "central", + "cosmos", + "flash", + "flatcg", "lavd", + "nest", + "p2dq", "rlfifo", "rustland", - "rusty" + "rusty", + "simple" ] def activate_specialisation(name: str): diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index cb21509d75ed..142aefe75ad6 100644 --- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -48,6 +48,17 @@ stdenv.mkDerivation (finalAttrs: { # Build-time Vala codegen substituteInPlace src/CMakeLists.txt \ --replace-fail '/usr/share/gir-1.0/AccountsService-1.0.gir' '${lib.getDev accountsservice}/share/gir-1.0/AccountsService-1.0.gir' + + # timeouts are too short for aarch64 OfBorg builder under loads, which leads to spurious test failures + substituteInPlace \ + tests/accounts-service-user.cc \ + tests/media-player-user.cc \ + tests/name-watch-test.cc \ + tests/notifications-test.cc \ + tests/volume-control-test.cc \ + --replace-quiet 'loop(50)' 'loop(500)' \ + --replace-quiet 'loop(100)' 'loop(1000)' \ + --replace-quiet 'loop(500)' 'loop(5000)' \ ''; strictDeps = true; diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 4a38e656b0ef..39927d95c0e8 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -222,6 +222,11 @@ stdenv.mkDerivation (finalAttrs: { $ETN 'test_qt' # we don't include svg or webp support $ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused $ETN 'test_websocket_basic' # flakey + # hangs with cuda enabled, also: + # eglInitialize: Failed to get system egl display + # Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory + $ETN 'test_recipe_browser_webengine' + ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038 ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"} ) diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 58957dbddec4..d38e8e92463b 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -158,6 +158,10 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${unwrappedCC}/$file $out/$file done ''; + + meta = { + inherit (unwrappedCC.meta) mainProgram; + }; }; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 5ad1b80c6379..d8e5a2431352 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.93" + "@anthropic-ai/claude-code": "^1.0.95" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.93", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.93.tgz", - "integrity": "sha512-HSrbuYVu4k1dwoj/IYsXEVSoMWDPujy2D4zl9BMt4Zt0kwUwZch0nHpTyQ0C+YeHMN7hHbViz0bw6spg0a5GgQ==", + "version": "1.0.95", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.95.tgz", + "integrity": "sha512-VLwfezJ8vnNpkdUdyMORQ1JXx/C7GFd8MLiJTXXThvMTxhNEr8IhAY/bExNrtdkWx2+aipGocRLgNZrUon9HMw==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index d75cbc98cbbe..7ceb269f1463 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.93"; + version = "1.0.95"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-vEUty4HRPSkFpT94bxMWcLj0nFe34AeQEZ0WsCXuy10="; + hash = "sha256-msAIwzvmzu9qherfXUAgyt7NMq+vZwhTKhu/9ksX6xs="; }; - npmDepsHash = "sha256-JL0GPIhpyTQonKsyMR5zN8LaPfX3KkEfQbMR1Z7gTFE="; + npmDepsHash = "sha256-nUzpOO3GQ2ME0kwyTcqhy30OW0wOPlai2YX/GH8pgS4="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix index 779537f11180..0ea3e749541c 100644 --- a/pkgs/by-name/co/comma/package.nix +++ b/pkgs/by-name/co/comma/package.nix @@ -1,4 +1,5 @@ { + stdenv, comma, fetchFromGitHub, installShellFiles, @@ -8,6 +9,7 @@ nix, rustPlatform, testers, + buildPackages, }: rustPlatform.buildRustPackage rec { @@ -48,8 +50,9 @@ rustPlatform.buildRustPackage rec { "$out/share/comma/command-not-found.nu" \ "$out/share/comma/command-not-found.fish" \ --replace-fail "comma --ask" "$out/bin/comma --ask" - - "$out/bin/comma" --mangen > comma.1 + '' + + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + ${stdenv.hostPlatform.emulator buildPackages} "$out/bin/comma" --mangen > comma.1 installManPage comma.1 ''; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/by-name/fe/feh/package.nix similarity index 92% rename from pkgs/applications/graphics/feh/default.nix rename to pkgs/by-name/fe/feh/package.nix index fdd7cd5186a0..e7395f815523 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/by-name/fe/feh/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeWrapper, xorg, - imlib2, + imlib2Full, libjpeg, libpng, curl, @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feh"; - version = "3.10.3"; + version = "3.11"; src = fetchFromGitHub { owner = "derf"; repo = "feh"; rev = finalAttrs.version; - hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og="; + hash = "sha256-3QKKXgwrDXVn8ahIG+NfP60GezFrZiHWOFoM2T0OoqU="; }; outputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXt xorg.libX11 xorg.libXinerama - imlib2 + imlib2Full libjpeg libpng curl diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index d9108d096081..1ddd34275c79 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.1.22"; + version = "0.2.1"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-taQyrthHrlHc6Zy8947bpxvbHeSq0+JbgxROtQOGq44="; + hash = "sha256-TcXCGI27qJOVbR8XaJzE9dYV/3uDM9HATU1OkziRib8="; }; patches = [ @@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: { ./restore-missing-dependencies-fields.patch ]; - npmDepsHash = "sha256-1AJ+EZfPKioeptms3uio4U20zeQ9+yKC69Gbm6HlFMY="; + npmDepsHash = "sha256-0j6kXlnWg7N23cnmMialZVqyZTAzgPn0VGAqSeYIVZM="; preConfigure = '' mkdir -p packages/generated diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/by-name/gn/gnunet-gtk/package.nix similarity index 97% rename from pkgs/applications/networking/p2p/gnunet/gtk.nix rename to pkgs/by-name/gn/gnunet-gtk/package.nix index 69cb8c180954..a174a7b7ee44 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/by-name/gn/gnunet-gtk/package.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-rsQzMvOoQEuushd0jBGQt9j6zXj2G1SMax8d4QoDV6s="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/by-name/gn/gnunet/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/gnunet/default.nix rename to pkgs/by-name/gn/gnunet/package.nix diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index e83216488c64..62af987d2f38 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "golds"; - version = "0.7.6"; + version = "0.7.8"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${version}"; - hash = "sha256-j6k68+hiXsXW5WLnmbN/iFLFpyU64z/1+DKuaAnNbac="; + hash = "sha256-sK7mnvIy8xgsb/K73bEsp1x667AXrDJXSXjFbOSoX9A="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source @@ -22,7 +22,7 @@ buildGoModule rec { # https://github.com/NixOS/nixpkgs/pull/358316#discussion_r1855322027 patches = [ ./info_module-gover.patch ]; - vendorHash = "sha256-Sy9O23iCW8voImPFQkqczPxqGyD5rf0/tKxaRDFgbSs="; + vendorHash = "sha256-CL9CdLGeMTxXazJUr2+syQYJZXafX6ARzmEOHn7l14I="; ldflags = [ "-s" ]; diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index d7781911b0f5..72fcde7dfc7d 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; tag = finalAttrs.version; - hash = "sha256-dj+BEAx626vSPy26+Ip3uaj3SBE1SWkfbh5P8U0iXsg="; + hash = "sha256-96NiBE0/sBnIdajKui3pZmR8IGlElbeoyqYEYFWtOuM="; }; patches = [ ./nocontent.patch ]; diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 2ee705103dc0..5c6c001f1c5c 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.124.0"; + version = "2.126.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-aB9WFfGSdrIaBpOL7qqomfCqYIIsTeCch2fkta4M9RM="; + hash = "sha256-QAe8ft06Nna2rFyFTGK4mwfO1ueZKFcuacvKU4lln0k="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix index 51b16f81a501..e149eca1f70c 100644 --- a/pkgs/by-name/me/memray/package.nix +++ b/pkgs/by-name/me/memray/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "memray"; - version = "1.17.2"; + version = "1.18.0"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; tag = "v${version}"; - hash = "sha256-n000m2jIJJFZFTjfECS3gFrO6xHauZW46xe1tDqI6Lg="; + hash = "sha256-bShFMuDJlvBA3rQJRwXlsgRk4q+gdFQjOpDzOrp4/8k="; }; build-system = with python3Packages; [ @@ -77,7 +77,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Memory profiler for Python"; homepage = "https://bloomberg.github.io/memray/"; - changelog = "https://github.com/bloomberg/memray/releases/tag/v${src.tag}"; + changelog = "https://github.com/bloomberg/memray/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix index 81f73b14b431..10734346d211 100644 --- a/pkgs/by-name/mo/monero-cli/package.nix +++ b/pkgs/by-name/mo/monero-cli/package.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.4.1"; + version = "0.18.4.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - hash = "sha256-z5yhU1xePFBSmfl0X8x7AAgPvqUX0PQzLzxMblS8Um8="; + hash = "sha256-ibwcvEHlJkMjXoJQMPVrlir5irdclJsmV7aBB4/m190="; }; patches = [ diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix index 9f6ed89018ee..4d56bd6bec84 100644 --- a/pkgs/by-name/mo/monero-gui/package.nix +++ b/pkgs/by-name/mo/monero-gui/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.4.1"; + version = "0.18.4.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - hash = "sha256-Fm/kV31aKcjQjMO8vwjfDQsH8Qq8pRdFX3zbZdEGETg="; + hash = "sha256-FKQrB47q791lDaomI5A10qw1oGh5zp9TFPpFoX2ZAmc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 80143f6e9599..3d3c8a0afdd1 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -169,6 +169,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "django-allauth" + "rapidfuzz" "redis" ]; diff --git a/pkgs/by-name/ra/radicle-node/update.sh b/pkgs/by-name/ra/radicle-node/update.sh index b1a79b18da55..586dd95cc2fa 100755 --- a/pkgs/by-name/ra/radicle-node/update.sh +++ b/pkgs/by-name/ra/radicle-node/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils gnused common-updater-scripts nix-update +#!nix-shell -i bash -p coreutils gnugrep common-updater-scripts nix-update -version=$(list-git-tags | tail -1 | sed 's|^releases/||') +version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+$' | sort -rV | head -1) nix-update --version="$version" radicle-node diff --git a/pkgs/by-name/sc/scrounge-ntfs/package.nix b/pkgs/by-name/sc/scrounge-ntfs/package.nix index 25523e6d971d..0a3b9d094493 100644 --- a/pkgs/by-name/sc/scrounge-ntfs/package.nix +++ b/pkgs/by-name/sc/scrounge-ntfs/package.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-HYrMIMTRPmgAac/vaZ1jaUFchyAl5B0quxgHH0DHJ84="; }; + env.NIX_CFLAGS_COMPILE = "-D_FILE_OFFSET_BITS=64"; + + postPatch = '' + substituteInPlace src/{list,ntfsx,scrounge}.c \ + --replace-fail "lseek64" "lseek" + ''; + patches = [ ./darwin.diff ]; diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index 763f79baf4c8..a51249a1e827 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-gjkq1Be+x5qZYjO3pWt+u5A2izgMfR3+nxIHTc1ck6Y="; + hash = "sha256-Lg7cESGMbVCNx0KQBIAP/UsfvO3IO+DO9bYiQbg9Fls="; }; - vendorHash = "sha256-l0gsStKkfH0TQ1a935LSuFah3BBwVsMD4iSf2oDyViY="; + vendorHash = "sha256-DBgVcbt2kejtEJSajJh6vS4feT3Lwm+KqUOks55iWIc="; doCheck = false; diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index 5d84cadd1d9b..399de2fdd5e1 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.48"; + version = "1.9.52"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-5o39BwSKltqkbbcbArbKXmU3HQdXwC7QD3sq+3OK3yI="; + hash = "sha256-8OGGF1b74lYv1EQgcY54gdwJ2mvuS2D2oNdmKoJmkmM="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-akhRnWAzisjxOb4j3HCSGZ1e/qJcHERR2Msd1hB1on4="; + hash = "sha256-adtA5+Ft7ToTDeQ2vp3Hx1UUHgU0NUlcCVpJsV1alvU="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-7Ss+TQPkMyV18LU2EA7KZZjtb2S6hzEbwkIzAemee5E="; + hash = "sha256-kMIvW3dabv9iHLOx9QbsuiBkts62FHjvEYzBze9prlw="; }; }; updateScript = "${ diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 0817cc9b6f88..af59a36e955a 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -178,6 +178,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723 ./ignore-tests.patch + (fetchpatch { + name = "x264enc-test-fix.patch"; + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/c0c9888d66e107f9e0b6d96cd3a85961c7e97d9a.diff"; + hash = "sha256-/ILdPDjI20k5l9Qf/klglSuhawmFUs9mR+VhBnQqsWw="; + }) ]; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch index 63c053f9a066..52b231816ce8 100644 --- a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch +++ b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch @@ -1,23 +1,3 @@ -diff --git a/mux/mp4/tests/tests.rs b/mux/mp4/tests/tests.rs -index 52b91f59..c5875554 100644 ---- a/mux/mp4/tests/tests.rs -+++ b/mux/mp4/tests/tests.rs -@@ -1339,6 +1339,7 @@ fn test_taic_encode_cannot_sync(video_enc: &str) { - ); - } - -+#[ignore = "Unknown failure"] - #[test] - fn test_taic_x264() { - init(); -@@ -1359,6 +1360,7 @@ fn test_taic_stai_x264_not_enabled() { - test_taic_stai_encode("x264enc", false); - } - -+#[ignore = "Unknown failure"] - #[test] - fn test_taic_x264_no_sync() { - init(); diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs index 3489eaa8..569635d6 100644 --- a/utils/uriplaylistbin/tests/uriplaylistbin.rs diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index a6e5c276524d..92a785702089 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.82.0"; + version = "3.83.0"; pyproject = true; src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-C/ese6ezyDFp+3ifobq/DlHsz4g0wrBnuWCoa69qYYg="; + hash = "sha256-woiuT3RnxDkLtDaBAh9vdUvsMKAp3s5ahpJNS1T2DcQ="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 4e82b6382161..8e68e05545f3 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { doCheck = false; # tests require network access - pythonImportsCheck = [ "duckduckgo_search" ]; + pythonImportsCheck = [ "ddgs" ]; meta = { description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine"; diff --git a/pkgs/development/python-modules/fastapi-mcp/default.nix b/pkgs/development/python-modules/fastapi-mcp/default.nix index 844ba0f6de2d..bc9c51e8f0d3 100644 --- a/pkgs/development/python-modules/fastapi-mcp/default.nix +++ b/pkgs/development/python-modules/fastapi-mcp/default.nix @@ -20,7 +20,7 @@ # tests coverage, - pytest-asyncio, + pytest-asyncio_0, pytest-cov-stub, pytestCheckHook, }: @@ -59,7 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ coverage - pytest-asyncio + pytest-asyncio_0 pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 53d96d53493f..09142c15c739 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-5gkwYvmBXeRxGBL1CoM5H/obYDTceap1TP00uv8SDs4="; + hash = "sha256-2NX72ejiuzhjCi15EPa9OJZtTkKb5ySjMRfiDP617lY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index cc22e73d99d6..7f5beb398a14 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -36,16 +35,14 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.2.3.250308"; + version = "2.3.2.250827"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas-stubs"; tag = "v${version}"; - hash = "sha256-93XVzdb3A2S+Exk33v3U8HDMg9vPKAEkWjLZnBaXMWQ="; + hash = "sha256-qjHnFT/ydK5n6QfUzAhnGJWVpqHQbMoqGkel3Pu7S78="; }; build-system = [ poetry-core ]; @@ -99,10 +96,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pandas" ]; - meta = with lib; { + meta = { description = "Type annotations for Pandas"; homepage = "https://github.com/pandas-dev/pandas-stubs"; - license = licenses.mit; - maintainers = with maintainers; [ malo ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ malo ]; }; } diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 4d88ca3d47d8..4c8398a101d9 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, capstone, filebytes, + keystone-engine, pytestCheckHook, pythonOlder, setuptools, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "ropper"; - version = "1.13.10"; + version = "1.13.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sashs"; repo = "Ropper"; - rev = "v${version}"; - hash = "sha256-yuHJ+EpglumEAXEu0iJKIXK1ouW1yptNahM9Wmk7AW4="; + tag = "v${version}"; + hash = "sha256-MOAbACLDdeKCMV4K/n1rAQlxDN0JoDIiUF6Zr3yPw8o="; }; build-system = [ setuptools ]; @@ -30,15 +31,20 @@ buildPythonPackage rec { filebytes ]; + optional-dependencies = { + ropchain = [ keystone-engine ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ropper" ]; meta = with lib; { description = "Show information about files in different file formats"; - mainProgram = "ropper"; homepage = "https://scoding.de/ropper/"; + changelog = "https://github.com/sashs/Ropper/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs ]; + mainProgram = "ropper"; }; } diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index 4356e4fe4983..ed6cf8b9c555 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -1,16 +1,21 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, hatchling, - pytestCheckHook, - pytest-cov-stub, huggingface-hub, matplotlib, + numpy, + packaging, pandas, + prettytable, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + pyyaml, + rich, scikit-learn, - stdenv, streamlit, tabulate, }: @@ -30,7 +35,9 @@ buildPythonPackage rec { build-system = [ hatchling ]; dependencies = [ - huggingface-hub + numpy + packaging + prettytable scikit-learn tabulate ]; @@ -38,19 +45,26 @@ buildPythonPackage rec { nativeCheckInputs = [ matplotlib pandas - pytestCheckHook pytest-cov-stub + pytestCheckHook + pyyaml streamlit ]; + + optional-dependencies = { + rich = [ rich ]; + }; + enabledTestPaths = [ "skops" ]; + disabledTests = [ # flaky "test_base_case_works_as_expected" + # fairlearn is not available in nixpkgs + "TestAddFairlearnMetricFrame" ]; + disabledTestPaths = [ - # try to download data from Huggingface Hub: - "skops/hub_utils/tests" - "skops/card/tests" # minor output formatting issue "skops/card/_model_card.py" ] @@ -58,19 +72,21 @@ buildPythonPackage rec { # Segfaults on darwin "skops/io/tests/test_persist.py" ]; + pytestFlags = [ # Warning from scipy.optimize in skops/io/tests/test_persist.py::test_dump_and_load_with_file_wrapper # https://github.com/skops-dev/skops/issues/479 "-Wignore::DeprecationWarning" ]; + pythonImportsCheck = [ "skops" ]; meta = { description = "Library for saving/loading, sharing, and deploying scikit-learn based models"; - mainProgram = "skops"; homepage = "https://skops.readthedocs.io/en/stable"; changelog = "https://github.com/skops-dev/skops/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.bcdarwin ]; + mainProgram = "skops"; }; } diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index ad177f998e12..977710b04449 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -33,7 +33,7 @@ # openai openai, # toolkit - duckduckgo-search, + ddgs, markdownify, # torch numpy, @@ -52,14 +52,14 @@ buildPythonPackage rec { pname = "smolagents"; - version = "1.20.0"; + version = "1.21.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "smolagents"; tag = "v${version}"; - hash = "sha256-ING+C2MACKFto+1FON5OGFgzLf8SM99ViTdADzNzQLw="; + hash = "sha256-sm0G8z5Jaes8XybxeAUiRh3LVuzvnGaem5FLkcA5Qls="; }; # TODO: remove at the next release @@ -108,7 +108,7 @@ buildPythonPackage rec { # opentelemetry-sdk # ]; toolkit = [ - duckduckgo-search + ddgs markdownify ]; torch = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 618d1cf3a1cd..6f5af8ba14d7 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "12.4.0"; + version = "12.5.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HNH1sFeYZ5IwgbrPWUlZ0fQD8hgiOgbcOCc76wfQFWc="; + hash = "sha256-zSuOcSFrau1dwem15vZYteIdaaYNRPuMCPQeH3vd7dA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index 4a4d2cd161c1..c07b7d8d6a91 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tlds"; - version = "2025051700"; + version = "2025082700"; pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; tag = version; - hash = "sha256-AqVe9U/gLjXkmLls4+t04youpY7DtrbmlaHVUdAElMo="; + hash = "sha256-sMK+jglwhF8FX8yLDHBtheudfg20MOJhk+zHznQ0hbk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 6726f6de2e33..f03f31265a1c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.16.1"; # zen + version = "6.16.3"; # zen suffix = "zen1"; # zen - sha256 = "1z20d53hz1zwg65x8jbq57v7snh9z5qk0gnvw4v6xfn9hwi79sjs"; # zen + sha256 = "1dxxpd1j163m0ijw3ldc0v958jwn002crw5x0n1yzrklgs4jp4dm"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix index 23c183bf8a2a..8497ddac1d15 100644 --- a/pkgs/os-specific/linux/scx/scx_cscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix @@ -58,10 +58,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf substituteInPlace meson.build \ --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool" - - # TODO: Remove in next release. - substituteInPlace lib/scxtest/overrides.h \ - --replace-fail '#define __builtin_preserve_enum_value(x,y,z) 1' '#define __builtin_preserve_enum_value(x,y) 1' ''; nativeBuildInputs = [ @@ -89,7 +85,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { "systemd" = false; # not for nix "openrc" = false; - "libalpm" = false; }) (lib.mapAttrsToList lib.mesonBool { # needed libs are already fetched as FOD @@ -106,16 +101,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { "zerocallusedregs" ]; - # We copy the compiled header files to the dev output - # These are needed for the rust schedulers - postFixup = '' - mkdir -p ${placeholder "dev"} - cp -r libbpf ${placeholder "dev"} - ''; - outputs = [ "bin" - "dev" "out" ]; diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix index fc48fd7b26d4..c43bfee59861 100644 --- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix @@ -7,7 +7,6 @@ zlib, zstd, scx-common, - scx, protobuf, libseccomp, }: @@ -17,12 +16,6 @@ rustPlatform.buildRustPackage { inherit (scx-common.versionInfo.scx) cargoHash; - # Copy compiled headers and libs from scx.cscheds - postPatch = '' - mkdir libbpf - cp -r ${scx.cscheds.dev}/libbpf/* libbpf/ - ''; - nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook @@ -37,17 +30,11 @@ rustPlatform.buildRustPackage { env = { BPF_CLANG = lib.getExe llvmPackages.clang; - BPF_EXTRA_CFLAGS_PRE_INCL = lib.concatStringsSep " " [ - "-I${scx.cscheds.dev}/libbpf/src/usr/include" - "-I${scx.cscheds.dev}/libbpf/include/uapi" - "-I${scx.cscheds.dev}/libbpf/include/linux" - ]; RUSTFLAGS = lib.concatStringsSep " " [ "-C relocation-model=pic" "-C link-args=-lelf" "-C link-args=-lz" "-C link-args=-lzstd" - "-L ${scx.cscheds.dev}/libbpf/src" ]; }; @@ -63,6 +50,7 @@ rustPlatform.buildRustPackage { "--skip=compat::tests::test_struct_has_field" "--skip=cpumask" "--skip=topology" + "--skip=proc_data::tests::test_thread_operations" ]; meta = scx-common.meta // { diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json index 822e674361ed..ba4efd7bc025 100644 --- a/pkgs/os-specific/linux/scx/version.json +++ b/pkgs/os-specific/linux/scx/version.json @@ -1,15 +1,15 @@ { "scx": { - "version": "1.0.14", - "hash": "sha256-Wh+8vaQO93Erj+z8S2C633UDmUrFjQc3Bg+Nm7EML0E=", - "cargoHash": "sha256-6uiDx2/5ZcYkz8x8vuOTEUclIttzxVMvh1Q6QHg9N6E=" + "version": "1.0.15", + "hash": "sha256-HZIcJVWb0prkCjoSw7hd4JKve+unWFnfz9bGXZaF6EA=", + "cargoHash": "sha256-CRk8vLwSylNM5M9j0iwRbAmzAREUOJAl28BdY2o1zGs=" }, "bpftool": { "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e", "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c=" }, "libbpf": { - "rev": "c5f22aca0f3aa855daa159b2777472b35e721804", - "hash": "sha256-ggGVqAkdZt28KAx+LztVIYGxj0j79hKcPKmUy8TrJy8=" + "rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9", + "hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM=" } } diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix index 9b3b04753458..2968d0b2c2bc 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -2,7 +2,6 @@ lib, stdenv, kernel, - kernelModuleMakeFlags, ncurses, }: @@ -18,7 +17,9 @@ stdenv.mkDerivation { cd tools/thermal/tmon ''; - makeFlags = kernelModuleMakeFlags ++ [ + makeFlags = [ + "ARCH=${stdenv.hostPlatform.linuxArch}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ]; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index ebca23a792bc..d6a28ece4163 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -25,17 +25,16 @@ python3Packages, haskellPackages, testers, - zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zstd"; version = "1.5.7"; src = fetchFromGitHub { owner = "facebook"; repo = "zstd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-tNFWIT9ydfozB8dWcmTMuZLCQmQudTFJIkSr0aG7S44="; }; @@ -122,13 +121,19 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; tests = { + + # Reverse dependencies + inherit libarchive rocksdb arrow-cpp; libzip = libzip.override { withZstd = true; }; curl = curl.override { zstdSupport = true; }; python-zstd = python3Packages.zstd; haskell-zstd = haskellPackages.zstd; haskell-hs-zstd = haskellPackages.hs-zstd; - pkg-config = testers.hasPkgConfigModules { package = zstd; }; + + # Package tests (coherent with overrides) + + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; }; }; @@ -151,4 +156,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej ]; pkgConfigModules = [ "libzstd" ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fcf77beadf5..f4d98403f882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11606,10 +11606,6 @@ with pkgs; fclones = callPackage ../tools/misc/fclones { }; - feh = callPackage ../applications/graphics/feh { - imlib2 = imlib2Full; - }; - buildMozillaMach = opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { }; @@ -11828,10 +11824,6 @@ with pkgs; jdk = jdk.override { enableJavaFX = true; }; }; - gnunet = callPackage ../applications/networking/p2p/gnunet { }; - - gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; - gphoto2 = callPackage ../applications/misc/gphoto2 { }; gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };