git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107512 from thiagokokada/bump-cpuset
commit09794ef0dd3d37965efd83a5c6a333d2309e619b authorSandro <sandro.jaeckel@gmail.com> dateSun 27 Dec 2020, 01:23 (6 years ago) parent44108c5563ce87
2 files changed+28−9
pkgs/os-specific/linux/cpuset/default.nix+25−8 pkgs/top-level/all-packages.nix+3−1
pkgs/os-specific/linux/cpuset/default.nix+25−8
@@ -1,27 +1,44 @@
11{ stdenv
22, fetchFromGitHub
3−, python2Packages
3+, fetchpatch
4+, pythonPackages
45}:
56
6−python2Packages.buildPythonApplication rec {
7+pythonPackages.buildPythonApplication rec {
78 pname = "cpuset";
8− version = "1.5.8";
9+ version = "1.6";
910
10− propagatedBuildInputs = [ ];
11+ propagatedBuildInputs = with pythonPackages; [
12+ configparser
13+ future
14+ ];
15+
16+ # https://github.com/lpechacek/cpuset/pull/36
17+ patches = [
18+ (fetchpatch {
19+ url = "https://github.com/MawKKe/cpuset/commit/a4b6b275d0a43d2794ab9e82922d3431aeea9903.patch";
20+ sha256 = "1mi1xrql81iczl67s4dk2rm9r1mk36qhsa19wn7zgryf95krsix2";
21+ })
22+ ];
1123
1224 makeFlags = [ "prefix=$(out)" ];
1325
1426 src = fetchFromGitHub {
15− owner = "wykurz";
27+ owner = "lpechacek";
1628 repo = "cpuset";
1729 rev = "v${version}";
18− sha256 = "19fl2sn470yrnm2q508giggjwy5b6r2gd94gvwfbdlhf0r9dsbbm";
30+ sha256 = "0ig0ml2zd5542d0989872vmy7cs3qg7nxwa93k42bdkm50amhar4";
1931 };
2032
33+ checkPhase = ''
34+ cd t
35+ make
36+ '';
37+
2138 meta = with stdenv.lib; {
2239 description = "Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier";
23− homepage = "https://github.com/wykurz/cpuset";
40+ homepage = "https://github.com/lpechacek/cpuset";
2441 license = licenses.gpl2;
25− maintainers = with maintainers; [ wykurz ];
42+ maintainers = with maintainers; [ thiagokokada wykurz ];
2643 };
2744}
pkgs/top-level/all-packages.nix+3−1
@@ -18065,7 +18065,9 @@ in
1806518065
1806618066 cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
1806718067
18068− cpuset = callPackage ../os-specific/linux/cpuset { };
18068+ cpuset = callPackage ../os-specific/linux/cpuset {
18069+ pythonPackages = python3Packages;
18070+ };
1806918071
1807018072 criu = callPackage ../os-specific/linux/criu { };
1807118073