Merge branch 'master' into staging

lib/maintainers.nix

···
   mornfall = "Petr Ročkai <[e-mail]>";
   MP2E = "Cray Elliott <[e-mail]>";
   msackman = "Matthew Sackman <[e-mail]>";
+  muflax = "Stefan Dorn <[e-mail]>";
   nathan-gs = "Nathan Bijnens <[e-mail]>";
   nckx = "Tobias Geerinckx-Rice <[e-mail]>";
   notthemessiah = "Brian Cohen <[e-mail]>";

nixos/doc/manual/configuration/network-manager.xml

···
 services.networkmanager.enable = true;
 </programlisting>
 
-Some desktop managers (e.g., GNOME) enable NetworkManager
+some desktop managers (e.g., GNOME) enable NetworkManager
 automatically for you.</para>
 
 <para>All users that should have permission to change network settings

nixos/doc/manual/development/running-nixos-tests.xml

···
 
 </para>
 
-<para>It is also possible to run the test environment interactively,
-allowing you to experiment with the VMs.  For example:
-
-<screen>
-$ nix-build login.nix -A driver
-$ ./result/bin/nixos-run-vms
-</screen>
-
-The script <command>nixos-run-vms</command> starts the virtual
-machines defined by test.  The root file system of the VMs is created
-on the fly and kept across VM restarts in
-<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para>
+<title>Running Tests interactively</title>
 
-<para>Finally, the test itself can be run interactively.  This is
+<para>The test itself can be run interactively.  This is
 particularly useful when developing or debugging a test:
 
 <screen>
-$ nix-build tests/ -A nfs.driver
+$ nix-build nixos/tests/login.nix -A driver
 $ ./result/bin/nixos-test-driver
 starting VDE switch for network 1
 &gt;
···
 
 <screen>
 &gt; startAll
+&gt; testScript
 &gt; $machine->succeed("touch /tmp/foo")
 </screen>
 
···
 completion.  This allows you to inspect the state of the VMs after the
 test (e.g. to debug the test script).</para>
 
-</section>
+<para>To just start and experiment with the VMs, run:
+
+<screen>
+$ nix-build nixos/tests/login.nix -A driver
+$ ./result/bin/nixos-run-vms
+</screen>
+
+The script <command>nixos-run-vms</command> starts the virtual
+machines defined by test.  The root file system of the VMs is created
+on the fly and kept across VM restarts in
+<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para>
+
+</section>

nixos/doc/manual/installation/installing.xml

···
   run <command>start display-manager</command> to start KDE.</para></listitem>
 
   <listitem><para>The boot process should have brought up networking (check
-  <command>ifconfig</command>).  Networking is necessary for the
+  <command>ip a</command>).  Networking is necessary for the
   installer, since it will download lots of stuff (such as source
   tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
   server on your network. Otherwise configure networking manually
   using <command>ifconfig</command>.</para>
   <para>To manually configure the network on the graphical installer,
-  first disable NetworkManager with
-  <command>stop NetworkManager</command>.</para></listitem>
+  first disable network-manager with
+  <command>systemctl stop network-manager</command>.</para></listitem>
 
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to that yourself.  Use the following

nixos/modules/installer/tools/nixos-generate-config.pl

···
 # Check if we're a VirtualBox guest.  If so, enable the guest
 # additions.
 if ($virt eq "oracle") {
-    push @attrs, "services.virtualbox.enable = true;"
+    push @attrs, "services.virtualboxGuest.enable = true;"
 }
 
 

nixos/modules/module-list.nix

···
   ./programs/ssmtp.nix
   ./programs/uim.nix
   ./programs/venus.nix
+  ./programs/virtualbox-host.nix
   ./programs/wvdial.nix
   ./programs/freetds.nix
   ./programs/zsh/zsh.nix

nixos/modules/programs/environment.nix

···
     # TODO: move most of these elsewhere
     environment.profileRelativeEnvVars =
       { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ];
-        MANPATH = [ "/man" "/share/man" ];
         INFOPATH = [ "/info" "/share/info" ];
         PKG_CONFIG_PATH = [ "/lib/pkgconfig" ];
         TERMINFO_DIRS = [ "/share/terminfo" ];

nixos/modules/programs/virtualbox-host.nix

···
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  virtualbox = config.boot.kernelPackages.virtualbox;
+in
+
+{
+  options = {
+    services.virtualboxHost.enable = mkEnableOption "VirtualBox Host support";
+  };
+
+  config = mkIf config.services.virtualboxHost.enable {
+    boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];
+    boot.extraModulePackages = [ virtualbox ];
+    environment.systemPackages = [ virtualbox ];
+
+    users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers;
+
+    services.udev.extraRules =
+      ''
+        KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
+        KERNEL=="vboxdrvu",   OWNER="root", GROUP="root",      MODE="0666", TAG+="systemd"
+        KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
+        SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+        SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+        SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+        SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+      '';
+
+    # Since we lack the right setuid binaries, set up a host-only network by default.
+
+    systemd.services."vboxnet0" =
+      { description = "VirtualBox vboxnet0 Interface";
+        requires = [ "dev-vboxnetctl.device" ];
+        after = [ "dev-vboxnetctl.device" ];
+        wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ];
+        path = [ virtualbox ];
+        serviceConfig.RemainAfterExit = true;
+        serviceConfig.Type = "oneshot";
+        script =
+          ''
+            if ! [ -e /sys/class/net/vboxnet0 ]; then
+              VBoxManage hostonlyif create
+            fi
+          '';
+        postStop =
+          ''
+            VBoxManage hostonlyif remove vboxnet0
+          '';
+      };
+
+    networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
+  };
+}

nixos/modules/programs/virtualbox.nix

···
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let virtualbox = config.boot.kernelPackages.virtualbox; in
-
-{
-  boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];
-  boot.extraModulePackages = [ virtualbox ];
-  environment.systemPackages = [ virtualbox ];
-
-  users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers;
-
-  services.udev.extraRules =
-    ''
-      KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
-      KERNEL=="vboxdrvu",   OWNER="root", GROUP="root",      MODE="0666", TAG+="systemd"
-      KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
-      SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-      SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-      SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-      SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-    '';
-
-  # Since we lack the right setuid binaries, set up a host-only network by default.
-
-  systemd.services."vboxnet0" =
-    { description = "VirtualBox vboxnet0 Interface";
-      requires = [ "dev-vboxnetctl.device" ];
-      after = [ "dev-vboxnetctl.device" ];
-      wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ];
-      path = [ virtualbox ];
-      serviceConfig.RemainAfterExit = true;
-      serviceConfig.Type = "oneshot";
-      script =
-        ''
-          if ! [ -e /sys/class/net/vboxnet0 ]; then
-            VBoxManage hostonlyif create
-          fi
-        '';
-      postStop =
-        ''
-          VBoxManage hostonlyif remove vboxnet0
-        '';
-    };
-
-  networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
+let
+  msg = "Importing <nixpkgs/nixos/modules/programs/virtualbox.nix> is "
+      + "deprecated, please use `services.virtualboxHost.enable = true' "
+      + "instead.";
+in {
+  config.warnings = [ msg ];
+  config.services.virtualboxHost.enable = true;
 }

nixos/modules/rename.nix

···
 ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
 ++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ]
 
+# VirtualBox
+++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ]
+
 # KDE
 ++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ]
 # ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] # !!! doesn't work!

nixos/modules/security/ca.nix

···
       { SSL_CERT_FILE          = "/etc/ssl/certs/ca-bundle.crt";
         # FIXME: unneeded - remove eventually.
         OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
-        GIT_SSL_CAINFO         = "/etc/ssl/certs/ca-bundle.crt";
       };
 
   };

nixos/modules/services/networking/networkmanager.nix

···
     systemd.services."networkmanager-init" = {
       description = "NetworkManager initialisation";
       wantedBy = [ "network.target" ];
-      wants = [ "NetworkManager.service" ];
-      before = [ "NetworkManager.service" ];
+      wants = [ "network-manager.service" ];
+      before = [ "network-manager.service" ];
       script = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections
         mkdir -m 755 -p ${stateDirs}
···
     };
 
     powerManagement.resumeCommands = ''
-      systemctl restart NetworkManager
+      Systemctl restart network-manager
     '';
 
     security.polkit.extraConfig = polkitConf;

nixos/modules/services/networking/ssh/sshd.nix

···
 
   knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
 
-  knownHostsFile = pkgs.writeText "ssh_known_hosts" (
-    flip concatMapStrings knownHosts (h: ''
-      ${concatStringsSep "," h.hostNames} ${if h.publicKey != null then h.publicKey else readFile h.publicKeyFile}
-    '')
-  );
+  knownHostsFile = pkgs.runCommand "ssh_known_hosts" {} ''
+    touch "$out"
+    ${flip concatMapStrings knownHosts (h: ''
+      pubkeyfile=${builtins.toFile "host.pub" (if h.publicKey == null then readFile h.publicKeyFile else h.publicKey)}
+      ${pkgs.gnused}/bin/sed 's/^/${concatStringsSep "," h.hostNames} /' $pubkeyfile >> "$out"
+    '')}
+  '';
 
   userOptions = {
 
···
             description = ''
               The public key data for the host. You can fetch a public key
               from a running SSH server with the <command>ssh-keyscan</command>
-              command.
+              command. The public key should not include any host names, only
+              the key type and the key itself. It is allowed to add several
+              lines here, each line will be treated as type/key pair and the
+              host names will be prepended to each line.
             '';
           };
           publicKeyFile = mkOption {
···
               The path to the public key file for the host. The public
               key file is read at build time and saved in the Nix store.
               You can fetch a public key file from a running SSH server
-              with the <command>ssh-keyscan</command> command.
+              with the <command>ssh-keyscan</command> command. The content
+              of the file should follow the same format as described for
+              the <literal>publicKey</literal> option.
             '';
           };
         };

nixos/modules/services/printing/cupsd.nix

···
         '';
       };
 
+      extraConf = mkOption {
+        type = types.lines;
+        default = "";
+        example =
+          ''
+            BrowsePoll cups.example.com
+            LogLevel debug
+          '';
+        description = ''
+          Extra contents of the configuration file of the CUPS daemon
+          (<filename>cupsd.conf</filename>).
+        '';
+      };
+
       clientConf = mkOption {
         type = types.lines;
         default = "";
···
             Order deny,allow
           </Limit>
         </Policy>
+        ${cfg.extraConf}
       '';
 
     security.pam.services.cups = {};

nixos/modules/services/x11/desktop-managers/default.nix

···
   # 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 = {

nixos/modules/services/x11/desktop-managers/e17.nix

···
-{ 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 ];
-
-  };
-
-}

nixos/modules/services/x11/desktop-managers/e18.nix

···
-{ 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" ];
-
-  };
-
-}

nixos/modules/virtualisation/virtualbox-guest.nix

···
 
 let
 
-  cfg = config.services.virtualbox;
+  cfg = config.services.virtualboxGuest;
   kernel = config.boot.kernelPackages;
 
 in
···
 
   options = {
 
-    services.virtualbox = {
+    services.virtualboxGuest = {
 
       enable = mkOption {
         default = false;

nixos/modules/virtualisation/virtualbox-image.nix

···
     boot.loader.grub.version = 2;
     boot.loader.grub.device = "/dev/sda";
   
-    services.virtualbox.enable = true;
+    services.virtualboxGuest.enable = true;
   };
 }

nixos/tests/printing.nix

···
       { config, pkgs, ... }:
       { services.printing.enable = true;
         services.printing.listenAddresses = [ "*:631" ];
-        services.printing.cupsdConf =
+        services.printing.extraConf =
           ''
             <Location />
               Order allow,deny
···
       $server->fail("curl --fail --connect-timeout 2  http://client:631/");
 
       # Add a HP Deskjet printer connected via USB to the server.
-      $server->succeed("lpadmin -p DeskjetLocal -v usb://HP/Deskjet%205400%20series?serial=TH93I152S123XY -m 'drv:///sample.drv/deskjet.ppd' -E");
+      $server->succeed("lpadmin -p DeskjetLocal -E -v usb://foobar/printers/foobar");
 
       # Add it to the client as well via IPP.
-      $client->succeed("lpadmin -p DeskjetRemote -v ipp://server/printers/DeskjetLocal -m 'drv:///sample.drv/deskjet.ppd' -E");
+      $client->succeed("lpadmin -p DeskjetRemote -E -v ipp://server/printers/DeskjetLocal");
       $client->succeed("lpadmin -d DeskjetRemote");
 
       # Do some status checks.
···
       $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
 
       # Test printing various file types.
-      foreach my $file ("${pkgs.groff}/share/doc/*/examples/mom/typesetting.pdf",
+      foreach my $file ("${pkgs.groff}/share/doc/*/examples/mom/penguin.pdf",
                         "${pkgs.groff}/share/doc/*/meref.ps",
                         "${pkgs.cups}/share/doc/cups/images/cups.png",
                         "${pkgs.xz}/share/doc/xz/faq.txt")
···
               # (showing that the right filters have been applied).  Of
               # course, since there is no actual USB printer attached, the
               # file will stay in the queue forever.
-              $server->waitForFile("/var/spool/cups/d*-*");
-              $server->succeed("lpq -a") =~ /remroot.*$fn/ or die;
-              $server->succeed("hexdump -C -n2 /var/spool/cups/d*-*") =~ /1b 45/ or die; # 1b 45 = printer reset
+              $server->waitForFile("/var/spool/cups/d00001-001");
+              $server->succeed("lpq -a") =~ /$fn/ or die;
 
               # Delete the job on the client.  It should disappear on the
               # server as well.

pkgs/applications/audio/drumgizmo/default.nix

···
+{ stdenv, fetchurl, alsaLib, expat, glib, jack2, libX11, libpng
+, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.9.6";
+  name = "drumgizmo-${version}";
+
+  src = fetchurl {
+    url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
+    sha256 = "1qs8aa1v8cw5zgfzcnr2dc4w0y5yzsgrywlnx2hfvx2si3as0mw4";
+  };
+
+  configureFlags = [ "--enable-lv2" ];
+
+  buildInputs = [
+    alsaLib expat glib jack2 libX11 libpng libpthreadstubs libsmf
+    libsndfile lv2 pkgconfig
+  ];
+
+  meta = with stdenv.lib; {
+    description = "An LV2 sample based drum plugin";
+    homepage = http://www.drumgizmo.org;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}

pkgs/applications/audio/faust-compiler/default.nix

···
-{ fetchurl, stdenv, unzip }:
+{ fetchurl, stdenv, unzip, pkgconfig, makeWrapper, libsndfile, libmicrohttpd, vim }:
 
 stdenv.mkDerivation rec {
 
···
     sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";
   };
 
-  buildInputs = [ unzip ];
+  buildInputs = [ unzip pkgconfig makeWrapper libsndfile libmicrohttpd vim];
+
+
+  makeFlags="PREFIX = $(out)";
+  FPATH="$out"; # <- where to search
 
   patchPhase = ''
-    sed -i '77,101d' Makefile
-    sed -i 's#?= $(shell uname -s)#:= Linux#g'  architecture/osclib/oscpack/Makefile
-    sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@$out@g" -i tools/faust2appls/faustpath
+    sed -i 's@?= $(shell uname -s)@:= Linux@g'  architecture/osclib/oscpack/Makefile
+    sed -i 's@faust/misc.h@../../architecture/faust/misc.h@g' tools/sound2faust/sound2faust.cpp
+    sed -i 's@faust/gui/@../../architecture/faust/gui/@g' architecture/faust/misc.h
+    '';
+
+  buildPhase = ''
+    make -C compiler -f Makefile.unix
+    make -C architecture/osclib
+	g++ -O3 tools/sound2faust/sound2faust.cpp `pkg-config --cflags --static --libs sndfile` -o tools/sound2faust/sound2faust
+    make httpd
+
   '';
 
-  postInstallPhase = ''
-    rm -rf $out/include/
-  '';
+  installPhase = ''
+
+    echo install faust itself
+    mkdir -p $out/bin/
+    mkdir -p $out/include/
+	mkdir -p $out/include/faust/
+	mkdir -p $out/include/faust/osc/
+    install compiler/faust $out/bin/
 
-  makeFlags = "PREFIX=$(out)";
-  FPATH = "$out"; # <- where to search
+    echo install architecture and faust library files
+    mkdir -p $out/lib/faust
+    cp architecture/*.lib $out/lib/faust/
+    cp architecture/*.cpp $out/lib/faust/
+
+    echo install math documentation files
+	cp architecture/mathdoctexts-*.txt $out/lib/faust/
+	cp architecture/latexheader.tex $out/lib/faust/
+
+    echo install additional binary libraries: osc, http
+	([ -e architecture/httpdlib/libHTTPDFaust.a ] && cp architecture/httpdlib/libHTTPDFaust.a $out/lib/faust/) || echo libHTTPDFaust not available	
+	cp architecture/osclib/*.a $out/lib/faust/
+	cp -r architecture/httpdlib/html/js $out/lib/faust/js
+	([ -e architecture/httpdlib/src/hexa/stylesheet ] && cp architecture/httpdlib/src/hexa/stylesheet $out/lib/faust/js/stylesheet.js) || echo stylesheet not available
+	([ -e architecture/httpdlib/src/hexa/jsscripts ] && cp architecture/httpdlib/src/hexa/jsscripts $out/lib/faust/js/jsscripts.js) || echo jsscripts not available
+
+    echo install includes files for architectures
+	cp -r architecture/faust $out/include/
+
+    echo install additional includes files for binary libraries:  osc, http
+	cp architecture/osclib/faust/faust/OSCControler.h $out/include/faust/gui/
+	cp architecture/osclib/faust/faust/osc/*.h $out/include/faust/osc/
+	cp architecture/httpdlib/src/include/*.h $out/include/faust/gui/
+
+
+    echo patch header and cpp files
+    find $out/include/ -name "*.h" -type f | xargs sed "s@#include \"faust/@#include \"$out/include/faust/@g" -i
+    find $out/lib/faust/ -name "*.cpp" -type f | xargs sed "s@#include \"faust/@#include \"$out/include/faust/@g" -i
+    sed -i "s@../../architecture/faust/gui/@$out/include/faust/gui/@g"  $out/include/faust/misc.h
+
+    wrapProgram $out/bin/faust \
+    --set FAUSTLIB $out/lib/faust \
+    --set FAUST_LIB_PATH  $out/lib/faust \
+    --set FAUSTINC $out/include/
+  '';
 
   meta = with stdenv.lib; {
     description = "A functional programming language for realtime audio signal processing";

pkgs/applications/audio/faust/default.nix

···
+{ fetchurl, stdenv, bash, alsaLib, atk, cairo, faust-compiler, fontconfig, freetype
+, gcc, gdk_pixbuf, glib, gtk, makeWrapper, pango, pkgconfig, unzip
+, gtkSupport ? true
+}:
+
+stdenv.mkDerivation rec {
+
+  version = "0.9.67";
+  name = "faust-${version}";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip";
+    sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";
+  };
+
+  buildInputs = [ bash unzip faust-compiler gcc makeWrapper pkgconfig ]
+    ++ stdenv.lib.optionals gtkSupport [
+      alsaLib atk cairo fontconfig freetype gdk_pixbuf glib gtk pango
+    ]
+  ;
+
+  makeFlags="PREFIX=$(out)";
+  FPATH="$out"; # <- where to search
+
+  phases = [ "unpackPhase installPhase postInstall" ];
+
+  installPhase  = ''
+    mkdir $out/bin
+    install tools/faust2appls/faust2alsaconsole $out/bin
+    install tools/faust2appls/faustpath  $out/bin
+    install tools/faust2appls/faustoptflags  $out/bin
+    install tools/faust2appls/faust2alsa $out/bin
+
+    wrapProgram $out/bin/faust2alsaconsole \
+    --prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig \
+    --set FAUSTLIB ${faust-compiler}/lib/faust \
+    --set FAUSTINC ${faust-compiler}/include/
+
+    GTK_PKGCONFIG_PATHS=${gtk}/lib/pkgconfig:${pango}/lib/pkgconfig:${glib}/lib/pkgconfig:${cairo}/lib/pkgconfig:${gdk_pixbuf}/lib/pkgconfig:${atk}/lib/pkgconfig:${freetype}/lib/pkgconfig:${fontconfig}/lib/pkgconfig
+
+    wrapProgram  $out/bin/faust2alsa \
+    --prefix PKG_CONFIG_PATH :  ${alsaLib}/lib/pkgconfig:$GTK_PKGCONFIG_PATHS \
+    --set FAUSTLIB ${faust-compiler}/lib/faust \
+    --set FAUSTINC ${faust-compiler}/include/ \
+    '' + stdenv.lib.optionalString (!gtkSupport) "rm $out/bin/faust2alsa"
+  ;
+
+  postInstall = ''
+    find $out/bin/ -name "faust2*" -type f | xargs sed "s@/bin/bash@${bash}/bin/bash@g" -i
+    sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustpath
+    sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@${faust-compiler}@g" -i $out/bin/faustpath
+    sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustoptflags
+    find $out/bin/ -name "faust2*" -type f | xargs sed "s@pkg-config@${pkgconfig}/bin/pkg-config@g" -i
+    find $out/bin/ -name "faust2*" -type f | xargs sed "s@CXX=g++@CXX=${gcc}/bin/g++@g" -i
+    find $out/bin/ -name "faust2*" -type f | xargs sed "s@faust -i -a @${faust-compiler}/bin/faust -i -a ${faust-compiler}/lib/faust/@g" -i
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A functional programming language for realtime audio signal processing";
+    longDescription = ''
+      FAUST (Functional Audio Stream) is a functional programming
+      language specifically designed for real-time signal processing
+      and synthesis. FAUST targets high-performance signal processing
+      applications and audio plug-ins for a variety of platforms and
+      standards.
+      The Faust compiler translates DSP specifications into very
+      efficient C++ code. Thanks to the notion of architecture,
+      FAUST programs can be easily deployed on a large variety of
+      audio platforms and plugin formats (jack, alsa, ladspa, maxmsp,
+      puredata, csound, supercollider, pure, vst, coreaudio) without
+      any change to the FAUST code.
+    '';
+    homepage = http://faust.grame.fr/;
+    downloadPage = http://sourceforge.net/projects/faudiostream/files/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.magnetophon ];
+  };
+}
+

pkgs/applications/editors/neovim/default.nix

···
+{ stdenv, fetchgit, fetchurl, unzip, callPackage, ncurses, gettext, pkgconfig,
+cmake, pkgs, lpeg, lua, luajit, luaMessagePack, luabitop }:
+
+stdenv.mkDerivation rec {
+  name = "neovim-nightly";
+
+  version = "nightly";
+
+  src = fetchgit {
+    url = "https://github.com/neovim/neovim";
+    rev = "68fcd8b696dae33897303c9f8265629a31afbf17";
+    sha256 = "0hxkcy641jpn4qka44gfvhmb6q3dkjx6lvn9748lcl2gx2d36w4i";
+  };
+
+  libmsgpack = stdenv.mkDerivation rec {
+    version = "0.5.9";
+    name = "libmsgpack-${version}";
+
+    src = fetchgit {
+      rev = "ecf4b09acd29746829b6a02939db91dfdec635b4";
+      url = "https://github.com/msgpack/msgpack-c";
+      sha256 = "076ygqgxrc3vk2l20l8x2cgcv05py3am6mjjkknr418pf8yav2ww";
+    };
+
+    buildInputs = [ cmake ];
+
+    meta = with stdenv.lib; {
+      description = "MessagePack implementation for C and C++";
+      homepage = http://msgpack.org;
+      maintainers = [ maintainers.manveru ];
+      license = licenses.asl20;
+      platforms = platforms.all;
+    };
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    ncurses
+    pkgconfig
+    cmake
+    pkgs.libuvVersions.v0_11_29
+    luajit
+    lua
+    lpeg
+    luaMessagePack
+    luabitop
+    libmsgpack
+  ];
+  nativeBuildInputs = [ gettext ];
+
+  LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
+  LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
+  cmakeFlags = [
+    "-DUSE_BUNDLED_MSGPACK=ON"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Aggressive refactor of Vim";
+    homepage    = http://www.neovim.org;
+    maintainers = with maintainers; [ manveru ];
+    platforms   = platforms.unix;
+  };
+}
+

pkgs/applications/graphics/shotwell/default.nix

···
-{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit
+{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x
 , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
 , lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }:
 
···
     buildInputs = [ pkgconfig glib libsoup ];
   };
 in stdenv.mkDerivation rec {
-  version = "0.18.0";
+  version = "0.20.2";
   name = "shotwell-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/shotwell/0.18/${name}.tar.xz";
-    sha256 = "0cq0zs13f3f4xyz46yvj4qfpm5nh4ypds7r53pkqm4a3n8ybf5v7";
+    url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz";
+    sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
···
   '';
 
 
-  buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig
+  buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2
                   libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
                   makeWrapper gnome_doc_utils ];

pkgs/applications/graphics/synfigstudio/default.nix

···
   };
 
   buildInputs = [
-    ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool
+    ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool
     intltool libsigcxx libtool libxmlxx pkgconfig synfig
   ];
 
···
   preBuild = ''
     export FONTCONFIG_FILE=${fontsConf}
   '';
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A 2D animation program";

pkgs/applications/graphics/yed/default.nix

···
+{ stdenv, fetchurl, makeWrapper, unzip, jre }:
+
+stdenv.mkDerivation rec {
+  name = "yEd-3.13";
+
+  src = fetchurl {
+    url = "http://www.yworks.com/products/yed/demo/${name}.zip";
+    sha256 = "1d5qs6q31k49y9gh054aafck548pv9f97b3il4iksnna1r59w5jy";
+  };
+
+  nativeBuildInputs = [ unzip makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/yed
+    cp -r * $out/yed
+    mkdir -p $out/bin
+
+    makeWrapper ${jre}/bin/java $out/bin/yed \
+      --add-flags "-jar $out/yed/yed.jar --"
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.unfreeRedistributable;
+    homepage = http://www.yworks.com/en/products/yfiles/yed/;
+    description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
+    platforms = jre.meta.platforms;
+    maintainer = with maintainers; [ abbradar ];
+  };
+}

pkgs/applications/misc/calibre/default.nix

···
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.11.0";
+  name = "calibre-2.12.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "19pn55yvc7yiz21gri5838zf7n88l6m2abbwzswn4x8v9915lls1";
+    sha256 = "1qp3aq6f6ngfy8m0bj6rzdf6p2vmk4bxycxfby2n8byfhr8gaclf";
   };
 
   inherit python;

pkgs/applications/misc/xrandr-invert-colors/default.nix

···
+{ fetchurl, stdenv, libXrandr}:
+
+stdenv.mkDerivation rec {
+  version = "v0.01";
+  name = "xrandr-invert-colors-${version}";
+  src = fetchurl {
+    url = "https://github.com/zoltanp/xrandr-invert-colors/archive/${version}.tar.gz";
+    sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75";
+  };
+
+  buildInputs = [ libXrandr ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv xrandr-invert-colors.bin xrandr-invert-colors
+    install xrandr-invert-colors $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Inverts the colors of your screen";
+    license = stdenv.lib.licenses.gpl3Plus;
+    homepage = https://github.com/zoltanp/xrandr-invert-colors;
+    maintainers = [stdenv.lib.maintainers.magnetophon ];
+    platforms = platforms.linux;
+  }; 
+}

pkgs/applications/networking/browsers/chromium/common.nix

···
       libExecPath="${libExecPath}"
       python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
       python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
+      find . -iname '*.py[co]' -delete
     '';
 
     buildPhase = let

pkgs/applications/networking/browsers/rekonq/default.nix

···
 assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
 
 stdenv.mkDerivation rec {
-  name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0
+  name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0
 
   src = fetchurl {
-    url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
-    sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g";
+    url = "mirror://sourceforge/rekonq/${name}.tar.xz";
+    sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079";
   };
 
   buildInputs = [ kde4.kdelibs qca2 qoauth ];

pkgs/applications/networking/ids/daq/default.nix

···
 {stdenv, fetchurl, flex, bison, libpcap}:
 
 stdenv.mkDerivation rec {
-  name = "daq-2.0.2";
+  name = "daq-2.0.4";
   
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
-    sha256 = "1a39qbm9nc05yr8llawl7mz0ny1fci4acj9c2k1h4klrqikiwpfn";
+    sha256 = "0g15kny0s6mpqfc723jxv7mgjfh45izhwcidhjzh52fd04ysm552";
   };
   
   buildInputs = [ flex bison libpcap ];

pkgs/applications/networking/ids/snort/default.nix

···
 {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
 
 stdenv.mkDerivation rec {
-  name = "snort-2.9.6.2";
+  name = "snort-2.9.7.0";
   
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
-    sha256 = "0xsxbd5h701ncnhn9sf7zkmzravlqhn1182whinphfjjw72py7cf";
+    sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p";
   };
   
   buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];

pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix

···
 { stdenv, fetchurl, libotr, pidgin, intltool } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-otr-4.0.0";
+  name = "pidgin-otr-4.0.1";
   src = fetchurl {
     url = "http://www.cypherpunks.ca/otr/${name}.tar.gz";
-    sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym";
+    sha256 = "02pkkf86fh5jvzsdn9y78impsgzj1n0p81kc2girvk3vq941yy0v";
   };
 
   postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";

pkgs/applications/networking/instant-messengers/teamspeak/client.nix

···
 { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
 , fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null
-, libredirect, quazip
+, libredirect, quazip, less, which
 }:
 
 let
···
                 else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz";
   };
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper less which ];
 
   unpackPhase =
     ''
-      yes | sh $src
+      echo -e 'q\ny' | sh -xe $src
       cd TeamSpeak*
     '';
 

pkgs/applications/version-management/git-and-tools/git/default.nix

···
     sha256 = "0mvgvr2hz25p49dhhizcw9591f2h17y2699mpmndis3kzap0c6zy";
   };
 
-  patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];
+  patches = [
+    ./docbook2texi.patch
+    ./symlinks-in-bin.patch
+    ./cert-path.patch
+    ./ssl-cert-file.patch
+  ];
 
   buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
     ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
···
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ simons the-kenny wmertens ];
   };
 }

pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch

···
+This patch adds support for the OpenSSL SSL_CERT_FILE environment variable.
+GIT_SSL_CAINFO still takes precedence.
+
+--- git-orig/http.c.orig	2014-11-25 23:27:56.000000000 +0100
++++ git-orig/http.c	2014-11-25 23:28:48.000000000 +0100
+@@ -433,6 +433,7 @@
+ #if LIBCURL_VERSION_NUM >= 0x070908
+ 	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
+ #endif
++	set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
+ 	set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
+ 
+ 	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");

pkgs/applications/version-management/src/default.nix

···
 { stdenv, fetchurl, python, rcs, git }:
 
 stdenv.mkDerivation rec {
-  name = "src-0.12";
+  name = "src-0.13";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/src/${name}.tar.gz";
-    sha256 = "1w8k9z2dxim99nniid9kjsc5lzri7m4sd0n819y73aqcdi54lr1s";
+    sha256 = "03x0slgi6bnzgfn7f9qbl6jma0pj7357kwdh832l3v8zafk41p51";
   };
 
   buildInputs = [ python ];

pkgs/applications/version-management/src/path.patch

···
-diff -Naur src-0.12-orig/src src-0.12/src
---- src-0.12-orig/src	2014-11-21 08:19:59.000000000 -0500
-+++ src-0.12/src	2014-11-21 15:54:54.598113846 -0500
+diff -Naur src-0.13-orig/src src-0.13/src
+--- src-0.13-orig/src	2014-11-24 03:56:16.000000000 -0500
++++ src-0.13/src	2014-11-26 16:32:32.925151003 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2
 +#!@python@/bin/python
  #
  # src - simple revision control.
  #
-@@ -58,6 +58,8 @@
+@@ -51,6 +51,8 @@
  
  import sys, os, subprocess, time, calendar, stat, glob, shutil, hashlib
  
 +os.environ['PATH'] = "@rcs@/bin:@git@/bin:" + os.environ['PATH']
 +
- version="0.12"
+ version="0.13"
  
  def rfc3339(t):
-diff -Naur src-0.12-orig/srctest src-0.12/srctest
---- src-0.12-orig/srctest	2014-11-21 08:12:00.000000000 -0500
-+++ src-0.12/srctest	2014-11-21 15:58:31.370500990 -0500
+diff -Naur src-0.13-orig/srctest src-0.13/srctest
+--- src-0.13-orig/srctest	2014-11-21 08:12:00.000000000 -0500
++++ src-0.13/srctest	2014-11-26 16:33:13.627715388 -0500
 @@ -12,7 +12,7 @@
  
  # Set the PATH to include the current directory, so the repository

pkgs/applications/video/mpv/default.nix

···
 # For screenshots
 , libpngSupport ? true, libpng ? null
 # for Youtube support
-, quviSupport ? false, libquvi ? null
+, youtubeSupport ? false, youtubeDL ? null
 , cacaSupport ? false, libcaca ? null
 , vaapiSupport ? false, libva ? null
 }:
···
 assert pulseSupport -> pulseaudio != null;
 assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
-assert quviSupport -> libquvi != null;
+assert youtubeSupport -> youtubeDL != null;
 assert cacaSupport -> libcaca != null;
 
 # Purity problem: Waf needed to be is downloaded by bootstrap.py
···
 
 let
   waf = fetchurl {
-    url = http://ftp.waf.io/pub/release/waf-1.7.16;
-    sha256 = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61";
+    url = http://ftp.waf.io/pub/release/waf-1.8.1;
+    sha256 = "ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d";
   };
 
 in
 
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.6.2";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "1s42i3vf8i86lx62kw00vvimjizvp8zpxdq53mqhdz1p5im2ylr0";
+    sha256 = "0rz8dp44yag442gamaa2vdmf69h25gqh2bgybx89prkfh8n4hy8x";
   };
 
   buildInputs = with stdenv.lib;
···
     ++ optional speexSupport speex
     ++ optional bs2bSupport libbs2b
     ++ optional libpngSupport libpng
-    ++ optional quviSupport libquvi
+    ++ optional youtubeSupport youtubeDL
     ++ optional sdl2Support SDL2
     ++ optional cacaSupport libcaca
     ++ optional vaapiSupport libva
···
 }
 
 # TODO: Wayland support
-# TODO: investigate libquvi problems (related to Youtube support)
 # TODO: investigate caca support
 # TODO: investigate lua5_sockets bug

pkgs/build-support/grsecurity/default.nix

···
       let boolToKernOpt = b: if b then "y" else "n";
           # Disable RANDSTRUCT under virtualbox, as it has some kind of
           # breakage with the vbox guest drivers
-          #randstruct = optionalString config.services.virtualbox.enable
+          #randstruct = optionalString config.services.virtualboxGuest.enable
           #  "GRKERNSEC_RANDSTRUCT n";
 
           # Disable restricting links under the testing kernel, as something

pkgs/desktops/e17/default.nix

···
-{ 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
-
-
-
-
-}

pkgs/desktops/e17/e_dbus/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/e_dbus/setup-hook.sh

···
-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)

pkgs/desktops/e17/ecore/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/edje/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/eet/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/eeze/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/efreet/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/eina/default.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e17/eio/default.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e17/elementary/default.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e17/embryo/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/emotion/default.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e17/enlightenment/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/ethumb/default.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e17/evas/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e17/terminology/default.nix

···
-{ 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
-  };
-}

pkgs/desktops/e18/default.nix

···
-{ 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 { };
-
-}

pkgs/desktops/e18/econnman.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e18/efl.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e18/elementary.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e18/emotion.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e18/enlightenment.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e18/evas.nix

···
-{ 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;
-  };
-}

pkgs/desktops/e18/terminology.nix

···
-{ 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;
-  };
-}

pkgs/development/compilers/ccl/default.nix

···
-a :  
-let 
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
-  version = "1.8";
-  name = "ccl-${version}";
+{ stdenv, fetchsvn, gcc, glibc, m4 }:
 
-  /* There are also MacOS and FreeBSD and Windows versions */
-  src = a.fetchurl {
-    url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz";
-    sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01";
+/* TODO: there are also MacOS, FreeBSD and Windows versions */
+assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+
+stdenv.mkDerivation rec {
+  name     = "ccl-${version}";
+  version  = "1.10";
+  revision = "16313";
+
+  src = fetchsvn {
+    url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl;
+    rev = revision;
+    sha256 = "11lmdvzj1mbm7mbr22vjbcrsvinyz8n32a91ms324xqdqpr82ifb";
   };
-  
-  inherit buildInputs;
-  configureFlags = [];
+
+  buildInputs = [ gcc glibc m4 ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doUnpack" "doPatchElf" "doCopy"];
+  CCL_RUNTIME = if stdenv.system == "x86_64-linux" then "lx86cl64"   else "lx86cl";
+  CCL_KERNEL  = if stdenv.system == "x86_64-linux" then "linuxx8664" else "linuxx8632";
 
-  doCopy = a.fullDepEntry ''
+  buildPhase = ''
+    sed -i lisp-kernel/${CCL_KERNEL}/Makefile -e's/svnversion/echo ${revision}/g'
+
+    make -C lisp-kernel/${CCL_KERNEL} clean
+    make -C lisp-kernel/${CCL_KERNEL} all
+
+    ./${CCL_RUNTIME} -n -b -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)'
+  '';
+
+  installPhase = ''
     mkdir -p "$out/share"
-    cp -r . "$out/share/ccl-installation"
+    cp -r .  "$out/share/ccl-installation"
 
     mkdir -p "$out/bin"
-    for i in $(find . -maxdepth 1 -type f -perm +111); do
-      echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")"
-      chmod a+x "$out"/bin/"$(basename "$i")"
-    done
-  '' ["minInit" "doUnpack" "defEnsureDir"];
+    echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}"
+    chmod a+x "$out"/bin/"${CCL_RUNTIME}"
+  '';
 
-  doPatchElf = a.fullDepEntry ''
-    patchelfFile="$(type -P patchelf)"
-    goodInterp="$(patchelf --print-interpreter "$patchelfFile")"
-    find . -type f -perm +111 -exec  patchelf --set-interpreter "$goodInterp" '{}' ';'
-  '' ["minInit" "doUnpack"];
-      
   meta = {
     description = "Clozure Common Lisp";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms; 
-      linux;
+    homepage    = http://ccl.clozure.com/;
+    maintainers = with stdenv.lib.maintainers; [ raskin muflax ];
+    platforms   = stdenv.lib.platforms.linux;
+    license     = stdenv.lib.licenses.lgpl21;
   };
 }
-

pkgs/development/interpreters/groovy/default.nix

···
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.3.7";
+  version = "2.3.8";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
-    sha256 = "09957vi33c8bgk6z4wnidch5sz3s183yh6xba8cdjy5f7jpzmmiq";
+    sha256 = "0fgsn1s7vhxcrwb2wa6zvrdzff7zbb2s6f7xj6c9x7gl9mdfcwpn";
   };
 
   installPhase = ''

pkgs/development/libraries/audio/libsmf/default.nix

···
+{ lib, stdenv, fetchurl, glib, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "1.3";
+  name = "libsmf-${version}";
+  src = fetchurl {
+    url = "https://github.com/stump/libsmf/archive/${name}.tar.gz";
+    sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
+  };
+
+  buildInputs = [ glib pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "A C library for reading and writing Standard MIDI Files";
+    homepage = https://github.com/stump/libsmf;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}

pkgs/development/libraries/haskell/GenericPretty/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "GenericPretty";
+  version = "1.2.1";
+  sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
+  meta = {
+    homepage = "https://github.com/RazvanRanca/GenericPretty";
+    description = "A generic, derivable, haskell pretty printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/aws-ec2/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, aws, base16Bytestring, base64Bytestring
+, blazeBuilder, byteable, conduitExtra, cryptohash, httpConduit
+, httpTypes, mtl, optparseApplicative, resourcet, scientific, text
+, time, unorderedContainers, vector, xmlConduit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "aws-ec2";
+  version = "0.2.2";
+  sha256 = "1jlm6a4mb3mzzvql8llnvci4qd8imf58m681iqhcw1qq6hy56srl";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aws base16Bytestring base64Bytestring blazeBuilder byteable
+    conduitExtra cryptohash httpConduit httpTypes mtl
+    optparseApplicative resourcet scientific text time
+    unorderedContainers vector xmlConduit
+  ];
+  meta = {
+    homepage = "https://github.com/zalora/aws-ec2";
+    description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/handa-gdata/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, base64Bytestring, binary, caseInsensitive, cmdargs
+, dataDefault, filepath, GenericPretty, HTTP, httpConduit, json
+, network, pureMD5, random, regexPosix, resourcet, split, time
+, unixCompat, utf8String, xml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "handa-gdata";
+  version = "0.7.0.1";
+  sha256 = "1azjfhwcirf6nv7pym8lcrghvjbrb1hh1y2w43g7qxxdmk54n8g7";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    base64Bytestring binary caseInsensitive cmdargs dataDefault
+    filepath GenericPretty HTTP httpConduit json network pureMD5 random
+    regexPosix resourcet split time unixCompat utf8String xml
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://code.google.com/p/hgdata";
+    description = "Library and command-line utility for accessing Google services and APIs";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/hsbencher-fusion/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, criterion, csv, dataDefault, filepath, handaGdata
+, hsbencher, httpConduit, mtl, network, statistics, text, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsbencher-fusion";
+  version = "0.3.3";
+  sha256 = "0vp1biv5jwac3bhj7qxl8x3bw73436qn284fippmlr6f54c15yw8";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    criterion csv dataDefault filepath handaGdata hsbencher httpConduit
+    mtl network statistics text time
+  ];
+  doCheck = false;
+  meta = {
+    description = "Backend for uploading benchmark data to Google Fusion Tables";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/hsbencher/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, dataDefault, filepath, GenericPretty, HUnit
+, ioStreams, mtl, random, testFramework, testFrameworkHunit, text
+, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsbencher";
+  version = "1.20.0.3";
+  sha256 = "1qnj4zhq6j4cvnxcparm2xr9qc6l9q7j72h4dr5jz04lz8c2fkcl";
+  buildDepends = [
+    async dataDefault filepath GenericPretty ioStreams mtl random time
+  ];
+  testDepends = [ HUnit testFramework testFrameworkHunit text time ];
+  doCheck = false;
+  meta = {
+    description = "Launch and gather data from Haskell and non-Haskell benchmarks";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/lzma-conduit/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bindingsDSL, conduit, HUnit, lzma, QuickCheck, resourcet
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lzma-conduit";
+  version = "1.1.1";
+  sha256 = "1i1khkxpia5hp3f0p7h656yvbgwsxffpl2czxjbkiw6iz31rapwg";
+  buildDepends = [ bindingsDSL conduit resourcet transformers ];
+  testDepends = [
+    conduit HUnit QuickCheck resourcet testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  extraLibraries = [ lzma ];
+  meta = {
+    homepage = "http://github.com/alphaHeavy/lzma-conduit";
+    description = "Conduit interface for lzma/xz compression";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/network-data/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cereal, prettyclass }:
+
+cabal.mkDerivation (self: {
+  pname = "network-data";
+  version = "0.5.2";
+  sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s";
+  buildDepends = [ cereal prettyclass ];
+  meta = {
+    description = "Library for network data structures and their serialization";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/snap-error-collector/default.nix

···
 
 cabal.mkDerivation (self: {
   pname = "snap-error-collector";
-  version = "1.0.0";
-  sha256 = "1rywfbc489kgbcm7svgrim3zihma5j9vy6cwhlc6dgvsb1rb37j2";
+  version = "1.1.0";
+  sha256 = "06pqlv93qgibl5gbrp7p1vg6x421nrpkvhazbrcipdpbawrsgaj2";
   buildDepends = [
     async MonadCatchIOTransformers monadLoops snap stm time
     transformers

pkgs/development/libraries/haskell/vk-aws-route53/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aws, httpConduit, httpTypes, resourcet, text, time
+, xmlConduit, xmlHamlet
+}:
+
+cabal.mkDerivation (self: {
+  pname = "vk-aws-route53";
+  version = "0.1.2";
+  sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x";
+  buildDepends = [
+    aws httpConduit httpTypes resourcet text time xmlConduit xmlHamlet
+  ];
+  meta = {
+    description = "Amazon Route53 DNS service plugin for the aws package";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/vk-posix-pty/default.nix

···
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "vk-posix-pty";
+  version = "0.2.0.2";
+  sha256 = "0dp9kpn1qzfqykmyq20sg0snyk8zrqa2g8c5xp9rfp0zfgmh37dh";
+  isLibrary = true;
+  isExecutable = true;
+  meta = {
+    homepage = "https://bitbucket.org/merijnv/posix-pty
+https://github.com/proger/posix-pty/tree/fork";
+    description = "Pseudo terminal interaction with subprocesses";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/libc++abi/default.nix

···
 
   postUnpack = ''
     unpackFile ${libcxx.src}
+    cp -r libcxx-*/include libcxxabi*/
   '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
     # Hack: NIX_CFLAGS_COMPILE doesn't work here because clang++ isn't
···
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
     license = "BSD";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/development/libraries/libksba/default.nix

···
 { stdenv, fetchurl, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libksba-1.3.1";
+  name = "libksba-1.3.2";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/${name}.tar.bz2";
-    sha256 = "1ya6mcd6pk2v1pylvlk6wv3869aslz2mr2xw2gs6faxx2ravk5mw";
+    sha256 = "01l4hvcknk9nb4bvyb6aqaid19jg0wv3ik54j1b89hnzamwm75gb";
   };
 
   propagatedBuildInputs = [ libgpgerror ];

pkgs/development/ocaml-modules/uucp/default.nix

···
+{ stdenv, fetchurl, ocaml, findlib, opam }:
+
+let
+  inherit (stdenv.lib) getVersion versionAtLeast;
+
+  pname = "uucp";
+  version = "0.9.0";
+  webpage = "http://erratique.ch/software/${pname}";
+in
+
+assert versionAtLeast (getVersion ocaml) "4.00";
+
+stdenv.mkDerivation {
+
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "1cwjr16cg03h30r97lnb32g725qi7ma76kr2aly5smc3m413dhqy";
+  };
+
+  buildInputs = [ ocaml findlib opam ];
+
+  createFindlibDestdir = true;
+
+  unpackCmd = "tar xjf $src";
+
+  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
+
+  installPhase = ''
+    opam-installer --script --prefix=$out ${pname}.install | sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database";
+    homepage = "${webpage}";
+    platforms = ocaml.meta.platforms;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
+  };
+}

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

···
-{ stdenv, fetchurl, python, pkgconfig
-, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg
+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11
+, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi
 }:
 
-stdenv.mkDerivation {
+buildPythonPackage {
   name = "pygame-1.9.1";
 
   src = fetchurl {
···
   };
 
   buildInputs = [
-    python pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
+    pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
+    smpeg portmidi libX11
   ];
 
   patches = [ ./pygame-v4l.patch ];
 
-  configurePhase = ''
-    for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg}; do
+  preConfigure = ''
+    for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg} ${portmidi} ${libX11}; do
       sed -e "/origincdirs =/a'$i/include'," -i config_unix.py
       sed -e "/origlibdirs =/aoriglibdirs += '$i/lib'," -i config_unix.py
     done
 
-    yes Y | LOCALBASE=/ python config.py
+    LOCALBASE=/ python config.py
   '';
-
-  buildPhase = "python setup.py build"; 
-
-  installPhase = "python setup.py install --prefix=$out";
 
   meta = {
     description = "Python library for games";

pkgs/development/tools/analysis/checkstyle/default.nix

···
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.1";
+  version = "6.1.1";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
-    sha256 = "0g5ywnc64v2c4zlamm3l2x0l1z79199mcjz0xzv3j5wx7rsyasrc";
+    sha256 = "07qickjgayakzfq54nwb9rpxydjkymxw6lnhzxri36mxspq9pzda";
   };
 
   installPhase = ''

pkgs/development/tools/rust/racer/default.nix

···
     wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustSrc}/src"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A utility intended to provide rust code completion for editors and IDEs.";
     homepage = https://github.com/phildawes/racer;
     license = stdenv.lib.licenses.mit;
+    maintainers = [ maintainers.jagajaga ];
   };
 }

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

···
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.25";
-      revision  = "201411231452";
+      revision  = "201411260106";
       branch    = "stable";
-      sha256    = "033i7lgc0qp63d772xgikb3bh9hp78xapdaqwi85lgbzi39ak2gz";
+      sha256    = "19131hkbf8zrqq31iiw99hslb5g29yqfl67jzlc4y4c8092s7fdm";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "3.17.4";
-      revision  = "201411231452";
+      revision  = "201411260107";
       branch    = "test";
-      sha256    = "1ns8im11lbqyvk2kmaz88ymw1b1ni1h4byb763rbrnxclrid1f2d";
+      sha256    = "1ynwmgm5c2fcd2dr76s3sqap3bv9b04p7qvf92pa1p4hgj2lva2n";
     };
 
   grsec_fix_path =

pkgs/servers/monitoring/bosun/default.nix

···
     '';
     homepage = http://bosun.org;
     license = licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = ["x86_64-linux"];
   };
 }

pkgs/tools/X11/sselp/default.nix

···
+{ stdenv, fetchurl, libX11 }:
+
+stdenv.mkDerivation rec {
+  version = "0.2";
+  name = "sselp-${version}";
+ 
+  src = fetchurl {
+    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
+  };
+ 
+  buildInputs = [ libX11 ];
+
+  patchPhase = ''
+    sed -i "s@/usr/local@$out@g" config.mk
+    sed -i "s@/usr/X11R6/include@${libX11}/include@g" config.mk
+    sed -i "s@/usr/X11R6/lib@${libX11}/lib@g" config.mk
+  '';
+
+  meta = {
+    homepage = "http://tools.suckless.org/sselp";
+    description = "Prints the X selection to stdout, usefull in scripts";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/tools/filesystems/btrfsprogs/default.nix

···
 { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "3.17.1"; in
+let version = "3.17.2"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1axazaw6ps5gy4l6j2jrivxqx8ysva3v1cynmrd1g345gff5f0bc";
+    sha256 = "1ijn8kd13hliqph9vijfl9zzvnkb6d6i7fqggbiwjvhslhjcgv2h";
   };
 
   buildInputs = [

pkgs/tools/graphics/qrcode/default.nix

···
+{stdenv, fetchgit}:
+let
+  s =
+  rec {
+    baseName = "qrcode";
+    date = "2014-01-01";
+    version = "git-${date}";
+    name = "${baseName}-${version}";
+    url = "https://github.com/qsantos/qrcode";
+    rev = "2843cbada3b768f60ee1ae13c65160083558cc03";
+    sha256 = "0x321xhzxk6ldvpr2090w14khj9n2gfay9db5vvvli16affpcrvb";
+  };
+  buildInputs = [
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchgit {
+    inherit (s) rev url sha256;
+  };
+  installPhase = ''
+    mkdir -p "$out"/{bin,share/doc/qrcode}
+    cp qrcode "$out/bin"
+    cp DOCUMENTATION LICENCE "$out/share/doc/qrcode"
+  '';
+  meta = {
+    inherit (s) version;
+    description = ''A small QR-code tool'';
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/tools/graphics/quirc/default.nix

···
+{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, pkgconfig}:
+let
+  s =
+  rec {
+    date = "2014-11-01";
+    version = "git-${date}";
+    baseName = "quirc";
+    name = "${baseName}-${version}";
+    url = "https://github.com/dlbeer/quirc";
+    rev = "3a3df0d1d6adc59fdc2cadecfaed91650b84cacb";
+    sha256 = "0wk2lmnw1k6m12dxs5a684mrm05x362h5kr3dwkfj8pyvdw3am18";
+  };
+  buildInputs = [
+    SDL SDL_gfx libjpeg pkgconfig
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchgit {
+    inherit (s) url sha256 rev;
+  };
+  NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL";
+  configurePhase = ''
+    sed -e 's/-[og] root//g' -i Makefile
+  '';
+  preInstall = ''
+    mkdir -p "$out"/{bin,lib,include}
+    find . -maxdepth 1 -type f -perm +111 -exec cp '{}' "$out"/bin ';'
+  '';
+  makeFlags = "PREFIX=$(out)";
+  meta = {
+    inherit (s) version;
+    description = ''A small QR code decoding library'';
+    license = stdenv.lib.licenses.isc;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/tools/misc/opentsdb/default.nix

···
-{ stdenv, autoconf, automake, fetchurl, curl, jdk, jre, makeWrapper, nettools, python }:
+{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }:
 with stdenv.lib;
-stdenv.mkDerivation rec {
+let
+  thirdPartyDeps = {
+    guava = {
+      "guava-18.0.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar;
+        md5 = "947641f6bb535b1d942d1bc387c45290";
+      };
+    };
+    gwt = {
+      "gwt-dev-2.6.0.jar" = fetchurl {
+        url = http://central.maven.org/maven2/com/google/gwt/gwt-dev/2.6.0/gwt-dev-2.6.0.jar;
+        md5 = "23d8bf52709230c2c7e6dd817261f9ee";
+      };
+      "gwt-user-2.6.0.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/com/google/gwt/gwt-user/2.6.0/gwt-user-2.6.0.jar;
+        md5 = "99226fc2764f2b8fd6db6e05d0847659";
+      };
+    };
+    hamcrest = {
+      "hamcrest-core-1.3.jar" = fetchurl {
+         url = http://central.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar;
+         md5 = "6393363b47ddcbba82321110c3e07519";
+      };
+    };
+    hbase = {
+      "asynchbase-1.6.0.jar" = fetchurl {
+        url = http://central.maven.org/maven2/org/hbase/asynchbase/1.6.0/asynchbase-1.6.0.jar;
+        md5 = "6738dd73fd48d30cbf5c78f62bc18852";
+      };
+    };
+    jackson = {
+      "jackson-annotations-2.4.3.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3.jar;
+        md5 = "31ef4fa866f9d24960a6807c9c299e98";
+      };
+      "jackson-core-2.4.3.jar" = fetchurl {
+        url = http://central.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar;
+        md5 = "750ef3d86f04fe0d6d14d6ae904a6d2d";
+      };
+      "jackson-databind-2.4.3.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar;
+        md5 = "4fcb9f74280eaa21de10191212c65b11";
+      };
+    };
+    javassist = {
+      "javassist-3.18.1-GA.jar" = fetchurl {
+        url = http://central.maven.org/maven2/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar;
+        md5 = "5bb83868c87334320562af7eded65cc2";
+      };
+    };
+    junit = {
+      "junit-4.11.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar;
+        md5 = "3c42be5ea7cbf3635716abbb429cb90d";
+      };
+    };
+    logback = {
+      "logback-classic-1.0.13.jar" = fetchurl {
+        url = https://opentsdb.googlecode.com/files/logback-classic-1.0.13.jar;
+        md5 = "b4dc8eb42150aafd6d9fd3d211807621";
+      };
+      "logback-core-1.0.13.jar" = fetchurl {
+        url = https://opentsdb.googlecode.com/files/logback-core-1.0.13.jar;
+        md5 = "3d5f8ce8dca36e493d39177b71958bd4";
+      };
+    };
+    mockito = {
+      "mockito-1.9.0.jar" = fetchurl {
+        url = https://opentsdb.googlecode.com/files/mockito-1.9.0.jar;
+        md5 = "cab21b44958a173a5b1d55a6aff0ab54";
+      };
+      "mockito-core-1.9.5.jar" = fetchurl {
+        url = https://opentsdb.googlecode.com/files/mockito-core-1.9.5.jar;
+        md5 = "98f3076e2a691d1ac291624e5a46b80b";
+      };
+    };
+    netty = {
+      "netty-3.9.4.Final.jar" = fetchurl {
+        url = http://central.maven.org/maven2/io/netty/netty/3.9.4.Final/netty-3.9.4.Final.jar;
+        md5 = "b3701ef46c7518d0d63705e2f092dbe5";
+      };
+    };
+    objenesis = {
+      "objenesis-1.3.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar;
+        md5 = "2d649907bd6203f2661f70d430a6ade8";
+      };
+    };
+    powermock = {
+      "powermock-mockito-release-full-1.5.4-full.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/org/powermock/powermock-mockito-release-full/1.5.4/powermock-mockito-release-full-1.5.4-full.jar;
+        md5 = "5dee1dce6952bb7338d4d053157ae647";
+      };
+    };
+    protobuf = {
+      "protobuf-java-2.5.0.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar;
+        md5 = "a44473b98947e2a54c54e0db1387d137";
+      };
+    };
+    slf4j = {
+      "log4j-over-slf4j-1.7.7.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/1.7.7/log4j-over-slf4j-1.7.7.jar;
+        md5 = "93ab42a5216afd683c35988c6b6fc3d8";
+      };
+      "slf4j-api-1.7.7.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar;
+        md5 = "ca4280bf93d64367723ae5c8d42dd0b9";
+      };
+    };
+    suasync = {
+      "suasync-1.4.0.jar" = fetchurl {
+        url = https://opentsdb.googlecode.com/files/suasync-1.4.0.jar;
+        md5 = "289ce3f3e6a9bb17857981eacf6d74b6";
+      };
+    };
+    validation-api = {
+      "validation-api-1.0.0.GA.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar;
+        md5 = "40c1ee909493066397a6d4d9f8d375d8";
+      };
+      "validation-api-1.0.0.GA-sources.jar" = fetchurl {
+        url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar;
+        md5 = "f816682933b59c5ffe32bdb4ab4bf628";
+      };
+    };
+    zookeeper = {
+      "zookeeper-3.3.6.jar" = fetchurl {
+        url = https://opentsdb.googlecode.com/files/zookeeper-3.3.6.jar;
+        md5 = "02786e11c19d1671640992f1bda4a858";
+      };
+    };
+  };
+
+in stdenv.mkDerivation rec {
   name = "opentsdb-2.1.0-rc1";
 
   src = fetchurl {
···
   buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ];
 
   configurePhase = ''
+    echo > build-aux/fetchdep.sh.in
     ./bootstrap
     mkdir build
     cd build
     ../configure --prefix=$out
+    patchShebangs ./build-aux/
   '';
 
+  buildPhase =
+    concatStringsSep
+      "\n"
+      (mapAttrsToList
+        (folder: jars:
+          "mkdir -p third_party/${folder}\n" +
+          (concatStringsSep
+            "\n"
+            (mapAttrsToList
+              (jar: src:
+                 "ln -s ${src} third_party/${folder}/${jar}")
+              jars)))
+        thirdPartyDeps);
+
   installPhase = ''
     make install
     wrapProgram $out/bin/tsdb \
···
     homepage = http://opentsdb.net;
     license = licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.ocharles ];
   };
 }

pkgs/tools/misc/parcellite/default.nix

···
 { stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "parcellite-1.1.7";
+  name = "parcellite-1.1.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/parcellite/${name}.tar.gz";
-    sha256 = "0pszw3yd4a08p6jsz7asayr7jir08bxbwvfb16k01cj7ya4kf3w7";
+    sha256 = "1m0igxny8f8hlbwcbsr4vg08808sqwy05h61ia2bxsrf122rba6b";
   };
 
   buildInputs = [ pkgconfig intltool gtk2 ];

pkgs/tools/misc/youtube-dl/default.nix

···
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.11.16";
+  version = "2014.11.27";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0i0j5dzmwil5x5qh6bghqy7zmj8wqqilp5m9sq95vqmsxpjfgw3q";
+    sha256 = "0bmjlp3jk5nd2i9jpbqbv2smh5rdxcjajv7fccfinmi6v2bjm1aa";
   };
 
   buildInputs = [ python ];

pkgs/tools/misc/yubico-piv-tool/default.nix

···
 { stdenv, fetchurl, pkgconfig, openssl, pcsclite }:
 
 stdenv.mkDerivation rec {
-  name = "yubico-piv-tool-0.1.0";
+  name = "yubico-piv-tool-0.1.2";
 
   src = fetchurl {
     url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz";
-    sha256 = "1m573f0vn3xgzsl29ps679iykp5krwd0fnr4nhm1fw2hm5zahrhf";
+    sha256 = "0sqakrlw4j60xhlmp2fq6ccj3lqf13kwvmahsrj3xr5qdi7h0fza";
   };
 
   buildInputs = [ pkgconfig openssl pcsclite ];

pkgs/tools/misc/yubikey-personalization/default.nix

···
 
 stdenv.mkDerivation rec {
   name = "yubikey-personalization-${version}";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchurl {
     url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz";
-    sha256 = "1zspbb10k9x9mjv8hadmwwgzjlign372al3zshypj9ri55ky0xs3";
+    sha256 = "1zivikg1ndxziwdmy2x66f9x0jxwbl0km4vxr5wgjsk94q6h45li";
   };
 
   buildInputs = [ pkgconfig libusb libyubikey json_c ];

pkgs/tools/networking/network-manager-applet/default.nix

···
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
-    sha256 = "1sx97cp9nb5p82kg2dl6dmqri7wichpjqchhx7bk77limngby7jq";
+    sha256 = "1jz0vawfixzm892m6plrzhsybgdxwv96pfwld9p85lb7wshykzj6";
   };
 
   buildInputs = [

pkgs/tools/networking/network-manager/default.nix

···
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "0.9.8.8";
+  version = "0.9.8.10";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
-    sha256 = "0mbsl6x3aavdnam8i87p0zz8fvvgi96g199s35wgg5r8rplks2la";
+    sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86";
   };
 
   preConfigure = ''
···
       # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
       substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
 
+      # rename to network-manager to be in style
+      mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service 
+      echo "Alias=NetworkManager.service" >> $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+
       # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
       # aliases ourselves.
       ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
-      ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
+      ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
     '';
 
   meta = with stdenv.lib; {

pkgs/tools/networking/network-manager/nixos-purity.patch

···
  		NULL
  	};
  	const char **path = dhcpcd_paths;
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index 8e216f4..6e00210 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -52,9 +52,7 @@ static inline const char *
- find_dnsmasq (void)
- {
- 	static const char *paths[] = {
--		"/usr/local/sbin/dnsmasq",
--		"/usr/sbin/dnsmasq",
--		"/sbin/dnsmasq",
-+		"@dnsmasq@/bin/dnsmasq",
- 		NULL
- 	};
- 	const char **binary = paths;
-diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
-index ca2f9dc..ce718d0 100644
---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
-+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
-@@ -170,9 +170,7 @@ static inline const char *
- nm_find_dnsmasq (void)
- {
- 	static const char *dnsmasq_binary_paths[] = {
--		"/usr/local/sbin/dnsmasq",
--		"/usr/sbin/dnsmasq",
--		"/sbin/dnsmasq",
-+		"@dnsmasq@/bin/dnsmasq",
- 		NULL
- 	};
- 
 diff --git a/src/nm-device.c b/src/nm-device.c
 index 1dc94ee..e60f3c8 100644
 --- a/src/nm-device.c

pkgs/tools/networking/nzbget/default.nix

···
 , gnutls, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "nzbget-14.0";
+  name = "nzbget-14.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/nzbget/${name}.tar.gz";
-    sha256 = "1r9qdp17px8vq3mh18fzxhm5cqd37wcz2vv7hsxdq8rmgxhl7lj1";
+    sha256 = "062bvf0r290qi3xgbvvwgxxmnka7raa71dz9fg1mq0zpc5mq2sx1";
   };
 
   buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ];

pkgs/top-level/all-packages.nix

···
     chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { };
   };
 
-  ccl = builderDefsPackage ../development/compilers/ccl {};
+  ccl = callPackage ../development/compilers/ccl { };
 
   clang = wrapGCC llvmPackages.clang;
 
···
     sawja = callPackage ../development/ocaml-modules/sawja { };
 
     uucd = callPackage ../development/ocaml-modules/uucd { };
+    uucp = callPackage ../development/ocaml-modules/uucp { };
     uunf = callPackage ../development/ocaml-modules/uunf { };
     uutf = callPackage ../development/ocaml-modules/uutf { };
 
···
   splint = callPackage ../development/tools/analysis/splint {
     flex = flex_2_5_35;
   };
+
+  sselp = callPackage ../tools/X11/sselp{ };
 
   stm32flash = callPackage ../development/tools/misc/stm32flash { };
 
···
 
   librdf = callPackage ../development/libraries/librdf { };
 
+  libsmf = callPackage ../development/libraries/audio/libsmf { };
+
   lilv = callPackage ../development/libraries/audio/lilv { };
 
   lv2 = callPackage ../development/libraries/audio/lv2 { };
···
 
   doodle = callPackage ../applications/search/doodle { };
 
+  drumgizmo = callPackage ../applications/audio/drumgizmo { inherit (xlibs) libX11; };
+
   dunst = callPackage ../applications/misc/dunst { };
 
   dvb_apps  = callPackage ../applications/video/dvb-apps { };
···
     lua = lua5_1;
     lua5_sockets = lua5_1_sockets;
     bs2bSupport = config.mpv.bs2bSupport or true;
-    quviSupport = config.mpv.quviSupport or false;
+    youtubeSupport = config.mpv.youtubeSupport or true;
     cacaSupport = config.mpv.cacaSupport or true;
     vaapiSupport = config.mpv.vaapiSupport or false;
   };
···
 
   qmmp = callPackage ../applications/audio/qmmp { };
 
+  qrcode = callPackage ../tools/graphics/qrcode {};
+
   qsampler = callPackage ../applications/audio/qsampler { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
···
   qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
 
   qtractor = callPackage ../applications/audio/qtractor { };
+
+  quirc = callPackage ../tools/graphics/quirc {};
 
   quodlibet = callPackage ../applications/audio/quodlibet {
     inherit (pythonPackages) mutagen;
···
 
   vimpc = callPackage ../applications/audio/vimpc { };
 
+  neovim = callPackage ../applications/editors/neovim {
+    inherit (lua52Packages) lpeg luaMessagePack luabitop;
+  };
+
   virtviewer = callPackage ../applications/virtualization/virt-viewer {
     gtkvnc = gtkvnc.override { enableGTK3 = true; };
     spice_gtk = spice_gtk.override { enableGTK3 = true; };
···
     qt = qt4;
   };
 
+  yed = callPackage ../applications/graphics/yed {};
+
   ykpers = callPackage ../applications/misc/ykpers {};
 
   yoshimi = callPackage ../applications/audio/yoshimi {
···
 
   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; }
···
   xfce = xfce4_10;
   xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });
 
+  xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
 
   ### SCIENCE
 
···
   electricsheep = callPackage ../misc/screensavers/electricsheep { };
 
   fakenes = callPackage ../misc/emulators/fakenes { };
+
+
+  faust = callPackage ../applications/audio/faust { };
 
   faust-compiler = callPackage ../applications/audio/faust-compiler { };
 
···
   vimprobable2Wrapper = wrapFirefox
     { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
     };
+
+  rekonqWrapper = wrapFirefox {
+    browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq";
+  };
 
   vimb = callPackage ../applications/networking/browsers/vimb {
     webkit = webkitgtk2;

pkgs/top-level/haskell-packages.nix

···
 
   aws = callPackage ../development/libraries/haskell/aws {};
 
+  awsEc2 = callPackage ../development/libraries/haskell/aws-ec2 {};
+
   authenticate = callPackage ../development/libraries/haskell/authenticate {};
 
   authenticateOauth = callPackage ../development/libraries/haskell/authenticate-oauth {};
···
 
   genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {};
 
+  GenericPretty = callPackage ../development/libraries/haskell/GenericPretty {};
+
   genericsSop = callPackage ../development/libraries/haskell/generics-sop {};
 
   ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
···
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
 
+  handaGdata = callPackage ../development/libraries/haskell/handa-gdata {};
+
   haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {};
 
   haxl = callPackage ../development/libraries/haskell/haxl {};
···
 
   hS3 = callPackage ../development/libraries/haskell/hS3 {};
 
+  hsbencher = callPackage ../development/libraries/haskell/hsbencher {};
+
+  hsbencherFusion = callPackage ../development/libraries/haskell/hsbencher-fusion {};
+
   hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {};
 
   hsc3 = callPackage ../development/libraries/haskell/hsc3 {};
···
 
   lushtags = callPackage ../development/libraries/haskell/lushtags {};
 
+  lzmaConduit = callPackage ../development/libraries/haskell/lzma-conduit {};
+
   lzmaEnumerator = callPackage ../development/libraries/haskell/lzma-enumerator {};
 
   maccatcher = callPackage ../development/libraries/haskell/maccatcher {};
···
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
   networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {};
+
+  networkData = callPackage ../development/libraries/haskell/network-data {};
 
   networkFancy = callPackage ../development/libraries/haskell/network-fancy {};
 
···
   vectorThUnbox = callPackage ../development/libraries/haskell/vector-th-unbox {};
 
   vinyl = callPackage ../development/libraries/haskell/vinyl {};
+
+  vkAwsRoute53 = callPackage ../development/libraries/haskell/vk-aws-route53 {};
+
+  vkPosixPty = callPackage ../development/libraries/haskell/vk-posix-pty {};
 
   void = callPackage ../development/libraries/haskell/void {};
 

pkgs/top-level/lua-packages.nix

···
     };
   };
 
+  lpeg = buildLuaPackage rec {
+    name = "lpeg-${version}";
+    version = "0.12";
+    src = fetchurl {
+      url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz";
+      sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg";
+    };
+    buildInputs = [ unzip ];
+
+    installPhase = ''
+      mkdir -p $out/lib/lua/${lua.luaversion}
+      install -p lpeg.so $out/lib/lua/${lua.luaversion}
+      install -p re.lua $out/lib/lua/${lua.luaversion}
+    '';
+
+    meta = {
+      homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/";
+      hydraPlatforms = stdenv.lib.platforms.linux;
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
+  luaMessagePack = buildLuaPackage rec {
+    name = "lua-MessagePack-${version}";
+    version = "0.3.1";
+    src = fetchurl {
+      url = "https://github.com/fperrad/lua-MessagePack/archive/${version}.tar.gz";
+      sha256 = "185mrd6bagwwm94jxzanq01l72ama3x4hf160a7yw7hgim2y5h9c";
+    };
+    buildInputs = [ unzip ];
+
+    meta = {
+      homepage = "http://fperrad.github.io/lua-MessagePack/index.html";
+      hydraPlatforms = stdenv.lib.platforms.linux;
+      license = stdenv.lib.licenses.mit;
+    };
+  };
 }; in self

pkgs/top-level/python-packages.nix

···
 
     propagatedBuildInputs = with self; [ pycrypto ecdsa ];
 
-    doCheck = !isPyPy;
+    # https://github.com/paramiko/paramiko/issues/449
+    doCheck = !(isPyPy || isPy33);
     checkPhase = ''
       ${python}/bin/${python.executable} test.py --no-sftp --no-big-file
     '';
···
       export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE"
     '';
     buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.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;
-    };
-  };
-
-  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/;