diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a4386b067b52..8ca8a2bcf4ba 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -65,6 +65,7 @@ modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; msackman = "Matthew Sackman "; + notthemessiah = "Brian Cohen "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; @@ -108,6 +109,7 @@ winden = "Antonio Vargas Gonzalez "; wizeman = "Ricardo M. Correia "; wjlroe = "William Roe "; + wkennington = "William A. Kennington III "; wmertens = "Wout Mertens "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 4ba81dadb315..853efcc09dc1 100644 --- a/nixos/modules/misc/ids.nix +++ b/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! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2cbda50ba29d..ea647b43c9d2 100644 --- a/nixos/modules/module-list.nix +++ b/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 diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 804f9a0847ff..6887ab1e8052 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/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} + ''; + }; }; } diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix new file mode 100644 index 000000000000..634f760328f7 --- /dev/null +++ b/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}"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index af5450166379..3758652ebddf 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/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 ''; diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 1b51c11e351a..73fc6ce543cf 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/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"!' diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index bfc3c9b5da39..fcefdfa88a36 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/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 diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 9100a433cd63..54a376c9560e 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/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 ""; + }; } diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 246d35065317..93a83a3e42af 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/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 diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 2e30f4c62f97..106b269d9e1f 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/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; + }; } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index f59f71b0d6f8..dae3b9210a86 100644 --- a/nixos/release-combined.nix +++ b/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) diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index cbd883304348..47e62a281fb0 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/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 ]; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 165510f39336..e5cfbcdfe178 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/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"; diff --git a/pkgs/applications/editors/idea/pycharm.nix b/pkgs/applications/editors/idea/pycharm.nix new file mode 100644 index 000000000000..d283686765ed --- /dev/null +++ b/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"; + }; + }; +} diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix new file mode 100644 index 000000000000..0af750ec989e --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch new file mode 100644 index 000000000000..cd06a8315f98 --- /dev/null +++ b/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 + #include ++#include ++#include ++#include + + #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 + #include ++#include ++#include ++#include ++#include + + #include "interface.h" + #include "support.h" diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index c997f5c343fd..cc1fe8c3a220 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/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"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 03faaa9ada4b..3d814bf6a304 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/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; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix new file mode 100644 index 000000000000..61fd44925b71 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch b/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch new file mode 100644 index 000000000000..fd711a321acf --- /dev/null +++ b/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 +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 + #include + +-#include ++#include + #include + #include + #include +-- +1.7.8.5 + diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix new file mode 100644 index 000000000000..15202a1e90c6 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index caad542ebac4..e38d5188dc2f 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/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; [ diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 6c133e9dbb49..a8388b4829af 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/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 }; } diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix index 72c2028e63c9..b3bde7874cab 100644 --- a/pkgs/applications/science/math/sloane/default.nix +++ b/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 diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index e699b82f2b0a..d183db5d0548 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/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 ] diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 7bb1e1d21d59..0a2c43fc5812 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/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"; diff --git a/pkgs/development/compilers/agda/2.3.2.2.nix b/pkgs/development/compilers/agda/2.3.2.2.nix deleted file mode 100644 index 5a1f00a995ce..000000000000 --- a/pkgs/development/compilers/agda/2.3.2.2.nix +++ /dev/null @@ -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 ]; - }; -}) diff --git a/pkgs/development/compilers/agda/2.4.0.2.nix b/pkgs/development/compilers/agda/default.nix similarity index 100% rename from pkgs/development/compilers/agda/2.4.0.2.nix rename to pkgs/development/compilers/agda/default.nix diff --git a/pkgs/development/compilers/agda/stdlib-0.7.nix b/pkgs/development/compilers/agda/stdlib-0.7.nix deleted file mode 100644 index c07b3e7c7dd2..000000000000 --- a/pkgs/development/compilers/agda/stdlib-0.7.nix +++ /dev/null @@ -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 ]; - }; -}) \ No newline at end of file diff --git a/pkgs/development/compilers/agda/stdlib-0.8.nix b/pkgs/development/compilers/agda/stdlib.nix similarity index 100% rename from pkgs/development/compilers/agda/stdlib-0.8.nix rename to pkgs/development/compilers/agda/stdlib.nix diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 5ab692ce34e6..d3892d43d15e 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/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 = [ ] diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 593cc61dc410..fdfb5d8ca30c 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/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 ]; }; } diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index c194c3aa8a07..bc5320ff77c0 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/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 = { diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c75b82dcf15d..b8f6fbf3401d 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index 4abea15c51d7..a687f7090181 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/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 = { diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index bfefa0bead26..0c426a3bf4c7 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index bc4b7eb14542..20def8db154c 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix index 39c17de2c313..d53d11385f4d 100644 --- a/pkgs/development/libraries/haskell/ad/default.nix +++ b/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 }: diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 2fefde3a8caa..3b9883dc04a3 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix similarity index 88% rename from pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix rename to pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix index e17fd13741af..a038ad0e12f5 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 381f9d81d013..1441879606e4 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix new file mode 100644 index 000000000000..b7c314f9ff97 --- /dev/null +++ b/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; + }; +}) diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index b50a61f9157f..ff33d1378cbd 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/bencoding/default.nix b/pkgs/development/libraries/haskell/bencoding/default.nix index c93def746554..325343985ac8 100644 --- a/pkgs/development/libraries/haskell/bencoding/default.nix +++ b/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: { diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index b46b8508e9ac..cbb362402a61 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index 3563abb0a856..e19cac2b2ec3 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/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/"; diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 6a35f3d55238..d38de13c3265 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 3abc6443c6e3..0be319aeff23 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/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; diff --git a/pkgs/development/libraries/haskell/data-fin/default.nix b/pkgs/development/libraries/haskell/data-fin/default.nix new file mode 100644 index 000000000000..3c0d77e1a7a8 --- /dev/null +++ b/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; + }; +}) diff --git a/pkgs/development/libraries/haskell/dom-selector/default.nix b/pkgs/development/libraries/haskell/dom-selector/default.nix new file mode 100644 index 000000000000..b9806ca4dc7b --- /dev/null +++ b/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; + }; +}) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 6a1aa3dfb3c5..d44041038089 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 51a6ea84c50c..37d243097324 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix new file mode 100644 index 000000000000..ba3d8a5686c3 --- /dev/null +++ b/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 ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index d82c5bbc1317..a9c06e80f8af 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/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 .. diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index b0d2d9f30c4d..8c87bcc0dc5f 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/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; diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index f189ca43f96f..69cc5cd9ea6f 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 68c46f5866d6..31e4ea86ddf9 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index 68ed02f4b184..86a062b69098 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 055f61cbc76c..971ef970a68c 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/graph-wrapper/default.nix b/pkgs/development/libraries/haskell/graph-wrapper/default.nix index 711f490aa19a..f38bc24d2464 100644 --- a/pkgs/development/libraries/haskell/graph-wrapper/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 9fd8cf6f303d..652580b08fb7 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index e0a0053b2ea5..39ef8cbba0f4 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index caa825535ecc..c4b2104eee49 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index b125dbcef642..7f46f1e54fd6 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/hsshellscript/default.nix b/pkgs/development/libraries/haskell/hsshellscript/default.nix index b6fdac695449..221d3079d2be 100644 --- a/pkgs/development/libraries/haskell/hsshellscript/default.nix +++ b/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 = { diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index acd93b29e18c..08d93287ecbf 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index 2aa33e9b4417..cfb05b9f0948 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix index 3be5d8298565..0b655689dc44 100644 --- a/pkgs/development/libraries/haskell/monad-extras/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 8a4122efc8fa..cb3a13f8c6ed 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/network-metrics/default.nix b/pkgs/development/libraries/haskell/network-metrics/default.nix index 024192a06a89..c9df88a41c92 100644 --- a/pkgs/development/libraries/haskell/network-metrics/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index ee44d908c498..6b84a53e0c2b 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 765f4c7a3fce..5ce05edb3073 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix index eb6fb43e8d6f..dc3fa3e85b56 100644 --- a/pkgs/development/libraries/haskell/pathtype/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index a1dfa4fcc298..882ebcc7d250 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 3647431bbb15..898bc13284da 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix index 96044afae0e9..91e31801e7f2 100644 --- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/prelude-safeenum/default.nix b/pkgs/development/libraries/haskell/prelude-safeenum/default.nix new file mode 100644 index 000000000000..17674a5be56f --- /dev/null +++ b/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; + }; +}) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index ab05167683fc..5d6c54f4b837 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix index f3fe5343e523..9a0a994cf77e 100644 --- a/pkgs/development/libraries/haskell/retry/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/simple-conduit/default.nix b/pkgs/development/libraries/haskell/simple-conduit/default.nix index a55267d426b1..f1ad007c8f97 100644 --- a/pkgs/development/libraries/haskell/simple-conduit/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/sodium/default.nix b/pkgs/development/libraries/haskell/sodium/default.nix new file mode 100644 index 000000000000..f27c5d0e51c0 --- /dev/null +++ b/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; + }; +}) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 4bb356a44434..9bed0331a50b 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 01c6e4d999f5..96b47a877414 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index f87230271f13..b0358a3ac726 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix index af3dd417a995..f03aedad4fd3 100644 --- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 1fc8fd24e252..60f0f21b292a 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/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 = { diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 4d63904a0926..93f95d36a0c5 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index a94742ea2e7c..2eca7d3c1c3c 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index cb88d7ab6e69..a60a6e9dda01 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 6c70fede1eca..03e58e59476b 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/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 = { diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 3065c52c0f9f..d49e0fe7db4e 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix new file mode 100644 index 000000000000..7993213e3e93 --- /dev/null +++ b/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; + }; +}) diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix index 29fcc454112c..edc8f93cfe06 100644 --- a/pkgs/development/libraries/haskell/websockets-snap/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/xorshift/default.nix b/pkgs/development/libraries/haskell/xorshift/default.nix new file mode 100644 index 000000000000..7fe91aad0e70 --- /dev/null +++ b/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; + }; +}) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 3dcda2466880..3f0b9267f009 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 864602a3a53f..dbf98e1457b2 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 3ac24f874626..a5a70848dfd7 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/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 diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 41f8f694ca15..16dc0b6857f4 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/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 diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix new file mode 100644 index 000000000000..e3d64994fe2f --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch new file mode 100644 index 000000000000..5c007be5b4b4 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch @@ -0,0 +1,60 @@ +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c +--- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 ++++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 +@@ -23,7 +23,12 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#include ++#else + #include ++#endif + #include + #include + #include +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am +--- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 ++++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 +@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe + noinst_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + + EXTRA_DIST = libgksu.ver +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in +--- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 ++++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 +@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- + gksu_run_helper_SOURCES = gksu-run-helper.c + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + EXTRA_DIST = libgksu.ver + all: all-am + +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am +--- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 ++++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 +@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE + noinst_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in +--- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 ++++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 +@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + all: all-am + + .SUFFIXES: diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch new file mode 100644 index 000000000000..0f22166fb8b7 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch @@ -0,0 +1,25 @@ +Due to the following change, pkglib_PROGRAMS is invalid: + http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf + +https://savannah.nongnu.org/bugs/index.php?35241 +https://bugs.gentoo.org/show_bug.cgi?id=397411 + +--- + libgksu/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am +index 49362f9..3cb1090 100644 +--- a/libgksu/Makefile.am ++++ b/libgksu/Makefile.am +@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = libgksu2.pc + +-pkglibdir = ${libdir}/${PACKAGE} +-pkglib_PROGRAMS = gksu-run-helper ++gksulibdir = ${libdir}/${PACKAGE} ++gksulib_PROGRAMS = gksu-run-helper + gksu_run_helper_LDADD = ${GLIB_LIBS} + gksu_run_helper_SOURCES = gksu-run-helper.c + diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch new file mode 100644 index 000000000000..dd52b8247fa4 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch @@ -0,0 +1,19 @@ +--- libgksu/Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500 ++++ libgksu/Makefile.am 2010-08-22 16:11:55.289599110 -0500 +@@ -17,11 +17,11 @@ + + if GCONF_SCHEMAS_INSTALL + install-data-local: +- if test -z "$(DESTDIR)" ; then \ +- for p in $(schemas_DATA) ; do \ +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ +- done \ +- fi ++ if test -z "$(DESTDIR)" ; then \ ++ for p in $(schemas_DATA) ; do \ ++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ ++ done \ ++ fi + else + install-data-local: + endif diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch new file mode 100644 index 000000000000..3787ef6bfc13 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch @@ -0,0 +1,26 @@ +Index: libgksu-2.0.12/libgksu/Makefile.am +=================================================================== +--- libgksu-2.0.12.orig/libgksu/Makefile.am ++++ libgksu-2.0.12/libgksu/Makefile.am +@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper + gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` + gksu_run_helper_SOURCES = gksu-run-helper.c + +-noinst_PROGRAMS = test-gksu ++EXTRA_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la + test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` +Index: libgksu-2.0.12/libgksuui/Makefile.am +=================================================================== +--- libgksu-2.0.12.orig/libgksuui/Makefile.am ++++ libgksu-2.0.12/libgksuui/Makefile.am +@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + includedir = ${prefix}/include/$(PACKAGE) + +-noinst_PROGRAMS = test-gksuui ++EXTRA_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la + test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch new file mode 100644 index 000000000000..2c3a8cc786bb --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch @@ -0,0 +1,359 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c +--- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400 ++++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500 +@@ -1,7 +1,6 @@ + /* + * Gksu -- a library providing access to su functionality + * Copyright (C) 2004-2009 Gustavo Noronha Silva +- * Portions Copyright (C) 2009 VMware, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -56,9 +55,6 @@ + static void + gksu_context_launch_complete (GksuContext *context); + +-static void +-read_line (int fd, gchar *buffer, int n); +- + GType + gksu_error_get_type (void) + { +@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context, + for (i = 0 ; cmd[i] != NULL ; i++) + g_free (cmd[i]); + g_free(cmd); +- +- _exit(1); + } + else if (pid == -1) + { +@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context, + /* drop the \n echoed on password entry if su did request + a password */ + if (password_needed) +- read_line (fdpty, buf, 255); ++ read (fdpty, buf, 255); + if (context->debug) + fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); +- read_line (fdpty, buf, 255); ++ read (fdpty, buf, 255); + if (context->debug) + fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); + } +@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context, + { + int retval = 0; + +- /* Red Hat's su shows the full path to su in its error messages. */ +- if (!strncmp (buf, "su:", 3) || +- !strncmp (buf, "/bin/su:", 7)) ++ if (!strncmp (buf, "su", 2)) + { + gchar **strings; + +@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context, + } + + strings = g_strsplit (buf, ":", 2); +- +- /* Red Hat and Fedora use 'incorrect password'. */ +- if (strings[1] && +- (g_str_has_prefix(strings[1], " Authentication failure") || +- g_str_has_prefix(strings[1], " incorrect password"))) ++ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23)) + { + if (used_gnome_keyring) + g_set_error (error, gksu_quark, +@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context, + { + char **cmd; + char buffer[256] = {0}; +- char *child_stderr = NULL; +- /* This command is used to gain a token */ +- char *const verifycmd[] = +- { +- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL +- }; + int argcount = 8; + int i, j; + +@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context, + + pid_t pid; + int status; +- FILE *fdfile = NULL; +- int fdpty = -1; ++ FILE *infile, *outfile; ++ int parent_pipe[2]; /* For talking to the parent */ ++ int child_pipe[2]; /* For talking to the child */ + + context->sudo_mode = TRUE; + +@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context, + cmd[argcount] = g_strdup("-S"); + argcount++; + +- /* Make sudo noninteractive (we should already have a token) */ +- cmd[argcount] = g_strdup("-n"); +- argcount++; +- + /* Make sudo use next arg as prompt */ + cmd[argcount] = g_strdup("-p"); + argcount++; +@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]); + } + +- pid = forkpty(&fdpty, NULL, NULL, NULL); +- if (pid == 0) ++ if ((pipe(parent_pipe)) == -1) + { +- // Child +- setsid(); // make us session leader +- +- execv(verifycmd[0], verifycmd); ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error creating pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + +- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, +- _("Failed to exec new process: %s"), ++ if ((pipe(child_pipe)) == -1) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error creating pipe: %s"), + strerror(errno)); + sudo_reset_xauth (context, xauth, xauth_env); + return FALSE; + } +- else if (pid == -1) ++ ++ pid = fork(); ++ if (pid == -1) + { + g_set_error (error, gksu_quark, GKSU_ERROR_FORK, + _("Failed to fork new process: %s"), +@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context, + sudo_reset_xauth (context, xauth, xauth_env); + return FALSE; + } ++ else if (pid == 0) ++ { ++ // Child ++ setsid(); // make us session leader ++ close(child_pipe[1]); ++ dup2(child_pipe[0], STDIN_FILENO); ++ dup2(parent_pipe[1], STDERR_FILENO); + ++ execv(cmd[0], cmd); ++ ++ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, ++ _("Failed to exec new process: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + else + { + gint counter = 0; + gchar *cmdline = NULL; +- struct termios tio; + + // Parent +- fdfile = fdopen(fdpty, "w+"); ++ close(parent_pipe[1]); + +- /* make sure we notice that ECHO is turned off, if it gets +- turned off */ +- tcgetattr (fdpty, &tio); +- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++) +- { +- usleep (1000); +- tcgetattr (fdpty, &tio); +- } ++ infile = fdopen(parent_pipe[0], "r"); ++ if (!infile) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error opening pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + +- fcntl (fdpty, F_SETFL, O_NONBLOCK); ++ outfile = fdopen(child_pipe[1], "w"); ++ if (!outfile) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error opening pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } ++ ++ /* ++ we are expecting to receive a GNOME_SUDO_PASS ++ if we don't there are two possibilities: an error ++ or a password is not needed ++ */ ++ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK); + + { /* no matter if we can read, since we're using + O_NONBLOCK; this is just to avoid the prompt +@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context, + struct timeval tv; + + FD_ZERO(&rfds); +- FD_SET(fdpty, &rfds); ++ FD_SET(parent_pipe[0], &rfds); + tv.tv_sec = 1; + tv.tv_usec = 0; + +- select (fdpty + 1, &rfds, NULL, NULL, &tv); ++ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv); + } + + /* Try hard to find the prompt; it may happen that we're +@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context, + if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0) + break; + +- read_line (fdpty, buffer, 256); ++ read_line (parent_pipe[0], buffer, 256); + + if (context->debug) + fprintf (stderr, "buffer: -%s-\n", buffer); +@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context, + + usleep (1000); + +- write (fdpty, password, strlen(password) + 1); +- write (fdpty, "\n", 1); ++ fprintf (outfile, "%s\n", password); ++ fclose (outfile); + + nullify_password (password); + +- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); ++ /* turn NONBLOCK off */ ++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); + /* ignore the first newline that comes right after sudo receives + the password */ +- fgets (buffer, 255, fdfile); +- /* this is the status we are interested in */ +- fgets (buffer, 255, fdfile); ++ fgets (buffer, 255, infile); ++ /* this is the status we are interessted in */ ++ fgets (buffer, 255, infile); + } + else + { +@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n"); + + /* turn NONBLOCK off, also if have no prompt */ +- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); ++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); + + should_display = gconf_client_get_bool (context->gconf_client, + BASE_PATH "display-no-pass-info", NULL); +@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "%s", buffer); + } + +- if (g_str_has_prefix (buffer, "Sorry, try again.")) ++ if (!strcmp (buffer, "Sorry, try again.\n")) + g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS, + _("Wrong password.")); ++ else if (!strncmp (buffer, "Sorry, user ", 12)) ++ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, ++ _("The underlying authorization mechanism (sudo) " ++ "does not allow you to run this program. Contact " ++ "the system administrator.")); + else + { + gchar *haystack = buffer; +@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context, + } + } + +- /* If we have an error, let's just stop sudo right there. */ +- if (error) +- close(fdpty); +- + cmdline = g_strdup("sudo"); + /* wait for the child process to end or become something other + than sudo */ +@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context, + if (context->sn_context) + gksu_context_launch_complete (context); + ++ while (read (parent_pipe[0], buffer, 255) > 0) ++ { ++ fprintf (stderr, "%s", buffer); ++ bzero(buffer, 256); ++ } ++ + /* if the process is still active waitpid() on it */ + if (pid_exited != pid) + waitpid(pid, &status, 0); + sudo_reset_xauth (context, xauth, xauth_env); + +- /* +- * Did token acquisition succeed? If so, spawn sudo in +- * non-interactive mode. It should either succeed or die +- * immediately if you're not allowed to run the command. +- */ +- if (WEXITSTATUS(status) == 0) +- { +- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL, +- NULL, &child_stderr, &status, +- error); +- } +- + if (exit_status) + { + if (WIFEXITED(status)) { +@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context, + + if (WEXITSTATUS(status)) + { +- if (g_str_has_prefix(child_stderr, "Sorry, user ")) +- { +- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, +- _("The underlying authorization mechanism (sudo) " +- "does not allow you to run this program. Contact " +- "the system administrator.")); +- } + if(cmdline) + { + /* sudo already exec()ed something else, don't report +@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context, + if (!g_str_has_suffix (cmdline, "sudo")) + { + g_free (cmdline); +- g_free (child_stderr); + return FALSE; + } + g_free (cmdline); +@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context, + } + } + +- fprintf(stderr, child_stderr); +- g_free(child_stderr); +- + /* if error is set we have found an error condition */ +- return (error == NULL); ++ if (error) ++ return FALSE; ++ ++ return TRUE; + } + + /** diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch new file mode 100644 index 000000000000..b9fb77f27147 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch @@ -0,0 +1,76 @@ +# https://savannah.nongnu.org/bugs/?25362 +# https://bugs.gentoo.org/show_bug.cgi?id=226837 +diff -Nura a/configure.ac b/configure.ac +--- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 ++++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 +@@ -43,6 +43,9 @@ + PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) + PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) + ++PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) ++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) ++ + # Checks for library functions. + ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" + +diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am +--- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 +@@ -3,7 +3,7 @@ + AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" + + bin_PROGRAMS = gksu-properties +-gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} ++gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} + gksu_properties_SOURCES = gksu-properties.c + + gladedir = ${prefix}/share/${PACKAGE} +diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am +--- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 +@@ -8,8 +8,8 @@ + # major -> breaks backward compatibility (changes to existing ABI) + # minor -> keeps compatibility (additions to the API) + # micro -> no change to the API/ABI +-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la +-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} ++libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} ++libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 + if USE_VERSION_SCRIPT + libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver + endif +@@ -24,12 +24,11 @@ + + pkglibdir = ${libdir}/${PACKAGE} + pkglib_PROGRAMS = gksu-run-helper +-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` ++gksu_run_helper_LDADD = ${GLIB_LIBS} + gksu_run_helper_SOURCES = gksu-run-helper.c + + noinst_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c +-test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` ++test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} + + EXTRA_DIST = libgksu.ver +diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am +--- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 +@@ -4,12 +4,13 @@ + + noinst_LTLIBRARIES = libgksuui1.0.la + libgksuui1_0_la_SOURCES = gksuui-dialog.c +-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` ++libgksuui1_0_la_LDFLAGS = -Wl,-O1 ++libgksuui1_0_la_LIBADD = ${GTK_LIBS} + + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + includedir = ${prefix}/include/$(PACKAGE) + + noinst_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c +-test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` ++test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} ++ diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch new file mode 100644 index 000000000000..e423af16b44c --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch @@ -0,0 +1,40 @@ +# https://savannah.nongnu.org/bugs/?25360 +diff -Nura a/configure.ac b/configure.ac +--- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 ++++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 +@@ -50,7 +50,7 @@ + GETTEXT_PACKAGE=AC_PACKAGE_NAME + AC_SUBST(GETTEXT_PACKAGE) + +-IT_PROG_INTLTOOL ++IT_PROG_INTLTOOL([0.35.5]) + AM_GLIB_GNU_GETTEXT + + ################################################## +diff -Nura a/po/LINGUAS b/po/LINGUAS +--- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 ++++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 +@@ -0,0 +1,23 @@ ++# please keep this list sorted alphabetically ++# http://live.gnome.org/GnomeGoals/PoLinguas ++# ++ca ++cs ++da ++de ++es ++eu ++fr ++hu ++it ++ko ++lt ++pl ++pt_BR ++ro ++ru ++sk ++sv ++nb ++nl ++zh_CN diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 95299cb3fd7b..e9b7ae4e46cd 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: +{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, wayland, libffi }: stdenv.mkDerivation rec { - name = "libva-1.1.1"; + name = "libva-1.3.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0"; + sha256 = "15y27jdnfvf9krg4s3a1c29rn9pvyp43wckpwhd2rg4wrbqv32c7"; }; - buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; + buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes wayland libffi ]; configureFlags = [ "--enable-glx" ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/vaapi; - license = stdenv.lib.licenses.mit; + license = licenses.mit; description = "VAAPI library: Video Acceleration API"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 00d586a9f04c..389e2385f986 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate +{ stdenv, fetchurl, SDL, ffmpeg, frei0r, jack2, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2 + SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig qt sox ]; diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index e03f4ec88c72..fe290fd69fcf 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /bin/pwd pwd substituteInPlace qtbase/configure --replace /bin/pwd pwd substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace /usr/share/X11/locale ${libX11}/share/X11/locale \ + --replace /usr/lib/X11/locale ${libX11}/share/X11/locale sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf ''; diff --git a/pkgs/development/libraries/qt-5/qt-5.3.nix b/pkgs/development/libraries/qt-5/qt-5.3.nix index fdda7559d7ae..1722a1e52a19 100644 --- a/pkgs/development/libraries/qt-5/qt-5.3.nix +++ b/pkgs/development/libraries/qt-5/qt-5.3.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /bin/pwd pwd substituteInPlace qtbase/configure --replace /bin/pwd pwd substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace /usr/share/X11/locale ${libX11}/share/X11/locale \ + --replace /usr/lib/X11/locale ${libX11}/share/X11/locale sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf ''; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index b511a841d190..409b5db01049 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,25 +1,15 @@ -{stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig}: -let - s = # Generated upstream information - rec { - baseName="serf"; - version="1.3.3"; - name="${baseName}-${version}"; - hash="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2"; - url="https://serf.googlecode.com/files/serf-1.3.3.tar.bz2"; - sha256="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2"; - }; - buildInputs = [ - apr scons openssl aprutil zlib krb5 pkgconfig - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; +{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }: + +stdenv.mkDerivation rec { + name = "serf-1.3.6"; + src = fetchurl { - inherit (s) url sha256; + url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2"; + sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya"; }; + buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ]; + configurePhase = '' sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct @@ -36,7 +26,6 @@ stdenv.mkDerivation { ''; meta = { - inherit (s) version; description = "HTTP client library based on APR"; license = stdenv.lib.licenses.asl20 ; maintainers = [stdenv.lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/serf/default.upstream b/pkgs/development/libraries/serf/default.upstream deleted file mode 100644 index a081905759e2..000000000000 --- a/pkgs/development/libraries/serf/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url https://code.google.com/p/serf/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 6f1cb572b9bc..2c553aeded32 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig -, intelgen4asm }: +{ stdenv, fetchurl, pkgconfig, libdrm, libva, libX11, intel-gpu-tools, mesa_noglu, wayland, python, gnum4 }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.0.20"; + name = "libva-intel-driver-1.3.2"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj"; + sha256 = "1l8897plk74zcik6snk7hb5s4ga0d2vypccfkh0bp1fb2775dn8i"; }; - buildInputs = [ pkgconfig libdrm libva libX11 ]; + prePatch = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' src/shaders/gpp.py + ''; + + buildInputs = [ pkgconfig libdrm libva libX11 intel-gpu-tools mesa_noglu wayland gnum4 ]; preConfigure = '' sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; - meta = { + meta = with stdenv.lib; { homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; description = "Intel driver for the VAAPI library"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/misc/intelgen4asm/default.nix b/pkgs/development/misc/intelgen4asm/default.nix deleted file mode 100644 index c7365f944e95..000000000000 --- a/pkgs/development/misc/intelgen4asm/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex }: - -stdenv.mkDerivation rec { - name = "intel-g4asm-20110416"; - - src = fetchgit { - url = http://anongit.freedesktop.org/git/xorg/app/intel-gen4asm.git; - rev = "2450ff752642d116eb789a35393b9828133c7d31"; - sha256 = "a24c054a7c5ae335b72523fd2f51cae7f07a2885ef3c7a04d07a85e39f0c053f"; - }; - - buildInputs = [ autoconf automake libtool bison flex ]; - - preConfigure = "sh autogen.sh"; - - meta = { - homepage = http://cgit.freedesktop.org/xorg/app/intel-gen4asm/; - license = stdenv.lib.licenses.mit; - description = "Program to compile an assembly language for the Intel 965 Express Chipset"; - }; -} diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix new file mode 100644 index 000000000000..939ff8ec7506 --- /dev/null +++ b/pkgs/development/pharo/vm/default.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib }: + +stdenv.mkDerivation rec { + name = "pharo-vm-core-i386-2014.06.25"; + system = "x86_32-linux"; + src = fetchurl { + url = http://files.pharo.org/vm/src/vm-unix-sources/pharo-vm-2014.06.25.tar.bz2; + md5 = "4d80d8169c2f2f0355c43ee90bbad23f"; + }; + + sources10Zip = fetchurl { + url = http://files.pharo.org/sources/PharoV10.sources.zip; + md5 = "3476222a0345a6f8f8b6093b5e3b30fb"; + }; + + sources20Zip = fetchurl { + url = http://files.pharo.org/sources/PharoV20.sources.zip; + md5 = "a145b0733f9d68d9ce6a76270b6b9ec8"; + }; + + sources30Zip = fetchurl { + url = http://files.pharo.org/sources/PharoV30.sources.zip; + md5 = "bb0a66b8968ef7d0da97ec86331f68c8"; + }; + + # Building + preConfigure = '' + cd build/ + ''; + resources = ./resources; + installPhase = '' + echo Current directory $(pwd) + echo Creating prefix "$prefix" + mkdir -p "$prefix/lib/pharo-vm" + + cd ../../results + + mv vm-display-null vm-display-null.so + mv vm-display-X11 vm-display-X11.so + mv vm-sound-null vm-sound-null.so + mv vm-sound-ALSA vm-sound-ALSA.so + mv pharo pharo-vm + + cp * "$prefix/lib/pharo-vm" + + cp -R "$resources"/* "$prefix/" + + mkdir $prefix/bin + + chmod u+w $prefix/bin + cat > $prefix/bin/pharo-vm-x < $prefix/bin/pharo-vm-nox < +Subject: Fix use of absolute paths in cmake files + +* build/directories.cmake +* build/CMakeLists.txt +* build/vm-sound-ALSA/CMakeLists.txt +* build/vm-sound-null/CMakeLists.txt +* build/vm-display-null/CMakeLists.txt +* build/vm-display-X11/CMakeLists.txt +--- a/build/CMakeLists.txt ++++ b/build/CMakeLists.txt +@@ -71,7 +71,7 @@ + list(APPEND LINKLIBS m) + list(APPEND LINKLIBS dl) + list(APPEND LINKLIBS pthread) +-set(EXECUTABLE_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + add_subdirectory("vm-display-null") + add_subdirectory("vm-display-X11") + add_subdirectory("vm-sound-ALSA") +--- a/build/directories.cmake ++++ b/build/directories.cmake +@@ -1,12 +1,12 @@ +-set(topDir "/builds/workspace/Pharo-vm-unix-sources/cog") +-set(buildDir "/builds/workspace/Pharo-vm-unix-sources/cog/build") ++set(topDir "${CMAKE_SOURCE_DIR}/..") ++set(buildDir "${CMAKE_SOURCE_DIR}/../build") + set(thirdpartyDir "${buildDir}/thirdParty") +-set(platformsDir "/builds/workspace/Pharo-vm-unix-sources/cog/platforms") +-set(srcDir "/builds/workspace/Pharo-vm-unix-sources/cog/src") ++set(platformsDir "${CMAKE_SOURCE_DIR}/../platforms") ++set(srcDir "${CMAKE_SOURCE_DIR}/../src") + set(srcPluginsDir "${srcDir}/plugins") + set(srcVMDir "${srcDir}/vm") + set(platformName "unix") + set(targetPlatform ${platformsDir}/${platformName}) + set(crossDir "${platformsDir}/Cross") + set(platformVMDir "${targetPlatform}/vm") +-set(outputDir "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(outputDir "${CMAKE_SOURCE_DIR}/../results") +--- a/build/vm-display-X11/CMakeLists.txt ++++ b/build/vm-display-X11/CMakeLists.txt +@@ -11,7 +11,7 @@ + include_directories(${crossDir}/plugins/FilePlugin) + include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin) + include_directories(${crossDir}/plugins/B3DAcceleratorPlugin) +-set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + list(APPEND LINKLIBS SM) + list(APPEND LINKLIBS ICE) + list(APPEND LINKLIBS GL) +--- a/build/vm-display-null/CMakeLists.txt ++++ b/build/vm-display-null/CMakeLists.txt +@@ -11,7 +11,7 @@ + include_directories(${crossDir}/plugins/FilePlugin) + include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin) + include_directories(${crossDir}/plugins/B3DAcceleratorPlugin) +-set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + target_link_libraries(vm-display-null ${LINKLIBS}) + set_target_properties(vm-display-null PROPERTIES PREFIX "" SUFFIX "" + LINK_FLAGS -m32) +--- a/build/vm-sound-ALSA/CMakeLists.txt ++++ b/build/vm-sound-ALSA/CMakeLists.txt +@@ -11,7 +11,7 @@ + include_directories(${crossDir}/plugins/FilePlugin) + include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin) + include_directories(${crossDir}/plugins/B3DAcceleratorPlugin) +-set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + target_link_libraries(vm-sound-ALSA ${LINKLIBS}) + set_target_properties(vm-sound-ALSA PROPERTIES PREFIX "" SUFFIX "" + LINK_FLAGS -m32) +--- a/build/vm-sound-null/CMakeLists.txt ++++ b/build/vm-sound-null/CMakeLists.txt +@@ -11,7 +11,7 @@ + include_directories(${crossDir}/plugins/FilePlugin) + include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin) + include_directories(${crossDir}/plugins/B3DAcceleratorPlugin) +-set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + target_link_libraries(vm-sound-null ${LINKLIBS}) + set_target_properties(vm-sound-null PROPERTIES PREFIX "" SUFFIX "" + LINK_FLAGS -m32) diff --git a/pkgs/development/pharo/vm/patches/fix-executable-name.patch b/pkgs/development/pharo/vm/patches/fix-executable-name.patch new file mode 100644 index 000000000000..b32ed7a32d25 --- /dev/null +++ b/pkgs/development/pharo/vm/patches/fix-executable-name.patch @@ -0,0 +1,14 @@ +Change the name of the executable file from Squeak to Pharo +--- a/platforms/unix/vm-display-X11/sqUnixX11.c ++++ b/platforms/unix/vm-display-X11/sqUnixX11.c +@@ -153,8 +153,8 @@ + /*** Variables -- X11 Related ***/ + + /* name of Squeak windows in Xrm and the WM */ +-#define xResClass "Squeak" +-#define xResName "squeak" ++#define xResClass "pharo-vm" ++#define xResName "Pharo" + + char *displayName= 0; /* name of display, or 0 for $DISPLAY */ + Display *stDisplay= null; /* Squeak display */ diff --git a/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch b/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch new file mode 100644 index 000000000000..c06916c96ee3 --- /dev/null +++ b/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch @@ -0,0 +1,23 @@ +pharo --help must talk about Pharo and not about Squeak +--- a/platforms/unix/vm-display-X11/sqUnixX11.c ++++ b/platforms/unix/vm-display-X11/sqUnixX11.c +@@ -7075,8 +7075,8 @@ + printf(" -lazy go to sleep when main window unmapped\n"); + printf(" -mapdelbs map Delete key onto Backspace\n"); + printf(" -nointl disable international keyboard support\n"); +- printf(" -notitle disable the Squeak window title bar\n"); +- printf(" -title use t as the Squeak window title instead of the image name\n"); ++ printf(" -notitle disable the Pharo window title bar\n"); ++ printf(" -title use t as the Pharo window title instead of the image name\n"); + printf(" -ldtoms launch drop timeout milliseconds\n"); + printf(" -noxdnd disable X drag-and-drop protocol support\n"); + printf(" -optmod map Mod to the Option key\n"); +@@ -7095,7 +7095,7 @@ + static void display_printUsageNotes(void) + { + printf(" Using `unix:0' for may improve local display performance.\n"); +- printf(" -xshm only works when Squeak is running on the X server host.\n"); ++ printf(" -xshm only works when Pharo is running on the X server host.\n"); + } + + diff --git a/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop b/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop new file mode 100644 index 000000000000..9061ec9b8e50 --- /dev/null +++ b/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Pharo VM +GenericName=Pharo Virtual Machine +Exec=pharo-vm-x %F +Icon=pharo +Terminal=false +Type=Application +StartupNotify=false +Categories=Development; +MimeType=application/x-pharo-image; +NoDisplay=true diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png new file mode 100644 index 000000000000..7910e17ebc49 Binary files /dev/null and b/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png differ diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png new file mode 100644 index 000000000000..f6e881417524 Binary files /dev/null and b/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png differ diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png new file mode 100644 index 000000000000..ec8a5f95c6c4 Binary files /dev/null and b/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png differ diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png new file mode 100644 index 000000000000..3f206cf8b18c Binary files /dev/null and b/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png differ diff --git a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml b/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml new file mode 100644 index 000000000000..927514dd215b --- /dev/null +++ b/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml @@ -0,0 +1,9 @@ + + + + Pharo image file + Fichier d'image Pharo + + + + diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix new file mode 100644 index 000000000000..14bfe74821de --- /dev/null +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: + +stdenv.mkDerivation rec { + name = "intel-gpu-tools-1.7"; + + src = fetchurl { + url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; + sha256 = "0yi0024kr1xzglkkhyjpxr081bmwvdakb61az6wiidfrpd1j6q92"; + }; + + configureFlags = [ "--disable-tests" ]; + + buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; + + meta = with stdenv.lib; { + homepage = https://01.org/linuxgraphics/; + description = "Tools for development and testing of the Intel DRM driver"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 3ddbbbdc5bf8..6536d83183cd 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -23,6 +23,9 @@ cabal.mkDerivation (self: { unorderedContainers vector vectorBinaryInstances zlib ]; doCheck = false; + patchPhase = '' + sed -i -e 's|gtk >=.*|gtk|' LambdaHack.cabal + ''; meta = { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A roguelike game engine in early development"; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix new file mode 100644 index 000000000000..a2897a795e84 --- /dev/null +++ b/pkgs/games/astromenace/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, cmake, x11, mesa, SDL, openal, freealut, libogg, libvorbis }: + +stdenv.mkDerivation rec { + version = "1.3.2"; + name = "astromenace-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2"; + sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; + }; + + buildInputs = [ cmake x11 mesa SDL openal freealut libogg libvorbis ]; + + buildPhase = '' + cmake ./ + make + ./AstroMenace --pack --rawdata=../RAW_VFS_DATA + ''; + installPhase = '' + mkdir -p $out/bin + cp AstroMenace $out + cp gamedata.vfs $out + cat > $out/bin/AstroMenace << EOF + #!/bin/bash + $out/AstroMenace --dir=$out + EOF + chmod 755 $out/bin/AstroMenace + ''; + + meta = { + description = "Hardcore 3D space shooter with spaceship upgrade possibilities."; + homepage = http://www.viewizard.com/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 717ea6306cff..264e6ff749a5 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.9"; + version = "1.10"; name = "beanstalkd-${version}"; installPhase=''make install "PREFIX=$out"''; src = fetchurl { url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz"; - sha256 = "158e6d6090c0afac7ee17b9f22713506b3e870dc04a738517282e2e262afb9eb"; + sha256 = "0n9dlmiddcfl7i0f1lwfhqiwyvf26493fxfcmn8jm30nbqciwfwj"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index db8db908d1ec..921d8e907f19 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [viric simons]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix new file mode 100644 index 000000000000..8aa15ee9f82f --- /dev/null +++ b/pkgs/servers/unifi/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "unifi-controller-${version}"; + version = "3.2.1"; + + src = fetchurl { + url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; + sha256 = "0x7s5k9wxkw0rcs4c2mdrmmjpcfmbh5pvvpj8brrwnkgx072n53c"; + }; + + buildInputs = [ unzip ]; + + doConfigure = false; + + buildPhase = '' + rm -rf bin conf readme.txt + ''; + + installPhase = '' + mkdir -p $out + cp -ar * $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.ubnt.com/; + description = "Controller for Ubiquiti UniFi accesspoints"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix new file mode 100644 index 000000000000..7d79eefb122c --- /dev/null +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, fuse, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.12.6"; + name = "bindfs-${version}"; + + src = fetchurl { + url = "http://bindfs.org/downloads/${name}.tar.gz"; + sha256 = "0s90n1n4rvpcg51ixr5wx8ixml1xnc7w28xlbnms34v19pzghm59"; + }; + + dontStrip = true; + + buildInputs = [ fuse pkgconfig ]; + + meta = { + description = "A FUSE filesystem for mounting a directory to another location"; + homepage = http://bindfs.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index d3f18b1353c3..00eaa8aad760 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "riemann-c-client-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/algernon/riemann-c-client/archive/${name}.tar.gz"; - sha256 = "10nz20svf1nb6kymwp0x49nvwnxakby33r6jsadish1fjcvzki88"; + sha256 = "1w3rx0hva605d5vzlhhm4pb43ady0m3s4mz8ix1ycn4b8cq9jsjs"; }; buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index ac7055e20f2a..d42d0712455d 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, libcap, readline }: +{ stdenv, fetchurl, libcap, readline, texinfo }: assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "chrony-1.29.1"; + name = "chrony-${version}"; + + version = "1.30"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "09xgcmh9yrprsazsrm3bm0xl3y75csi9lhh815yyrn68v2s9p335"; + sha256 = "1pa6629nigcv95x2q9dnmzlrwhicxizq9z7ggy2c9cmyl1bakb23"; }; - buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap; + buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap; - configureFlags = [ "--sysconfdir=\$(out)/etc" "--chronyvardir=\$(out)/var/lib/chrony" ]; + configureFlags = [ + "--sysconfdir=$(out)/etc" + "--chronyvardir=$(out)/var/lib/chrony" + ]; meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; @@ -20,6 +25,7 @@ stdenv.mkDerivation rec { repository.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; platforms = platforms.unix; + maintainers = [ maintainers.rickynils ]; longDescription = '' Chronyd is a daemon which runs in background on the system. It obtains measurements via the network of the system clock’s offset relative to time servers on other systems and adjusts the system time accordingly. For isolated systems, the user can periodically enter the correct time by hand (using Chronyc). In either case, Chronyd determines the rate at which the computer gains or loses time, and compensates for this. Chronyd implements the NTP protocol and can act as either a client or a server. diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 8d6a6241ad3f..6b5c69c3d2e2 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages, unzip, gamin }: +{ stdenv, fetchurl, python, pythonPackages, unzip, systemd, gamin }: -let version = "0.8.13"; in +let version = "0.9"; in pythonPackages.buildPythonPackage { name = "fail2ban-${version}"; @@ -9,12 +9,12 @@ pythonPackages.buildPythonPackage { src = fetchurl { url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; name = "fail2ban-${version}.zip"; - sha256 = "0c63i5jsn2n6hv6fb6q922ksxfpppah9415vpydiv0vpf23pq0cb"; + sha256 = "0dawl0vvdvpnkg1hc4l0c8sj8ikcr2l48d6khfx0174nq8yfcg93"; }; buildInputs = [ unzip ]; - pythonPath = [ gamin ]; + pythonPath = [ systemd python.modules.sqlite3 gamin ]; preConfigure = '' substituteInPlace setup.cfg \ diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 93cc7fa7c5da..34a0f15ec1db 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz"; - sha256 = "0zr0vlp7cq3qfhqhalf7rdyd54skswxnc9j9wi8sfmz3psy3vd4y"; + sha256 = "1yx2gdq1vhrcp113hxgl66z5df4ya9nznvq00nvy4v9yn8wf9fb8"; }; buildInputs = [ diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 89bf06886518..a62f81052bad 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: -stdenv.mkDerivation { - name = "syslog-ng-3.5.4.1"; +stdenv.mkDerivation rec { + name = "syslog-ng-${version}"; + + version = "3.5.6"; src = fetchurl { - url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.4.1/source/syslog-ng_3.5.4.1.tar.gz"; - sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj"; + url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; + sha256 = "19i1idklpgn6mz0mg7194by5fjgvvh5n4v2a0rr1z0778l2038kc"; }; buildInputs = [ eventlog pkgconfig glib python systemd perl ]; @@ -16,9 +18,10 @@ stdenv.mkDerivation { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - meta = { + meta = with stdenv.lib; { homepage = "http://www.balabit.com/network-security/syslog-ng/"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = [ maintainers.rickynils ]; }; } diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix new file mode 100644 index 000000000000..be49ba509200 --- /dev/null +++ b/pkgs/tools/text/peco/default.nix @@ -0,0 +1,63 @@ +{ stdenv, go, fetchgit }: + +let + go-flags = fetchgit { + url = "git://github.com/jessevdk/go-flags"; + rev = "4f0ca1e2d1349e9662b633ea1b8b8d48e8a32533"; + sha256 = "5f22f4c5a0529ff0da8e507462ad910bb73c513fde49d58dd4baf7332787ca3d"; + }; + go-runewidth = fetchgit { + url = "git://github.com/mattn/go-runewidth"; + rev = "36f63b8223e701c16f36010094fb6e84ffbaf8e0"; + sha256 = "718e9e04659441744b8d43bd3d7e806836194cf322962712a6e019311d407ecf"; + }; + termbox-go = fetchgit { + url = "git://github.com/nsf/termbox-go"; + rev = "4e63c3a917c197694cb4fef6c55582500b3741e3"; + sha256 = "00ecc0dcf0919a42ea06fe3bd93480a17241160c434ff3872b6f5e418eb18069"; + }; +in stdenv.mkDerivation rec { + name = "peco-${version}"; + version = "0.2.3"; + + src = fetchgit { + url = "git://github.com/peco/peco"; + rev = "b8e0c8f37d3eed68e64c931b0edb77728f3723f9"; + sha256 = "f178e01ab0536770b17eddcefd863e68c2d65b527b5da1fc3fb9efb19c12635f"; + }; + + buildInputs = [ go ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir -p src/github.com/jessevdk/go-flags/ + ln -s ${go-flags}/* src/github.com/jessevdk/go-flags + + mkdir -p src/github.com/mattn/go-runewidth/ + ln -s ${go-runewidth}/* src/github.com/mattn/go-runewidth + + mkdir -p src/github.com/nsf/termbox-go/ + ln -s ${termbox-go}/* src/github.com/nsf/termbox-go + + mkdir -p src/github.com/peco/peco + ln -s ${src}/* src/github.com/peco/peco + + export GOPATH=$PWD + go build -v -o peco src/github.com/peco/peco/cmd/peco/peco.go + ''; # */ + + installPhase = '' + ensureDir $out/bin + cp peco $out/bin + ''; + + meta = with stdenv.lib; { + description = "Simplistic interactive filtering tool"; + homepage = https://github.com/peco/peco; + license = licenses.mit; + # peco should work on Windows or other POSIX platforms, but the go package + # declares only linux and darwin. + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 1f04229c2c82..cbe53326339a 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation rec { - name = "ec2-ami-tools-1.4.0.9"; + name = "ec2-ami-tools-${version}"; + + version = "1.5.3"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.zip"; - sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq"; + url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip"; + sha256 = "0n184nxc57alg25h5bslg0cs1z854sf7f52a820ihxxknrq2dy6i"; }; # Amazon EC2 requires that disk images are writable. If they're diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ca773f98013..6af488d5217e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,6 +569,8 @@ let bfr = callPackage ../tools/misc/bfr { }; + bindfs = callPackage ../tools/filesystems/bindfs { }; + bitbucket-cli = pythonPackages.bitbucket-cli; blockdiag = pythonPackages.blockdiag; @@ -992,7 +994,11 @@ let fabric = pythonPackages.fabric; - fail2ban = callPackage ../tools/security/fail2ban { }; + fail2ban = callPackage ../tools/security/fail2ban { + systemd = systemd.override { + pythonSupport = true; + }; + }; fakeroot = callPackage ../tools/system/fakeroot { }; @@ -1815,6 +1821,8 @@ let pdnsd = callPackage ../tools/networking/pdnsd { }; + peco = callPackage ../tools/text/peco { }; + pg_top = callPackage ../tools/misc/pg_top { }; pdsh = callPackage ../tools/networking/pdsh { @@ -2348,6 +2356,8 @@ let xarchiver = callPackage ../tools/archivers/xarchiver { }; + xcruiser = callPackage ../applications/misc/xcruiser { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; @@ -3302,7 +3312,7 @@ let sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl { - clisp = clisp_2_44_1; + clisp = clisp; }; scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; @@ -3705,6 +3715,8 @@ let guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; + pharo-vm = callPackage_i686 ../development/pharo/vm { }; + srecord = callPackage ../development/tools/misc/srecord { }; windowssdk = ( @@ -3974,7 +3986,9 @@ let inotifyTools = callPackage ../development/tools/misc/inotify-tools { }; - intelgen4asm = callPackage ../development/misc/intelgen4asm { }; + intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { + inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr; + }; ired = callPackage ../development/tools/analysis/radare/ired.nix { }; @@ -5183,6 +5197,8 @@ let libgdiplus = callPackage ../development/libraries/libgdiplus { }; + libgksu = callPackage ../development/libraries/libgksu { }; + libgpgerror = callPackage ../development/libraries/libgpg-error { }; libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; @@ -6973,6 +6989,8 @@ let axis2 = callPackage ../servers/http/tomcat/axis2 { }; + unifi = callPackage ../servers/unifi { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; @@ -8569,6 +8587,8 @@ let geany = callPackage ../applications/editors/geany { }; + gksu = callPackage ../applications/misc/gksu { }; + gnuradio = callPackage ../applications/misc/gnuradio { inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl; fftw = fftwFloat; @@ -8685,6 +8705,8 @@ let fuze = callPackage ../applications/networking/instant-messengers/fuze {}; + gcolor2 = callPackage ../applications/graphics/gcolor2 { }; + get_iplayer = callPackage ../applications/misc/get_iplayer {}; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { @@ -8735,7 +8757,8 @@ let libart = gnome2.libart_lgpl; }; # latest version: gnome3.goffice - ideas = recurseIntoAttrs (callPackage ../applications/editors/idea { }); + ideas = recurseIntoAttrs ( (callPackage ../applications/editors/idea { }) + // (callPackage ../applications/editors/idea/pycharm.nix { })); libquvi = callPackage ../applications/video/quvi/library.nix { }; @@ -10121,6 +10144,8 @@ let libsigcxx = libsigcxx12; }; + astromenace = callPackage ../games/astromenace { }; + atanks = callPackage ../games/atanks {}; ballAndPaddle = callPackage ../games/ball-and-paddle { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 91ba32a239e8..ee889e5d079a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -200,8 +200,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; - attoparsec_0_12_1_0 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.0.nix {}; - attoparsec = self.attoparsec_0_12_1_0; + attoparsec_0_12_1_1 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.1.nix {}; + attoparsec = self.attoparsec_0_12_1_1; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; @@ -209,6 +209,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec-enumerator {}; + autoUpdate = callPackage ../development/libraries/haskell/auto-update {}; + aws = callPackage ../development/libraries/haskell/aws {}; authenticate = callPackage ../development/libraries/haskell/authenticate {}; @@ -572,6 +574,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dataenc = callPackage ../development/libraries/haskell/dataenc {}; + dataFin = callPackage ../development/libraries/haskell/data-fin {}; + dataFix = callPackage ../development/libraries/haskell/data-fix {}; dataHash = callPackage ../development/libraries/haskell/data-hash {}; @@ -678,6 +682,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in doctestProp = callPackage ../development/libraries/haskell/doctest-prop {}; + domSelector = callPackage ../development/libraries/haskell/dom-selector {}; + dotgen = callPackage ../development/libraries/haskell/dotgen {}; doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; @@ -862,6 +868,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {}; + genericsSop = callPackage ../development/libraries/haskell/generics-sop {}; + ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; @@ -1852,6 +1860,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {}; + preludeSafeenum = callPackage ../development/libraries/haskell/prelude-safeenum {}; + preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {}; preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {}; preprocessorTools = self.preprocessorTools_1_0_1; @@ -2139,6 +2149,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in socketIo = callPackage ../development/libraries/haskell/socket-io {}; + sodium = callPackage ../development/libraries/haskell/sodium {}; + sparse = callPackage ../development/libraries/haskell/sparse {}; spawn = callPackage ../development/libraries/haskell/spawn {}; @@ -2614,6 +2626,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in webdriver = callPackage ../development/libraries/haskell/webdriver {}; + webkit = callPackage ../development/libraries/haskell/webkit { + webkit = pkgs.webkitgtk2; + }; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; @@ -2693,6 +2709,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; + xorshift = callPackage ../development/libraries/haskell/xorshift {}; + xournalParser = callPackage ../development/libraries/haskell/xournal-parser {}; xournalTypes = callPackage ../development/libraries/haskell/xournal-types {}; @@ -2765,17 +2783,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. - Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {}; - Agda_2_4_0_2 = callPackage ../development/compilers/agda/2.4.0.2.nix {}; - Agda = self.Agda_2_4_0_2; - - AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { - Agda = self.Agda_2_3_2_2; - }; - AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { - Agda = self.Agda_2_4_0_2; - }; - AgdaStdlib = self.AgdaStdlib_0_8; + Agda = callPackage ../development/compilers/agda {}; + AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {}; uhc = callPackage ../development/compilers/uhc {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59da67e5294e..b37ce6581cd3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5054,7 +5054,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "The World-Wide Web library for Perl"; license = "perl"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31f0875b5f27..2bf34a0623be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -895,11 +895,11 @@ rec { boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.9.9"; + version = "2.32.0"; src = fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "18wqpzd1zf8nivcn2rl1wnladf7hhyy5p75b5l6kafynm4l9j6jq"; + sha256 = "0bl5y7m0m84rz4q7hx783kxpj1n9wcm7dhv54bnx8cnanyd13cxn"; }; # The tests seem to require AWS credentials. @@ -4256,11 +4256,11 @@ rec { meld3 = buildPythonPackage rec { - name = "meld3-0.6.10"; + name = "meld3-1.0.0"; src = fetchurl { - url = https://pypi.python.org/packages/source/m/meld3/meld3-0.6.10.tar.gz; - md5 = "42e58624e9d427be7659d7a28e2b0b6f"; + url = https://pypi.python.org/packages/source/m/meld3/meld3-1.0.0.tar.gz; + md5 = "ca270506dd4ecb20ae26fa72fbd9b0be"; }; doCheck = false; @@ -4268,7 +4268,7 @@ rec { meta = { description = "An HTML/XML templating engine used by supervisor"; homepage = https://github.com/supervisor/meld3; - license = "ZPL"; + license = "free-non-copyleft"; }; }; @@ -6720,12 +6720,12 @@ rec { robotframework = buildPythonPackage rec { - version = "2.8.4"; + version = "2.8.5"; name = "robotframework-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz"; - sha256 = "0rxk135c1051cwv45219ib3faqvi5rl50l98ncb83c7qxy92jg2n"; + sha256 = "0rzdn2gvmcrxs2fvxm11h55w4j5pv0lf443fc4hl8kzwjwgjckga"; }; # error: invalid command 'test' @@ -7184,6 +7184,8 @@ rec { buildInputs = [ pbr pip ]; + propagatedBuildInputs = [ setuptools ]; + meta = { description = "Manage dynamic plugins for Python applications"; homepage = "https://pypi.python.org/pypi/stevedore";