diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 6f2246688d21..a13644acfd6f 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -10,7 +10,9 @@ -- Create the first release note entry in this section! +- `pqos-wrapper` was removed + as it has been unmaintained since 2022 + and not widely used. ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index bbbe172038d5..be3056814827 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -74,7 +74,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [BenchExec](https://github.com/sosy-lab/benchexec), a framework for reliable benchmarking and resource measurement, available as [programs.benchexec](#opt-programs.benchexec.enable), as well as related programs [CPU Energy Meter](https://github.com/sosy-lab/cpu-energy-meter), available as [programs.cpu-energy-meter](#opt-programs.cpu-energy-meter.enable), and - [PQoS Wrapper](https://gitlab.com/sosy-lab/software/pqos-wrapper), available as [programs.pqos-wrapper](#opt-programs.pqos-wrapper.enable). + [PQoS Wrapper](https://gitlab.com/sosy-lab/software/pqos-wrapper), available as `programs.pqos-wrapper`. - [Bluemap](https://bluemap.bluecolored.de/), a 3D minecraft map renderer. Available as [services.bluemap](#opt-services.bluemap.enable). diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index c017279d73b5..3d53f1f20930 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -16,7 +16,12 @@ -- Create the first release note entry in this section! +- `programs.pqos-wrapper` module has been deleted + as the corresponding package has been dropped from nixpkgs. + +- `programs.benchexec.enable = true` + no longer sets `programs.pqos-wrapper.enable = true` + as the corresponding module has been deleted. ## Other Notable Changes {#sec-release-26.11-notable-changes} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7699a60b6ac3..b9bf52b0068a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -296,7 +296,6 @@ ./programs/pay-respects.nix ./programs/plotinus.nix ./programs/pmount.nix - ./programs/pqos-wrapper.nix ./programs/projecteur.nix ./programs/proxychains.nix ./programs/pulseview.nix diff --git a/nixos/modules/programs/benchexec.nix b/nixos/modules/programs/benchexec.nix index 322da3450f92..e60f657e4788 100644 --- a/nixos/modules/programs/benchexec.nix +++ b/nixos/modules/programs/benchexec.nix @@ -85,7 +85,6 @@ in # See . programs = { cpu-energy-meter.enable = lib.mkDefault true; - pqos-wrapper.enable = lib.mkDefault true; }; # See . diff --git a/nixos/modules/programs/pqos-wrapper.nix b/nixos/modules/programs/pqos-wrapper.nix deleted file mode 100644 index 06fe81c0b1b2..000000000000 --- a/nixos/modules/programs/pqos-wrapper.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.programs.pqos-wrapper; -in -{ - options.programs.pqos-wrapper = { - enable = lib.mkEnableOption "PQoS Wrapper for BenchExec"; - package = lib.mkPackageOption pkgs "pqos-wrapper" { }; - }; - - config = lib.mkIf cfg.enable { - hardware.cpu.x86.msr.enable = true; - - security.wrappers.${cfg.package.meta.mainProgram} = { - owner = "nobody"; - group = config.hardware.cpu.x86.msr.group; - source = lib.getExe cfg.package; - capabilities = "cap_sys_rawio=eip"; - }; - }; - - meta.maintainers = with lib.maintainers; [ lorenzleutgeb ]; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a66a9bd5b929..5dbd2a2d09f2 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -82,6 +82,10 @@ in "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ + "programs" + "pqos-wrapper" + ] "The corresponding package was removed from nixpkgs.") # added 2026-05-13 (mkRemovedOptionModule [ "services" diff --git a/pkgs/by-name/pq/pqos-wrapper/package.nix b/pkgs/by-name/pq/pqos-wrapper/package.nix deleted file mode 100644 index e0a175023de5..000000000000 --- a/pkgs/by-name/pq/pqos-wrapper/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - intel-cmt-cat, - fetchFromGitLab, - python3, -}: -python3.pkgs.buildPythonApplication { - pname = "pqos-wrapper"; - version = "unstable-2022-01-31"; - pyproject = true; - - src = fetchFromGitLab { - group = "sosy-lab"; - owner = "software"; - repo = "pqos-wrapper"; - rev = "ce816497a07dcb4b931652b98359e4601a292b15"; - hash = "sha256-SaYr6lVucpJjVtGgxRbDGYbOoBwdfEDVKtvD+M1L0o4="; - }; - - build-system = with python3.pkgs; [ setuptools ]; - - makeWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ intel-cmt-cat ]}" ]; - - pythonImportsCheck = [ "pqos_wrapper" ]; - - meta = { - description = "Wrapper for Intel PQoS for the purpose of using it in BenchExec"; - homepage = "https://gitlab.com/sosy-lab/software/pqos-wrapper"; - maintainers = with lib.maintainers; [ lorenzleutgeb ]; - license = lib.licenses.asl20; - platforms = [ "x86_64-linux" ]; - mainProgram = "pqos_wrapper"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5ac49d96524f..27104f80f7c3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1724,6 +1724,7 @@ mapAliases { pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09 powerdns = throw "'powerdns' has been renamed to/replaced by 'pdns'"; # Converted to throw 2025-10-27 powwow = throw "'powwow' has been removed, since it's unmaintained since 2021 and doesn't build with glibc 2.42"; # Added 2025-09-28 + pqos-wrapper = throw "'pqos-wrapper' has been removed, since it's unmaintained since 2022 and archived upstream"; # Added 2026-05-13 prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14 preload = throw "'preload' has been removed due to lack of usage and being broken since its introduction into nixpkgs"; # Added 2025-11-29 premid = throw "'premid' has been removed, as it has been archived upstream since July 2024. Consider using the browser extension instead."; # Added 2026-04-04