diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e3b3b05067f7..ab6c2c34c5ed 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -46,6 +46,7 @@ coroa = "Jonas Hörsch "; cstrahan = "Charles Strahan "; DamienCassou = "Damien Cassou "; + davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; DerGuteMoritz = "Moritz Heidkamp "; dmalikov = "Dmitry Malikov "; @@ -53,9 +54,11 @@ ederoyd46 = "Matthew Brown "; edwtjo = "Edward Tjörnhammar "; eelco = "Eelco Dolstra "; + eikek = "Eike Kettner "; ellis = "Ellis Whitehead "; emery = "Emery Hemingway "; ertes = "Ertugrul Söylemez "; + exlevan = "Alexey Levan "; falsifian = "James Cook "; flosse = "Markus Kohlhase "; fpletz = "Franz Pletz "; @@ -132,6 +135,7 @@ shell = "Shell Turner "; shlevy = "Shea Levy "; simons = "Peter Simons "; + sjmackenzie = "Stewart Mackenzie "; skeidel = "Sven Keidel "; smironov = "Sergey Mironov "; sprock = "Roger Mason "; diff --git a/nixos/doc/manual/release-notes/rl-1411.xml b/nixos/doc/manual/release-notes/rl-1411.xml index 74cf8323e692..e355118139dc 100644 --- a/nixos/doc/manual/release-notes/rl-1411.xml +++ b/nixos/doc/manual/release-notes/rl-1411.xml @@ -11,6 +11,19 @@ following incompatible changes: + The default version of Apache httpd is now 2.4. If + you use the option to pass literal + Apache configuration text, you may need to update it — see Apache’s + documentation for details. If you wish to continue to use + httpd 2.2, add the following line to your NixOS configuration: + + +services.httpd.package = pkgs.apacheHttpd_2_2; + + + + The host side of a container virtual Ethernet pair is now called ve-container-name rather than c-container-name. diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index b2409c6006bc..5ad546e9534d 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, pathsFromGraph, xorriso, syslinux +{ stdenv, perl, cdrkit, pathsFromGraph , # The file name of the resulting ISO image. isoName ? "cd.iso" @@ -22,18 +22,12 @@ , # Whether this should be an efi-bootable El-Torito CD. efiBootable ? false -, # Wheter this should be an hybrid CD (bootable from USB as well as CD). - usbBootable ? false - , # The path (in the ISO file system) of the boot image. bootImage ? "" , # The path (in the ISO file system) of the efi boot image. efiBootImage ? "" -, # The path (outside the ISO file system) of the isohybrid-mbr image. - isohybridMbrImage ? "" - , # Whether to compress the resulting ISO image with bzip2. compressImage ? false @@ -44,14 +38,13 @@ assert bootable -> bootImage != ""; assert efiBootable -> efiBootImage != ""; -assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = "iso9660-image"; builder = ./make-iso9660-image.sh; - buildInputs = [perl xorriso syslinux]; + buildInputs = [perl cdrkit]; - inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable isohybridMbrImage usbBootable; + inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable; # !!! should use XML. sources = map (x: x.source) contents; diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index c8522513aa23..675b5bb35148 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -31,20 +31,11 @@ if test -n "$bootable"; then fi done - isoBootFlags="-eltorito-boot ${bootImage} - -eltorito-catalog .boot.cat - -no-emul-boot -boot-load-size 4 -boot-info-table" -fi - -if test -n "$usbBootable"; then - usbBootFlags="-isohybrid-mbr ${isohybridMbrImage}" + bootFlags="-b $bootImage -c .boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" fi if test -n "$efiBootable"; then - efiBootFlags="-eltorito-alt-boot - -e $efiBootImage - -no-emul-boot - -isohybrid-gpt-basdat" + bootFlags="$bootFlags -eltorito-alt-boot -e $efiBootImage -no-emul-boot" fi touch pathlist @@ -83,41 +74,18 @@ for ((n = 0; n < ${#objects[*]}; n++)); do fi done -# Escape filenames that contain '='. -# TODO: Handle this properly. This fails for filenames -# that contain multiple '=' symbols. +# !!! what does this do? cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer mkdir -p $out/iso - -xorriso="xorriso - -as mkisofs - -iso-level 3 - -volid ${volumeID} - -appid nixos - -publisher nixos - -graft-points - -full-iso9660-filenames - ${isoBootFlags} - ${usbBootFlags} - ${efiBootFlags} - -r - -path-list pathlist.safer - --sort-weight 0 / - --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO - -$xorriso -output $out/iso/$isoName - -if test -n "$usbBootable"; then - echo "Making image hybrid..." - isohybrid --uefi $out/iso/$isoName +genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer ${volumeID:+-V $volumeID}" +if test -z "$compressImage"; then + $genCommand -o $out/iso/$isoName +else + $genCommand | bzip2 > $out/iso/$isoName.bz2 fi -if test -n "$compressImage"; then - echo "Compressing image..." - bzip2 $out/iso/$isoName -fi mkdir -p $out/nix-support echo $system > $out/nix-support/system diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index a68581c113fc..3001214f90fb 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -36,9 +36,6 @@ with lib; # EFI booting isoImage.makeEfiBootable = true; - # USB booting - isoImage.makeUsbBootable = true; - # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index f387c64cb9c9..22f31c460802 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -8,37 +8,45 @@ with lib; let - # The configuration file for syslinux. - isolinuxCfg = + # The Grub image. + grubImage = pkgs.runCommand "grub_eltorito" {} '' - SERIAL 0 38400 - UI vesamenu.c32 - MENU TITLE NixOS - MENU BACKGROUND /isolinux/background.png + ${pkgs.grub2}/bin/grub-mkimage -p /boot/grub -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot + cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out + ''; # */ - LABEL boot - MENU LABEL Boot NixOS - LINUX /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} - INITRD /boot/initrd - LABEL chain - MENU LABEL Boot existing OS - COM32 chain.c32 - APPEND hd0 0 + # The configuration file for Grub. + grubCfg = + '' + set default=${builtins.toString config.boot.loader.grub.default} + set timeout=${builtins.toString config.boot.loader.grub.timeout} - LABEL reboot - MENU LABEL Reboot - COM32 reboot.c32 + if loadfont /boot/grub/unicode.pf2; then + set gfxmode=640x480 + insmod gfxterm + insmod vbe + terminal_output gfxterm - LABEL poweroff - MENU LABEL Power Off - COM32 poweroff.c32 + insmod png + if background_image /boot/grub/splash.png; then + set color_normal=white/black + set color_highlight=black/white + else + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue + fi + + fi + + ${config.boot.loader.grub.extraEntries} ''; + # The efi boot image efiDir = pkgs.runCommand "efi-directory" {} '' - mkdir -p $out/EFI/boot - cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi + mkdir -p $out/efi/boot + cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/efi/boot/boot${targetArch}.efi mkdir -p $out/loader/entries echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf @@ -144,22 +152,6 @@ in ''; }; - isoImage.makeUsbBootable = mkOption { - default = false; - description = '' - Whether the ISO image should be bootable from CD as well as USB. - ''; - }; - - isoImage.splashImage = mkOption { - default = pkgs.fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/5729ab16c6a5793c10a2913b5a1b3f59b91c36ee/ideas/grub-splash/grub-nixos-1.png; - sha256 = "43fd8ad5decf6c23c87e9026170a13588c2eba249d9013cb9f888da5e2002217"; - }; - description = '' - The splash image to use in the bootloader. - ''; - }; }; @@ -174,7 +166,7 @@ in # !!! Hack - attributes expected by other modules. system.boot.loader.kernelFile = "bzImage"; - environment.systemPackages = [ pkgs.grub2 pkgs.syslinux ]; + environment.systemPackages = [ pkgs.grub2 ]; # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the @@ -221,7 +213,7 @@ in options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; }; - boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ]; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ]; boot.initrd.kernelModules = [ "loop" ]; @@ -241,12 +233,15 @@ in # Individual files to be included on the CD, outside of the Nix # store on the CD. isoImage.contents = - [ { source = pkgs.substituteAll { - name = "isolinux.cfg"; - src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; + [ { source = grubImage; + target = "/boot/grub/grub_eltorito"; + } + { source = pkgs.substituteAll { + name = "grub.cfg"; + src = pkgs.writeText "grub.cfg-in" grubCfg; bootRoot = "/boot"; }; - target = "/isolinux/isolinux.cfg"; + target = "/boot/grub/grub.cfg"; } { source = config.boot.kernelPackages.kernel + "/bzImage"; target = "/boot/bzImage"; @@ -254,38 +249,51 @@ in { source = config.system.build.initialRamdisk + "/initrd"; target = "/boot/initrd"; } + { source = "${pkgs.grub2}/share/grub/unicode.pf2"; + target = "/boot/grub/unicode.pf2"; + } + { source = config.boot.loader.grub.splashImage; + target = "/boot/grub/splash.png"; + } { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } - { source = "${pkgs.syslinux}/share/syslinux"; - target = "/isolinux"; - } - { source = config.isoImage.splashImage; - target = "/isolinux/background.png"; - } ] ++ optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; } - { source = "${efiDir}/EFI"; - target = "/EFI"; + { source = "${efiDir}/efi"; + target = "/efi"; } { source = "${efiDir}/loader"; target = "/loader"; } - ]; + ] ++ mapAttrsToList (n: v: { source = v; target = "/boot/${n}"; }) config.boot.loader.grub.extraFiles; + + # The Grub menu. + boot.loader.grub.extraEntries = + '' + menuentry "NixOS ${config.system.nixosVersion} Installer" { + linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + initrd /boot/initrd + } + + menuentry "Boot from hard disk" { + set root=(hd0) + chainloader +1 + } + ''; + + boot.loader.grub.timeout = 10; # Create the ISO image. system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({ - inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux; + inherit (pkgs) stdenv perl cdrkit pathsFromGraph; inherit (config.isoImage) isoName compressImage volumeID contents; bootable = true; - bootImage = "/isolinux/isolinux.bin"; - } // optionalAttrs config.isoImage.makeUsbBootable { - usbBootable = true; - isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin"; + bootImage = "/boot/grub/grub_eltorito"; } // optionalAttrs config.isoImage.makeEfiBootable { efiBootable = true; efiBootImage = "boot/efi.img"; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 073a22207652..ea7d9763ce64 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -131,5 +131,6 @@ in zipModules ([] ++ obsolete' [ "programs" "bash" "enable" ] ++ obsolete' [ "services" "samba" "defaultShare" ] ++ obsolete' [ "services" "syslog-ng" "serviceName" ] +++ obsolete' [ "services" "syslog-ng" "listenToJournal" ] ) diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix index 5233794a20cc..88c3f99aed4e 100644 --- a/nixos/modules/services/hardware/thermald.nix +++ b/nixos/modules/services/hardware/thermald.nix @@ -19,6 +19,8 @@ in { ###### implementation config = mkIf cfg.enable { + services.dbus.packages = [ pkgs.thermald ]; + systemd.services.thermald = { description = "Thermal Daemon Service"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index f3991a411ec4..2bf6d1ff7904 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -43,15 +43,6 @@ in { The package providing syslog-ng binaries. ''; }; - listenToJournal = mkOption { - type = types.bool; - default = true; - description = '' - Whether syslog-ng should listen to the syslog socket used - by journald, and therefore receive all logs that journald - produces. - ''; - }; extraModulePaths = mkOption { type = types.listOf types.str; default = []; @@ -74,7 +65,7 @@ in { configHeader = mkOption { type = types.lines; default = '' - @version: 3.5 + @version: 3.6 @include "scl.conf" ''; description = '' @@ -86,18 +77,13 @@ in { }; config = mkIf cfg.enable { - systemd.sockets.syslog = mkIf cfg.listenToJournal { - wantedBy = [ "sockets.target" ]; - socketConfig.Service = "syslog-ng.service"; - }; systemd.services.syslog-ng = { description = "syslog-ng daemon"; preStart = "mkdir -p /{var,run}/syslog-ng"; - wantedBy = optional (!cfg.listenToJournal) "multi-user.target"; + wantedBy = [ "multi-user.target" ]; after = [ "multi-user.target" ]; # makes sure hostname etc is set serviceConfig = { Type = "notify"; - Sockets = if cfg.listenToJournal then "syslog.socket" else null; StandardOutput = "null"; Restart = "on-failure"; ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 749e5dcebb61..579d62884c78 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -74,21 +74,23 @@ in gid = config.ids.gids.quassel; }]; - jobs.quassel = + systemd.services.quassel = { description = "Quassel IRC client daemon"; - startOn = "ip-up"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; preStart = '' - mkdir -p ${cfg.dataDir} - chown ${user} ${cfg.dataDir} + mkdir -p ${cfg.dataDir} + chown ${user} ${cfg.dataDir} ''; - exec = '' - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \ - -c '${quassel}/bin/quasselcore --listen=${cfg.interface}\ - --port=${toString cfg.portNumber} --configdir=${cfg.dataDir}' - ''; + serviceConfig = + { + ExecStart = "${quassel}/bin/quasselcore --listen=${cfg.interface} --port=${toString cfg.portNumber} --configdir=${cfg.dataDir}"; + User = user; + PermissionsStartOnly = true; + }; }; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 85458a2ab565..1f0729c1b715 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -109,6 +109,9 @@ let "mpm_${mainCfg.multiProcessingModule}" "authz_core" "unixd" + "cache" "cache_disk" + "slotmem_shm" + "socache_shmcb" ] ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ]) ++ optional enableSSL "ssl" @@ -160,9 +163,9 @@ let sslConf = '' - SSLSessionCache shm:${mainCfg.stateDir}/ssl_scache(512000) + SSLSessionCache ${if version24 then "shmcb" else "shm"}:${mainCfg.stateDir}/ssl_scache(512000) - SSLMutex posixsem + ${if version24 then "Mutex" else "SSLMutex"} posixsem SSLRandomSeed startup builtin SSLRandomSeed connect builtin @@ -420,8 +423,7 @@ in package = mkOption { type = types.package; - default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; }; - example = literalExample "pkgs.apacheHttpd_2_4"; + default = pkgs.apacheHttpd; description = '' Overridable attribute of the Apache HTTP Server package to use. ''; @@ -593,11 +595,11 @@ in ###### implementation config = mkIf config.services.httpd.enable { - + assertions = [ { assertion = mainCfg.enableSSL == true -> mainCfg.sslServerCert != null && mainCfg.sslServerKey != null; - message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; } + message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; } ]; users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 1ce066cdc73d..11d3f576728f 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -7,6 +7,8 @@ with lib; let cfg = config.virtualisation.docker; + pro = config.nix.proxy; + proxy_env = optionalAttrs (pro != "") { Environment = "\"http_proxy=${pro}\""; }; in @@ -73,7 +75,7 @@ in # goes in config bundled with docker itself LimitNOFILE = 1048576; LimitNPROC = 1048576; - }; + } // proxy_env; }; systemd.sockets.docker = { @@ -99,7 +101,7 @@ in # goes in config bundled with docker itself LimitNOFILE = 1048576; LimitNPROC = 1048576; - }; + } // proxy_env; # Presumably some containers are running we don't want to interrupt restartIfChanged = false; diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 01f0f3fe17a3..8350bc5c6a4b 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -22,20 +22,19 @@ in { services.httpd.enable = true; services.httpd.adminAddr = "bar@example.org"; - services.httpd.extraModules = ["proxy_balancer"]; + services.httpd.extraModules = [ "proxy_balancer" "lbmethod_byrequests" ]; services.httpd.extraConfig = '' ExtendedStatus on - Order deny,allow - Allow from all + Require all granted SetHandler server-status - Allow from all + Require all granted BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0 BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0 diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index a8f9480c7d34..c151deddd70e 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE +, libSM, libICE, sqlite }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup - libunique libmpd gob2 vala libSM libICE + libunique libmpd gob2 vala libSM libICE sqlite ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix new file mode 100644 index 000000000000..6af08cf0221a --- /dev/null +++ b/pkgs/applications/audio/morituri/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao +, pygobject, gst_python, gst_plugins_base, gst_plugins_good +, setuptools, utillinux, makeWrapper }: + +stdenv.mkDerivation rec { + name = "morituri-${version}"; + version = "0.2.3"; + + src = fetchurl { + url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2"; + sha256 = "1b30bs1y8azl04izsrl01gw9ys0lhzkn5afxi4p8qbiri2h4v210"; + }; + + pythonPath = [ + pygobject gst_python pythonPackages.musicbrainzngs + pythonPackages.pycdio pythonPackages.pyxdg setuptools + ]; + + buildInputs = [ + python cdparanoia cdrdao utillinux makeWrapper + gst_plugins_base gst_plugins_good + ] ++ pythonPath; + + patches = [ ./paths.patch ]; + + postPatch = '' + substituteInPlace morituri/extern/python-command/scripts/help2man \ + --replace /usr/bin/python ${python}/bin/python + + substituteInPlace morituri/common/program.py \ + --replace umount ${utillinux}/bin/umount \ + --replace \'eject \'${utillinux}/bin/eject + + substituteInPlace morituri/program/cdparanoia.py \ + --replace '"cdparanoia"' '"${cdparanoia}/bin/cdparanoia"' + + substituteInPlace morituri/program/cdrdao.py \ + --replace "['cdrdao', ]" "['${cdrdao}/bin/cdrdao', ]" \ + --replace '"cdrdao"' '"${cdrdao}/bin/cdrdao"' + ''; + + # This package contains no binaries to patch or strip. + dontPatchELF = true; + dontStrip = true; + + postInstall = '' + wrapProgram "$out/bin/rip" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + ''; + + meta = with stdenv.lib; { + homepage = http://thomas.apestaart.org/morituri/trac/; + description = "A CD ripper aiming for accuracy over speed"; + maintainers = [ maintainers.rycee ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/audio/morituri/paths.patch b/pkgs/applications/audio/morituri/paths.patch new file mode 100644 index 000000000000..12f1d5b761c8 --- /dev/null +++ b/pkgs/applications/audio/morituri/paths.patch @@ -0,0 +1,12 @@ +diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in +--- morituri-0.2.3-orig/doc/Makefile.in 2014-11-01 00:13:01.231364181 +0100 ++++ morituri-0.2.3/doc/Makefile.in 2014-11-01 00:13:56.691812229 +0100 +@@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa + -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics + + rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri +- PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 ++ PYTHONPATH=$(top_srcdir):$(PYTHONPATH) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 + + clean-local: + @rm -rf reference diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix new file mode 100644 index 000000000000..820e959a3574 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, emacs }: + +let + modules = [ + { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; } + { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; } + { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; } + { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; } + { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; } + { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; } + { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; } + { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; } + { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; } + { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; } + { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; } + { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; } + { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; } + ]; + + forAll = f: map f modules; +in +stdenv.mkDerivation { + name = "icicles-2014-11-06"; + + srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; }); + + buildInputs = [ emacs ]; + + unpackPhase = "for m in $srcs; do cp $m $(echo $m | cut -d- -f2-); done"; + + buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; + + installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/"; + + meta = { + homepage = "http://www.emacswiki.org/emacs/Icicles"; + description = "Enhance Emacs minibuffer input with cycling and powerful completion."; + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = with stdenv.lib.maintainers; [ simons ]; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 7c81f3c5c81a..8f055476dcdf 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -233,25 +233,25 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "14pre"; - build = "IC-139.222.5"; + version = "14"; + build = "IC-139.224"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { - url = "http://download-ln.jetbrains.com/idea/idea${build}.tar.gz"; - sha256 = "e2c696f465da36b77148a61b45f35f8f08ceae3b624904de8f7cccf0e7c20ce2"; + url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; + sha256 = "72e1e7659aa90c0b520eed8190fa96899e26bde7448a9fe4ed43929ef25c508a"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "14pre"; - build = "IU-139.222.5"; + version = "14"; + build = "IU-139.224"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "http://download-ln.jetbrains.com/idea/idea${build}.tar.gz"; - sha256 = "d8e8927adebdc4d2e5f1f5bfb0ecc97c3e561b74d56391898dd36abe89a4f170"; + url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz"; + sha256 = "e1c86f0b39e74b3468f7512d299ad9e0ca0c492316e996e65089368aff5446c6"; }; }; diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index 7b91d94f3867..a63375adfd14 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -1,27 +1,27 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, Cabal, cautiousFile, dataDefault, derive, dlist -, dynamicState, dyre, filepath, glib, gtk, hashable, hint, HUnit -, lens, mtl, ooPrototypes, pango, parsec, pointedlist, QuickCheck -, random, regexBase, regexTdfa, safe, semigroups, split, tagged -, tasty, tastyHunit, tastyQuickcheck, text, time, transformersBase -, unixCompat, unorderedContainers, utf8String, vty, wordTrie -, xdgBasedir, yiLanguage, yiRope +, dynamicState, dyre, exceptions, filepath, glib, gtk, hashable +, hint, HUnit, lens, mtl, ooPrototypes, pango, parsec, pointedlist +, QuickCheck, random, regexBase, regexTdfa, safe, semigroups, split +, tagged, tasty, tastyHunit, tastyQuickcheck, text, time +, transformersBase, unixCompat, unorderedContainers, utf8String +, vty, wordTrie, xdgBasedir, yiLanguage, yiRope }: cabal.mkDerivation (self: { pname = "yi"; - version = "0.11.0"; - sha256 = "1da5wnqx1z8d809dydqr97jh8n5g9phh06lvkgc32hib2rybh5yx"; + version = "0.11.1"; + sha256 = "15m1wwrxmszl930az79lpgyz5rxg72gy8vi17ibpac1cszfdx192"; isLibrary = true; isExecutable = true; buildDepends = [ binary Cabal cautiousFile dataDefault derive dlist dynamicState - dyre filepath glib gtk hashable hint lens mtl ooPrototypes pango - parsec pointedlist QuickCheck random regexBase regexTdfa safe - semigroups split tagged text time transformersBase unixCompat - unorderedContainers utf8String vty wordTrie xdgBasedir yiLanguage - yiRope + dyre exceptions filepath glib gtk hashable hint lens mtl + ooPrototypes pango parsec pointedlist QuickCheck random regexBase + regexTdfa safe semigroups split tagged text time transformersBase + unixCompat unorderedContainers utf8String vty wordTrie xdgBasedir + yiLanguage yiRope ]; testDepends = [ filepath HUnit lens QuickCheck semigroups tasty tastyHunit diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index e75ce535f7f2..da2ca64d9758 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , pkgconfig , bzip2 @@ -18,8 +19,16 @@ }: let + version = "6.8.9-8"; + + arch = + if stdenv.system == "i686-linux" then "i686" + else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" + else throw "ImageMagick is not supported on this platform."; + in + stdenv.mkDerivation rec { name = "ImageMagick-${version}"; @@ -35,18 +44,19 @@ stdenv.mkDerivation rec { export DVIDecodeDelegate=${tetex}/bin/dvips '' else ""; - configureFlags = "" + stdenv.lib.optionalString (stdenv.system != "x86_64-darwin") '' - --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts - --with-gslib - '' + '' - --with-frozenpaths - ${if librsvg != null then "--with-rsvg" else ""} - ''; + configureFlags = + [ "--with-frozenpaths" ] + ++ [ "--with-gcc-arch=${arch}" ] + ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optionals (stdenv.system != "x86_64-darwin") + [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" + "--with-gslib" + ]; propagatedBuildInputs = [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg libtool jasper libX11 - ] ++ stdenv.lib.optional (stdenv.system != "x86_64-darwin") ghostscript; + ] ++ lib.optional (stdenv.system != "x86_64-darwin") ghostscript; buildInputs = [ tetex pkgconfig ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a23c939789b3..2928317bbc7b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.8.0"; + name = "calibre-2.9.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0wjkcgv7y4ll4lh5av6zs0q3k9y6p36sndw3864zhgwqwff00k12"; + sha256 = "0g6vhah736ps88maw3ggn7pcvnmani2mp8b29ksasv0683q7lldw"; }; inherit python; diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 3129498d59c1..73459205c7d7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_source.rb > source.nix { - version = "33.0.2"; + version = "33.0.3"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "84289121c49e9472972f04cafa707abef6d40ab4"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "b048883f61a09b3a4d46b5b35dfa44df108c013d"; } - { locale = "af"; arch = "linux-i686"; sha1 = "2a8bf42955842920044a119b5da480dd40fd99f0"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "c5cd176dc69eea6d3a933b58661704c8c381ca70"; } - { locale = "an"; arch = "linux-i686"; sha1 = "8aab040e91770e347bd89a77d6cc3e2f822f1b01"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "fba44ab169b11a78b3616a4bcfa9a813626306a5"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "3ca9bee8dfe329198669c27a7743504767e4311c"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "4420c6974845d5b036ca8465fd530ff477302b6e"; } - { locale = "as"; arch = "linux-i686"; sha1 = "85d3f501184ed7bf4fbf2328d7797dc7656c60ea"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "7b79e41bbecb87df2b79c41fd6f4efe5fc5a62f1"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "65dc73669af6965ef7cc3e937070a629a91d27c0"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "5ba415acaf6aaf00ef9603b1bd7c28067a38c06f"; } - { locale = "az"; arch = "linux-i686"; sha1 = "161ffff8bba5bd7e3fdfff2cbbe06788a75a1786"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "305c54bf69d82270beaf9268d4936c04465efc19"; } - { locale = "be"; arch = "linux-i686"; sha1 = "a4677e7a0013390c99dc117e70f7be344487b9fa"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "9d2a5a92c74dcb4ecc960fda83cda4d6a6a333e7"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "06cd3eeb03646b2301f779859b6121e33946b9f9"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "f352868b172f54d007b72b6364ecd9a073a086e3"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "b487c35201063e0b3b1751361973e86bbb6d3646"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e5d827177cc3bb9adcb74f01e4937ba77982c2d8"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "edb44f171a1d70a7e4c8a0eddceb603b511210f8"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "dcc2e0ac1c5bb8b06e6daeb8a98d8598664864f9"; } - { locale = "br"; arch = "linux-i686"; sha1 = "eb21581ed2c552383e868cf2d689517642b66f47"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "bfedb09a7ad5998b90fc3471115be0a607b0f6ca"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "23507b237d3968ceb1a987326ac62d94f9df65ea"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "47f485cd621bd892994292ed564b90269e2a2754"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "e69ae2cf47575cca8403e9d8273161c9f23b28d7"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "fbe9546b99ffadd68c05783fa14eb56465eda3cc"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "dd523103288e93513fa366a2ddbeaa554fdbb176"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "55c0db80a935cecce7551008fcc389f4fb742748"; } - { locale = "csb"; arch = "linux-i686"; sha1 = "66704c774f8aa5b6ed08b5ad418474e39092ec6d"; } - { locale = "csb"; arch = "linux-x86_64"; sha1 = "01f72eafcf9b16ba9030956c147fd0198bbc7920"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "900d37825d69a9ac26f1876b6967f5b7499bbd85"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "52da4de76b59a234b933c49ed760f223c7c4c15d"; } - { locale = "da"; arch = "linux-i686"; sha1 = "a750e76cd0c9a0f9188642a14339d7c9173cd720"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "59e5293f5862f583b9dccc4c33441773e024f90f"; } - { locale = "de"; arch = "linux-i686"; sha1 = "d83b88f086bfc5cfedf15c02ed4b5359abaec1e3"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "a8d3c09b24c9554205d0f7b09b3281ae55e3a7ef"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "123923553c828e8190c265ffbfc423a1744ae031"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "51cd2a899d18239e653460eff4b5fb9a3c792cad"; } - { locale = "el"; arch = "linux-i686"; sha1 = "280719149af0cbc2ed3216d2f7217e60bfdfa2d1"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "854c5243738cd462465b38fe09da05bcf336fd8e"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "1db81b7381b6217b2d041b2faaca83a90be48640"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "0de6a9f1ae3f7db8d30cb1b38da6bc928a56a373"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "2a92e782d140055690ce9ac89be46ef2e0664260"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "dd511606189c45f830e196b396ee62682ef4116b"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "89e0abd4a56ad8d7cfa750e8c1c44e70320ebdbd"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "873a055caa419904a1c82c29407f7f5d2b6baf70"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "369dda2004fadc6d6f58c8f5eb86515eb0fc1c4a"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "c25e885800ee5a84e05919aee38f29608e878b9f"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "d334207e5b0456ad90b12b9a713e446b6d0a59e6"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d6938e9c0e150fcb468301dd12d657e44a6fd216"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "8a3e3f6302e260857ff09a737e8272d59c3490be"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "5eb5e282d60f97bc723a362dad92d7d14a0ee9e2"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "69149b7d4309b51ae87deb834d5ab1836dcfb7d4"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "840c817433ec950a0284b4ff59e0634111cff3ae"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "0a2ddb4b2b92264372b1bdf5ad957147610c5383"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "aab30300c0062f0b3839201cecda6fdd974638ff"; } - { locale = "et"; arch = "linux-i686"; sha1 = "a09b9a0c58afbb1a19e841a4f72cca699d0f14e4"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "2c23762407edee338a53f50e9c9f5a884bc2c479"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "2b118062f5c8f93cb2be5aa298d4e2caae0302f8"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "ae2841ec555a74d129052f6af9931d1927bdcccb"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "604a2be7317416e31ba2d1705c587a29b9dcfc57"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "3c53a30d4383d05a12631feb72be8aac88b4ad9e"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "7229ddd990a18eddafe2478db0e082b108a18972"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "0555b251a17ff1fb700e891676987f98a110ec1a"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "e04a02fcffab0db1e85b4cee754d5ba8006cf387"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "d85c3448d2b685fb69cb7f567ee50c21a4d66345"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "7be35c9e5bca6b83b3123468333d05360cb212ff"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "01a9900d207f44456f55499b5c8074983001a896"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "aab9b751d299d6ea3b5914b33b6ba22d45a1a800"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "146f82bc19217b2736e82f6cdf8c367dfe546b0e"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "21420623f201278b788f3ebf8ea075d5cd2720cc"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "888112fc030689f48889227765377dab969e07db"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "528b236cb8553576adceb5ffe73a52f07a2bbab7"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "41d5a5cd74e61d5274774842f224daf22ad9751a"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "36397364384b61a083e9cfb4535749b08fd35d68"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "08a80c6088abf0b970e1bbce1370de24ba3e50bf"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "cecf38096e029453ffbaf5ce14333836754f05dc"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "87515724726efd12eab5018d6062ef8a4bec19c6"; } - { locale = "he"; arch = "linux-i686"; sha1 = "ca162ce8e0d33883489923f714cb6880eed4ddf6"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "bdc063b683ccdc26e8d3314aac9a89beffb855dc"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "6054818606b0e004f16d503f6772897bc556cea5"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "b52d98d4bc6825e923ad438b0a4e7989e8cabe3a"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "d75988c20d86068523dc2bfbf6f1b6a9fdf50ea2"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "0eb0eb3bcf947a5df91552a520c3dae502e8ca12"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "6a7af0b5e6f9e7673c41b69c0b20b619657670e1"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "eba91ab9ce2c8b4951c201f8ca0247c8810991ce"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "0277e06231e406fca6594489d0629a2df28b099a"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "1049f9deef387f7e51d5b1b87677a236ecd8e8bc"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "da5b737c60c95df82a464e3028869892ac083f22"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "e9bcab47f9870b0dce22f764d78acdb9c8fdc3a2"; } - { locale = "id"; arch = "linux-i686"; sha1 = "c76ff5c58977afcedf88ea354596329d83dbfcd4"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "9cd4cfa700f96654608956932cc16d0b60d3de72"; } - { locale = "is"; arch = "linux-i686"; sha1 = "b79c4c2131e8ba15d6f31f0609616476b91b739b"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "feaa1616f97e1145554fdd93f1f5310dbf35c30a"; } - { locale = "it"; arch = "linux-i686"; sha1 = "e3c1658e92f1ef6ec98c2dce0269eba3c64a4312"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "608298dad85daa4ca08996cfe20a1602a951dcba"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "eacc6251f1fca09b41e84d43f84ae49c87619c55"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "110e1ad59d404aa4bcbf5ed6781a93a27d9756d0"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "772ad939e83fb889ac24cafba5006395757d73b8"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "2d0e1909f76f9007a63afd1aadd3175a3dc5bade"; } - { locale = "km"; arch = "linux-i686"; sha1 = "284d52d38a58c392dfa4deac506b26c8dcc8a8d7"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "acf596620f0de73eb51b2ff1687ee5723e1939bd"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "b4e3aa3ca7dbad47db42dc10e486d38b4515decc"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "b24aedb7ed569666e979ef71c54b99c5f0fdecc5"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "29e54578a74203613e084a5ef36e05a7fff0e0c7"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "858fb59b17acbc8027ab5962ed4a4c45b0e3afd7"; } - { locale = "ku"; arch = "linux-i686"; sha1 = "ee5b0d2fa065d4f488f9871cb034db27ef02580c"; } - { locale = "ku"; arch = "linux-x86_64"; sha1 = "31bbfb80de63d24022c7779ded2e31a32dbdca0e"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "4e82e29fbf6485ea16ce0766764ac62ed848b94d"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "cbe98fdf2eb3001968d0df0769e0cd0902b06fbc"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "d12ae187d164616e89cf4eed77e5927e575128d2"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "518a384b8ad40ea9efe659a896b0512948e1e987"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "88c90db1b921a76cb85632e0f362b122d4da411c"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "3c2a1c0b507c486b709c1010343a97bc8f7c3e77"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "5b73e8d4a01826f3b27664b9289953ad3784793b"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "d988bee839d38d09b990cc93107cc2f53e236928"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "dce5f05792e19ae41352b33a15721e91b1ec51d8"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "92025b929fceecefc7bc120a3bf7cbd4374dadb0"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "073aee45ae60efb142514353125f8f73d07cb41b"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "0aa10e353aacc98de2799c42fb1a767a2db073df"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "96f72aa8dbde2c807d314dffe7b17d9ef8cd4cbb"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "0153e84af4ee51cfe046b7419471788becae94bb"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "a5a9a008006830b903aff077dd4ecbd88f56e065"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "d62254d76c09c6e7ecf5b8fce5f16c19f6778f95"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "23552008764881e8132ad918f7fee319d8663665"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eb42bdb42d0e51b1c68dc50b8da066682afa6a68"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "88fea28ecd7f8257fac516183e48f6a23599850b"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "9f5002532f94726b53de4c2ea9e0099a2b88e4cc"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "005f55140ced2888691c3695f491063874c083e0"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "9e8c4103fe98a591ca62f8bf3b73dd91ff8e6973"; } - { locale = "or"; arch = "linux-i686"; sha1 = "20f94f1c14cfcd95825cbf0613e94b4bf4db8e55"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "9a31112abecd538e1b9489b16a89fd5c8bb10d25"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "fa6d6e65d14f7b771c65465b67f1ceca83402051"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "9268ffeb1982f08044ab882224aad93da4064340"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "97b6e4700c6cd35a40e9256dc558cc0f01198c75"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "46c721a5c778a7dbc51f6a89ef29ee00203a64f9"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "11f6f7868a6733a2459d3e36e106526eb0a2b44f"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "d276a761068f662b59c7d832f24bd756eda5a37a"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3eeb28a4a01d13111a2214ee64647f332d476088"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "a55faf0846dbf8e964402e75f7c213968afd4568"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "471757165eeeeb2e97f3a2e71fc942ad7f7719e4"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "3583eaf02e502d1346de9ef769a9df236a78599d"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "1b93473d549e639b9e3f29e31387fb79ae373d94"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "dc0255b15ff129cb38eaa0a52d61a2f74bbcf7bc"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "43ba7700c44d26b6433678d7dd6e0a0c14d93f45"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "46bc5736bbfcfb948e9980dbc63b901753e16862"; } - { locale = "si"; arch = "linux-i686"; sha1 = "d445f110df79720b14fd6f445167a706b116488b"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "b4b3db391ae6e2d503633245878a00f4e33e0d43"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "3080a0fb40da4e96943114d20f1f72529d0667bf"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "7158353b5310e77ca0497c288f0662e1f922fb7a"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "24260e9b0fcb7313a3eebe5070e0a94b27bf81a2"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "9a5add8d7300ddc64089e02404825514ff17647a"; } - { locale = "son"; arch = "linux-i686"; sha1 = "600913614d41258cc77cf506cc13d1ddab40625d"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "b278970e4ca2ccb2dd3491a905bbdbbf0d70490e"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "5f15a63b1648e44ae9551aba26e81ec48a6bdfae"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "cbb9ed192d45f6acaaa27ecfa41b618053c6d7d6"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "6ef381a41653bdaeb86315c090fcbc31b9dc606b"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "0c0957b8bf14789c1d535044ab4c23c6da7b7fb0"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "1e1aff3b58c5545d4fca293e36392d1bfa94ad84"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "6af5115d5c998f01fc47a632a2043d1796dc0e48"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "69b0da1959ebe1216042b7e9eb50ce35c1d32dd6"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "423f5eee83bedcc10aaf43ba78fe8eda221f7225"; } - { locale = "te"; arch = "linux-i686"; sha1 = "05c078b8532236c8807366058fa56d86f7d9f202"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "36edfcbe5eee5700b99285d4be56d812f8d6126c"; } - { locale = "th"; arch = "linux-i686"; sha1 = "f1dbcb989ab807dde9c718564f2a6666e541fb08"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "6b97dc0cfb18c168b909e80a0cf6944197fcf971"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "a5311e7bbece416d44659fb6a026d1c4b7e559ad"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "75c876fc07f088b4909cc07892e15b9cda8d7d57"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "24bcdf22c9887b6272289fc74ec9b7c5ca210fd6"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "4d334079f0314f3ec7ad201b3ff3a47c096820c7"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "31a06884815086e2c2e5f2e346b645e7831bbe0f"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "f842a69f2b9ac552227fc70c9f83851d6e493111"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "feab880c09ad8b7cda7cae61886da651c21e54e6"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "b30851acdbaba53791698277d4285da3229707ae"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "27166890fc8b804fe092fad68b04c59ee9705b70"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "e7f8aac338aa457bc8de8dc68e7d8f0af6303420"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "e9ea70c45439fd09a8b36694a9e59d7161aa6341"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c907e3c10dddfb313c7570fe8232c74673d2fc93"; } - { locale = "zu"; arch = "linux-i686"; sha1 = "d1aad06eeebd135c65092f78d50f2b9c64705320"; } - { locale = "zu"; arch = "linux-x86_64"; sha1 = "2fbb2d086c8260dda2485c430143a53c4f1383f0"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "1921293ebe2f6ed8b26fb543c2d9673f617551bd"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "cf19672cc4f69d049f072cc3739deff77385652b"; } + { locale = "af"; arch = "linux-i686"; sha1 = "65382d7fcf53b28447c99eea6a1b1d5bccfc390c"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "af0c9cf1517e51f92a5c83c2621722cf3fff2c0f"; } + { locale = "an"; arch = "linux-i686"; sha1 = "10426df065b812a600c817e0567b1adea6148aba"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "ef8411a2a00eeab85ac9d7c6793bbd61302e2589"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "cdb9040dbd00599bf8490cb51c1a22ea27d57559"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "6a65730cadd941c8352ab4b28b5d051f387f7d3f"; } + { locale = "as"; arch = "linux-i686"; sha1 = "1bbcf263c7e211a101957d936f801f47dffd3a43"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "b6abce1b67f168adcfa6f50312407c42ea987895"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "82e66bbd01efa26862826cb785c228fe710edc1a"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "e7b65e099dda3ed9928cf0769e87702e68c8457d"; } + { locale = "az"; arch = "linux-i686"; sha1 = "c6313210c17be8eb34657cd929cae28d46d4ac95"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "5395709e0336bb79d1cc711b52353bd8c7b00005"; } + { locale = "be"; arch = "linux-i686"; sha1 = "69c5d38974cd23a3b42d6cc2e647b3d51e68f902"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "a9db15df6bca0bca8079181b9dff9149ddcdb36f"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "7487ede4bed190cc0cd94973e8219ca8c1da76df"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "f85f2992b7a1820a2d328bed7dbec42d461ba478"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "2fca93f2f697249012e61bbb42b1ff135602787d"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "68498facf3cfb2f01f4c6c632b858555f2dca915"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "f867da3ea71fbece79d48897af3c264756050dea"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "483faa6cae8fbddc1a1dc70344ee9b8f140da2b7"; } + { locale = "br"; arch = "linux-i686"; sha1 = "843a9831bf65d6ace18e77fa12798e30a69e1bd8"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "6571768ba5c6648fc74c857ef193d214b057c9ff"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "649ac72cd49b1f12f0c5e65c51251ea459bba46f"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "e98aa76e2b0d482316f1497ef02fdc55911e7358"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "bdc2dabc89e77f8e3ffc0e1e1eef54d86da4e915"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "683573c54c29b3952df02414eb8c08ed72a175c0"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "e109d9c8a18021d95c6dd9b024a9ef3098ad2002"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "70571f4b8de2f6ecd78a0d993a92ba50ebfe88f5"; } + { locale = "csb"; arch = "linux-i686"; sha1 = "e257c5462caa7a2cc911b2fd98c2b0c1b8295c3d"; } + { locale = "csb"; arch = "linux-x86_64"; sha1 = "72ec3481d6d8f222954e74097de8f81353229476"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "a37c821b0e5b011928256fd2f1ba5bef904ea115"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "09f149d1a0298b86956278c7785ac1e463fbe966"; } + { locale = "da"; arch = "linux-i686"; sha1 = "3e9ecdbb95a47bc268b670944d8aad093468d300"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "d9f1c143820bb55b87d47c09fb8bd8e8806cc6bd"; } + { locale = "de"; arch = "linux-i686"; sha1 = "a3a0bc4e13191c298ded627f72905234764a3ddc"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "119b106774414fa5befffd7a1b9d33e932e8968f"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "783b4721e6c39bd10ab8adca64a9688ed46561d4"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "22ad1c92851fae97ecb6c73207e98eafed2ffe68"; } + { locale = "el"; arch = "linux-i686"; sha1 = "241cf6cfefd7148d594c97847bd5a38b1cb3d503"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "0557b84b189eaf4e40a1e7c6f1b50e25565abec9"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "b5ff1db0a6b0d757b600096f3f42681044806aa0"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6aca6f3184ffd1548f696988d3c020ccbd42ae39"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "446f501eac8c8f89c04bf27e43a6c5345b5c9672"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "550b8c17dabc55442fa3b64875ce7eabbc54624e"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "1021a7038bdb337c27b46a601f545a949f148b0c"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d0dccd437651d9c58b0c7a7b9d6f406ce4949aa2"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "f4b15872c28238b5715a6462f95dc3b41f67e2bd"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "770a8387e74fa9dc5e35524d4b9b761e590b4cdc"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "7d8c56fdfbe441b4fefa3cb9cf86d23031bfd8b4"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "855659d84f4a2f9568f2328cc325875f1d8d1278"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "8b6fd782fb2c402beadbac8455e06c3c39b44a41"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "26887448078121ba67f9aa1595b3ef177c7eaba8"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "315fc00607a0c926ff5c8ce5f702036159b8cf5c"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "86f0474583db54add265b13d28bc5d96656d6e9f"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "8b848b83291d70f870d5bbb5bf6e4c2324224c71"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "0b29b6e966099c686195c1de7c2fde7b1150338d"; } + { locale = "et"; arch = "linux-i686"; sha1 = "c64f5ac533b9afc8851abc9cc27aecc62e1896b2"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "90762975828e0003f41c8b91918cfa26385016b2"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "131fba3c72658418c2d33b727b97db94a9edf043"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "1c4cc0c11eff48db085cdc90e29c8d0a82ee1580"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "eda6dbfbdcc12e2b1f41e05847494f4fb186f86b"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "1753b8f6999ec79595d8220149c2f366dd53d50f"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "e4b4269db2ed0e70883b68b09c9de4944d7322e6"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "e84f1ef0a5af55eb455e8aea277c7915eba6c7fc"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "56112c07a35aa309975c177c63835d7084573091"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "68619b9f4e2a0d4d1fcfb125c3afe69ab7e4b888"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "b7e576d28cf1d9321d20e13fe06a75a420c9d266"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "b7a88881f9cd88861f2c1475ff651021215dc10f"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "7a4d32f2eef796da72906f17e3b3fefdbbeefff2"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "73ce69c69382e8928ba75bfee039484a89a954b7"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c6cd2c29d52f6d41e57a6a6c6920a1b81d3d9ad2"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "704b3f20af6eb5ba8fff11df2b61d165da0c704f"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "b44f19060ad05f90e8a4610ee31742fcf0a1887d"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "4cfe19b446023b477603986f8ebce10760116556"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "0ef95ffc60b27db15175c35c4c67d03e7d4ab187"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "7a4aeda8ebd3f8e84c5eaa41fe654002fa972cf9"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "ad61a487a2fa61c0a59df2a49ad66ffbea6c3d58"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "be8cb3124bed4de2c75f4121e8fba51fd924d9c9"; } + { locale = "he"; arch = "linux-i686"; sha1 = "a8f61990571b1e82c92e3aa5d04e0634ba845868"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "21e9e92ac2e1b5d401db087e42cfb8e7b70dbb76"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "f9dad0de082bbe79ac3a4d65a7e230ef7573615d"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "4d63ae66cd5c4f5f2136074f25a12a8d7afdf414"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "9fb6741ad66d4518da42f8fd01808cb7225cb179"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "95ab75701daab063c349affd2f64bb78c08c4372"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "3fcf4edabb1214959cb317c87712d93e2b528322"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "378c162773d8fa98bfd4c65a3318da6fd62d9e09"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "f14bbb59e17aa7f2e618acd7bada59f572969da0"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "9d3ed9567343e309d07e33bdd6bf12e342558b83"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "42ee6763c5583cb2a81e165a3594f5225478d341"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "6b68651f66f01b2ca6809688208f58d962185334"; } + { locale = "id"; arch = "linux-i686"; sha1 = "af9764798b22a45700d6a8af4fa6fc4fa42057b0"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "1599eb91d24958067fbda8610baba4032906a80e"; } + { locale = "is"; arch = "linux-i686"; sha1 = "ddf37bd5da00481956cb5da8e5c7a4746eac89a2"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "771b15c19b66b9f9dabe2a21cdebdd1a038b1944"; } + { locale = "it"; arch = "linux-i686"; sha1 = "64eb88bbdb9684c985a0b370eebc231f8b7f541c"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "462256d8390173a8b3a4494f71a33882cfff2b05"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "042510095ba9d7d3c07f0fe2d8961ac5a66b3485"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "f5d831366bf57b383f941600b70ab8322207eba4"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "24dd935b408f9d02743dac81ff472f71a54c5652"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "43482c8dde95698306ad6bd21e19471c067cf8c1"; } + { locale = "km"; arch = "linux-i686"; sha1 = "7ab99490f590b2b6e7113c0e9e710db7c64ed3d3"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "e9c23eb7fc81c1afc3d242f6a74fcadeed1e8625"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "7d1b892e88e01ea4eaf403036814096530cc96ad"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "1b72a40aa32456bfe7066e3953a38dd476b936d7"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "315bfc8bf6b9de2f949bc414205ad2e732e6b86a"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "b0276581252154e92757e5497b1f72afcc70a88d"; } + { locale = "ku"; arch = "linux-i686"; sha1 = "e723b3c993a32147d96ccd30fc49c38781e7b2e7"; } + { locale = "ku"; arch = "linux-x86_64"; sha1 = "f32b109fa8cc29aeba8efe88ce860b0d8cd31272"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "772d796a7c23c0a19570371ed975d9ce2a28152d"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "06b981f4f3d4ce531abd62cb5266326820f03032"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "48de585882d3f43c7482788ea53861ecdfe47feb"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "b15f167b0c02b18c87657aed28914b5bb8c9ae8c"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "f99e7c29d74e8c71ab3a75030785a796cb2fb7cd"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "cd0c6a7a6cb760daa95fb3f8512ceb59d02d9561"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "e14ef6323bc419c8ea9cc3a5377f81783ceacfe6"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "72b85394e96ea8427c87e305249db32d777679a1"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "f074172c4823d6460084ad035fdf125c7604fcfd"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "a9cb300a95e6209e0960cd4c442927f99685c157"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "ce1e3a7648aa414a036e8e8fedcda1625531a896"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "0ccdea5606e7bd153220986028b08adf9d110489"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "dd2cfce96f63c596d92fc41bf7b0cbb4d3910c75"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "e3132b39198a4d1102e91d5b128aff59a90749fb"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "ef75a6e8ff561505e156143e79732db4e6e7463f"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "d5f9910e8b9c99b6b2a0b02a8d235679bf91e3f9"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "a8a25e635595a463b278d3cad6fe0f3270dde5d4"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "bbaccfa625940ee0cea4bc80b890de12261a2975"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "300906dc853308d56f9be18efbe013ad84b842ed"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "0b3a2dc384b23bf5080514111af1eaddd8b08fdd"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "7ab5b40e63eec97e6340cc47027f3e1dde4bfd33"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "521efadf61693655cd55eff03f5c1b7c74531ede"; } + { locale = "or"; arch = "linux-i686"; sha1 = "56f2c698815def24af986fa5843bd421915f6f55"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "f6062ab71bad05de678f12eb7795786955b2729a"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "2a7390e40308487854ab73af5941936d72907fef"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "1d7ce2a4c0b5c2e1e469a2fd80ac1dd5efa6d5af"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "8aa59c2cbb548fbd3e770d8d149807eaf55d97dc"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "504a1ec25f4c7ec9bfaf171eee8388710ee74952"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "13175cb113c74407ed7014b4d63617e5ad94806b"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "eb3f3ea67b365b1f7d02eddc1edd1631530ecaed"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "17932f6836ab2eb476e53bf0de0ec71cca43cf91"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "d9842d99f3bf39b19f704d1d1037a2653845690f"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "75b6738fad63af2374ab1e68f762887b125951df"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "5e5463aa6c65f883f0b5256fa39d5674ce25af55"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "d31da8f672922c92646a99448204447ff4299fa0"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "8f70168006e90f722b3ce0374728ff25a99e7499"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "a030523200e2fb2423e4961d227c3adfa913d5f4"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "5d696249b6732a8a4d8806ac8032bfd86c49ad36"; } + { locale = "si"; arch = "linux-i686"; sha1 = "ce48e3f09e5a5473d568ed2004e3fef69479f8e0"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "be68d12ab8c5a23f4daf0f6ab024a0a2e43aa8cb"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "e22dd3e46ee4029aadcc6bbb1b7cd0cd2393583c"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "e731b4cb099ef5768861e50320eea79095b40883"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "54066600ccc2ab644dd37467deb4b316b9cc1054"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "79ea8f6eb4319e883b25ca3eb34d2e9baab210ac"; } + { locale = "son"; arch = "linux-i686"; sha1 = "bbf18f281de6083acabc9b94175a959edbedbf0d"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "0e73ef32446ef1b1bf78a748aa33e352dead9415"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "a9f07225212e4e76ea085fc959dd1e5b9ae4cf9e"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "6bfb8ac480c1959e5413ff2c0705bb3f33bc30e4"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "aabbce39a67c3124de70d44b7a0f9d6ee236317b"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "f1ee3384548fd5f42e0cf9562cb640082d370ea4"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "9657f9cd1b898b08d1318fc671ce049254ef179a"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "380ff2e58890a604235a32cdfd1ade91742cd1d0"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "2a888f529c1fd427de4d2c9192c6c34d382beb66"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "931d046374efe0cc02dae0481e71dd62a7ffbcda"; } + { locale = "te"; arch = "linux-i686"; sha1 = "a3ae25c1cad81e5c46917b537467de3a3f4df494"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "846b559dd6f1c09b7f362cc18948df73ef85b417"; } + { locale = "th"; arch = "linux-i686"; sha1 = "e4d9098a89300fcb91a8c9c832a932143b999cc6"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "152c26901be43baefba0acc268667a234b19c102"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "e860e4e718c9185683417cbe624797b0839740ba"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "30fb6171a38dee24f67ac0eb9d27f73d240927db"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "f35e3874fc5be4fe09af9562ba1ba10cb2d1adf8"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "961b37b14ffcb9d627c82b39b7c62d75986e6476"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "06cc7e7827a7426ce5dfb067475ff3bf7ba7abd2"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "e17faa31f58ece35cc00b28b3c94e4b2ce302a51"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "b67854a2dbe447cca7b367916c11acccb17e56d3"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "398bcfbec858de749c6f8e4a7361ed97962653e9"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "542d2872ef5ca6d9e61dd632f1f4c00d9e1b63c8"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ffe67b7988f74e557ce83f62eaa692a86b5e8dc2"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "7cae4e75d12f484799569bbfba2a534e5d0b2ab1"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "53c9cb92486c5b166e6e93fa688b82e0c4e39af1"; } + { locale = "zu"; arch = "linux-i686"; sha1 = "1c5dfd0b0ed74bbbc70f005e82f3715463ac36ac"; } + { locale = "zu"; arch = "linux-x86_64"; sha1 = "44cdce366e31abb691676f9effc8f6bfb6b3b9f4"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 22b6756f0a1e..0baa3f32bed1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "33.0.2"; in +let version = "33.0.3"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "60657ba123df85a632822974d8f914cc8c35a738"; + sha1 = "88b8380f0c0929a8beb892e6169e8e5d4bf5f62f"; }; buildInputs = diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/default.nix similarity index 78% rename from pkgs/applications/office/ledger/3.0.nix rename to pkgs/applications/office/ledger/default.nix index 6118d377a79f..34aa7c769d01 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -2,16 +2,18 @@ , texinfo, gnused }: let - rev = "5961384"; + version = "3.1"; in stdenv.mkDerivation { - name = "ledger-3.0.4.${rev}"; + name = "ledger-${version}"; + # NOTE: fetchgit because ledger has submodules not included in the + # default github tarball. src = fetchgit { - url = "git://github.com/ledger/ledger.git"; - inherit rev; - sha256 = "0fmmhr3as4v2kb6h64k1fq979080cqhd75jvxfg7axk2mylb6b3q"; + url = "https://github.com/ledger/ledger.git"; + rev = "refs/tags/v${version}"; + sha256 = "1l5y4k830jyw7n1nnhssci3qahq091fj5cxcr77znk20nclz851s"; }; buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 036f21fdead3..d6b9e4598aea 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { + '' ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} tar xf $sourceRoot/src/${srcs.help.name} -C $sourceRoot/../ - ln -sv ${srcs.translations} $sourceRoot/src/${srcs.translations.name} + ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} tar xf $sourceRoot/src/${srcs.translations.name} -C $sourceRoot/../ ''; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix new file mode 100644 index 000000000000..0c3297ccc937 --- /dev/null +++ b/pkgs/applications/office/pinpoint/default.nix @@ -0,0 +1,19 @@ +{ fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst +, gdk_pixbuf, cairo }: + +stdenv.mkDerivation rec { + name = "pinpoint-${version}"; + version = "0.1.4"; + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.bz2"; + sha256 = "26df7ba171d13f697c30c272460989b0f1b45e70c797310878a589ed5a6a47de"; + }; + buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf + cairo ]; + + meta = { + homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint; + description = "A tool for making hackers do excellent presentations"; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 62359baf2bc6..ca1602d6e58e 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ocaml, ocamlPackages, gmp }: +{ fetchurl, stdenv, ocaml, ocamlPackages }: stdenv.mkDerivation rec { name = "alt-ergo-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = with ocamlPackages; - [ ocaml findlib ocamlgraph zarith lablgtk gmp ]; + [ ocaml findlib ocamlgraph zarith lablgtk ]; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix index 8664b822cca7..63aaa02e67a3 100644 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ b/pkgs/applications/science/logic/coq/8.3.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation { ''; homepage = "http://coq.inria.fr"; license = licenses.lgpl21; + branch = "8.3"; maintainers = with maintainers; [ roconnor vbgl ]; }; } diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index c9c8396c37a7..293fcaf8cee6 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation { ''; homepage = "http://coq.inria.fr"; license = licenses.lgpl21; + branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 721cd4ffa083..391dba244ef1 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation { ''; homepage = "http://coq.inria.fr"; license = licenses.lgpl21; + branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index ff19b0af16f4..1ec4866f1aa4 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,12 +6,12 @@ , javahlBindings ? false , saslSupport ? false , stdenv, fetchurl, apr, aprutil, zlib, sqlite -, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null +, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null }: assert bdbSupport -> aprutil.bdbSupport; -assert httpServer -> httpd != null; +assert httpServer -> apacheHttpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { configureFlags = '' ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} + ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"} diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 49618266d79b..b7c523f71815 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -194,7 +194,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; for i in Setup.hs Setup.lhs ${defaultSetupHs}; do test -f $i && break done - ghc --make -o Setup -odir $TMPDIR $i + ghc --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i for p in $extraBuildInputs $propagatedNativeBuildInputs; do if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then @@ -217,6 +217,9 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) '' configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names" ''} + ${optionalString (versionOlder "7.8" ghc.version && !self.isLibrary) '' + configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES" + ''} ${optionalString self.stdenv.isDarwin '' configureFlags+=" --with-gcc=clang" diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix new file mode 100644 index 000000000000..d2de6f63be3a --- /dev/null +++ b/pkgs/data/fonts/hasklig/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "hasklig-0.4"; + + src = fetchurl { + url = "https://github.com/i-tu/Hasklig/releases/download/0.4/Hasklig-0.4.zip"; + sha256 = "14j0zfapw6s6x5psp1rvx2i59rxdwb1jgwfgfhzhypr22qy40xi8"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp *.otf $out/share/fonts/opentype + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/i-tu/Hasklig"; + description = "A font with ligatures for Haskell code based off Source Code Pro"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ davidrusu ]; + }; +} diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 81de83aecef3..f6d98088ef95 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -1,19 +1,21 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, fontforge, pythonPackages, python}: stdenv.mkDerivation rec { - name = "liberation-fonts-1.04"; + name = "liberation-fonts-2.00.1"; src = fetchurl { url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz"; - sha256 = "189i6pc4jqhhmsb9shi8afg9af9crpmz9bnlldhqaxavr1bhj38f"; + sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; }; + buildInputs = [ fontforge pythonPackages.fonttools python ]; + installPhase = '' mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + cp -v $(find . -name '*.ttf') $out/share/fonts/truetype mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; meta = { diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 54371f4f420b..bf2e10b2c629 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,45 +1,55 @@ -args : with args; -rec { - version = "1.2.6"; - versionSuffix = "-0"; - src = fetchurl { +{ +stdenv, fetchurl +, fpc +, gtk, glib, pango, atk, gdk_pixbuf +, libXi, inputproto, libX11, xproto, libXext, xextproto +, makeWrapper +}: +let + s = + rec { + version = "1.2.6"; + versionSuffix = "-0"; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; sha256 = "1sjyc2l46hyd5ic5hr6vscy4qr9kazyhiyddy7bfs9vgf54fdiy0"; + name = "lazarus-${version}"; }; - - buildInputs = [fpc gtk glib libXi inputproto + buildInputs = [ + fpc gtk glib libXi inputproto libX11 xproto libXext xextproto pango atk - stdenv.gcc makeWrapper gdk_pixbuf]; - configureFlags = []; + stdenv.gcc makeWrapper gdk_pixbuf + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; makeFlags = [ - "LAZARUS_INSTALL_DIR=$out/lazarus/" - "INSTALL_PREFIX=$out/" "FPC=fpc" "PP=fpc" + "REQUIRE_PACKAGES+=tachartlazaruspkg" + "bigide" ]; - - /* doConfigure should be specified separately */ - phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; - - preBuild = fullDepEntry ('' - export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo' + preBuild = '' + export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/lazarus/ INSTALL_PREFIX=$out/" + export NIX_LDFLAGS="$NIX_LDFLAGS -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s" export LCL_PLATFORM=gtk2 mkdir -p $out/share "$out/lazarus" tar xf ${fpc.src} --strip-components=1 -C $out/share -m sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc - '') - ["minInit" "defEnsureDir" "doUnpack"]; - - postInstall = fullDepEntry ('' + ''; + postInstall = '' wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ --prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'" - '') ["doMakeInstall" "minInit" "defEnsureDir"]; - - name = "lazarus-${version}"; + ''; meta = { + inherit (s) version; + license = stdenv.lib.licenses.gpl2Plus ; + platforms = stdenv.lib.platforms.linux; description = "Lazarus graphical IDE for FreePascal language"; homepage = http://www.lazarus.freepascal.org; - maintainers = [args.lib.maintainers.raskin]; - #platforms = args.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.raskin]; }; } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a5b4aeaff393..c50a79b84747 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.9.20140814"; + version = "7.9.20141106"; name = "ghc-${version}"; src = fetchurl { - url = "http://deb.haskell.org/dailies/2014-08-14/ghc_${version}.orig.tar.bz2"; - sha256 = "05vmlbzbfv72z570xmlh8n003z9xc4l5hixjqvczyyyisdvmyaa3"; + url = "http://deb.haskell.org/dailies/2014-11-06/ghc_${version}.orig.tar.bz2"; + sha256 = "1si8wx8a2lrg5ba13vwpisssxa3rcxi5a7fqxhgapa8d2i2w7gaz"; }; buildInputs = [ ghc perl gmp ncurses happy alex ]; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 16c3cb1d7872..6488d94cc08e 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "3.12"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 5b1e69b86b08..4e888e143223 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.00"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 5e3cb61c3398..d178285834ff 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.01"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.02.0.nix b/pkgs/development/compilers/ocaml/4.02.0.nix index b6753cc6297c..4b5805e2448e 100644 --- a/pkgs/development/compilers/ocaml/4.02.0.nix +++ b/pkgs/development/compilers/ocaml/4.02.0.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.02"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix new file mode 100644 index 000000000000..59d25a767329 --- /dev/null +++ b/pkgs/development/libraries/boost-process/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "boost-process-0.5"; + + src = fetchurl { + url = "http://www.highscore.de/boost/process0.5/process.zip"; + sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = '' + mkdir $name + cd $name + unzip $src + ''; + + installPhase = '' + mkdir -p $out/include + cp -r boost $out/include + ''; + + meta = with stdenv.lib; { + homepage = "http://www.highscore.de/boost/process0.5/"; + description = "Library to manage system processes"; + license = "boost-license"; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/ccnx/default.nix b/pkgs/development/libraries/ccnx/default.nix new file mode 100644 index 000000000000..01812b7baa91 --- /dev/null +++ b/pkgs/development/libraries/ccnx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, openssl, expat, libpcap }: +let + version = "0.8.2"; +in +stdenv.mkDerivation { + name = "ccnx-${version}"; + src = fetchurl { + url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz"; + sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00"; + }; + buildInputs = [ openssl expat libpcap ]; + preConfigure = '' + mkdir -p $out/include + mkdir -p $out/lib + mkdir -p $out/bin + substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh" + ''; + meta = with stdenv.lib; { + homepage = "http://www.ccnx.org/"; + description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; + longDescription = '' + To address the Internet’s modern-day requirements with a better + fitting model, PARC has created a new networking architecture + called Content-Centric Networking (CCN), which operates by addressing + and delivering Content Objects directly by Name instead of merely + addressing network end-points. In addition, the CCN security model + explicitly secures individual Content Objects rather than securing + the connection or “pipe”. Named and secured content resides in + distributed caches automatically populated on demand or selectively + pre-populated. When requested by name, CCN delivers named content to + the user from the nearest cache, thereby traversing fewer network hops, + eliminating redundant requests, and consuming less resources overall. + ''; + license = licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.sjmackenzie ]; + }; +} diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix new file mode 100644 index 000000000000..a7b70615d932 --- /dev/null +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "cppzmq"; + + src = fetchgit { + url = "https://github.com/zeromq/cppzmq"; + rev = "1f05e0d111197c64be32ad5aecd59f4d1b05a819"; + sha256 = "3a3507fd5646f191088e7a0a7a09846da54b0cac0fcb08f7c4c8d510b484e6da"; + }; + + installPhase = '' + install -Dm644 zmq.hpp $out/include/zmq.hpp + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/zeromq/cppzmq; + license = licenses.bsd2; + description = "C++ binding for 0MQ"; + maintainers = maintainers.abbradar; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix new file mode 100644 index 000000000000..c43942a5f645 --- /dev/null +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "double-conversion-1.1.5"; + + src = fetchurl { + url = "https://double-conversion.googlecode.com/files/${name}.tar.gz"; + sha256 = "0hnlyn9r8vd9b3dafnk01ykz4k7bk6xvmvslv93as1cswf7vdvqv"; + }; + + unpackPhase = '' + mkdir $name + cd $name + tar xzf $src + ''; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Binary-decimal and decimal-binary routines for IEEE doubles"; + homepage = https://code.google.com/p/double-conversion/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix new file mode 100644 index 000000000000..f8f60ae24e2c --- /dev/null +++ b/pkgs/development/libraries/folly/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, autoreconfHook, boost, libevent, double_conversion, glog +, google-gflags, python, libiberty }: + +stdenv.mkDerivation rec { + name = "folly-12"; + + src = fetchgit { + url = "https://github.com/facebook/folly"; + rev = "8d3b079a75fe1a8cf5811f290642b4f494f13822"; + sha256 = "005fa202aca29c3a6757ae3bb050a6e4e5e773a1439f5803257a5f9e3cc9bdb6"; + }; + + buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags ]; + + nativeBuildInputs = [ autoreconfHook python boost ]; + + postUnpack = "sourceRoot=\${sourceRoot}/folly"; + preBuild = '' + patchShebangs build + ''; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A YAML parser and emitter for C++"; + homepage = https://code.google.com/p/yaml-cpp/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/haskell/Extra-lib/default.nix b/pkgs/development/libraries/haskell/Extra-lib/default.nix index aada08828b1a..d244700e58a1 100644 --- a/pkgs/development/libraries/haskell/Extra-lib/default.nix +++ b/pkgs/development/libraries/haskell/Extra-lib/default.nix @@ -1,22 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, bzlib, filepath, HUnit, mtl, network, pureMD5, QuickCheck -, random, regexCompat, time, Unixutils, zlib +{ cabal, bzlib, filepath, HUnit, mtl, networkUri, pureMD5 +, QuickCheck, random, regexCompat, time, Unixutils, zlib }: cabal.mkDerivation (self: { pname = "Extra"; - version = "1.46.1"; - sha256 = "0dgj72s60mhc36x7hpfdcdvxydq5d5aj006gxma9zz3hqzy5nnz9"; + version = "1.46.3"; + sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh"; buildDepends = [ - bzlib filepath HUnit mtl network pureMD5 QuickCheck random + bzlib filepath HUnit mtl networkUri pureMD5 QuickCheck random regexCompat time Unixutils zlib ]; meta = { - homepage = "http://src.seereason.com/haskell-extra"; + homepage = "https://github.com/ddssff/haskell-extra"; description = "A grab bag of modules"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/HaTeX/default.nix b/pkgs/development/libraries/haskell/HaTeX/default.nix index 370c371eb8ce..c2968cfc8e6a 100644 --- a/pkgs/development/libraries/haskell/HaTeX/default.nix +++ b/pkgs/development/libraries/haskell/HaTeX/default.nix @@ -6,14 +6,14 @@ cabal.mkDerivation (self: { pname = "HaTeX"; - version = "3.14.0.0"; - sha256 = "0vbwhj031ny2vkp5hjxihlmpxaqy1far2nmxfzl1bv6rx0sqfjbg"; + version = "3.15.0.0"; + sha256 = "1rhxml458d8y0vxns2rp76yvfk66496mvab81i71km653n6g5kky"; buildDepends = [ matrix parsec QuickCheck text transformers wlPprintExtras ]; testDepends = [ QuickCheck tasty tastyQuickcheck text ]; meta = { - homepage = "http://daniel-diaz.github.io/projects/hatex"; + homepage = "http://wrongurl.net/haskell/HaTeX"; description = "The Haskell LaTeX library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 466a44290917..5a84686d3a43 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.6.0.6"; - sha256 = "10i9s6d9951z9bf88w1vxcfb9z9axm2q4kf8wy6zd5gcc8hm7wcb"; + version = "0.6.1"; + sha256 = "1j8slmqsyhvx7xns1qpvbmcjsfqfkphycv32hgcmk17wl1fzbyi7"; buildDepends = [ primitive ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index 8bbfddd781a2..78a34c53b37d 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bifunctors"; - version = "4.1.1.1"; - sha256 = "0b31q6ypndaj6fa9cnkld5k0x3lncp9i28vfkkh6vv4jnnjd6pqi"; + version = "4.2"; + sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6"; buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 2072a91afb1a..3c2d5c6655f4 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.10.1"; - sha256 = "0q6x0mb24yslgqjazg443v9w15x3j4xn32m6p9iwbmafyfbp9vs4"; + version = "0.10.2"; + sha256 = "0bgic61p05hpnsami199wzs2q4cbdm00nyp03vsxz2ddsz8dwc8l"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index b8e6d06ed32c..4cd9dc1dba39 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.10.1"; - sha256 = "1x22kq808ncgbi32idwn2232fy0hji3a7p9l9ardpg7hb6q1w76g"; + version = "0.10.2"; + sha256 = "0pq16rgksbv2ml4wg7jdxlb9y80h8la78hnrcci637s6kbdisd7k"; buildDepends = [ basicPrelude bifunctors chunkedData enclosedExceptions exceptions hashable liftedBase monoTraversable mtl primitive semigroups stm diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 4c194279b4ed..7386c2494945 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, base16Bytestring, base64Bytestring, chunkedData, conduit -, conduitExtra, hspec, monadControl, monoTraversable, mwcRandom -, primitive, resourcet, silently, systemFileio, systemFilepath -, text, transformers, transformersBase, unixCompat, vector, void +, conduitExtra, hspec, monadControl, monoTraversable, mtl +, mwcRandom, primitive, QuickCheck, resourcet, safe, silently +, systemFileio, systemFilepath, text, transformers +, transformersBase, unixCompat, vector, void }: cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.8.3"; - sha256 = "1a3dysrxg7mhm9naqj6vq45k0vxihar7pn650rb8aw22k85ifmkz"; + version = "0.3.0"; + sha256 = "1ggdzll71a05743x3a8y1n43ais85simlqsng9da2z3qa42a9dz9"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit conduitExtra monadControl monoTraversable mwcRandom primitive resourcet @@ -17,8 +18,9 @@ cabal.mkDerivation (self: { unixCompat vector void ]; testDepends = [ - base16Bytestring base64Bytestring chunkedData hspec monoTraversable - mwcRandom silently systemFilepath text transformers vector + base16Bytestring base64Bytestring chunkedData conduit hspec + monoTraversable mtl mwcRandom QuickCheck safe silently + systemFilepath text transformers vector ]; meta = { homepage = "https://github.com/fpco/conduit-combinators"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index f58293ec5e66..53f7e05a6717 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl -, QuickCheck, resourcet, transformers, transformersBase, void +, QuickCheck, resourcet, safe, transformers, transformersBase, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "1.2.1"; - sha256 = "0pcnaqvavy289cmsp6mfapc350p9sq2fq8aq9lv5a256nxq2qffa"; + version = "1.2.2"; + sha256 = "04wx9c7lybqmrvhw8h6zb9vp5qyqfs9p7a9a2m2yicf1p3p0q4n8"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void ]; testDepends = [ - exceptions hspec mtl QuickCheck resourcet transformers void + exceptions hspec mtl QuickCheck resourcet safe transformers void ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/distributed-process-platform/default.nix b/pkgs/development/libraries/haskell/distributed-process-platform/default.nix new file mode 100644 index 000000000000..cb014f53a8a9 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process-platform/default.nix @@ -0,0 +1,37 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ansiTerminal, binary, dataAccessor, deepseq +, distributedProcess, distributedStatic, fingertree, hashable +, HUnit, mtl, network, networkTransport, networkTransportTcp +, QuickCheck, rematch, stm, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, time, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "distributed-process-platform"; + version = "0.1.0"; + sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary dataAccessor deepseq distributedProcess fingertree hashable + mtl stm time transformers unorderedContainers + ]; + testDepends = [ + ansiTerminal binary dataAccessor deepseq distributedProcess + distributedStatic fingertree hashable HUnit mtl network + networkTransport networkTransportTcp QuickCheck rematch stm + testFramework testFrameworkHunit testFrameworkQuickcheck2 time + transformers unorderedContainers + ]; + hyperlinkSource = false; + jailbreak = true; + doCheck = false; + patchPhase = "mv Setup.hs Setup.lhs"; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process-platform"; + description = "The Cloud Haskell Application Platform"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index edce093d2d47..86bc90fae815 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "2.1.1"; - sha256 = "0nr18wjih1rbkprr7cvacgnk0m05m79l0sd25fihy5fy7sqqh3yw"; + version = "2.1.2"; + sha256 = "18wcr5jwf7iz0rfrx07b4mm3j15rqwc43a6hycrabijik6s0v95v"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix index 77f44de70fcf..30d066e3b2ed 100644 --- a/pkgs/development/libraries/haskell/extra/default.nix +++ b/pkgs/development/libraries/haskell/extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "extra"; - version = "0.6"; - sha256 = "1mayrzlk6kycdwcag60pzas5cmbhlxid1bkfsaqa371bfjs79zpn"; + version = "0.7"; + sha256 = "11839h4915xjgmz8av60pn8qaw3b0ckbpw4l9nq5a77qb9rgpbfs"; buildDepends = [ filepath time ]; testDepends = [ filepath QuickCheck time ]; meta = { diff --git a/pkgs/development/libraries/haskell/fixed-vector/default.nix b/pkgs/development/libraries/haskell/fixed-vector/default.nix new file mode 100644 index 000000000000..81df126dd75c --- /dev/null +++ b/pkgs/development/libraries/haskell/fixed-vector/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, filemanip, primitive }: + +cabal.mkDerivation (self: { + pname = "fixed-vector"; + version = "0.7.0.0"; + sha256 = "07wpzcpnnz0jjq5gs4ra8c2hyrxzmp0ryk06y3ryf8i4w65awgvf"; + buildDepends = [ primitive ]; + testDepends = [ doctest filemanip primitive ]; + meta = { + description = "Generic vectors with statically known size"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix index 47b2a7d26ad8..fc3e6c32c724 100644 --- a/pkgs/development/libraries/haskell/generic-aeson/default.nix +++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "generic-aeson"; - version = "0.2.0.1"; - sha256 = "0k5zkfmwffdv4q0c9zgysq4654gjwnz1nbl37y8aq7g3rsfzfbf5"; + version = "0.2.0.2"; + sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh"; buildDepends = [ aeson attoparsec genericDeriving mtl tagged text unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 4ec1f4517887..06c543911301 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.6.3"; - sha256 = "04cjyl5aphf36qbbn75midrqj151fc77z2znpal8dk52gaab2f67"; + version = "1.7.0"; + sha256 = "145bixg4jr0hhw32jznrvl4qjjk7bgjbxlfznqra1s1rnmcyr5v6"; meta = { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix index 7d003289c7a2..36fe2f7113de 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hindent"; - version = "3.9"; - sha256 = "0x8qm39rmaw1s0fbljr9zp6vnqxfcs1w6a3ylrknwqgwbzzr5hbn"; + version = "3.9.1"; + sha256 = "1q1a5smykjs36y29cn34kws443kw0w26xjjfdvv0kf69jpcm4b2f"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ]; diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 661707aaa7c2..c0527d380b9d 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.12.2"; - sha256 = "1gx62pqii2y29wxk6krzrwj18xp15y3qxyvnkkgcq9j984146zfs"; + version = "1.12.3"; + sha256 = "106wzvramjw18a2wvmfik3z47zshq7yalgax389gx340g3wnrfp7"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 98b7149914a6..0848aabb5152 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.12.2"; - sha256 = "1ika9qqw8y9j95db9xgjsfj9s9jb56hq962mwbpx1pl5d15m5262"; + version = "1.12.3"; + sha256 = "0lqihgsk46lwm4k2nc81pbi1gdfk7qnmjli90bvf4pbbhg5igjkn"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix index 39374b436ad6..d40dc03be476 100644 --- a/pkgs/development/libraries/haskell/json-schema/default.nix +++ b/pkgs/development/libraries/haskell/json-schema/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "json-schema"; - version = "0.7.0.2"; - sha256 = "1yh5zq10d0lyn67p5n3q445rcm18rdagj6pi2ic7fpyh9bks2r12"; + version = "0.7.1.1"; + sha256 = "1fzlavgx60gzqvk5h1wb0igz5qjb52zcxnmm48pwmbcjl9d6j57v"; buildDepends = [ aeson genericAeson genericDeriving mtl scientific tagged text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index a709c4a0b2d7..548b9ce9e89a 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "json"; - version = "0.7"; - sha256 = "18v8vbx3pyskf3ap4lpy2d3461gghfsq5bzjyrjvqsd2r9r44rfk"; + version = "0.8"; + sha256 = "0ddwgp54drnv4d6jss1fp1khg0d463fz7lasx75fc0bxzjq6ln2w"; buildDepends = [ mtl parsec syb text ]; meta = { description = "Support for serialising Haskell to and from JSON"; diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index d8e724259a0f..4cb44acf652e 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.7.2"; - sha256 = "03q8l28rwrg00c2zcv0gr5fpis5xz8c5zspziay6p2grbwfxmwda"; + version = "0.3.8"; + sha256 = "08mvz78ak6rf22s2z0b50iky36cnd6f498262aj57l7j0l7zsy7r"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 62a7cdde95af..21c49c457f90 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "2.1.0.2"; - sha256 = "15g0y7vmzihg6cxym5drzbk8jzpp8cqkfvnvmd395fa2ki2acxm7"; + version = "2.1.1"; + sha256 = "0wmvjizz0zx5i9q5sh8hvsks14q6if4s0dnk63f9mw03jb8jpdd1"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit exceptions fastLogger liftedBase monadControl monadLogger mtl diff --git a/pkgs/development/libraries/haskell/pipes-shell/default.nix b/pkgs/development/libraries/haskell/pipes-shell/default.nix index b55b1b88677a..f7f5e20bcf44 100644 --- a/pkgs/development/libraries/haskell/pipes-shell/default.nix +++ b/pkgs/development/libraries/haskell/pipes-shell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes-shell"; - version = "0.1.2"; - sha256 = "18ikjkppds7k9fgjn39qvdp8avj8vv3csiqcrhgrpfqy1d0hgrlw"; + version = "0.1.3"; + sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1"; buildDepends = [ async pipes pipesBytestring pipesSafe stm stmChans text ]; diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index ec4a8e967865..ca849127e9d7 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes-text"; - version = "0.0.0.12"; - sha256 = "18xf0rhshbl03js50n98k96692w98j0j0dfyi67780i08c39dq6m"; + version = "0.0.0.13"; + sha256 = "1sqwrs5y9s16zikwb5w21fvrqf06ld0915kc065ikdcrd6z4sk43"; buildDepends = [ pipes pipesBytestring pipesGroup pipesParse pipesSafe streamingCommons text transformers diff --git a/pkgs/development/libraries/haskell/rematch/default.nix b/pkgs/development/libraries/haskell/rematch/default.nix new file mode 100644 index 000000000000..0ef47cde9045 --- /dev/null +++ b/pkgs/development/libraries/haskell/rematch/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hspec, HUnit }: + +cabal.mkDerivation (self: { + pname = "rematch"; + version = "0.2.0.0"; + sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr"; + testDepends = [ hspec HUnit ]; + doCheck = false; + meta = { + description = "A simple api for matchers"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix index 7cbe69021473..409c572603ed 100644 --- a/pkgs/development/libraries/haskell/shell-conduit/default.nix +++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shell-conduit"; - version = "4.3"; - sha256 = "1f82ncdsi4w63r48aj7679hii0hkd46drdz3bdgwxqx2yynjmlj8"; + version = "4.4"; + sha256 = "023cqmj5c45d65rcv07m2w1w2b5lhlfhzwv18fxxl3v8s6gr3wb8"; buildDepends = [ async conduit conduitExtra controlMonadLoop filepath monadControl monadsTf resourcet semigroups split text these transformers diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index 6bb589984efc..1b7a7b10b213 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snaplet-redis"; - version = "0.1.4"; - sha256 = "1xyff7hsafxjyiifm7fb2d43sscrzqrn3gxfdjzgrhf8b3ayi01y"; + version = "0.1.4.1"; + sha256 = "0vrsvmgrds7l4q88q7gmy1bz36z5ba45rib2vm5z6v2cf0x22qz2"; buildDepends = [ configurator hedis lens mtl network snap text transformers ]; diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 903eccdfed3c..10585eb3412b 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.7.2"; - sha256 = "06w7gss2vqnly2zijf0hkq60jx13nsxwsjsnyfbn25r4f6gjsnq5"; + version = "0.7.3"; + sha256 = "016bzws7w09xhyyqiz56ahlf7zhagihn370ga0083fgv172lym7b"; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; diff --git a/pkgs/development/libraries/haskell/text-binary/default.nix b/pkgs/development/libraries/haskell/text-binary/default.nix new file mode 100644 index 000000000000..9e6205b7001e --- /dev/null +++ b/pkgs/development/libraries/haskell/text-binary/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, text }: + +cabal.mkDerivation (self: { + pname = "text-binary"; + version = "0.1.0"; + sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z"; + buildDepends = [ binary text ]; + meta = { + homepage = "https://github.com/kawu/text-binary"; + description = "Binary instances for text types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 110f9f396c1d..25118d1ff648 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.3"; - sha256 = "1gfqj9rsjmc8gdg2qrzdnjnjdwdls55k061qh82ihwa6l7nfkjv1"; + version = "0.3.5.4"; + sha256 = "00qsd0ig1zjj7lni7xw5xaxk8w2zwq8jbii8admigrfqsj5qcnam"; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 55270cbb2102..a5112b8fa3d9 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -21,12 +21,12 @@ cabal.mkDerivation (self: { temporary testFramework testFrameworkHunit text ]; doCheck = false; + patches = [ ./lens-4.5.patch ]; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/wreq/lens-4.5.patch b/pkgs/development/libraries/haskell/wreq/lens-4.5.patch new file mode 100644 index 000000000000..b47e5647bf1d --- /dev/null +++ b/pkgs/development/libraries/haskell/wreq/lens-4.5.patch @@ -0,0 +1,15 @@ +diff --git a/Network/Wreq/Lens/Machinery.hs b/Network/Wreq/Lens/Machinery.hs +index 782d965..0c97d27 100644 +--- a/Network/Wreq/Lens/Machinery.hs ++++ b/Network/Wreq/Lens/Machinery.hs +@@ -13,8 +13,8 @@ import Language.Haskell.TH.Syntax (Dec, Name, Q, mkName, nameBase) + defaultRules :: LensRules + defaultRules = lensRules + +-fieldName :: (String -> String) -> [Name] -> Name -> [DefName] +-fieldName f _ name = [TopName . mkName . f . nameBase $ name] ++fieldName :: (String -> String) -> Name -> [Name] -> Name -> [DefName] ++fieldName f _ _ name = [TopName . mkName . f . nameBase $ name] + + makeLenses :: Name -> Q [Dec] + makeLenses = makeLensesWith (defaultRules & lensField .~ fieldName id) diff --git a/pkgs/development/libraries/haskell/yi-rope/default.nix b/pkgs/development/libraries/haskell/yi-rope/default.nix index 146308038eb6..a92f086f3a6e 100644 --- a/pkgs/development/libraries/haskell/yi-rope/default.nix +++ b/pkgs/development/libraries/haskell/yi-rope/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yi-rope"; - version = "0.6.0.0"; - sha256 = "1r52mybqzy28zsv6r6a0cfmi8qaiscc91q2dhfq8rlp63l7ghq36"; + version = "0.7.0.0"; + sha256 = "123p0m31h8qa53jl2sd646s1hrs5qnb7y82y7bzgg2zny4qqw9a2"; buildDepends = [ binary charsetdetectAe dataDefault deepseq fingertree text textIcu ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix new file mode 100644 index 000000000000..26748d50479a --- /dev/null +++ b/pkgs/development/libraries/ldb/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, tdb, talloc, tevent +, popt, libxslt, docbook_xsl, docbook_xml_dtd_42 +, acl ? null, heimdal ? null, libaio ? null, libcap ? null, libgcrypt ? null +, sasl ? null, pam ? null, zlib ? null, openldap ? null +}: + +stdenv.mkDerivation rec { + name = "ldb-1.1.17"; + + src = fetchurl { + url = "http://samba.org/ftp/ldb/${name}.tar.gz"; + sha256 = "1rmnppbk06aa1kfdrxi4xyjw2zzx54jqyz95dmqn754ys6m158xr"; + }; + + buildInputs = [ + python27 pkgconfig readline gettext tdb talloc tevent popt + libxslt docbook_xsl docbook_xml_dtd_42 + acl heimdal libaio libcap libgcrypt sasl pam zlib openldap + ]; + + preConfigure = '' + sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf + ''; + + configureFlags = [ + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ]; + + meta = with stdenv.lib; { + description = "a LDAP-like embedded database"; + homepage = http://ldb.samba.org/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix new file mode 100644 index 000000000000..a29107c38967 --- /dev/null +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, +pkgconfig, perl, git, libevent, openssl}: + +stdenv.mkDerivation { + name = "libcouchbase-2.4.1"; + src = fetchgit { + url = "https://github.com/couchbase/libcouchbase.git"; + rev = "bd3a20f9e18a69dca199134956fd4ad3e1b80ca8"; + sha256 = "0gimvfxvbmhm6zy4vgs2630ygilhryxl8apfmv3iqs23pafwzm8r"; + leaveDotGit = true; + }; + + preConfigure = '' + patchShebangs ./config/ + ./config/autorun.sh + ''; + + configureFlags = "--disable-couchbasemock"; + + buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl]; + + meta = { + description = "C client library for Couchbase."; + homepage = "https://github.com/couchbase/libcouchbase"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix new file mode 100644 index 000000000000..a555b4dd5f9d --- /dev/null +++ b/pkgs/development/libraries/libgsystem/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +, glib, attr, systemd +}: + +stdenv.mkDerivation { + name = "libgsystem-2014.2"; + + meta = with stdenv.lib; { + description = "GIO-based library with Unix/Linux specific API"; + homepage = "https://wiki.gnome.org/Projects/LibGSystem"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "libgsystem"; + rev = "v2014.2"; + sha256 = "10mqyy94wbmxv9rizwby4dyvqgranjr3hixr5k7fs90lhgbxbkj6"; + }; + + nativeBuildInputs = [ + autoreconfHook pkgconfig gtk_doc gobjectIntrospection + ]; + + propagatedBuildInputs = [ glib attr systemd ]; + + preAutoreconf = '' + mkdir m4 + ''; +} diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix new file mode 100644 index 000000000000..b4c256fb340f --- /dev/null +++ b/pkgs/development/libraries/libiberty/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "4.8.3"; + name = "libiberty-${version}"; + + src = fetchurl { + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "07hg10zs7gnqz58my10ch0zygizqh0z0bz6pv4pgxx45n48lz3ka"; + }; + + postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; + + enable_shared = 1; + + installPhase = '' + mkdir -p $out/lib + cp pic/libiberty.a $out/lib/libiberty_pic.a + ''; + + meta = with stdenv.lib; { + homepage = http://gcc.gnu.org/; + license = licenses.lgpl2; + description = "Collection of subroutines used by various GNU programs"; + maintainers = maintainers.abbradar; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix new file mode 100644 index 000000000000..d8477c5fca0f --- /dev/null +++ b/pkgs/development/libraries/libxls/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "libxls-1.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/libxls/${name}.zip"; + sha256 = "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk"; + }; + + nativeBuildInputs = [ unzip ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Extract Cell Data From Excel xls files"; + homepage = http://libxls.sourceforge.net/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index a8975e29b4b3..2459284b2703 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,24 +1,37 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, libxslt, docbook_xsl +, docbook_xml_dtd_42 +, acl ? null, heimdal ? null, libaio ? null, pam ? null, zlib ? null +, libgcrypt ? null, libcap ? null +}: stdenv.mkDerivation rec { - name = "talloc-2.0.1"; + name = "talloc-2.1.1"; src = fetchurl { url = "http://samba.org/ftp/talloc/${name}.tar.gz"; - sha256 = "1d694zyi451a5zr03l5yv0n8yccyr3r8pmzga17xaaaz80khb0av"; + sha256 = "0x31id42b425dbxv5whrqlc6dj14ph7wzs3wsp1ggi537dncwa9y"; }; - configureFlags = "--enable-talloc-compat1 --enable-largefile"; - - # https://bugzilla.samba.org/show_bug.cgi?id=7000 - postConfigure = if stdenv.isDarwin then '' - substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -Wl,-install_name," - '' else ""; + buildInputs = [ + python27 pkgconfig readline gettext libxslt docbook_xsl docbook_xml_dtd_42 + acl heimdal libaio pam zlib libgcrypt libcap + ]; - meta = { + preConfigure = '' + sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf + ''; + + configureFlags = [ + "--enable-talloc-compat1" + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ]; + + meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index c53316564351..ce43202ee438 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,16 +1,32 @@ -{ fetchurl, stdenv, libxslt, libxml2, docbook_xsl }: +{ stdenv, fetchurl, python27, pkgconfig, gettext, readline, libxslt +, docbook_xsl, docbook_xml_dtd_42 +, libaio ? null, acl ? null, heimdal ? null, libcap ? null, sasl ? null, pam ? null, zlib ? null +, libgcrypt ? null +}: stdenv.mkDerivation rec { - name = "tdb-1.2.1"; + name = "tdb-1.3.1"; src = fetchurl { url = "http://samba.org/ftp/tdb/${name}.tar.gz"; - sha256 = "1yndfc2hn28v78vgvrds7cjggmmhf9q5dcfklgdfvpsx9j9knhpg"; + sha256 = "1qzcl8n57vpxwd8048djna3zwjy6ji56c2bnvmnr1hw0x1d9hagz"; }; - buildInputs = [ libxslt libxml2 docbook_xsl ]; + buildInputs = [ + python27 pkgconfig gettext readline libxslt docbook_xsl docbook_xml_dtd_42 + libaio acl heimdal libcap sasl pam zlib libgcrypt + ]; - meta = { + preConfigure = '' + sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf + ''; + + configureFlags = [ + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ]; + + meta = with stdenv.lib; { description = "The trivial database"; longDescription = '' TDB is a Trivial Database. In concept, it is very much like GDBM, @@ -18,11 +34,9 @@ stdenv.mkDerivation rec { uses locking internally to keep writers from trampling on each other. TDB is also extremely small. ''; - homepage = http://tdb.samba.org/; - license = stdenv.lib.licenses.lgpl3Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix new file mode 100644 index 000000000000..e92ae2ecef1e --- /dev/null +++ b/pkgs/development/libraries/tevent/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, talloc +, libxslt, docbook_xsl, docbook_xml_dtd_42 +, acl ? null, heimdal ? null, libaio ? null, libcap ? null, sasl ? null +, pam ? null, zlib ? null, libgcrypt ? null +}: + +stdenv.mkDerivation rec { + name = "tevent-0.9.22"; + + src = fetchurl { + url = "http://samba.org/ftp/tevent/${name}.tar.gz"; + sha256 = "0myyi3lwsi6f3f0a5qw8rjpm2d5yf18pw4vljdwyi885l411sksl"; + }; + + buildInputs = [ + python27 pkgconfig readline gettext talloc libxslt docbook_xsl + docbook_xml_dtd_42 + acl heimdal libaio libcap sasl pam zlib libgcrypt + ]; + + preConfigure = '' + sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf + ''; + + configureFlags = [ + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ]; + + meta = with stdenv.lib; { + description = "an event system based on the talloc memory management library."; + homepage = http://tevent.samba.org/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix new file mode 100644 index 000000000000..760f9cdc5745 --- /dev/null +++ b/pkgs/development/libraries/xlslib/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "2.4.0"; + name = "xlslib-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip"; + sha256 = "0h7qhxcc55cz3jvrfv4scjnzf5w9g97wigyviandi4ag54qjxjdc"; + }; + + nativeBuildInputs = [ unzip ]; + + setSourceRoot = "export sourceRoot=xlslib/xlslib"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "C++/C library to construct Excel .xls files in code"; + homepage = http://xlslib.sourceforge.net/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index e3ab1d37b15a..4f47680dcec9 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { + branch = "4.0"; homepage = https://bitbucket.org/camlspotter/camlimages; description = "OCaml image processing library"; license = licenses.lgpl2; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index adbdc936d1e4..f6d22f62ec09 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { meta = { homepage = http://camomile.sourceforge.net/; description = "A comprehensive Unicode library for OCaml"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; + branch = "0.8.2"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 59da5473ab10..932a5811bec7 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -1,20 +1,15 @@ {stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - pname = "ocaml-http"; - version = "0.1.3"; -in - stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "ocaml-http-0.1.5"; src = fetchurl { - url = "http://upsilon.cc/~zack/hacking/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn"; + url = https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz; + sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws"; }; - buildInputs = [ocaml_pcre ocamlnet ocaml findlib camlp4]; + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [ocaml_pcre ocamlnet]; createFindlibDestdir = true; @@ -31,7 +26,8 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; + homepage = http://ocaml-http.forge.ocamlcore.org/; + platforms = ocaml.meta.platforms; description = "do it yourself (OCaml) HTTP daemon"; license = licenses.lgpl2; maintainers = with maintainers; [ roconnor vbgl ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 5fb9969e62ef..2e50b897f3d3 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (rec { ''; meta = { + branch = "2.14"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 06e54a677334..0948b7132a4e 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocamlnet-3.7.6"; + name = "ocamlnet-3.7.7"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-3.7.6.tar.gz; - sha256 = "0z17kxn1cyn1x5wgajw737m9rsjwji823rxdwvv8a5239xd1whji"; + url = http://download.camlcity.org/download/ocamlnet-3.7.7.tar.gz; + sha256 = "02bnks9jshpq9nqva5lky5hl009yp19cgvf1izjca620hx54d3jv"; }; buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit]; diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 3dbb0ea8e818..bde9c2713715 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { + branch = "108"; homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix index 805a8926e186..24daa366b2af 100644 --- a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://ocaml.janestreet.com/; description = "Support library for OCaml preprocessor type conversions"; - #license = licenses.apl20; invalid license + license = licenses.asl20; + branch = "108"; platforms = ocaml.meta.platforms; maintainers = with maintainers; [ z77z ]; }; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 2f679da977d7..ccd278a2faaf 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; }; - buildInputs = [ ocaml findlib pkgconfig gmp perl ]; + buildInputs = [ ocaml findlib pkgconfig perl ]; + propagatedBuildInputs = [ gmp ]; patchPhase = '' substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl' diff --git a/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch b/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch new file mode 100644 index 000000000000..3ac3f4e2a821 --- /dev/null +++ b/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch @@ -0,0 +1,25 @@ +https://github.com/pfig/net-amazon-s3/pull/42 + +From 116d73235d8243ec4427e6d7bf1f14f7fb9129aa Mon Sep 17 00:00:00 2001 +From: Jay Hannah +Date: Thu, 8 May 2014 02:29:14 +0000 +Subject: [PATCH] Patch for current versions of Moose: "Passing a list of + values to enum is deprecated. Enum values should be wrapped in an arrayref." + +--- + lib/Net/Amazon/S3/Client/Object.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Net/Amazon/S3/Client/Object.pm b/lib/Net/Amazon/S3/Client/Object.pm +index 08e48c6..106f2fd 100755 +--- a/lib/Net/Amazon/S3/Client/Object.pm ++++ b/lib/Net/Amazon/S3/Client/Object.pm +@@ -16,7 +16,7 @@ enum 'AclShort' => + [ qw(private public-read public-read-write authenticated-read) ]; + + enum 'StorageClass' => +- qw(standard reduced_redundancy); ++ [ qw(standard reduced_redundancy) ]; + + has 'client' => + ( is => 'ro', isa => 'Net::Amazon::S3::Client', required => 1 ); diff --git a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch new file mode 100644 index 000000000000..4e36612d80d0 --- /dev/null +++ b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch @@ -0,0 +1,52 @@ +diff -Nurp pycdio-0.20-orig/test/cdtext.toc pycdio-0.20/test/cdtext.toc +--- pycdio-0.20-orig/test/cdtext.toc 1970-01-01 01:00:00.000000000 +0100 ++++ pycdio-0.20/test/cdtext.toc 2014-11-06 23:36:12.520708320 +0100 +@@ -0,0 +1,48 @@ ++CD_DA ++ ++// global CD-TEXT data ++ ++CD_TEXT { ++ ++ // Mapping from language number (0..7) used in 'LANGUAGE' statements ++ // to language code. ++/// LANGUAGE_MAP { ++/// 0 : EN // 9 is the code for ENGLISH, ++/// // I don't know any other language code, yet ++/// } ++ ++ // Language number should always start with 0 ++ LANGUAGE 0 { ++ // Required fields - at least all CD-TEXT CDs I've seen so far have them. ++ TITLE "CD Title" ++ PERFORMER "Performer" ++ DISC_ID "XY12345" ++ UPC_EAN "" // usually empty ++ ++ // Further possible items, all of them are optional ++ ARRANGER "" ++ SONGWRITER "" ++ MESSAGE "" ++ GENRE "" // I'm not sure if this should be really ascii data ++ } ++} ++ ++ ++TRACK AUDIO ++// track specific CD-TEXT data ++CD_TEXT { ++ LANGUAGE 0 { ++ // if an item is defined for one track it should be defined for all tracks ++ TITLE "Track Title" ++ ++ PERFORMER "Performer" ++ ISRC "US-XX1-98-01234" ++ ++ ARRANGER "" ++ SONGWRITER "" ++ MESSAGE "" ++ } ++} ++ ++SILENCE 1:0:0 ++ diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index baa63855a0af..9e2f310b8a11 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, ocamlPackages, graphviz -, ltl2ba, coq, alt-ergo, gmp, why3 }: +, ltl2ba, coq, alt-ergo, why3 }: stdenv.mkDerivation rec { name = "frama-c-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = with ocamlPackages; [ - ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph gmp + ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph lablgtk coq graphviz zarith why3 zarith ]; diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix index 36b3739a1405..03dfaee87861 100644 --- a/pkgs/development/tools/haskell/hasktags/default.nix +++ b/pkgs/development/tools/haskell/hasktags/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ filepath json utf8String ]; + jailbreak = true; meta = { homepage = "http://github.com/MarcWeber/hasktags"; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix index 350ad216bcab..8f1397775b7e 100644 --- a/pkgs/development/tools/haskell/hdevtools/default.nix +++ b/pkgs/development/tools/haskell/hdevtools/default.nix @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7"; isLibrary = false; isExecutable = true; - patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; md5 = "256609d2d3f5b719caa0002ee579d169"; }) ]; + patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; sha256 = "104vdw6qxl71fdg43ppv0hrg6k17zaijq73vap794178d3gb35al"; }) ]; buildDepends = [ cmdargs ghcPaths network syb time ]; meta = { homepage = "https://github.com/bitc/hdevtools/"; diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 807ce70ef040..18c4b2b88641 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.5"; - sha256 = "0jbf9x50gy9qja6gazh0lgyffz46a3wps6hbxppqmcicjhwbpvr5"; + version = "1.3.5.1"; + sha256 = "1g8cq74cjhy8r0435m4il0iak5g03jdiz40sn4801iy765rcylpv"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix index 97099d1b4920..adfdb4bd204c 100644 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation { It also provides parsing and printing tools. ''; homepage = "${webpage}"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; + branch = "5"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch b/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch index 1a4a6a225a49..4fc887c070d7 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch +++ b/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch @@ -9,6 +9,15 @@ STDBIN = $(shell dirname `which ocamlfind`) ifndef PREFIX PREFIX = $(shell dirname $(STDBIN)) +@@ -15,7 +17,7 @@ + endif + export BINDIR + +-PACKS = unix str ++PACKS = unix str findlib + PP = camlp4o -I . -parser pa_tryfinally.cmo -parser pa_opt.cmo + export PP + @@ -36,11 +38,11 @@ common: version.ml @@ -23,3 +32,39 @@ cp pa_tryfinally310.cmo pa_tryfinally.cmo && \ cp pa_tryfinally310.cmi pa_tryfinally.cmi +--- a/main.ml 2014-11-08 09:05:12.516401313 +0000 ++++ b/main.ml 2014-11-08 09:09:59.801311230 +0000 +@@ -250,9 +250,15 @@ + Sys.getcwd ()) + | `File script_name -> "", get_dir script_name in + ++ let findlibdir = ++ Filename.( ++ concat (Findlib.package_directory "findlib") parent_dir_name ++ ) in ++ + let file, oc = Filename.open_temp_file "meta" ".ml" in + fprintf oc "\ + #%i %S;; ++#directory \"%s\";; + #use \"topfind\";; + #require \"ocamlscript\";; + Ocamlscript.Common.verbose := %s;; +@@ -261,7 +267,7 @@ + open Ocamlscript;; + open Utils;; + #%i %S;;\n" +- pos source verbose script_dir extra_args trash pos source; ++ pos source findlibdir verbose script_dir extra_args trash pos source; + + List.iter (output_line oc) lines; + +@@ -544,6 +550,7 @@ + exit compilation_status + + let _ = ++ Findlib.init (); + try main () + with Failure s -> + eprintf "ocamlscript: %s\n%!" s; + diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 50b9c496abaf..1b37c21fdfa7 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd"; }; - buildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ ocaml findlib camlp4 ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 247daacf1617..0ae6cf92b4ef 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,42 +1,26 @@ -{stdenv, composableDerivation, fetchurl, transfig, texLive}: +{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra, ghostscript +, build-manual ? false +}: -let - version = "6.3"; +stdenv.mkDerivation rec { name = "ragel-${version}"; -in + version = "6.9"; -composableDerivation.composableDerivation {} { - inherit name; src = fetchurl { - url = "http://www.complang.org/ragel/${name}.tar.gz"; - sha256 = "018cedc8a68be85cda330fc53d0bb8a1ca6ad39b1cf790eed0311e7baa5a2520"; + url = "http://www.colm.net/wp-content/uploads/2014/10/${name}.tar.gz"; + sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf"; }; - flags = { - doc = { - # require fig2dev & pdflatex (see README) - buildInputs = [transfig texLive]; - # use post* because default values of buildPhase is empty. - postBuild = '' - pushd doc - make - popd - ''; - postInstall = '' - pushd doc - make install - popd - ''; - }; - }; - - cfg = { - docSupport = false; - }; - - meta = { + buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ]; + + preConfigure = stdenv.lib.optional build-manual '' + sed -i "s/build_manual=no/build_manual=yes/g" DIST + ''; + + meta = with stdenv.lib; { homepage = http://www.complang.org/ragel; description = "State machine compiler"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index c9d421eac9be..c2f401310946 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,17 +1,41 @@ -{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile -, copyDataDirectory ? false }: +{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses, SDL, SDL_image, SDL_ttf, gtk2, glib, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile + , copyDataDirectory ? true }: + +/* set copyDataDirectory as true by default since df 40 does not seem to run without it */ + +let + + srcs = { + df_unfuck = fetchgit { + url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; + rev = "7c1d8bf027c8d8835d0d3ef50502f0c45a7f9bae"; + sha256 = "d4a681231da00fec7bcdb092bcf51415c75fd20fc9da786fb6013e0c03fbc373"; + }; + + df = fetchurl { + url = "http://www.bay12games.com/dwarves/df_40_15_linux.tar.bz2"; + sha256 = "1mmz7mnsm2y5n2aqyf30zrflyl58haaj6p380pi4022gbd13mnsn"; + }; + }; + +in assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "dwarf-fortress-0.34.11"; + name = "dwarf-fortress-0.40.15"; - src = fetchurl { - url = "http://www.bay12games.com/dwarves/df_34_11_linux.tar.bz2"; - sha256 = "1qk9vmdxzs0li81c8bglpj3m7aw9k71x1slf58hv2bz7hdndl3kj"; - }; - phases = "unpackPhase patchPhase installPhase"; + buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf]; + src = "${srcs.df_unfuck} ${srcs.df}"; + phases = "unpackPhase patchPhase configurePhase buildPhase installPhase"; + + sourceRoot = "git-export"; + + cmakeFlags = [ + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" + ]; /* :TODO: Game options should be configurable by patching the default configuration files */ @@ -21,11 +45,15 @@ stdenv.mkDerivation rec { set -x mkdir -p $out/bin mkdir -p $out/share/df_linux - cp -r * $out/share/df_linux + cd ../../ + cp -r ./df_linux/* $out/share/df_linux + rm $out/share/df_linux/libs/lib* + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress + cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so + cp $permission $out/share/df_linux/nix_permission patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress - ln -s ${libsndfile}/lib/libsndfile.so $out/share/df_linux/libs/ cat > $out/bin/dwarf-fortress << EOF #!${stdenv.shell} @@ -60,23 +88,13 @@ stdenv.mkDerivation rec { ln -s \$i \$DF_DIR/data/ done - # index initial_movies, announcement, dipscript and help files are as of 0.31.16 opened in read/write mode instead of read-only mode - # this is a hack to work around this - # Should I just apply this to the whole data directory? - for i in index initial_movies announcement dipscript help - do - rm \$DF_DIR/data/\$i - cp -rf $out/share/df_linux/data/\$i \$DF_DIR/data/ - chmod -R u+w \$DF_DIR/data/\$i - done - # link in persistant data mkdir -p \$DF_DIR/save ln -s \$DF_DIR/save \$DF_DIR/data/ ''} # now run Dwarf Fortress! - export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/ + export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:$DF_DIR/df_linux/libs/ \$DF_DIR/df "\$@" EOF diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix deleted file mode 100644 index 406c45d3414b..000000000000 --- a/pkgs/games/dwarf-fortress/df2014.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses, SDL, SDL_image, SDL_ttf, gtk2, glib, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile - , copyDataDirectory ? true }: - -/* set copyDataDirectory as true by default since df 40 does not seem to run without it */ - -let - - srcs = { - df_unfuck = fetchgit { - url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; - rev = "044b266ce3e03b54a4228d51d6b75d70963debc9"; - sha256 = "0xc839zmg1bqyrdirhy2ixm8i58q7nwhyi86h60qmrfdg3bsnnpr"; - }; - - df = fetchurl { - url = "http://www.bay12games.com/dwarves/df_40_13_linux.tar.bz2"; - sha256 = "1azsxgjc1fh8i041p6i7dmvdk0v3xpmhg44lmimlrs78a08h4z61"; - }; - }; - -in - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation rec { - name = "dwarf-fortress-0.40.13"; - - - buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf]; - src = "${srcs.df_unfuck} ${srcs.df}"; - phases = "unpackPhase patchPhase configurePhase buildPhase installPhase"; - - sourceRoot = "git-export"; - - cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" - ]; - - /* :TODO: Game options should be configurable by patching the default configuration files */ - - permission = ./df_permission; - - installPhase = '' - set -x - mkdir -p $out/bin - mkdir -p $out/share/df_linux - cd ../../ - cp -r ./df_linux/* $out/share/df_linux - rm $out/share/df_linux/libs/lib* - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress - cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so - - cp $permission $out/share/df_linux/nix_permission - - patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress - - cat > $out/bin/dwarf-fortress << EOF - #!${stdenv.shell} - export DF_DIR="\$HOME/.config/df_linux" - if [ -n "\$XDG_DATA_HOME" ] - then export DF_DIR="\$XDG_DATA_HOME/df_linux" - fi - - # Recreate a directory structure reflecting the original - # distribution in the user directory (for modding support) - ${if copyDataDirectory then '' - if [ ! -d "\$DF_DIR" ]; - then - mkdir -p \$DF_DIR - cp -r $out/share/df_linux/* \$DF_DIR/ - chmod -R u+rw \$DF_DIR/ - fi - '' else '' - # Link in the static stuff - mkdir -p \$DF_DIR - ln -sf $out/share/df_linux/libs \$DF_DIR/ - ln -sf $out/share/df_linux/raw \$DF_DIR/ - ln -sf $out/share/df_linux/df \$DF_DIR/ - - # Delete old data directory - rm -rf \$DF_DIR/data - - # Link in the static data directory - mkdir \$DF_DIR/data - for i in $out/share/df_linux/data/* - do - ln -s \$i \$DF_DIR/data/ - done - - # link in persistant data - mkdir -p \$DF_DIR/save - ln -s \$DF_DIR/save \$DF_DIR/data/ - ''} - - # now run Dwarf Fortress! - export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:$DF_DIR/df_linux/libs/ - \$DF_DIR/df "\$@" - EOF - - chmod +x $out/bin/dwarf-fortress - ''; - - meta = { - description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; - homepage = http://www.bay12games.com/dwarves; - license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = [stdenv.lib.maintainers.roconnor]; - }; -} diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index be011f2497ee..a1af42814d12 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "1pb3vzmqkzxdrrrxvrji66bjiz5bx7n6c6d1pkqnjkc6p7fvpg0i"; + sha256 = "1xykqb5bx2dzffxhvm4cbn1nf72f7zcdz8hy25i5wky4hfw31x3h"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0cb305551b64..c882ae3d029d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -77,6 +77,7 @@ with stdenv.lib; IP_DCCP_CCID3 n # experimental CLS_U32_PERF y CLS_U32_MARK y + BPF_JIT y # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build @@ -175,6 +176,12 @@ with stdenv.lib; CIFS_XATTR y CIFS_POSIX y CIFS_FSCACHE y + ${optionalString (versionAtLeast version "3.12") '' + CEPH_FSCACHE y + ''} + ${optionalString (versionAtLeast version "3.14") '' + CEPH_FS_POSIX_ACL y + ''} # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem @@ -239,6 +246,7 @@ with stdenv.lib; MTRR_SANITIZER y NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support + PPP_FILTER y REGULATOR y # Voltage and Current Regulator Support ${optionalString (versionAtLeast version "3.6") '' RC_DEVICES? y # Enable IR devices @@ -308,6 +316,11 @@ with stdenv.lib; ${optionalString (!stdenv.is64bit) '' HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support. ''} + INTEL_IOMMU_DEFAULT_ON y + ${optionalString (versionAtLeast version "3.9") '' + VFIO_PCI_VGA y + ''} + VIRT_DRIVERS y # Media support. ${optionalString (versionAtLeast version "3.6") '' diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index ee397308c371..bb046999925f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.31"; + version = "3.12.32"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "02azv8csa248ba9fvaja2n1r4dvc8irjg2z1pax1hxqrfkqaxvp3"; + sha256 = "1hzws2bf267hfk81ywqcxspkyi1lg56x63izdc0pv1338xcfas53"; }; features.iwlwifi = true; diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix index 129f44ab502f..c89e4100d38b 100644 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, apacheHttpd }: +{ lib, stdenv, fetchurl, apacheHttpd }: + +if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then + + throw "mod_evasive is not supported on Apache httpd 2.4" + +else stdenv.mkDerivation { name = "mod_evasive-1.10.1"; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 5fdf74551723..e70c3105408f 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,13 +1,21 @@ { stdenv, fetchurl, apacheHttpd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "mod_fastcgi-2.4.6"; src = fetchurl { - url = "http://www.fastcgi.com/dist/mod_fastcgi-2.4.6.tar.gz"; + url = "http://www.fastcgi.com/dist/${name}.tar.gz"; sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55"; }; + patches = + [ (fetchurl { + name = "compile-against-apache24.diff"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; + sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; + }) + ]; + buildInputs = [ apacheHttpd ]; preBuild = '' diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index b36327ff5205..08f5d7456840 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,29 +1,26 @@ -{stdenv, fetchurl, apacheHttpd, python}: +{ stdenv, fetchurl, apacheHttpd, python }: -stdenv.mkDerivation { - name = "mod_python-3.3.1"; +stdenv.mkDerivation rec { + name = "mod_python-3.5.0"; src = fetchurl { - url = mirror://apache/httpd/modpython/mod_python-3.3.1.tgz; - sha256 = "0sss2xi6l1a2z8y6ji0cp8vgyvnhq8zrg0ilkvpj1mygbzyk28xd"; + url = "http://dist.modpython.org/dist/${name}.tgz"; + sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f"; }; - patches = [ - ./install.patch - - # See http://bugs.gentoo.org/show_bug.cgi?id=230211 - (fetchurl { - url = "http://bugs.gentoo.org/attachment.cgi?id=160400"; - sha256 = "0yx6x9c5rg5kn6y8vsi4xj3nvg016rrfk553ca1bw796v383xkyj"; - }) - ]; + patches = [ ./install.patch ]; preInstall = '' installFlags="LIBEXECDIR=$out/modules $installFlags" - mkdir -p $out/modules + mkdir -p $out/modules $out/bin ''; passthru = { inherit apacheHttpd; }; - - buildInputs = [apacheHttpd python]; + + buildInputs = [ apacheHttpd python ]; + + meta = { + homepage = http://modpython.org/; + description = "An Apache module that embeds the Python interpreter within the server"; + }; } diff --git a/pkgs/servers/http/apache-modules/mod_python/install.patch b/pkgs/servers/http/apache-modules/mod_python/install.patch index 28a36edbc237..29667e11ed8e 100644 --- a/pkgs/servers/http/apache-modules/mod_python/install.patch +++ b/pkgs/servers/http/apache-modules/mod_python/install.patch @@ -1,20 +1,12 @@ -diff -rc mod_python-3.1.4-orig/dist/Makefile.in mod_python-3.1.4/dist/Makefile.in -*** mod_python-3.1.4-orig/dist/Makefile.in 2005-01-29 22:25:28.000000000 +0100 ---- mod_python-3.1.4/dist/Makefile.in 2006-01-15 12:07:40.000000000 +0100 -*************** -*** 34,40 **** - install_py_lib: mod_python src - @cd src; $(MAKE) psp_parser.c - if test -z "$(DESTDIR)" ; then \ -! $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ - else \ - $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ - fi ---- 34,40 ---- - install_py_lib: mod_python src - @cd src; $(MAKE) psp_parser.c - if test -z "$(DESTDIR)" ; then \ -! $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \ - else \ - $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ - fi +diff -ru -x '*~' mod_python-3.5.0-orig/dist/Makefile.in mod_python-3.5.0/dist/Makefile.in +--- mod_python-3.5.0-orig/dist/Makefile.in 2013-11-12 04:21:34.000000000 +0100 ++++ mod_python-3.5.0/dist/Makefile.in 2014-11-07 11:28:24.466377733 +0100 +@@ -34,7 +34,7 @@ + install_py_lib: mod_python src + @cd src; $(MAKE) psp_parser.c + if test -z "$(DESTDIR)" ; then \ +- $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ ++ $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \ + else \ + $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ + fi diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix new file mode 100644 index 000000000000..500c8add4c63 --- /dev/null +++ b/pkgs/tools/audio/pasystray/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, unzip, autoconf, automake, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: + +stdenv.mkDerivation rec { + name = "pasystray-0.4.0"; + + src = fetchurl { + url = "https://github.com/christophgysin/pasystray/archive/${name}.zip"; + sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; + }; + + buildInputs = [ unzip autoconf automake pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; + + preConfigure = '' + aclocal + autoconf + autoheader + automake --add-missing + ''; + + meta = with stdenv.lib; { + description = "PulseAudio system tray"; + homepage = "https://github.com/christophgysin/pasystray"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.exlevan ]; + platfoms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index b8ee95fae92c..1da552a46e2c 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, ... }: +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy, ... }: stdenv.mkDerivation rec { version = "1.8.6"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { gtk3 kdelibs cmake + anthy ]; patches = [ ./immodules_cache.patch ]; @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { "--with-qt4-immodule" "--with-skk" "--with-x" + "--with-anthy-utf8" ]; dontUseCmakeConfigure = true; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix new file mode 100644 index 000000000000..b91e6bcb3138 --- /dev/null +++ b/pkgs/tools/misc/ostree/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +, libgsystem, xz, e2fsprogs, libsoup, gpgme +}: + +stdenv.mkDerivation { + name = "ostree-2014.11"; + + meta = with stdenv.lib; { + description = "Git for operating system binaries"; + homepage = "http://live.gnome.org/OSTree/"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "ostree"; + rev = "v2014.11"; + sha256 = "152s94r744lyz64syagha2c4y4afblc178lr9mkk8h2d4xvp6nf5"; + }; + + nativeBuildInputs = [ + autoreconfHook pkgconfig gtk_doc gobjectIntrospection + ]; + + buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme ]; + + preAutoreconf = '' + mkdir m4 + gtkdocize + ''; +} diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index a6700284af56..7a9e3fc0d1d9 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -1,54 +1,45 @@ -x@{builderDefsPackage +{ stdenv, fetchurl , openssl, tdb, zlib, flex, bison - , ...}: -builderDefsPackage -(a : + }: let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + buildInputs = [ openssl tdb zlib flex bison ]; sourceInfo = rec { baseName="fdm"; - version="1.7"; + version = "1.7"; name="${baseName}-${version}"; url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz"; - hash="0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28"; + sha256 = "0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28"; }; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation { + src = fetchurl { + inherit (sourceInfo) url sha256; }; inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["doConfigure" "fixInstall" "doMakeInstall"]; - makeFlags = ["PREFIX=$out"]; - fixInstall = a.fullDepEntry ('' + preBuild = '' + export makeFlags="$makeFlags PREFIX=$out" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Dbool=int" + sed -i */Makefile -i Makefile -e 's@ -g bin @ @' sed -i */Makefile -i Makefile -e 's@ -o root @ @' sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @' sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @' sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g' - '') ["minInit" "doUnpack"]; + ''; meta = { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; - maintainers = with a.lib.maintainers; + maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with a.lib.platforms; + platforms = with stdenv.lib.platforms; linux; + homepage = "http://fdm.sourceforge.net/"; + inherit (sourceInfo) version; + updateWalker = true; }; - passthru = { - updateInfo = { - downloadPage = "http://fdm.sourceforge.net/"; - }; - }; -}) x - +} diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg/1.nix similarity index 100% rename from pkgs/tools/security/gnupg1/default.nix rename to pkgs/tools/security/gnupg/1.nix diff --git a/pkgs/tools/security/gnupg1compat/default.nix b/pkgs/tools/security/gnupg/1compat.nix similarity index 100% rename from pkgs/tools/security/gnupg1compat/default.nix rename to pkgs/tools/security/gnupg/1compat.nix diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/20.nix similarity index 100% rename from pkgs/tools/security/gnupg/default.nix rename to pkgs/tools/security/gnupg/20.nix diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix new file mode 100644 index 000000000000..8c3854ac23d6 --- /dev/null +++ b/pkgs/tools/security/gnupg/21.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth +, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null +, zlib ? null, bzip2 ? null, pinentry ? null +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "gnupg-2.1.0"; + + src = fetchurl { + url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0n"; + }; + + buildInputs = [ + pkgconfig libgcrypt libassuan libksba npth + readline libusb gnutls adns openldap zlib bzip2 + ]; + + configureFlags = + optional (pinentry != null) "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + + meta = with stdenv.lib; { + homepage = http://gnupg.org; + description = "a complete and free implementation of the OpenPGP standard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index ccda9be9f03f..e9d8e8aabd90 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ${if withGUI then "make DESTDIR=$out install-gui" else ""} mv $out/usr/* $out rmdir $out/usr + mv $out/sbin $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 73d1f8fdff6a..004b2b58fa37 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "0.3.3"; + version = "141106-54179c5"; src = fetchFromGitHub { owner = "balabit"; repo = "syslog-ng-incubator"; - rev = name; - sha256 = "0pswajcw9f651c1jmprbf1mlr6qadiaplyygz5j16vj0d23x4mal"; + rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a"; + sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam"; }; buildInputs = [ @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-ivykis" - "--with-riemann" "--with-module-dir=$(out)/lib/syslog-ng" ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index a62f81052bad..cec906e1f439 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: +{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl +, riemann_c_client, protobufc, yacc }: stdenv.mkDerivation rec { name = "syslog-ng-${version}"; - version = "3.5.6"; + version = "3.6.1"; src = fetchurl { url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "19i1idklpgn6mz0mg7194by5fjgvvh5n4v2a0rr1z0778l2038kc"; + sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7"; }; - buildInputs = [ eventlog pkgconfig glib python systemd perl ]; + buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; configureFlags = [ "--enable-dynamic-linking" diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix new file mode 100644 index 000000000000..27de591d8896 --- /dev/null +++ b/pkgs/tools/text/html2text/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "html2text-1.3.2a"; + + src = fetchurl { + url = http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz; + sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; + }; + + preConfigure = '' + sed -i s,/bin/echo,echo, configure + ''; + + # the --prefix has no effect + installPhase = '' + mkdir -p $out/bin $out/man/man{1,5} + cp html2text $out/bin + cp html2text.1.gz $out/man/man1 + cp html2textrc.5.gz $out/man/man5 + ''; + + meta = { + description = "html2text is a command line utility, written in C++, that converts HTML documents into plain text."; + homepage = http://www.mbayer.de/html2text/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eikek ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1f8aa6f59d2..d5a09dd74789 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1263,14 +1263,22 @@ let gnupatch = callPackage ../tools/text/gnupatch { }; - gnupg1orig = callPackage ../tools/security/gnupg1 { }; + gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; - gnupg1compat = callPackage ../tools/security/gnupg1compat { }; + gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { gnupg = gnupg20; }; # use config.packageOverrides if you prefer original gnupg1 gnupg1 = gnupg1compat; - gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; }; + gnupg20 = callPackage ../tools/security/gnupg/20.nix { + libgcrypt = libgcrypt_1_6; + }; + + gnupg21 = callPackage ../tools/security/gnupg/21.nix { + libgcrypt = libgcrypt_1_6; + }; + + gnupg = gnupg21; gnuplot = callPackage ../tools/graphics/gnuplot { }; @@ -1542,6 +1550,8 @@ let mmv = callPackage ../tools/misc/mmv { }; + morituri = callPackage ../applications/audio/morituri { }; + most = callPackage ../tools/misc/most { }; multitail = callPackage ../tools/misc/multitail { }; @@ -1590,6 +1600,8 @@ let libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; + libiberty = callPackage ../development/libraries/libiberty { }; + libibverbs = callPackage ../development/libraries/libibverbs { }; librdmacm = callPackage ../development/libraries/librdmacm { }; @@ -1815,6 +1827,10 @@ let pa_applet = callPackage ../tools/audio/pa-applet { }; + pasystray = callPackage ../tools/audio/pasystray { + inherit (gnome3) gnome_icon_theme; + }; + pnmixer = callPackage ../tools/audio/pnmixer { }; nifskope = callPackage ../tools/graphics/nifskope { }; @@ -1959,6 +1975,8 @@ let ossec = callPackage ../tools/security/ossec {}; + ostree = callPackage ../tools/misc/ostree { }; + otpw = callPackage ../os-specific/linux/otpw { }; p7zip = callPackage ../tools/archivers/p7zip { }; @@ -2569,6 +2587,8 @@ let testdisk = callPackage ../tools/misc/testdisk { }; + html2text = callPackage ../tools/text/html2text { }; + htmlTidy = callPackage ../tools/text/html-tidy { }; html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { }; @@ -3425,9 +3445,7 @@ let }; julia = julia031; - lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { - inherit makeWrapper gtk glib pango atk gdk_pixbuf; - inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto; + lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; @@ -4823,6 +4841,8 @@ let boost156 = callPackage ../development/libraries/boost/1.56.nix { }; boost = boost156; + boost_process = callPackage ../development/libraries/boost-process { }; + botan = callPackage ../development/libraries/botan { }; botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; @@ -4841,6 +4861,8 @@ let capnproto = callPackage ../development/libraries/capnproto { }; + ccnx = callPackage ../development/libraries/ccnx { }; + cimg = callPackage ../development/libraries/cimg { }; scmccid = callPackage ../development/libraries/scmccid { }; @@ -4962,6 +4984,8 @@ let dhex = callPackage ../applications/editors/dhex { }; + double_conversion = callPackage ../development/libraries/double-conversion { }; + dclib = callPackage ../development/libraries/dclib { }; dillo = callPackage ../applications/networking/browsers/dillo { @@ -5074,6 +5098,8 @@ let fontconfig = callPackage ../development/libraries/fontconfig { }; + folly = callPackage ../development/libraries/folly { }; + makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: import ../development/libraries/fontconfig/make-fonts-conf.nix { inherit runCommand libxslt fontconfig fontDirectories; @@ -5514,6 +5540,11 @@ let lcms2 = callPackage ../development/libraries/lcms2 { }; + ldb = callPackage ../development/libraries/ldb { + sasl = cyrus_sasl; + libgcrypt = libgcrypt_1_6; + }; + lensfun = callPackage ../development/libraries/lensfun { }; lesstif = callPackage ../development/libraries/lesstif { }; @@ -5605,6 +5636,8 @@ let libctemplate = callPackage ../development/libraries/libctemplate { }; + libcouchbase = callPackage ../development/libraries/libcouchbase { }; + libcue = callPackage ../development/libraries/libcue { }; libdaemon = callPackage ../development/libraries/libdaemon { }; @@ -5760,6 +5793,8 @@ let inherit (pkgs.pythonPackages) mutagen; }; + libgsystem = callPackage ../development/libraries/libgsystem { }; + libharu = callPackage ../development/libraries/libharu { }; libHX = callPackage ../development/libraries/libHX { }; @@ -6158,6 +6193,8 @@ let libxklavier = callPackage ../development/libraries/libxklavier { }; + libxls = callPackage ../development/libraries/libxls { }; + libxmi = callPackage ../development/libraries/libxmi { }; libxml2 = callPackage ../development/libraries/libxml2 { @@ -6814,7 +6851,9 @@ let taglib_extras = callPackage ../development/libraries/taglib-extras { }; - talloc = callPackage ../development/libraries/talloc { }; + talloc = callPackage ../development/libraries/talloc { + libgcrypt = libgcrypt_1_6; + }; tclap = callPackage ../development/libraries/tclap {}; @@ -6824,7 +6863,10 @@ let tcltls = callPackage ../development/libraries/tcltls { }; - tdb = callPackage ../development/libraries/tdb { }; + tdb = callPackage ../development/libraries/tdb { + sasl = cyrus_sasl; + libgcrypt = libgcrypt_1_6; + }; tecla = callPackage ../development/libraries/tecla { }; @@ -6834,6 +6876,11 @@ let telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; + tevent = callPackage ../development/libraries/tevent { + libgcrypt = libgcrypt_1_6; + sasl = cyrus_sasl; + }; + thrift = callPackage ../development/libraries/thrift { }; tinyxml = tinyxml2; @@ -6997,6 +7044,8 @@ let xmlsec = callPackage ../development/libraries/xmlsec { }; + xlslib = callPackage ../development/libraries/xlslib { }; + xvidcore = callPackage ../development/libraries/xvidcore { }; xylib = callPackage ../development/libraries/xylib { }; @@ -7031,6 +7080,8 @@ let zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; + cppzmq = callPackage ../development/libraries/cppzmq {}; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA @@ -7321,7 +7372,7 @@ let rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = pkgs.apacheHttpd_2_2; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; @@ -7331,6 +7382,28 @@ let sslSupport = true; }); + apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { + inherit apacheHttpd; + + mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; + + mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; + + mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; + + mod_python = callPackage ../servers/http/apache-modules/mod_python { }; + + mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + + php = pkgs.php.override { inherit apacheHttpd; }; + + subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; + }; + + apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; + apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2; + apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + cassandra = callPackage ../servers/nosql/cassandra { }; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { @@ -7439,15 +7512,12 @@ let memcached = callPackage ../servers/memcached {}; - mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd/default.nix { }; - - mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; - - mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - - mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + # Backwards compatibility. + mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; + mod_evasive = pkgs.apacheHttpdPackages.mod_evasive; + mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; + mod_python = pkgs.apacheHttpdPackages.mod_python; + mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; mpd = callPackage ../servers/mpd { aacSupport = config.mpd.aacSupport or true; @@ -8688,8 +8758,9 @@ let kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; - liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; + liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; + liberation_ttf = liberation_ttf_binary; libertine = builderDefsPackage (import ../data/fonts/libertine) { inherit fetchurl fontforge lib; @@ -8745,6 +8816,8 @@ let r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; + hasklig = callPackage ../data/fonts/hasklig {}; + source-code-pro = callPackage ../data/fonts/source-code-pro {}; source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; @@ -9220,6 +9293,8 @@ let htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; + icicles = callPackage ../applications/editors/emacs-modes/icicles { }; + idris = callPackage ../applications/editors/emacs-modes/idris { }; jabber = callPackage ../applications/editors/emacs-modes/jabber { }; @@ -9876,8 +9951,9 @@ let links = callPackage ../applications/networking/browsers/links { }; - ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; + ledger3 = callPackage ../applications/office/ledger { }; + ledger = ledger3; lighttable = callPackage ../applications/editors/lighttable {}; @@ -10286,6 +10362,8 @@ let pinfo = callPackage ../applications/misc/pinfo { }; + pinpoint = callPackage ../applications/office/pinpoint {}; + pinta = callPackage ../applications/graphics/pinta { gtksharp = gtksharp2; }; @@ -10496,7 +10574,7 @@ let smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { + snapper = callPackage ../tools/misc/snapper { btrfsProgs = btrfsProgs-3_16; }; @@ -10543,7 +10621,6 @@ let perlBindings = false; javahlBindings = false; saslSupport = false; - httpd = apacheHttpd; sasl = cyrus_sasl; }; @@ -11205,20 +11282,10 @@ let }; }; - dwarf_fortress_2014 = callPackage_i686 ../games/dwarf-fortress/df2014.nix { - SDL_image = pkgsi686Linux.SDL_image.override { - libpng = pkgsi686Linux.libpng12; - }; - }; - dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override { copyDataDirectory = true; }); - dwarf_fortress_2014_modable = appendToName "moddable" (dwarf_fortress_2014.override { - copyDataDirectory = true; - }); - dwarf-therapist = callPackage ../games/dwarf-therapist { }; d1x_rebirth = callPackage ../games/d1x-rebirth { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 643bfd56eb81..8966683e7a48 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -694,6 +694,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; + distributedProcessPlatform = callPackage ../development/libraries/haskell/distributed-process-platform {}; + distributive = callPackage ../development/libraries/haskell/distributive {}; djinn = callPackage ../development/libraries/haskell/djinn {}; @@ -825,6 +827,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in fileLocation = callPackage ../development/libraries/haskell/file-location {}; + fixedVector = callPackage ../development/libraries/haskell/fixed-vector {}; + fmlist = callPackage ../development/libraries/haskell/fmlist {}; ftphs = callPackage ../development/libraries/haskell/ftphs {}; @@ -2225,6 +2229,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regularXmlpickler = callPackage ../development/libraries/haskell/regular-xmlpickler {}; + rematch = callPackage ../development/libraries/haskell/rematch {}; + remote = callPackage ../development/libraries/haskell/remote {}; repa = callPackage ../development/libraries/haskell/repa {}; @@ -2646,6 +2652,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in text_1_2_0_0 = callPackage ../development/libraries/haskell/text/1.2.0.0.nix {}; text = self.text_1_2_0_0; + textBinary = callPackage ../development/libraries/haskell/text-binary {}; + textFormat = callPackage ../development/libraries/haskell/text-format {}; textIcu = callPackage ../development/libraries/haskell/text-icu {}; @@ -2749,7 +2757,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {}; - unificationFd = callPackage ../development/libraries/haskell/unification-fd {}; + unificationFd = callPackage ../development/libraries/haskell/unification-fd {}; unionFind = callPackage ../development/libraries/haskell/union-find {}; @@ -3116,7 +3124,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hyperlinkSource = false; configureFlags = super.configureFlags or "" + pkgs.lib.optionalString (pkgs.stdenv.lib.versionOlder "6.12" ghc.version) " --ghc-option=-rtsopts"; - }; + } // pkgs.stdenv.lib.optionalAttrs (pkgs.stdenv.lib.versionOlder "7.9" ghc.version) { noHaddock = true; }; }; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23c4773c8fea..5fa7fddfabe6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6553,7 +6553,9 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI XMLLibXML JSON ]; # See https://github.com/pfig/net-amazon-s3/pull/25 patches = - [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch ]; + [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch + ../development/perl-modules/net-amazon-s3-moose-warning.patch + ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -7832,18 +7834,18 @@ let self = _self // overrides; _self = with self; { }; Starman = buildPerlModule { - name = "Starman-0.4008"; + name = "Starman-0.4010"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4008.tar.gz; - sha256 = "06fc3yp3nmi26d7lcfqanwwk5jxsmqmidyr8n2qfrsa0r7d07c88"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4010.tar.gz; + sha256 = "abe8e2e0519b7326d64db1e93d9c32d853a7be083792d0d7e5f5a1ddf1472d42"; }; - buildInputs = [ ModuleBuildTiny TestRequires ]; + buildInputs = [ LWP ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ DataDump HTTPDate HTTPMessage HTTPParserXS NetServer Plack TestTCP ]; doCheck = false; # binds to various TCP ports meta = { homepage = https://github.com/miyagawa/Starman; description = "High-performance preforking PSGI/Plack web server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = "perl"; }; }; @@ -8522,6 +8524,31 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + TermSizeAny = buildPerlPackage { + name = "Term-Size-Any-0.002"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Any-0.002.tar.gz; + sha256 = "64fa5fdb1ae3a823134aaa95aec75354bc17bdd9ca12ba0a7ae34a7e51b3ded2"; + }; + propagatedBuildInputs = [ DevelHide TermSizePerl ]; + meta = { + description = "Retrieve terminal size"; + license = "perl"; + }; + }; + + TermSizePerl = buildPerlPackage { + name = "Term-Size-Perl-0.029"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.029.tar.gz; + sha256 = "8c1aaab73646ee1d233e827213ea3b5ab8afcf1d02a8f94be7aed306574875e7"; + }; + meta = { + description = "Perl extension for retrieving terminal size (Perl version)"; + license = "perl"; + }; + }; + TermVT102 = buildPerlPackage { name = "Term-VT102-0.91"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5377ab20d6bc..bab7bcddc38d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6690,6 +6690,38 @@ let }; + pycdio = buildPythonPackage rec { + name = "pycdio-0.20"; + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pycdio/${name}.tar.gz"; + sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14"; + }; + + buildInputs = [ + self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio + ]; + + patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; + + # Run tests using nosetests but first need to install the binaries + # to the root source directory where they can be found. + checkPhase = '' + ./setup.py install_lib -d . + nosetests + ''; + + meta = with stdenv.lib; { + homepage = http://www.gnu.org/software/libcdio/; + description = "Wrapper around libcdio (CD Input and Control library)"; + maintainers = with maintainers; [ rycee ]; + license = licenses.gpl3Plus; + }; + + }; + + pycryptopp = buildPythonPackage (rec { name = "pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958"; disabled = isPy3k || isPyPy; # see https://bitbucket.org/pypy/pypy/issue/1190/ @@ -8494,7 +8526,7 @@ let disabled = isPy34; # some tests fail src = pkgs.fetchurl { - url = "https://github.com/sympy/sympy/releases/download/${name}/${name}.tar.gz"; + url = "https://pypi.python.org/packages/source/s/sympy/${name}.tar.gz"; sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh"; }; @@ -8506,7 +8538,7 @@ let meta = with stdenv.lib; { description = "A Python library for symbolic mathematics"; homepage = http://www.sympy.org/; - license = "free"; + license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; @@ -8840,11 +8872,11 @@ let sphinx = buildPythonPackage (rec { - name = "Sphinx-1.2"; + name = "Sphinx-1.2.3"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; - md5 = "8516046aad73fe46dedece4e8e434328"; + md5 = "a98c93124035b4cd7183604aec656cb3"; }; propagatedBuildInputs = with self; [docutils jinja2 pygments];