Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -28753,6 +28753,12 @@
     githubId = 988849;
     name = "Vasiliy Yorkin";
   };
+  VZstless = {
+    name = "VZstless";
+    email = "i@vzstless.moe";
+    github = "atlarator";
+    githubId = 233668878;
+  };
   w-lfchen = {
     email = "w-lfchen@posteo.net";
     github = "w-lfchen";

nixos/modules/services/scheduling/scx.nix

@@ -37,31 +37,7 @@ in
     };
 
     scheduler = lib.mkOption {
-      type = lib.types.enum [
-        "scx_beerland"
-        "scx_bpfland"
-        "scx_chaos"
-        "scx_cosmos"
-        "scx_central"
-        "scx_flash"
-        "scx_flatcg"
-        "scx_lavd"
-        "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"
-      ];
+      type = lib.types.enum cfg.package.schedulers;
       default = "scx_rustland";
       example = "scx_bpfland";
       description = ''
@@ -126,5 +102,6 @@ in
 
   meta = {
     inherit (pkgs.scx.full.meta) maintainers;
+    buildDocsInSandbox = false;
   };
 }

nixos/tests/kernel-generic/default.nix

@@ -84,7 +84,6 @@ let
       linux_rt_5_15
       linux_rt_6_1
       linux_rt_6_6
-      linux_libre
 
       linux_testing
       ;

pkgs/by-name/co/code-cursor/sources.json

@@ -1,22 +1,22 @@
 {
-  "version": "2.6.19",
+  "version": "2.6.20",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/linux/x64/Cursor-2.6.19-x86_64.AppImage",
-      "hash": "sha256-KPHcY7KhcWTpiFPvHUXmP57ePOW1ouANYVtFMaSzN3Y="
+      "url": "https://downloads.cursor.com/production/b29eb4ee5f9f6d1cb2afbc09070198d3ea6ad76f/linux/x64/Cursor-2.6.20-x86_64.AppImage",
+      "hash": "sha256-fEvDNnFdJ2WhFam6tw1rnDbNQEZmxsoraIuvrHuKy+w="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/linux/arm64/Cursor-2.6.19-aarch64.AppImage",
-      "hash": "sha256-oyWGiuMkfEgwVd5c28CWfPjZHK3agtfrWZ54/Bk4c6E="
+      "url": "https://downloads.cursor.com/production/b29eb4ee5f9f6d1cb2afbc09070198d3ea6ad76f/linux/arm64/Cursor-2.6.20-aarch64.AppImage",
+      "hash": "sha256-SEiPNP1wZrLN+fW6q3ldniZYA7ndFf4p7OarPOvCxig="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-vHIQTWpYouXll7T661/IlsWzw6nEl09OoxfUZhpFLVs="
+      "url": "https://downloads.cursor.com/production/b29eb4ee5f9f6d1cb2afbc09070198d3ea6ad76f/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-PWgoiEFLXJr3AIcPN485BUUuGeCxXr0yk3ROmOILOh4="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-qDaqhZqUu7WQieSvLHnMk3rghWGhg/rA8tFBuRnh/nk="
+      "url": "https://downloads.cursor.com/production/b29eb4ee5f9f6d1cb2afbc09070198d3ea6ad76f/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-WxJUezRquZglmjRzjFkBcqLeByAwGTuYSJFWCccuKXc="
     }
   }
 }

pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fcitx5-mcbopomofo";
-  version = "2.9.5";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner = "openvanilla";
     repo = "fcitx5-mcbopomofo";
     rev = finalAttrs.version;
-    hash = "sha256-efpVvWchJywKyGu7I6pNRVKJhIv01iKAXFCJ+7kcMwc=";
+    hash = "sha256-yeqNiRiV/RXyFAlEfvsTLcw+AD/qZNvPLr34Cvqe360=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/go/golazo/package.nix

@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "golazo";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "0xjuanma";
     repo = "golazo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TWpaW8MTkYEOp+7dd3LiDs05tCB3riUPmFRzhMiAeZI=";
+    hash = "sha256-t8jzZcOVJaeQ4SGb8WO9lqzVgllz2mX8mUwk+JsNWzI=";
   };
 
   vendorHash = "sha256-M2gfqU5rOfuiVSZnH/Dr8OVmDhyU2jYkgW7RuIUTd+E=";

pkgs/by-name/ha/hath-rust/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hath-rust";
-  version = "1.14.1";
+  version = "1.14.2";
 
   src = fetchFromGitHub {
     owner = "james58899";
     repo = "hath-rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bo9MXMk/Dfa8cXjeWn14MF6rmVcWYes0WeVn1oC2y0k=";
+    hash = "sha256-aGdQ0nBrLOSs1xgbgn/e1e9QPMDlmpNJvmMtwvAOeVQ=";
   };
 
-  cargoHash = "sha256-4xty4nUs81nq2Ax7koFplHlscpG1Pdbd5zwd/lQwbmg=";
+  cargoHash = "sha256-1DibBXpg1x04wE+URSqemxqpuR9wgVJqWIIosZwAZ2k=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

pkgs/by-name/la/launchnext/package.nix

@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "launchnext";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchzip {
     url = "https://github.com/RoversX/LaunchNext/releases/download/${finalAttrs.version}/LaunchNext${finalAttrs.version}.zip";
-    hash = "sha256-gdfSkBWLXd1N17ruVlRs77q3VMX2nfmAYitPOVnDe3k=";
+    hash = "sha256-o52vYFr2j3AtFOpTyZ4jBnPhpfRGjyBXp5ZM4hlXqvU=";
     stripRoot = false;
   };
 

pkgs/by-name/le/ledger-live-desktop/package.nix

@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.143.0";
+  version = "2.145.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-SFIiXr83XV+FRSgbzOQ0/4rLUMu+FTlo3QxagmVXuJ4=";
+    hash = "sha256-BGd/NRw6befb2+cEgJjAaQnJzwUxywgltO7oSsaiukc=";
   };
 
   appimageContents = appimageTools.extractType2 {

pkgs/by-name/no/noctalia-qs/0001-fix-unneccessary-reloads.patch

@@ -0,0 +1,23 @@
+diff --git a/src/core/generation.cpp b/src/core/generation.cpp
+index c68af71..4967562 100644
+--- a/src/core/generation.cpp
++++ b/src/core/generation.cpp
+@@ -172,12 +172,18 @@ void EngineGeneration::setWatchingFiles(bool watching) {
+ 		if (this->watcher == nullptr) {
+ 			this->watcher = new QFileSystemWatcher();
+ 
++			// note: not using canonicalFilePath() here on purpose,
++			//       since the path could be a link to the nix store
++			//       and the link might change
++
+ 			for (auto& file: this->scanner.scannedFiles) {
++				if (file.startsWith("/nix/store/")) continue;
+ 				this->watcher->addPath(file);
+ 				this->watcher->addPath(QFileInfo(file).dir().absolutePath());
+ 			}
+ 
+ 			for (auto& file: this->extraWatchedFiles) {
++				if (file.startsWith("/nix/store/")) continue;
+ 				this->watcher->addPath(file);
+ 				this->watcher->addPath(QFileInfo(file).dir().absolutePath());
+ 			}

pkgs/by-name/no/noctalia-qs/package.nix

@@ -0,0 +1,93 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+
+  pkg-config,
+  cmake,
+  ninja,
+  spirv-tools,
+  qt6,
+  breakpad,
+  jemalloc,
+  cli11,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  libxcb,
+  libdrm,
+  libgbm ? null,
+  vulkan-headers,
+  pipewire,
+  pam,
+  polkit,
+  glib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "noctalia-qs";
+  version = "0.0.9";
+
+  src = fetchFromGitHub {
+    owner = "noctalia-dev";
+    repo = "noctalia-qs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=";
+  };
+
+  patches = [
+    ./0001-fix-unneccessary-reloads.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    spirv-tools
+    pkg-config
+    qt6.qtwayland
+    qt6.wrapQtAppsHook
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtwayland
+    qt6.qtsvg
+    cli11
+    wayland
+    wayland-protocols
+    libdrm
+    libgbm
+    vulkan-headers
+    breakpad
+    jemalloc
+    libxcb
+    pam
+    pipewire
+    polkit
+    glib
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "DISTRIBUTOR" "Nixpkgs")
+    (lib.cmakeBool "DISTRIBUTOR_DEBUGINFO_AVAILABLE" true)
+    (lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix)
+    (lib.cmakeFeature "GIT_REVISION" "tag-v${finalAttrs.version}")
+  ];
+
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+  dontStrip = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/noctalia-dev/noctalia-qs";
+    description = "Flexbile QtQuick based desktop shell toolkit";
+    license = lib.licenses.lgpl3Only;
+    platforms = lib.platforms.linux;
+    mainProgram = "quickshell";
+    maintainers = with lib.maintainers; [ iynaix ];
+  };
+})

pkgs/by-name/no/noctalia-shell/package.nix

@@ -6,7 +6,7 @@
 
   # build
   qt6,
-  quickshell,
+  noctalia-qs,
 
   # runtime deps
   bluez,
@@ -16,6 +16,7 @@
   ddcutil,
   wlsunset,
   wl-clipboard,
+  wlr-randr,
   imagemagick,
   wget,
   gpu-screen-recorder,
@@ -37,6 +38,7 @@
   ddcutilSupport ? true,
   wlsunsetSupport ? true,
   wl-clipboardSupport ? true,
+  wlr-randrSupport ? true,
   imagemagickSupport ? true,
   calendarSupport ? false,
   # gpu-screen-recorder support was moved to an optional plugin in v4.0.0
@@ -54,6 +56,7 @@ let
   ++ lib.optional ddcutilSupport ddcutil
   ++ lib.optional wlsunsetSupport wlsunset
   ++ lib.optional wl-clipboardSupport wl-clipboard
+  ++ lib.optional wlr-randrSupport wlr-randr
   ++ lib.optional imagemagickSupport imagemagick
   ++ lib.optional gpuScreenRecorderSupport gpu-screen-recorder;
 
@@ -68,13 +71,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "noctalia-shell";
-  version = "4.5.0";
+  version = "4.6.7";
 
   src = fetchFromGitHub {
     owner = "noctalia-dev";
     repo = "noctalia-shell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y5P0RYO9NKxa4UZBoGmmxtz3mEwJrBOfvdLJRGjV2Os=";
+    hash = "sha256-6fuxf185uga/AaeFgN6VUygGE8bUEkzZSA1UQ1FFes4=";
   };
 
   nativeBuildInputs = [
@@ -90,7 +93,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook preInstall
 
     mkdir -p $out/share/noctalia-shell $out/bin
-    ln -s ${quickshell}/bin/qs $out/bin/noctalia-shell
+    ln -s ${noctalia-qs}/bin/qs $out/bin/noctalia-shell
 
     cp -R \
       Assets Commons CREDITS.md Helpers Modules Services Shaders Scripts Widgets shell.qml \
@@ -119,6 +122,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "noctalia-shell";
     maintainers = with lib.maintainers; [ spacedentist ];
-    platforms = quickshell.meta.platforms;
+    platforms = noctalia-qs.meta.platforms;
   };
 })

pkgs/by-name/po/polyphone/package.nix

@@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     kdePackages.qmake
     kdePackages.qttools
+    kdePackages.qtbase
     kdePackages.wrapQtAppsHook
   ];
 
@@ -48,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   postConfigure = ''
     # Work around https://github.com/NixOS/nixpkgs/issues/214765
     substituteInPlace Makefile \
-      --replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin kdePackages.qttools}/bin/lrelease"
+      --replace-fail "${lib.getBin kdePackages.qtbase}/bin/lrelease" "${lib.getBin kdePackages.qttools}/bin/lrelease"
   '';
 
   qmakeFlags = [

pkgs/by-name/st/stoolap/package.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  stdenv,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "stoolap";
+  version = "0.3.7";
+
+  src = fetchFromGitHub {
+    owner = "stoolap";
+    repo = "stoolap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NfGs9TDyX+8hC2bCGJL0AWFd3C1joowT061vea5hxx0=";
+  };
+
+  cargoHash = "sha256-tzgxffwXd331Sz1xftXNBowqud29pKvbw+Epv01xOiQ=";
+
+  # On aarch64-darwin, dev target needs to set panic strategy to abort
+  # However this must be set while the flag `-Zpanic_abort_tests` is also set,
+  # which could only be done in Rust nightly toolchain.
+  doCheck = !(with stdenv.hostPlatform; isDarwin && isAarch64);
+
+  meta = {
+    description = "Modern Embedded SQL Database written in Rust";
+    homepage = "https://stoolap.io/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ VZstless ];
+    mainProgram = "stoolap";
+  };
+})

pkgs/by-name/te/teams-for-linux/package.nix

@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.7.10";
+  version = "2.7.12";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-ROst4Dc2ddJRe0xu5OjxsejZIOepuhbrpi+MxZNRd1Y=";
+    hash = "sha256-76pp0ON36aRBDnU4rsg/jTr+kNV+JsOMIclkxKp4JQk=";
   };
 
-  npmDepsHash = "sha256-ICv240Iw5Dld7EO59hxCtW0KhOF8AvnxUOEkYFGtIOU=";
+  npmDepsHash = "sha256-UkgNfuIwDWc/5zn3m5cvcNgZVRYJdKb6XkncF5CCowU=";
 
   nativeBuildInputs = [
     makeWrapper

pkgs/by-name/um/umap/package.nix

@@ -19,14 +19,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "umap";
-  version = "3.6.2";
+  version = "3.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "umap-project";
     repo = "umap";
     rev = version;
-    hash = "sha256-sTPxtncA9v/MkbJxBybGO/pL3xO6Ht74Ac14ZlLOkqk=";
+    hash = "sha256-b+ie1fZxeE7W2YKEUrftkRnmUnCeWZF1VSaB+nDRCXU=";
   };
 
   build-system = [

pkgs/by-name/zc/zcash/package.nix

@@ -16,7 +16,7 @@
   rustc,
   rustPlatform,
   pkg-config,
-  stdenv,
+  llvmPackages,
   testers,
   tl-expected,
   utf8cpp,
@@ -24,7 +24,9 @@
   zcash,
   zeromq,
 }:
-
+let
+  stdenv = llvmPackages.stdenv;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zcash";
   version = "5.4.2";
@@ -32,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zcash";
     repo = "zcash";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-XGq/cYUo43FcpmRDO2YiNLCuEQLsTFLBFC4M1wM29l8=";
   };
 

pkgs/kde/misc/ktextaddons/default.nix

@@ -8,11 +8,11 @@
 }:
 mkKdeDerivation rec {
   pname = "ktextaddons";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
-    hash = "sha256-AQHazKYL75LSsEU0LIgOFBnz3WsemKH4UKFPR7P53nk=";
+    hash = "sha256-tSNWvgchXwrOC44qbfi82PNXLvXAr/iWMbBDsQrbDIo=";
   };
 
   extraBuildInputs = [

pkgs/os-specific/linux/amdgpu-i2c/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/twifty/amd-gpu-i2c";
     downloadPage = "https://github.com/twifty/amd-gpu-i2c";
     description = "Exposes i2c interface to set colors on AMD GPUs";
-    broken = kernel.kernelOlder "6.1.0" || kernel.isLibre;
+    broken = kernel.kernelOlder "6.1.0";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ thardin ];

pkgs/os-specific/linux/kernel/build.nix

@@ -77,7 +77,6 @@ lib.makeOverridable (
 
     # for module compatibility
     isZen ? false,
-    isLibre ? false,
     isHardened ? false,
 
     # Whether to utilize the controversial import-from-derivation feature to parse the config
@@ -529,7 +528,6 @@ lib.makeOverridable (
       inherit
         isZen
         isHardened
-        isLibre
         withRust
         ;
       isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;

pkgs/os-specific/linux/kernel/generic.nix

@@ -75,7 +75,6 @@ lib.makeOverridable (
 
     isLTS ? false,
     isZen ? false,
-    isLibre ? false,
     isHardened ? false,
 
     # easy overrides to stdenv.hostPlatform.linux-kernel members
@@ -317,7 +316,6 @@ lib.makeOverridable (
             isLTS
             isZen
             isHardened
-            isLibre
             ;
           isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
 

pkgs/os-specific/linux/scx/scx_cscheds.nix

@@ -1,4 +1,5 @@
 {
+  fetchFromGitHub,
   llvmPackages,
   libbpf,
   pkg-config,
@@ -10,9 +11,16 @@
   libseccomp,
 }:
 
-llvmPackages.stdenv.mkDerivation {
+llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "scx_cscheds";
-  inherit (scx.rustscheds) version src;
+  version = "0-unstable-2026-01-13";
+
+  src = fetchFromGitHub {
+    owner = "sched-ext";
+    repo = "scx-c-examples";
+    rev = "82c692afe32ed4e79fd047a93d3ff316bf399287";
+    hash = "sha256-buXwId/4TwDfo/5mApMAEWHri92bW9x3jLEE5rawS3w=";
+  };
 
   postPatch = ''
     substituteInPlace ./scheds/c/Makefile \
@@ -40,17 +48,43 @@ llvmPackages.stdenv.mkDerivation {
     "zerocallusedregs"
   ];
 
-  doCheck = true;
+  __structuredAttrs = true;
+  EXPECTED_SCHEDULERS = finalAttrs.passthru.schedulers;
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    cd $out/bin
+    found=(scx_*)
+    if [[ "''${found[@]}" != "''${EXPECTED_SCHEDULERS[@]}" ]]; then
+      echo "List of available schedulers changed, expected: ''${EXPECTED_SCHEDULERS[@]}, found: ''${found[@]}"
+      exit 1
+    fi
+
+    runHook postInstallCheck
+  '';
 
   passthru = {
     inherit (scx.rustscheds.passthru) tests;
+    schedulers = [
+      "scx_central"
+      "scx_flatcg"
+      "scx_nest"
+      "scx_pair"
+      "scx_prev"
+      "scx_qmap"
+      "scx_simple"
+      "scx_userland"
+    ];
   };
 
   meta = scx.rustscheds.meta // {
-    description = "Sched-ext C userspace schedulers";
+    description = "Sched-ext C example schedulers";
     longDescription = ''
-      This includes C based schedulers such as scx_central, scx_flatcg,
-      scx_nest, scx_pair, scx_qmap, scx_simple, scx_userland.
+      This includes C based example schedulers such as scx_central, scx_flatcg,
+      scx_nest, scx_pair, scx_qmap, scx_simple, scx_userland. These are examples,
+      and generally not recommended for end users.
 
       ::: {.note}
       Sched-ext schedulers are only available on kernels version 6.12 or later.
@@ -59,4 +93,4 @@ llvmPackages.stdenv.mkDerivation {
     '';
     homepage = "https://github.com/sched-ext/scx/tree/main/scheds/c";
   };
-}
+})

pkgs/os-specific/linux/scx/scx_full.nix

@@ -1,14 +1,19 @@
 {
-  lib,
+  buildEnv,
   scx,
 }:
-scx.cscheds.overrideAttrs (oldAttrs: {
+buildEnv {
   pname = "scx_full";
-  postInstall = (oldAttrs.postInstall or "") + ''
-    cp ${lib.getBin scx.rustscheds}/bin/* ${placeholder "out"}/bin/
-  '';
+  inherit (scx.rustscheds) version;
 
-  meta = oldAttrs.meta // {
+  paths = [
+    scx.cscheds
+    scx.rustscheds
+  ];
+
+  passthru.schedulers = scx.cscheds.schedulers ++ scx.rustscheds.schedulers;
+
+  meta = {
     description = "Sched-ext C and Rust userspace schedulers";
     longDescription = ''
       This includes C based schedulers such as scx_central, scx_flatcg,
@@ -22,4 +27,4 @@ scx.cscheds.overrideAttrs (oldAttrs: {
     '';
     homepage = "https://github.com/sched-ext/scx";
   };
-})
+}

pkgs/os-specific/linux/scx/scx_rustscheds.nix

@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "scx_rustscheds";
-  version = "1.0.20";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "sched-ext";
     repo = "scx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MUWbNsxmbCRCOWB2dHpi5dEY2rNRrINxJSyl5SNSO9Y=";
+    hash = "sha256-kPOAiy2siIKZ6/zz43qPW7bp27T98MOhwmZMxpVpito=";
   };
 
-  cargoHash = "sha256-H58wschck+l41fQh9W5SNVb5g9lAnw90SOSd/RtGXyw=";
+  cargoHash = "sha256-nXiprz5ryGJeTy9nnKaLSKE0FSl17YE88xFt9bUTTL8=";
 
   nativeBuildInputs = [
     pkg-config
@@ -51,20 +51,52 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "zerocallusedregs"
   ];
 
-  doCheck = true;
-  checkFlags = [
-    "--skip=compat::tests::test_ksym_exists"
-    "--skip=compat::tests::test_read_enum"
-    "--skip=compat::tests::test_struct_has_field"
-    "--skip=cpumask"
-    "--skip=topology"
-    "--skip=proc_data::tests::test_thread_operations"
-    "--skip=json::tests::test_with_resources"
-    "--skip=json::tests::test_with_dir"
-  ];
+  # most of the tests rely on system CPU topology info,
+  # which is not available in the sandbox
+  doCheck = false;
+
+  # we don't need these
+  postInstall = ''
+    rm $out/bin/{scx_arena_selftests,vmlinux_docify,xtask}
+  '';
+
+  __structuredAttrs = true;
+  EXPECTED_SCHEDULERS = finalAttrs.passthru.schedulers;
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    cd $out/bin
+    found=(scx_*)
+    if [[ "''${found[@]}" != "''${EXPECTED_SCHEDULERS[@]}" ]]; then
+      echo "List of available schedulers changed, expected: ''${EXPECTED_SCHEDULERS[@]}, found: ''${found[@]}"
+      exit 1
+    fi
+
+    runHook postInstallCheck
+  '';
 
   passthru.tests.basic = nixosTests.scx;
   passthru.updateScript = nix-update-script { };
+  passthru.schedulers = [
+    "scx_beerland"
+    "scx_bpfland"
+    "scx_cake"
+    "scx_chaos"
+    "scx_cosmos"
+    "scx_flash"
+    "scx_lavd"
+    "scx_layered"
+    "scx_mitosis"
+    "scx_p2dq"
+    "scx_pandemonium"
+    "scx_rlfifo"
+    "scx_rustland"
+    "scx_rusty"
+    "scx_tickless"
+    "scx_wd40"
+  ];
 
   meta = {
     description = "Sched-ext Rust userspace schedulers";

pkgs/top-level/all-packages.nix

@@ -11086,10 +11086,6 @@ with pkgs;
     withGui = false;
   };
 
-  zcash = callPackage ../applications/blockchains/zcash {
-    stdenv = llvmPackages.stdenv;
-  };
-
   beancount = with python3.pkgs; toPythonApplication beancount;
 
   beancount_2 = with python3.pkgs; toPythonApplication beancount_2;

pkgs/top-level/linux-kernels.nix

@@ -329,7 +329,6 @@ in
           isLTS
           isZen
           isHardened
-          isLibre
           ;
         inherit (kernel) kernelOlder kernelAtLeast;
         kernelModuleMakeFlags = self.kernel.commonMakeFlags ++ [