diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index ebdb2ad0649..bffbb56e681 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix - ./e17.nix ./e18.nix ./e19.nix ./gnome3.nix ./xbmc.nix + ./e19.nix ./gnome3.nix ./xbmc.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/e17.nix b/nixos/modules/services/x11/desktop-managers/e17.nix deleted file mode 100644 index 4cac53c9c75..00000000000 --- a/nixos/modules/services/x11/desktop-managers/e17.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.e17; - -in - -{ - options = { - - services.xserver.desktopManager.e17.enable = mkOption { - default = false; - example = true; - description = "Enable support for the E17 desktop environment."; - }; - - }; - - - config = mkIf (xcfg.enable && cfg.enable) { - - services.dbus.packages = [ pkgs.e17.ethumb ]; - - }; - -} diff --git a/nixos/modules/services/x11/desktop-managers/e18.nix b/nixos/modules/services/x11/desktop-managers/e18.nix deleted file mode 100644 index faafd21b07d..00000000000 --- a/nixos/modules/services/x11/desktop-managers/e18.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.e18; - e18_enlightenment = pkgs.e18.enlightenment.override { set_freqset_setuid = true; }; - -in - -{ - options = { - - services.xserver.desktopManager.e18.enable = mkOption { - default = false; - example = true; - description = "Enable the E18 desktop environment."; - }; - - }; - - config = mkIf (xcfg.enable && cfg.enable) { - - environment.systemPackages = [ - pkgs.e18.efl pkgs.e18.evas pkgs.e18.emotion pkgs.e18.elementary e18_enlightenment - pkgs.e18.terminology pkgs.e18.econnman - ]; - - services.xserver.desktopManager.session = [ - { name = "E18"; - start = '' - ${e18_enlightenment}/bin/enlightenment_start - waitPID=$! - ''; - }]; - - security.setuidPrograms = [ "e18_freqset" ]; - - }; - -} diff --git a/pkgs/desktops/e17/default.nix b/pkgs/desktops/e17/default.nix deleted file mode 100644 index 648a3577863..00000000000 --- a/pkgs/desktops/e17/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ callPackage, pkgs }: -rec { - #### CORE EFL - - eina = callPackage ./eina { }; - - eet = callPackage ./eet { }; - - evas = callPackage ./evas { }; - - ecore = callPackage ./ecore { }; - - eio = callPackage ./eio { }; - - embryo = callPackage ./embryo { }; - - edje = callPackage ./edje { lua = pkgs.lua5; }; - - efreet = callPackage ./efreet { }; - - e_dbus = callPackage ./e_dbus { }; - - eeze = callPackage ./eeze { }; - - emotion = callPackage ./emotion { }; - - ethumb = callPackage ./ethumb { }; - - elementary = callPackage ./elementary { }; - - - #### WINDOW MANAGER - - enlightenment = callPackage ./enlightenment { }; - - - #### APPLICATIONS - - terminology = callPackage ./terminology { }; - - - - #### ART - - - - -} diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix deleted file mode 100644 index cfc0203b3e0..00000000000 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, expat, ecore, eina, evas -, dbus_libs }: -stdenv.mkDerivation rec { - name = "e_dbus-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q"; - }; - buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; - propagatedBuildInputs = [ dbus_libs ]; - setupHook = ./setup-hook.sh; - configureFlags = '' - --disable-edbus-test - --disable-edbus-test-client - --disable-edbus-notify-send - --disable-edbus-notify-test - --disable-edbus-async-test - ''; - meta = { - description = "Enlightenment's D-Bus wrapping and glue layer library"; - longDescription = '' - Enlightenment's E_Dbus is a set of wrappers around DBus APIs by - third party, so they can be easily used by EFL applications, - automatically providing Ecore/main loop integration, as well as - Eina data types. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/e_dbus/setup-hook.sh b/pkgs/desktops/e17/e_dbus/setup-hook.sh deleted file mode 100644 index 33e3a6b0f18..00000000000 --- a/pkgs/desktops/e17/e_dbus/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addDbusIncludePath () { - if test -d "$1/include/dbus-1.0" - then - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include" - fi -} - -envHooks+=(addDbusIncludePath) diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix deleted file mode 100644 index 4a3eef4ec49..00000000000 --- a/pkgs/desktops/e17/ecore/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender -, libXcomposite, libXfixes, libXdamage }: -stdenv.mkDerivation rec { - name = "ecore-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb"; - }; - buildInputs = [ pkgconfig eina evas ]; - propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes - libXdamage - ]; - meta = { - description = "Enlightenment's core mainloop, display abstraction and utility library"; - longDescription = '' - Enlightenment's Ecore is a clean and tiny event loop library - with many modules to do lots of convenient things for a - programmer, to save time and effort. - - It's small and lean, designed to work on embedded systems all - the way to large and powerful multi-cpu workstations. It - serialises all system signals, events etc. into a single event - queue, that is easily processed without needing to worry about - concurrency. A properly written, event-driven program using this - kind of programming doesn't need threads, nor has to worry about - concurrency. It turns a program into a state machine, and makes - it very robust and easy to follow. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix deleted file mode 100644 index 62758b2094e..00000000000 --- a/pkgs/desktops/e17/edje/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, lua, expat, zlib, libjpeg, eina, eet, evas -, ecore, embryo }: -stdenv.mkDerivation rec { - name = "edje-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7"; - }; - buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; - patchPhase = '' - substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc' - substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' "" - ''; - meta = { - description = "Enlightenment's abstract GUI layout and animation object library"; - longDescription = '' - Enlightenment's Edje is a complex graphical design & layout - library based on Evas that provides an abstraction layer between - the application code and the interface, while allowing extremely - flexible dynamic layouts and animations. - - In more popular terms, Edje makes every application that uses it - "skinable". - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix deleted file mode 100644 index 079d07187ff..00000000000 --- a/pkgs/desktops/e17/eet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }: -stdenv.mkDerivation rec { - name = "eet-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767"; - }; - buildInputs = [ pkgconfig eina zlib libjpeg ]; - meta = { - description = "Enlightenment's data encode/decode and storage library"; - longDescription = '' - Enlightenment's EET is a tiny library designed to write an - arbitary set of chunks of data to a file and optionally compress - each chunk (very much like a zip file) and allow fast - random-access reading of the file later on. EET files are - perfect for storing data that is written once (or rarely) and - read many times, especially when the program does not want to - have to read all the data in at once. - - Use this library when you need to pack C structure and you want - to retrieve it quickly with as few as possible memory use. You - can also use it to serialize data quickly and exchange them - between two program over ipc or network link. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix deleted file mode 100644 index 162fbcf1aef..00000000000 --- a/pkgs/desktops/e17/eeze/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, ecore, udev }: -stdenv.mkDerivation rec { - name = "eeze-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr"; - }; - buildInputs = [ pkgconfig eina ecore ]; - propagatedBuildInputs = [ udev ]; - meta = { - description = "Enlightenment's device abstraction library"; - longDescription = '' - Enlightenment's Eeze is a library for manipulating devices - through udev with a simple and fast api. It interfaces directly - with libudev, avoiding such middleman daemons as udisks/upower - or hal, to immediately gather device information the instant it - becomes known to the system. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix deleted file mode 100644 index dfe755db597..00000000000 --- a/pkgs/desktops/e17/efreet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, ecore }: -stdenv.mkDerivation rec { - name = "efreet-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg"; - }; - buildInputs = [ pkgconfig eina eet ecore ]; - meta = { - description = "Enlightenment's standards handling for freedesktop.org standards"; - longDescription = '' - Enlightenment's Efreet is a library designed to help apps work - several of the Freedesktop.org standards regarding Icons, - Desktop files and Menus. To that end it implements the following - specifications: - - * XDG Base Directory Specification - * Icon Theme Specification - * Desktop Entry Specification - * Desktop Menu Specification - * FDO URI Specification - * Shared Mime Info Specification - * Trash Specification - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix deleted file mode 100644 index 653bb639b1b..00000000000 --- a/pkgs/desktops/e17/eina/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "eina-${version}"; - version = "1.7.10"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "06pqn17zknmxzdk5gw6df0gpbicnrdjl9g4vncw57k2wzf5icy33"; - }; - meta = { - description = "Enlightenment's core data structure library"; - longDescription = '' - Enlightenment's Eina is a core data structure and common utility - library. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/eio/default.nix b/pkgs/desktops/e17/eio/default.nix deleted file mode 100644 index b56422fd774..00000000000 --- a/pkgs/desktops/e17/eio/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }: -stdenv.mkDerivation rec { - name = "eio-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6"; - }; - buildInputs = [ pkgconfig eet eina ecore ]; - meta = { - description = "A library that integrates with EFL to provide efficient filesystem IO"; - longDescription = '' - Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output. - It use the best techniques to achieve such purpose, like using at-variants, splice, - properly handling errors and doing it in an asynchronous fashion by means of worker - threads. It is also ported to Windows, so multi-platform. - - Whenever you need to list a directory, copy, move or delete files, Eio will do that - task better than you'd achieve with naive implementations, and it is easy to use. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/elementary/default.nix b/pkgs/desktops/e17/elementary/default.nix deleted file mode 100644 index b0240d986de..00000000000 --- a/pkgs/desktops/e17/elementary/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }: -stdenv.mkDerivation rec { - name = "elementary-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9"; - }; - buildInputs = [ pkgconfig eina eet evas ecore edje ]; - meta = { - description = "Enlightenment's core data structure library"; - longDescription = '' - Enlightenment's Eina is a core data structure and common utility - library. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix deleted file mode 100644 index 59b5540f25d..00000000000 --- a/pkgs/desktops/e17/embryo/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina }: -stdenv.mkDerivation rec { - name = "embryo-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9"; - }; - buildInputs = [ pkgconfig eina ]; - meta = { - description = "Enlightenment's small Pawn based virtual machine and compiler"; - longDescription = '' - Enlightenment's Embryo is a tiny library designed to interpret - limited Small programs compiled by the included compiler, - embryo_cc. It is mostly a cleaned up and smaller version of the - original Small abstract machine. The compiler is mostly - untouched. - ''; - homepage = http://enlightenment.org/; - license = with stdenv.lib.licenses; [ bsd2.shortName bsd3.shortName ]; # not sure - }; -} diff --git a/pkgs/desktops/e17/emotion/default.nix b/pkgs/desktops/e17/emotion/default.nix deleted file mode 100644 index 9ec3631b1e7..00000000000 --- a/pkgs/desktops/e17/emotion/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje, vlc }: -stdenv.mkDerivation rec { - name = "emotion-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw"; - }; - buildInputs = [ pkgconfig ecore evas eet eina edje vlc ]; - meta = { - description = "A library to easily integrate media playback into EFL applications"; - longDescription = '' - Emotion is a library to easily integrate media playback into EFL applications, - it will take care of using Ecore's main loop and video display is done using Evas. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix deleted file mode 100644 index 953c90e8003..00000000000 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus -, embryo, eio, xcbutilkeysyms, libjpeg }: -stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.17.1"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y"; - }; - buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo - eio xcbutilkeysyms libjpeg ]; - configureFlags = '' - --with-profile=FAST_PC - --disable-illume - --disable-illume2 - ''; - meta = { - description = "A window manager"; - longDescription = '' - The Enlightenment Desktop shell provides an efficient yet - breathtaking window manager based on the Enlightenment - Foundation Libraries along with other essential desktop - components like a file manager, desktop icons and widgets. - - It boasts a un-precedented level of theme-ability while still - being capable of performing on older hardware or embedded - devices. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/ethumb/default.nix b/pkgs/desktops/e17/ethumb/default.nix deleted file mode 100644 index 344abe1e3f1..00000000000 --- a/pkgs/desktops/e17/ethumb/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet, e_dbus, emotion, libexif }: -stdenv.mkDerivation rec { - name = "ethumb-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l"; - }; - buildInputs = [ pkgconfig eina evas ecore edje eet emotion libexif ]; - propagatedBuildInputs = [ e_dbus libexif ]; - meta = { - description = "A thumbnail generation library"; - longDescription = '' - Ethumb - thumbnail generation library. Features: - * create thumbnails with a predefined frame (possibly an edje frame); - * have an option to create fdo-like thumbnails; - * have a client/server utility; - * TODO: make thumbnails from edje backgrounds, icons and themes; - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix deleted file mode 100644 index c271caa980d..00000000000 --- a/pkgs/desktops/e17/evas/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, freetype, fontconfig, libpng, libjpeg -, libX11, libXext, eina, eet }: -stdenv.mkDerivation rec { - name = "evas-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh"; - }; - buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg - libX11 libXext eina eet - ]; - meta = { - description = "Enlightenment's canvas and scenegraph rendering library"; - longDescription = '' - Enlightenment's Evas is a clean display canvas API that - implements a scene graph, not an immediate-mode rendering - target, is cross-platform, for several target display systems - that can draw anti-aliased text, smooth super and sub-sampled - scaled images, alpha-blend objects and much more. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix deleted file mode 100644 index 35e2f3f5a34..00000000000 --- a/pkgs/desktops/e17/terminology/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, elementary, eina, eet, evas, edje, emotion, ecore, ethumb, efreet }: - -stdenv.mkDerivation rec { - name = "terminology-${version}"; - version = "0.7.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5"; - }; - buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ]; - - meta = { - description = "Terminology, the E17 terminal emulator"; - homepage = http://www.enlightenment.org/p.php?p=about/terminology; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e18/default.nix b/pkgs/desktops/e18/default.nix deleted file mode 100644 index 56361eb85ce..00000000000 --- a/pkgs/desktops/e18/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ callPackage, pkgs }: -rec { - #### CORE EFL - efl = callPackage ./efl.nix { }; - evas = callPackage ./evas.nix { }; - emotion = callPackage ./emotion.nix { }; - elementary = callPackage ./elementary.nix { }; - - #### WINDOW MANAGER - enlightenment = callPackage ./enlightenment.nix { }; - - #### APPLICATIONS - econnman = callPackage ./econnman.nix { }; - terminology = callPackage ./terminology.nix { }; - -} diff --git a/pkgs/desktops/e18/econnman.nix b/pkgs/desktops/e18/econnman.nix deleted file mode 100644 index f2c67edf4f8..00000000000 --- a/pkgs/desktops/e18/econnman.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, python27, python27Packages, dbus, makeWrapper }: -stdenv.mkDerivation rec { - name = "econnman-${version}"; - version = "1.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; - sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; - }; - - buildInputs = [ makeWrapper pkgconfig e18.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus e18.elementary ]; - postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages - ''; - - meta = { - description = "Econnman is a user interface for the connman network connection manager"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; - }; -} diff --git a/pkgs/desktops/e18/efl.nix b/pkgs/desktops/e18/efl.nix deleted file mode 100644 index ca09ac32ee5..00000000000 --- a/pkgs/desktops/e18/efl.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages }: -stdenv.mkDerivation rec { - name = "efl-${version}"; - version = "1.10.2"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "0py8x0kv2hgl5v983xb6653fvmvn20im6picpc0hqfyxy09g1b24"; - }; - buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; - propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ]; - configureFlags = [ "--with-opengl=full" "--with-tests=none" "--enable-wayland" "--enable-sdl" "--enable-drm" ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${xlibs.libXtst} $NIX_CFLAGS_COMPILE" - export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" - ''; - meta = { - description = "Enlightenment Core libraries"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; - }; -} diff --git a/pkgs/desktops/e18/elementary.nix b/pkgs/desktops/e18/elementary.nix deleted file mode 100644 index f808d5c905b..00000000000 --- a/pkgs/desktops/e18/elementary.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18 }: -stdenv.mkDerivation rec { - name = "elementary-${version}"; - version = "1.10.2"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0y3knvmabl9adc8pd54p7qxpf7gvciixc1rk40hqppwhdgbgpz28"; - }; - buildInputs = [ pkgconfig e18.efl ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "Widget set/toolkit"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; - }; -} diff --git a/pkgs/desktops/e18/emotion.nix b/pkgs/desktops/e18/emotion.nix deleted file mode 100644 index 7e1c3be6400..00000000000 --- a/pkgs/desktops/e18/emotion.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, vlc }: -stdenv.mkDerivation rec { - name = "emotion_generic_players-${version}"; - version = "1.10.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "1nwlrk9inrhiv6jpzji10ikcdlhzhz7f2b5qhi2ai8bb6j61ryyc"; - }; - buildInputs = [ pkgconfig e18.efl vlc ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "Extra video decoders"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/e18/enlightenment.nix b/pkgs/desktops/e18/enlightenment.nix deleted file mode 100644 index c3cd585e525..00000000000 --- a/pkgs/desktops/e18/enlightenment.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit, bzip2, set_freqset_setuid ? false }: - -stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.18.8"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz"; - sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l"; - }; - buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - - # this is a hack and without this cpufreq module is not working: - # when set_freqset_setuid is true and "e18_freqset" is set in setuidPrograms (this is taken care of in e18 NixOS module), - # then this postInstall does the folowing: - # 1. moves the "freqset" binary to "e18_freqset", - # 2. linkes "e18_freqset" to enlightenment/bin so that, - # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e18_freqset, - # 4. and finaly, linkes /var/setuid-wrappers/e18_freqset to original destination where enlightenment wants it - postInstall = if set_freqset_setuid then '' - export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; - mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e18_freqset - ln -sv $CPUFREQ_DIRPATH/e18_freqset $out/bin/e18_freqset - ln -sv /var/setuid-wrappers/e18_freqset $CPUFREQ_DIRPATH/freqset - '' else ""; - meta = { - description = "The Compositing Window Manager and Desktop Shell"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/e18/evas.nix b/pkgs/desktops/e18/evas.nix deleted file mode 100644 index 9ddd94dbaea..00000000000 --- a/pkgs/desktops/e18/evas.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, zlib }: -stdenv.mkDerivation rec { - name = "evas_generic_loaders-${version}"; - version = "1.10.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "0qx44g7a8pzcgspx8q10zjiwzafis301fhpchd4pskfxhqd4qagm"; - }; - buildInputs = [ pkgconfig e18.efl zlib ]; - meta = { - description = "Extra image decoders"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/e18/terminology.nix b/pkgs/desktops/e18/terminology.nix deleted file mode 100644 index 892abc6ea5f..00000000000 --- a/pkgs/desktops/e18/terminology.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18 }: -stdenv.mkDerivation rec { - name = "terminology-${version}"; - version = "0.6.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x"; - }; - buildInputs = [ pkgconfig e18.efl e18.elementary ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "The best terminal emulator written with the EFL"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c5caa1649..50198b0e1c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11718,16 +11718,6 @@ let enlightenment = callPackage ../desktops/enlightenment { }; - e17 = recurseIntoAttrs ( - let callPackage = newScope pkgs.e17; in - import ../desktops/e17 { inherit callPackage pkgs; } - ); - - e18 = recurseIntoAttrs ( - let callPackage = newScope pkgs.e18; in - import ../desktops/e18 { inherit callPackage pkgs; } - ); - e19 = recurseIntoAttrs ( let callPackage = newScope pkgs.e19; in import ../desktops/e19 { inherit callPackage pkgs; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 797a300f9a4..fcb7eb212a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11827,26 +11827,6 @@ let }; }; - pythonefl = buildPythonPackage rec { - name = "python-efl-${version}"; - version = "1.10.0"; - src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; - sha256 = "1inv2qalnm9paifdwyh9q3ffxcp9bjj92phvfw1rgkaildvfji5i"; - }; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${pkgs.e18.efl}/include/eo-1 -I${pkgs.e18.efl}/include/eina-1 -I${pkgs.e18.efl}/include/eina-1/eina -I${pkgs.e18.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e18.efl}/include/efl-1 -I${pkgs.e18.efl}/include/eet-1 -I${pkgs.e18.efl}/include/ecore-1 -I${pkgs.e18.efl}/include/ecore-evas-1 -I${pkgs.e18.efl}/include/ecore-file-1 -I${pkgs.e18.efl}/include/ecore-input-1 -I${pkgs.e18.efl}/include/ecore-imf-1 -I${pkgs.e18.efl}/include/ecore-con-1 -I${pkgs.e18.efl}/include/edje-1 -I${pkgs.e18.efl}/include/eldbus-1 -I${pkgs.e18.efl}/include/efreet-1 -I${pkgs.e18.efl}/include/ethumb-client-1 -I${pkgs.e18.efl}/include/ethumb-1 -I${pkgs.e18.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" - ''; - buildInputs = with self; [ pkgs.pkgconfig pkgs.e18.efl pkgs.e18.elementary ]; - meta = { - description = "Python bindings for EFL and Elementary."; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; - }; - }; - snapperGUI = buildPythonPackage rec { name = "Snapper-GUI";