summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-03-28 19:38:33 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2020-04-05 20:39:11 -0400
commit120a2f30338669b0099d70eb40a8f13c9276c135 (patch)
treec7ce705dd615a871cd1182589ec6153ae0d5b3ae
parent83eafe80f295ab8d30933cc546a410e6117f31f4 (diff)
pantheon.cerbere: remove
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix1
-rw-r--r--pkgs/desktops/pantheon/default.nix4
-rw-r--r--pkgs/desktops/pantheon/services/cerbere/default.nix58
3 files changed, 2 insertions, 61 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 869c66944897..882f3a8e8c4d 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -206,7 +206,6 @@ in
})
# Services
- cerbere
elementary-capnet-assist
elementary-dpms-helper
elementary-settings-daemon
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index d4e6b192f200..8f9110c154b0 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -99,8 +99,6 @@ lib.makeScope pkgs.newScope (self: with self; {
#### SERVICES
- cerbere = callPackage ./services/cerbere { };
-
contractor = callPackage ./services/contractor { };
elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { };
@@ -200,4 +198,6 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) vala; # added 2019-10-10
+ cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1.";
+
})
diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix
deleted file mode 100644
index 02c885198b62..000000000000
--- a/pkgs/desktops/pantheon/services/cerbere/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, pantheon
-, pkgconfig
-, meson
-, python3
-, ninja
-, glib
-, libgee
-, vala_0_46
-, wrapGAppsHook
-}:
-
-stdenv.mkDerivation rec {
- pname = "cerbere";
- version = "2.5.0";
-
- src = fetchFromGitHub {
- owner = "elementary";
- repo = pname;
- rev = version;
- sha256 = "12y6gg4vyc1rhdm2c7pr7bgmdrah7ddphyh25fgh3way8l9gh7vw";
- };
-
- passthru = {
- updateScript = pantheon.updateScript {
- attrPath = "pantheon.${pname}";
- };
- };
-
- nativeBuildInputs = [
- meson
- ninja
- pkgconfig
- python3
- vala_0_46
- wrapGAppsHook
- ];
-
- buildInputs = [
- glib
- libgee
- ];
-
- postPatch = ''
- chmod +x meson/post_install.py
- patchShebangs meson/post_install.py
- '';
-
- meta = with stdenv.lib; {
- description = "A simple service to ensure uptime of essential processes";
- homepage = https://github.com/elementary/cerbere;
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = pantheon.maintainers;
- };
-
-}