b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #89525 from Mic92/cgmanager

Browse source
This commit is contained in:
Jörg Thalheim 2020-06-05 11:46:42 +01:00 committed by GitHub
parent 685f06c193 073d2fc4d5
commit abb2f6038c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 2 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/module-list.nix
View file

@ -806,7 +806,6 @@
./services/security/torsocks.nix
./services/security/usbguard.nix
./services/security/vault.nix
./services/system/cgmanager.nix
./services/system/cloud-init.nix
./services/system/dbus.nix
./services/system/earlyoom.nix

1
nixos/modules/rename.nix
View file

@ -24,6 +24,7 @@ with lib;
(mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed")
(mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed")
(mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed")
(mkRemovedOptionModule ["services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed")
(mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed")
(mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")

26
nixos/modules/services/system/cgmanager.nix
View file

@ -1,26 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.cgmanager;
in {
meta.maintainers = [ maintainers.mic92 ];
###### interface
options.services.cgmanager.enable = mkEnableOption "cgmanager";
###### implementation
config = mkIf cfg.enable {
systemd.services.cgmanager = {
wantedBy = [ "multi-user.target" ];
description = "Cgroup management daemon";
restartIfChanged = false;
serviceConfig = {
ExecStart = "${pkgs.cgmanager}/bin/cgmanager -m name=systemd";
KillMode = "process";
Restart = "on-failure";
};
};
};
}

27
pkgs/os-specific/linux/cgmanager/default.nix
View file

@ -1,27 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libnih, dbus, pam, popt }:
stdenv.mkDerivation rec {
pname = "cgmanager";
version = "0.42";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/${pname}/${pname}-${version}.tar.gz";
sha256 = "15np08h9jrvc1y1iafr8v654mzgsv5hshzc0n4p3pbf0rkra3h7c";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libnih dbus pam popt ];
configureFlags = [
"--with-init-script=systemd"
"--sysconfdir=/etc"
"--localstatedir=/var"
];
meta = with stdenv.lib; {
homepage = "https://linuxcontainers.org/cgmanager/introduction/";
description = "A central privileged daemon that manages all your cgroups";
license = licenses.lgpl21;
platforms = platforms.linux;
};
}

1
pkgs/top-level/aliases.nix
View file

@ -67,6 +67,7 @@ mapAliases ({
bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03
catfish = xfce.catfish; # added 2019-12-22
cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05
checkbashism = checkbashisms; # added 2016-08-16
cide = throw "deprecated in 2019-09-11: abandoned by upstream";
cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10

2
pkgs/top-level/all-packages.nix
View file

@ -16542,8 +16542,6 @@ in
cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
cgmanager = callPackage ../os-specific/linux/cgmanager { };
checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
checksec = callPackage ../os-specific/linux/checksec { };