diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index b7178fb7d71..c6d77529dd4 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -91,4 +91,7 @@ foreach my $file (@{$data->{list}->{attrs}}) { my $sha256 = hashFile("sha256", 0, $storePath) or die; symlink("../$fn", "$tarballsCache/sha256/$sha256"); + + $sha256 = hashFile("sha256", 1, $storePath) or die; + symlink("../$fn", "$tarballsCache/sha256/$sha256"); } diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl index 358c29e515f..8ad0d67f68c 100644 --- a/nixos/lib/test-driver/test-driver.pl +++ b/nixos/lib/test-driver/test-driver.pl @@ -52,12 +52,12 @@ sub createMachine { my ($args) = @_; my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"}); $vms{$vm->name} = $vm; + $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; "; return $vm; } foreach my $vmScript (@ARGV) { my $vm = createMachine({startCommand => $vmScript}); - $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; "; } diff --git a/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix b/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix new file mode 100644 index 00000000000..d0c7f3a6a6c --- /dev/null +++ b/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ...}: +{ + imports = [ ./amazon-base-config.nix ]; + ec2.hvm = true; +} diff --git a/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix b/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix new file mode 100644 index 00000000000..d9feba164a7 --- /dev/null +++ b/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix @@ -0,0 +1,33 @@ +{ config, pkgs, lib, ...}: +let + cloudUtils = pkgs.fetchurl { + url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz"; + sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd"; + }; + growpart = pkgs.stdenv.mkDerivation { + name = "growpart"; + src = cloudUtils; + buildPhase = '' + cp bin/growpart $out + sed -i 's|awk|gawk|' $out + sed -i 's|sed|gnused|' $out + ''; + dontInstall = true; + dontPatchShebangs = true; + }; +in +{ + imports = [ ./amazon-base-config.nix ]; + ec2.hvm = true; + boot.loader.grub.device = lib.mkOverride 0 "nodev"; + + boot.initrd.extraUtilsCommands = '' + cp -v ${pkgs.gawk}/bin/gawk $out/bin/gawk + cp -v ${pkgs.gnused}/bin/sed $out/bin/gnused + cp -v ${pkgs.utillinux}/sbin/sfdisk $out/bin/sfdisk + cp -v ${growpart} $out/bin/growpart + ''; + boot.initrd.postDeviceCommands = '' + [ -e /dev/xvda ] && [ -e /dev/xvda1 ] && TMPDIR=/run sh $(type -P growpart) /dev/xvda 1 + ''; +} diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 4e1aea65980..14607b9a367 100755 --- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py +++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py @@ -18,7 +18,7 @@ parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM i parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob") args = parser.parse_args() -instance_type = "m3.xlarge" if args.hvm else "m1.small" +instance_type = "m3.medium" if args.hvm else "m1.small" ebs_size = 8 if args.hvm else 20 @@ -52,7 +52,6 @@ depl.deploy(allow_reboot=True) m = depl.machines['machine'] - # Do the installation. device="/dev/xvdg" if args.hvm: @@ -66,24 +65,27 @@ m.run_command("mkdir -p /mnt") m.run_command("mount {0} /mnt".format(device)) m.run_command("touch /mnt/.ebs") m.run_command("mkdir -p /mnt/etc/nixos") + m.run_command("nix-channel --add http://nixos.org/channels/nixos-{} nixos".format(args.channel)) m.run_command("nix-channel --update") -m.run_command("nixos-rebuild switch") -version = m.run_command("nixos-version", capture_stdout=True).split(' ')[0] + +version = m.run_command("nix-instantiate --eval-only -A lib.nixpkgsVersion ''", capture_stdout=True).split(' ')[0].replace('"','').strip() print >> sys.stderr, "NixOS version is {0}".format(version) -m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix") -m.run_command("nixos-install") if args.hvm: + m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/amazon-base-config.nix") + m.upload_file("./amazon-hvm-config.nix", "/mnt/etc/nixos/configuration.nix") + m.upload_file("./amazon-hvm-install-config.nix", "/mnt/etc/nixos/amazon-hvm-install-config.nix") + m.run_command("NIXOS_CONFIG=/etc/nixos/amazon-hvm-install-config.nix nixos-install") m.run_command('nix-env -iA nixos.pkgs.grub') m.run_command('cp /nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub') - m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst') m.run_command('echo "(hd1) /dev/xvdg" > device.map') m.run_command('echo -e "root (hd1,0)\nsetup (hd1)" | grub --device-map=device.map --batch') - +else: + m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix") + m.run_command("nixos-install") m.run_command("umount /mnt") - if args.hvm: ami_name = "nixos-{0}-x86_64-ebs-hvm".format(version) description = "NixOS {0} (x86_64; EBS root; hvm)".format(version) diff --git a/nixos/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix index 43dbd86f675..37795d5d5b4 100644 --- a/nixos/maintainers/scripts/ec2/ebs-creator.nix +++ b/nixos/maintainers/scripts/ec2/ebs-creator.nix @@ -4,10 +4,11 @@ machine = { config, pkgs, resources, ... }: { deployment.targetEnv = "ec2"; - deployment.ec2.instanceType = "m1.large"; + deployment.ec2.instanceType = "c3.large"; deployment.ec2.securityGroups = [ "admin" ]; deployment.ec2.ebsBoot = false; deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name; + deployment.ec2.zone = "us-east-1e"; environment.systemPackages = [ pkgs.parted ]; }; } diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index ac804bef7fe..49b1e1d42a3 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -10,6 +10,7 @@ with lib; # TODO: find another name for it. fonts = mkOption { + type = types.listOf types.path; example = [ pkgs.dejavu_fonts ]; description = "List of primary font paths."; apply = list: list ++ diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index 88aa7866c2b..65703d8bb08 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -2,6 +2,12 @@ with lib; +let + + tzdir = "${pkgs.tzdata}/share/zoneinfo"; + +in + { options = { @@ -26,8 +32,10 @@ with lib; environment.variables.TZDIR = "/etc/zoneinfo"; + systemd.globalEnvironment.TZDIR = tzdir; + environment.etc.localtime = - { source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}"; + { source = "${tzdir}/${config.time.timeZone}"; mode = "direct-symlink"; }; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index a120a01041b..eb7c4026857 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -39,6 +39,9 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; - # Get a console as soon as the initrd loads fbcon on EFI boot + # Get a console as soon as the initrd loads fbcon on EFI boot. boot.initrd.kernelModules = [ "fbcon" ]; + + # Allow the user to log in as root without a password. + security.initialRootPassword = ""; } diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 00f5fae8434..28c42d64f6f 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -67,7 +67,7 @@ let ${config.boot.kernelPackages.kernel}/bzImage ::boot/bzImage mcopy -v -i "$out" \ ${config.system.build.initialRamdisk}/initrd ::boot/initrd - ''; + ''; # */ targetArch = if pkgs.stdenv.isi686 then "ia32" @@ -177,39 +177,45 @@ in # recognise that. boot.kernelParams = [ "root=LABEL=${config.isoImage.volumeID}" ]; - # Note that /dev/root is a symlink to the actual root device - # specified on the kernel command line, created in the stage 1 init - # script. - fileSystems."/".device = "/dev/root"; + fileSystems."/" = + { fsType = "tmpfs"; + device = "none"; + options = "mode=0755"; + }; - fileSystems."/nix/store" = + # Note that /dev/root is a symlink to the actual root device + # specified on the kernel command line, created in the stage 1 + # init script. + fileSystems."/iso" = + { device = "/dev/root"; + neededForBoot = true; + noCheck = true; + }; + + fileSystems."/nix/.ro-store" = { fsType = "squashfs"; - device = "/nix-store.squashfs"; + device = "/iso/nix-store.squashfs"; options = "loop"; + neededForBoot = true; + }; + + fileSystems."/nix/.rw-store" = + { fsType = "tmpfs"; + device = "none"; + options = "mode=0755"; + neededForBoot = true; }; boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ]; boot.initrd.kernelModules = [ "loop" ]; - # In stage 1, mount a tmpfs on top of / (the ISO image) and - # /nix/store (the squashfs image) to make this a live CD. + # In stage 1, mount a tmpfs on top of /nix/store (the squashfs + # image) to make this a live CD. boot.initrd.postMountCommands = '' - mkdir -p /unionfs-chroot/ro-root - mount --rbind $targetRoot /unionfs-chroot/ro-root - - mkdir /unionfs-chroot/rw-root - mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-root - mkdir /mnt-root-union - unionfs -o allow_other,cow,chroot=/unionfs-chroot,max_files=32768 /rw-root=RW:/ro-root=RO /mnt-root-union - oldTargetRoot=$targetRoot - targetRoot=/mnt-root-union - - mkdir /unionfs-chroot/rw-store - mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store - mkdir -p $oldTargetRoot/nix/store - unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store + mkdir -p $targetRoot/nix/store + unionfs -o allow_other,cow,nonempty,chroot=$targetRoot,max_files=32768 /nix/.rw-store=RW:/nix/.ro-store=RO $targetRoot/nix/store ''; # Closures to be copied to the Nix store on the CD, namely the init @@ -253,10 +259,6 @@ in { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } - { # Quick hack: need a mount point for the store. - source = pkgs.runCommand "empty" {} "mkdir -p $out"; - target = "/nix/store"; - } ] ++ optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 3311e4c8e9a..9d62ba131dc 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -80,7 +80,8 @@ mount -t tmpfs -o "mode=0755" none $mountPoint/run mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers rm -rf $mountPoint/var/run ln -s /run $mountPoint/var/run -cp -f /etc/resolv.conf $mountPoint/etc/resolv.conf +rm -f $mountPoint/etc/{resolv.conf,hosts} +cp -f /etc/resolv.conf /etc/hosts $mountPoint/etc/ if [ -n "$runChroot" ]; then diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ab0b263c4b8..b80ecce90ce 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -121,7 +121,6 @@ ./services/hardware/pommed.nix ./services/hardware/sane.nix ./services/hardware/udev.nix - ./services/hardware/udisks.nix ./services/hardware/udisks2.nix ./services/hardware/upower.nix ./services/hardware/thinkfan.nix diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 8fbeeb9ba61..f4af04247fe 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -7,7 +7,10 @@ let customGrsecPkg = (import ../../../pkgs/build-support/grsecurity - { grsecOptions = cfg; } + { + inherit lib pkgs; + grsecOptions = cfg; + } ).grsecPackage; in { diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 9a70d9edfa7..653c0ed5d70 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -7,8 +7,6 @@ let inherit (pkgs) alsaUtils; - soundState = "/var/lib/alsa/asound.state"; - in { @@ -35,6 +33,17 @@ in ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + defaults.pcm.!card 3 + ''; + description = '' + Set addition configuration for system-wide alsa. + ''; + }; + }; }; @@ -46,6 +55,13 @@ in environment.systemPackages = [ alsaUtils ]; + environment.etc = mkIf (config.sound.extraConfig != "") + [ + { source = pkgs.writeText "asound.conf" config.sound.extraConfig; + target = "asound.conf"; + } + ]; + # ALSA provides a udev rule for restoring volume settings. services.udev.packages = [ alsaUtils ]; diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index a49b5b47768..a8f8da0eed5 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -4,6 +4,9 @@ with lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -30,9 +33,9 @@ with lib; config = mkIf config.services.gnome3.evolution-data-server.enable { - environment.systemPackages = [ pkgs.evolution_data_server ]; + environment.systemPackages = [ gnome3.evolution_data_server ]; - services.dbus.packages = [ pkgs.evolution_data_server ]; + services.dbus.packages = [ gnome3.evolution_data_server ]; }; diff --git a/nixos/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix deleted file mode 100644 index c9d11bcfc68..00000000000 --- a/nixos/modules/services/hardware/udisks.nix +++ /dev/null @@ -1,45 +0,0 @@ -# Udisks daemon. - -{ config, lib, pkgs, ... }: - -with lib; - -{ - - ###### interface - - options = { - - services.udisks = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Udisks, a DBus service that allows - applications to query and manipulate storage devices. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.udisks.enable { - - environment.systemPackages = [ pkgs.udisks ]; - - services.dbus.packages = [ pkgs.udisks ]; - - system.activationScripts.udisks = - '' - mkdir -m 0755 -p /var/lib/udisks - ''; - - services.udev.packages = [ pkgs.udisks ]; - }; - -} diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 5cdecd1eb57..02db4a7a5b2 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -125,13 +125,17 @@ in #include #include - ${pkgs.glibc}/lib/*.so mr, - ${pkgs.libevent}/lib/libevent*.so* mr, - ${pkgs.curl}/lib/libcurl*.so* mr, - ${pkgs.openssl}/lib/libssl*.so* mr, - ${pkgs.openssl}/lib/libcrypto*.so* mr, - ${pkgs.zlib}/lib/libz*.so* mr, - ${pkgs.libssh2}/lib/libssh2*.so* mr, + ${pkgs.glibc}/lib/*.so mr, + ${pkgs.libevent}/lib/libevent*.so* mr, + ${pkgs.curl}/lib/libcurl*.so* mr, + ${pkgs.openssl}/lib/libssl*.so* mr, + ${pkgs.openssl}/lib/libcrypto*.so* mr, + ${pkgs.zlib}/lib/libz*.so* mr, + ${pkgs.libssh2}/lib/libssh2*.so* mr, + ${pkgs.systemd}/lib/libsystemd*.so* mr, + ${pkgs.xz}/lib/liblzma*.so* mr, + ${pkgs.libgcrypt}/lib/libgcrypt*.so* mr, + ${pkgs.libgpgerror}/lib/libgpg-error*.so* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 4398a97ff47..74d9fee2357 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -101,13 +101,14 @@ in { }; environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" - "${pkgs.glib_networking}/lib/gio/modules" ]; + "${gnome3.glib_networking}/lib/gio/modules" ]; environment.systemPackages = [ pkgs.desktop_file_utils - pkgs.glib_networking - pkgs.gtk3 # for gtk-update-icon-cache + gnome3.glib_networking + gnome3.gtk3 # for gtk-update-icon-cache pkgs.ibus pkgs.shared_mime_info # for update-mime-database + gnome3.gvfs gnome3.dconf gnome3.gnome-backgrounds gnome3.gnome_control_center diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index dc3aa9d15cc..5f3e8003b45 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -169,7 +169,7 @@ in videoDrivers = mkOption { type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. - default = [ "ati" "cirrus" "intel" "vesa" "vmware" ]; + default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; example = [ "vesa" ]; description = '' The names of the video drivers the configuration diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index fe5935c2ffa..b1bad956b4b 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -127,11 +127,6 @@ in mkdir -m 0555 -p /var/empty ''; - system.activationScripts.media = - '' - mkdir -m 0755 -p /media - ''; - system.activationScripts.usrbinenv = '' mkdir -m 0755 -p /usr/bin diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index c4a21b02cac..15586e68e7e 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -58,6 +58,7 @@ echo mkdir -p /etc touch /etc/fstab # to shut up mount touch /etc/mtab # to shut up mke2fs +touch /etc/initrd-release mkdir -p /proc mount -t proc none /proc mkdir -p /sys @@ -345,8 +346,8 @@ exec 3>&- udevadm control --exit || true # Kill any remaining processes, just to be sure we're not taking any -# with us into stage 2. unionfs-fuse mounts require the unionfs process. -pkill -9 -v '(1|unionfs)' +# with us into stage 2. But keep storage daemons like unionfs-fuse. +pkill -9 -v -f '@' if test -n "$debug1mounts"; then fail; fi diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index c38d33c45d6..b6249b6c091 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -344,5 +344,8 @@ in (isYes "BLK_DEV_INITRD") ]; + # Prevent systemd from waiting for the /dev/root symlink. + systemd.units."dev-root.device".text = ""; + }; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 138047a07db..9e64327c3ab 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -1,164 +1,183 @@ { config, lib, pkgs, ... }: with lib; - +let + cfg = config.ec2; +in { imports = [ ../profiles/headless.nix ./ec2-data.nix ]; - system.build.amazonImage = - pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "amazon-image" - { preVM = - '' - mkdir $out - diskImage=$out/nixos.img - ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G" - mv closure xchg/ - ''; - buildInputs = [ pkgs.utillinux pkgs.perl ]; - exportReferencesGraph = - [ "closure" config.system.build.toplevel ]; - } - '' - # Create an empty filesystem and mount it. - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda - ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda - mkdir /mnt - mount /dev/vda /mnt + options = { + ec2 = { + hvm = mkOption { + default = false; + description = '' + Whether the EC2 instance is a HVM instance. + ''; + }; + }; + }; - # The initrd expects these directories to exist. - mkdir /mnt/dev /mnt/proc /mnt/sys + config = { + system.build.amazonImage = + pkgs.vmTools.runInLinuxVM ( + pkgs.runCommand "amazon-image" + { preVM = + '' + mkdir $out + diskImage=$out/nixos.img + ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G" + mv closure xchg/ + ''; + buildInputs = [ pkgs.utillinux pkgs.perl ]; + exportReferencesGraph = + [ "closure" config.system.build.toplevel ]; + } + '' + # Create an empty filesystem and mount it. + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda + mkdir /mnt + mount /dev/vda /mnt - mount -o bind /proc /mnt/proc + # The initrd expects these directories to exist. + mkdir /mnt/dev /mnt/proc /mnt/sys - # Copy all paths in the closure to the filesystem. - storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) + mount -o bind /proc /mnt/proc - mkdir -p /mnt/nix/store - echo "copying everything (will take a while)..." - cp -prd $storePaths /mnt/nix/store/ + # Copy all paths in the closure to the filesystem. + storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) - # 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 + mkdir -p /mnt/nix/store + echo "copying everything (will take a while)..." + cp -prd $storePaths /mnt/nix/store/ - # 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} + # 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 - # `nixos-rebuild' requires an /etc/NIXOS. - mkdir -p /mnt/etc - touch /mnt/etc/NIXOS + # 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} - # `switch-to-configuration' requires a /bin/sh - mkdir -p /mnt/bin - ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh + # `nixos-rebuild' requires an /etc/NIXOS. + mkdir -p /mnt/etc + touch /mnt/etc/NIXOS - # Install a configuration.nix. - mkdir -p /mnt/etc/nixos - cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix + # `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. - chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot + # Install a configuration.nix. + mkdir -p /mnt/etc/nixos + cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix - umount /mnt/proc - umount /mnt - '' - ); + # Generate the GRUB menu. + chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot - fileSystems."/".device = "/dev/disk/by-label/nixos"; + umount /mnt/proc + umount /mnt + '' + ); - boot.initrd.kernelModules = [ "xen-blkfront" ]; - boot.kernelModules = [ "xen-netfront" ]; - boot.kernelParams = [ "console=ttyS0" ]; + fileSystems."/".device = "/dev/disk/by-label/nixos"; - # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. - boot.loader.grub.version = 1; - boot.loader.grub.device = "nodev"; - boot.loader.grub.timeout = 0; - boot.loader.grub.extraPerEntryConfig = "root (hd0)"; + boot.initrd.kernelModules = [ "xen-blkfront" ]; + boot.kernelModules = [ "xen-netfront" ]; - boot.initrd.postDeviceCommands = - '' - # Force udev to exit to prevent random "Device or resource busy - # while trying to open /dev/xvda" errors from fsck. - udevadm control --exit || true - kill -9 -1 - ''; + # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. + boot.loader.grub.version = 1; + boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev"; + boot.loader.grub.timeout = 0; + boot.loader.grub.extraPerEntryConfig = "root (hd0${lib.optionalString cfg.hvm ",0"})"; - # Mount all formatted ephemeral disks and activate all swap devices. - # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options - # because the set of devices is dependent on the instance type - # (e.g. "m1.large" has one ephemeral filesystem and one swap device, - # while "m1.large" has two ephemeral filesystems and no swap - # devices). Also, put /tmp and /var on /disk0, since it has a lot - # more space than the root device. Similarly, "move" /nix to /disk0 - # by layering a unionfs-fuse mount on top of it so we have a lot more space for - # Nix operations. - boot.initrd.postMountCommands = - '' - diskNr=0 - diskForUnionfs= - for device in /dev/xvd[abcde]*; do - if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi - fsType=$(blkid -o value -s TYPE "$device" || true) - if [ "$fsType" = swap ]; then - echo "activating swap device $device..." - swapon "$device" || true - elif [ "$fsType" = ext3 ]; then - mp="/disk$diskNr" - diskNr=$((diskNr + 1)) - echo "mounting $device on $mp..." - if mountFS "$device" "$mp" "" ext3; then - if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi - fi - else - echo "skipping unknown device type $device" - fi - done + boot.initrd.postDeviceCommands = + '' + # Force udev to exit to prevent random "Device or resource busy + # while trying to open /dev/xvda" errors from fsck. + udevadm control --exit || true + kill -9 -1 + ''; - if [ -n "$diskForUnionfs" ]; then - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root + # Mount all formatted ephemeral disks and activate all swap devices. + # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options + # because the set of devices is dependent on the instance type + # (e.g. "m1.large" has one ephemeral filesystem and one swap device, + # while "m1.large" has two ephemeral filesystems and no swap + # devices). Also, put /tmp and /var on /disk0, since it has a lot + # more space than the root device. Similarly, "move" /nix to /disk0 + # by layering a unionfs-fuse mount on top of it so we have a lot more space for + # Nix operations. + boot.initrd.postMountCommands = + '' + diskNr=0 + diskForUnionfs= + for device in /dev/xvd[abcde]*; do + if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi + fsType=$(blkid -o value -s TYPE "$device" || true) + if [ "$fsType" = swap ]; then + echo "activating swap device $device..." + swapon "$device" || true + elif [ "$fsType" = ext3 ]; then + mp="/disk$diskNr" + diskNr=$((diskNr + 1)) + echo "mounting $device on $mp..." + if mountFS "$device" "$mp" "" ext3; then + if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi + fi + else + echo "skipping unknown device type $device" + fi + done - mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp - mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp + if [ -n "$diskForUnionfs" ]; then + mkdir -m 755 -p $targetRoot/$diskForUnionfs/root - if [ ! -e $targetRoot/.ebs ]; then - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var - mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var + mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp + mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp - mkdir -p /unionfs-chroot/ro-nix - mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix + if [ ! -e $targetRoot/.ebs ]; then + mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var + mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/nix - mkdir -p /unionfs-chroot/rw-nix - mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix + mkdir -p /unionfs-chroot/ro-nix + mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix - unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix - fi - fi - ''; + mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/nix + mkdir -p /unionfs-chroot/rw-nix + mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix - boot.initrd.extraUtilsCommands = - '' - # We need swapon in the initrd. - cp ${pkgs.utillinux}/sbin/swapon $out/bin - ''; + unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix + fi + fi + ''; - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; + boot.initrd.extraUtilsCommands = + '' + # We need swapon in the initrd. + cp ${pkgs.utillinux}/sbin/swapon $out/bin + ''; - # Allow root logins only using the SSH key that the user specified - # at instance creation time. - services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; + # Don't put old configurations in the GRUB menu. The user has no + # way to select them anyway. + boot.loader.grub.configurationLimit = 0; - # Force getting the hostname from EC2. - networking.hostName = mkDefault ""; + # Allow root logins only using the SSH key that the user specified + # at instance creation time. + services.openssh.enable = true; + services.openssh.permitRootLogin = "without-password"; - # Always include cryptsetup so that Charon can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; + # Force getting the hostname from EC2. + networking.hostName = mkDefault ""; - boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; + # Always include cryptsetup so that Charon can use it. + environment.systemPackages = [ pkgs.cryptsetup ]; + + boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; + + # Prevent logging in as root without a password. This doesn't really matter, + # since the only PAM services that allow logging in with a null + # password are local ones that are inaccessible on EC2 machines. + security.initialRootPassword = mkDefault "!"; + }; } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 323f1bfc57e..bccf6583e47 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -65,7 +65,7 @@ let ${if cfg.useBootLoader then '' -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ -drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \ - -boot menu=on + -boot menu=on \ '' else '' -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 090d8400f1c..f59f71b0d6f 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -62,7 +62,6 @@ in rec { (all nixos.tests.printing) (all nixos.tests.proxy) (all nixos.tests.simple) - (all nixos.tests.udisks) (all nixos.tests.udisks2) (all nixos.tests.xfce) diff --git a/nixos/release.nix b/nixos/release.nix index 30f87aaa4f2..06749966cbb 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -241,7 +241,6 @@ in rec { tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.simple = callTest tests/simple.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; - tests.udisks = callTest tests/udisks.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; tests.xfce = callTest tests/xfce.nix {}; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 9149b1bff02..1c3fb148410 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -129,9 +129,10 @@ let #$machine->waitForUnit('getty@tty2'); $machine->waitForUnit("rogue"); $machine->waitForUnit("nixos-manual"); - $machine->waitForUnit("dhcpcd"); ${optionalString testChannel '' + $machine->waitForUnit("dhcpcd"); + # Allow the machine to talk to the fake nixos.org. $machine->succeed( "rm /etc/hosts", @@ -161,10 +162,10 @@ let "/mnt/etc/nixos/configuration.nix"); # Perform the installation. - $machine->succeed("nixos-install >&2"); + $machine->succeed("nixos-install < /dev/null >&2"); # Do it again to make sure it's idempotent. - $machine->succeed("nixos-install >&2"); + $machine->succeed("nixos-install < /dev/null >&2"); $machine->succeed("umount /mnt/boot || true"); $machine->succeed("umount /mnt"); @@ -173,7 +174,7 @@ let $machine->shutdown; # Now see if we can boot the installation. - my $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); # Did /boot get mounted? $machine->waitForUnit("local-fs.target"); @@ -205,7 +206,7 @@ let # And just to be sure, check that the machine still boots after # "nixos-rebuild switch". - my $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); $machine->waitForUnit("network.target"); $machine->shutdown; ''; diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 8896830b0c2..68ab8b642b0 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -28,7 +28,9 @@ in $client1->execute("mumble mumble://client1\@server/test &"); $client2->execute("mumble mumble://client2\@server/test &"); - $server->sleep(10); # Wait for Mumble UI to pop up + $client1->waitForWindow(qr/Mumble/); + $client2->waitForWindow(qr/Mumble/); + $server->sleep(3); # Wait some more for the Mumble UI # cancel client audio configuration $client1->sendKeys("esc"); diff --git a/nixos/tests/udisks.nix b/nixos/tests/udisks.nix deleted file mode 100644 index b7f2e2c0031..00000000000 --- a/nixos/tests/udisks.nix +++ /dev/null @@ -1,56 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: - -let - - stick = pkgs.fetchurl { - url = http://nixos.org/~eelco/nix/udisks-test.img.xz; - sha256 = "0was1xgjkjad91nipzclaz5biv3m4b2nk029ga6nk7iklwi19l8b"; - }; - -in - -{ - - machine = - { config, pkgs, ... }: - { services.udisks.enable = true; - imports = [ ./common/user-account.nix ]; - - security.polkit.extraConfig = - '' - polkit.addRule(function(action, subject) { - if (subject.user == "alice") return "yes"; - }); - ''; - }; - - testScript = - '' - my $stick = $machine->stateDir . "/usbstick.img"; - system("xz -d < ${stick} > $stick") == 0 or die; - - $machine->succeed("udisks --enumerate | grep /org/freedesktop/UDisks/devices/vda"); - $machine->fail("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1"); - - # Attach a USB stick and wait for it to show up. - $machine->sendMonitorCommand("usb_add disk:$stick"); - $machine->waitUntilSucceeds("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1"); - $machine->succeed("udisks --show-info /dev/sda1 | grep 'label:.*USBSTICK'"); - - # Mount the stick as a non-root user and do some stuff with it. - $machine->succeed("su - alice -c 'udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1'"); - $machine->succeed("su - alice -c 'udisks --mount /dev/sda1'"); - $machine->succeed("su - alice -c 'cat /media/USBSTICK/test.txt'") =~ /Hello World/ or die; - $machine->succeed("su - alice -c 'echo foo > /media/USBSTICK/bar.txt'"); - - # Unmounting the stick should make the mountpoint disappear. - $machine->succeed("su - alice -c 'udisks --unmount /dev/sda1'"); - $machine->fail("[ -d /media/USBSTICK ]"); - - # Remove the USB stick. - $machine->sendMonitorCommand("usb_del 0.3"); # FIXME - $machine->waitUntilFails("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1"); - $machine->fail("[ -e /dev/sda ]"); - ''; - -}) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 4315a5a7547..88bc7399c65 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -6,7 +6,7 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - tag = "3.5.357"; + tag = "3.5.380"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; rev = "refs/tags/${tag}"; - sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42"; + sha256 = "dbcbb2d9143e196d079c27b15266e47d24b81cb7591fe64b717f3485965ded7b"; }; buildInputs = @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { patchPhase = '' # The funny revision number is from `git describe rev` - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-g2f6065b\"; }\n' > libs/ardour/revision.cc # Note the different version number - sed -i '33i rev = \"3.5-357-gce4d125\"' wscript + sed -i '33i rev = \"3.5-380-g2f6065b\"' wscript sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 5d4a3614e40..82f24b05f72 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig -, sparsehash }: +, sparsehash, config }: +let withSpotify = config.clementine.spotify or false; +in stdenv.mkDerivation { name = "clementine-1.2.1"; @@ -27,7 +29,6 @@ stdenv.mkDerivation { liblastfm libmtp libplist - libspotify pkgconfig protobuf qca2 @@ -37,7 +38,7 @@ stdenv.mkDerivation { sqlite taglib usbmuxd - ]; + ] ++ stdenv.lib.optional withSpotify libspotify; meta = with stdenv.lib; { homepage = "http://www.clementine-player.org"; @@ -45,6 +46,7 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; - hydraPlatforms = []; # libspotify is unfree + # libspotify is unfree + hydraPlatforms = optional (!withSpotify) platforms.linux; }; } diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 39f6ae0ded4..ab8027e2371 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "0wxbn5qm3dn9spwbm618flgrwvls7bipg0nhgn0lv4za2g823g56"; + sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 5356d4ce298..c5a33796ca5 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: stdenv.mkDerivation rec { name = "moc-${version}"; - version = "2.5.0-beta1"; + version = "2.5.0-beta2"; src = fetchurl { url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2"; - sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6"; + sha256 = "486d50584c3fb0067b8c03af54e44351633a7740b18dc3b7358322051467034c"; }; configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; meta = { description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index c70842c399a..a15cf255040 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r"; + sha256 = "09lyz1pn2dadr1ii2msyv3n13kq3mbgpcwcyfm0brm01c2fnh6wc"; }; buildInputs = diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index f1d3be317d1..c201536ed34 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1cx3qs9vrdwmym2qsghqq53bshnjqgpqypsilr1m2i1cpfnfrr6x"; + sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 4037b88ecb7..d1c2230cf16 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1j1x8n3rlwrh373wqmm6mj3cgyk3apvnpqygx1700fl4cf249agl"; + sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; }; buildInputs = [ qt4 jackaudio lv2 ]; diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index ad2bd2f0ba6..9af7c24e800 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, emacs, texinfo, which, texLive }: stdenv.mkDerivation rec { - name = "org-8.2.1"; + name = "org-8.2.6"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823"; + sha256 = "0f196r0n9m2np123sjabsqdw68h9qp6qr7l5v257am8qs7rj0jm1"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 0f8d6d45f12..aca4d822c82 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "gimp-2.8.10"; src = fetchurl { - url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; + url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7"; }; diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index b8c56baf956..b5ecf8fa1d1 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { tastyGolden tastyHunit time transformers utf8String ]; extraLibraries = [ libXScrnSaver ]; + jailbreak = true; meta = { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index fb6b011f30a..0bc2170340c 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool }: +{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool, gcc, makeWrapper }: stdenv.mkDerivation rec { name = "xca-${version}"; @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { prefix=$out ./configure ${openssl} ${libtool} ''; - buildInputs = [ openssl qt4 libtool ]; + postInstall = '' + wrapProgram "$out/bin/xca" \ + --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.gcc}/lib:${gcc.gcc}/lib64:${openssl}/lib:${libtool}/lib" + ''; + + buildInputs = [ openssl qt4 libtool gcc makeWrapper ]; nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index d631b28a67f..acd0568772a 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,5 +1,6 @@ -{ cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl -, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11, libmpd +{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP +, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time +, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11 , X11Xft }: @@ -10,11 +11,12 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time - utf8String X11 X11Xft libmpd + alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec + regexCompat stm time timezoneOlson timezoneSeries utf8String X11 + X11Xft ]; extraLibraries = [ libXrandr wirelesstools ]; - configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd"; + configureFlags = "-fall_extensions"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 715b1e95825..bd5ded3f4c6 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -13,9 +13,9 @@ sha256bin64 = "1sqavz6lh0ryf8jlw8jcfwk265spxs70bhigcgcqsd6647fbdqsr"; }; stable = { - version = "34.0.1847.132"; - sha256 = "0f30i0jxqx059imfiyvsaslkydkva9x6nbvpsjccvwygs91hm4z8"; - sha256bin32 = "1czbydkyazhc63ndyiarbwmmi7p3wh2rb4x7avs41yx7sx9vdqjl"; - sha256bin64 = "01k301629m4m8a4mpg0m5kblygfs72kpa4qi3mlkl8cbb0rlq6mv"; + version = "35.0.1916.114"; + sha256 = "1bvpkwjchkzx1qfc93hd8md6sz5sd7pl55xc8b8m3iakbp0csvsn"; + sha256bin32 = "0zm5770cv9dld37xall9lpl9faa0bgjcp8hjx6l1ivfhs6lxbxxa"; + sha256bin64 = "18p302aj2d7xdza9kf438vbz3wqh8db7v2dq5d9b4b3ak6w9ld03"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 010dbd168a8..b426019efca 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-04-20"; + name = "dwb-2014-05-23"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "117a6a8cdb84b30b0c084dee531b650664d09ba2"; - sha256 = "1k1nax3ij64b2hbn9paqj128yyzy41b61xd2m1ayq9y17k9als0b"; + rev = "813457c0cb6603d3b7a548fc97a8298a7fac34fa"; + sha256 = "1fywnf3yp6p84hap40nb9vrz1gswgnhppygmi1gzjzz3bphwf5pr"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ]; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index b0f9b69012c..74c9574c7d6 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -5,11 +5,11 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation { - name = "lynx-2.8.7"; + name = "lynx-2.8.8"; src = fetchurl { - url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.bz2; - sha256 = "1baxwpdvak6nalr943g22z67r1d3fbibbkqvkvvar9xlvrs9gv20"; + url = http://lynx.isc.org/lynx2.8.8/lynx2.8.8.tar.bz2; + sha256 = "1rxysl08acqll5b87368f04kckl8sggy1qhnq59gsxyny1ffg039"; }; configureFlags = if sslSupport then "--with-ssl=${openssl}" else ""; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index a7002dec2f6..378e32c0afb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.356"; + version = "11.2.202.359"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "1g09a9fvm3wm2zi885q2kc2rwq0a7ywc637i31pzfic6kij10ps5"; + sha256 = "13myq6f999qy1jbgm73gxnadrxdvasi2jiffdyxmwpbwglhhrpka"; } else if stdenv.system == "i686-linux" then if debug then { @@ -58,7 +58,7 @@ let } else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1r7sbwfbgq7c5jhginsc95rihdcjsfzrbx0kxgwv7sk2jc7x8hhb"; + sha256 = "04wh18jbscp7m3drvsxxhp2vjnhww69vw0pgr23hx81ry0ccvb8m"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 0a9703d5e34..766ec0c17fc 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.29.0"; + name = "esniper-2.30.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-29-0.tgz"; - sha256 = "052jfbzm0a88h3hss2vg1vfdrhibjwhbcdnwsbkk5i1z0jj16xxc"; + url = "mirror://sourceforge/esniper/esniper-2-30-0.tgz"; + sha256 = "1p85d5qfr3f35xfj5555ck4wwk5hqkh65ivam1527p8dwcz00wpl"; }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index cf52838b78c..f8558ef052e 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,14 +3,14 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "6f64ee699ba46c90b55d3b99c60e4807819e2b7b"; - version = "0.4.4-rev${rev}"; + rev = "02eed97d977567b0fb16cfeeaeebb863eab1e509"; + version = "1.0-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; url = "git://github.com/weechat/weechat.git"; - sha256 = "1w58gir48kxvscf6njy3kmfxbjlnsf2byw3g3w6r47zjkgyxcf1z"; + sha256 = "0nk0p9chvn0h2pzq9793k2dz8h5iplz0zwqzyds55fbmsgzz51g2"; }; buildInputs = diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 29fb558c83d..f260e3eb30a 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper -, openssl, curl, libevent, inotifyTools +, openssl, curl, libevent, inotifyTools, systemd , enableGTK3 ? false, gtk3 }: let - version = "2.82"; + version = "2.83"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -14,11 +14,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.transmissionbt.com/files/transmission-${version}.tar.xz"; - sha256 = "08imy28hpjxwdzgvhm66hkfyzp8qnnqr4jhv3rgshryzhw86b5ir"; + sha256 = "0cqlgl6jmjw1caybz6nzh3l8z0jak1dxba01isv72zvy2r8b1qdh"; }; buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ] - ++ optionals enableGTK3 [ gtk3 makeWrapper ]; + ++ optionals enableGTK3 [ gtk3 makeWrapper ] + ++ optional stdenv.isLinux systemd; preConfigure = '' sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index d24437aabb6..e9036ba9261 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "2.1.1"; + version = "3.0.4"; name = "seafile-client-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0"; + sha256 = "10iz45y8j5f9smi0srxw62frb97vhr0w938v8w3rsjcw9qq366a2"; }; buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index cc000398855..191b24304bf 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -16,8 +16,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140421"; - sha256 = "1ahn62gmgszssl2ni7b6rran548wjkb10035hrgvag6dwiiyik9g"; + version = "5.20140517"; + sha256 = "150xf6664rfdljswc270m2pqvia4sywph4rrrbky6izy6a0vq680"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix index 2f3aa14c6a0..e807a04628a 100644 --- a/pkgs/build-support/build-fhs-chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-chrootenv/default.nix @@ -1,11 +1,11 @@ {stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2, -bashInteractive, xz, shadow, gawk, less, su, buildEnv}: +bashInteractive, xz, shadow, gawk, less, buildEnv}: {name, pkgs ? [], profile ? ""}: let basePkgs = [ glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar - gzip bzip2 bashInteractive xz shadow gawk less su + gzip bzip2 bashInteractive xz shadow gawk less ]; # Compose a global profile for the chroot environment diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in index 8d3f464186b..6089fa27585 100644 --- a/pkgs/build-support/build-fhs-chrootenv/load.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/load.sh.in @@ -3,4 +3,4 @@ chrootenvDest=/run/chrootenv/@name@ # Enter the LFS chroot environment -chroot $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="/root" PATH="/bin:/sbin" /bin/bash --login +sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in index 68459cca256..225d9dbc4f7 100644 --- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in @@ -17,7 +17,7 @@ mount --bind /home $chrootenvDest/home # Bind mount state directories mount --bind /var $chrootenvDest/var -mount --bind /run $chrootenvDest/run +mount --rbind /run $chrootenvDest/run # Bind mount the host system's /etc mount --bind /etc $chrootenvDest/host-etc diff --git a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in index 29d631fbd90..5089141c0aa 100644 --- a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in @@ -2,5 +2,5 @@ chrootenvDest=/run/chrootenv/@name@ -# Unmount all bind mounts -umount $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run} +# Unmount all (r)bind mounts +umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run} diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index b58bf7ef1d3..c601a1501a3 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -1,7 +1,7 @@ { callPackage, self, pkgs }: rec { - inherit (pkgs) glib gtk2 gtk3 gnome2 upower; + inherit (pkgs) glib gtk2 gtk3 gnome2 upower glib_networking; gtk = gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) ORBit2; diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix index 982256b15d8..f9fbbbe56c6 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix @@ -33,9 +33,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - wrapProgram "$out/bin/evolution" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix index 8e47382954a..5c2206641e5 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix @@ -35,12 +35,15 @@ stdenv.mkDerivation rec { in '' substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" - wrapProgram "$out/bin/gnome-documents" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${libPath}" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" + + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${libPath}" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" + done rm $out/share/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix index 17ed92da870..cc92cdd3014 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix @@ -27,10 +27,14 @@ stdenv.mkDerivation rec { hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preFixup = '' - wrapProgram "$out/bin/gnome-photos" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication" + + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done rm $out/share/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix index e7c94d8003f..d159965c544 100644 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix @@ -33,9 +33,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - wrapProgram "$out/bin/epiphany" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done ''; patches = [ ./libxml_missing_dep.patch ]; diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 7fbbd941327..baa7113ce90 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -44,6 +44,10 @@ rec { gjs = callPackage ./core/gjs { }; + glib_networking = pkgs.glib_networking.override { + inherit gsettings_desktop_schemas; + }; + gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-contacts = callPackage ./core/gnome-contacts { }; @@ -112,7 +116,7 @@ rec { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; }; + gvfs = pkgs.gvfs.override { gnome = gnome3; }; eog = callPackage ./core/eog { }; @@ -134,6 +138,28 @@ rec { nautilus = callPackage ./core/nautilus { }; + networkmanager_openvpn = pkgs.networkmanager_openvpn.override { + inherit gnome3; + }; + + networkmanager_pptp = pkgs.networkmanager_pptp.override { + inherit gnome3; + }; + + networkmanager_vpnc = pkgs.networkmanager_vpnc.override { + inherit gnome3; + }; + + networkmanager_openconnect = pkgs.networkmanager_openconnect.override { + inherit gnome3; + }; + + networkmanagerapplet = pkgs.networkmanagerapplet.override { + inherit gnome3 gsettings_desktop_schemas glib_networking + networkmanager_openvpn networkmanager_pptp networkmanager_vpnc + networkmanager_openconnect; + }; + rest = callPackage ./core/rest { }; sushi = callPackage ./core/sushi { }; @@ -185,6 +211,8 @@ rec { #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + geary = callPackage ./misc/geary { }; + gfbgraph = callPackage ./misc/gfbgraph { }; goffice = callPackage ./misc/goffice { }; diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix new file mode 100644 index 00000000000..1eb6c0e3ed2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala +, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils +, libnotify, libcanberra, libsecret, gmime +, libpthreadstubs, hicolor_icon_theme +, gnome3, librsvg, gnome_doc_utils, webkitgtk }: + +stdenv.mkDerivation rec { + name = "geary-0.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz"; + sha256 = "44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils + vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime + libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme + gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; + + preConfigure = '' + substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' + ''; + + postInstall = '' + mkdir -p $out/share/gsettings-schemas/${name}/ + mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} + ''; + + preFixup = '' + wrapProgram "$out/bin/geary" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + patches = [ ./disable_valadoc.patch ]; + patchFlags = "-p0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Geary; + description = "Mail client for GNOME 3"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch new file mode 100644 index 00000000000..e65c0dea747 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch @@ -0,0 +1,24 @@ +--- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 ++++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 +@@ -696,21 +696,6 @@ + ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ + ) + +-# Valadoc +-################################################# +-foreach(pkg ${ENGINE_PACKAGES}) +- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") +-endforeach(pkg ${ENGINE_PACKAGES}) +- +-include(FindValadoc) +-add_custom_target( +- valadoc +- WORKING_DIRECTORY +- ${CMAKE_SOURCE_DIR}/src +- COMMAND +- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi +-) +- + ## Make clean: remove copied files + ################################################## + set_property( diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix index d71713674f7..c07b3e7c7dd 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/compilers/agda/stdlib.nix @@ -1,4 +1,4 @@ -{ cabal, fetchurl }: +{ cabal, fetchurl, filemanip, Agda }: cabal.mkDerivation (self: { pname = "Agda-stdlib"; @@ -9,11 +9,16 @@ cabal.mkDerivation (self: { sha256 = "1ynjgqk8hhnm6rbngy8fjsrd6i4phj2hlan9bk435bbywbl366k3"; }; + buildDepends = [ filemanip Agda ]; + preConfigure = "cd ffi"; postInstall = '' mkdir -p $out/share - cp -pR ../src $out/share/agda + cd .. + runhaskell GenerateEverything + agda -i . -i src Everything.agda + cp -pR src $out/share/agda ''; meta = { diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index fce6f4a2699..5f389d48c8e 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "elm-server"; - version = "0.11"; - sha256 = "1977fa03n2m2apxhbzpcn6b5y5gf7ksnpigibi8djlpp76rliaz2"; + version = "0.11.0.1"; + sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 9fe18cdaf30..3daa1b507b7 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -1,27 +1,27 @@ { cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup , cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript -, mtl, pandoc, parsec, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers -, unionFind, unorderedContainers +, languageGlsl, mtl, pandoc, parsec, QuickCheck, scientific +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, transformers, unionFind, unorderedContainers, yaml }: cabal.mkDerivation (self: { pname = "Elm"; - version = "0.12.1.3"; - sha256 = "1p4py4qyxsp25qa8141ywfh0qnvdid4v7xlbqkk8aafxccb7lsm9"; + version = "0.12.3"; + sha256 = "1v6h9qbbz27ikh19xwjbyfw0zi5ag9x1gp0khh9v4af1g0j86320"; isLibrary = true; isExecutable = true; buildDepends = [ aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath - indents languageEcmascript mtl pandoc parsec text transformers - unionFind unorderedContainers + indents languageEcmascript languageGlsl mtl pandoc parsec + scientific text transformers unionFind unorderedContainers yaml ]; testDepends = [ aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip - filepath HUnit indents languageEcmascript mtl pandoc parsec - QuickCheck testFramework testFrameworkHunit + filepath HUnit indents languageEcmascript languageGlsl mtl pandoc + parsec QuickCheck scientific testFramework testFrameworkHunit testFrameworkQuickcheck2 text transformers unionFind - unorderedContainers + unorderedContainers yaml ]; doCheck = false; meta = { diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 76359de6575..8098b9d278f 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 2070da0bee4..220d3f87fba 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "6.6.3"; + version = "6.6.5"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "01dr66d7rm2xvxwm6wy71bbjvfrmzxgvmaz3sl1fb63cn8d78nz3"; + sha256 = "0lsa90sdnkd286xgm1amwkdhvnrpsz7imfzczrfdaw4arqk4bvkr"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 9a803a6d510..ec1fda10d8c 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { homepage = http://www.tortall.net/projects/yasm/; description = "Complete rewrite of the NASM assembler"; license = "BSD"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 0b877446324..d5402c5cb03 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; let majorVersion = "3.4"; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -31,7 +31,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "1gjcn5c3zqg161vwzh43ciha15w0plf5v7cyfm372pnllb08cdpi"; + sha256 = "1i7dgbzyvj24i6gfhb5q2zwr9nn1ni6w1ig1rcgh96a321is35f5"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d3630888f64..ccaa45c6c33 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - name = "renpy-6.17.4"; + name = "renpy-6.17.6"; meta = { description = "Ren'Py Visual Novel Engine"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://www.renpy.org/dl/6.17.4/renpy-6.17.4-source.tar.bz2"; - sha256 = "1n0ki944vawl1i3z9g5h65spdjvb8p0gj6rckv36fb2yq2adxclp"; + url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2"; + sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic"; }; buildInputs = [ diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 0e94b78c037..847d561fbe4 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "--enable-avresample" "--enable-runtime-cpudetect" ] - ++ stdenv.lib.optional subtitleSupport "--enable-libass" + ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass" ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" ++ stdenv.lib.optional speexSupport "--enable-libspeex" ++ stdenv.lib.optional theoraSupport "--enable-libtheora" @@ -55,13 +55,12 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional playSupport "--enable-ffplay" + ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay" ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig" ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree" ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls"; - buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] - ++ stdenv.lib.optional subtitleSupport libass + buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora @@ -75,10 +74,12 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional playSupport SDL + ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ] ++ stdenv.lib.optional fdkAACSupport fdk_aac - ++ stdenv.lib.optional gnutlsSupport gnutls; + ++ stdenv.lib.optional gnutlsSupport gnutls + ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 618b37bae4c..6b715028e8a 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -2,15 +2,15 @@ , gsettings_desktop_schemas }: let - ver_maj = "2.38"; - ver_min = "2"; + ver_maj = "2.40"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "glib-networking-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "1iwzjkx6q9gqr7fipc98zi2bi0gccrwq1v7skff1cdijkn8zxqp8"; + sha256 = "9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28"; }; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 033a1def3ce..b1dd66584f4 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -55,7 +55,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext perl python ]; - propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty; + propagatedBuildInputs = [ pcre zlib libffi ] + ++ optional (!stdenv.isDarwin) libiconvOrEmpty + ++ libintlOrEmpty; configureFlags = optional stdenv.isDarwin "--disable-compile-warnings" diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 92c6debaa66..c57179364a7 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -23,14 +23,17 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xlibs; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] - ++ optionals stdenv.isLinux - [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optional stdenv.isDarwin x11 + ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ + libXrandr libXrender libXcomposite libXi libXcursor + ] + ++ optionals stdenv.isDarwin [ x11 libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; - configureFlags = "--with-xinput=yes"; + configureFlags = if stdenv.isDarwin + then "--disable-glibtest --disable-introspection --disable-visibility" + else "--with-xinput=yes"; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 2e596b17af3..9cdd2a275bf 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty , icu, graphite2 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big -, withGraphite2 ? true # it is small and major distros do include it +, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it }: # TODO: split non-icu and icu lib into different outputs? diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix similarity index 83% rename from pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix rename to pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix index a6f0e61d273..1da2b743687 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLURaw"; - version = "1.4.0.0"; - sha256 = "0q86rpd5cx0vrb9d3y1fljc3mg0p8wy6xdn37ngv2s0f4kslq63g"; + version = "1.4.0.1"; + sha256 = "1k0f1vbbrsfc7jb4qbif4w4q87lsis5gvq7jd2n8zzslxd5n8mcn"; buildDepends = [ OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix similarity index 85% rename from pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix rename to pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix index 1cfd9a37eb0..79112138b4a 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.5.1.0"; - sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s"; + version = "2.5.1.1"; + sha256 = "0n9dkdjmpnbcjg0ll0ny7mw21xwwix0gxy0hq6yagmgaakhpg0aa"; buildDepends = [ OpenGL OpenGLRaw ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix new file mode 100644 index 00000000000..844d512c62f --- /dev/null +++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix @@ -0,0 +1,14 @@ +{ cabal, JuicyPixels, vector }: + +cabal.mkDerivation (self: { + pname = "JuicyPixels-util"; + version = "0.1"; + sha256 = "181wryax2k43qlblink9vcg2hk8f2qxn02ifmgxa2fl95z5ar0dc"; + buildDepends = [ JuicyPixels vector ]; + meta = { + homepage = "https://github.com/fumieval/JuicyPixels-util"; + description = "Convert JuicyPixel images into RGBA format, flip, trim and so on"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index a9723721e1e..03c8853cfd7 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -1,11 +1,11 @@ -{ cabal, HUnit, QuickCheck, random, text, vector }: +{ cabal, dlist, fmlist, HUnit, QuickCheck, random, text, vector }: cabal.mkDerivation (self: { pname = "ListLike"; - version = "4.0.2"; - sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah"; - buildDepends = [ text vector ]; - testDepends = [ HUnit QuickCheck random text vector ]; + version = "4.1.0"; + sha256 = "0j78mm9vsl3scwgqp4h2bhq54hf22bxj9cg9pl26d12zw7038kwj"; + buildDepends = [ dlist fmlist text vector ]; + testDepends = [ dlist fmlist HUnit QuickCheck random text vector ]; jailbreak = true; meta = { homepage = "http://software.complete.org/listlike"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix similarity index 84% rename from pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix rename to pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix index 6f79b5c7a06..c012c65d522 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.9.1.0"; - sha256 = "09xzjaa9qyh7bfsnq226v9zi6lhnalhmlqlca3808hgax8ijwhp3"; + version = "2.9.2.0"; + sha256 = "1sa5jmhj0az6sik6swv2vgzhv9gj34dbq2px23ag1a4yrk5gcn0p"; buildDepends = [ GLURaw OpenGLRaw text ]; extraLibraries = [ libX11 mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix new file mode 100644 index 00000000000..f0e6c7ac7ad --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix @@ -0,0 +1,15 @@ +{ cabal, mesa }: + +cabal.mkDerivation (self: { + pname = "OpenGLRaw"; + version = "1.5.0.0"; + sha256 = "04lsidv82fl7yb2fnqpx7q0vgiwxbswh8g7dv9q9s9i2jwiaaal5"; + extraLibraries = [ mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix similarity index 85% rename from pkgs/development/libraries/haskell/aeson/default.nix rename to pkgs/development/libraries/haskell/aeson/0.7.0.4.nix index 7c8dd42c005..b5c959bb617 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix @@ -16,14 +16,10 @@ cabal.mkDerivation (self: { attoparsec HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 text time unorderedContainers vector ]; - patchPhase = '' - sed -i -e 's|scientific >=.*,|scientific,|' aeson.cabal - ''; meta = { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix new file mode 100644 index 00000000000..96a93b40195 --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix @@ -0,0 +1,26 @@ +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit +, mtl, QuickCheck, scientific, syb, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson"; + version = "0.7.0.6"; + sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; + buildDepends = [ + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb + text time unorderedContainers vector + ]; + testDepends = [ + attoparsec HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time unorderedContainers vector + ]; + meta = { + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 8e9f69f8fc0..8256ff54e19 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -1,26 +1,27 @@ { cabal, binary, clock, connection, dataBinaryIeee754, hspec -, hspecExpectations, monadControl, network, split, text, xml +, hspecExpectations, monadControl, network, split, text, vector +, xml }: cabal.mkDerivation (self: { pname = "amqp"; - version = "0.8.2"; - sha256 = "0hl9x6kbxdv32014k1w34d84wl4ivpiyg1ikpjr0nr9bsg3wr0gf"; + version = "0.8.3"; + sha256 = "0gl5vdhbic8llhbqmhnwj0wvykhbrci6zz53v5cayqfcwi1v1dw2"; isLibrary = true; isExecutable = true; buildDepends = [ binary clock connection dataBinaryIeee754 monadControl network - split text xml + split text vector xml ]; testDepends = [ binary clock connection dataBinaryIeee754 hspec hspecExpectations - network split text + network split text vector ]; + doCheck = false; meta = { homepage = "https://github.com/hreinhardt/amqp"; description = "Client library for AMQP servers (currently only RabbitMQ)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - doCheck = false; }) diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix new file mode 100644 index 00000000000..4af501e7dca --- /dev/null +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix @@ -0,0 +1,20 @@ +{ cabal, deepseq, QuickCheck, scientific, testFramework +, testFrameworkQuickcheck2, text +}: + +cabal.mkDerivation (self: { + pname = "attoparsec"; + version = "0.11.3.4"; + sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi"; + buildDepends = [ deepseq scientific text ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 text + ]; + meta = { + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.0.nix b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix similarity index 86% rename from pkgs/development/libraries/haskell/binary/0.7.2.0.nix rename to pkgs/development/libraries/haskell/binary/0.7.2.1.nix index 102206b5947..bf91922835d 100644 --- a/pkgs/development/libraries/haskell/binary/0.7.2.0.nix +++ b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.7.2.0"; - sha256 = "149pdhzjg9bhl66azgv0nmj3fy38s4klzk01vhzazngdiagfq6wn"; + version = "0.7.2.1"; + sha256 = "0s0idmcmribgajxxnxdvppnz62qyxwrj9iy34pi7nvm41gj6q5nz"; testDepends = [ Cabal filepath HUnit QuickCheck random testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix index 0502f1eabc2..92a25e5e3b4 100644 --- a/pkgs/development/libraries/haskell/blaze-svg/default.nix +++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-svg"; - version = "0.3.3.1"; - sha256 = "00i0apyklvmkr4w30d4r86gcg86h35sc3ncvqax70827126cdmsj"; + version = "0.3.4"; + sha256 = "061011qrpqiyag9549hn0hfikvkrin5wb3cf0zfm9n80cgvzmqd3"; buildDepends = [ blazeMarkup mtl ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix new file mode 100644 index 00000000000..3dfd986ee62 --- /dev/null +++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix @@ -0,0 +1,21 @@ +{ cabal, lens, linear, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "boundingboxes"; + version = "0.1.1"; + sha256 = "1nl0lqgfwd98jzhhw7i4vvd88lpnn8770x2pcbyfzqcyr27079f0"; + buildDepends = [ lens linear ]; + testDepends = [ + lens linear QuickCheck random testFramework + testFrameworkQuickcheck2 testFrameworkTh + ]; + doCheck = false; + meta = { + homepage = "https://github.com/fumieval/boundingboxes"; + description = "The type for 2D bounding box"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix new file mode 100644 index 00000000000..44c8b3fee6f --- /dev/null +++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix @@ -0,0 +1,21 @@ +{ cabal, lens, linear, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "boundingboxes"; + version = "0.2"; + sha256 = "0xvh1h4papfrf6dg553rx6q8fqi06ff1ivgn4rdx3haqg1zf40hp"; + buildDepends = [ lens ]; + testDepends = [ + lens linear QuickCheck random testFramework + testFrameworkQuickcheck2 testFrameworkTh + ]; + doCheck = false; + meta = { + homepage = "https://github.com/fumieval/boundingboxes"; + description = "The type for 2D bounding box"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix new file mode 100644 index 00000000000..54483f17701 --- /dev/null +++ b/pkgs/development/libraries/haskell/categories/default.nix @@ -0,0 +1,14 @@ +{ cabal, void }: + +cabal.mkDerivation (self: { + pname = "categories"; + version = "1.0.6"; + sha256 = "0i5mrxbhqj5g46lvwbw2m07prjvfwja6q8648qm6bq54z6zrl5cy"; + buildDepends = [ void ]; + meta = { + homepage = "http://github.com/ekmett/categories"; + description = "Categories"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix index 5025fcc403b..bc5b0b4ffba 100644 --- a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "chell-quickcheck"; - version = "0.2.3"; - sha256 = "15j1wzhfyr9v8hy9d5lnr6jkrfr1zfb7dwgiy3ni90mvpf8x54yc"; + version = "0.2.4"; + sha256 = "0ys6aks97y5h0n8n8dmwx8jrai4bjlnr7n69s259664y694054wd"; buildDepends = [ chell QuickCheck random ]; meta = { homepage = "https://john-millikin.com/software/chell/"; diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix index c69994e6868..cab43842f73 100644 --- a/pkgs/development/libraries/haskell/chell/default.nix +++ b/pkgs/development/libraries/haskell/chell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "chell"; - version = "0.3.3"; - sha256 = "1k5vxipf47753d41dgr1gr4zy7y72gz2x8lcn0fgfmxi2v810nsm"; + version = "0.4"; + sha256 = "1hynr7n7wxgc3z6zrc3xrfpiqlh4zfb3kagwwfhqmcamv9d4x0ng"; buildDepends = [ ansiTerminal options patience random text transformers ]; diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix new file mode 100644 index 00000000000..245ea3ef30e --- /dev/null +++ b/pkgs/development/libraries/haskell/colors/default.nix @@ -0,0 +1,14 @@ +{ cabal, profunctors }: + +cabal.mkDerivation (self: { + pname = "colors"; + version = "0.1.1"; + sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm"; + buildDepends = [ profunctors ]; + meta = { + homepage = "https://github.com/fumieval/colors"; + description = "A type for colors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix new file mode 100644 index 00000000000..13e6fd8a2b2 --- /dev/null +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -0,0 +1,23 @@ +{ cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns +, transformers, treeView +}: + +cabal.mkDerivation (self: { + pname = "compdata"; + version = "0.8.1.0"; + sha256 = "06bsdhf40b8111k0fmfc53i5kib9n431f07qyj83pq8isgkk33xc"; + buildDepends = [ + deepseq derive mtl QuickCheck thExpandSyns transformers treeView + ]; + testDepends = [ + deepseq derive HUnit mtl QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 thExpandSyns + transformers + ]; + meta = { + description = "Compositional Data Types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 99308d43272..94423cc41ef 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.1.2.1"; - sha256 = "1jzc3vnc0dr4nm79yx2kk5rsm06jfbf3h89y28bgv05r1pw6r7ai"; + version = "1.1.3"; + sha256 = "14fc7v00zmrcwba2rdnh7c6sx0rv5mmbwlgq5p8p7nlald1dcr6z"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/control-bool/default.nix b/pkgs/development/libraries/haskell/control-bool/default.nix new file mode 100644 index 00000000000..4fe9a975f41 --- /dev/null +++ b/pkgs/development/libraries/haskell/control-bool/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "control-bool"; + version = "0.2.1"; + sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4"; + meta = { + homepage = "https://github.com/fumieval/control-bool"; + description = "Useful combinators for boolean expressions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index 7f0285dfc7a..d2700195b10 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.7"; - sha256 = "0xszynw6p07r7z9nlq8alx5lxfjm57gljya835ccj63hqhkr5yxh"; + version = "0.10.8"; + sha256 = "1pqcb6fk6l2xzwyy3n9sa2q2k3qykym1f98n2zf75545ix46b1r6"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 5c8b357593e..343aeb014ad 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "directory-tree"; - version = "0.11.0"; - sha256 = "07vqwnzbwfjvlwcl50x5jl9yzvqfln0m4k4lam9r5n49wv7p01c9"; + version = "0.12.0"; + sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz"; buildDepends = [ filepath ]; + testDepends = [ filepath ]; meta = { homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 0a92db399e5..0538e2f1899 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "1.4.1"; - sha256 = "0b2gwsd6014fhmq8lipc299n6ndak7fv6dmrvi9vgasw0a665ryj"; + version = "1.4.1.2"; + sha256 = "1qny5c0xy2vdsl4qmgqr83jxqw1r68r81xhmx236rhxcffs9yvw2"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "https://github.com/meteficha/esqueleto"; - description = "Bare bones, type-safe EDSL for SQL queries on persistent backends"; + description = "Type-safe EDSL for SQL queries on persistent backends"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index d67cc988a2d..d32a5759780 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.0.3"; - sha256 = "1vs4brndk091mp7lm057my4ghlpv3563qg5blrs5zqcmnwnm75x5"; + version = "0.20.0.4"; + sha256 = "0cxcd4nxnq8nl03xgxa1nb0932hq4dz1lxpp3gqqs5k5wvs62303"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 7aa1b78a03e..a42e963d558 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.6"; - sha256 = "0ag3g8mv8cw8km785kskz8kv38zs8gimrc3lr9dvkc1qnp2fdmgz"; + version = "0.0.7"; + sha256 = "0mj8f70f9k78wjzcx59w68szajafmm119rcrsspmxsygglh8ji2g"; buildDepends = [ filepath ]; testDepends = [ filepath HUnit ]; meta = { diff --git a/pkgs/development/libraries/haskell/fmlist/default.nix b/pkgs/development/libraries/haskell/fmlist/default.nix new file mode 100644 index 00000000000..8dcbb7fff18 --- /dev/null +++ b/pkgs/development/libraries/haskell/fmlist/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "fmlist"; + version = "0.8"; + sha256 = "1knr9yh58fwjpkm37hvrqghlchf5qibwf9q52app6zh3ys999rrs"; + meta = { + description = "FoldMap lists"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix new file mode 100644 index 00000000000..efe269db26c --- /dev/null +++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix @@ -0,0 +1,23 @@ +{ cabal, boundingboxes, colors, controlBool, filepath, free +, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens +, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers +, vector, void +}: + +cabal.mkDerivation (self: { + pname = "free-game"; + version = "1.0.5"; + sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf"; + buildDepends = [ + boundingboxes colors controlBool filepath free freetype2 GLFWB + hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL + OpenGLRaw random reflection transformers vector void + ]; + jailbreak = true; + meta = { + homepage = "https://github.com/fumieval/free-game"; + description = "Create games for free"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix new file mode 100644 index 00000000000..b19e3202741 --- /dev/null +++ b/pkgs/development/libraries/haskell/free-game/1.1.nix @@ -0,0 +1,23 @@ +{ cabal, boundingboxes, colors, controlBool, filepath, free +, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens +, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers +, vector, void +}: + +cabal.mkDerivation (self: { + pname = "free-game"; + version = "1.1"; + sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz"; + buildDepends = [ + boundingboxes colors controlBool filepath free freetype2 GLFWB + hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL + OpenGLRaw random reflection transformers vector void + ]; + jailbreak = true; + meta = { + homepage = "https://github.com/fumieval/free-game"; + description = "Create games for free"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/freetype2/default.nix b/pkgs/development/libraries/haskell/freetype2/default.nix new file mode 100644 index 00000000000..145ae4a2d79 --- /dev/null +++ b/pkgs/development/libraries/haskell/freetype2/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "freetype2"; + version = "0.1.1"; + sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s"; + isLibrary = true; + isExecutable = true; + meta = { + description = "Haskell binding for FreeType 2 library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index be0b72aa963..40700b52f61 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,17 +4,17 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.2.1"; - sha256 = "160b45bgiz2ckva70dnmkf6i9bvffaavm5wzia2lk8c65pnvc9ih"; + version = "0.7.2.2"; + sha256 = "0abk76cy9qiblyways1r7jfsj996sj4laawzaz1j9p546plfkbnj"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot ]; + jailbreak = true; postInstall = '' ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" ''; - jailbreak = true; meta = { homepage = "http://felsin9.de/nnis/ghc-vis"; description = "Live visualization of data structures in GHCi"; diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index bd3ccbba7a4..18ef54746a9 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.17.0.0"; - sha256 = "1wi5yzs0b321as10h9awin87501njbd4ii40nak1fr534g1abhf5"; + version = "2999.17.0.1"; + sha256 = "0s6l1mlqvllrlx7vc06lgcs68ajhfk98awm63ab1dkqmcnj23ixv"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 723fdb0fdb9..e59bccaf6b5 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.5"; - sha256 = "1n0pdishsngrri83flipfzmk0gn01n256rg7vrbn7kjl1aff9r1g"; + version = "7.3.6"; + sha256 = "0js1rzg1zpqg9mbi0kdzb5i8ggsrq4l8p0c05k85ppw6h5lwkayd"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 77ebf3fd9af..faf5212a794 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { filepath hashable MonadCatchIOTransformers mtl random text time transformers unorderedContainers vector xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff b/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff new file mode 100644 index 00000000000..df507c5a470 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff @@ -0,0 +1,28 @@ +diff --git a/src/CmdLine/All.hs b/src/CmdLine/All.hs +index 94b1d48..f41f270 100644 +--- a/src/CmdLine/All.hs ++++ b/src/CmdLine/All.hs +@@ -86,8 +86,10 @@ guessLocal = do + ghc <- findExecutable "ghc" + home <- getHomeDirectory + lib <- getLibDir ++ path <- lookup "HOOGLE_DOC_PATH" <$> getEnvironment + let xs = [takeDirectory (takeDirectory lib) "doc" {- Windows, installed with Cabal -} ] ++ + [takeDirectory (takeDirectory ghc) "doc/html/libraries" | Just ghc <- [ghc] {- Windows, installed by GHC -} ] ++ ++ maybeToList path ++ + [home ".cabal/share/doc" {- Linux -} ] + filterM doesDirectoryExist xs + +diff --git a/src/Hoogle/Language/Haskell.hs b/src/Hoogle/Language/Haskell.hs +index b037f11..f2ac047 100644 +--- a/src/Hoogle/Language/Haskell.hs ++++ b/src/Hoogle/Language/Haskell.hs +@@ -112,7 +112,7 @@ setPriority pkg mod x = x{itemPriority = pri} + + setModuleURL (Just pkg) _ x | itemLevel x == 1 = x{itemURL=if null $ itemURL x then f $ itemName x else itemURL x} + where f xs = if "http://hackage.haskell.org/package/" `isPrefixOf` itemURL pkg +- then "http://hackage.haskell.org/packages/archive/" ++ itemName pkg ++ "/latest/doc/html/" ++ file ++ then "http://hackage.haskell.org/package/" ++ itemName pkg ++ "/docs/" ++ file + else takeDirectory (itemURL pkg) ++ "/" ++ file + where file = reps '.' '-' xs ++ ".html" + setModuleURL _ _ x = x diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix new file mode 100644 index 00000000000..20816d3b2f9 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -0,0 +1,116 @@ +# Install not only the Hoogle library and executable, but also a local Hoogle +# database which provides "Source" links to all specified 'packages' -- or the +# current Haskell Platform if no custom package set is provided. +# +# It is intended to be used in config.nix similarly to: +# +# { packageOverrides = pkgs: rec { +# +# haskellPackages = +# let callPackage = pkgs.lib.callPackageWith haskellPackages; +# in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override { +# extraPrefs = self: { +# hoogleLocal = pkgs.haskellPackages.hoogleLocal.override { +# packages = with pkgs.haskellPackages; [ +# mmorph +# monadControl +# ] +# }; +# }; +# }); +# }} +# +# This will build mmorph and monadControl, and have the hoogle installation +# refer to their documentation via symlink so they are not garbage collected. + +{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive +, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes +, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text +, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp + +, parallel, perl, wget, rehoo, haskellPlatform +, packages ? haskellPlatform.propagatedUserEnvPkgs +}: + +cabal.mkDerivation (self: rec { + pname = "hoogle"; + version = "4.2.32"; + sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc"; + isLibrary = true; + isExecutable = true; + buildInputs = [ self.ghc Cabal parallel perl wget rehoo ] + ++ self.extraBuildInputs ++ packages; + buildDepends = [ + aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit + deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random + resourcet safe shake tagsoup text time transformers uniplate vector + vectorAlgorithms wai warp parallel perl wget rehoo + ]; + testDepends = [ filepath ]; + testTarget = "--test-option=--no-net"; + + # The tests will fail because of the added documentation. + doCheck = false; + patches = [ ./hoogle-local.diff ]; + + docPackages = packages; + + postInstall = '' + if [ -z "$docPackages" ]; then + echo "ERROR: The packages attribute has not been set" + exit 1 + fi + + ensureDir $out/share/hoogle/doc + export HOOGLE_DOC_PATH=$out/share/hoogle/doc + + cd $out/share/hoogle + + function import_dbs() { + find $1 -name '*.txt' \ + | parallel -j$NIX_BUILD_CORES 'cp -p {} .; perl -i -pe "print \"\@url file://{//}/index.html\n\" if /^\@version/;" {/}; $out/bin/hoogle convert {/}' + } + + for i in $docPackages; do + import_dbs $i/share/doc + ln -sf $i/share/doc/* $out/share/hoogle/doc + done + + import_dbs ${self.ghc}/share/doc/ghc*/html/libraries + ln -sf ${self.ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc + + unset http_proxy + unset ftp_proxy + + chmod 644 *.hoo *.txt + $out/bin/hoogle data -d $PWD --redownload -l $(echo *.txt | sed 's/\.txt//g') + PATH=$out/bin:$PATH ${rehoo}/bin/rehoo -j4 -c64 . + + rm -fr downloads *.txt *.dep + mv default.hoo x || exit 0 + rm -f *.hoo + mv x default.hoo || exit 1 + + if [ ! -f default.hoo ]; then + echo "Unable to build the default Hoogle database" + exit 1 + fi + + mv $out/bin/hoogle $out/bin/.hoogle-wrapped + cat - > $out/bin/hoogle <= $JANSSON_REQUIRED]) -+AC_SUBST(JANSSON_CFLAGS) -+AC_SUBST(JANSSON_LIBS) -+ -+ - PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED]) - AC_SUBST(LIBEVENT_CFLAGS) - AC_SUBST(LIBEVENT_LIBS) -diff -r -u a/daemon/Makefile.am b/daemon/Makefile.am ---- a/daemon/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/daemon/Makefile.am 2014-01-16 14:22:24.587427993 +0100 -@@ -139,7 +139,7 @@ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/common/index/libindex.la ${LIB_WS32} \ -- @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ -+ @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ - - seaf_daemon_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ - -diff -r -u a/server/gc/Makefile.am b/server/gc/Makefile.am ---- a/server/gc/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/server/gc/Makefile.am 2014-01-16 14:23:20.991449822 +0100 -@@ -50,7 +50,7 @@ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seafserv_gc_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ - -@@ -63,6 +63,6 @@ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seaf_fsck_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/server/Makefile.am b/server/Makefile.am ---- a/server/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/server/Makefile.am 2014-01-16 14:23:40.498354610 +0100 -@@ -99,6 +99,6 @@ - $(top_builddir)/common/index/libindex.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/httpserver/Makefile.am b/httpserver/Makefile.am ---- a/httpserver/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/httpserver/Makefile.am 2014-01-16 14:26:48.673985279 +0100 -@@ -50,7 +50,7 @@ - @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile.la \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ - @LIBARCHIVE_LIBS@ ${LIB_WS32} - - httpserver_LDFLAGS = @STATIC_COMPILE@ -diff -r -u a/controller/Makefile.am b/controller/Makefile.am ---- a/controller/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/controller/Makefile.am 2014-01-16 14:29:42.076102675 +0100 -@@ -18,6 +18,6 @@ - seafile_controller_LDADD = @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -levent \ -- @SEARPC_LIBS@ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ - - seafile_controller_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/fuse/Makefile.am b/fuse/Makefile.am ---- a/fuse/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/fuse/Makefile.am 2014-01-16 14:31:44.764267711 +0100 -@@ -43,6 +43,6 @@ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ \ - -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ - - seaf_fuse_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 53092e3a8b7..d6c08e99a51 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation rec { - version = "2.1.1"; + version = "3.0.4"; name = "seafile-shared-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6"; + sha256 = "0a0yj9k2rr3q42swwzn1js3r8bld9wcysw6p9415rw5jabcm1af0"; }; - patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ]; - buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; propagatedBuildInputs = [ ccnet ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 51144bc1051..fef97002eaa 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -73,10 +73,10 @@ installPhase() { # Install the programs. mkdir -p $out/bin - for i in nvidia-settings nvidia-smi nvidia-xconfig; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + for i in nvidia-settings nvidia-smi; do + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done # Header files etc. @@ -85,6 +85,7 @@ installPhase() { mkdir -p $out/share/man/man1 cp -p *.1.gz $out/share/man/man1 + rm $out/share/man/man1/nvidia-xconfig.1.gz mkdir -p $out/share/applications cp -p *.desktop $out/share/applications @@ -96,6 +97,10 @@ installPhase() { substituteInPlace $out/share/applications/nvidia-settings.desktop \ --replace '__UTILS_PATH__' $out/bin \ --replace '__PIXMAP_PATH__' $out/share/pixmaps + + # Test a bit. + $out/bin/nvidia-settings --version + $out/bin/nvidia-smi --help > /dev/null fi } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2afbf12097c..0c0f6ecc71e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "331.67"; + versionNumber = "331.79"; in @@ -25,12 +25,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1imc66yxnm01i58xwqrwqc612h0rhdz8x170hqr2pjyk99bllsv9"; + sha256 = "0dl6gj1k6rz7bzyflfgi8y4489bxv03gfcni7zjzy440xjm3sk9l"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0qxd4jd25ymcr6w97f71kfn549x6wgg4g3vixd3sqlczknn85f47"; + sha256 = "14mwxz12kd5znnrmwia4qk35sd7xpr6cgpxs1xzjwmjgvz6gc71v"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix new file mode 100644 index 00000000000..7c11aa8e837 --- /dev/null +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchsvn, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "spawn-fcgi-${version}"; + version = "1.6.3"; + + src = fetchsvn { + url = "svn://svn.lighttpd.net/spawn-fcgi/tags/spawn-fcgi-${version}"; + sha256 = "06f0zw3rja42d9vg8j68nqkm3mn5pfzzhwfadpvs4aidh6kz9p42"; + }; + + buildInputs = [ automake autoconf ]; + + patches = [ ./show_version.patch ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = "http://redmine.lighttpd.net/projects/spawn-fcgi"; + description = "Provides an interface to external programs that support the FastCGI interface"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/servers/http/spawn-fcgi/show_version.patch b/pkgs/servers/http/spawn-fcgi/show_version.patch new file mode 100644 index 00000000000..90c64ed6620 --- /dev/null +++ b/pkgs/servers/http/spawn-fcgi/show_version.patch @@ -0,0 +1,14 @@ +diff --git a/src/spawn-fcgi.c b/src/spawn-fcgi.c +index 7f3f594..2f1046f 100644 +--- a/src/spawn-fcgi.c ++++ b/src/spawn-fcgi.c +@@ -405,8 +405,7 @@ static int find_user_group(const char *user, const char *group, uid_t *uid, gid_ + + static void show_version () { + write(1, CONST_STR_LEN( +- PACKAGE_DESC \ +- "Build-Date: " __DATE__ " " __TIME__ "\n" ++ PACKAGE_DESC "\n" + )); + } + diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 8d1b03ddf34..be890ff5900 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.20"; + version = "2.0.21"; name = "munin-${version}"; src = fetchurl { url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; - sha256 = "17b24fsr8abipq09hipnh6cd4h2aiwyzyjhg0wpplngwals54qmc"; + sha256 = "18ipk8n78iik07190h9r8mj5209ha6yhbiw7da0l4khw0y00cvf8"; }; buildInputs = [ diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index cd65234855f..40b4ff1f2d7 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = "GPLv2"; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 7a2f3538fb8..792aa49f447 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -80,6 +80,7 @@ in stdenv.mkDerivation rec { (mkFlag mmsSupport "mms") (mkFlag mpg123Support "mpg123") (mkFlag aacSupport "aac") + (mkFlag stdenv.isDarwin "osx") "--enable-debugging" ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index bd52a70eaf2..a88c0b345d7 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - version = "5.1.2"; + version = "5.1.5"; in stdenv.mkDerivation { name = "unrar-${version}"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "0344cn4w3lw2111m3g431khiyndx9ibbp952bli1inx2fixps9cq"; + sha256 = "1jrla255911rbl953br2xbgvyw15kpi11r4lpqm3jlw553ccw912"; }; patchPhase = '' diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix new file mode 100644 index 00000000000..61553566d6c --- /dev/null +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon +, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }: + +stdenv.mkDerivation rec { + version = "20130809"; + name = "mpdcron-${version}"; + + src = fetchgit { + url = https://github.com/alip/mpdcron.git; + rev = "1dd16181c32f33e7754bbe21841c8e70b28f8ecd"; + sha256 = "1h3n433jn9yg74i218pkxzrngsjpnf0z02lakfldl6j1s9di2pn3"; + }; + + meta = { + description = "A cron like daemon for mpd."; + homepage = http://alip.github.io/mpdcron/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; unix; + maintainers = [ stdenv.lib.maintainers.lovek323 ]; + }; + + buildInputs = + [ autoconf automake libtool pkgconfig glib libdaemon + mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ]; +} diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 183b889da9b..161383cb9de 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bcache-tools-${version}"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; - sha256 = "1abf86xcnj601lddig3kmn26jrf8q8xhcyszf5pxrcs5ym72jj8l"; + sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; buildInputs = [ pkgconfig utillinux ]; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 4da1a84e937..bff5aaf242b 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0qpnr4czgc62vsfnmv933w62nq3xwcbnvqch72qakfgca75rsp4d"; }; + patches = + [ # Prevent the unionfs daemon from being killed during + # shutdown. See + # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ + # for details. + ./prevent-kill-on-shutdown.patch + ]; + buildInputs = [ cmake fuse ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it diff --git a/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch b/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch new file mode 100644 index 00000000000..0a98b83282b --- /dev/null +++ b/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' unionfs-fuse-0.26-orig/src/unionfs.c unionfs-fuse-0.26/src/unionfs.c +--- unionfs-fuse-0.26-orig/src/unionfs.c 2012-09-11 00:06:32.000000000 +0200 ++++ unionfs-fuse-0.26/src/unionfs.c 2014-05-21 14:22:03.597861805 +0200 +@@ -831,6 +831,10 @@ + } + #endif + ++ /* Prevent systemd's shutdown from killing us. */ ++ if (access("/etc/initrd-release", F_OK) >= 0) ++ argv[0][0] = '@'; ++ + umask(0); + int res = fuse_main(args.argc, args.argv, &unionfs_oper, NULL); + RETURN(uopt.doexit ? uopt.retval : res); diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 5df814530a1..ed9ac2da2d2 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libjpeg, lcms, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.19"; + name = "dcraw-9.20"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "0x2qjavfp97vadw29d384sb887wgpfki4sl00p5lximf0a7fa0dv"; + sha256 = "151xpfmfd1ksjcnpmsnxry1mf2xpx9iaiy9sg1vxgm9i80lkkp5f"; }; buildInputs = [ libjpeg lcms gettext jasper ]; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 480e00c850d..d99fc1960dd 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.5.2"; + name = "pv-1.5.3"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "1sz5ishd66xliwnhv0x3vr48fbp7id4xd8fsrbm66y7f5mfd7qp2"; + sha256 = "03prg025kzivl1a5xqlf45szpnpqrmkzcvnf7lb2fc1v3jdrkwvn"; }; meta = { diff --git a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch deleted file mode 100644 index 83cdbad7bba..00000000000 --- a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f730ba82d641029dd262d05e8533fc7643f4c4b9 Mon Sep 17 00:00:00 2001 -From: Aaron Lindsay -Date: Wed, 15 Jan 2014 13:49:40 -0500 -Subject: [PATCH] Add autoconfiguration for libjansson - ---- - configure.ac | 5 +++++ - net/daemon/Makefile.am | 4 ++-- - net/server/Makefile.am | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64e74b5..0911671 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -248,6 +248,7 @@ SEARPC_REQUIRED=1.0 - ZDB_REQUIRED=2.10 - LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 - SEARPC_REQUIRED=1.0 -+JANSSON_REQUIRED=2.2.1 - CURL_REQUIRED=7.17 - - PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED]) -@@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED]) - AC_SUBST(SEARPC_CFLAGS) - AC_SUBST(SEARPC_LIBS) - -+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) -+AC_SUBST(JANSSON_CFLAGS) -+AC_SUBST(JANSSON_LIBS) -+ - if test x${compile_python} = xyes; then - AM_PATH_PYTHON([2.6]) - -diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am -index 35d1a3c..0e28c6a 100644 ---- a/net/daemon/Makefile.am -+++ b/net/daemon/Makefile.am -@@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \ - - ccnet_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ -- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ -+ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ - - - ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined -@@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs) - - ccnet_test_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ -- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ -+ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ - - ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@ - -diff --git a/net/server/Makefile.am b/net/server/Makefile.am -index d587f48..b048936 100644 ---- a/net/server/Makefile.am -+++ b/net/server/Makefile.am -@@ -103,7 +103,7 @@ ccnet_server_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ - -lpthread \ - @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \ -- @LDAP_LIBS@ -+ @LDAP_LIBS@ @JANSSON_LIBS@ - - - ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined --- -1.8.5.2 - diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 14b88ddafe8..8896156bd1c 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { - version = "1.4.0"; - seafileVersion = "2.1.1"; + version = "1.4.2"; + seafileVersion = "3.0.4"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz"; - sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0"; + sha256 = "1y9x6k9ql8bj83016a1mi1m5ixxh8fm7p4qbd5mslnamvjln171q"; }; - patches = [ ./libccnet.pc.patch ./0001-Add-autoconfiguration-for-libjansson.patch ]; - buildInputs = [ which automake autoconf pkgconfig libtool vala python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; diff --git a/pkgs/tools/networking/ccnet/libccnet.pc.patch b/pkgs/tools/networking/ccnet/libccnet.pc.patch deleted file mode 100644 index 0d9fea552bc..00000000000 --- a/pkgs/tools/networking/ccnet/libccnet.pc.patch +++ /dev/null @@ -1,10 +0,0 @@ -From: Aaron Lindsay - ---- a/libccnet.pc.in 2013-01-10 01:35:24.000000000 -0500 -+++ b/libccnet.pc.in 2013-01-19 11:31:50.479301798 -0500 -@@ -1,4 +1,4 @@ --prefix=(DESTDIR)@prefix@ -+prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 6926b9aa82a..ea94560219f 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { name = "openssh-6.6p1"; src = fetchurl { - url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; + url = "http://ftp.nluug.nl/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; sha256 = "1fq3w86q05y5nn6z878wm312k0svaprw8k007188fd259dkg1ha8"; }; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 4f54404b713..7162e29e1ea 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonPackage rec { name = "speedtest-cli-${version}"; - version = "0.2.5"; + version = "0.2.7"; src = fetchurl { url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; - sha256 = "0a19kyn6064jbxda4yq1rfrlqlh8ha40fgwkj4rckdzk9bnxkhdn"; + sha256 = "00r3mjr8852glwryfj9f86pikqg1v0f0xivy25cj86n526wdpy95"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix similarity index 90% rename from pkgs/tools/package-management/cabal-install/1.20.0.1.nix rename to pkgs/tools/package-management/cabal-install/1.20.0.2.nix index d0db9354ae0..dba92ab9321 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.1"; - sha256 = "14zrsbjr7kgrnjd5hxczll4j39vwj95drlw73gad2div2954dqxi"; + version = "1.20.0.2"; + sha256 = "1nsc8qklhlg2xpaj7k158gg45rlrp7mn15zyfsgjpaqf3rjm9dl4"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 1df8c1a62d2..8975ca4324d 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub }: - + stdenv.mkDerivation rec { name = "mkpasswd-${version}"; @@ -22,10 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://packages.qa.debian.org/w/whois.html; - description = '' - Overfeatured front end to crypt, from the Debian whois package - ''; - license = licenses.gpl2; - maintainers = with maintainers; [ cstrahan ]; + description = "Overfeatured front-end to crypt, from the Debian whois package"; + license = licenses.gpl2; + maintainers = [ maintainers.cstrahan ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 28d58abe5aa..8e4848f2db6 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.8"; + name = "monit-5.8.1"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1xa7i29ma81jjxac0qc29wcxxvbv58n3jbwmllscamh1phz5f00c"; + sha256 = "1rbhr3aff8pbiz60r73607hci4yngv5xq1b6yjx9xhks4mwlnpm2"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 184701ceb59..cbffd8648d4 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, eventlog, pkgconfig, glib, python }: stdenv.mkDerivation { - name = "syslog-ng-3.5.3"; + name = "syslog-ng-3.5.4.1"; src = fetchurl { - url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.3/source/syslog-ng_3.5.3.tar.gz"; - sha256 = "1l3424qn9bf9z742pqba8x3dj7g729asimmhlizv1rvjlaxa2jd3"; + 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"; }; buildInputs = [ eventlog pkgconfig glib python ]; diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 2484aac8b0d..c67444838b2 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-7.7.2"; + name = "basex-7.8.2"; src = fetchurl { - url = "http://files.basex.org/releases/7.7.2/BaseX772.zip"; - sha256 = "1rh91rzgca1waq8jnd3ard1r04qlalc2qqrawmrahwxgf3f16f4a"; + url = "http://files.basex.org/releases/7.8.2/BaseX782.zip"; + sha256 = "0i9h7fsvn8cy1g44f23iyqndwamvx4kvyc4y3i00j15qm6qd2kbm"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d2249ff333..2f24425b773 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -270,7 +270,7 @@ let buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils; inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk; - inherit less su buildEnv; + inherit less buildEnv; }; dotnetenv = import ../build-support/dotnetenv { @@ -462,12 +462,18 @@ let analog = callPackage ../tools/admin/analog {}; + apktool = callPackage ../development/tools/apktool { + buildTools = androidenv.buildTools; + }; + apt-offline = callPackage ../tools/misc/apt-offline { }; archivemount = callPackage ../tools/filesystems/archivemount { }; arandr = callPackage ../tools/X11/arandr { }; + arcanist = callPackage ../development/tools/misc/arcanist {}; + arduino_core = callPackage ../development/arduino/arduino-core { jdk = jdk; jre = jdk; @@ -632,6 +638,8 @@ let mcrl2 = callPackage ../tools/misc/mcrl2 { }; + mpdcron = callPackage ../tools/audio/mpdcron { }; + syslogng = callPackage ../tools/system/syslog-ng { }; rsyslog = callPackage ../tools/system/rsyslog { }; @@ -6390,10 +6398,10 @@ let python = python32; }; - python27Packages = recurseIntoAttrs (import ./python-packages.nix { + python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; python = python27; - }); + })); pypyPackages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; @@ -6609,10 +6617,8 @@ let mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; mpd = callPackage ../servers/mpd { - # resolve the "stray '@' in program" errors - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; + aacSupport = config.mpd.aacSupport or true; + ffmpegSupport = config.mpd.ffmpegSupport or true; }; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; @@ -6765,6 +6771,8 @@ let sipwitch = callPackage ../servers/sip/sipwitch { }; + spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; + squids = recurseIntoAttrs( import ../servers/squid/squids.nix { inherit fetchurl stdenv perl lib composableDerivation openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool @@ -10878,7 +10886,7 @@ let libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; + withIcu = true; withGraphite2 = !stdenv.isDarwin; }; }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 3c5d50835ea..3618c0f10ed 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -16,11 +16,12 @@ ghcHEADPrefs = self : super : super // { mtl = self.mtl_2_1_3_1; - cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = null; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; }; ghc782Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_0; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; }; }; ghc763Prefs = self : super : ghc782Prefs self super // { @@ -29,37 +30,42 @@ haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; }; }; }; - binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_0; }; - bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_0; }; }; + binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; }; + bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; }; criterion = super.criterion.override { statistics = self.statistics.override { - vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_0; }; + vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; }; }; }; gloss = null; # requires base >= 4.7 haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 - pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; }; + pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x + zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; ghc742Prefs = self : super : ghc763Prefs self super // { - aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; }; + aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; }; + attoparsec = self.attoparsec_0_11_3_1; + extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + scientific = self.scientific_0_2_0_2; }; ghc722Prefs = self : super : ghc742Prefs self super // { + caseInsensitive = self.caseInsensitive_1_0_0_1; deepseq = self.deepseq_1_3_0_2; DrIFT = null; # doesn't compile with old GHC versions - extensibleExceptions = null; # core package in ghc <= 7.4.x haddock = self.haddock_2_9_4; syb = self.syb_0_4_0; }; ghc704Prefs = self : super : ghc722Prefs self super // { - binary = self.binary_0_7_2_0; # core package in ghc >= 7.2.2 + binary = self.binary_0_7_2_1; # core package in ghc >= 7.2.2 + caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; HsSyck = self.HsSyck_0_51; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; @@ -68,35 +74,51 @@ ghc6123Prefs = self : super : ghc704Prefs self super // { alex = self.alex_3_1_3; + async = self.async_2_0_1_4; + attoparsec = self.attoparsec_0_10_4_0; cabalInstall = self.cabalInstall_1_16_0_2; cgi = self.cgi_3001_1_7_5; deepseq = self.deepseq_1_2_0_1; + dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + exceptions = null; # none of our versions compile haddock = self.haddock_2_7_2; + logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + monadPar = self.monadPar_0_1_0_3; + nats = null; # none of our versions compile parallel = self.parallel_3_2_0_3; primitive = self.primitive_0_5_0_1; + reflection = super.reflection.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + scientific = null; # none of our versions compile + split = self.split_0_1_4_3; stm = self.stm_2_4_2; syb = null; # core package in ghc < 7 + tagged = super.tagged.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + temporary = null; # none of our versions compile + vectorAlgorithms = super.vectorAlgorithms.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; ghc6104Prefs = self : super : ghc6123Prefs self super // { - alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - binary = super.binary_0_6_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - Cabal = self.Cabal_1_16_0_3; + alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + async = null; # none of our versions compile + attoparsec = null; # none of our versions compile + binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; - happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - hashable = self.hashable_1_1_2_5; - HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; OpenGLRaw = self.OpenGLRaw_1_3_0_0; OpenGL = self.OpenGL_2_6_0_1; - QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; # Abstraction for Haskell packages collections diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 205961701ed..216037e74cd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -138,9 +138,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aes = callPackage ../development/libraries/haskell/aes {}; - aeson = callPackage ../development/libraries/haskell/aeson { - blazeBuilder = null; - }; + aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; + aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; + aeson = self.aeson_0_7_0_6; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; @@ -191,7 +191,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 = self.attoparsec_0_11_3_1; + attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; + attoparsec = self.attoparsec_0_11_3_4; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; @@ -228,7 +229,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bimap = callPackage ../development/libraries/haskell/bimap {}; binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {}; - binary_0_7_2_0 = callPackage ../development/libraries/haskell/binary/0.7.2.0.nix {}; + binary_0_7_2_1 = callPackage ../development/libraries/haskell/binary/0.7.2.1.nix {}; binary = null; # core package since ghc >= 7.2.x binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {}; @@ -270,11 +271,15 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; bmp = callPackage ../development/libraries/haskell/bmp { - binary = self.binary_0_7_2_0; + binary = self.binary_0_7_2_1; }; Boolean = callPackage ../development/libraries/haskell/Boolean {}; + boundingboxes_0_1_1 = callPackage ../development/libraries/haskell/boundingboxes/0.1.1.nix {}; + boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {}; + boundingboxes = self.boundingboxes_0_2; + brainfuck = callPackage ../development/libraries/haskell/brainfuck {}; bson = callPackage ../development/libraries/haskell/bson {}; @@ -326,6 +331,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in carray = callPackage ../development/libraries/haskell/carray {}; + categories = callPackage ../development/libraries/haskell/categories {}; + cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; @@ -404,6 +411,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; + colors = callPackage ../development/libraries/haskell/colors {}; + colour = callPackage ../development/libraries/haskell/colour {}; comonad = callPackage ../development/libraries/haskell/comonad {}; @@ -414,6 +423,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; + compdata = callPackage ../development/libraries/haskell/compdata {}; + composition = callPackage ../development/libraries/haskell/composition {}; concatenative = callPackage ../development/libraries/haskell/concatenative {}; @@ -436,6 +447,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in constraints = callPackage ../development/libraries/haskell/constraints {}; + controlBool = callPackage ../development/libraries/haskell/control-bool {}; + controlMonadFree = callPackage ../development/libraries/haskell/control-monad-free {}; controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; @@ -712,6 +725,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in fileLocation = callPackage ../development/libraries/haskell/file-location {}; + fmlist = callPackage ../development/libraries/haskell/fmlist {}; + ftphs = callPackage ../development/libraries/haskell/ftphs {}; extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {}; @@ -766,8 +781,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in free = callPackage ../development/libraries/haskell/free {}; + freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix { + boundingboxes = self.boundingboxes_0_1_1; + }; + freeGame_1_1 = callPackage ../development/libraries/haskell/free-game/1.1.nix {}; + freeGame = self.freeGame_1_1; + fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; + freetype2 = callPackage ../development/libraries/haskell/freetype2 {}; + gamma = callPackage ../development/libraries/haskell/gamma {}; geniplate = callPackage ../development/libraries/haskell/geniplate {}; @@ -828,7 +851,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in GLFW = callPackage ../development/libraries/haskell/GLFW {}; - GLFWb = callPackage ../development/libraries/haskell/GLFW-b {}; + GLFWB = callPackage ../development/libraries/haskell/GLFW-b {}; glib = callPackage ../development/libraries/haskell/glib { glib = pkgs.glib; @@ -850,8 +873,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; }; - GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_4_0_0; }; - GLURaw = self.GLURaw_1_4_0_0; + GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {}; + GLURaw = self.GLURaw_1_4_0_1; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; @@ -867,10 +890,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenGLRaw = self.OpenGLRaw_1_3_0_0; OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; }; - GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix { - OpenGL = self.OpenGL_2_9_1_0; + GLUT_2_5_1_1 = callPackage ../development/libraries/haskell/GLUT/2.5.1.1.nix { + OpenGL = self.OpenGL_2_9_2_0; }; - GLUT = self.GLUT_2_5_1_0; + GLUT = self.GLUT_2_5_1_1; gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; @@ -1070,6 +1093,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; hoogle = callPackage ../development/libraries/haskell/hoogle {}; + hoogleLocal = callPackage ../development/libraries/haskell/hoogle/local.nix { + parallel = pkgs.parallel; + }; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -1226,6 +1252,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; + JuicyPixelsUtil = callPackage ../development/libraries/haskell/JuicyPixels-util {}; + kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {}; kansasLava = callPackage ../development/libraries/haskell/kansas-lava {}; @@ -1242,6 +1270,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in languageEcmascript = callPackage ../development/libraries/haskell/language-ecmascript {}; + languageGlsl = callPackage ../development/libraries/haskell/language-glsl {}; + languageJava = callPackage ../development/libraries/haskell/language-java {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; @@ -1354,8 +1384,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in minimorph = callPackage ../development/libraries/haskell/minimorph {}; + minioperational = callPackage ../development/libraries/haskell/minioperational {}; + miniutter = callPackage ../development/libraries/haskell/miniutter { - binary = self.binary_0_7_2_0; + binary = self.binary_0_7_2_1; }; mimeMail = callPackage ../development/libraries/haskell/mime-mail {}; @@ -1527,9 +1559,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in oeis = callPackage ../development/libraries/haskell/oeis {}; - OpenAL = callPackage ../development/libraries/haskell/OpenAL { - OpenGL = self.OpenGL_2_9_1_0; - }; + OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; @@ -1537,12 +1567,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; - OpenGL = self.OpenGL_2_9_1_0; + OpenGL_2_9_2_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.2.0.nix {}; + OpenGL = self.OpenGL_2_9_2_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {}; - OpenGLRaw = self.OpenGLRaw_1_4_0_0; + OpenGLRaw_1_5_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.5.0.0.nix {}; + OpenGLRaw = self.OpenGLRaw_1_5_0_0; opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {}; @@ -1587,8 +1618,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = self.parsec_3_1_5; parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_11 = callPackage ../development/libraries/haskell/parsers/0.11.nix {}; - parsers = self.parsers_0_11; + parsers_0_11_0_1 = callPackage ../development/libraries/haskell/parsers/0.11.0.1.nix {}; + parsers = self.parsers_0_11_0_1; parsimony = callPackage ../development/libraries/haskell/parsimony {}; @@ -1684,9 +1715,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in prettyclass = callPackage ../development/libraries/haskell/prettyclass {}; - prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {}; - prettyShow = self.prettyShow_1_6_7; + prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; punycode = callPackage ../development/libraries/haskell/punycode {}; @@ -1773,6 +1802,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; + recursionSchemes = callPackage ../development/libraries/haskell/recursion-schemes {}; + reducers = callPackage ../development/libraries/haskell/reducers {}; reflection = callPackage ../development/libraries/haskell/reflection {}; @@ -1849,7 +1880,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; - scientific = callPackage ../development/libraries/haskell/scientific {}; + scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; + scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {}; + scientific = self.scientific_0_3_2_1; scotty = callPackage ../development/libraries/haskell/scotty {}; @@ -1869,6 +1902,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setenv = callPackage ../development/libraries/haskell/setenv {}; + setlocale = callPackage ../development/libraries/haskell/setlocale {}; + shelly = callPackage ../development/libraries/haskell/shelly {}; simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; @@ -2007,6 +2042,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sourcemap = callPackage ../development/libraries/haskell/sourcemap {}; + split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {}; split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2; @@ -2182,8 +2218,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; - tls_1_2_7 = callPackage ../development/libraries/haskell/tls/1.2.7.nix {}; - tls = self.tls_1_2_7; + tls_1_2_8 = callPackage ../development/libraries/haskell/tls/1.2.8.nix {}; + tls = self.tls_1_2_8; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { tls = self.tls_1_1_5; @@ -2299,8 +2335,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; - vector_0_10_9_1 = callPackage ../development/libraries/haskell/vector/0.10.9.1.nix {}; - vector = self.vector_0_10_9_1; + vector_0_10_9_2 = callPackage ../development/libraries/haskell/vector/0.10.9.2.nix {}; + vector = self.vector_0_10_9_2; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; @@ -2344,6 +2380,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in warpTls = callPackage ../development/libraries/haskell/warp-tls {}; + wcwidth = callPackage ../development/libraries/haskell/wcwidth {}; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; @@ -2368,13 +2406,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in word8 = callPackage ../development/libraries/haskell/word8 {}; - wreq = callPackage ../development/libraries/haskell/wreq { - aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; }; - attoparsec = self.attoparsec_0_11_3_1; - lens = self.lens.override { - aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; }; - }; - }; + wreq = callPackage ../development/libraries/haskell/wreq {}; wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; @@ -2470,7 +2502,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; }; - zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; + zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {}; + zipArchive_0_2_3_2 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.2.nix {}; + zipArchive = self.zipArchive_0_2_3_2; zipper = callPackage ../development/libraries/haskell/zipper {}; @@ -2658,13 +2692,17 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; }; - cabalInstall = self.cabalInstall_1_20_0_1; + cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall = self.cabalInstall_1_20_0_2; + + codex = callPackage ../development/tools/haskell/codex {}; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; + hobbes = callPackage ../development/tools/haskell/hobbes {}; + jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; keter = callPackage ../development/tools/haskell/keter {}; @@ -2687,7 +2725,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in LambdaHack = callPackage ../games/LambdaHack { vectorBinaryInstances = self.vectorBinaryInstances.override { - binary = self.binary_0_7_2_0; # the miniutter build input requires this version + binary = self.binary_0_7_2_1; # the miniutter build input requires this version }; }; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 356b736506d..e250085f730 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -18226,6 +18226,26 @@ ]; passthru.names = [ "typedarray" ]; }; + by-spec."typescript"."*" = + self.by-version."typescript"."1.0.1"; + by-version."typescript"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "typescript-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz"; + name = "typescript-1.0.1.tgz"; + sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a"; + }) + ]; + buildInputs = + (self.nativeDeps."typescript" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "typescript" ]; + }; + "typescript" = self.by-version."typescript"."1.0.1"; by-spec."uglify-js"."*" = self.by-version."uglify-js"."2.4.13"; by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 57eab330ce2..4d220a00829 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -130,4 +130,5 @@ , "phantomjs" , "sinon" , "shelljs" +, "typescript" ] diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9949682d337..2b67e2a89d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1631,15 +1631,17 @@ let self = _self // overrides; _self = with self; { }; CPANMetaYAML = buildPerlPackage { - name = "CPAN-Meta-YAML-0.008"; + name = "CPAN-Meta-YAML-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.008.tar.gz; - sha256 = "1fxc8ybn6mdgzxyq1n69rgihmpfaarfclmbdw2rznya5zg2b0nz0"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.012.tar.gz; + sha256 = "7c728c573ba74294d3df2f0cbae2cd1b3830ed47040649b49a33a086b8300d28"; }; + buildInputs = [ JSONPP ]; + doCheck = false; # Test::More too old meta = { - homepage = https://github.com/dagolden/cpan-meta-yaml; + homepage = https://github.com/dagolden/CPAN-Meta-YAML; description = "Read and write a subset of YAML for CPAN Meta files"; - license = "perl5"; + license = "perl"; }; }; @@ -3318,16 +3320,19 @@ let self = _self // overrides; _self = with self; { }; }; - ExtUtilsMakeMaker = buildPerlPackage rec{ + ExtUtilsMakeMaker = buildPerlPackage { name = "ExtUtils-MakeMaker-6.98"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "1vv3v9rc2dnx8amwa7lpdywg3lakx7yv2n38qvfbk9jzkqc27c1f"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.98.tar.gz; + sha256 = "2eb023189e5fa6b9dcc66858b1fde953d1f1b86f971ec5ab42dd36c172da63ef"; }; propagatedBuildInputs = - [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta - FileCopyRecursive VersionRequirements ExtUtilsManifest - ]; + [ ParseCPANMeta JSONPP JSONPPCompat5006 CPANMetaYAML FileCopyRecursive ]; + meta = { + homepage = https://metacpan.org/release/ExtUtils-MakeMaker; + description = "Create a module Makefile"; + license = "perl"; + }; }; ExtUtilsManifest = buildPerlPackage rec { @@ -4616,6 +4621,18 @@ let self = _self // overrides; _self = with self; { }; }; + JSONPPCompat5006 = buildPerlPackage { + name = "JSON-PP-Compat5006-1.09"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-Compat5006-1.09.tar.gz; + sha256 = "197030df52635f9bbe25af10742eea5bd74971473118c11311fcabcb62e3716a"; + }; + meta = { + description = "Helper module in using JSON::PP in Perl 5.6"; + license = "perl"; + }; + }; + JSONXS = buildPerlPackage { name = "JSON-XS-2.34"; src = fetchurl { @@ -6610,13 +6627,18 @@ let self = _self // overrides; _self = with self; { }; }; - ParseCPANMeta = buildPerlPackage rec { - name = "Parse-CPAN-Meta-1.4409"; + ParseCPANMeta = buildPerlPackage { + name = "Parse-CPAN-Meta-1.4414"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Parse/${name}.tar.gz"; - sha256 = "0b7cp78zajmwf4a0968p3b2bb00axkxj3a9nq1rx8cb17hhva819"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4414.tar.gz; + sha256 = "cd7608154dfb72c9e110f012befe6b75d78448cb3e761716b60aa7545e16ca1b"; }; propagatedBuildInputs = [ CPANMetaYAML JSONPP ]; + meta = { + homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta; + description = "Parse META.yml and META.json CPAN metadata files"; + license = "perl"; + }; }; ParseRecDescent = buildPerlPackage rec { @@ -9234,10 +9256,14 @@ let self = _self // overrides; _self = with self; { }; UNIVERSALrequire = buildPerlPackage { - name = "UNIVERSAL-require-0.16"; + name = "UNIVERSAL-require-0.17"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.16.tar.gz; - sha256 = "0fbx3f39lvck3n4ksqwji5m1hfdagx25jk5kg2h0gkb01jwz3za2"; + url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.17.tar.gz; + sha256 = "5dc9f13f2d2bbdf852387e2a63c0753728c2bea9125dd628c313db3ef66ec4c3"; + }; + meta = { + description = "Require() modules from a variable"; + license = "perl"; }; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fd990ebf17e..ce01b257741 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -422,6 +422,7 @@ let xf86videonv = linux; xf86videovesa = linux; xf86videovmware = linux; + xf86videomodesetting = linux; xfs = linux; xinput = linux; xkbcomp = linux;