Merge remote-tracking branch 'origin/master' into staging.

lib/maintainers.nix

@@ -65,6 +65,7 @@
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
+  notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
@@ -108,6 +109,7 @@
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
   wjlroe = "William Roe <willroe@gmail.com>";
+  wkennington = "William A. Kennington III <william@wkennington.com>";
   wmertens = "Wout Mertens <Wout.Mertens@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zef = "Zef Hemel <zef@zef.me>";

nixos/modules/misc/ids.nix

@@ -138,6 +138,7 @@
       znc = 128;
       polipo = 129;
       mopidy = 130;
+      unifi = 131;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 

nixos/modules/module-list.nix

@@ -233,6 +233,7 @@
   ./services/networking/teamspeak3.nix
   ./services/networking/tftpd.nix
   ./services/networking/unbound.nix
+  ./services/networking/unifi.nix
   ./services/networking/vsftpd.nix
   ./services/networking/wakeonlan.nix
   ./services/networking/websockify.nix

nixos/modules/services/logging/logrotate.nix

@@ -8,10 +8,6 @@ let
   configFile = pkgs.writeText "logrotate.conf"
     cfg.config;
 
-  cronJob = ''
-    5 * * * * root ${pkgs.logrotate}/sbin/logrotate ${configFile}
-  '';
-
 in
 {
   options = {
@@ -33,6 +29,16 @@ in
   };
 
   config = mkIf cfg.enable {
-    services.cron.systemCronJobs = [ cronJob ];
+    systemd.services.logrotate = {
+      description   = "Logrotate Service";
+      wantedBy      = [ "multi-user.target" ];
+      startAt       = "*-*-* *:05:00";
+
+      serviceConfig.Restart = "no";
+      serviceConfig.User    = "root";
+      script = ''
+        exec ${pkgs.logrotate}/sbin/logrotate ${configFile}
+      '';
+    };
   };
 }

nixos/modules/services/networking/unifi.nix

@@ -0,0 +1,88 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+  cfg = config.services.unifi;
+  stateDir = "/var/lib/unifi";
+  cmd = "@${pkgs.icedtea7_jre}/bin/java java -jar ${stateDir}/lib/ace.jar";
+in
+{
+
+  options = {
+
+    services.unifi.enable = mkOption {
+      type = types.uniq types.bool;
+      default = false;
+      description = ''
+        Whether or not to enable the unifi controller service.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.unifi = {
+      uid = config.ids.uids.unifi;
+      description = "UniFi controller daemon user";
+      home = "${stateDir}";
+    };
+
+    # We must create the binary directories as bind mounts instead of symlinks
+    # This is because the controller resolves all symlinks to absolute paths
+    # to be used as the working directory.
+    systemd.mounts = map ({ what, where }: {
+        bindsTo = [ "unifi.service" ];
+        requiredBy = [ "unifi.service" ];
+        before = [ "unifi.service" ];
+        options = "bind";
+        what = what;
+        where = where;
+      }) [
+        {
+          what = "${pkgs.unifi}/dl";
+          where = "${stateDir}/dl";
+        }
+        {
+          what = "${pkgs.unifi}/lib";
+          where = "${stateDir}/lib";
+        }
+        {
+          what = "${pkgs.mongodb}/bin";
+          where = "${stateDir}/bin";
+        }
+      ];
+
+    systemd.services.unifi = {
+      description = "UniFi controller daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      preStart = ''
+        # Ensure privacy of state
+        chown unifi "${stateDir}"
+        chmod 0700 "${stateDir}"
+
+        # Create the volatile webapps
+        mkdir -p "${stateDir}/webapps"
+        chown unifi "${stateDir}/webapps"
+        ln -s "${pkgs.unifi}/webapps/ROOT.war" "${stateDir}/webapps/ROOT.war"
+      '';
+
+      postStop = ''
+        rm "${stateDir}/webapps/ROOT.war"
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${cmd} start";
+        ExecStop = "${cmd} stop";
+        User = "unifi";
+        PermissionsStartOnly = true;
+        UMask = "0077";
+        WorkingDirectory = "${stateDir}";
+      };
+    };
+
+  };
+
+}

nixos/modules/services/security/fail2ban.nix

@@ -25,12 +25,17 @@ in
   options = {
 
     services.fail2ban = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to enable the fail2ban service.";
+      };
 
       daemonConfig = mkOption {
         default =
           ''
             [Definition]
-            loglevel  = 3
+            loglevel  = INFO
             logtarget = SYSLOG
             socket    = /run/fail2ban/fail2ban.sock
             pidfile   = /run/fail2ban/fail2ban.pid
@@ -80,7 +85,7 @@ in
 
   ###### implementation
 
-  config = {
+  config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.fail2ban ];
 
@@ -101,12 +106,13 @@ in
         preStart =
           ''
             mkdir -p /run/fail2ban -m 0755
+            mkdir -p /var/lib/fail2ban
           '';
 
         serviceConfig =
           { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
             ReadOnlyDirectories = "/";
-            ReadWriteDirectories = "/run /var/tmp";
+            ReadWriteDirectories = "/run /var/tmp /var/lib";
             CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
           };
 
@@ -131,15 +137,14 @@ in
         bantime  = 600
         findtime = 600
         maxretry = 3
-        backend  = auto
-      '';
+        backend  = systemd
+       '';
 
     # Block SSH if there are too many failing connection attempts.
     services.fail2ban.jails.ssh-iptables =
       ''
         filter   = sshd
         action   = iptables[name=SSH, port=ssh, protocol=tcp]
-        logpath  = /var/log/warn
         maxretry = 5
       '';
 

nixos/modules/system/boot/stage-1-init.sh

@@ -194,6 +194,9 @@ checkFS() {
     # Don't check ROM filesystems.
     if [ "$fsType" = iso9660 -o "$fsType" = udf ]; then return 0; fi
 
+    # Don't check resilient COWs as they validate the fs structures at mount time
+    if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi
+
     # If we couldn't figure out the FS type, then skip fsck.
     if [ "$fsType" = auto ]; then
         echo 'cannot check filesystem with type "auto"!'

nixos/modules/system/boot/stage-2-init.sh

@@ -180,4 +180,4 @@ echo "starting systemd..."
 PATH=/run/current-system/systemd/lib/systemd \
     MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \
     LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \
-    exec systemd --log-target=journal # --log-level=debug --log-target=console --crash-shell
+    exec systemd

nixos/modules/testing/test-instrumentation.nix

@@ -66,13 +66,22 @@ let kernel = config.boot.kernelPackages.kernel; in
     # Panic if an error occurs in stage 1 (rather than waiting for
     # user intervention).
     boot.kernelParams =
-      [ "console=tty1" "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
+      [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
 
     # `xwininfo' is used by the test driver to query open windows.
     environment.systemPackages = [ pkgs.xorg.xwininfo ];
 
     # Log everything to the serial console.
-    services.journald.console = "/dev/console";
+    services.journald.extraConfig =
+      ''
+        ForwardToConsole=yes
+        MaxLevelConsole=debug
+      '';
+
+    # Don't clobber the console with duplicate systemd messages.
+    systemd.extraConfig = "ShowStatus=no";
+
+    boot.consoleLogLevel = 7;
 
     # Prevent tests from accessing the Internet.
     networking.defaultGateway = mkOverride 150 "";
@@ -88,6 +97,9 @@ let kernel = config.boot.kernelPackages.kernel; in
 
     networking.usePredictableInterfaceNames = false;
 
+    # Make it easy to log in as root when running the test interactively.
+    security.initialRootPassword = mkDefault "";
+
   };
 
 }

nixos/modules/virtualisation/ec2-data.nix

@@ -22,21 +22,22 @@ with lib;
     systemd.services."fetch-ec2-data" =
       { description = "Fetch EC2 Data";
 
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "multi-user.target" "sshd.service" ];
         before = [ "sshd.service" ];
-        after = [ "network.target" ];
+        wants = [ "ip-up.target" ];
+        after = [ "ip-up.target" ];
 
-        path = [ pkgs.curl pkgs.iproute ];
+        path = [ pkgs.wget pkgs.iproute ];
 
         script =
           ''
             ip route del blackhole 169.254.169.254/32 || true
 
-            curl="curl --retry 3 --retry-delay 0 --fail"
+            wget="wget -q --retry-connrefused -O -"
 
             echo "setting host name..."
             ${optionalString (config.networking.hostName == "") ''
-              ${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname)
+              ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname)
             ''}
 
             # Don't download the SSH key if it has already been injected
@@ -44,7 +45,7 @@ with lib;
             if ! [ -e /root/.ssh/authorized_keys ]; then
                 echo "obtaining SSH key..."
                 mkdir -p /root/.ssh
-                $curl -o /root/key.pub http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+                $wget http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key > /root/key.pub
                 if [ $? -eq 0 -a -e /root/key.pub ]; then
                     if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
                         cat /root/key.pub >> /root/.ssh/authorized_keys
@@ -58,7 +59,7 @@ with lib;
             # Extract the intended SSH host key for this machine from
             # the supplied user data, if available.  Otherwise sshd will
             # generate one normally.
-            $curl http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+            $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
             key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
             key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
             if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then

nixos/modules/virtualisation/virtualbox-image.nix

@@ -2,112 +2,132 @@
 
 with lib;
 
-{
-  system.build.virtualBoxImage =
-    pkgs.vmTools.runInLinuxVM (
-      pkgs.runCommand "virtualbox-image"
-        { memSize = 768;
-          preVM =
-            ''
-              mkdir $out
-              diskImage=$out/image
-              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "10G"
-              mv closure xchg/
-            '';
-          postVM =
-            ''
-              echo "creating VirtualBox disk image..."
-              ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi
-              rm $diskImage
-            '';
-          buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph =
-            [ "closure" config.system.build.toplevel ];
-        }
-        ''
-          # Create a single / partition.
-          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
-          ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
-          . /sys/class/block/vda1/uevent
-          mknod /dev/vda1 b $MAJOR $MINOR
+let
 
-          # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
-          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
-          mkdir /mnt
-          mount /dev/vda1 /mnt
+  cfg = config.virtualbox;
 
-          # The initrd expects these directories to exist.
-          mkdir /mnt/dev /mnt/proc /mnt/sys
-          mount --bind /proc /mnt/proc
-          mount --bind /dev /mnt/dev
-          mount --bind /sys /mnt/sys
+in {
 
-          # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+  options = {
+    virtualbox = {
+      baseImageSize = mkOption {
+        type = types.str;
+        default = "10G";
+        description = ''
+          The size of the VirtualBox base image. The size string should be on
+          a format the qemu-img command accepts.
+        '';
+      };
+    };
+  };
 
-          echo "filling Nix store..."
-          mkdir -p /mnt/nix/store
-          set -f
-          cp -prd $storePaths /mnt/nix/store/
-
-          mkdir -p /mnt/etc/nix
-          echo 'build-users-group = ' > /mnt/etc/nix/nix.conf
-
-          # Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package}/bin/nix-store --load-db
-
-          # Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
-
-          # `nixos-rebuild' requires an /etc/NIXOS.
-          mkdir -p /mnt/etc/nixos
-          touch /mnt/etc/NIXOS
-
-          # `switch-to-configuration' requires a /bin/sh
-          mkdir -p /mnt/bin
-          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
-
-          # Generate the GRUB menu.
-          ln -s vda /dev/sda
-          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
-
-          umount /mnt/proc /mnt/dev /mnt/sys
-          umount /mnt
-        ''
-    );
-
-  system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova"
-    { buildInputs = [ pkgs.linuxPackages.virtualbox ];
-      vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})";
-      fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
-    }
-    ''
-      echo "creating VirtualBox VM..."
-      export HOME=$PWD
-      VBoxManage createvm --name "$vmName" --register \
-        --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
-      VBoxManage modifyvm "$vmName" \
-        --memory 1536 --acpi on --vram 10 \
-        --nictype1 virtio --nic1 nat \
-        --audiocontroller ac97 --audio alsa \
-        --rtcuseutc on \
-        --usb on --mouse usbtablet
-      VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
-      VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
-        --medium ${config.system.build.virtualBoxImage}/disk.vdi
-
-      echo "exporting VirtualBox VM..."
-      mkdir -p $out
-      VBoxManage export "$vmName" --output "$out/$fileName"
-    '';
-
-  fileSystems."/".device = "/dev/disk/by-label/nixos";
-
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sda";
-
-  services.virtualbox.enable = true;
+  config = {
+    system.build.virtualBoxImage =
+      pkgs.vmTools.runInLinuxVM (
+        pkgs.runCommand "virtualbox-image"
+          { memSize = 768;
+            preVM =
+              ''
+                mkdir $out
+                diskImage=$out/image
+                ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "${cfg.baseImageSize}"
+                mv closure xchg/
+              '';
+            postVM =
+              ''
+                echo "creating VirtualBox disk image..."
+                ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi
+                rm $diskImage
+              '';
+            buildInputs = [ pkgs.utillinux pkgs.perl ];
+            exportReferencesGraph =
+              [ "closure" config.system.build.toplevel ];
+          }
+          ''
+            # Create a single / partition.
+            ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+            ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
+            . /sys/class/block/vda1/uevent
+            mknod /dev/vda1 b $MAJOR $MINOR
+  
+            # Create an empty filesystem and mount it.
+            ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+            ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+            mkdir /mnt
+            mount /dev/vda1 /mnt
+  
+            # The initrd expects these directories to exist.
+            mkdir /mnt/dev /mnt/proc /mnt/sys
+            mount --bind /proc /mnt/proc
+            mount --bind /dev /mnt/dev
+            mount --bind /sys /mnt/sys
+  
+            # Copy all paths in the closure to the filesystem.
+            storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+  
+            echo "filling Nix store..."
+            mkdir -p /mnt/nix/store
+            set -f
+            cp -prd $storePaths /mnt/nix/store/
+  
+            mkdir -p /mnt/etc/nix
+            echo 'build-users-group = ' > /mnt/etc/nix/nix.conf
+  
+            # Register the paths in the Nix database.
+            printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+                chroot /mnt ${config.nix.package}/bin/nix-store --load-db
+  
+            # Create the system profile to allow nixos-rebuild to work.
+            chroot /mnt ${config.nix.package}/bin/nix-env \
+                -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+  
+            # `nixos-rebuild' requires an /etc/NIXOS.
+            mkdir -p /mnt/etc/nixos
+            touch /mnt/etc/NIXOS
+  
+            # `switch-to-configuration' requires a /bin/sh
+            mkdir -p /mnt/bin
+            ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+  
+            # Generate the GRUB menu.
+            ln -s vda /dev/sda
+            chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+  
+            umount /mnt/proc /mnt/dev /mnt/sys
+            umount /mnt
+          ''
+      );
+  
+    system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova"
+      { buildInputs = [ pkgs.linuxPackages.virtualbox ];
+        vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})";
+        fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
+      }
+      ''
+        echo "creating VirtualBox VM..."
+        export HOME=$PWD
+        VBoxManage createvm --name "$vmName" --register \
+          --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
+        VBoxManage modifyvm "$vmName" \
+          --memory 1536 --acpi on --vram 10 \
+          --nictype1 virtio --nic1 nat \
+          --audiocontroller ac97 --audio alsa \
+          --rtcuseutc on \
+          --usb on --mouse usbtablet
+        VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
+        VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
+          --medium ${config.system.build.virtualBoxImage}/disk.vdi
+  
+        echo "exporting VirtualBox VM..."
+        mkdir -p $out
+        VBoxManage export "$vmName" --output "$out/$fileName"
+      '';
+  
+    fileSystems."/".device = "/dev/disk/by-label/nixos";
+  
+    boot.loader.grub.version = 2;
+    boot.loader.grub.device = "/dev/sda";
+  
+    services.virtualbox.enable = true;
+  };
 }

nixos/release-combined.nix

@@ -42,8 +42,8 @@ in rec {
         (all nixos.iso_graphical)
         (all nixos.ova)
 
-        # (all nixos.tests.efi-installer.simple)
-        (all nixos.tests.containers)
+        #(all nixos.tests.efi-installer.simple)
+        #(all nixos.tests.containers)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)

pkgs/applications/editors/emacs-modes/js2/default.nix

@@ -1,12 +1,11 @@
 { stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation {
-  name = "js2-mode-0-20120712";
+  name = "js2-mode-0-20140114";
 
   src = fetchgit {
     url = "git://github.com/mooz/js2-mode.git";
-    rev = "f8cb9c52614e0a8e477f1ac557585ed950246c9b";
-    sha256 = "37055b7e8c1d9eee6b86f6b9b9d74ad196cc43701bc2263ffd539a3e44025047";
+    sha256 = "dbdc07b864a9506a21af445c7fb1c75fbffadaac980ee7bbf752470d8054bd65";
   };
 
   buildInputs = [ emacs ];

pkgs/applications/editors/idea/default.nix

@@ -8,7 +8,7 @@ let
   { name, version, build, src, description, license }:
 
   stdenv.mkDerivation rec {
-    inherit name build src license;
+    inherit name build src;
     ideaItem = makeDesktopItem {
       name = "IDEA";
       exec = "idea";
@@ -69,7 +69,7 @@ in {
     version = "13.1.3";
     build = "IC-135.909";
     description = "IntelliJ IDEA 13 Community Edition";
-    license = stdenv.lib.licenses.asl20.shortName;
+    license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
       sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51";

pkgs/applications/editors/idea/pycharm.nix

@@ -0,0 +1,113 @@
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
+, coreutils, gnugrep, which, git, python
+}:
+
+let
+
+  buildPycharm =
+  { name, version, build, src, description, license }:
+
+  stdenv.mkDerivation rec {
+    inherit name build src;
+    desktopItem = makeDesktopItem {
+      name = "pycharm";
+      exec = "pycharm";
+      comment = "Powerful Python and Django IDE";
+      desktopName = "PyCharm";
+      genericName = "Powerful Python and Django IDE";
+      categories = "Application;Development;";
+    };
+
+    buildInputs = [ makeWrapper patchelf p7zip ];
+
+    propagatedUserEnvPkgs = [ python ];
+
+    patchPhase = ''
+      interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)"
+      snappyPath="lib/snappy-java-1.0.5"
+
+      7z x -o"$snappyPath" "$snappyPath.jar"
+      if [ "${stdenv.system}" == "x86_64-linux" ]; then
+        patchelf --set-interpreter "$interpreter" bin/fsnotifier64
+        patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so"
+      else
+        patchelf --set-interpreter "$interpreter" bin/fsnotifier
+        patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so"
+      fi
+      7z a -tzip "$snappyPath.jar" ./"$snappyPath"/*
+      rm -vr "$snappyPath"
+    '';
+
+    installPhase = ''
+      mkdir -vp "$out/bin" "$out/$name"
+      cp -va . "$out/$name"
+
+      jdk="${jdk}/lib/openjdk"
+      makeWrapper "$out/$name/bin/pycharm.sh" "$out/bin/pycharm" \
+        --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
+        --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \
+        --prefix JDK_HOME : "$jdk" \
+        --prefix PYCHARM_JDK : "$jdk"
+
+      cp -a "${desktopItem}"/* "$out"
+    '';
+
+    meta = {
+      homepage = "https://www.jetbrains.com/pycharm/";
+      inherit description;
+      inherit license;
+      maintainers = [ stdenv.lib.maintainers.jgeerds ];
+      platforms = stdenv.lib.platforms.linux;
+    };
+  };
+
+in {
+
+  pycharm-community-313 = buildPycharm rec {
+    name = "pycharm-community-${version}";
+    version = "3.1.3";
+    build = "133.1347";
+    description = "PyCharm 3.1 Community Edition";
+    license = stdenv.lib.licenses.asl20;
+    src = fetchurl {
+      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "f671ee4c99207c179f168b5b98fa23afe90a94c3a3914367b95a46b0c2881b23";
+    };
+  };
+
+  pycharm-community-341 = buildPycharm rec {
+    name = "pycharm-community-${version}";
+    version = "3.4.1";
+    build = "135.1057";
+    description = "PyCharm 3.4 Community Edition";
+    license = stdenv.lib.licenses.asl20;
+    src = fetchurl {
+      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64";
+    };
+  };
+
+  pycharm-professional-313 = buildPycharm rec {
+    name = "pycharm-professional-${version}";
+    version = "3.1.3";
+    build = "133.1347";
+    description = "PyCharm 3.1 Professional Edition";
+    license = stdenv.lib.licenses.unfree;
+    src = fetchurl {
+      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "e0c2db8f18cb825a95de6ddc4b0b9f93c5643bf34cca9f1b3c2fa37fd7c14f11";
+    };
+  };
+
+  pycharm-professional-341 = buildPycharm rec {
+    name = "pycharm-professional-${version}";
+    version = "3.4.1";
+    build = "135.1057";
+    description = "PyCharm 3.4 Professional Edition";
+    license = stdenv.lib.licenses.unfree;
+    src = fetchurl {
+      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b";
+    };
+  };
+}

pkgs/applications/graphics/gcolor2/default.nix

@@ -0,0 +1,31 @@
+{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } :
+
+let version = "0.4"; in
+stdenv.mkDerivation {
+  name = "gcolor2-${version}";
+  arch = if stdenv.system == "x86_64-linux" then "amd64" else "386";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2";
+    sha1 = "e410a52dcff3d5c6c3d448b68a026d04ccd744be";
+
+  };
+
+  preConfigure = ''
+    sed -i 's/\[:space:\]/[&]/g' configure
+  '';
+
+  # from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches
+  patches = if stdenv.system == "x86_64-linux" then
+        [ ./gcolor2-amd64.patch ] else
+        [ ];
+
+buildInputs = [ gtk perl perlXMLParser pkgconfig ];
+
+  meta = {
+    description = "Simple GTK+2 color selector";
+    homepage = http://gcolor2.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ notthemessiah ];
+  };
+}

pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch

@@ -0,0 +1,46 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
+--- gcolor2-0.4.orig/src/callbacks.c	2005-07-12 14:06:12.000000000 -0400
++++ gcolor2-0.4/src/callbacks.c	2007-02-17 19:19:38.000000000 -0500
+@@ -4,6 +4,9 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <string.h>
++#include <glib.h>
++#include <glib/gprintf.h>
+ 
+ #include "callbacks.h"
+ #include "interface.h"
+@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate
+ 	gtk_clipboard_set_text (cb, hex, strlen (hex));
+ }
+ 
++void add_rgb_file (gchar *filename, gchar *type);
++gchar* get_system_file (void);
++
+ void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data)
+ {
+ 	if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)))
+@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton *
+ 	gtk_widget_destroy (savedialog);
+ }
+ 
++void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color);
++
+ void add_color_to_treeview ()
+ {
+ 	GtkTreeView      *treeview;
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
+--- gcolor2-0.4.orig/src/main.c	2005-07-11 10:55:49.000000000 -0400
++++ gcolor2-0.4/src/main.c	2007-02-17 19:18:23.000000000 -0500
+@@ -4,6 +4,10 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <glib.h>
++#include <glib/gprintf.h>
+ 
+ #include "interface.h"
+ #include "support.h"

pkgs/applications/graphics/mcomix/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pygtk, pil }:
+{ stdenv, fetchurl, buildPythonPackage, pygtk, pil, python27Packages }:
 
 buildPythonPackage rec {
     namePrefix = "";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
     doCheck = false;
 
-    pythonPath = [ pygtk pil ];
+    pythonPath = [ pygtk pil python27Packages.sqlite3 ];
 
     meta = {
       description = "Image viewer designed to handle comic books";

pkgs/applications/misc/calibre/default.nix

@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.47.0";
+  name = "calibre-1.48.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1hmqynxh9h12whcjwcd5idgc6mdaggczsf4hm70ajhj7pfjp3szg";
+    sha256 = "0wplmf3p4s5zwn9ri8ry18bx7k3pw1c1ngrc4msf7i8icq7hj177";
   };
 
   inherit python;

pkgs/applications/misc/gksu/default.nix

@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome3, libgksu,
+  intltool, libstartup_notification, gtk_doc
+}:
+
+stdenv.mkDerivation rec {
+  version = "2.0.2";
+  pname = "gksu";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+    sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1";
+  };
+
+  patches = [
+    # https://savannah.nongnu.org/bugs/index.php?36127
+    ./gksu-2.0.2-glib-2.31.patch
+  ];
+
+  postPatch = ''
+    sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop
+  '';
+
+  configureFlags = "--disable-nautilus-extension";
+
+  buildInputs = [
+    pkgconfig makeWrapper gtk gnome3.gconf intltool
+    libstartup_notification gnome3.libgnome_keyring gtk_doc
+  ];
+
+  propagatedBuildInputs = [
+    libgksu
+  ];
+
+  meta = {
+    description = "A graphical frontend for libgksu";
+    longDescription = ''
+      GKSu is a library that provides a Gtk+ frontend to su and sudo.
+      It supports login shells and preserving environment when acting as
+      a su frontend. It is useful to menu items or other graphical
+      programs that need to ask a user's password to run another program
+      as another user.
+    '';
+    homepage = "http://www.nongnu.org/gksu/";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}

pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch

@@ -0,0 +1,29 @@
+From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 7 Apr 2012 17:57:36 -0400
+Subject: [PATCH] Fix glib includes for building with >=glib-2.31
+
+glib-2.31 and newer no longer allow most glib subheaders to be included
+directly.
+
+https://savannah.nongnu.org/bugs/index.php?36127
+---
+ nautilus-gksu/libnautilus-gksu.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c
+index 8e44d29..4acf3f8 100644
+--- a/nautilus-gksu/libnautilus-gksu.c
++++ b/nautilus-gksu/libnautilus-gksu.c
+@@ -5,7 +5,7 @@
+ #include <string.h>
+ #include <pthread.h>
+ 
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gio/gio.h>
+ #include <libnautilus-extension/nautilus-extension-types.h>
+-- 
+1.7.8.5
+

pkgs/applications/misc/xcruiser/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, gccmakedep, xlibs }:
+
+stdenv.mkDerivation {
+  name = "xcruiser-0.30";
+
+  src = fetchurl {
+      url = mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz;
+      sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
+    };
+
+  buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ];
+
+  configurePhase = "xmkmf -a";
+
+  preBuild = ''
+    makeFlagsArray=( BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults)
+  '';
+
+  meta = with stdenv.lib;
+    { description = "Filesystem visualization utility";
+      longDescription = ''
+        XCruiser, formerly known as XCruise, is a filesystem visualization utility.
+        It constructs a virtually 3-D formed universe from a directory
+        tree and allows you to "cruise" within a visualized filesystem.
+      '';
+      homepage = http://xcruiser.sourceforge.net/;
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ emery ];
+    };
+}

pkgs/applications/networking/newsreaders/liferea/default.nix

@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.9";
+    version = "1.10.10";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0s6rg30xwdxzh2r1n4m9ns4pbq0p428h4nh72bcrcf9m0mdcg0ai";
+    sha256 = "0y01lhw0fn5m0j9ykz8x7i0wchjqbxp33cvvprsfxfwzz4x31jm4";
   };
 
   buildInputs = with gst_all_1; [

pkgs/applications/networking/remote/freerdp/unstable.nix

@@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
     homepage = http://www.freerdp.com/;
 
     license = "free-non-copyleft";
+
+    broken = true;  # fails to build
   };
 }
 

pkgs/applications/science/math/sloane/default.nix

@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ansiTerminal, filepath, HTTP, network, optparseApplicative
-, terminalSize, text, time, zlib
+{ cabal, ansiTerminal, cereal, downloadCurl, filepath, HTTP
+, network, optparseApplicative, terminalSize, text, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "sloane";
-  version = "1.8.2";
-  sha256 = "0kdznrvyrax1gihqxxw36jfbmjri808ii827fa71v2ijlm416hk1";
+  version = "1.9.1";
+  sha256 = "0scnvir7il8ldy3g846xmrdkk2rxnlsiyqak0jvcarf2qi251x5i";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath HTTP network optparseApplicative terminalSize
-    text time zlib
+    ansiTerminal cereal downloadCurl filepath HTTP network
+    optparseApplicative terminalSize text zlib
   ];
   postInstall = ''
     mkdir -p $out/share/man/man1

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

@@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
 
 stdenv.mkDerivation rec {
 
-  version = "1.8.8";
+  version = "1.8.9";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion/${name}.tar.bz2";
-    sha256 = "1cqxwydjidyf59y4lgkxl7bra1sy28abqm2mi5971qjsv0f96s8m";
+    sha1 = "424ee12708f39a126efd905886666083dcc4eeaf";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

pkgs/data/misc/cacert/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cacert-20140704";
+  name = "cacert-20140715";
 
   src = fetchurl {
     url = "http://tarballs.nixos.org/${name}.pem.bz2";
-    sha256 = "05ymb7lrxavscbpx5xywlbya9q66r26fbngfif6zrvfpf3qskiza";
+    sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl";
   };
 
   unpackPhase = "true";

pkgs/development/compilers/agda/2.3.2.2.nix

@@ -1,29 +0,0 @@
-{ cabal, alex, binary, deepseq, emacs, filepath, geniplate, happy
-, hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel
-, QuickCheck, text, time, unorderedContainers, xhtml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Agda";
-  version = "2.3.2.2";
-  sha256 = "0zr2rg2yvq6pqg69c6h7hqqpc5nj8prfhcvj5p2alkby0vs110qc";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary deepseq filepath geniplate hashable hashtables haskeline
-    haskellSrcExts mtl parallel QuickCheck text time
-    unorderedContainers xhtml zlib
-  ];
-  buildTools = [ alex emacs happy ];
-  jailbreak = true;
-  postInstall = ''
-    $out/bin/agda-mode compile
-  '';
-  meta = {
-    homepage = "http://wiki.portal.chalmers.se/agda/";
-    description = "A dependently typed functional programming language and proof assistant";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})

pkgs/development/compilers/agda/stdlib-0.7.nix

@@ -1,31 +0,0 @@
-{ cabal, fetchurl, filemanip, Agda }:
-
-cabal.mkDerivation (self: {
-  pname = "Agda-stdlib";
-  version = "0.7";
-
-  src = fetchurl {
-    url = "http://www.cse.chalmers.se/~nad/software/lib-0.7.tar.gz";
-    sha256 = "1ynjgqk8hhnm6rbngy8fjsrd6i4phj2hlan9bk435bbywbl366k3";
-  };
-
-  buildDepends = [ filemanip Agda ];
-
-  preConfigure = "cd ffi";
-
-  postInstall = ''
-      mkdir -p $out/share
-      cd ..
-      runhaskell GenerateEverything
-      agda -i . -i src Everything.agda
-      cp -pR src $out/share/agda
-  '';
-
-  meta = {
-    homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
-    description = "A standard library for use with the Agda compiler.";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.jwiegley ];
-  };
-})

pkgs/development/compilers/sbcl/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.2";
+  version = "1.2.0";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "08jk1bjk7087gq4ibzs1d27r0c6pigbvmff351j9a03kvl652b2v";
+    sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
   };
 
   buildInputs = [ ]

pkgs/development/interpreters/groovy/default.nix

@@ -3,11 +3,12 @@
 # at runtime, need jdk
 
 stdenv.mkDerivation rec {
-  name = "groovy-1.7.1";
+  name = "groovy-${version}";
+  version = "2.3.6";
 
   src = fetchurl {
-    url = "http://dist.groovy.codehaus.org/distributions/groovy-binary-1.7.1.zip";
-    sha256 = "0a204f6835f07e6a079bd4761e70cd5e0c31ebc0c9eb293fda11dfb2d8bf137c";
+    url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
+    sha256 = "0yvk6x1f68avl52zzwx9p3faiqr98rfps70vql05j6kd7syyp0ah";
   };
 
   installPhase = ''
@@ -20,8 +21,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An agile dynamic language for the Java Platform";
     homepage = http://groovy.codehaus.org/;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ pSub ];
   };
 }

pkgs/development/interpreters/php/5.4.nix

@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.30";
+  version = "5.4.31";
 
   name = "php-${version}";
 
@@ -243,7 +243,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   src = fetchurl {
     url = "http://www.php.net/distributions/php-${version}.tar.bz2";
-    sha256 = "1rkc977b4k0y6qg5nf8729g5zpica31h1isyds6khmrdwi23df1j";
+    sha256 = "0kci0yir923fc7dv7j9qrc10pj05v82jnxjxjbgrj7gx64a4k3jy";
   };
 
   meta = {

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

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "0.6.2";
-  sha256 = "1alnjm0rfr7kwj6jax10bg8rcs8523n5dxyvw0mm65qykf78cprl";
+  version = "0.8";
+  sha256 = "0khjid5jaaf4c3xn9cbph8ay4ibqr7pg3b3w7d0kfvci90ksc08r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GLFW";
-  version = "0.5.2.0";
-  sha256 = "06vps929dmk9yimfv7jj12m0p0bf4ih0ssf6rbcq2j6i9wbhpxq3";
+  version = "0.5.2.2";
+  sha256 = "0yqvfkg9p5h5bv3ak6b89am9kan9lbcq26kg1wk53xl6mz1aaijf";
   buildDepends = [ OpenGL ];
   extraLibraries = [ libX11 mesa ];
   meta = {

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

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MFlow";
-  version = "0.4.5.6";
-  sha256 = "12rgp4x2in3r1hf4j1fr5ih0x0mb54x1rdr1mjllbh8c09ricrah";
+  version = "0.4.5.7";
+  sha256 = "0faw082z8yyzf0k1vrgpqa8kvwb2zwmasy1p1vvj3a7lhhnlr20s";
   buildDepends = [
     blazeHtml blazeMarkup caseInsensitive clientsession conduit
     conduitExtra extensibleExceptions httpTypes monadloc mtl parsec

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Vec";
-  version = "1.0.1";
-  sha256 = "1v0v0ph881vynx8q8xwmn9da6qrd16g83q5i132nxys3ynl5s76m";
+  version = "1.0.5";
+  sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
   meta = {
     homepage = "http://github.net/sedillard/Vec";
     description = "Fixed-length lists and low-dimensional linear algebra";

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

@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, comonad, dataReify, doctest, erf, filepath, free, mtl
 , nats, reflection, tagged, transformers
 }:

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "amqp";
-  version = "0.9";
-  sha256 = "10yacflzvf7y21yi6frs88gdbhf5g4j99ag8mwv6jrwfzwqszs5j";
+  version = "0.10";
+  sha256 = "0606grl2149phzqf0aww8264f9xaw4486ps5jw47ar57mcnxsml6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.12.1.0";
-  sha256 = "1y7sikk5hg9yj3mn21k026ni6lznsih0lx03rgdz4gmb6aqh54bn";
+  version = "0.12.1.1";
+  sha256 = "0whj2wscw9pdf6avnhnqiapsllh6228j4hifyfvr4v0w663plh7p";
   buildDepends = [ deepseq scientific text ];
   testDepends = [
     deepseq QuickCheck scientific testFramework

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

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.3.2.8";
-  sha256 = "1ylijkj32li9nm4x16d66h6a74q07m4v3n2dqm67by548wfyh1j9";
+  version = "1.3.2.9";
+  sha256 = "09vg7m2sh3566q7jgi85djc5jrq2y06swlbj1fbym6yf4cmk8gdr";
   buildDepends = [
     aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
     httpTypes monadControl network resourcet tagstreamConduit text

pkgs/development/libraries/haskell/auto-update/default.nix

@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec }:
+
+cabal.mkDerivation (self: {
+  pname = "auto-update";
+  version = "0.1.1.1";
+  sha256 = "0ksclbh3d7p2511ji86ind8f6jrh58mz61mc441kfz51ippkdk59";
+  testDepends = [ hspec ];
+  meta = {
+    homepage = "https://github.com/yesodweb/wai";
+    description = "Efficiently run periodic, on-demand actions";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -3,20 +3,20 @@
 { cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder
 , byteable, caseInsensitive, cereal, conduit, conduitExtra
 , cryptohash, dataDefault, filepath, httpConduit, httpTypes
-, liftedBase, monadControl, mtl, resourcet, text, time
+, liftedBase, monadControl, mtl, network, resourcet, text, time
 , transformers, unorderedContainers, utf8String, vector, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.9.1";
-  sha256 = "1fp18j8my9v7d6z0d28bc1hjzrs9znf3c986950pfpv2bsiw7m6d";
+  version = "0.9.2";
+  sha256 = "1jmvf1x3vamcjb89mk52l1iikdchab8pm23iw9y1d4zm4636czxm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson base16Bytestring base64Bytestring blazeBuilder byteable
     caseInsensitive cereal conduit conduitExtra cryptohash dataDefault
-    filepath httpConduit httpTypes liftedBase monadControl mtl
+    filepath httpConduit httpTypes liftedBase monadControl mtl network
     resourcet text time transformers unorderedContainers utf8String
     vector xmlConduit
   ];

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

@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, attoparsec, deepseq, hspec, mtl, QuickCheck, text }:
 
 cabal.mkDerivation (self: {

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

@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String
-, zlib
+{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, text
+, utf8String, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "cairo";
-  version = "0.12.5.3";
-  sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7";
-  buildDepends = [ mtl utf8String ];
+  version = "0.13.0.0";
+  sha256 = "1sw1f50kmqln1mkvrr6g85b46dn0ipwnvyl13kxzhq5g581rra92";
+  buildDepends = [ mtl text utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ cairo libc pkgconfig zlib ];
   pkgconfigDepends = [ cairo ];

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

@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ansiTerminal, cmdargs, dlist, filepath, regexPosix, safe
-, split, stm, stringsearch, unorderedContainers
+{ cabal, ansiTerminal, cmdargs, dlist, either, filepath, mtl
+, regexPosix, safe, split, stm, stringsearch, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "cgrep";
-  version = "6.4.5";
-  sha256 = "0pp3gfy8dvdbv40vfy3dhqymjp0knnbzv9hmbc18f3s8zpy4lis0";
+  version = "6.4.6";
+  sha256 = "13plsh6411k273qllpkcrkakwxcdmw0p6arj0j3gdqa7bbxii99s";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal cmdargs dlist filepath regexPosix safe split stm
-    stringsearch unorderedContainers
+    ansiTerminal cmdargs dlist either filepath mtl regexPosix safe
+    split stm stringsearch unorderedContainers
   ];
   meta = {
     homepage = "http://awgn.github.io/cgrep/";

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

@@ -1,12 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeBuilder, dataDefault, deepseq, text, time }:
+{ cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+, time
+}:
 
 cabal.mkDerivation (self: {
   pname = "cookie";
-  version = "0.4.1.1";
-  sha256 = "1w1nh7h4kc9pr9kpi8fkrqiih37mp3gcnxf42r01nciq4sh4yi3m";
+  version = "0.4.1.3";
+  sha256 = "184ymp1pbi49fm4jl9s04dfyrgdbc9vlmqahqha4yncppr5s1sdw";
   buildDepends = [ blazeBuilder dataDefault deepseq text time ];
+  testDepends = [
+    blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text time
+  ];
+  doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version;
   meta = {
     homepage = "http://github.com/snoyberg/cookie";
     description = "HTTP cookie parsing and rendering";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cuda";
-  version = "0.6.0.0";
-  sha256 = "0zvyvk5yhwz7nl613yvfl32xnv9kgfdwbb0whyd6nrm663xa352y";
+  version = "0.6.0.1";
+  sha256 = "03wnkqgdvy6h2dqcmj0xlag3am3s3rjzhx0kqaq362mq365n9y51";
   buildTools = [ c2hs ];
   extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
   doCheck = false;

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

@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, lazysmallcheck, preludeSafeenum, QuickCheck, reflection
+, smallcheck, tagged
+}:
+
+cabal.mkDerivation (self: {
+  pname = "data-fin";
+  version = "0.1.1.2";
+  sha256 = "13qgqx3b01a8bm7jw7fkv7nyyzg2jkgg27zv2wp57g0nd5aw5hpn";
+  buildDepends = [
+    lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck
+    tagged
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Finite totally ordered sets";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/dom-selector/default.nix

@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, blazeHtml, htmlConduit, parsec, QuickCheck, text, thLift
+, xmlConduit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "dom-selector";
+  version = "0.2.0.1";
+  sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22";
+  buildDepends = [
+    blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
+  ];
+  testDepends = [
+    blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/nebuta/";
+    description = "DOM traversal by CSS selectors for xml-conduit package";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/fast-logger/default.nix

@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeBuilder, filepath, hspec, text }:
+{ cabal, autoUpdate, blazeBuilder, filepath, hspec, text }:
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "2.1.5";
-  sha256 = "12f7yad2f6q846rw2ji5fsx3d7qd8jdrnnzsbji5bpv00mvvsiza";
-  buildDepends = [ blazeBuilder filepath text ];
+  version = "2.2.0";
+  sha256 = "02gc5f7vgwfdlhfawki4xxrl33lbdl05wh64qm3mb3h2dv1gnwrr";
+  buildDepends = [ autoUpdate blazeBuilder filepath text ];
   testDepends = [ hspec ];
   meta = {
     description = "A fast logging system";

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

@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fb";
-  version = "1.0.2";
-  sha256 = "1xgldk690dpbmhzmjlngpbalmbs0xrc7265zc7frphpsbbw3cnqc";
+  version = "1.0.4";
+  sha256 = "1sp0x5p9l02i2ynvynazhgs5lqqwih997c2fyfp0xi24qsc7ilr2";
   buildDepends = [
     aeson attoparsec base16Bytestring base64Bytestring cereal conduit
     conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault

pkgs/development/libraries/haskell/generics-sop/default.nix

@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, tagged }:
+
+cabal.mkDerivation (self: {
+  pname = "generics-sop";
+  version = "0.1.0.2";
+  sha256 = "01s3v3a29wdsps9vas8in2ks5p4d2arqp3qvmzqa7v2sz786xjra";
+  buildDepends = [ tagged ];
+  meta = {
+    description = "Generic Programming using True Sums of Products";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})

pkgs/development/libraries/haskell/ghc-mod/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "4.1.5";
-  sha256 = "192v0h9nhi7xgvidyisn3rpr6kjpkibrm2b859b6a92gp0h37nnn";
+  version = "4.1.6";
+  sha256 = "093wafaizr2xf7vmzj6f3vs8ch0vpcmwlrja6af6hshgaj2d80qs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -23,7 +23,6 @@ cabal.mkDerivation (self: {
   configureFlags = "--datasubdir=${self.pname}-${self.version}";
   postInstall = ''
     cd $out/share/$pname-$version
-    sed -i -e 's/"-b" "\\n" "-l"/"-l" "-b" "\\"\\\\n\\""/' ghc-process.el
     make
     rm Makefile
     cd ..

pkgs/development/libraries/haskell/ghcjs-dom/default.nix

@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ghcjsBase, mtl }:
+{ cabal, ghcjsBase, mtl, text }:
 
 cabal.mkDerivation (self: {
   pname = "ghcjs-dom";
-  version = "0.0.10";
-  sha256 = "0xffr197m6qam4q7ckgcwl0v9kwrxa5fm894c9vyxdmlcjyn38rm";
-  buildDepends = [ ghcjsBase mtl ];
+  version = "0.1.0.0";
+  sha256 = "0qm43bd4m7w14p6ag643h09pll4fp09j1mzjyqvp0dhal03dc723";
+  buildDepends = [ ghcjsBase mtl text ];
   meta = {
     description = "DOM library that supports both GHCJS and WebKitGTK";
     license = self.stdenv.lib.licenses.mit;

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gio";
-  version = "0.12.5.3";
-  sha256 = "1n9sima0m30w1bmfk0wb4fawrg76vgpvlzki0kwdh6f0sfczxywc";
+  version = "0.13.0.0";
+  sha256 = "05mycm6nrwwpjflcmm3w33b5nmm6fgyzwzrx1piqazvd1magwcyj";
   buildDepends = [ glib mtl ];
   buildTools = [ gtk2hsBuildtools ];
   pkgconfigDepends = [ glib ];

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.8";
-  sha256 = "0lzz7q2gjiq4z8yi1sb981m220qnwjizk9hqv09yfj5a4grqfchf";
+  version = "0.9";
+  sha256 = "19ff9srvm03n9iz7mf6wadydfw0xs0j9ayvr86dmmp9blmjkqc0d";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure
     hashable HTTP httpConduit httpTypes network text time

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

@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ gtkC libglade ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/gtk2hs/";
     description = "Binding to the glade library";

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

@@ -1,12 +1,13 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String }:
+{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, text, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "glib";
-  version = "0.12.5.4";
-  sha256 = "1jbqfcsmsghq67lwnk6yifs34lxvh6xfbzxzfryalifb4zglccz6";
-  buildDepends = [ utf8String ];
+  version = "0.13.0.0";
+  sha256 = "0l3mkbwm90zfgn6qrblnp642pr4m9lqpi4pg3kfpqlqp5vziszy9";
+  buildDepends = [ text utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ glib ];

pkgs/development/libraries/haskell/graph-wrapper/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "graph-wrapper";
-  version = "0.2.4.2";
-  sha256 = "0cf70xvmzn4w5pg1bxizajqgcbjwwk6jrd7hnb3kfqy1v3apifyf";
+  version = "0.2.4.3";
+  sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg";
   meta = {
     homepage = "http://www.github.com/batterseapower/graph-wrapper";
     description = "A wrapper around the standard Data.Graph with a less awkward interface";

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

@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
-, pkgconfig
+, pkgconfig, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "gtk";
-  version = "0.12.5.7";
-  sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
-  buildDepends = [ cairo gio glib mtl pango ];
+  version = "0.13.0.0";
+  sha256 = "04xi1415i3qaiif9ha5wnmyzxxw8ix17zpvvfjn61nrxlk6p973m";
+  buildDepends = [ cairo gio glib mtl pango text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ glib gtk ];

pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk2hs-buildtools";
-  version = "0.13.0.0";
-  sha256 = "075f6jjkk56h0nda0gbdr775d72c0b3d2z483cff2bnnjf8aqwa6";
+  version = "0.13.0.1";
+  sha256 = "0ngdg44hxpyga9kwm70340c8jhsh9wl5rja3wx9mfx194idivaxa";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath hashtables random ];

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

@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl
-, pkgconfig
+, pkgconfig, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "gtksourceview2";
-  version = "0.12.5.0";
-  sha256 = "125psfr58na60nz5ax3va08fq1aa4knzjccj8ghwk8x9fkzddfs9";
-  buildDepends = [ glib gtk mtl ];
+  version = "0.13.0.0";
+  sha256 = "0md4dwg68cgq5qj80rjvsrckwn2ap9d1xp0hy8w1iiyii8dfqcnn";
+  buildDepends = [ glib gtk mtl text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ gtksourceview ];

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

@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsec, cmdargs, filepath, haskellSrcExts, lens, mtl
-, split, tasty, tastyGolden, text
+{ cabal, attoparsec, cmdargs, dyre, filepath, haskellSrcExts, lens
+, mtl, split, tasty, tastyGolden, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.4";
-  sha256 = "1pkj6cfdfyrcrm6gr4a43y6s4qhwpli6zgnlx4ycmhs3yh5kay60";
+  version = "0.5";
+  sha256 = "18rhldw6vbkjcpx373m784sppadccm2b3xx3zzr0l45dwmsh6rb4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec cmdargs haskellSrcExts lens mtl split text
+    attoparsec cmdargs dyre haskellSrcExts lens mtl split text
   ];
-  testDepends = [ filepath tasty tastyGolden ];
+  testDepends = [ filepath haskellSrcExts tasty tastyGolden ];
   doCheck = false;
   meta = {
     description = "A command line program for extending the import list of a Haskell source file";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsshellscript";
-  version = "3.3.1";
-  sha256 = "0z3afp3r1j1in03fv2yb5sfbzgcrhdig6gay683bzgh85glwxhlp";
+  version = "3.3.2";
+  sha256 = "0rc78yx82gy7a3dxl1mn9hrj1cqhq51zq6w4nf11rzgn6106zdln";
   buildDepends = [ parsec random ];
   buildTools = [ c2hs ];
   meta = {

pkgs/development/libraries/haskell/http-client/default.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.6";
-  sha256 = "0zav8arj6swhrzfyxf6py2yfpphjd0bllz7rm1540vb5lrhg4znm";
+  version = "0.3.6.1";
+  sha256 = "0mamndx2fyvshchcwv8ic910b90hp8rgbjhgqww0zpg8p1rr0v9h";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

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

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iproute";
-  version = "1.3.0";
-  sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p";
+  version = "1.3.1";
+  sha256 = "1l3asv8q1jiwsvpq6kkigrzpm3pjbm03gpc4rbhn6kpi6z9h8cdp";
   buildDepends = [ appar byteorder network ];
   testDepends = [
     appar byteorder doctest hspec network QuickCheck safe

pkgs/development/libraries/haskell/monad-extras/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-extras";
-  version = "0.5.8";
-  sha256 = "1h7gjdmbdjw2k49xlflca88bxiid7gxl8l9gzmywybllff376npl";
+  version = "0.5.9";
+  sha256 = "1y24yz635brllfygia1mbln4d8xiwb0pq0izh5pil7511gijhs0s";
   buildDepends = [
     mmorph monadControl stm transformers transformersBase
   ];

pkgs/development/libraries/haskell/monad-logger/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.7";
-  sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58";
+  version = "0.3.7.1";
+  sha256 = "0imr1bgcpfm19a91r4i6lii7gycx77ysfrdri030zr2jjrvggh9i";
   buildDepends = [
     blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
     monadControl monadLoops mtl resourcet stm stmChans text

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-metrics";
-  version = "0.3.2";
-  sha256 = "14yf9di909443gkgaw7n262453d60pp9mw8vncmd6q7pywhdz9hh";
+  version = "0.4";
+  sha256 = "0dvrjf84pdm42pxwc7fm4gvswc5nzmdsq7cr7ab8jyzvjqb8684c";
   buildDepends = [ binary dataDefault network random time ];
   meta = {
     homepage = "http://github.com/brendanhay/network-metrics";

pkgs/development/libraries/haskell/pandoc-types/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc-types";
-  version = "1.12.4";
-  sha256 = "10vlw8iabaay0xqlshagl45ksawlanlg6fyqwv9d448qm32ngvdn";
+  version = "1.12.4.1";
+  sha256 = "1wbgm0s45smi8gix0byapkiarbb416fv765fc329qsvl295xlyqq";
   buildDepends = [ aeson deepseqGenerics syb ];
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";

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

@@ -1,13 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
+, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "pango";
-  version = "0.12.5.3";
-  sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a";
-  buildDepends = [ cairo glib mtl ];
+  version = "0.13.0.0";
+  sha256 = "0qrsivr6z8pp4ibg1vyzyg2fw0jzrshn6h6g6vff93awxzqq9rlw";
+  buildDepends = [ cairo glib mtl text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ cairo pango ];

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pathtype";
-  version = "0.5.3";
-  sha256 = "11plb7xw4j8vjziw1q0ymx33p6185cxd2hqrxw2hgsfzf2b9dvqg";
+  version = "0.5.4";
+  sha256 = "1ns5q3nrkl99xp4mrmk8wpvb9qzyvnw5cyjwh5rh76ykm2d5dbg7";
   buildDepends = [ QuickCheck time ];
   meta = {
     homepage = "http://code.haskell.org/pathtype";

pkgs/development/libraries/haskell/persistent-template/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.3.1.4";
-  sha256 = "1ys5s1vb9w3nrv9kwvzgjwfs2j09pslpplz05idpfn02xx03hcfk";
+  version = "1.3.2.1";
+  sha256 = "1i7jlp16bwxrfbbln1izjmjjicgqw5i6hsylfjmh622vri2rxi31";
   buildDepends = [
     aeson monadControl monadLogger persistent text transformers
     unorderedContainers

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

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.3.1.1";
-  sha256 = "0na1mci7m8hzv40d5qc75dqdkw2kbw8i6xpjlpwgd1flznmqkdvx";
+  version = "1.3.3";
+  sha256 = "1pz3xdbk46qprcyb0sll5zzr2vp6x08w7pd5glz2jf2242k7cdrd";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     exceptions liftedBase monadControl monadLogger pathPieces

pkgs/development/libraries/haskell/pipes-aeson/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-aeson";
-  version = "0.4.1.1";
-  sha256 = "1z520c9l2wqjcv5lb997n3zfks7p0z7dlwgqm74dcwnnfy3mfp9j";
+  version = "0.4.1.2";
+  sha256 = "0wacib0wf40bkm6rp2qcsrahc43g89l3icclbrshk8r54dhbazl7";
   buildDepends = [
     aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
     transformers

pkgs/development/libraries/haskell/prelude-safeenum/default.nix

@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "prelude-safeenum";
+  version = "0.1.1.1";
+  sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv";
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "A redefinition of the Prelude's Enum class in order to render it safe";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.5.3";
-  sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i";
+  version = "0.5.4";
+  sha256 = "02mxg9bsyzhr7xclf7jdsjjwcc6d05ibji64n9783rc1i9clc2gg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -1,12 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, dataDefault, exceptions, transformers }:
+{ cabal, dataDefaultClass, exceptions, hspec, HUnit, QuickCheck
+, time, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "retry";
-  version = "0.4";
-  sha256 = "16njq924b5n7jyfc059dbypp529gqlc9qnzd7wjk4m7dpm5bww67";
-  buildDepends = [ dataDefault exceptions transformers ];
+  version = "0.5";
+  sha256 = "1qp949w8pisgki06j5qgaxw1761q3gfccc7bqnhqpchazl4p6p6n";
+  buildDepends = [ dataDefaultClass exceptions transformers ];
+  testDepends = [
+    dataDefaultClass exceptions hspec HUnit QuickCheck time
+    transformers
+  ];
   jailbreak = true;
   meta = {
     homepage = "http://github.com/Soostone/retry";

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

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-conduit";
-  version = "0.5.0";
-  sha256 = "0fbm1nv9190p1b038p6zxmw042cgm5jgkfbhscw1fslgzja90iyz";
+  version = "0.5.1";
+  sha256 = "1jy70cdw2h6fd2618dczajml5k82kkjmd2n0mgbby2mr6r3sk5zr";
   buildDepends = [
     bifunctors chunkedData either exceptions filepath free liftedAsync
     liftedBase mmorph monadControl monoTraversable mtl mwcRandom

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

@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "sodium";
+  version = "0.10.0.2";
+  sha256 = "0rm1blh0br4gdnqb6ixvql6nrxzcjxjkwp4lmqmsisa2b68gbzqy";
+  buildDepends = [ mtl ];
+  meta = {
+    description = "Sodium Reactive Programming (FRP) System";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "statistics";
-  version = "0.13.1.1";
-  sha256 = "1ghb2snbacbfzxqcrvdiihvw2iip1m8rq9y62x1ayg6k13agm7r5";
+  version = "0.13.2.1";
+  sha256 = "0giibqpnjndnhvxqsr8ikcxxfhz3ws0mk3ckykq2sfwz7gkipvva";
   buildDepends = [
     aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive
     vector vectorAlgorithms vectorBinaryInstances

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

@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }:
+{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl, text }:
 
 cabal.mkDerivation (self: {
   pname = "svgcairo";
-  version = "0.12.5.2";
-  sha256 = "0l3903fzd5pk9wmxjdmx6vyym2r90b33hs6p2sfdks2lx352i94l";
-  buildDepends = [ cairo glib mtl ];
+  version = "0.13.0.0";
+  sha256 = "1i93dhg2fpnk38lgbfpsl97xpfgifrl7xs5nny5vj4hi8ln76ih0";
+  buildDepends = [ cairo glib mtl text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc ];
   pkgconfigDepends = [ librsvg ];

pkgs/development/libraries/haskell/twitter-types/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "twitter-types";
-  version = "0.3.20140620";
-  sha256 = "02mwdgz1l1z5k5k78bjnnbabcr27xixli1gqk6rmqrarcylybvll";
+  version = "0.3.20140801";
+  sha256 = "1ryvbshafgnfvn6697lb5qj9y61bm9371lzaz5v4xjf0jklm2z5n";
   buildDepends = [ aeson httpTypes text unorderedContainers ];
   testDepends = [
     aeson attoparsec httpTypes HUnit shakespeare testFramework

pkgs/development/libraries/haskell/unbounded-delays/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbounded-delays";
-  version = "0.1.0.7";
-  sha256 = "1nv50i90hgvcl51w7s8x1c1ylpzyrbvs2mz5zfn68lr1ix2lk879";
+  version = "0.1.0.8";
+  sha256 = "1jdlpg82kndz6g97bw8fb6sjyyvylrcrg982xnhgi36717f0pv40";
   meta = {
     homepage = "https://github.com/basvandijk/unbounded-delays";
     description = "Unbounded thread delays and timeouts";

pkgs/development/libraries/haskell/unix-time/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.3.2";
-  sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds";
+  version = "0.3.3";
+  sha256 = "018wpr5d2kjv8syj97664sqh1v7ws1780qmlfxvrakj86z9k5i8x";
   buildDepends = [ binary ];
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {

pkgs/development/libraries/haskell/wai-extra/default.nix

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "3.0.1.1";
-  sha256 = "099pxahczai6ychsm04bwcvvd9m6lan5nqg159ny4jakpyk67zs8";
+  version = "3.0.1.2";
+  sha256 = "15v3mk7kbinvynsfxb95lwvg52wkpm3q9k5an8ak936ll3j2s14z";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder caseInsensitive
     dataDefaultClass deepseq fastLogger httpTypes liftedBase network

pkgs/development/libraries/haskell/wai-logger/default.nix

@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeBuilder, byteorder, caseInsensitive, doctest
-, easyFile, fastLogger, httpTypes, network, unixTime, wai, waiTest
+{ cabal, autoUpdate, blazeBuilder, byteorder, caseInsensitive
+, doctest, easyFile, fastLogger, httpTypes, network, unixTime, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-logger";
-  version = "2.1.2";
-  sha256 = "0rfgcq433k5jpdgwyzrzgiy5h66bb38xfqzb63gmqabysr8wa9kl";
+  version = "2.2.1";
+  sha256 = "0210phkadr5ndpx6ppmygir0mxnpjffvccjb4lnpjnwy2ydf0lzy";
   buildDepends = [
-    blazeBuilder byteorder caseInsensitive easyFile fastLogger
-    httpTypes network unixTime wai
+    autoUpdate blazeBuilder byteorder caseInsensitive easyFile
+    fastLogger httpTypes network unixTime wai
   ];
-  testDepends = [ doctest waiTest ];
+  testDepends = [ doctest ];
   doCheck = false;
   meta = {
     description = "A logging system for WAI";

pkgs/development/libraries/haskell/wai-websockets/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-websockets";
-  version = "3.0.0";
-  sha256 = "0bpzkh9a5j0a282z4dj9dqnjsgd0g8gyvvp0xm0a53582zfhfi5s";
+  version = "3.0.0.1";
+  sha256 = "01rbwyx2ks6hdaw5qw7dibidyw4bh85s2gzqy4rhmxpdcnmxxmnz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "3.0.1";
-  sha256 = "1889l6fbgvxn13yaskcvjrq07vs62ayvq8q5rn9cpq0yqyc6llcw";
+  version = "3.0.1.1";
+  sha256 = "04dka0mgqckzhvmz8m9gqvk5qq79g23q8wx40v42fwhkwwy7f8i0";
   buildDepends = [ blazeBuilder httpTypes network text vault ];
   testDepends = [ blazeBuilder hspec ];
   meta = {

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

@@ -1,22 +1,22 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, async, blazeBuilder, caseInsensitive, doctest, hashable
-, hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase, network
-, QuickCheck, simpleSendfile, streamingCommons, text, time
+{ cabal, async, autoUpdate, blazeBuilder, caseInsensitive, doctest
+, hashable, hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase
+, network, QuickCheck, simpleSendfile, streamingCommons, text, time
 , transformers, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "3.0.0.4";
-  sha256 = "119yw4k11v2gq3z4gjr51i8z551cbbgwhkfnl9jr4ira06m6si2v";
+  version = "3.0.0.6";
+  sha256 = "0085v0gnjr4yv4s341jyc8cf9l69rmj9rrnr6h2lyhq5hx1i1lw8";
   buildDepends = [
-    blazeBuilder caseInsensitive hashable httpDate httpTypes network
-    simpleSendfile streamingCommons text unixCompat void wai
+    autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes
+    network simpleSendfile streamingCommons text unixCompat void wai
   ];
   testDepends = [
-    async blazeBuilder caseInsensitive doctest hashable hspec HTTP
-    httpDate httpTypes HUnit liftedBase network QuickCheck
+    async autoUpdate blazeBuilder caseInsensitive doctest hashable
+    hspec HTTP httpDate httpTypes HUnit liftedBase network QuickCheck
     simpleSendfile streamingCommons text time transformers unixCompat
     void wai
   ];

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

@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango, text
+, webkit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "webkit";
+  version = "0.13.0.0";
+  sha256 = "152rbb01fq9cxjxqm26s1qcv3nashzymkbjy52ql06y7s1n5i3q5";
+  buildDepends = [ cairo glib gtk mtl pango text ];
+  buildTools = [ gtk2hsBuildtools ];
+  pkgconfigDepends = [ webkit ];
+  meta = {
+    homepage = "http://projects.haskell.org/gtk2hs/";
+    description = "Binding to the Webkit library";
+    license = self.stdenv.lib.licenses.lgpl21;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/websockets-snap/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "websockets-snap";
-  version = "0.8.2.1";
-  sha256 = "13q1vrrcka91w9yad3jw1w68hp59n851hkn9a3hylw0cqs7008az";
+  version = "0.8.2.2";
+  sha256 = "1r5y5czpxrc06i7w3y3fa4dlqmxdypcc8yplg28cv4k3mkfa1hf4";
   buildDepends = [
     blazeBuilder enumerator ioStreams mtl snapCore snapServer
     websockets

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

@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, random, time }:
+
+cabal.mkDerivation (self: {
+  pname = "xorshift";
+  version = "2.0.1";
+  sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf";
+  buildDepends = [ random time ];
+  meta = {
+    description = "Haskell implementation of the xorshift random generator";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/yesod-auth/default.nix

@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.3";
-  sha256 = "05kzsrb49r11yhsrn9j7vx90831qd1jni1h8wdj26qn85anxr10z";
+  version = "1.3.4";
+  sha256 = "138wnrs9bf6wl9r4mc1fhshxky7bc6anhgqnwljx4gzvzsd0vq0y";
   buildDepends = [
     aeson attoparsecConduit authenticate base16Bytestring
     base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable

pkgs/development/libraries/haskell/yesod-bin/default.nix

@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.12";
-  sha256 = "0ksl78k27sshp9l6x7blv5csswv6vb8k632ggj9whnp8akzn37x1";
+  version = "1.2.12.3";
+  sha256 = "0pm7wwml2574fsimibhhb47s6fn19cdips4p419k7j8g62v4kfzx";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/yesod-form/default.nix

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.14";
-  sha256 = "0a2xlar67f0y48zqml8kqjna33i474j3j04gmgglsfmk1wikr7sh";
+  version = "1.3.15";
+  sha256 = "1cyz39892kxa3m3wx8a3sy4fkmhaljvz72r2jq8l5qn2hd0n5b69";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet network persistent resourcet

pkgs/development/libraries/haskell/yesod-test/default.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.3.1";
-  sha256 = "0q4w7q22d8hvsg939w686fb295v8cznnhqlfd1bh0v2lp9dih4ms";
+  version = "1.2.3.2";
+  sha256 = "05h7m0v92b8js71kgkvqc9nzpwa8hhxp052pknbvcfv3yn3spsx9";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network

pkgs/development/libraries/libgksu/default.nix

@@ -0,0 +1,83 @@
+{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome, gnome3,
+  libstartup_notification, libgtop, perl, perlXMLParser, autoconf,
+  automake, libtool, intltool, gtk_doc, docbook_xsl, xauth, sudo
+}:
+
+stdenv.mkDerivation rec {
+  version = "2.0.12";
+  pname = "libgksu";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+    sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92";
+  };
+
+  patches = [
+        # Patches from the gentoo ebuild
+
+        # Fix compilation on bsdc
+	./libgksu-2.0.0-fbsd.patch
+
+        # Fix wrong usage of LDFLAGS, gentoo bug #226837
+	./libgksu-2.0.7-libs.patch
+
+        # Use po/LINGUAS
+	./libgksu-2.0.7-polinguas.patch
+
+        # Don't forkpty; gentoo bug #298289
+	./libgksu-2.0.12-revert-forkpty.patch
+
+        # Make this gmake-3.82 compliant, gentoo bug #333961
+	./libgksu-2.0.12-fix-make-3.82.patch
+
+        # Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues).
+	./libgksu-2.0.12-notests.patch
+
+        # Fix automake-1.11.2 compatibility, gentoo bug #397411
+	./libgksu-2.0.12-automake-1.11.2.patch
+	];
+
+  postPatch = ''
+    # gentoo bug #467026
+    sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac
+
+    # Fix some binary paths
+    sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c
+    sed -i -e 's|/usr/bin/sudo|${sudo}/bin/sudo|g' libgksu/libgksu.c
+    sed -i -e 's|/bin/su\([^d]\)|/var/setuid-wrappers/su\1|g' libgksu/libgksu.c
+
+    touch NEWS README
+  '';
+
+  preConfigure = ''
+    intltoolize --force --copy --automake
+    autoreconf -vfi
+  '';
+
+  buildInputs = [
+    pkgconfig makeWrapper gtk gnome.GConf libstartup_notification
+    gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser
+    autoconf automake libtool intltool gtk_doc docbook_xsl
+  ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gksu-properties" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A library for integration of su into applications";
+    longDescription = ''
+      This library comes from the gksu program. It provides a simple API
+      to use su and sudo in programs that need to execute tasks as other
+      user.  It provides X authentication facilities for running
+      programs in an X session.
+    '';
+    homepage = "http://www.nongnu.org/gksu/";
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}