commit 0f332692123b80c607eecc778e97845646a8d0ae · pyrox.dev/nixpkgs

-1

nixos/tests/kernel-generic.nix

···

       25
        
         }) args);

     

       26
        
         kernels = pkgs.linuxKernel.vanillaPackages // {

     

       27
        
           inherit (pkgs.linuxKernel.packages)

     

       28
       -
             linux_4_14_hardened

     

       29
        
             linux_4_19_hardened

     

       30
        
             linux_5_4_hardened

     

       31
        
             linux_5_10_hardened

···

       25
        
         }) args);

     

       26
        
         kernels = pkgs.linuxKernel.vanillaPackages // {

     

       27
        
           inherit (pkgs.linuxKernel.packages)

     

       0
        
       
     

       28
        
             linux_4_19_hardened

     

       29
        
             linux_5_4_hardened

     

       30
        
             linux_5_10_hardened

+31 -18

pkgs/applications/audio/ardour/6.nix pkgs/applications/audio/ardour/7.nix

···

       1
       -
       { lib, stdenv

     

       0
        
       
     

       2
        
       , fetchgit

     

       0
        
       
     

       3
        
       , alsa-lib

     

       4
        
       , aubio

     

       5
        
       , boost

     
···

       56
        
       }:

     

       57
        
       stdenv.mkDerivation rec {

     

       58
        
         pname = "ardour";

     

       59
       -
         version = "6.9";

     

       60
        
       

     

       61
        
         # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org

     

       62
        
         # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.

     

       63
        
         src = fetchgit {

     

       64
        
           url = "git://git.ardour.org/ardour/ardour.git";

     

       65
        
           rev = version;

     

       66
       -
           sha256 = "0vlcbd70y0an881zv87kc3akmaiz4w7whsy3yaiiqqjww35jg1mm";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       67
        
         };

     

       68
        
       

     

       69
        
         patches = [

     

       70
        
           # AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096

     

       71
        
           ./as-flags.patch

     

       0
        
       
     

       72
        
         ];

     

       73
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
         nativeBuildInputs = [

     

       75
        
           doxygen

     

       76
        
           graphviz # for dot

     
···

       142
        
         # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437

     

       143
        
         # "--use-external-libs"

     

       144
        
       

     

       145
       -
         # Ardour's wscript requires git revision and date to be available.

     

       146
       -
         # Since they are not, let's generate the file manually.

     

       147
       -
         postPatch = ''

     

       148
       -
           printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${version}"; const char* date = ""; }\n' > libs/ardour/revision.cc

     

       149
       -
           sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript

     

       150
       -
           patchShebangs ./tools/

     

       151
       -
           substituteInPlace libs/ardour/video_tools_paths.cc \

     

       152
       -
             --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \

     

       153
       -
             --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'

     

       154
       -
         '';

     

       155
       -
       

     

       156
        
         postInstall = ''

     

       157
        
           # wscript does not install these for some reason

     

       158
        
           install -vDm 644 "build/gtk2_ardour/ardour.xml" \

     

       159
        
             -t "$out/share/mime/packages"

     

       160
       -
           install -vDm 644 "build/gtk2_ardour/ardour6.desktop" \

     

       161
        
             -t "$out/share/applications"

     

       162
        
           for size in 16 22 32 48 256 512; do

     

       163
        
             install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \

     

       164
       -
               "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour6.png"

     

       165
        
           done

     

       166
        
           install -vDm 644 "ardour.1"* -t "$out/share/man/man1"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       167
        
         '' + lib.optionalString videoSupport ''

     

       168
        
           # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.

     

       169
       -
           wrapProgram "$out/bin/ardour6" \

     

       170
        
             --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}"

     

       171
        
         '';

     

       172
        
       

     
···

       185
        
           '';

     

       186
        
           homepage = "https://ardour.org/";

     

       187
        
           license = licenses.gpl2Plus;

     

       188
       -
           mainProgram = "ardour6";

     

       189
        
           platforms = platforms.linux;

     

       190
        
           maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ];

     

       191
        
         };

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
        
       , fetchgit

     

       4
       +
       , fetchzip

     

       5
        
       , alsa-lib

     

       6
        
       , aubio

     

       7
        
       , boost

     
···

       58
        
       }:

     

       59
        
       stdenv.mkDerivation rec {

     

       60
        
         pname = "ardour";

     

       61
       +
         version = "7.5";

     

       62
        
       

     

       63
        
         # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org

     

       64
        
         # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.

     

       65
        
         src = fetchgit {

     

       66
        
           url = "git://git.ardour.org/ardour/ardour.git";

     

       67
        
           rev = version;

     

       68
       +
           hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I=";

     

       69
       +
         };

     

       70
       +
       

     

       71
       +
         bundledContent = fetchzip {

     

       72
       +
           url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip";

     

       73
       +
           hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A=";

     

       74
       +
           # archive does not contain a single folder at the root

     

       75
       +
           stripRoot = false;

     

       76
        
         };

     

       77
        
       

     

       78
        
         patches = [

     

       79
        
           # AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096

     

       80
        
           ./as-flags.patch

     

       81
       +
           ./default-plugin-search-paths.patch

     

       82
        
         ];

     

       83
        
       

     

       84
       +
         # Ardour's wscript requires git revision and date to be available.

     

       85
       +
         # Since they are not, let's generate the file manually.

     

       86
       +
         postPatch = ''

     

       87
       +
           printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${version}"; const char* date = ""; }\n' > libs/ardour/revision.cc

     

       88
       +
           sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript

     

       89
       +
           patchShebangs ./tools/

     

       90
       +
           substituteInPlace libs/ardour/video_tools_paths.cc \

     

       91
       +
             --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \

     

       92
       +
             --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'

     

       93
       +
         '';

     

       94
       +
       

     

       95
        
         nativeBuildInputs = [

     

       96
        
           doxygen

     

       97
        
           graphviz # for dot

     
···

       163
        
         # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437

     

       164
        
         # "--use-external-libs"

     

       165
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       166
        
         postInstall = ''

     

       167
        
           # wscript does not install these for some reason

     

       168
        
           install -vDm 644 "build/gtk2_ardour/ardour.xml" \

     

       169
        
             -t "$out/share/mime/packages"

     

       170
       +
           install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \

     

       171
        
             -t "$out/share/applications"

     

       172
        
           for size in 16 22 32 48 256 512; do

     

       173
        
             install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \

     

       174
       +
               "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png"

     

       175
        
           done

     

       176
        
           install -vDm 644 "ardour.1"* -t "$out/share/man/man1"

     

       177
       +
       

     

       178
       +
           # install additional bundled beats, chords and progressions

     

       179
       +
           cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media"

     

       180
        
         '' + lib.optionalString videoSupport ''

     

       181
        
           # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.

     

       182
       +
           wrapProgram "$out/bin/ardour${lib.versions.major version}" \

     

       183
        
             --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}"

     

       184
        
         '';

     

       185
        
       

     
···

       198
        
           '';

     

       199
        
           homepage = "https://ardour.org/";

     

       200
        
           license = licenses.gpl2Plus;

     

       201
       +
           mainProgram = "ardour7";

     

       202
        
           platforms = platforms.linux;

     

       203
        
           maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ];

     

       204
        
         };

+4 -4

pkgs/applications/audio/ardour/default.nix

···

       54
        
       , vamp-plugin-sdk

     

       55
        
       , wafHook

     

       56
        
       , xjadeo

     

       0
        
       
     

       57
        
       , videoSupport ? true

     

       58
        
       }:

     

       59
        
       stdenv.mkDerivation rec {

     

       60
        
         pname = "ardour";

     

       61
       -
         version = "7.5";

     

       62
        
       

     

       63
        
         # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org

     

       64
        
         # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.

     

       65
        
         src = fetchgit {

     

       66
        
           url = "git://git.ardour.org/ardour/ardour.git";

     

       67
        
           rev = version;

     

       68
       -
           hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I=";

     

       69
        
         };

     

       70
        
       

     

       71
        
         bundledContent = fetchzip {

     
···

       155
        
           "--docs"

     

       156
        
           "--freedesktop"

     

       157
        
           "--no-phone-home"

     

       158
       -
           "--optimize"

     

       159
        
           "--ptformat"

     

       160
        
           "--run-tests"

     

       161
        
           "--test"

     

       162
       -
         ];

     

       163
        
         # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437

     

       164
        
         # "--use-external-libs"

     

       165

···

       54
        
       , vamp-plugin-sdk

     

       55
        
       , wafHook

     

       56
        
       , xjadeo

     

       57
       +
       , optimize ? true # disable to print Lua DSP script output to stdout

     

       58
        
       , videoSupport ? true

     

       59
        
       }:

     

       60
        
       stdenv.mkDerivation rec {

     

       61
        
         pname = "ardour";

     

       62
       +
         version = "8.0";

     

       63
        
       

     

       64
        
         # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org

     

       65
        
         # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.

     

       66
        
         src = fetchgit {

     

       67
        
           url = "git://git.ardour.org/ardour/ardour.git";

     

       68
        
           rev = version;

     

       69
       +
           hash = "sha256-ZL8aTq2OsCWwLUUx5XYbH4eRN+Xz+oMAj9IS07RfTag=";

     

       70
        
         };

     

       71
        
       

     

       72
        
         bundledContent = fetchzip {

     
···

       156
        
           "--docs"

     

       157
        
           "--freedesktop"

     

       158
        
           "--no-phone-home"

     

       0
        
       
     

       159
        
           "--ptformat"

     

       160
        
           "--run-tests"

     

       161
        
           "--test"

     

       162
       +
         ] ++ lib.optional optimize "--optimize";

     

       163
        
         # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437

     

       164
        
         # "--use-external-libs"

     

       165

+2 -2

pkgs/applications/emulators/86box/default.nix

···

       10
        
       

     

       11
        
       stdenv.mkDerivation rec {

     

       12
        
         pname = "86Box";

     

       13
       -
         version = "4.0";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "86Box";

     

       17
        
           repo = "86Box";

     

       18
        
           rev = "v${version}";

     

       19
       -
           hash = "sha256-VTfYCVEbArcYVzh3NkX1yBXhtRnGZ/+khk0KG42fs24=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [

···

       10
        
       

     

       11
        
       stdenv.mkDerivation rec {

     

       12
        
         pname = "86Box";

     

       13
       +
         version = "4.0.1";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "86Box";

     

       17
        
           repo = "86Box";

     

       18
        
           rev = "v${version}";

     

       19
       +
           hash = "sha256-1005Czm4CftL96G0+sKV1wx/ogXTKS0vQAzZHtIMlKA=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/misc/mediainfo-gui/default.nix

···

       6
        
       in

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "mediainfo-gui";

     

       9
       -
         version = "23.07";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
        
           url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";

     

       13
       -
           hash = "sha256-ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

···

       6
        
       in

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "mediainfo-gui";

     

       9
       +
         version = "23.10";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
        
           url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";

     

       13
       +
           hash = "sha256-t0OuJSHZ2Oi5pYUNfCop3jC6d321JzjQ37oXzARnduc=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

+3 -3

pkgs/applications/networking/ipget/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "ipget";

     

       5
       -
         version = "0.9.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "ipfs";

     

       9
        
           repo = "ipget";

     

       10
        
           rev = "v${version}";

     

       11
       -
           hash = "sha256-gcxfsP5awCCau1RqCuXKEdXC2jvpwsGsPkBsiaRlfBU=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorHash = "sha256-qCUa/XbfDrbwPSZywNVK/yn88C7Dsmz0cDTG2Z4ho0Y=";

     

       15
        
       

     

       16
        
         postPatch = ''

     

       17
        
           # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "ipget";

     

       5
       +
         version = "0.10.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "ipfs";

     

       9
        
           repo = "ipget";

     

       10
        
           rev = "v${version}";

     

       11
       +
           hash = "sha256-nT0bMy4L1T2rwE6g3Q4tNkmeP3XyPVxCV9yoGqMZjNs=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorHash = "sha256-q8uwijh3y4l4ebFc3u5Z6TLUUiQqUK6Qpqq/m0kLF14=";

     

       15
        
       

     

       16
        
         postPatch = ''

     

       17
        
           # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies

+2 -2

pkgs/applications/virtualization/qemu/default.nix

···

       48
        
           + lib.optionalString xenSupport "-xen"

     

       49
        
           + lib.optionalString hostCpuOnly "-host-cpu-only"

     

       50
        
           + lib.optionalString nixosTestRunner "-for-vm-tests";

     

       51
       -
         version = "8.1.1";

     

       52
        
       

     

       53
        
         src = fetchurl {

     

       54
        
           url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";

     

       55
       -
           hash = "sha256-N84u9eUA+3UvaBEXxotFEYMD6kmn4mvVQIDO1U+rfe8=";

     

       56
        
         };

     

       57
        
       

     

       58
        
         depsBuildBuild = [ buildPackages.stdenv.cc ]

···

       48
        
           + lib.optionalString xenSupport "-xen"

     

       49
        
           + lib.optionalString hostCpuOnly "-host-cpu-only"

     

       50
        
           + lib.optionalString nixosTestRunner "-for-vm-tests";

     

       51
       +
         version = "8.1.2";

     

       52
        
       

     

       53
        
         src = fetchurl {

     

       54
        
           url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";

     

       55
       +
           hash = "sha256-VBUmp2RXbrSU0v9exGrrJT5i6ikDXRwjwKivTmzU8Ic=";

     

       56
        
         };

     

       57
        
       

     

       58
        
         depsBuildBuild = [ buildPackages.stdenv.cc ]

+23

pkgs/by-name/pr/presenterm/package.nix

···

       1
       +
       { lib, fetchFromGitHub, rustPlatform }:

     

       2
       +
       

     

       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       +
         pname = "presenterm";

     

       5
       +
         version = "0.2.0";

     

       6
       +
       

     

       7
       +
         src = fetchFromGitHub {

     

       8
       +
           owner = "mfontanini";

     

       9
       +
           repo = "presenterm";

     

       10
       +
           rev = version;

     

       11
       +
           hash = "sha256-mNWnUUezKIffh5gMgMMdvApNZZTxxB8XrL0jFLyBxuk=";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         cargoHash = "sha256-JLPJLhWN/yXpPIHa+FJ2aQ/GDUFKtZ7t+/8rvR8WNKM=";

     

       15
       +
       

     

       16
       +
         meta = with lib; {

     

       17
       +
           description = "A terminal based slideshow tool";

     

       18
       +
           homepage = "https://github.com/mfontanini/presenterm";

     

       19
       +
           license = licenses.bsd2;

     

       20
       +
           maintainers = with maintainers; [ mikaelfangel ];

     

       21
       +
           mainProgram = "presenterm";

     

       22
       +
         };

     

       23
       +
       }

+2 -2

pkgs/by-name/ri/rimgo/package.nix

···

       6
        
       }:

     

       7
        
       buildGoModule rec {

     

       8
        
         pname = "rimgo";

     

       9
       -
         version = "1.2.0";

     

       10
        
       

     

       11
        
         src = fetchFromGitea {

     

       12
        
           domain = "codeberg.org";

     

       13
        
           owner = "rimgo";

     

       14
        
           repo = "rimgo";

     

       15
        
           rev = "v${version}";

     

       16
       -
           hash = "sha256-C878ABs978viVtIuv3fPn2F2anOg2GB/+f5jaCO13tc=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         vendorHash = "sha256-u5N7aI9RIQ3EmiyHv0qhMcKkvmpp+5G7xbzdQcbhybs=";

···

       6
        
       }:

     

       7
        
       buildGoModule rec {

     

       8
        
         pname = "rimgo";

     

       9
       +
         version = "1.2.1";

     

       10
        
       

     

       11
        
         src = fetchFromGitea {

     

       12
        
           domain = "codeberg.org";

     

       13
        
           owner = "rimgo";

     

       14
        
           repo = "rimgo";

     

       15
        
           rev = "v${version}";

     

       16
       +
           hash = "sha256-C6xixULZCDs+rIP7IWBVQNo34Yk/8j9ell2D0nUoHBg=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         vendorHash = "sha256-u5N7aI9RIQ3EmiyHv0qhMcKkvmpp+5G7xbzdQcbhybs=";

+2 -2

pkgs/development/libraries/libmediainfo/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "libmediainfo";

     

       5
       -
         version = "23.09";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";

     

       9
       -
           hash = "sha256-HDJvFmVyrGwsHIim1Tr35FE4iEDH7r7scdWrv9G7LtM=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "libmediainfo";

     

       5
       +
         version = "23.10";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";

     

       9
       +
           hash = "sha256-duvlAuDzELVZ1d2Qcn2ar9X6uq7KNELzjmKd/AfaDSI=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

-36

pkgs/development/libraries/lightstep-tracer-cpp/default.nix

···

       1
       -
       { stdenv, lib, fetchFromGitHub, pkg-config, cmake

     

       2
       -
       , opentracing-cpp, protobuf

     

       3
       -
       , enableGrpc ? false, grpc, openssl

     

       4
       -
       }:

     

       5
       -
       

     

       6
       -
       stdenv.mkDerivation rec {

     

       7
       -
         pname = "lightstep-tracer-cpp";

     

       8
       -
         version = "0.14.0";

     

       9
       -
       

     

       10
       -
         src = fetchFromGitHub {

     

       11
       -
           owner = "lightstep";

     

       12
       -
           repo = pname;

     

       13
       -
           rev = "v${version}";

     

       14
       -
           sha256 = "1xr11dm94qpbx3nxb7si7zy7hzg2akj01pyxkd8pzzbvmkmic16j";

     

       15
       -
         };

     

       16
       -
       

     

       17
       -
         nativeBuildInputs = [

     

       18
       -
           cmake pkg-config

     

       19
       -
         ];

     

       20
       -
       

     

       21
       -
         buildInputs = [

     

       22
       -
           opentracing-cpp protobuf

     

       23
       -
         ] ++ lib.optionals enableGrpc [

     

       24
       -
           grpc openssl

     

       25
       -
         ];

     

       26
       -
       

     

       27
       -
         cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ];

     

       28
       -
       

     

       29
       -
         meta = with lib; {

     

       30
       -
           description = "Distributed tracing system built on top of the OpenTracing standard";

     

       31
       -
           homepage = "https://lightstep.com/";

     

       32
       -
           license = licenses.mit;

     

       33
       -
           platforms = platforms.linux;

     

       34
       -
           maintainers = with maintainers; [ ];

     

       35
       -
         };

     

       36
       -
       }

+3 -3

pkgs/development/python-modules/pycatch22/default.nix

···

       8
        
       

     

       9
        
       buildPythonPackage rec {

     

       10
        
         pname = "pycatch22";

     

       11
       -
         version = "0.4.3";

     

       12
        
         pyproject = true;

     

       13
        
       

     

       14
        
         disabled = pythonOlder "3.7";

     
···

       17
        
           owner = "DynamicsAndNeuralSystems";

     

       18
        
           repo = "pycatch22";

     

       19
        
           rev = "refs/tags/v${version}";

     

       20
       -
           hash = "sha256-wjMklOzU9I3Y2HdZ+rOTiffoKda+6X9zwDsmB+HXrSY=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

     
···

       46
        
           description = "Python implementation of catch22";

     

       47
        
           homepage = "https://github.com/DynamicsAndNeuralSystems/pycatch22";

     

       48
        
           changelog = "https://github.com/DynamicsAndNeuralSystems/pycatch22/releases/tag/v${version}";

     

       49
       -
           license = licenses.gpl3Only;

     

       50
        
           maintainers = with maintainers; [ mbalatsko ];

     

       51
        
         };

     

       52
        
       }

···

       8
        
       

     

       9
        
       buildPythonPackage rec {

     

       10
        
         pname = "pycatch22";

     

       11
       +
         version = "0.4.4";

     

       12
        
         pyproject = true;

     

       13
        
       

     

       14
        
         disabled = pythonOlder "3.7";

     
···

       17
        
           owner = "DynamicsAndNeuralSystems";

     

       18
        
           repo = "pycatch22";

     

       19
        
           rev = "refs/tags/v${version}";

     

       20
       +
           hash = "sha256-l41LLo9k075EL8rV48bwa4Yw12XuqNJSDYtd9kyqS3U=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

     
···

       46
        
           description = "Python implementation of catch22";

     

       47
        
           homepage = "https://github.com/DynamicsAndNeuralSystems/pycatch22";

     

       48
        
           changelog = "https://github.com/DynamicsAndNeuralSystems/pycatch22/releases/tag/v${version}";

     

       49
       +
           license = licenses.gpl3Plus;

     

       50
        
           maintainers = with maintainers; [ mbalatsko ];

     

       51
        
         };

     

       52
        
       }

+5 -3

pkgs/development/tools/misc/runme/default.nix

···

       3
        
       , fetchFromGitHub

     

       4
        
       , installShellFiles

     

       5
        
       , nodejs

     

       0
        
       
     

       6
        
       , runtimeShell

     

       7
        
       , stdenv

     

       8
        
       , testers

     
···

       11
        
       

     

       12
        
       buildGo121Module rec {

     

       13
        
         pname = "runme";

     

       14
       -
         version = "1.7.6";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "stateful";

     

       18
        
           repo = "runme";

     

       19
        
           rev = "v${version}";

     

       20
       -
           hash = "sha256-gYaC1ROvW4wFrOKt1Wjl/ExhWX0ZQXHW6n6N70tXa+E=";

     

       21
        
         };

     

       22
        
       

     

       23
       -
         vendorHash = "sha256-/eofPpXmfpc7Vjz97hjKXH/Fl/EAk0zrnI279iit7MI=";

     

       24
        
       

     

       25
        
         nativeBuildInputs = [

     

       26
        
           installShellFiles

     
···

       28
        
       

     

       29
        
         nativeCheckInputs = [

     

       30
        
           nodejs

     

       0
        
       
     

       31
        
         ];

     

       32
        
       

     

       33
        
         subPackages = [

···

       3
        
       , fetchFromGitHub

     

       4
        
       , installShellFiles

     

       5
        
       , nodejs

     

       6
       +
       , python3

     

       7
        
       , runtimeShell

     

       8
        
       , stdenv

     

       9
        
       , testers

     
···

       12
        
       

     

       13
        
       buildGo121Module rec {

     

       14
        
         pname = "runme";

     

       15
       +
         version = "1.7.7";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "stateful";

     

       19
        
           repo = "runme";

     

       20
        
           rev = "v${version}";

     

       21
       +
           hash = "sha256-ZM8gdZ26XAlC+j6U0+oQJIb+5gOGFUAYHPP82kA1ogU=";

     

       22
        
         };

     

       23
        
       

     

       24
       +
         vendorHash = "sha256-nKH4hT0J9QfrDdvovu/XNxU4PtZYKkfqEBiCTNLWyRA=";

     

       25
        
       

     

       26
        
         nativeBuildInputs = [

     

       27
        
           installShellFiles

     
···

       29
        
       

     

       30
        
         nativeCheckInputs = [

     

       31
        
           nodejs

     

       32
       +
           python3

     

       33
        
         ];

     

       34
        
       

     

       35
        
         subPackages = [

-784

pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch

···

       1
       -
       commit 827b86ad1dd21feed4c0b99faf6059f245f7dadb

     

       2
       -
       Author: Tejun Heo <tj@kernel.org>

     

       3
       -
       Date:   Fri Mar 11 07:31:23 2016 -0500

     

       4
       -
       

     

       5
       -
           sched: Misc preps for cgroup unified hierarchy interface

     

       6
       -
           

     

       7
       -
           Make the following changes in preparation for the cpu controller

     

       8
       -
           interface implementation for the unified hierarchy.  This patch

     

       9
       -
           doesn't cause any functional differences.

     

       10
       -
           

     

       11
       -
           * s/cpu_stats_show()/cpu_cfs_stats_show()/

     

       12
       -
           

     

       13
       -
           * s/cpu_files/cpu_legacy_files/

     

       14
       -
           

     

       15
       -
           * Separate out cpuacct_stats_read() from cpuacct_stats_show().  While

     

       16
       -
             at it, make the @val array u64 for consistency.

     

       17
       -
           

     

       18
       -
           Signed-off-by: Tejun Heo <tj@kernel.org>

     

       19
       -
           Cc: Ingo Molnar <mingo@redhat.com>

     

       20
       -
           Cc: Peter Zijlstra <peterz@infradead.org>

     

       21
       -
           Cc: Li Zefan <lizefan@huawei.com>

     

       22
       -
           Cc: Johannes Weiner <hannes@cmpxchg.org>

     

       23
       -
       

     

       24
       -
       diff --git a/kernel/sched/core.c b/kernel/sched/core.c

     

       25
       -
       index 3b31fc05a0f1..a1b95e83fa87 100644

     

       26
       -
       --- a/kernel/sched/core.c

     

       27
       -
       +++ b/kernel/sched/core.c

     

       28
       -
       @@ -7174,7 +7174,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota)

     

       29
       -
        	return ret;

     

       30
       -
        }

     

       31
       -
        

     

       32
       -
       -static int cpu_stats_show(struct seq_file *sf, void *v)

     

       33
       -
       +static int cpu_cfs_stats_show(struct seq_file *sf, void *v)

     

       34
       -
        {

     

       35
       -
        	struct task_group *tg = css_tg(seq_css(sf));

     

       36
       -
        	struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;

     

       37
       -
       @@ -7214,7 +7214,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css,

     

       38
       -
        }

     

       39
       -
        #endif /* CONFIG_RT_GROUP_SCHED */

     

       40
       -
        

     

       41
       -
       -static struct cftype cpu_files[] = {

     

       42
       -
       +static struct cftype cpu_legacy_files[] = {

     

       43
       -
        #ifdef CONFIG_FAIR_GROUP_SCHED

     

       44
       -
        	{

     

       45
       -
        		.name = "shares",

     

       46
       -
       @@ -7235,7 +7235,7 @@ static struct cftype cpu_files[] = {

     

       47
       -
        	},

     

       48
       -
        	{

     

       49
       -
        		.name = "stat",

     

       50
       -
       -		.seq_show = cpu_stats_show,

     

       51
       -
       +		.seq_show = cpu_cfs_stats_show,

     

       52
       -
        	},

     

       53
       -
        #endif

     

       54
       -
        #ifdef CONFIG_RT_GROUP_SCHED

     

       55
       -
       @@ -7261,7 +7261,7 @@ struct cgroup_subsys cpu_cgrp_subsys = {

     

       56
       -
        	.fork		= cpu_cgroup_fork,

     

       57
       -
        	.can_attach	= cpu_cgroup_can_attach,

     

       58
       -
        	.attach		= cpu_cgroup_attach,

     

       59
       -
       -	.legacy_cftypes	= cpu_files,

     

       60
       -
       +	.legacy_cftypes	= cpu_legacy_files,

     

       61
       -
        	.early_init	= true,

     

       62
       -
        };

     

       63
       -
        

     

       64
       -
       diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c

     

       65
       -
       index f95ab29a45d0..6151c23f722f 100644

     

       66
       -
       --- a/kernel/sched/cpuacct.c

     

       67
       -
       +++ b/kernel/sched/cpuacct.c

     

       68
       -
       @@ -276,26 +276,33 @@ static int cpuacct_all_seq_show(struct seq_file *m, void *V)

     

       69
       -
        	return 0;

     

       70
       -
        }

     

       71
       -
        

     

       72
       -
       -static int cpuacct_stats_show(struct seq_file *sf, void *v)

     

       73
       -
       +static void cpuacct_stats_read(struct cpuacct *ca,

     

       74
       -
       +			       u64 (*val)[CPUACCT_STAT_NSTATS])

     

       75
       -
        {

     

       76
       -
       -	struct cpuacct *ca = css_ca(seq_css(sf));

     

       77
       -
       -	s64 val[CPUACCT_STAT_NSTATS];

     

       78
       -
        	int cpu;

     

       79
       -
       -	int stat;

     

       80
       -
        

     

       81
       -
       -	memset(val, 0, sizeof(val));

     

       82
       -
       +	memset(val, 0, sizeof(*val));

     

       83
       -
       +

     

       84
       -
        	for_each_possible_cpu(cpu) {

     

       85
       -
        		u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat;

     

       86
       -
        

     

       87
       -
       -		val[CPUACCT_STAT_USER]   += cpustat[CPUTIME_USER];

     

       88
       -
       -		val[CPUACCT_STAT_USER]   += cpustat[CPUTIME_NICE];

     

       89
       -
       -		val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM];

     

       90
       -
       -		val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ];

     

       91
       -
       -		val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ];

     

       92
       -
       +		(*val)[CPUACCT_STAT_USER]   += cpustat[CPUTIME_USER];

     

       93
       -
       +		(*val)[CPUACCT_STAT_USER]   += cpustat[CPUTIME_NICE];

     

       94
       -
       +		(*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM];

     

       95
       -
       +		(*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ];

     

       96
       -
       +		(*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ];

     

       97
       -
        	}

     

       98
       -
       +}

     

       99
       -
       +

     

       100
       -
       +static int cpuacct_stats_show(struct seq_file *sf, void *v)

     

       101
       -
       +{

     

       102
       -
       +	u64 val[CPUACCT_STAT_NSTATS];

     

       103
       -
       +	int stat;

     

       104
       -
       +

     

       105
       -
       +	cpuacct_stats_read(css_ca(seq_css(sf)), &val);

     

       106
       -
        

     

       107
       -
        	for (stat = 0; stat < CPUACCT_STAT_NSTATS; stat++) {

     

       108
       -
       -		seq_printf(sf, "%s %lld\n",

     

       109
       -
       +		seq_printf(sf, "%s %llu\n",

     

       110
       -
        			   cpuacct_stat_desc[stat],

     

       111
       -
        			   (long long)nsec_to_clock_t(val[stat]));

     

       112
       -
        	}

     

       113
       -
       

     

       114
       -
       commit fdb64d002b3a223ce4bb11aa4448a42050470052

     

       115
       -
       Author: Tejun Heo <tj@kernel.org>

     

       116
       -
       Date:   Fri Mar 11 07:31:23 2016 -0500

     

       117
       -
       

     

       118
       -
           sched: Implement interface for cgroup unified hierarchy

     

       119
       -
           

     

       120
       -
           While the cpu controller doesn't have any functional problems, there

     

       121
       -
           are a couple interface issues which can be addressed in the v2

     

       122
       -
           interface.

     

       123
       -
           

     

       124
       -
           * cpuacct being a separate controller.  This separation is artificial

     

       125
       -
             and rather pointless as demonstrated by most use cases co-mounting

     

       126
       -
             the two controllers.  It also forces certain information to be

     

       127
       -
             accounted twice.

     

       128
       -
           

     

       129
       -
           * Use of different time units.  Writable control knobs use

     

       130
       -
             microseconds, some stat fields use nanoseconds while other cpuacct

     

       131
       -
             stat fields use centiseconds.

     

       132
       -
           

     

       133
       -
           * Control knobs which can't be used in the root cgroup still show up

     

       134
       -
             in the root.

     

       135
       -
           

     

       136
       -
           * Control knob names and semantics aren't consistent with other

     

       137
       -
             controllers.

     

       138
       -
           

     

       139
       -
           This patchset implements cpu controller's interface on the unified

     

       140
       -
           hierarchy which adheres to the controller file conventions described

     

       141
       -
           in Documentation/cgroups/unified-hierarchy.txt.  Overall, the

     

       142
       -
           following changes are made.

     

       143
       -
           

     

       144
       -
           * cpuacct is implictly enabled and disabled by cpu and its information

     

       145
       -
             is reported through "cpu.stat" which now uses microseconds for all

     

       146
       -
             time durations.  All time duration fields now have "_usec" appended

     

       147
       -
             to them for clarity.  While this doesn't solve the double accounting

     

       148
       -
             immediately, once majority of users switch to v2, cpu can directly

     

       149
       -
             account and report the relevant stats and cpuacct can be disabled on

     

       150
       -
             the unified hierarchy.

     

       151
       -
           

     

       152
       -
             Note that cpuacct.usage_percpu is currently not included in

     

       153
       -
             "cpu.stat".  If this information is actually called for, it can be

     

       154
       -
             added later.

     

       155
       -
           

     

       156
       -
           * "cpu.shares" is replaced with "cpu.weight" and operates on the

     

       157
       -
             standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000).

     

       158
       -
             The weight is scaled to scheduler weight so that 100 maps to 1024

     

       159
       -
             and the ratio relationship is preserved - if weight is W and its

     

       160
       -
             scaled value is S, W / 100 == S / 1024.  While the mapped range is a

     

       161
       -
             bit smaller than the orignal scheduler weight range, the dead zones

     

       162
       -
             on both sides are relatively small and covers wider range than the

     

       163
       -
             nice value mappings.  This file doesn't make sense in the root

     

       164
       -
             cgroup and isn't create on root.

     

       165
       -
           

     

       166
       -
           * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max"

     

       167
       -
             which contains both quota and period.

     

       168
       -
           

     

       169
       -
           * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by

     

       170
       -
             "cpu.rt.max" which contains both runtime and period.

     

       171
       -
           

     

       172
       -
           v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for

     

       173
       -
               CFS bandwidth stats and also using raw division for u64.  Use

     

       174
       -
               CONFIG_CFS_BANDWITH and do_div() instead.

     

       175
       -
           

     

       176
       -
               The semantics of "cpu.rt.max" is not fully decided yet.  Dropped

     

       177
       -
               for now.

     

       178
       -
           

     

       179
       -
           Signed-off-by: Tejun Heo <tj@kernel.org>

     

       180
       -
           Cc: Ingo Molnar <mingo@redhat.com>

     

       181
       -
           Cc: Peter Zijlstra <peterz@infradead.org>

     

       182
       -
           Cc: Li Zefan <lizefan@huawei.com>

     

       183
       -
           Cc: Johannes Weiner <hannes@cmpxchg.org>

     

       184
       -
       

     

       185
       -
       diff --git a/kernel/sched/core.c b/kernel/sched/core.c

     

       186
       -
       index a1b95e83fa87..f01d56e58a1b 100644

     

       187
       -
       --- a/kernel/sched/core.c

     

       188
       -
       +++ b/kernel/sched/core.c

     

       189
       -
       @@ -7253,6 +7253,139 @@ static struct cftype cpu_legacy_files[] = {

     

       190
       -
        	{ }	/* Terminate */

     

       191
       -
        };

     

       192
       -
        

     

       193
       -
       +static int cpu_stats_show(struct seq_file *sf, void *v)

     

       194
       -
       +{

     

       195
       -
       +	cpuacct_cpu_stats_show(sf);

     

       196
       -
       +

     

       197
       -
       +#ifdef CONFIG_CFS_BANDWIDTH

     

       198
       -
       +	{

     

       199
       -
       +		struct task_group *tg = css_tg(seq_css(sf));

     

       200
       -
       +		struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;

     

       201
       -
       +		u64 throttled_usec;

     

       202
       -
       +

     

       203
       -
       +		throttled_usec = cfs_b->throttled_time;

     

       204
       -
       +		do_div(throttled_usec, NSEC_PER_USEC);

     

       205
       -
       +

     

       206
       -
       +		seq_printf(sf, "nr_periods %d\n"

     

       207
       -
       +			   "nr_throttled %d\n"

     

       208
       -
       +			   "throttled_usec %llu\n",

     

       209
       -
       +			   cfs_b->nr_periods, cfs_b->nr_throttled,

     

       210
       -
       +			   throttled_usec);

     

       211
       -
       +	}

     

       212
       -
       +#endif

     

       213
       -
       +	return 0;

     

       214
       -
       +}

     

       215
       -
       +

     

       216
       -
       +#ifdef CONFIG_FAIR_GROUP_SCHED

     

       217
       -
       +static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css,

     

       218
       -
       +			       struct cftype *cft)

     

       219
       -
       +{

     

       220
       -
       +	struct task_group *tg = css_tg(css);

     

       221
       -
       +	u64 weight = scale_load_down(tg->shares);

     

       222
       -
       +

     

       223
       -
       +	return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024);

     

       224
       -
       +}

     

       225
       -
       +

     

       226
       -
       +static int cpu_weight_write_u64(struct cgroup_subsys_state *css,

     

       227
       -
       +				struct cftype *cftype, u64 weight)

     

       228
       -
       +{

     

       229
       -
       +	/*

     

       230
       -
       +	 * cgroup weight knobs should use the common MIN, DFL and MAX

     

       231
       -
       +	 * values which are 1, 100 and 10000 respectively.  While it loses

     

       232
       -
       +	 * a bit of range on both ends, it maps pretty well onto the shares

     

       233
       -
       +	 * value used by scheduler and the round-trip conversions preserve

     

       234
       -
       +	 * the original value over the entire range.

     

       235
       -
       +	 */

     

       236
       -
       +	if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX)

     

       237
       -
       +		return -ERANGE;

     

       238
       -
       +

     

       239
       -
       +	weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL);

     

       240
       -
       +

     

       241
       -
       +	return sched_group_set_shares(css_tg(css), scale_load(weight));

     

       242
       -
       +}

     

       243
       -
       +#endif

     

       244
       -
       +

     

       245
       -
       +static void __maybe_unused cpu_period_quota_print(struct seq_file *sf,

     

       246
       -
       +						  long period, long quota)

     

       247
       -
       +{

     

       248
       -
       +	if (quota < 0)

     

       249
       -
       +		seq_puts(sf, "max");

     

       250
       -
       +	else

     

       251
       -
       +		seq_printf(sf, "%ld", quota);

     

       252
       -
       +

     

       253
       -
       +	seq_printf(sf, " %ld\n", period);

     

       254
       -
       +}

     

       255
       -
       +

     

       256
       -
       +/* caller should put the current value in *@periodp before calling */

     

       257
       -
       +static int __maybe_unused cpu_period_quota_parse(char *buf,

     

       258
       -
       +						 u64 *periodp, u64 *quotap)

     

       259
       -
       +{

     

       260
       -
       +	char tok[21];	/* U64_MAX */

     

       261
       -
       +

     

       262
       -
       +	if (!sscanf(buf, "%s %llu", tok, periodp))

     

       263
       -
       +		return -EINVAL;

     

       264
       -
       +

     

       265
       -
       +	*periodp *= NSEC_PER_USEC;

     

       266
       -
       +

     

       267
       -
       +	if (sscanf(tok, "%llu", quotap))

     

       268
       -
       +		*quotap *= NSEC_PER_USEC;

     

       269
       -
       +	else if (!strcmp(tok, "max"))

     

       270
       -
       +		*quotap = RUNTIME_INF;

     

       271
       -
       +	else

     

       272
       -
       +		return -EINVAL;

     

       273
       -
       +

     

       274
       -
       +	return 0;

     

       275
       -
       +}

     

       276
       -
       +

     

       277
       -
       +#ifdef CONFIG_CFS_BANDWIDTH

     

       278
       -
       +static int cpu_max_show(struct seq_file *sf, void *v)

     

       279
       -
       +{

     

       280
       -
       +	struct task_group *tg = css_tg(seq_css(sf));

     

       281
       -
       +

     

       282
       -
       +	cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg));

     

       283
       -
       +	return 0;

     

       284
       -
       +}

     

       285
       -
       +

     

       286
       -
       +static ssize_t cpu_max_write(struct kernfs_open_file *of,

     

       287
       -
       +			     char *buf, size_t nbytes, loff_t off)

     

       288
       -
       +{

     

       289
       -
       +	struct task_group *tg = css_tg(of_css(of));

     

       290
       -
       +	u64 period = tg_get_cfs_period(tg);

     

       291
       -
       +	u64 quota;

     

       292
       -
       +	int ret;

     

       293
       -
       +

     

       294
       -
       +	ret = cpu_period_quota_parse(buf, &period, &quota);

     

       295
       -
       +	if (!ret)

     

       296
       -
       +		ret = tg_set_cfs_bandwidth(tg, period, quota);

     

       297
       -
       +	return ret ?: nbytes;

     

       298
       -
       +}

     

       299
       -
       +#endif

     

       300
       -
       +

     

       301
       -
       +static struct cftype cpu_files[] = {

     

       302
       -
       +	{

     

       303
       -
       +		.name = "stat",

     

       304
       -
       +		.flags = CFTYPE_NOT_ON_ROOT,

     

       305
       -
       +		.seq_show = cpu_stats_show,

     

       306
       -
       +	},

     

       307
       -
       +#ifdef CONFIG_FAIR_GROUP_SCHED

     

       308
       -
       +	{

     

       309
       -
       +		.name = "weight",

     

       310
       -
       +		.flags = CFTYPE_NOT_ON_ROOT,

     

       311
       -
       +		.read_u64 = cpu_weight_read_u64,

     

       312
       -
       +		.write_u64 = cpu_weight_write_u64,

     

       313
       -
       +	},

     

       314
       -
       +#endif

     

       315
       -
       +#ifdef CONFIG_CFS_BANDWIDTH

     

       316
       -
       +	{

     

       317
       -
       +		.name = "max",

     

       318
       -
       +		.flags = CFTYPE_NOT_ON_ROOT,

     

       319
       -
       +		.seq_show = cpu_max_show,

     

       320
       -
       +		.write = cpu_max_write,

     

       321
       -
       +	},

     

       322
       -
       +#endif

     

       323
       -
       +	{ }	/* terminate */

     

       324
       -
       +};

     

       325
       -
       +

     

       326
       -
        struct cgroup_subsys cpu_cgrp_subsys = {

     

       327
       -
        	.css_alloc	= cpu_cgroup_css_alloc,

     

       328
       -
        	.css_online	= cpu_cgroup_css_online,

     

       329
       -
       @@ -7262,7 +7395,15 @@ struct cgroup_subsys cpu_cgrp_subsys = {

     

       330
       -
        	.can_attach	= cpu_cgroup_can_attach,

     

       331
       -
        	.attach		= cpu_cgroup_attach,

     

       332
       -
        	.legacy_cftypes	= cpu_legacy_files,

     

       333
       -
       +	.dfl_cftypes	= cpu_files,

     

       334
       -
        	.early_init	= true,

     

       335
       -
       +#ifdef CONFIG_CGROUP_CPUACCT

     

       336
       -
       +	/*

     

       337
       -
       +	 * cpuacct is enabled together with cpu on the unified hierarchy

     

       338
       -
       +	 * and its stats are reported through "cpu.stat".

     

       339
       -
       +	 */

     

       340
       -
       +	.depends_on	= 1 << cpuacct_cgrp_id,

     

       341
       -
       +#endif

     

       342
       -
        };

     

       343
       -
        

     

       344
       -
        #endif	/* CONFIG_CGROUP_SCHED */

     

       345
       -
       diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c

     

       346
       -
       index 6151c23f722f..fc1cf13c3af1 100644

     

       347
       -
       --- a/kernel/sched/cpuacct.c

     

       348
       -
       +++ b/kernel/sched/cpuacct.c

     

       349
       -
       @@ -347,6 +347,31 @@ static struct cftype files[] = {

     

       350
       -
        	{ }	/* terminate */

     

       351
       -
        };

     

       352
       -
        

     

       353
       -
       +/* used to print cpuacct stats in cpu.stat on the unified hierarchy */

     

       354
       -
       +void cpuacct_cpu_stats_show(struct seq_file *sf)

     

       355
       -
       +{

     

       356
       -
       +	struct cgroup_subsys_state *css;

     

       357
       -
       +	u64 usage, val[CPUACCT_STAT_NSTATS];

     

       358
       -
       +

     

       359
       -
       +	css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys);

     

       360
       -
       +

     

       361
       -
       +	usage = cpuusage_read(css, seq_cft(sf));

     

       362
       -
       +	cpuacct_stats_read(css_ca(css), &val);

     

       363
       -
       +

     

       364
       -
       +	val[CPUACCT_STAT_USER] *= TICK_NSEC;

     

       365
       -
       +	val[CPUACCT_STAT_SYSTEM] *= TICK_NSEC;

     

       366
       -
       +	do_div(usage, NSEC_PER_USEC);

     

       367
       -
       +	do_div(val[CPUACCT_STAT_USER], NSEC_PER_USEC);

     

       368
       -
       +	do_div(val[CPUACCT_STAT_SYSTEM], NSEC_PER_USEC);

     

       369
       -
       +

     

       370
       -
       +	seq_printf(sf, "usage_usec %llu\n"

     

       371
       -
       +		   "user_usec %llu\n"

     

       372
       -
       +		   "system_usec %llu\n",

     

       373
       -
       +		   usage, val[CPUACCT_STAT_USER], val[CPUACCT_STAT_SYSTEM]);

     

       374
       -
       +

     

       375
       -
       +	css_put(css);

     

       376
       -
       +}

     

       377
       -
       +

     

       378
       -
        /*

     

       379
       -
         * charge this task's execution time to its accounting group.

     

       380
       -
         *

     

       381
       -
       diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h

     

       382
       -
       index ba72807c73d4..ddf7af466d35 100644

     

       383
       -
       --- a/kernel/sched/cpuacct.h

     

       384
       -
       +++ b/kernel/sched/cpuacct.h

     

       385
       -
       @@ -2,6 +2,7 @@

     

       386
       -
        

     

       387
       -
        extern void cpuacct_charge(struct task_struct *tsk, u64 cputime);

     

       388
       -
        extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val);

     

       389
       -
       +extern void cpuacct_cpu_stats_show(struct seq_file *sf);

     

       390
       -
        

     

       391
       -
        #else

     

       392
       -
        

     

       393
       -
       @@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *tsk, int index, u64 val)

     

       394
       -
        {

     

       395
       -
        }

     

       396
       -
        

     

       397
       -
       +static inline void cpuacct_cpu_stats_show(struct seq_file *sf)

     

       398
       -
       +{

     

       399
       -
       +}

     

       400
       -
       +

     

       401
       -
        #endif

     

       402
       -
       

     

       403
       -
       commit 8dde150866b8c433216105c50b7e889d5242d583

     

       404
       -
       Author: Tejun Heo <tj@kernel.org>

     

       405
       -
       Date:   Fri Aug 5 12:41:01 2016 -0400

     

       406
       -
       

     

       407
       -
           cgroup: add documentation regarding CPU controller cgroup v2 support

     

       408
       -
           

     

       409
       -
           Signed-off-by: Tejun Heo <tj@kernel.org>

     

       410
       -
       

     

       411
       -
       diff --git a/Documentation/cgroup-v2-cpu.txt b/Documentation/cgroup-v2-cpu.txt

     

       412
       -
       new file mode 100644

     

       413
       -
       index 000000000000..1ed7032d4472

     

       414
       -
       --- /dev/null

     

       415
       -
       +++ b/Documentation/cgroup-v2-cpu.txt

     

       416
       -
       @@ -0,0 +1,368 @@

     

       417
       -
       +

     

       418
       -
       +

     

       419
       -
       +CPU Controller on Control Group v2

     

       420
       -
       +

     

       421
       -
       +August, 2016		Tejun Heo <tj@kernel.org>

     

       422
       -
       +

     

       423
       -
       +

     

       424
       -
       +While most controllers have support for cgroup v2 now, the CPU

     

       425
       -
       +controller support is not upstream yet due to objections from the

     

       426
       -
       +scheduler maintainers on the basic designs of cgroup v2.  This

     

       427
       -
       +document explains the current situation as well as an interim

     

       428
       -
       +solution, and details the disagreements and arguments.  The latest

     

       429
       -
       +version of this document can be found at the following URL.

     

       430
       -
       +

     

       431
       -
       + https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu

     

       432
       -
       +

     

       433
       -
       +This document was posted to the linux-kernel and cgroup mailing lists.

     

       434
       -
       +Unfortunately, no consensus was reached as of Oct, 2016.  The thread

     

       435
       -
       +can be found at the following URL.

     

       436
       -
       +

     

       437
       -
       + http://lkml.kernel.org/r/20160805170752.GK2542@mtj.duckdns.org

     

       438
       -
       +

     

       439
       -
       +

     

       440
       -
       +CONTENTS

     

       441
       -
       +

     

       442
       -
       +1. Current Situation and Interim Solution

     

       443
       -
       +2. Disagreements and Arguments

     

       444
       -
       +  2-1. Contentious Restrictions

     

       445
       -
       +    2-1-1. Process Granularity

     

       446
       -
       +    2-1-2. No Internal Process Constraint

     

       447
       -
       +  2-2. Impact on CPU Controller

     

       448
       -
       +    2-2-1. Impact of Process Granularity

     

       449
       -
       +    2-2-2. Impact of No Internal Process Constraint

     

       450
       -
       +  2-3. Arguments for cgroup v2

     

       451
       -
       +3. Way Forward

     

       452
       -
       +4. References

     

       453
       -
       +

     

       454
       -
       +

     

       455
       -
       +1. Current Situation and Interim Solution

     

       456
       -
       +

     

       457
       -
       +All objections from the scheduler maintainers apply to cgroup v2 core

     

       458
       -
       +design, and there are no known objections to the specifics of the CPU

     

       459
       -
       +controller cgroup v2 interface.  The only blocked part is changes to

     

       460
       -
       +expose the CPU controller interface on cgroup v2, which comprises the

     

       461
       -
       +following two patches:

     

       462
       -
       +

     

       463
       -
       + [1] sched: Misc preps for cgroup unified hierarchy interface

     

       464
       -
       + [2] sched: Implement interface for cgroup unified hierarchy

     

       465
       -
       +

     

       466
       -
       +The necessary changes are superficial and implement the interface

     

       467
       -
       +files on cgroup v2.  The combined diffstat is as follows.

     

       468
       -
       +

     

       469
       -
       + kernel/sched/core.c    |  149 +++++++++++++++++++++++++++++++++++++++++++++++--

     

       470
       -
       + kernel/sched/cpuacct.c |   57 ++++++++++++------

     

       471
       -
       + kernel/sched/cpuacct.h |    5 +

     

       472
       -
       + 3 files changed, 189 insertions(+), 22 deletions(-)

     

       473
       -
       +

     

       474
       -
       +The patches are easy to apply and forward-port.  The following git

     

       475
       -
       +branch will always carry the two patches on top of the latest release

     

       476
       -
       +of the upstream kernel.

     

       477
       -
       +

     

       478
       -
       + git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu

     

       479
       -
       +

     

       480
       -
       +There also are versioned branches going back to v4.4.

     

       481
       -
       +

     

       482
       -
       + git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu-$KERNEL_VER

     

       483
       -
       +

     

       484
       -
       +While it's difficult to tell whether the CPU controller support will

     

       485
       -
       +be merged, there are crucial resource control features in cgroup v2

     

       486
       -
       +that are only possible due to the design choices that are being

     

       487
       -
       +objected to, and every effort will be made to ease enabling the CPU

     

       488
       -
       +controller cgroup v2 support out-of-tree for parties which choose to.

     

       489
       -
       +

     

       490
       -
       +

     

       491
       -
       +2. Disagreements and Arguments

     

       492
       -
       +

     

       493
       -
       +There have been several lengthy discussion threads [3][4] on LKML

     

       494
       -
       +around the structural constraints of cgroup v2.  The two that affect

     

       495
       -
       +the CPU controller are process granularity and no internal process

     

       496
       -
       +constraint.  Both arise primarily from the need for common resource

     

       497
       -
       +domain definition across different resources.

     

       498
       -
       +

     

       499
       -
       +The common resource domain is a powerful concept in cgroup v2 that

     

       500
       -
       +allows controllers to make basic assumptions about the structural

     

       501
       -
       +organization of processes and controllers inside the cgroup hierarchy,

     

       502
       -
       +and thus solve problems spanning multiple types of resources.  The

     

       503
       -
       +prime example for this is page cache writeback: dirty page cache is

     

       504
       -
       +regulated through throttling buffered writers based on memory

     

       505
       -
       +availability, and initiating batched write outs to the disk based on

     

       506
       -
       +IO capacity.  Tracking and controlling writeback inside a cgroup thus

     

       507
       -
       +requires the direct cooperation of the memory and the IO controller.

     

       508
       -
       +

     

       509
       -
       +This easily extends to other areas, such as CPU cycles consumed while

     

       510
       -
       +performing memory reclaim or IO encryption.

     

       511
       -
       +

     

       512
       -
       +

     

       513
       -
       +2-1. Contentious Restrictions

     

       514
       -
       +

     

       515
       -
       +For controllers of different resources to work together, they must

     

       516
       -
       +agree on a common organization.  This uniform model across controllers

     

       517
       -
       +imposes two contentious restrictions on the CPU controller: process

     

       518
       -
       +granularity and the no-internal-process constraint.

     

       519
       -
       +

     

       520
       -
       +

     

       521
       -
       +  2-1-1. Process Granularity

     

       522
       -
       +

     

       523
       -
       +  For memory, because an address space is shared between all threads

     

       524
       -
       +  of a process, the terminal consumer is a process, not a thread.

     

       525
       -
       +  Separating the threads of a single process into different memory

     

       526
       -
       +  control domains doesn't make semantical sense.  cgroup v2 ensures

     

       527
       -
       +  that all controller can agree on the same organization by requiring

     

       528
       -
       +  that threads of the same process belong to the same cgroup.

     

       529
       -
       +

     

       530
       -
       +  There are other reasons to enforce process granularity.  One

     

       531
       -
       +  important one is isolating system-level management operations from

     

       532
       -
       +  in-process application operations.  The cgroup interface, being a

     

       533
       -
       +  virtual filesystem, is very unfit for multiple independent

     

       534
       -
       +  operations taking place at the same time as most operations have to

     

       535
       -
       +  be multi-step and there is no way to synchronize multiple accessors.

     

       536
       -
       +  See also [5] Documentation/cgroup-v2.txt, "R-2. Thread Granularity"

     

       537
       -
       +

     

       538
       -
       +

     

       539
       -
       +  2-1-2. No Internal Process Constraint

     

       540
       -
       +

     

       541
       -
       +  cgroup v2 does not allow processes to belong to any cgroup which has

     

       542
       -
       +  child cgroups when resource controllers are enabled on it (the

     

       543
       -
       +  notable exception being the root cgroup itself).  This is because,

     

       544
       -
       +  for some resources, a resource domain (cgroup) is not directly

     

       545
       -
       +  comparable to the terminal consumer (process/task) of said resource,

     

       546
       -
       +  and so putting the two into a sibling relationship isn't meaningful.

     

       547
       -
       +

     

       548
       -
       +  - Differing Control Parameters and Capabilities

     

       549
       -
       +

     

       550
       -
       +    A cgroup controller has different resource control parameters and

     

       551
       -
       +    capabilities from a terminal consumer, be that a task or process.

     

       552
       -
       +    There are a couple cases where a cgroup control knob can be mapped

     

       553
       -
       +    to a per-task or per-process API but they are exceptions and the

     

       554
       -
       +    mappings aren't obvious even in those cases.

     

       555
       -
       +

     

       556
       -
       +    For example, task priorities (also known as nice values) set

     

       557
       -
       +    through setpriority(2) are mapped to the CPU controller

     

       558
       -
       +    "cpu.shares" values.  However, how exactly the two ranges map and

     

       559
       -
       +    even the fact that they map to each other at all are not obvious.

     

       560
       -
       +

     

       561
       -
       +    The situation gets further muddled when considering other resource

     

       562
       -
       +    types and control knobs.  IO priorities set through ioprio_set(2)

     

       563
       -
       +    cannot be mapped to IO controller weights and most cgroup resource

     

       564
       -
       +    control knobs including the bandwidth control knobs of the CPU

     

       565
       -
       +    controller don't have counterparts in the terminal consumers.

     

       566
       -
       +

     

       567
       -
       +  - Anonymous Resource Consumption

     

       568
       -
       +

     

       569
       -
       +    For CPU, every time slice consumed from inside a cgroup, which

     

       570
       -
       +    comprises most but not all of consumed CPU time for the cgroup,

     

       571
       -
       +    can be clearly attributed to a specific task or process.  Because

     

       572
       -
       +    these two types of entities are directly comparable as consumers

     

       573
       -
       +    of CPU time, it's theoretically possible to mix tasks and cgroups

     

       574
       -
       +    on the same tree levels and let them directly compete for the time

     

       575
       -
       +    quota available to their common ancestor.

     

       576
       -
       +

     

       577
       -
       +    However, the same can't be said for resource types like memory or

     

       578
       -
       +    IO: the memory consumed by the page cache, for example, can be

     

       579
       -
       +    tracked on a per-cgroup level, but due to mismatches in lifetimes

     

       580
       -
       +    of involved objects (page cache can persist long after processes

     

       581
       -
       +    are gone), shared usages and the implementation overhead of

     

       582
       -
       +    tracking persistent state, it can no longer be attributed to

     

       583
       -
       +    individual processes after instantiation.  Consequently, any IO

     

       584
       -
       +    incurred by page cache writeback can be attributed to a cgroup,

     

       585
       -
       +    but not to the individual consumers inside the cgroup.

     

       586
       -
       +

     

       587
       -
       +  For memory and IO, this makes a resource domain (cgroup) an object

     

       588
       -
       +  of a fundamentally different type than a terminal consumer

     

       589
       -
       +  (process).  A process can't be a first class object in the resource

     

       590
       -
       +  distribution graph as its total resource consumption can't be

     

       591
       -
       +  described without the containing resource domain.

     

       592
       -
       +

     

       593
       -
       +  Disallowing processes in internal cgroups avoids competition between

     

       594
       -
       +  cgroups and processes which cannot be meaningfully defined for these

     

       595
       -
       +  resources.  All resource control takes place among cgroups and a

     

       596
       -
       +  terminal consumer interacts with the containing cgroup the same way

     

       597
       -
       +  it would with the system without cgroup.

     

       598
       -
       +

     

       599
       -
       +  Root cgroup is exempt from this constraint, which is in line with

     

       600
       -
       +  how root cgroup is handled in general - it's excluded from cgroup

     

       601
       -
       +  resource accounting and control.

     

       602
       -
       +

     

       603
       -
       +

     

       604
       -
       +Enforcing process granularity and no internal process constraint

     

       605
       -
       +allows all controllers to be on the same footing in terms of resource

     

       606
       -
       +distribution hierarchy.

     

       607
       -
       +

     

       608
       -
       +

     

       609
       -
       +2-2. Impact on CPU Controller

     

       610
       -
       +

     

       611
       -
       +As indicated earlier, the CPU controller's resource distribution graph

     

       612
       -
       +is the simplest.  Every schedulable resource consumption can be

     

       613
       -
       +attributed to a specific task.  In addition, for weight based control,

     

       614
       -
       +the per-task priority set through setpriority(2) can be translated to

     

       615
       -
       +and from a per-cgroup weight.  As such, the CPU controller can treat a

     

       616
       -
       +task and a cgroup symmetrically, allowing support for any tree layout

     

       617
       -
       +of cgroups and tasks.  Both process granularity and the no internal

     

       618
       -
       +process constraint restrict how the CPU controller can be used.

     

       619
       -
       +

     

       620
       -
       +

     

       621
       -
       +  2-2-1. Impact of Process Granularity

     

       622
       -
       +

     

       623
       -
       +  Process granularity prevents tasks belonging to the same process to

     

       624
       -
       +  be assigned to different cgroups.  It was pointed out [6] that this

     

       625
       -
       +  excludes the valid use case of hierarchical CPU distribution within

     

       626
       -
       +  processes.

     

       627
       -
       +

     

       628
       -
       +  To address this issue, the rgroup (resource group) [7][8][9]

     

       629
       -
       +  interface, an extension of the existing setpriority(2) API, was

     

       630
       -
       +  proposed, which is in line with other programmable priority

     

       631
       -
       +  mechanisms and eliminates the risk of in-application configuration

     

       632
       -
       +  and system configuration stepping on each other's toes.

     

       633
       -
       +  Unfortunately, the proposal quickly turned into discussions around

     

       634
       -
       +  cgroup v2 design decisions [4] and no consensus could be reached.

     

       635
       -
       +

     

       636
       -
       +

     

       637
       -
       +  2-2-2. Impact of No Internal Process Constraint

     

       638
       -
       +

     

       639
       -
       +  The no internal process constraint disallows tasks from competing

     

       640
       -
       +  directly against cgroups.  Here is an excerpt from Peter Zijlstra

     

       641
       -
       +  pointing out the issue [10] - R, L and A are cgroups; t1, t2, t3 and

     

       642
       -
       +  t4 are tasks:

     

       643
       -
       +

     

       644
       -
       +

     

       645
       -
       +          R

     

       646
       -
       +        / | \

     

       647
       -
       +       t1 t2 A

     

       648
       -
       +           /   \

     

       649
       -
       +          t3   t4

     

       650
       -
       +

     

       651
       -
       +

     

       652
       -
       +    Is fundamentally different from:

     

       653
       -
       +

     

       654
       -
       +

     

       655
       -
       +               R

     

       656
       -
       +             /   \

     

       657
       -
       +           L       A

     

       658
       -
       +         /   \   /   \

     

       659
       -
       +        t1  t2  t3   t4

     

       660
       -
       +

     

       661
       -
       +

     

       662
       -
       +    Because if in the first hierarchy you add a task (t5) to R, all of

     

       663
       -
       +    its A will run at 1/4th of total bandwidth where before it had

     

       664
       -
       +    1/3rd, whereas with the second example, if you add our t5 to L, A

     

       665
       -
       +    doesn't get any less bandwidth.

     

       666
       -
       +

     

       667
       -
       +

     

       668
       -
       +  It is true that the trees are semantically different from each other

     

       669
       -
       +  and the symmetric handling of tasks and cgroups is aesthetically

     

       670
       -
       +  pleasing.  However, it isn't clear what the practical usefulness of

     

       671
       -
       +  a layout with direct competition between tasks and cgroups would be,

     

       672
       -
       +  considering that number and behavior of tasks are controlled by each

     

       673
       -
       +  application, and cgroups primarily deal with system level resource

     

       674
       -
       +  distribution; changes in the number of active threads would directly

     

       675
       -
       +  impact resource distribution.  Real world use cases of such layouts

     

       676
       -
       +  could not be established during the discussions.

     

       677
       -
       +

     

       678
       -
       +

     

       679
       -
       +2-3. Arguments for cgroup v2

     

       680
       -
       +

     

       681
       -
       +There are strong demands for comprehensive hierarchical resource

     

       682
       -
       +control across all major resources, and establishing a common resource

     

       683
       -
       +hierarchy is an essential step.  As with most engineering decisions,

     

       684
       -
       +common resource hierarchy definition comes with its trade-offs.  With

     

       685
       -
       +cgroup v2, the trade-offs are in the form of structural constraints

     

       686
       -
       +which, among others, restrict the CPU controller's space of possible

     

       687
       -
       +configurations.

     

       688
       -
       +

     

       689
       -
       +However, even with the restrictions, cgroup v2, in combination with

     

       690
       -
       +rgroup, covers most of identified real world use cases while enabling

     

       691
       -
       +new important use cases of resource control across multiple resource

     

       692
       -
       +types that were fundamentally broken previously.

     

       693
       -
       +

     

       694
       -
       +Furthermore, for resource control, treating resource domains as

     

       695
       -
       +objects of a different type from terminal consumers has important

     

       696
       -
       +advantages - it can account for resource consumptions which are not

     

       697
       -
       +tied to any specific terminal consumer, be that a task or process, and

     

       698
       -
       +allows decoupling resource distribution controls from in-application

     

       699
       -
       +APIs.  Even the CPU controller may benefit from it as the kernel can

     

       700
       -
       +consume significant amount of CPU cycles in interrupt context or tasks

     

       701
       -
       +shared across multiple resource domains (e.g. softirq).

     

       702
       -
       +

     

       703
       -
       +Finally, it's important to note that enabling cgroup v2 support for

     

       704
       -
       +the CPU controller doesn't block use cases which require the features

     

       705
       -
       +which are not available on cgroup v2.  Unlikely, but should anybody

     

       706
       -
       +actually rely on the CPU controller's symmetric handling of tasks and

     

       707
       -
       +cgroups, backward compatibility is and will be maintained by being

     

       708
       -
       +able to disconnect the controller from the cgroup v2 hierarchy and use

     

       709
       -
       +it standalone.  This also holds for cpuset which is often used in

     

       710
       -
       +highly customized configurations which might be a poor fit for common

     

       711
       -
       +resource domains.

     

       712
       -
       +

     

       713
       -
       +The required changes are minimal, the benefits for the target use

     

       714
       -
       +cases are critical and obvious, and use cases which have to use v1 can

     

       715
       -
       +continue to do so.

     

       716
       -
       +

     

       717
       -
       +

     

       718
       -
       +3. Way Forward

     

       719
       -
       +

     

       720
       -
       +cgroup v2 primarily aims to solve the problem of comprehensive

     

       721
       -
       +hierarchical resource control across all major computing resources,

     

       722
       -
       +which is one of the core problems of modern server infrastructure

     

       723
       -
       +engineering.  The trade-offs that cgroup v2 took are results of

     

       724
       -
       +pursuing that goal and gaining a better understanding of the nature of

     

       725
       -
       +resource control in the process.

     

       726
       -
       +

     

       727
       -
       +I believe that real world usages will prove cgroup v2's model right,

     

       728
       -
       +considering the crucial pieces of comprehensive resource control that

     

       729
       -
       +cannot be implemented without common resource domains.  This is not to

     

       730
       -
       +say that cgroup v2 is fixed in stone and can't be updated; if there is

     

       731
       -
       +an approach which better serves both comprehensive resource control

     

       732
       -
       +and the CPU controller's flexibility, we will surely move towards

     

       733
       -
       +that.  It goes without saying that discussions around such approach

     

       734
       -
       +should consider practical aspects of resource control as a whole

     

       735
       -
       +rather than absolutely focusing on a particular controller.

     

       736
       -
       +

     

       737
       -
       +Until such consensus can be reached, the CPU controller cgroup v2

     

       738
       -
       +support will be maintained out of the mainline kernel in an easily

     

       739
       -
       +accessible form.  If there is anything cgroup developers can do to

     

       740
       -
       +ease the pain, please feel free to contact us on the cgroup mailing

     

       741
       -
       +list at cgroups@vger.kernel.org.

     

       742
       -
       +

     

       743
       -
       +

     

       744
       -
       +4. References

     

       745
       -
       +

     

       746
       -
       +[1]  http://lkml.kernel.org/r/20160105164834.GE5995@mtj.duckdns.org

     

       747
       -
       +     [PATCH 1/2] sched: Misc preps for cgroup unified hierarchy interface

     

       748
       -
       +     Tejun Heo <tj@kernel.org>

     

       749
       -
       +

     

       750
       -
       +[2]  http://lkml.kernel.org/r/20160105164852.GF5995@mtj.duckdns.org

     

       751
       -
       +     [PATCH 2/2] sched: Implement interface for cgroup unified hierarchy

     

       752
       -
       +     Tejun Heo <tj@kernel.org>

     

       753
       -
       +

     

       754
       -
       +[3]  http://lkml.kernel.org/r/1438641689-14655-4-git-send-email-tj@kernel.org

     

       755
       -
       +     [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy

     

       756
       -
       +     Tejun Heo <tj@kernel.org>

     

       757
       -
       +

     

       758
       -
       +[4]  http://lkml.kernel.org/r/20160407064549.GH3430@twins.programming.kicks-ass.net

     

       759
       -
       +     Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP

     

       760
       -
       +     Peter Zijlstra <peterz@infradead.org>

     

       761
       -
       +

     

       762
       -
       +[5]  https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt

     

       763
       -
       +     Control Group v2

     

       764
       -
       +     Tejun Heo <tj@kernel.org>

     

       765
       -
       +

     

       766
       -
       +[6]  http://lkml.kernel.org/r/CAPM31RJNy3jgG=DYe6GO=wyL4BPPxwUm1f2S6YXacQmo7viFZA@mail.gmail.com

     

       767
       -
       +     Re: [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy

     

       768
       -
       +     Paul Turner <pjt@google.com>

     

       769
       -
       +

     

       770
       -
       +[7]  http://lkml.kernel.org/r/20160105154503.GC5995@mtj.duckdns.org

     

       771
       -
       +     [RFD] cgroup: thread granularity support for cpu controller

     

       772
       -
       +     Tejun Heo <tj@kernel.org>

     

       773
       -
       +

     

       774
       -
       +[8]  http://lkml.kernel.org/r/1457710888-31182-1-git-send-email-tj@kernel.org

     

       775
       -
       +     [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP

     

       776
       -
       +     Tejun Heo <tj@kernel.org>

     

       777
       -
       +

     

       778
       -
       +[9]  http://lkml.kernel.org/r/20160311160522.GA24046@htj.duckdns.org

     

       779
       -
       +     Example program for PRIO_RGRP

     

       780
       -
       +     Tejun Heo <tj@kernel.org>

     

       781
       -
       +

     

       782
       -
       +[10] http://lkml.kernel.org/r/20160407082810.GN3430@twins.programming.kicks-ass.net

     

       783
       -
       +     Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource

     

       784
       -
       +     Peter Zijlstra <peterz@infradead.org>

-21

pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md

···

       1
       -
       Patches for CPU Controller on Control Group v2

     

       2
       -
       ===============================================

     

       3
       -
       

     

       4
       -
       See Tejun Heo's [explanation][1] for why these patches are currently

     

       5
       -
       out-of-tree.

     

       6
       -
       

     

       7
       -
       Generating the patches

     

       8
       -
       -----------------------

     

       9
       -
       

     

       10
       -
       In a linux checkout, with remote tc-cgroup pointing to

     

       11
       -
       git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git, your

     

       12
       -
       nixpkgs checkout in the same directory as your linux checkout (or

     

       13
       -
       modify the command accordingly), and setting `ver` to the appropriate

     

       14
       -
       version:

     

       15
       -
       

     

       16
       -
       ```shell

     

       17
       -
       $ ver=4.7

     

       18
       -
       $ git log --reverse --patch v$ver..remotes/tc-cgroup/cgroup-v2-cpu-v$ver > ../nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/$ver.patch

     

       19
       -
       ```

     

       20
       -
       

     

       21
       -
       [1]: https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu

-11

pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/default.nix

···

       1
       -
       let

     

       2
       -
         ents = builtins.readDir ./.;

     

       3
       -
       in builtins.listToAttrs (builtins.filter (x: x != null) (map (name: let

     

       4
       -
         match = builtins.match "(.*)\\.patch" name;

     

       5
       -
       in if match == null then null else {

     

       6
       -
         name = builtins.head match;

     

       7
       -
         value = {

     

       8
       -
           name = "cpu-cgroup-v2-${name}";

     

       9
       -
           patch = ./. + "/${name}";

     

       10
       -
         };

     

       11
       -
       }) (builtins.attrNames ents)))

-41

pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix

···

       1
       -
       { buildPackages, fetchFromGitHub, fetchurl, perl, buildLinux, libelf, util-linux, kernelPatches ? [], ... } @ args:

     

       2
       -
       

     

       3
       -
       buildLinux (args // rec {

     

       4
       -
         version = "4.14.180-176";

     

       5
       -
       

     

       6
       -
         # modDirVersion needs to be x.y.z.

     

       7
       -
         modDirVersion = "4.14.180";

     

       8
       -
       

     

       9
       -
         # branchVersion needs to be x.y.

     

       10
       -
         extraMeta.branch = "4.14";

     

       11
       -
       

     

       12
       -
         src = fetchFromGitHub {

     

       13
       -
           owner = "hardkernel";

     

       14
       -
           repo = "linux";

     

       15
       -
           rev = version;

     

       16
       -
           sha256 = "0n7i7a2bkrm9p1wfr20h54cqm32fbjvwyn703r6zm1f6ivqhk43v";

     

       17
       -
         };

     

       18
       -
       

     

       19
       -
         kernelPatches = args.kernelPatches ++ [{

     

       20
       -
           name = "usbip-tools-fno-common";

     

       21
       -
           patch = fetchurl {

     

       22
       -
             url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a";

     

       23
       -
             hash = "sha256-1CXYCV5zMLA4YdbCr8cO2N4CHEDzQChS9qbKYHPm3U4=";

     

       24
       -
           };

     

       25
       -
         }];

     

       26
       -
       

     

       27
       -
         defconfig = "odroidxu4_defconfig";

     

       28
       -
       

     

       29
       -
         # This extraConfig is (only) required because the gator module fails to build as-is.

     

       30
       -
         extraConfig = ''

     

       31
       -
       

     

       32
       -
           GATOR n

     

       33
       -
       

     

       34
       -
           # This attempted fix applies correctly but does not fix the build.

     

       35
       -
           #GATOR_MALI_MIDGARD_PATH ${src}/drivers/gpu/arm/midgard

     

       36
       -
       

     

       37
       -
         '' + (args.extraConfig or "");

     

       38
       -
       

     

       39
       -
         extraMeta.platforms = [ "armv7l-linux" ];

     

       40
       -
       

     

       41
       -
       } // (args.argsOverride or {}))

-2

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

···

       44
        
             patch = ./modinst-arg-list-too-long.patch;

     

       45
        
           };

     

       46
        
       

     

       47
       -
         cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;

     

       48
       -
       

     

       49
        
         hardened = let

     

       50
        
           mkPatch = kernelVersion: { version, sha256, patch }: let src = patch; in {

     

       51
        
             name = lib.removeSuffix ".patch" src.name;

···

       44
        
             patch = ./modinst-arg-list-too-long.patch;

     

       45
        
           };

     

       46
        
       

     

       0
        
       
     

       0
        
       
     

       47
        
         hardened = let

     

       48
        
           mkPatch = kernelVersion: { version, sha256, patch }: let src = patch; in {

     

       49
        
             name = lib.removeSuffix ".patch" src.name;

+3 -3

pkgs/tools/package-management/nix-du/default.nix

···

       12
        
       

     

       13
        
       rustPlatform.buildRustPackage rec {

     

       14
        
         pname = "nix-du";

     

       15
       -
         version = "1.0.0";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "symphorien";

     

       19
        
           repo = "nix-du";

     

       20
        
           rev = "v${version}";

     

       21
       -
           sha256 = "sha256-JU0kXMS4vCMdm3nOJM92Bit16141iuBnjRaV+HXiReQ=";

     

       22
        
         };

     

       23
        
       

     

       24
       -
         cargoSha256 = "sha256-DX0jpp1ujaeesW7iQWZ5/xAzGndOQqBmQZbBpMEI9u0=";

     

       25
        
       

     

       26
        
         doCheck = true;

     

       27
        
         nativeCheckInputs = [ nix graphviz ];

···

       12
        
       

     

       13
        
       rustPlatform.buildRustPackage rec {

     

       14
        
         pname = "nix-du";

     

       15
       +
         version = "1.1.0";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "symphorien";

     

       19
        
           repo = "nix-du";

     

       20
        
           rev = "v${version}";

     

       21
       +
           sha256 = "sha256-Ft0j9kcR5HTSX0K09OKZMIUz25PR/isqZQIKmlNjqNE=";

     

       22
        
         };

     

       23
        
       

     

       24
       +
         cargoSha256 = "sha256-x+NONRKF7b0tADG2flgBKo32wx/TyXm7Z0bd9ZbbES8=";

     

       25
        
       

     

       26
        
         doCheck = true;

     

       27
        
         nativeCheckInputs = [ nix graphviz ];

+2 -1

pkgs/top-level/aliases.nix

···

       68
        
         angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06

     

       69
        
         ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16

     

       70
        
         antimicroX = antimicrox; # Added 2021-10-31

     

       0
        
       
     

       71
        
         aseprite-unfree = aseprite; # Added 2023-08-26

     

       72
        
         asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16

     

       73
        
         asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19

     
···

       461
        
         libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29

     

       462
        
         libxkbcommon_7 = throw "libxkbcommon_7 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libxkbcommon'"; # Added 2023-01-03

     

       463
        
         lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01

     

       0
        
       
     

       464
        
         llama = walk; # Added 2023-01-23

     

       465
        
       

     

       466
        
         # Linux kernels

     
···

       482
        
         linuxPackages_6_3 = linuxKernel.packages.linux_6_3;

     

       483
        
         linuxPackages_6_4 = linuxKernel.packages.linux_6_4;

     

       484
        
         linuxPackages_6_5 = linuxKernel.packages.linux_6_5;

     

       485
       -
         linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;

     

       486
        
         linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;

     

       487
        
         linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;

     

       488
        
         linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;

···

       68
        
         angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06

     

       69
        
         ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16

     

       70
        
         antimicroX = antimicrox; # Added 2021-10-31

     

       71
       +
         ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13

     

       72
        
         aseprite-unfree = aseprite; # Added 2023-08-26

     

       73
        
         asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16

     

       74
        
         asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19

     
···

       462
        
         libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29

     

       463
        
         libxkbcommon_7 = throw "libxkbcommon_7 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libxkbcommon'"; # Added 2023-01-03

     

       464
        
         lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01

     

       465
       +
         lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects.";

     

       466
        
         llama = walk; # Added 2023-01-23

     

       467
        
       

     

       468
        
         # Linux kernels

     
···

       484
        
         linuxPackages_6_3 = linuxKernel.packages.linux_6_3;

     

       485
        
         linuxPackages_6_4 = linuxKernel.packages.linux_6_4;

     

       486
        
         linuxPackages_6_5 = linuxKernel.packages.linux_6_5;

     

       0
        
       
     

       487
        
         linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;

     

       488
        
         linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;

     

       489
        
         linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;

+2 -12

pkgs/top-level/all-packages.nix

···

       11707
        
         opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { };

     

       11708
        
         opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { };

     

       11709
        
       

     

       11710
       -
         opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };

     

       11711
       -
       

     

       11712
        
         openvswitch = callPackage ../os-specific/linux/openvswitch { };

     

       11713
        
       

     

       11714
        
         openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { };

     
···

       23821
        
       

     

       23822
        
         lightspark = callPackage ../misc/lightspark { };

     

       23823
        
       

     

       23824
       -
         lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp {

     

       23825
       -
           protobuf = protobuf3_21;

     

       23826
       -
         };

     

       23827
        
       

     

       23828
        
         ligolo-ng = callPackage ../tools/networking/ligolo-ng { };

     

       23829
        
       

     
···

       28148
        
         # hardened kernels

     

       28149
        
         linuxPackages_hardened = linuxKernel.packages.linux_hardened;

     

       28150
        
         linux_hardened = linuxPackages_hardened.kernel;

     

       28151
       -
         linuxPackages_4_14_hardened = linuxKernel.packages.linux_4_14_hardened;

     

       28152
       -
         linux_4_14_hardened = linuxPackages_4_14_hardened.kernel;

     

       28153
        
         linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened;

     

       28154
        
         linux_4_19_hardened = linuxPackages_4_19_hardened.kernel;

     

       28155
        
         linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;

     
···

       28162
        
         linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;

     

       28163
        
         linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened;

     

       28164
        
         linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened;

     

       28165
       -
       

     

       28166
       -
         # Hardkernel (Odroid) kernels.

     

       28167
       -
         linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;

     

       28168
       -
         linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel;

     

       28169
        
       

     

       28170
        
         # GNU Linux-libre kernels

     

       28171
        
         linuxPackages-libre = linuxKernel.packages.linux_libre;

     
···

       30431
        
           texlive = texlive.combined.scheme-medium;

     

       30432
        
         };

     

       30433
        
       

     

       30434
       -
         ardour_6 = callPackage ../applications/audio/ardour/6.nix { };

     

       30435
        
         ardour = callPackage ../applications/audio/ardour { };

     

       0
        
       
     

       30436
        
       

     

       30437
        
         arelle = with python3Packages; toPythonApplication arelle;

     

       30438

···

       11707
        
         opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { };

     

       11708
        
         opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { };

     

       11709
        
       

     

       0
        
       
     

       0
        
       
     

       11710
        
         openvswitch = callPackage ../os-specific/linux/openvswitch { };

     

       11711
        
       

     

       11712
        
         openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { };

     
···

       23819
        
       

     

       23820
        
         lightspark = callPackage ../misc/lightspark { };

     

       23821
        
       

     

       23822
       +
         opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };

     

       0
        
       
     

       0
        
       
     

       23823
        
       

     

       23824
        
         ligolo-ng = callPackage ../tools/networking/ligolo-ng { };

     

       23825
        
       

     
···

       28144
        
         # hardened kernels

     

       28145
        
         linuxPackages_hardened = linuxKernel.packages.linux_hardened;

     

       28146
        
         linux_hardened = linuxPackages_hardened.kernel;

     

       0
        
       
     

       0
        
       
     

       28147
        
         linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened;

     

       28148
        
         linux_4_19_hardened = linuxPackages_4_19_hardened.kernel;

     

       28149
        
         linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;

     
···

       28156
        
         linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;

     

       28157
        
         linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened;

     

       28158
        
         linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28159
        
       

     

       28160
        
         # GNU Linux-libre kernels

     

       28161
        
         linuxPackages-libre = linuxKernel.packages.linux_libre;

     
···

       30421
        
           texlive = texlive.combined.scheme-medium;

     

       30422
        
         };

     

       30423
        
       

     

       0
        
       
     

       30424
        
         ardour = callPackage ../applications/audio/ardour { };

     

       30425
       +
         ardour_7 = callPackage ../applications/audio/ardour/7.nix { };

     

       30426
        
       

     

       30427
        
         arelle = with python3Packages; toPythonApplication arelle;

     

       30428

+2 -29

pkgs/top-level/linux-kernels.nix

···

       96
        
             rpiVersion = 4;

     

       97
        
           };

     

       98
        
       

     

       99
       -
           linux_4_14 = callPackage ../os-specific/linux/kernel/mainline.nix {

     

       100
       -
             branch = "4.14";

     

       101
       -
             kernelPatches =

     

       102
       -
               [ kernelPatches.bridge_stp_helper

     

       103
       -
                 kernelPatches.request_key_helper

     

       104
       -
                 # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md

     

       105
       -
                 # when adding a new linux version

     

       106
       -
                 kernelPatches.cpu-cgroup-v2."4.11"

     

       107
       -
                 kernelPatches.modinst_arg_list_too_long

     

       108
       -
               ];

     

       109
       -
           };

     

       110
       -
       

     

       111
        
           linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix {

     

       112
        
             branch = "4.19";

     

       113
        
             kernelPatches =

     
···

       217
        
             ];

     

       218
        
           };

     

       219
        
       

     

       220
       -
           linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {

     

       221
       -
             kernelPatches = [

     

       222
       -
               kernelPatches.bridge_stp_helper

     

       223
       -
               kernelPatches.request_key_helper

     

       224
       -
               kernelPatches.modinst_arg_list_too_long

     

       225
       -
             ];

     

       226
       -
           };

     

       227
       -
       

     

       228
        
           # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version

     

       229
        
           # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708

     

       230
        
           zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;

     
···

       261
        
       

     

       262
        
           linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };

     

       263
        
       

     

       264
       -
           linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 {

     

       265
       -
             stdenv = gcc10Stdenv;

     

       266
       -
             buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };

     

       267
       -
           };

     

       268
        
           linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 {

     

       269
        
             stdenv = gcc10Stdenv;

     

       270
        
             buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };

     
···

       280
        
       

     

       281
        
         } // lib.optionalAttrs config.allowAliases {

     

       282
        
           linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";

     

       0
        
       
     

       283
        
           linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";

     

       284
        
           linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";

     

       285
        
           linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";

     
···

       590
        
       

     

       591
        
         vanillaPackages = {

     

       592
        
           # recurse to build modules for the kernels

     

       593
       -
           linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14);

     

       594
        
           linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);

     

       595
        
           linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);

     

       596
        
           linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);

     
···

       599
        
           linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5);

     

       600
        
         } // lib.optionalAttrs config.allowAliases {

     

       601
        
           linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08

     

       0
        
       
     

       602
        
           linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17

     

       603
        
           linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01

     

       604
        
           linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20

     
···

       630
        
       

     

       631
        
           linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);

     

       632
        
       

     

       633
       -
           linux_4_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_14_hardened);

     

       634
        
           linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened);

     

       635
        
           linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened);

     

       636
        
           linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);

     
···

       644
        
           linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable);

     

       645
        
           linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest);

     

       646
        
       

     

       647
       -
           hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14);

     

       648
       -
       

     

       649
        
           linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre);

     

       650
        
       

     

       651
        
           linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);

     
···

       663
        
           linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";

     

       664
        
           linux_rt_default = packages.linux_rt_5_4;

     

       665
        
           linux_rt_latest = packages.linux_rt_6_1;

     

       666
       -
           linux_hardkernel_latest = packages.hardkernel_4_14;

     

       667
        
         };

     

       668
        
       

     

       669
        
         manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {};

···

       96
        
             rpiVersion = 4;

     

       97
        
           };

     

       98
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       99
        
           linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix {

     

       100
        
             branch = "4.19";

     

       101
        
             kernelPatches =

     
···

       205
        
             ];

     

       206
        
           };

     

       207
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       208
        
           # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version

     

       209
        
           # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708

     

       210
        
           zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;

     
···

       241
        
       

     

       242
        
           linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };

     

       243
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       244
        
           linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 {

     

       245
        
             stdenv = gcc10Stdenv;

     

       246
        
             buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };

     
···

       256
        
       

     

       257
        
         } // lib.optionalAttrs config.allowAliases {

     

       258
        
           linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";

     

       259
       +
           linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";

     

       260
        
           linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";

     

       261
        
           linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";

     

       262
        
           linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";

     
···

       567
        
       

     

       568
        
         vanillaPackages = {

     

       569
        
           # recurse to build modules for the kernels

     

       0
        
       
     

       570
        
           linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);

     

       571
        
           linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);

     

       572
        
           linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);

     
···

       575
        
           linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5);

     

       576
        
         } // lib.optionalAttrs config.allowAliases {

     

       577
        
           linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08

     

       578
       +
           linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11

     

       579
        
           linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17

     

       580
        
           linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01

     

       581
        
           linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20

     
···

       607
        
       

     

       608
        
           linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);

     

       609
        
       

     

       0
        
       
     

       610
        
           linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened);

     

       611
        
           linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened);

     

       612
        
           linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);

     
···

       620
        
           linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable);

     

       621
        
           linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest);

     

       622
        
       

     

       0
        
       
     

       0
        
       
     

       623
        
           linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre);

     

       624
        
       

     

       625
        
           linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);

     
···

       637
        
           linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";

     

       638
        
           linux_rt_default = packages.linux_rt_5_4;

     

       639
        
           linux_rt_latest = packages.linux_rt_6_1;

     

       0
        
       
     

       640
        
         };

     

       641
        
       

     

       642
        
         manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {};