From cb3e1260428060ce7ef30fcefe5f9ab29f72f1d1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 8 Jan 2024 11:51:57 +0000 Subject: [PATCH] cpuset: migrate to by-name --- .../default.nix => by-name/cp/cpuset/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{os-specific/linux/cpuset/default.nix => by-name/cp/cpuset/package.nix} (82%) diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/by-name/cp/cpuset/package.nix similarity index 82% rename from pkgs/os-specific/linux/cpuset/default.nix rename to pkgs/by-name/cp/cpuset/package.nix index bb7a953c1195..ab7e5c3c38ec 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/by-name/cp/cpuset/package.nix @@ -1,14 +1,14 @@ { lib , fetchFromGitHub , fetchpatch -, pythonPackages +, python3 }: -pythonPackages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cpuset"; version = "1.6"; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3.pkgs; [ configparser future ]; @@ -37,8 +37,8 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier"; - homepage = "https://github.com/lpechacek/cpuset"; - license = licenses.gpl2; + homepage = "https://github.com/lpechacek/cpuset"; + license = licenses.gpl2; maintainers = with maintainers; [ thiagokokada wykurz ]; mainProgram = "cset"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2a0095f6243..ca0d9df03d0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27731,10 +27731,6 @@ with pkgs; inherit (pkgs) meson; }; - cpuset = callPackage ../os-specific/linux/cpuset { - pythonPackages = python3Packages; - }; - criu = callPackage ../os-specific/linux/criu { }; cryptomator = callPackage ../tools/security/cryptomator {