diff --git a/.travis.yml b/.travis.yml index 6fa426d36de..dbb04e29ee0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: python python: "3.4" +sudo: required before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix install: ./maintainers/scripts/travis-nox-review-pr.sh nox script: ./maintainers/scripts/travis-nox-review-pr.sh build diff --git a/README.md b/README.md index fa5a419f9f8..86a5568727e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,11 @@ -Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package -manager. +[logo +](https://nixos.org/nixos) [![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs) +Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package +manager. + [NixOS](https://nixos.org/nixos/) linux distribution source code is located inside `nixos/` folder. * [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation) @@ -18,3 +21,6 @@ Communication: * [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) + +--- +[![Throughput Graph](https://graphs.waffle.io/nixos/nixpkgs/throughput.svg)](https://waffle.io/nixos/nixpkgs/metrics) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 73b55ed6c06..c14f15a1ad5 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -47,7 +47,7 @@ rec { '' mkdir -p $out/nix-support - LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver || failed=1 + LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver # Generate a pretty-printed log. xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml @@ -63,8 +63,6 @@ rec { mkdir -p $out/coverage-data mv $i $out/coverage-data/$(dirname $(dirname $i)) done - - [ -z "$failed" ] || touch $out/nix-support/failed ''; # */ }; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 2ea0cd69384..711576982ec 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -13,9 +13,6 @@ let # driver. nvidiaForKernel = kernelPackages: if elem "nvidia" drivers then - if versionAtLeast kernelPackages.kernel.version "4.0" then - kernelPackages.nvidia_x11_beta - else kernelPackages.nvidia_x11 else if elem "nvidiaLegacy173" drivers then kernelPackages.nvidia_x11_legacy173 diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 43a83e0206d..eadaae6715b 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -148,7 +148,7 @@ sub pciCheck { $device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1" ) ) { - push @modulePackages, "config.boot.kernelPackages.broadcom_sta"; + push @modulePackages, "\${config.boot.kernelPackages.broadcom_sta}"; push @kernelModules, "wl"; } diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 1ccd6547df5..14ae3daace0 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -133,7 +133,7 @@ mkdir -m 0755 -p \ $mountPoint/nix/var/nix/db \ $mountPoint/nix/var/log/nix/drvs -mkdir -m 1735 -p $mountPoint/nix/store +mkdir -m 1775 -p $mountPoint/nix/store chown root:nixbld $mountPoint/nix/store diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 395ba82f2d1..114feb2562d 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -59,8 +59,8 @@ in }; nixpkgs.system = mkOption { - type = types.str; - default = builtins.currentSystem; + type = types.uniq types.str; + example = "i686-linux"; description = '' Specifies the Nix platform type for which NixOS should be built. If unset, it defaults to the platform type of your host system. diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index 4c734aefa46..d2c8af6de0c 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -8,6 +8,7 @@ in { options = { services.minecraft-server = { + enable = mkOption { type = types.bool; default = false; @@ -15,7 +16,23 @@ in If enabled, start a Minecraft Server. The listening port for the server is always 25565. The server data will be loaded from and saved to - /var/lib/minecraft. + ${cfg.dataDir}. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/minecraft"; + description = '' + Directory to store minecraft database and other state/data files. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open ports in the firewall (if enabled) for the server. ''; }; @@ -30,7 +47,7 @@ in config = mkIf cfg.enable { users.extraUsers.minecraft = { description = "Minecraft Server Service user"; - home = "/var/lib/minecraft"; + home = cfg.dataDir; createHome = true; uid = config.ids.uids.minecraft; }; @@ -43,9 +60,14 @@ in serviceConfig.Restart = "always"; serviceConfig.User = "minecraft"; script = '' - cd /var/lib/minecraft + cd ${cfg.dataDir} exec ${pkgs.minecraft-server}/bin/minecraft-server ${cfg.jvmOpts} ''; }; + + networking.firewall = mkIf cfg.openFirewall { + allowedUDPPorts = [ 25565 ]; + allowedTCPPorts = [ 25565 ]; + }; }; } diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 67580a1c627..d25fd13a77d 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -30,7 +30,7 @@ in { storagePath = mkOption { type = types.path; default = "/var/lib/docker/registry"; - description = "Docker registry strorage path."; + description = "Docker registry storage path."; }; extraConfig = mkOption { diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index f73c4102cfe..c570a01fb3b 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -14,6 +14,7 @@ let versionModule = { system.nixosVersionSuffix = config.system.nixosVersionSuffix; system.nixosRevision = config.system.nixosRevision; + nixpkgs.system = config.nixpkgs.system; }; eval = evalModules { diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index 0bfd3b74348..8b90f295ed4 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -200,7 +200,6 @@ in package = mkOption { type = types.package; - default = pkgs.bittorrentSync14; example = literalExample "pkgs.bittorrentSync20"; description = '' Branch of bittorrent sync to use. @@ -277,6 +276,8 @@ in } ]; + services.btsync.package = mkOptionDefault pkgs.bittorrentSync14; + users.extraUsers.btsync = { description = "Bittorrent Sync Service user"; home = cfg.storagePath; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 1912b8aa5a9..097e4fe70d5 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -16,6 +16,7 @@ in ./i3.nix ./metacity.nix ./openbox.nix + ./ratpoison.nix ./sawfish.nix ./stumpwm.nix ./spectrwm.nix diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 42148957be4..173453a17f7 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -53,7 +53,7 @@ echo "booting system configuration $systemConfig" > /dev/kmsg # Silence chown/chmod to fail gracefully on a readonly filesystem # like squashfs. chown -f 0:30000 /nix/store -chmod -f 1735 /nix/store +chmod -f 1775 /nix/store if [ -n "@readOnlyStore@" ]; then if ! readonly-mountpoint /nix/store; then mount --bind /nix/store /nix/store diff --git a/nixos/modules/virtualisation/amazon-config.nix b/nixos/modules/virtualisation/amazon-config.nix index a27e52a8e68..809cdb4d108 100644 --- a/nixos/modules/virtualisation/amazon-config.nix +++ b/nixos/modules/virtualisation/amazon-config.nix @@ -1,3 +1,3 @@ { - imports = [ ./amazon-image.nix ]; + imports = [ ]; } diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index e1830d95b41..b44af5316be 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -102,6 +102,10 @@ import ./make-test.nix { subtest "shell-vars", sub { $machine->succeed('[ -n "$NIX_PATH" ]'); }; + + subtest "nix-db", sub { + $machine->succeed("nix-store -qR /run/current-system | grep nixos-"); + }; ''; } diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 1196e6d5ebd..a49e4dc9f90 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -19,4 +19,8 @@ rec { namecoin = callPackage ./namecoin.nix { inherit namecoind; }; namecoind = callPackage ./namecoind.nix { }; + + primecoin = callPackage ./primecoin.nix { withGui = true; }; + primecoind = callPackage ./primecoin.nix { withGui = false; }; + } diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix new file mode 100644 index 00000000000..11ec35a71bd --- /dev/null +++ b/pkgs/applications/altcoins/primecoin.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, pkgconfig, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "primecoin" + (toString (optional (!withGui) "d")) + "-" + version; + version = "0.8.6"; + + src = fetchurl { + url = "https://github.com/primecoin/primecoin/archive/v${version}.tar.gz"; + sha256 = "0cixnkici74204s9d5iqj5sccib5a8dig2p2fp1axdjifpg787i3"; + }; + + buildInputs = [ pkgconfig openssl db48 boost zlib + miniupnpc utillinux protobuf ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + ++ optionals withGui [ "--with-gui=qt4" ]; + + configurePhase = optional withGui "qmake"; + + preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + + installPhase = + if withGui + then "install -D bitcoin-qt $out/bin/primecoin-qt" + else "install -D bitcoind $out/bin/primecoind"; + + meta = { + description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers."; + longDescription= '' + Primecoin is an innovative cryptocurrency, a form of digital + currency secured by cryptography and issued through a + decentralized mining market. Derived from Satoshi Nakamoto's + Bitcoin, Primecoin introduces an unique form of proof-of-work + based on prime numbers. + + The innovative prime proof-of-work in Primecoin not only + provides security and minting to the network, but also generates + a special form of prime number chains of interest to mathematical + research. Thus primecoin network is energy-multiuse, compared to + bitcoin. + ''; + homepage = http://primecoin.io/; + maintainers = with maintainers; [ AndersonTorres ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index af23dd1dd41..984d666ab95 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,26 +1,43 @@ -{ stdenv, fetchurl, avahi, boost, eigen, fftw, gettext, glib, glibmm, gtk -, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lilv, lv2 -, pkgconfig, python, serd, sord, sratom }: +{ stdenv, fetchurl, gettext, intltool, pkgconfig, python +, avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2 +, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom +, optimizationSupport ? false # Enable support for native CPU extensions +}: + +let + inherit (stdenv.lib) optional; +in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.32.2"; + version = "0.32.3"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "0mh4ma48hc8kq3xw25y1zjcrwgsdb0scd36vzw50a1qmmnh74rgp"; + sha256 = "1ybc5jk7fj6n8qh9ajzl1f6fzdmzab4nwjrh4fsylm94dn1jv0if"; }; + nativeBuildInputs = [ gettext intltool pkgconfig python ]; + buildInputs = [ - avahi boost eigen fftw gettext glib glibmm gtk gtkmm intltool - jack2 ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom + avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2 + ladspaH librdf libsndfile lilv lv2 serd sord sratom ]; - configurePhase = "python waf configure --prefix=$out"; + configureFlags = [ + "--shared-lib" + "--no-desktop-update" + "--no-faust" # Need to package a release of faust, 0.9.58 or 0.9.65 + "--enable-nls" + "--includeresampler" # Zita-resampler not packaged, use vendored version + "--includeconvolver" # Zita-convolver not packaged, use vendored version + ] ++ optional optimizationSupport "--optimization"; - buildPhase = "python waf build"; + configurePhase = ''python waf configure --prefix=$out $configureFlags''; - installPhase = "python waf install"; + buildPhase = ''python waf build''; + + installPhase = ''python waf install''; meta = with stdenv.lib; { description = "A virtual guitar amplifier for Linux running with JACK"; diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix index d196c3fee80..6d0631a4cb8 100644 --- a/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, emacs}: -let version = "2.0"; +let version = "2.0.2"; in stdenv.mkDerivation { name = "writegood-mode-${version}"; src = fetchurl { url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz"; - sha256 = "0wf7bj9d00ggy3xigym885a3njfr98i3aqrrawf8x6lgbfc56dgp"; + sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 9d6a74d942a..1764c85ca7d 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -38,8 +38,12 @@ in let ''; installPhase = '' + # Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text + sed -e 's,/opt/sublime_text/sublime_text,sublime,' -i sublime_text.desktop + mkdir -p $out cp -prvd * $out/ + # Without this, plugin_host crashes, even though it has the rpath wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so ''; @@ -52,11 +56,16 @@ in stdenv.mkDerivation { mkdir -p $out/bin ln -s ${sublime}/sublime_text $out/bin/sublime ln -s ${sublime}/sublime_text $out/bin/sublime3 + mkdir -p $out/share/applications + ln -s ${sublime}/sublime_text.desktop $out/share/applications/sublime_text.desktop + ln -s ${sublime}/Icon/256x256/ $out/share/icons ''; - meta = { + meta = with stdenv.lib; { description = "Sophisticated text editor for code, markup and prose"; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - license = stdenv.lib.licenses.unfree; + homepage = https://www.sublimetext.com/; + maintainers = with maintainers; [ wmertens ]; + license = licenses.unfree; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index bd77446b1ec..5b6d745f0e9 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://derf.homelinux.org/projects/feh/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index c370cc069c5..ca52a4f2766 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs share/extensions + '' + # Clang gets misdetected, so hardcode the right answer + + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + substituteInPlace src/ui/tool/node.h \ + --replace "#if __cplusplus >= 201103L" "#if true" ''; propagatedBuildInputs = [ diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index c9f1fc91328..1e51aa136fe 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, xulrunner }: stdenv.mkDerivation rec { - version = "2.0.8"; + version = "2.0.9"; name = "pencil-${version}"; src = fetchurl { url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "3426d0222b213649e448b06384556718c833667394f442682ff66da3cda1b881"; + sha256 = "a109d28a695919d2da979de6a6d0baeb4e2820ff795aecd75ba08322f21ed3ee"; }; buildPhase = ""; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b96dfaf5397..d5a231ac7bd 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.22.0"; + name = "calibre-2.23.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "19hpm5xzhjr0nfjm6xyqxjx2iwm3iw7y6bbs11337arfrxn16ly0"; + sha256 = "0n99la1pacrw4ahb3wk0p68120p7j7v76mvpaf4qnkxy1vfdif7d"; }; inherit python; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 1bd3b73ff49..36669dd8ae8 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -3,17 +3,17 @@ }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.6"; name = "slic3r-${version}"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; rev = "refs/tags/${version}"; - sha256 = "03xj2kv2d4j6nwmdd5cyghnvjyj4g7g9z0ynynbviyfiplmka2ph"; + sha256 = "1ymk2n9dw1mpizwg6bxbzq60mg1cwljxlncaasdyakqrkkr22r8k"; }; buildInputs = with perlPackages; [ perl makeWrapper which - EncodeLocale MathClipper ExtUtilsXSpp + EncodeLocale MathClipper ExtUtilsXSpp threads MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index a7b5ef6972e..00a881c0c67 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -2,14 +2,17 @@ pythonPackages.buildPythonPackage rec { name = "blink-${version}"; - version = "0.9.1"; + version = "1.2.2"; src = fetchurl { url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; - sha256 = "f578e5186893c3488e7773fbb775028ae54540433a0c51aefa5af983ca2bfdae"; + sha256 = "0z7bhfz2775cm7c7s794s5ighp5q7fb6jn8dw025m49vlgqzr78c"; }; patches = [ ./pythonpath.patch ]; + postPatch = '' + sed -i 's|@out@|'"''${out}"'|g' blink/resources.py + ''; propagatedBuildInputs = [ pyqt4 pythonPackages.cjson pythonPackages.sipsimple twisted ]; diff --git a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch index 2cf7ba19d38..723e097ea82 100644 --- a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch +++ b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch @@ -1,12 +1,20 @@ -diff --git a/blink/resources.py b/blink/resources.py -index 524d9e5..c271887 100644 ---- a/blink/resources.py -+++ b/blink/resources.py -@@ -64,6 +64,7 @@ class Resources(object): - if script == '': - application_directory = os.path.realpath(script) # executed in interactive interpreter +diff -rupN a/blink/resources.py b/blink/resources.py +--- a/blink/resources.py 2015-03-17 03:24:06.000000000 -0600 ++++ b/blink/resources.py 2015-04-07 22:52:06.101096413 -0600 +@@ -60,14 +60,7 @@ class Resources(object): + @classproperty + def directory(cls): + if cls._cached_directory is None: +- if sys.path[0] == '': +- application_directory = os.path.realpath('') # executed in interactive interpreter +- else: +- binary_directory = os.path.dirname(os.path.realpath(sys.argv[0])) +- if os.path.basename(binary_directory) == 'bin': +- application_directory = os.path.dirname(binary_directory) +- else: +- application_directory = binary_directory ++ application_directory = '@out@' + if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')): + cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding()) else: -+ script = os.path.join(sys.path[0], script) - binary_directory = os.path.dirname(os.path.realpath(script)) - if os.path.basename(binary_directory) == 'bin': - application_directory = os.path.dirname(binary_directory) +Binary files a/blink/.resources.py.swp and b/blink/.resources.py.swp differ diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index e10b4f9c83c..f9bd941b2f6 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,33 +1,36 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip -, speex, readline, mediastreamer, libsoup, udev, libnotify }: +{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp +, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev +, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip +}: stdenv.mkDerivation rec { - name = "linphone-3.6.1"; + name = "linphone-3.8.1"; src = fetchurl { - url = "mirror://savannah/linphone/3.6.x/sources/${name}.tar.gz"; - sha256 = "186jm4nd4ggb0j8cs8wnpm4sy9cr7chq0c6kx2yc6y4k7qi83fh5"; + url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz"; + sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd"; }; - buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup udev - libnotify ]; + buildInputs = [ + readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 + polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip + ]; nativeBuildInputs = [ intltool pkgconfig ]; - preConfigure = '' - rm -r mediastreamer2 oRTP - sed -i s,/bin/echo,echo, coreapi/Makefile* - ''; + configureFlags = [ + "--enable-ldap" + "--with-ffmpeg=${ffmpeg}" + "--with-polarssl=${polarssl}" + "--enable-lime" + "--enable-external-ortp" + "--enable-external-mediastreamer" + ]; - configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # I'm lazy to fix these for them - - meta = { + meta = with stdenv.lib; { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; - broken = true; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index c7f33c1f580..b096023eaa4 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile - libxml2 libjpeg readline qt3 perl file + libxml2 libjpeg readline qt3 perl file ccrtp # optional ? : alsaLib speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index bf03fe3267d..358a0bb1228 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchurl, qt4, boost, protobuf, libsndfile -, speex, libopus, avahi, pkgconfig -, jackSupport ? false -, jack2 ? null -, speechdSupport ? false -, speechd ? null -, pulseSupport ? false -, pulseaudio ? null +{ stdenv, fetchurl, pkgconfig +, avahi, boost, libopus, libsndfile, protobuf, qt4, speex +, jackSupport ? false, jack2 ? null +, speechdSupport ? false, speechd ? null +, pulseSupport ? false, pulseaudio ? null }: assert jackSupport -> jack2 != null; @@ -27,32 +24,46 @@ stdenv.mkDerivation rec { patches = optional jackSupport ./mumble-jack-support.patch; + configureFlags = [ + "CONFIG+=shared" + "CONFIG+=no-g15" + "CONFIG+=packaged" + "CONFIG+=no-update" + "CONFIG+=no-server" + "CONFIG+=no-embed-qt-translations" + "CONFIG+=bundled-celt" + "CONFIG+=no-bundled-opus" + "CONFIG+=no-bundled-speex" + ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" + ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"; + configurePhase = '' - qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \ - CONFIG+=no-embed-qt-translations CONFIG+=packaged \ - CONFIG+=bundled-celt CONFIG+=no-bundled-opus \ - ${optionalString (!speechdSupport) "CONFIG+=no-speechd"} \ - ${optionalString jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"} \ - CONFIG+=no-bundled-speex + qmake $configureFlags ''; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 boost protobuf libsndfile speex - libopus avahi pkgconfig ] - ++ (optional jackSupport jack2) - ++ (optional speechdSupport speechd) - ++ (optional pulseSupport pulseaudio); + buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ] + ++ optional jackSupport jack2 + ++ optional speechdSupport speechd + ++ optional pulseSupport pulseaudio; installPhase = '' mkdir -p $out cp -r ./release $out/bin + + mkdir -p $out/share/applications + cp scripts/mumble.desktop $out/share/applications + + mkdir -p $out/share/icons + cp icons/mumble.svg $out/share/icons ''; - meta = with stdenv.lib; { - homepage = "http://mumble.sourceforge.net/"; + meta = with stdenv.lib; { description = "Low-latency, high quality voice chat software"; + homepage = "http://mumble.sourceforge.net/"; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index e77fc5a522a..b6535ad7310 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.4"; name = "backintime-common-${version}"; src = fetchurl { url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz"; - md5 = "21e15538c38d0c440c1281457319c7f1"; + sha256 = "0w57b7xygwx83azz463fd4y7fxz0z6dy74f70ixhvhlsdpxw2ks3"; }; buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ]; diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index 67d521d272a..ef8f0282749 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (backintime-common) version src installFlags meta; - name = "backintime-gnome-${version}"; + name = "backintime-qt4-${version}"; buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ ]; dontAddPrefix = true; - + preFixup = '' substituteInPlace "$out/bin/backintime-qt4" \ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 56e994258a6..5fc70417883 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -26,7 +26,7 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { - version = "10.0.1"; + version = "10.0.2"; name = "mathematica-${version}"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 . ''; - sha256 = "1514qy5kbyislv8j7ryw8021k26y0z6dndliwy8hfi7w7kgb3ynq"; + sha256 = "1d2yaiaikzcacjamlw64g3xkk81m3pb4vz4an12cv8nb7kb20x9l"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index a49e5e1033e..ef400af7308 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation (rec { - version = "1.8.11"; + version = "1.8.13"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha1 = "161edaee328f4fdcfd2a7c10ecd3fbcd51c61275"; + sha1 = "aa0bd14ac6a8f0fb178cc9ff325387de01cd7452"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix new file mode 100644 index 00000000000..675f0a3a2f6 --- /dev/null +++ b/pkgs/applications/video/clipgrab/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, makeDesktopItem, qt4 }: + +let version = "3.4.9"; in +stdenv.mkDerivation rec { + name = "clipgrab-${version}"; + + src = fetchurl { + sha256 = "0valq3cgx7yz11zcscz1vdjmppwbicvg0id61dcar22pyp2zkap1"; + url = "http://download.clipgrab.de/${name}.tar.bz2"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Video downloader for YouTube and other sites"; + longDescription = '' + ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe, + Dailymotion and many other online video sites. It converts downloaded + videos to MPEG4, MP3 or other formats in just one easy step. + ''; + homepage = http://clipgrab.org/; + license = with licenses; gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ qt4 ]; + + configurePhase = '' + qmake clipgrab.pro + ''; + + enableParallelBuilding = true; + + desktopItem = makeDesktopItem rec { + name = "clipgrab"; + exec = name; + icon = name; + desktopName = "ClipGrab"; + comment = "A friendly downloader for YouTube and other sites"; + genericName = "Web video downloader"; + categories = "Qt;AudioVideo;Audio;Video"; + }; + + installPhase = '' + install -Dm755 clipgrab $out/bin/clipgrab + install -Dm644 icon.png $out/share/pixmaps/clipgrab.png + cp -r ${desktopItem}/share/applications $out/share + ''; +} diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 777fbde904e..583c800a8b4 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.9.1"; + ver = "1.9.2"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "0458ilchi64q8yw4kxck565anpn6lf5awrnkz17bk38qdgp0i2nq"; + sha256 = "0hjby7imja9sg2h68al81n4zl72mc3y3fqmf61sf1sad4njs9bkj"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "1x4mjx32839gf9k2zrjz2250valnqcaa2q89kc7sipgsl4b7wrr2"; + sha256 = "074scfz835jynzmb28i8q44hc6ixvfg3crgirmy02bbpxakyp1v6"; }; buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix deleted file mode 100644 index 5827e22ea5e..00000000000 --- a/pkgs/applications/video/mplayer2/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass -, python3, docutils, which -, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null -, xineramaSupport ? true, libXinerama ? null -, xvSupport ? true, libXv ? null -, alsaSupport ? true, alsaLib ? null -, screenSaverSupport ? true, libXScrnSaver ? null -, vdpauSupport ? true, libvdpau ? null -, dvdnavSupport ? true, libdvdnav ? null -, bluraySupport ? true, libbluray ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, jackaudioSupport ? false, jack2 ? null -, pulseSupport ? true, pulseaudio ? null -, bs2bSupport ? false, libbs2b ? null -# For screenshots -, libpngSupport ? true, libpng ? null -, libjpegSupport ? true, libjpeg ? null -, useUnfreeCodecs ? false -}: - -assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); -assert xineramaSupport -> (libXinerama != null && x11Support); -assert xvSupport -> (libXv != null && x11Support); -assert alsaSupport -> alsaLib != null; -assert screenSaverSupport -> libXScrnSaver != null; -assert vdpauSupport -> libvdpau != null; -assert dvdnavSupport -> libdvdnav != null; -assert bluraySupport -> libbluray != null; -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jack2 != null; -assert pulseSupport -> pulseaudio != null; -assert bs2bSupport -> libbs2b != null; -assert libpngSupport -> libpng != null; -assert libjpegSupport -> libjpeg != null; - -let - - codecs_src = - let - dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; - in - if stdenv.system == "i686-linux" then fetchurl { - url = "${dir}/essential-20071007.tar.bz2"; - sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; - } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${dir}/essential-amd64-20071007.tar.bz2"; - sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x"; - } else if stdenv.system == "powerpc-linux" then fetchurl { - url = "${dir}/essential-ppc-20071007.tar.bz2"; - sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z"; - } else null; - - codecs = if codecs_src != null then stdenv.mkDerivation { - name = "MPlayer-codecs-essential-20071007"; - - src = codecs_src; - - installPhase = '' - mkdir $out - cp -prv * $out - ''; - - meta.license = stdenv.lib.licenses.unfree; - } else null; - -in - -stdenv.mkDerivation rec { - name = "mplayer2-20130428"; - - src = fetchgit { - url = "git://git.mplayer2.org/mplayer2.git"; - rev = "6c87a981baa4972fd71c25dfddea017b5a972e89"; - sha256 = "b09c1331141dd0939dfa424ae14dc0bdf82c8a72bb32c78e3ad15e3ee1d2c851"; - }; - - prePatch = '' - sed -i /^_install_strip/d configure - - sed -i '/stdlib/a#include /' sub/sub*.c - ''; - - buildInputs = with stdenv.lib; - [ freetype pkgconfig ffmpeg libass docutils which ] - ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] - ++ optional alsaSupport alsaLib - ++ optional xvSupport libXv - ++ optional theoraSupport libtheora - ++ optional xineramaSupport libXinerama - ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jack2 - ++ optional pulseSupport pulseaudio - ++ optional screenSaverSupport libXScrnSaver - ++ optional vdpauSupport libvdpau - ++ optional speexSupport speex - ++ optional bs2bSupport libbs2b - ++ optional libpngSupport libpng - ++ optional libjpegSupport libjpeg - ; - - nativeBuildInputs = [ yasm python3 ]; - - postConfigure = '' - patchShebangs TOOLS - ''; - - configureFlags = with stdenv.lib; - '' - ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} - ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} - ${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"} - ${if xvSupport then "--enable-xv" else "--disable-xv"} - ${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I${libX11}/include" - else "--disable-x11 --disable-gl"} - --disable-xvid - --disable-ossaudio - ''; - - NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; - - enableParallelBuilding = true; - - # Provide a reasonable standard font. Maybe we should symlink here. - postInstall = - '' - mkdir -p $out/share/mplayer - cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf - ''; - - meta = { - description = "A movie player that supports many video formats (MPlayer fork)"; - homepage = "http://mplayer2.org"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/data/fonts/caladea/cambria-alias.conf b/pkgs/data/fonts/caladea/cambria-alias.conf new file mode 100644 index 00000000000..f763e2a8c34 --- /dev/null +++ b/pkgs/data/fonts/caladea/cambria-alias.conf @@ -0,0 +1,18 @@ + + + + + + Cambria + + Caladea + + + + Caladea + + Cambria + + + diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix new file mode 100644 index 00000000000..110405839a1 --- /dev/null +++ b/pkgs/data/fonts/caladea/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "caladea-${version}"; + version = "20130214"; + + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; + sha256 = "02addvvkbvf3bn21kfyj10j9w1c8hdxxld4wjmnc1j8ksqpir3f4"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out/etc/fonts/conf.d + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype + cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf + ''; + + meta = with stdenv.lib; { + # This font doesn't appear to have any official web site but this + # one provides some good information and samples. + homepage = http://openfontlibrary.org/en/font/caladea; + description = "A serif font metric-compatible with Microsoft Cambria"; + longDescription = '' + Caladea is a free font that is metric-compatible with the + Microsoft Cambria font. Developed by Carolina Giovagnoli and + Andrés Torresi at Huerta Tipográfica foundry. + ''; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + + # Reduce the priority of this package. The intent is that if you + # also install the `vista-fonts` package, then you probably will + # not want to install the font alias of this package. + priority = 10; + }; +} diff --git a/pkgs/data/fonts/carlito/calibri-alias.conf b/pkgs/data/fonts/carlito/calibri-alias.conf new file mode 100644 index 00000000000..294af3b6c78 --- /dev/null +++ b/pkgs/data/fonts/carlito/calibri-alias.conf @@ -0,0 +1,18 @@ + + + + + + Calibri + + Carlito + + + + Carlito + + Calibri + + + diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix new file mode 100644 index 00000000000..b90d89c9779 --- /dev/null +++ b/pkgs/data/fonts/carlito/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "carlito-${version}"; + version = "20130920"; + + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; + sha256 = "0nmgzp6gdvv4dipswrw0l1bfjp4jbic2qvm7dpqiq71jpin2plab"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out/etc/fonts/conf.d + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype + cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf + ''; + + meta = with stdenv.lib; { + # This font doesn't appear to have any official web site but this + # one provides some good information and samples. + homepage = http://openfontlibrary.org/en/font/carlito; + description = "A sans-serif font metric-compatible with Microsoft Calibri"; + longDescription = '' + Carlito is a free font that is metric-compatible with the + Microsoft Calibri font. The font is designed by Łukasz Dziedzic + of the tyPoland foundry and based his Lato font. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + + # Reduce the priority of this package. The intent is that if you + # also install the `vista-fonts` package, then you probably will + # not want to install the font alias of this package. + priority = 10; + }; +} diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix new file mode 100644 index 00000000000..c773f395592 --- /dev/null +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "comfortaa-${version}"; + version = "2.004"; + + src = fetchurl { + url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip"; + sha256 = "0js0kk5g6b7xrq92b68gz5ipbiv1havnbgnfqzvlw3k3nllwnl9z"; + }; + + phases = ["unpackPhase" "installPhase"]; + + buildInputs = [unzip]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v FONTLOG.txt $out/share/doc/${name}/ + cp -v donate.html $out/share/doc/${name}/ + ''; + + meta = with stdenv.lib; { + homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949; + description = "A clean and modern font suitable for headings and logos"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + }; +} diff --git a/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf b/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf new file mode 100644 index 00000000000..be5f6cca866 --- /dev/null +++ b/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf @@ -0,0 +1,18 @@ + + + + + + Comic Sans MS + + Comic Relief + + + + Comic Relief + + Comic Sans MS + + + diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix new file mode 100644 index 00000000000..a8b2b786efa --- /dev/null +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -0,0 +1,49 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "comic-relief-${version}"; + version = "1.1"; + + src = fetchurl { + url = "https://dl.dropbox.com/u/56493902/loudifier/comicrelief.zip"; + sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch"; + }; + + buildInputs = [unzip]; + + phases = ["unpackPhase" "installPhase"]; + + unpackCmd = '' + mkdir -p ${name} + unzip -qq -d ${name} $src + ''; + + installPhase = '' + mkdir -p $out/etc/fonts/conf.d + mkdir -p $out/share/doc/${name} + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype + cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf + cp -v FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + homepage = http://loudifier.com/comic-relief/; + description = "A font metric-compatible with Microsoft Comic Sans"; + longDescription = '' + Comic Relief is a typeface designed to be metrically equivalent + to the popular Comic Sans MS. Comic Relief can be used in place + of Comic Sans MS without having to move, resize, or reset any + part of the copy. It contains all glyphs and characters + available in Comic Sans MS. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + + # Reduce the priority of this package. The intent is that if you + # also install the `corefonts` package, then you probably will not + # want to install the font alias of this package. + priority = 10; + }; +} diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index b26d3bd8c1d..2030fb3ab1d 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -34,18 +34,34 @@ stdenv.mkDerivation { buildInputs = [cabextract]; - buildCommand = " + buildCommand = '' for i in $exes; do cabextract --lowercase $i done cabextract --lowercase viewer1.cab - + fontDir=$out/share/fonts/truetype mkdir -p $fontDir cp *.ttf $fontDir # Also put the EULA there to be on the safe side. cp ${eula} $fontDir/eula.html - "; + + # Set up no-op font configs to override any aliases set up by + # other packages. + mkdir -p $out/etc/fonts/conf.d + for name in Andale-Mono Arial-Black Arial Comic-Sans-MS \ + Courier-New Georgia Impact Times-New-Roman \ + Trebuchet Verdana Webdings ; do + substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-''${name,,}.conf \ + --subst-var-by fontname "''${name//-/ }" + done + ''; + + meta = { + # Set a non-zero priority to allow easy overriding of the + # fontconfig configuration files. + priority = 5; + }; } diff --git a/pkgs/data/fonts/corefonts/no-op.conf b/pkgs/data/fonts/corefonts/no-op.conf new file mode 100644 index 00000000000..503e62cfa29 --- /dev/null +++ b/pkgs/data/fonts/corefonts/no-op.conf @@ -0,0 +1,9 @@ + + + + + diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix new file mode 100644 index 00000000000..f612f077064 --- /dev/null +++ b/pkgs/data/fonts/crimson/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "crimson-${version}"; + version = "2014.10"; + + src = fetchurl { + url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; + sha256 = "0qyihrhqb89vwg9cfpaf5xqmcjvs4r4614bxy634vmqv9v1bzn5b"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype + cp -v README.md $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + homepage = https://aldusleaf.org/crimson.html; + description = "A font family inspired by beautiful oldstyle typefaces"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + }; +} diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix new file mode 100644 index 00000000000..930c0a22520 --- /dev/null +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "fantasque-sans-mono-${version}"; + version = "1.6.5"; + + src = fetchurl { + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; + sha256 = "19a82xlbcnd7dxqmpp03b62gjvi33bh635r0bjw2l09lgir6alym"; + }; + + buildInputs = [unzip]; + phases = ["unpackPhase" "installPhase"]; + + unpackCmd = '' + mkdir -p ${name} + unzip -qq -d ${name} $src + ''; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "OTF/"*.otf $out/share/fonts/opentype + cp -v README.md $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/belluzj/fantasque-sans; + description = "A font family with a great monospaced variant for programmers"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + }; +} diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix new file mode 100644 index 00000000000..84752fe6a1d --- /dev/null +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -0,0 +1,75 @@ +{stdenv, fetchurl}: + +let + + # HG revision in which this version of the font can be fount. + rev = "8e98053718f9a15184c93d6530885791be71b756"; + + urlBase = "https://googlefontdirectory.googlecode.com/hg-history/${rev}/ofl/lobstertwo"; + + # Just a small convenience function. + fetch = {name, path ? "/src", sha256}: + { + inherit name; + file = fetchurl { + url = "${urlBase}${path}/${name}"; + inherit sha256; + }; + }; + + fontlog = + fetch { + name = "FONTLOG.txt"; + path = ""; + sha256 = "0n405i8m70q95y8w43gzr5yvkj7gx7rd3xa4rx6y8qcqv5g7v9if"; + }; + + bold = + fetch { + name = "LobsterTwo-Bold.otf"; + sha256 = "0gkayn96vvgngs9xnmcyyf16q4payk79ghvl354rl93ayb3gf7x0"; + }; + + boldItalic = + fetch { + name = "LobsterTwo-BoldItalic.otf"; + sha256 = "0wznqkvwjqi9s4bg10fpp2345by3nxa0m0w6b3al3zaqyx2p1dxp"; + }; + + italic = + fetch { + name = "LobsterTwo-Italic.otf"; + sha256 = "0lpnzwgwl5fm6gqy8bylbryz0hy94mf1mp615y5sh0wikdvk570z"; + }; + + regular = + fetch { + name = "LobsterTwo-Regular.otf"; + sha256 = "147m3sa3sqqbkbw1hgjdwnw8w0y37x58g5p09s7q2vm74flcpbq1"; + }; +in + + stdenv.mkDerivation rec { + name = "lobstertwo-${version}"; + version = "1.006"; + + phases = ["installPhase"]; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name} + cp -v ${bold.file} $out/share/fonts/opentype/${bold.name} + cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name} + cp -v ${italic.file} $out/share/fonts/opentype/${italic.name} + cp -v ${regular.file} $out/share/fonts/opentype/${regular.name} + ''; + + meta = with stdenv.lib; { + homepage = http://www.impallari.com/lobstertwo; + description = "Script font with many ligatures"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + }; + } diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix new file mode 100644 index 00000000000..d83d9afcdfd --- /dev/null +++ b/pkgs/data/fonts/pecita/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "pecita-${version}"; + version = "1.1"; + + src = fetchurl { + url = "http://pecita.eu/b/Pecita.otf"; + sha256 = "07krzpbmc5yhfbf3aklv1f150i2g1spaan9girmg3189jsn6qw6p"; + }; + + phases = ["installPhase"]; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -v ${src} $out/share/fonts/opentype/Pecita.otf + ''; + + meta = with stdenv.lib; { + homepage = http://pecita.eu/police-en.php; + description = "Handwritten font with connected glyphs"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + }; +} diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix new file mode 100644 index 00000000000..116fdd25a04 --- /dev/null +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "quattrocento-sans-${version}"; + version = "2.0"; + + src = fetchurl { + url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; + sha256 = "043jfdn18dgzpx3qb3s0hc541n6xv4gacsm4srd6f0pri45g4wh1"; + }; + + buildInputs = [unzip]; + phases = ["unpackPhase" "installPhase"]; + + sourceRoot = "quattrocento-sans-v${version}"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "src/"*.otf $out/share/fonts/opentype + cp -v FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + homepage = http://www.impallari.com/quattrocentosans/; + description = "A classic, elegant and sober sans-serif typeface"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + }; +} diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix new file mode 100644 index 00000000000..7ef62d2300c --- /dev/null +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "quattrocento-${version}"; + version = "1.1"; + + src = fetchurl { + url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; + sha256 = "09wmbfwkry1r2cf5z4yy67wd4yzlnsjigg01r5r80z1phl0axn9n"; + }; + + buildInputs = [unzip]; + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "src/"*.otf $out/share/fonts/opentype + cp -v FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + homepage = http://www.impallari.com/quattrocento/; + description = "A classic, elegant, sober and strong serif typeface"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + }; +} diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 19996f3f1a3..f3165b33cca 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -18,13 +18,26 @@ stdenv.mkDerivation { buildPhase = "true"; - installPhase = " - mkdir -p $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype - "; + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + # Set up no-op font configs to override any aliases set up by + # other packages. + mkdir -p $out/etc/fonts/conf.d + for name in Calibri Cambria Candara Consolas Constantia Corbel ; do + substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-''${name,,}.conf \ + --subst-var-by fontname $name + done + ''; meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx; binaryDistribution = false; # haven't read the EULA, but we probably can't redistribute these files, so... + + # Set a non-zero priority to allow easy overriding of the + # fontconfig configuration files. + priority = 5; }; } diff --git a/pkgs/data/fonts/vista-fonts/no-op.conf b/pkgs/data/fonts/vista-fonts/no-op.conf new file mode 100644 index 00000000000..503e62cfa29 --- /dev/null +++ b/pkgs/data/fonts/vista-fonts/no-op.conf @@ -0,0 +1,9 @@ + + + + + diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index ac7577d91fd..c8860a5f7da 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "0wjy2n2ggjd9mzv9y0ra21wfjdbw927hdh6pz537p820bnghcivy"; + sha256 = "196293zf4pbyd5acs4nzb818yql9r67709ccfj7k3siyws6lsh4q"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 06166dd0978..28ce894bfc7 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0jfbw48krpzcj944rvyy1rmq7cykad6cwhjh54fhp52lh7c5savk"; + sha256 = "0f8hz60aj4ar8lqnc63nlxkpf3b51scjalgy1iphgjc27hzxcb9i"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index abc63e14f2a..3ec3d53c69a 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.13.0"; + version = "1.13.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63"; + sha256 = "06m8p8k8dpyvzdm690zhdzcr7n0ld12bcgjdssjfl66lil5z2mc4"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix index 2a5189f53f2..0ccdb3bf3e3 100644 --- a/pkgs/desktops/e19/rage.nix +++ b/pkgs/desktops/e19/rage.nix @@ -2,10 +2,10 @@ , makeWrapper, lib }: stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "0d87n0rl24s7b8y3bdcg6i3yrzhil5f5vmgrmh451i4y38k84swk"; + sha256 = "0jdhbzmnvl0i2zzmjs1wgvxmnv0lm76k7h5llbb8ai34xh4yp3fi"; }; buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig makeWrapper ]; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 428346b78b6..2135e75a07a 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20130603"; + version = "20150315"; src = fetchurl { url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0bk0s8p9r9an5m0l8y23wjlx490k15i4zah0a384a2akzji8y095"; + sha256 = "1vzwyhpqbrndg7mri81f1b2yi8cshw5pghvdda9vdxgq465sa52f"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e8e2119b5c7..d850e5870f8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -494,6 +494,9 @@ self: super: { # https://github.com/joeyadams/haskell-stm-delay/issues/3 stm-delay = dontCheck super.stm-delay; + # https://github.com/cgaebel/stm-conduit/issues/33 + stm-conduit = dontCheck super.stm-conduit; + # https://github.com/fumieval/call/issues/3 call = markBrokenVersion "0.1.2" super.call; rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; # depends on call @@ -678,9 +681,6 @@ self: super: { # https://github.com/prowdsponsor/esqueleto/issues/93 esqueleto = dontCheck super.esqueleto; - # https://github.com/anchor/ceilometer-common/issues/16 - ceilometer-common = dontCheck super.ceilometer-common; - # https://github.com/fumieval/audiovisual/issues/1 audiovisual = markBroken super.audiovisual; @@ -714,6 +714,14 @@ self: super: { ''; }); + # Uses OpenGL in testing + caramia = dontCheck super.caramia; + + llvm-general = super.llvm-general.override { llvm-config = pkgs.llvmPackages_34.llvm; }; + + # Tries to run GUI in tests + leksah = dontCheck super.leksah; + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index d93b84be004..36062652b1f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -134,9 +134,22 @@ self: super: { ''; }); + # see: https://github.com/jaspervdj/hakyll/issues/343 + hakyll = overrideCabal super.hakyll (drv: { + buildDepends = drv.buildDepends ++ [ self.time-locale-compat ]; + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/jaspervdj/hakyll/pull/344.patch"; + sha256 = "130c0icw3cj209p219siaq0n8avmm0fpmph0iyjgx67w62sffrli"; + }) + ]; + }); + # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); + HStringTemplate = self.HStringTemplate_0_8_3; + # We have Cabal 1.22.x. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; @@ -170,6 +183,7 @@ self: super: { patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; }); esqueleto = doJailbreak super.esqueleto; + pointfree = doJailbreak super.pointfree; # bos/attoparsec#92 attoparsec = dontCheck super.attoparsec; @@ -215,23 +229,14 @@ self: super: { }); wl-pprint = overrideCabal super.wl-pprint (drv: { - patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; - }); - - wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { - patchPhase = '' - sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs - sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs - ''; + postPatch = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; + jailbreak = true; }); # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; # Until the changes have been pushed to Hackage - haskell-src-meta = overrideCabal (doJailbreak (appendPatch super.haskell-src-meta ./haskell-src-meta-ghc710.patch)) (drv: { - prePatch = "sed -i -e 's|template-haskell [^,]\\+|template-haskell|' haskell-src-meta.cabal && cat haskell-src-meta.cabal"; - }); mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { url = "https://github.com/snoyberg/mono-traversable/pull/68.patch"; sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h"; @@ -240,10 +245,13 @@ self: super: { url = "https://github.com/fpco/conduit-combinators/pull/16.patch"; sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3"; }); - yesod-bin = appendPatch super.yesod-bin (pkgs.fetchpatch { - url = "https://github.com/yesodweb/yesod/pull/966.patch"; - sha256 = "0mm4swyn7qh30hw7ya8ykz5qvsd4ni4vmipq364yqbsi9ysrc6nb"; - stripLen = 1; + annotated-wl-pprint = appendPatch super.annotated-wl-pprint (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/david-christiansen/annotated-wl-pprint/pull/2.patch"; + sha256 = "0n0fbq3vd7b9kfmhg089q0dy40vawq4q88il3zc9ybivhi62nwv4"; + }); + ghc-events = appendPatch super.ghc-events (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/ghc-events/pull/8.patch"; + sha256 = "1k881jrvzfvs761jgfhf5nsbmbc33c9333l4s0f5088p46ff2n1l"; }); ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index e9bdec89bd0..c9d11ce90b3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -73,6 +73,15 @@ self: super: { mtl-prelude = self.mtl-prelude_1_0_3; equivalence = super.equivalence_0_2_5; # required by Agda + # purescript requires mtl 2.2.x. + purescript = overrideCabal (super.purescript.overrideScope (self: super: { + mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); + mtl = super.mtl_2_2_1; + transformers = super.transformers_0_4_3_0; + haskeline = self.haskeline_0_7_2_1; + transformers-compat = disableCabalFlag super.transformers-compat "three"; + })) (drv: {}); + # The test suite pulls in mtl 2.2.x command-qq = dontCheck super.command-qq; @@ -96,7 +105,6 @@ self: super: { highlighter2 = markBroken super.highlighter2; hypher = markBroken super.hypher; miniforth = markBroken super.miniforth; - purescript = markBroken super.purescript; xhb-atom-cache = markBroken super.xhb-atom-cache; xhb-ewmh = markBroken super.xhb-ewmh; yesod-purescript = markBroken super.yesod-purescript; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index aad0da0604e..aa872a950fc 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -7,7 +7,7 @@ self: super: { # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; - jailbreak-cabal = pkgs.haskell-ng.packages.ghc7101.jailbreak-cabal; + inherit (pkgs.haskell-ng.packages.ghc7101) jailbreak-cabal alex happy; # Many packages fail with: # haddock: internal error: expectJust getPackageDetails @@ -95,16 +95,7 @@ self: super: { ''; }); - "ghcjs-dom" = self.callPackage - ({ mkDerivation, base, mtl, text, ghcjs-base - }: - mkDerivation { - pname = "ghcjs-dom"; - version = "0.1.1.3"; - sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly"; - buildDepends = [ base mtl text ghcjs-base ]; - description = "DOM library that supports both GHCJS and WebKitGTK"; - license = pkgs.stdenv.lib.licenses.mit; - hydraPlatforms = pkgs.stdenv.lib.platforms.none; - }) {}; + ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { + buildDepends = [ self.base self.mtl self.text self.ghcjs-base ]; + }); } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2feb9f0326b..90e2c21aec1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5954,8 +5954,8 @@ self: { ({ mkDerivation, base, bytestring, fuse, unix }: mkDerivation { pname = "HFuse"; - version = "0.2.4.4"; - sha256 = "1wsrf9y90dk27da9pm9m11hnrxwrqwvq6c9799b91a91mc2lxslc"; + version = "0.2.4.5"; + sha256 = "1894dk7flfdblyyrx0d1acznrdbjw41dnal45cqvrxz5vy4hd3p2"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring unix ]; @@ -7604,8 +7604,8 @@ self: { }: mkDerivation { pname = "HaskellNet"; - version = "0.4.2"; - sha256 = "0mhzj2cxhbi2qi7llc81milsdc44cxhga3ypy227niky19xcwwlc"; + version = "0.4.3"; + sha256 = "1y7i7yi2c025l89hrrj2avzrszgfdjl8a4pii04lnxngq4b3nhmz"; buildDepends = [ array base base64-string bytestring cryptohash mime-mail mtl network old-time pretty text @@ -12366,8 +12366,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.5.2"; - sha256 = "0d7s2p3lis7mndsjw2v4jkn9s9sicq6dwmg4l3hd361d7paxkqb4"; + version = "0.5.2.1"; + sha256 = "1wd12l4vpav3jsjf2mib5yrblys5aifwq6xniqm4l92qs5vjh4a2"; buildDepends = [ base dlist FontyFruity free JuicyPixels mtl primitive vector vector-algorithms @@ -16246,8 +16246,8 @@ self: { ({ mkDerivation, base, parsec, random, random-shuffle, text }: mkDerivation { pname = "acme-lolcat"; - version = "0.1"; - sha256 = "1v071plkm1drjcpg9qpvavpkc4mb2d6sc60jw9dr3qjdyyp3gl18"; + version = "0.1.1"; + sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32"; buildDepends = [ base parsec random random-shuffle text ]; homepage = "https://github.com/llelf/acme-lolcat"; description = "LOLSPEAK translator"; @@ -16819,8 +16819,8 @@ self: { }: mkDerivation { pname = "aeson-casing"; - version = "0.1.0.0"; - sha256 = "0mlgrs6rb9vz67ggyrc51z1bm4586m6gwx54wg9dp8qb8jv3pknr"; + version = "0.1.0.1"; + sha256 = "0paspgxayshz007gibijrh4j141q0lxshl6h9nyn24lbkrs62nnb"; buildDepends = [ aeson base ]; testDepends = [ aeson base tasty tasty-hunit tasty-quickcheck tasty-th @@ -22271,8 +22271,8 @@ self: { ({ mkDerivation, base, ghc-prim, hspec, QuickCheck, setenv }: mkDerivation { pname = "base-compat"; - version = "0.7.0"; - sha256 = "1i52zamyalcyaq0sg38m7m5f1667yzdxi6shsf9rw7vr820pnbn4"; + version = "0.7.1"; + sha256 = "1kw3s8j8wljbbjx9gyxd2z5yyhcyj87s867gd6r0afz9m08mm6qa"; buildDepends = [ base ghc-prim setenv ]; testDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; @@ -22479,8 +22479,8 @@ self: { ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { pname = "basic-sop"; - version = "0.1.0.4"; - sha256 = "0gyg6801lwchksd5xvfjy45ygi7ah1z49gq7a485cjn5b7hpbxfh"; + version = "0.1.0.5"; + sha256 = "0zmjd11jckaknkifyif4zq5833cs2kxpm98j43viqc09w63brcx3"; buildDepends = [ base deepseq generics-sop QuickCheck text ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -29131,18 +29131,17 @@ self: { "cgi" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl - , multipart, network, network-uri, old-locale, old-time, parsec - , xhtml + , mtl-compat, multipart, network, network-uri, old-locale, old-time + , parsec, xhtml }: mkDerivation { pname = "cgi"; - version = "3001.2.2.1"; - sha256 = "1cpljh62mw2fim5gwpd0ag9ais9953iyiiwqfbd2nb6swy5k1z1m"; + version = "3001.2.2.2"; + sha256 = "0q1pxpa8gi42c0hsidcdkhk5xr5anfrvhqsn3iksr9c0rllhz193"; buildDepends = [ - base bytestring containers exceptions mtl multipart network - network-uri old-locale old-time parsec xhtml + base bytestring containers exceptions mtl mtl-compat multipart + network network-uri old-locale old-time parsec xhtml ]; - jailbreak = true; homepage = "https://github.com/cheecheeo/haskell-cgi"; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; @@ -30292,10 +30291,9 @@ self: { }: mkDerivation { pname = "clash-prelude-quickcheck"; - version = "0.1.0.0"; - sha256 = "0rn02hf5vj4yirh13y9h2jh2818lhchpabg5v6yqhngdj8rxys34"; + version = "0.1.1.0"; + sha256 = "1yccczs5bpg5qc4zdp4qpgfy5mnf6h17s16dv77d54k4c3r90adz"; buildDepends = [ base clash-prelude containers mtl QuickCheck ]; - jailbreak = true; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; }) {}; @@ -32527,8 +32525,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-split"; - version = "0.0"; - sha256 = "1g186wm8na81hnrfhb40xq6yyhs544k8plxpj3gphm3a00fd1ayr"; + version = "0.0.0.1"; + sha256 = "0xriw08w70dj4gji4afa034q9vcgwymjw2j6gx1x7fwdpi04lzsb"; buildDepends = [ base ]; description = "MVars and Channels with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -35636,6 +35634,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cube" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, hspec, STL + }: + mkDerivation { + pname = "cube"; + version = "0.1.0"; + sha256 = "1rjn548g324hsb95wv31nybck3hs4sxgqjp4wl62cfs5glrsx1j6"; + buildDepends = [ base bytestring cereal containers STL ]; + testDepends = [ base bytestring cereal containers hspec STL ]; + description = "Cubic DSL for 3D printing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cubical" = callPackage ({ mkDerivation, alex, array, base, BNFC, directory, filepath , happy, haskeline, mtl, transformers @@ -37531,6 +37542,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dataflow" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "dataflow"; + version = "0.3.1.0"; + sha256 = "0rl396ll4m5vc6347d98bf7iyyvf7przgdsmh5l53qj7vl226fj6"; + buildDepends = [ base mtl ]; + jailbreak = true; + description = "Generate Graphviz documents from a Haskell representation"; + license = stdenv.lib.licenses.mit; + }) {}; + "datalog" = callPackage ({ mkDerivation, base, containers, exceptions, hashable, haskeline , HUnit, parsec, pretty, test-framework, test-framework-hunit, text @@ -43931,8 +43954,8 @@ self: { }: mkDerivation { pname = "equivalence"; - version = "0.3"; - sha256 = "1fp8zyhl93jndk9xqb5qxsn5hab5xiipilng2n0wcpaqii3rzka0"; + version = "0.3.0.1"; + sha256 = "0ym4dlwajwh9qk6wgqzbwy0nfnq13a3f4lcfhw7g7xn63lkwm7ch"; buildDepends = [ base containers mtl STMonadTrans ]; testDepends = [ base containers mtl QuickCheck STMonadTrans template-haskell @@ -44228,8 +44251,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.1.2.2"; - sha256 = "1sklvl3fl7sq64i5k5jrhc6xvfa4a1a6dfbnzl2alq65x73jzna6"; + version = "2.1.2.3"; + sha256 = "0pa4j9xd8hk2imfggkjxk08314jpi0fh9z0pkr7f8mix6rvqm8ir"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -46335,8 +46358,8 @@ self: { }: mkDerivation { pname = "filediff"; - version = "0.1.0.3"; - sha256 = "1z52hv2s0rh8z9m4jnh3zqhbplsqf3i8pcq2gnf561hgkqjh8pqi"; + version = "0.1.0.4"; + sha256 = "0jqmwlg7xpz03kqchnydgrxyiz8cf4ijv3019nshwqxjwjyzf50r"; buildDepends = [ base data-default data-memocombinators directory either mtl tasty tasty-hunit text time transformers Zora @@ -47227,10 +47250,13 @@ self: { mkDerivation { pname = "flow"; version = "1.0.0"; + revision = "1"; sha256 = "15vr7d1fyabr9v9r9vnh9m2x0r2i0ggg714cc7r6zxhjbrrc9rbn"; + editedCabalFile = "acf5b2b49db56bf047774bc90e57e6c81c5c4d413849d4cdff9dfaf4c71246ab"; buildDepends = [ base ]; testDepends = [ base doctest QuickCheck template-haskell ]; - description = "Functions and operators for more understandable Haskell"; + homepage = "http://taylor.fausak.me/flow/"; + description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -49924,13 +49950,18 @@ self: { }) {}; "getopt-generics" = callPackage - ({ mkDerivation, base, generics-sop, hspec, safe, silently }: + ({ mkDerivation, base, base-compat, generics-sop, hspec + , hspec-expectations, silently, tagged + }: mkDerivation { pname = "getopt-generics"; - version = "0.1.1"; - sha256 = "1cf1mhc7wf8s0sbnq0a3xn8v5w1aw2py78flzanj9slz7cr02gqb"; - buildDepends = [ base generics-sop safe ]; - testDepends = [ base generics-sop hspec silently ]; + version = "0.2"; + sha256 = "12zidbkxnksh05l8ds100y6sx29l0i8x0xy3zfczh4cir4lbz67g"; + buildDepends = [ base base-compat generics-sop tagged ]; + testDepends = [ + base base-compat generics-sop hspec hspec-expectations silently + tagged + ]; description = "Simple command line argument parsing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -50807,8 +50838,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150327"; - sha256 = "1yhqb6iig5ny90dg5ql0wbpdjza0qn8l6005d20k9dkyc9k98c0y"; + version = "5.20150406.1"; + sha256 = "11r4i1bwkkwwffqqk0s9w9brbc7xnkjr6qw7amzagk4lfvcvpsvi"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -55379,12 +55410,12 @@ self: { , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base , regex-tdfa, snap-core, snap-server, system-filepath, tagsoup , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time + , text, time, time-locale-compat }: mkDerivation { pname = "hakyll"; - version = "4.6.7.1"; - sha256 = "125yp7ng3w91n6gvalbm3g1fj7p4zfx6fzdjcdgil2fsrcsxbcy6"; + version = "4.6.8.1"; + sha256 = "0f8c2b9zy55pscmkmwjb72qqsm2kmrjlwfhkl6igpj631r804iyr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -55393,6 +55424,7 @@ self: { http-conduit http-types lrucache mtl network network-uri old-locale old-time pandoc pandoc-citeproc parsec process random regex-base regex-tdfa snap-core snap-server system-filepath tagsoup text time + time-locale-compat ]; testDepends = [ base binary blaze-html blaze-markup bytestring cmdargs containers @@ -55401,7 +55433,7 @@ self: { old-locale old-time pandoc pandoc-citeproc parsec process QuickCheck random regex-base regex-tdfa snap-core snap-server system-filepath tagsoup test-framework test-framework-hunit - test-framework-quickcheck2 text time + test-framework-quickcheck2 text time time-locale-compat ]; homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; @@ -57854,10 +57886,8 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.6.0.8"; - revision = "1"; - sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk"; - editedCabalFile = "98609677e15a08af231b3bb957670cb1de50132625a36ef1fc83d530fb319f8a"; + version = "0.6.0.9"; + sha256 = "18dhgfaski58lxgfga9dy1kcmb049758z2r55y0yyw855rdi1rxf"; buildDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans uniplate @@ -59529,49 +59559,54 @@ self: { }) {}; "hbro" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, cond, containers - , data-default, dyre, errors, glib, gtk3, hslogger, integer-simple - , lens, lifted-async, lifted-base, monad-control, mtl, network-uri - , pango, parsec, process, safe, semigroups, stm, system-fileio - , text, time, transformers, transformers-base, unix, webkitgtk3 - , zeromq4-haskell + ({ mkDerivation, aeson, base, bytestring, classy-prelude, cond + , containers, data-default-class, dyre, errors, fast-logger, glib + , gtk3, integer-simple, lens, lifted-async, lifted-base + , monad-control, monad-logger, mtl, network-uri + , optparse-applicative, pango, parsec, process, resourcet, safe + , semigroups, stm-chans, system-fileio, text, time, transformers + , transformers-base, unix, webkitgtk3, zeromq4-haskell }: mkDerivation { pname = "hbro"; - version = "1.2.0.0"; - sha256 = "1cjg35rx9j7cg36ln2sbzdaiz4sqblgcc13k5giklrw4qfp0vccy"; + version = "1.3.0.0"; + sha256 = "114g9dz9f7s59s9d8hb38qffmdif617nhbs2z9vsdqmylgirirmz"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring classy-prelude cond containers data-default dyre - errors glib gtk3 hslogger integer-simple lens lifted-async - lifted-base monad-control mtl network-uri pango parsec process safe - semigroups stm system-fileio text time transformers + aeson base bytestring classy-prelude cond containers + data-default-class dyre errors fast-logger glib gtk3 integer-simple + lens lifted-async lifted-base monad-control monad-logger mtl + network-uri optparse-applicative pango parsec process resourcet + safe semigroups stm-chans system-fileio text time transformers transformers-base unix webkitgtk3 zeromq4-haskell ]; jailbreak = true; - homepage = "https://bitbucket.org/k0ral/hbro"; - description = "Minimal KISS-compliant browser"; + homepage = "https://github.com/k0ral/hbro"; + description = "Minimal extensible web-browser"; license = "unknown"; broken = true; }) { integer-simple = null;}; "hbro-contrib" = callPackage - ({ mkDerivation, base, classy-prelude, containers, glib, gtk3, hbro - , monad-control, mtl, network-uri, pango, parsec, process, safe + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , classy-prelude, containers, glib, gtk3, hbro, lens, monad-control + , mtl, network-uri, pango, parsec, process, resourcet, safe , system-fileio, text, time, transformers-base, unix, webkitgtk3 }: mkDerivation { pname = "hbro-contrib"; - version = "1.2.0.0"; - sha256 = "1hall154r07jribdipp68mf71yrdw77bm7h48scm127950z4y0rz"; + version = "1.3.0.0"; + revision = "1"; + sha256 = "09q7n5x61gsrjcv7ixh36daq3hj4sip5iph5ll7pfwpqd9mhxq95"; + editedCabalFile = "1df0341291f1e2820b8b0833b4951a555a96df54b3ef7cee754d32a6e53c69f0"; buildDepends = [ - base classy-prelude containers glib gtk3 hbro monad-control mtl - network-uri pango parsec process safe system-fileio text time - transformers-base unix webkitgtk3 + aeson aeson-pretty base bytestring classy-prelude containers glib + gtk3 hbro lens monad-control mtl network-uri pango parsec process + resourcet safe system-fileio text time transformers-base unix + webkitgtk3 ]; - jailbreak = true; - homepage = "https://bitbucket.org/k0ral/hbro-contrib"; + homepage = "https://github.com/k0ral/hbro-contrib"; description = "Third-party extensions to hbro"; license = "unknown"; }) {}; @@ -59934,15 +59969,15 @@ self: { }: mkDerivation { pname = "hdevtools"; - version = "0.1.0.6"; - sha256 = "1plpkdhjv2493zy7fdn3a6cwdava0yrqqkzyn3wddi9f70xd62ak"; + version = "0.1.0.8"; + sha256 = "1a84in8ip037p1f10199g2mk87ymjchyraic8zmxn7vxm1b88217"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal cmdargs directory filepath ghc ghc-paths network syb time unix ]; - homepage = "https://github.com/bitc/hdevtools/"; + homepage = "https://github.com/schell/hdevtools/"; description = "Persistent GHC powered background server for FAST haskell development tools"; license = stdenv.lib.licenses.mit; }) {}; @@ -62482,31 +62517,32 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, base, cmdargs, containers, csv, directory - , filepath, haskeline, hledger-lib, HUnit, mtl, old-locale - , old-time, parsec, pretty-show, process, regex-tdfa, regexpr, safe - , shakespeare, shakespeare-text, split, tabular, test-framework - , test-framework-hunit, text, time, transformers, utf8-string - , wizards + ({ mkDerivation, base, base-compat, cmdargs, containers, csv + , directory, filepath, haskeline, hledger-lib, HUnit, mtl + , mtl-compat, old-locale, old-time, parsec, pretty-show, process + , regex-tdfa, regexpr, safe, shakespeare, shakespeare-text, split + , tabular, terminfo, test-framework, test-framework-hunit, text + , time, transformers, utf8-string, wizards }: mkDerivation { pname = "hledger"; - version = "0.24.1"; - sha256 = "0k09bdr3y975581mpqpmg4jynghl8v4j2386nzqprh0k6a602nv8"; + version = "0.25"; + sha256 = "0gzhlrxdjgg7313aipxr0ziakvdlj07d7sm9cc0q2mx3f37mrnxx"; isLibrary = true; isExecutable = true; buildDepends = [ - base cmdargs containers csv directory filepath haskeline - hledger-lib HUnit mtl old-locale old-time parsec pretty-show - process regex-tdfa regexpr safe shakespeare shakespeare-text split - tabular text time utf8-string wizards + base base-compat cmdargs containers csv directory filepath + haskeline hledger-lib HUnit mtl mtl-compat old-locale old-time + parsec pretty-show process regex-tdfa regexpr safe shakespeare + shakespeare-text split tabular terminfo text time utf8-string + wizards ]; testDepends = [ - base cmdargs containers csv directory filepath haskeline - hledger-lib HUnit mtl old-locale old-time parsec pretty-show - process regex-tdfa regexpr safe shakespeare shakespeare-text split - tabular test-framework test-framework-hunit text time transformers - wizards + base base-compat cmdargs containers csv directory filepath + haskeline hledger-lib HUnit mtl mtl-compat old-locale old-time + parsec pretty-show process regex-tdfa regexpr safe shakespeare + shakespeare-text split tabular test-framework test-framework-hunit + text time transformers wizards ]; homepage = "http://hledger.org"; description = "The main command-line interface for the hledger accounting tool"; @@ -62543,6 +62579,7 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ base hledger-lib time ]; + jailbreak = true; homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; @@ -62573,31 +62610,33 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ base Cabal Decimal hledger-lib statistics time ]; + jailbreak = true; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; }) {}; "hledger-lib" = callPackage - ({ mkDerivation, array, base, blaze-markup, bytestring, cmdargs - , containers, csv, Decimal, directory, filepath, HUnit, mtl - , old-locale, old-time, parsec, pretty-show, regex-tdfa, regexpr - , safe, split, test-framework, test-framework-hunit, time - , transformers, utf8-string + ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring + , cmdargs, containers, csv, Decimal, directory, filepath, HUnit + , mtl, mtl-compat, old-locale, old-time, parsec, pretty-show + , regex-tdfa, regexpr, safe, split, test-framework + , test-framework-hunit, time, transformers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "0.24.1"; - sha256 = "1clzy72f34b497hsjkfjpgkhmn0dl19an9j4r11mn2q8z06106nc"; + version = "0.25"; + sha256 = "0p0j69gyd9q6rx86vzrqaclf4jys1d60rw5344danb2m3vgv7c21"; buildDepends = [ - array base blaze-markup bytestring cmdargs containers csv Decimal - directory filepath HUnit mtl old-locale old-time parsec pretty-show - regex-tdfa regexpr safe split time transformers utf8-string + array base base-compat blaze-markup bytestring cmdargs containers + csv Decimal directory filepath HUnit mtl mtl-compat old-locale + old-time parsec pretty-show regex-tdfa regexpr safe split time + transformers utf8-string ]; testDepends = [ - array base blaze-markup cmdargs containers csv Decimal directory - filepath HUnit mtl old-locale old-time parsec pretty-show - regex-tdfa regexpr safe split test-framework test-framework-hunit - time transformers + array base base-compat blaze-markup cmdargs containers csv Decimal + directory filepath HUnit mtl mtl-compat old-locale old-time parsec + pretty-show regex-tdfa regexpr safe split test-framework + test-framework-hunit time transformers ]; homepage = "http://hledger.org"; description = "Core data types, parsers and utilities for the hledger accounting tool"; @@ -62625,29 +62664,31 @@ self: { }) {}; "hledger-web" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , clientsession, cmdargs, conduit-extra, data-default, directory - , filepath, hjsmin, hledger, hledger-lib, hspec, http-client - , http-conduit, HUnit, json, network-conduit, old-locale, parsec - , regexpr, safe, shakespeare, template-haskell, text, time - , transformers, wai, wai-extra, wai-handler-launch, warp, yaml - , yesod, yesod-core, yesod-static, yesod-test + ({ mkDerivation, base, base-compat, blaze-html, blaze-markup + , bytestring, clientsession, cmdargs, conduit-extra, data-default + , directory, filepath, hjsmin, hledger, hledger-lib, hspec + , http-client, http-conduit, HUnit, json, network-conduit + , old-locale, parsec, regexpr, safe, shakespeare, template-haskell + , text, time, transformers, wai, wai-extra, wai-handler-launch + , warp, yaml, yesod, yesod-core, yesod-form, yesod-static + , yesod-test }: mkDerivation { pname = "hledger-web"; - version = "0.24.1"; - sha256 = "1fyb1r97kngxj293hfh23zh33dhajkdrf5s7sbp5zvg49dc65210"; + version = "0.25"; + sha256 = "15rkmw9zg95ijsl4xchgm642y888fa76lxwpzg4qqb5gpjbflz9x"; isLibrary = true; isExecutable = true; buildDepends = [ - base blaze-html blaze-markup bytestring clientsession cmdargs - conduit-extra data-default directory filepath hjsmin hledger - hledger-lib http-client http-conduit HUnit json network-conduit - old-locale parsec regexpr safe shakespeare template-haskell text - time transformers wai wai-extra wai-handler-launch warp yaml yesod - yesod-core yesod-static + base base-compat blaze-html blaze-markup bytestring clientsession + cmdargs conduit-extra data-default directory filepath hjsmin + hledger hledger-lib http-client http-conduit HUnit json + network-conduit old-locale parsec regexpr safe shakespeare + template-haskell text time transformers wai wai-extra + wai-handler-launch warp yaml yesod yesod-core yesod-form + yesod-static ]; - testDepends = [ base hspec yesod yesod-test ]; + testDepends = [ base base-compat hspec yesod yesod-test ]; homepage = "http://hledger.org"; description = "A web interface for the hledger accounting tool"; license = "GPL"; @@ -63322,8 +63363,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "0.4.6"; - sha256 = "1sn2m1vpbkbiv7lyhffgkcs1ck7680qqgi7d8hk2b02ca53lw8wp"; + version = "0.4.7"; + sha256 = "1y4bp6b7jxm4cx0xx27kff835jzxdnxiivf9kky2f2q65aj3q9xq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -67927,8 +67968,8 @@ self: { }: mkDerivation { pname = "html-conduit"; - version = "1.1.1.1"; - sha256 = "1bsr0fsy7k606m477c4rxdh7j71nyrp86f1lg9wlwnbm31vrhw00"; + version = "1.1.1.2"; + sha256 = "116sg4wig2irqqaha257h99ajgqdq6i3jbksvqn1ywqzq96lcx34"; buildDepends = [ base bytestring conduit conduit-extra containers resourcet system-filepath tagstream-conduit text transformers xml-conduit @@ -68201,8 +68242,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.10"; - sha256 = "1llvhchjv86zfhyrf8zc4lnq3z3ryl9cg5lwy4fphnf537zg2c2c"; + version = "0.4.11"; + sha256 = "0lzrvkja3na2s6r4ixgnj7fx8gjm02bxxs101d69d6s3b0n80phb"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive clock containers cookie data-default-class deepseq @@ -70248,8 +70289,8 @@ self: { }: mkDerivation { pname = "ide-backend"; - version = "0.9.0.6"; - sha256 = "0dskhqcxhl7vq4mgbbb4bcfn78xlrf8gii4jlrx5i4psi583jqzq"; + version = "0.9.0.7"; + sha256 = "0z85pxf4hmk0b374y3wrxsjx7lvmqhgb3k5153yfd08rh606p0s3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73683,8 +73724,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.3.41.0"; - sha256 = "035kbwskcf36phcj2s33kx4jjw6km2sw0rm8jbad82d33h67yxah"; + version = "0.3.41.1"; + sha256 = "1grb1yq3knm7hniqiivkx76mxkgacyq2qa12mv5lz097w7bldf4l"; buildDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable bytestring crypto-pubkey crypto-pubkey-types crypto-random @@ -73715,8 +73756,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.4.2"; - sha256 = "1vz32w4yd5yfk3wcsdicfy3qczwcf9hldx19jwf4ihsfyk4hdpzr"; + version = "0.5"; + sha256 = "0pk6fq3wsbl6pl79dcyns1c94xmv98acfr6rbxhyfqmc5lys759s"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey @@ -74058,6 +74099,7 @@ self: { mtl QuickCheck stm stm-conduit test-framework test-framework-quickcheck2 text unordered-containers ]; + jailbreak = true; homepage = "https://github.com/xenog/json-rpc"; description = "Fully-featured JSON-RPC 2.0 library"; license = stdenv.lib.licenses.publicDomain; @@ -74136,13 +74178,12 @@ self: { }: mkDerivation { pname = "json-sop"; - version = "0.1.0.3"; - sha256 = "1i23k96ncy0qb6fc3wb851zqck4qcf18vm569i0qinbxd8w9bgaq"; + version = "0.1.0.4"; + sha256 = "02x65fh0s3gl8adij8xg8mgqp7p3jj4yjhhvch51zgbhcflsb7cv"; buildDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector ]; - jailbreak = true; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -74351,8 +74392,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.1.2"; - sha256 = "01gdb7wi65idws4q2bbxzna07s3y0wd4p7npawm7rdiyfp3pg92k"; + version = "0.1.3"; + sha256 = "024q90vsphh3ka4p2l0xmyvp874jp5a61s4gwmg985v5b54srzh5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74702,27 +74743,27 @@ self: { , blaze-builder, bytestring, case-insensitive, conduit , conduit-extra, containers, data-default, directory, filepath , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy - , http-types, HUnit, lifted-base, mtl, network, network-conduit-tls - , process, random, regex-tdfa, stm, system-fileio, system-filepath - , tar, template-haskell, text, time, transformers, unix - , unix-compat, unordered-containers, vector, wai, wai-app-static - , wai-extra, warp, warp-tls, yaml, zlib + , http-types, HUnit, lifted-base, mtl, network, process, random + , regex-tdfa, stm, system-fileio, system-filepath, tar + , template-haskell, text, time, transformers, unix, unix-compat + , unordered-containers, vector, wai, wai-app-static, wai-extra + , warp, warp-tls, yaml, zlib }: mkDerivation { pname = "keter"; - version = "1.3.9.1"; - sha256 = "0b86f7j9yr4q24q88fwd2j4disns8mcwabrqgcz3hghrh6rhpgg9"; + version = "1.3.9.2"; + sha256 = "1c5hsckcdy966c5nn1cwa63sc7fqmyhanw0156cllkss8kzwzj4r"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array async attoparsec base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default directory filepath fsnotify http-client http-conduit - http-reverse-proxy http-types lifted-base mtl network - network-conduit-tls process random regex-tdfa stm system-fileio - system-filepath tar template-haskell text time transformers unix - unix-compat unordered-containers vector wai wai-app-static - wai-extra warp warp-tls yaml zlib + http-reverse-proxy http-types lifted-base mtl network process + random regex-tdfa stm system-fileio system-filepath tar + template-haskell text time transformers unix unix-compat + unordered-containers vector wai wai-app-static wai-extra warp + warp-tls yaml zlib ]; testDepends = [ base bytestring conduit hspec HUnit transformers unix @@ -76081,8 +76122,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.10.2"; - sha256 = "036jjhzx98k1vgdlkx1mlwvb2wz3sw8sflb7c4wxcg05hjnb05ki"; + version = "0.10.2.1"; + sha256 = "0klr7b4sdi8bsln9hw3xa56d3s1h869zkyqnm97fiyvzar91g532"; buildDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -79304,19 +79345,19 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, containers, cpuid, llvm-tf, tfp + ({ mkDerivation, base, containers, cpuid, llvm-tf, non-empty, tfp , transformers, unsafe, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.5"; - sha256 = "0zbzc5y0wd5wkyf1nnvafm5r6g6asrnnkn66qqin9awvz0prkmy4"; + version = "0.6"; + sha256 = "0nlh5l070zc7y1jpwnyxnc0223w8xaw0z92agmigiw6bm8vcs568"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers cpuid llvm-tf tfp transformers unsafe utility-ht + base containers cpuid llvm-tf non-empty tfp transformers unsafe + utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/llvm-extra/"; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -79346,8 +79387,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.5.1"; - sha256 = "13fnr4dpflbfywmdq1r7fxv16lcywwv4a300j8z59xclcskvpajr"; + version = "3.4.5.2"; + sha256 = "1n6c1dna2lw3z36y6pnx15qsqwdmdd0cki0snh4yhbfjvcz5lack"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -79372,8 +79413,8 @@ self: { }: mkDerivation { pname = "llvm-general-pure"; - version = "3.4.5.1"; - sha256 = "0j08pff3lrzbxpfz73ywxh27ps79c875qvp49swjm14zc6kbsyvy"; + version = "3.4.5.2"; + sha256 = "1ybrn3y10nz69jsmhhzv652skyd4d4xb6b89zlc4n5xvrpxxg36j"; buildDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -79482,19 +79523,19 @@ self: { }) {}; "llvm-tf" = callPackage - ({ mkDerivation, base, containers, llvm-base, process, tfp - , transformers + ({ mkDerivation, base, containers, llvm-ffi, non-empty, process + , storable-record, tfp, transformers, utility-ht }: mkDerivation { pname = "llvm-tf"; - version = "3.0.2"; - sha256 = "1hm1yk5zmp9g8c6ddgpa4hyf9skj0ixra1d0wjnw2vylr48g0rj5"; + version = "3.0.3.1"; + sha256 = "0bkx86gv5f7w14hxny6h36balsklscxzm3qakv8f2ana0bk1sv09"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers llvm-base process tfp transformers + base containers llvm-ffi non-empty process storable-record tfp + transformers utility-ht ]; - jailbreak = true; description = "Bindings to the LLVM compiler toolkit using type families"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81475,8 +81516,8 @@ self: { }: mkDerivation { pname = "mangopay"; - version = "1.10.2"; - sha256 = "0lf5f47h4hiqsdr36z2hsq5lrx6xp0imwy6g7qq4zcs3fgz6fdsh"; + version = "1.11"; + sha256 = "1ipw08z1p4kl9b682jl061g87df8kljxn4cdbfz6fx7g82ab58g3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81495,7 +81536,6 @@ self: { template-haskell text time tls transformers transformers-base unordered-containers utf8-string vector wai warp x509-system ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; @@ -82403,6 +82443,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memcache-haskell" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, hashable + , hashtables, HUnit, mtl, network, network-conduit, QuickCheck + , resourcet, split, stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, transformers + }: + mkDerivation { + pname = "memcache-haskell"; + version = "0.0.10"; + sha256 = "1k853wc1rqwq4wrsk72qs4gravd7scdgi4cvsjzjg8w0vn0scqm2"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec base bytestring containers hashable hashtables mtl + network network-conduit resourcet split stm transformers + ]; + testDepends = [ + base bytestring HUnit network QuickCheck split test-framework + test-framework-hunit test-framework-quickcheck2 test-framework-th + ]; + jailbreak = true; + license = stdenv.lib.licenses.mit; + }) {}; + "memcached" = callPackage ({ mkDerivation, base, bytestring, network, utf8-light }: mkDerivation { @@ -84367,8 +84431,8 @@ self: { }: mkDerivation { pname = "monad-unlift"; - version = "0.1.0.0"; - sha256 = "188xs20whrq9kqqc2rwlxframxsw19qc9fv0cdz1c7dk6h1s8anz"; + version = "0.1.0.1"; + sha256 = "0mgz9yxyvsrxp7l01frr7qdlpqg2krci472fj4id2ndnn7gk4mmf"; buildDepends = [ base constraints exceptions monad-control mtl mutable-containers stm transformers transformers-base @@ -86479,8 +86543,8 @@ self: { }: mkDerivation { pname = "mysql-simple-typed"; - version = "0.1.0.0"; - sha256 = "1glqiimxv0b4s0isd5c9n365j7nmy7k9bqkm2ccsi6rxhzlm9aqw"; + version = "0.1.1.1"; + sha256 = "0cizs7c51884j05409nc8ldzlsbjcwpwc1ral1p1g1c98y1mpkcc"; buildDepends = [ base haskell-src-meta mysql mysql-simple template-haskell typedquery utf8-string @@ -87118,14 +87182,14 @@ self: { }: mkDerivation { pname = "nested-routes"; - version = "0.0.2"; - sha256 = "0gajlb66cqnsi8svs98cil7clhlwdwh5fhdx19vy8mlvl99d9ri8"; + version = "0.1"; + sha256 = "0fz6lshm79iy62bxgg22bgrn8irgfalp5a3dllzlhbci8q5xs02k"; buildDepends = [ aeson base blaze-html bytestring containers http-types lucid mtl pseudo-trie semigroups text transformers wai wai-extra ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; - description = "Like scotty, but nested"; + description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -87554,8 +87618,8 @@ self: { }: mkDerivation { pname = "network-bitcoin"; - version = "1.8.0"; - sha256 = "00gffxnsij6m7mr539983ry8n6n8zm6hk6fwlh6fxsj5kv34nprj"; + version = "1.8.1"; + sha256 = "0gw04wh24j4vpyvx0wy0bdhh3dkwdxrg2laq7vsvwlpzwgcny99h"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -90123,8 +90187,8 @@ self: { }: mkDerivation { pname = "optimal-blocks"; - version = "0.0.1"; - sha256 = "0hn60fapmldk1dhg56n0j1vch07pqii49hk2k3d23v7sliv8bhwy"; + version = "0.1.0"; + sha256 = "1863sh22yfy7i5ibqjsp3bzbaxjd7vwhy2j3r523qrcci0xs8n9b"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring cryptohash deepseq hex vector ]; @@ -90424,19 +90488,21 @@ self: { }) {}; "orgmode-parse" = callPackage - ({ mkDerivation, attoparsec, base, free, HUnit, old-locale, tasty - , tasty-hunit, text, thyme, unordered-containers + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , free, hashable, HUnit, old-locale, tasty, tasty-hunit, text + , thyme, unordered-containers }: mkDerivation { pname = "orgmode-parse"; - version = "0.0.2.1"; - sha256 = "0jlajb6gvlh5w0b011129vqq46mb6kl5lh1bnih3k19hm0kd50fz"; + version = "0.1.0"; + sha256 = "1n1azp4ymsc9z89x39ycxx45hax8h2pqyr18q9sc88rawr31k4f8"; buildDepends = [ - attoparsec base free old-locale text thyme unordered-containers + aeson attoparsec base bytestring containers free hashable + old-locale text thyme unordered-containers ]; testDepends = [ - attoparsec base HUnit old-locale tasty tasty-hunit text thyme - unordered-containers + aeson attoparsec base bytestring containers hashable HUnit + old-locale tasty tasty-hunit text thyme unordered-containers ]; jailbreak = true; description = "A parser and writer for org-mode flavored documents"; @@ -90557,8 +90623,8 @@ self: { ({ mkDerivation, base, containers, parsec, split, uniplate }: mkDerivation { pname = "ottparse-pretty"; - version = "0.1.2.4"; - sha256 = "0zwqwx19k4zq87fnpj9akdqnqpmbfmyw0m24ghxn0nvs51vbp3lh"; + version = "0.1.2.5"; + sha256 = "1dwl9jbrhw5b7z2imlnkn8qjk36z06gqca4y9h8r85phsdkyzbm4"; isLibrary = false; isExecutable = true; buildDepends = [ base containers parsec split uniplate ]; @@ -92774,8 +92840,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.4"; - sha256 = "0284w3kvphlwp31d0mlkklimyrcjmwz4mp57q85sh27j7032sfkw"; + version = "2.1.4.1"; + sha256 = "0lwm1j7zz1zsfw70p7qwcsjlz0kmiliz2fdb2jgksxglw212nh2h"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -93326,8 +93392,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.6.4"; - sha256 = "1v870whyk96imsx0ld6a3yc2am6ywjwmixh0g7b916xf8vdh727w"; + version = "0.6.5"; + sha256 = "0xnxdnr2ifn0z78jzibg64znki2jppfy13fsl7s8vwrw0i5ys7a8"; buildDepends = [ aeson base bytestring containers either haskell-src-exts HsOpenSSL http-streams http-types io-streams mtl network old-locale random @@ -94204,8 +94270,8 @@ self: { ({ mkDerivation, base, template-haskell, th-expand-syns }: mkDerivation { pname = "plugins-multistage"; - version = "0.5.1"; - sha256 = "024lm002rywwkjyvz38j9xlgqbvbzjppj349kipwy0xicf2hdv2c"; + version = "0.5.2"; + sha256 = "0ij2yyf7kw0a3hhcih1fc96vsjxy7bd6ny0rbnikildydld5842g"; buildDepends = [ base template-haskell th-expand-syns ]; description = "Dynamic linking for embedded DSLs with staged compilation"; license = stdenv.lib.licenses.bsd3; @@ -96376,9 +96442,9 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.6"; - revision = "3"; + revision = "4"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; - editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca"; + editedCabalFile = "84407dc2bb4ba0fab1d21463e367149586a67758f2f6bba8eaa86b0cb1f07ac0"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; @@ -96913,17 +96979,12 @@ self: { }) {}; "pseudo-trie" = callPackage - ({ mkDerivation, base, data-default, hspec, QuickCheck - , quickcheck-instances, semigroups - }: + ({ mkDerivation, base, semigroups }: mkDerivation { pname = "pseudo-trie"; - version = "0.0.4"; - sha256 = "0v1j9ml746h3lpj5cvcwcwjan7vwqaadvblxnb0gl9in4k2kk0yz"; - buildDepends = [ base QuickCheck quickcheck-instances semigroups ]; - testDepends = [ - base data-default hspec QuickCheck quickcheck-instances semigroups - ]; + version = "0.0.4.2"; + sha256 = "0b09qxgxv86wmcsns2rl00pna0a3jfngddyzk9dfjk1xjaq8cb59"; + buildDepends = [ base semigroups ]; description = "A tagged rose-tree with short circuited unique leaves"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98781,8 +98842,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.1.0.3"; - sha256 = "1qzvqbkgj97wdiknlas57z2lfi311v0b5w68z6ni2il8hnnjrj64"; + version = "0.1.1"; + sha256 = "16nnvy3vvks4bc6nbm7m5cc0z195z2xk2qbnlar06axv7kqvwps6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -98790,7 +98851,6 @@ self: { JuicyPixels lens linear mtl optparse-applicative Rasterific scientific svg-tree text transformers vector ]; - jailbreak = true; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -99084,8 +99144,8 @@ self: { }: mkDerivation { pname = "reactive-banana"; - version = "0.8.0.4"; - sha256 = "1rvdf8gg7yiq9ajy7k5a95vdggwvig6snrnav2vfvdzvcp6ha8i9"; + version = "0.8.1.0"; + sha256 = "166bw6lr3jd0m7b9hfr45lwyvyrggkz0xqh6ybqwvcpmc5h99dcg"; buildDepends = [ base containers hashable pqueue transformers unordered-containers vault @@ -108149,7 +108209,9 @@ self: { mkDerivation { pname = "snap"; version = "0.14.0.2"; + revision = "1"; sha256 = "1yv1snkibsqd7cdxyqi7c8gvnv1hzzhw5jlk19kps526n5xvay7r"; + editedCabalFile = "1640756ec7bfd3130869dce451904d6cc762ab6c8b8128982933fba80f325c92"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109711,7 +109773,9 @@ self: { mkDerivation { pname = "sourcemap"; version = "0.1.3.0"; + revision = "1"; sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5"; + editedCabalFile = "aa8b674ddb6f30642da0a391ad3481b44241f9f1cb2ee661503e59dac3ca2053"; buildDepends = [ aeson attoparsec base bytestring process text unordered-containers utf8-string @@ -110902,11 +110966,12 @@ self: { }: mkDerivation { pname = "stack-prism"; - version = "0.1.2"; - sha256 = "01iz7x2f3pyagk42baryj9qgklcif8ias05cipyn349x3wgaqzz6"; + version = "0.1.3"; + sha256 = "0v69gd81b7qaci3f9bmlvpvhnzdksqx4nvazxghrmdq04f28gfjm"; buildDepends = [ base profunctors tagged template-haskell transformers ]; + testDepends = [ base template-haskell ]; homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; @@ -110957,8 +111022,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.7.2.1"; - sha256 = "0ynx9xmhnb5vjzpz41b7n2wzfpindn8zs2lf9rf2yajvd1rnq3hr"; + version = "0.7.4"; + sha256 = "181wdsrwr0dlgp969zkqyg231kz3xh8mzii8ikcxx5z0yharn3gk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111476,8 +111541,8 @@ self: { }: mkDerivation { pname = "steeloverseer"; - version = "1.1.0.3"; - sha256 = "12rivdszviksp1czxj71scbzj1b2xan6kq0f5aqlyrjcnbyrxa7s"; + version = "1.1.0.4"; + sha256 = "1wqhjg6xw2k863fkfhq0i706c399xsv7z7gaf61x7l9wrc91pcbn"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -111574,24 +111639,25 @@ self: { "stm-conduit" = callPackage ({ mkDerivation, async, base, cereal, cereal-conduit, conduit - , conduit-extra, directory, HUnit, lifted-async, lifted-base - , monad-control, monad-loops, QuickCheck, resourcet, stm, stm-chans - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers + , conduit-combinators, conduit-extra, directory, doctest, ghc-prim + , HUnit, lifted-async, lifted-base, monad-control, monad-loops + , QuickCheck, resourcet, stm, stm-chans, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers + , void }: mkDerivation { pname = "stm-conduit"; - version = "2.5.4"; - sha256 = "1pwsv9724b6g80l53wwziv2sajaxc2mwl3mxldpzd0v48zaajflk"; + version = "2.6.0"; + sha256 = "0lhqhsvisyn4wgj5qk0slzbgy7lbmzgcryi4vlw1d058nsjnpxwj"; buildDepends = [ - async base cereal cereal-conduit conduit conduit-extra directory - lifted-async lifted-base monad-control monad-loops resourcet stm - stm-chans transformers + async base cereal cereal-conduit conduit conduit-combinators + conduit-extra directory ghc-prim lifted-async lifted-base + monad-control monad-loops resourcet stm stm-chans transformers void ]; testDepends = [ - base conduit directory HUnit QuickCheck resourcet stm stm-chans - test-framework test-framework-hunit test-framework-quickcheck2 - transformers + base conduit conduit-combinators directory doctest HUnit QuickCheck + resourcet stm stm-chans test-framework test-framework-hunit + test-framework-quickcheck2 transformers ]; homepage = "https://github.com/wowus/stm-conduit"; description = "Introduces conduits to channels, and promotes using conduits concurrently"; @@ -111657,10 +111723,9 @@ self: { ({ mkDerivation, array, base, containers, mtl, stm }: mkDerivation { pname = "stm-io-hooks"; - version = "1.0.0"; - sha256 = "1wx68z1vq693bdcvv7d52pmk2s3pin0m382bc7j4i0s67m0ldcdn"; + version = "1.0.1"; + sha256 = "079q34wyiv4c8cn92bagh1axdvl7b03amlgygqm0ln9khni0lkg4"; buildDepends = [ array base containers mtl stm ]; - jailbreak = true; description = "STM with IO hooks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -111742,10 +111807,9 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-split"; - version = "0.0"; - sha256 = "11v2sq911byxvvmjbm7qkpdzma1mzzlch6rr529xsra0dv7myig2"; + version = "0.0.0.1"; + sha256 = "05338nbfhwmyy8njynznmbv0lddqs4kzs5x132992xq346dvvww8"; buildDepends = [ base stm ]; - jailbreak = true; description = "TMVars, TVars and TChans with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -112974,8 +113038,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.1.1"; - sha256 = "19bh640jzpw03k5vc9471qh2cf4nr3nz8s5axk0bxpss1dpz26fs"; + version = "0.2"; + sha256 = "1qn1xq1lbbqpy0jpw67gq9f8ng46hyxm43lvb8q0ifn5ll2grn36"; buildDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -113702,15 +113766,15 @@ self: { "synthesizer-llvm" = callPackage ({ mkDerivation, base, containers, event-list, filepath, llvm-extra - , llvm-tf, midi, non-empty, non-negative, numeric-prelude, random - , sox, storable-record, storable-tuple, storablevector - , synthesizer-core, synthesizer-midi, tfp, transformers, unsafe - , utility-ht, vault + , llvm-tf, midi, non-empty, non-negative, numeric-prelude + , QuickCheck, random, sox, storable-record, storable-tuple + , storablevector, synthesizer-core, synthesizer-midi, tfp + , transformers, unsafe, utility-ht, vault }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.6"; - sha256 = "1cbqcabgxc358799l2ch9hzcgd1chwz226wbg79ndl0f17kf9hg8"; + version = "0.7.0.1"; + sha256 = "04mzsdwf8n31nqjlv7ryylx64mvhcfkx6r8jq1yijvnb1pih4vk2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113719,6 +113783,10 @@ self: { storable-tuple storablevector synthesizer-core synthesizer-midi tfp transformers unsafe utility-ht vault ]; + testDepends = [ + base llvm-extra llvm-tf numeric-prelude QuickCheck random + storablevector synthesizer-core tfp utility-ht + ]; jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Efficient signal processing using runtime compilation"; @@ -114939,20 +115007,20 @@ self: { "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, stm, tagged, tasty, tasty-hunit, temporary-rc - , text, transformers + , process-extras, stm, tagged, tasty, tasty-hunit, temporary, text + , transformers }: mkDerivation { pname = "tasty-silver"; - version = "3.1.2"; - sha256 = "0yghvl3ld09fzkyn4w6y8bb7715gqsrmk92lb2n5w9z9bc1azxvg"; + version = "3.1.3"; + sha256 = "18ciqnj2h77cyr07wypyjdbry5g4m88zmlrxqavhqxz4008biqlx"; buildDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras stm tagged - tasty temporary-rc text + tasty temporary text ]; testDepends = [ - base directory filepath process tasty tasty-hunit temporary-rc + base directory filepath process tasty tasty-hunit temporary transformers ]; homepage = "https://github.com/phile314/tasty-silver"; @@ -116057,8 +116125,8 @@ self: { }: mkDerivation { pname = "text-and-plots"; - version = "0.2.0.0"; - sha256 = "1wmb3myk1002qhnwsybca6mhzc36c7kxk4ykcnfqb9728x4jrcms"; + version = "0.2.1.0"; + sha256 = "0fjwjdr6pbqfzlyi75apfclsq07qld4yj4h574pgyc22lnk2z9z8"; buildDepends = [ base blaze-html bytestring containers markdown text unordered-containers @@ -116460,14 +116528,13 @@ self: { }) {}; "tfp" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, QuickCheck, utility-ht }: mkDerivation { pname = "tfp"; - version = "0.8"; - sha256 = "0rmq41xfrmnmvgqnp97ccbaik73n7b2h91784xin6fir56bf2ggp"; - isLibrary = true; - isExecutable = true; - buildDepends = [ base ]; + version = "1.0"; + sha256 = "03jf2dk7sgggnr72wk6chxs3l4aycpmnapdjfm5f9i8wr0spga4l"; + buildDepends = [ base utility-ht ]; + testDepends = [ base QuickCheck ]; homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic"; description = "Type-level integers, booleans, lists using type families"; license = stdenv.lib.licenses.bsd3; @@ -116480,6 +116547,7 @@ self: { version = "0.8"; sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm"; buildDepends = [ base template-haskell tfp ]; + jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic"; description = "Template-Haskell code for tfp"; license = stdenv.lib.licenses.bsd3; @@ -122140,12 +122208,12 @@ self: { }) {}; "users" = callPackage - ({ mkDerivation, aeson, base, path-pieces, text, time }: + ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }: mkDerivation { pname = "users"; - version = "0.1.0.0"; - sha256 = "1svybj4sdkvcf1d5hm82szrc3s1rql9fcd8xxl1873qrvj4idjqq"; - buildDepends = [ aeson base path-pieces text time ]; + version = "0.2.0.1"; + sha256 = "0h0265yynj22p6m84gb9by4axby90awsf7zr2s2g0sb9j38z2b4p"; + buildDepends = [ aeson base bcrypt path-pieces text time ]; homepage = "https://github.com/agrafix/users"; description = "A library simplifying user management for web applications"; license = stdenv.lib.licenses.mit; @@ -122157,8 +122225,8 @@ self: { }: mkDerivation { pname = "users-postgresql-simple"; - version = "0.1.0.1"; - sha256 = "1k0dmh3m7998x7rqrxiwfgvsw26cwk3fw923m2dyxrifyaqzc5lk"; + version = "0.2.0.0"; + sha256 = "162bk3nswnnzblksx4n8fz2yvxaqry7jknb2gkypv15r6kw1pi43"; buildDepends = [ aeson base bytestring mtl postgresql-simple text time users uuid ]; @@ -122172,8 +122240,8 @@ self: { ({ mkDerivation, aeson, base, hspec, text, users }: mkDerivation { pname = "users-test"; - version = "0.1.0.0"; - sha256 = "0r3k89j5ljdp24286xirkx6arcaagljvfvgi1qzc6r6imcnbgim6"; + version = "0.2.0.0"; + sha256 = "1fli5h9i5bjx945pixnlicsy2y2caw1595isq98vwv7rsarkj8dx"; buildDepends = [ aeson base hspec text users ]; homepage = "https://github.com/agrafix/users"; description = "Library to test backends for the users library"; @@ -129667,8 +129735,8 @@ self: { }: mkDerivation { pname = "yesod-mangopay"; - version = "1.10"; - sha256 = "18vph90izbf3fyipn0ja2mig8akdic96sjsmvv7d6pqbmz2m5qhh"; + version = "1.11"; + sha256 = "1j6dibg7l0g3hykwvhxm9n898gg06mrgyg89yjbv31pm4mfvycsn"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -129681,7 +129749,6 @@ self: { wai-logger warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent yesod-static ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index ce6081b849c..1166c7075c8 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }: let - version = "1.0.3"; + version = "1.0.4"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "ec6c4eaffcb771d91bdea9fb274600c624fd16b1891d194b3fcb2b521f52cc75"; + sha256 = "1babp3ff6hajdm247zl9rc311k973cdnv6dqaai7l8817gg1yd3r"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 2e17ebea5ea..6b64fc32e12 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -14,11 +14,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "17.4"; + version = "17.5"; src = fetchurl { url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "0mhzfs64wa00g0bv9hwf0sbl8lgs83jj8cq9c3wg1iksmskfv0hd"; + sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w"; }; buildInputs = @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; - sha256 = "0n4sczblx8mjcck56rpxvyvz186hkzg0c1xjqrnpnz1nkn7dn73c"; + sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5"; }; in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 354a4d970ba..8650d07d00b 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; - sha256 = "02vbg9ywn76rslkinjk1dw3wrj76p5bahbhvz71drlp30cs1r28w"; + sha256 = "1qfvw49fbw9svk4gsniw0g0ghal0dqm2hf1i77qmcf80lln1vhdh"; }; installPhase = '' diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix new file mode 100644 index 00000000000..6dc1b5241f2 --- /dev/null +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, libantlr3c, jre, polarssl }: + +let + # We must use antlr-3.4 with belle-sip-1.4.0 + # We might be able to use antlr-3.5+ in the future + antlr = fetchurl { + url = "http://www.antlr3.org/download/antlr-3.4-complete.jar"; + sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx"; + }; +in +stdenv.mkDerivation rec { + name = "belle-sip-1.4.0"; + + src = fetchurl { + url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz"; + sha256 = "1lwxfvwvclbh0bfwf69jrknqzqh1igzm293wwwbmq4kn8c5fiypz"; + }; + + nativeBuildInputs = [ jre ]; + + # belle-sip.pc doesn't have a library path for antlr3c or polarssl + propagatedBuildInputs = [ libantlr3c polarssl ]; + + postPatch = '' + mkdir -p $TMPDIR/share/java + cp ${antlr} $TMPDIR/share/java/antlr.jar + + sed -i "s,\(antlr_java_prefixes=\).*,\1\"$TMPDIR/share/java\"," configure + cat configure | grep antlr_java + ''; + + configureFlags = [ + "--with-polarssl=${polarssl}" + ]; + + enableParallelBuild = true; + + meta = with stdenv.lib; { + homepage = http://www.linphone.org/index.php/eng; + description = "A Voice-over-IP phone"; + license = licenses.gpl2; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index ade48cb2288..13a9259fdec 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: +{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }: -stdenv.mkDerivation { - name = "ccrtp-2.0.9"; +stdenv.mkDerivation rec { + name = "ccrtp-2.1.2"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.9.tar.gz; - sha256 = "1prh2niwa4lzvskk12j4ckr7dv141dfh8yjmpkbhbnv4gmpifci0"; + url = "mirror://gnu/ccrtp/${name}.tar.gz"; + sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; - buildInputs = [ openssl pkgconfig libgcrypt ]; - propagatedBuildInputs = [ ucommon ]; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ ucommon openssl libgcrypt ]; + + configureFlags = [ + "--disable-demos" + ]; doCheck = true; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 010d2cb7ccc..5bf1ec78bef 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, cmake, ffmpeg, boost }: +{ stdenv, fetchurl, cmake, boost, ffmpeg }: stdenv.mkDerivation rec { name = "chromaprint-${version}"; - version = "1.1"; + version = "1.2"; src = fetchurl { url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; - sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b"; + sha256 = "06h36223r4bwcazp42faqs9w9g49wvspivd3z3309b12ld4qjaw2"; }; - buildInputs = [ cmake ffmpeg boost ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost ffmpeg ]; cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ]; - postInstall = "installBin examples/fpcalc"; - meta = with stdenv.lib; { homepage = "http://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 22a4597abbe..0b22aa501e6 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation (rec { # with Glibc 2.9. configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; - patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix); + patches = [ ./deadlock.patch ] + ++ map fetchurl (import ./debian-patches.nix) + ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./returnval.patch; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gamin/returnval.patch b/pkgs/development/libraries/gamin/returnval.patch new file mode 100644 index 00000000000..3944b14be64 --- /dev/null +++ b/pkgs/development/libraries/gamin/returnval.patch @@ -0,0 +1,12 @@ +diff -rupN gamin-0.1.10-orig/server/gam_eq.c gamin-0.1.10/server/gam_eq.c +--- gamin-0.1.10-orig/server/gam_eq.c 2015-04-05 19:25:54.000000000 -0400 ++++ gamin-0.1.10/server/gam_eq.c 2015-04-05 19:26:00.000000000 -0400 +@@ -124,7 +124,7 @@ gam_eq_flush (gam_eq_t *eq, GamConnDataP + { + gboolean done_work = FALSE; + if (!eq) +- return; ++ return done_work; + + #ifdef GAM_EQ_VERBOSE + GAM_DEBUG(DEBUG_INFO, "gam_eq: Flushing event queue for %s\n", gam_connection_get_pidname (conn)); diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index c0f0983d73d..9e06ed66412 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [urkud raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index d0782d94e5e..76175859e7d 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2d5798186c4..e158c64f73a 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 53f978551cd..50703f907d3 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -21,7 +21,23 @@ stdenv.mkDerivation rec { --replace "@my_libs@" "" ''; + # Do not build amd64 assembly code on Darwin, because it fails to compile + # with unknow directive errors + configureFlags = if stdenv.isDarwin then [ "--enable-amd64=no" ] else null; + meta = { - hydraPlatforms = stdenv.lib.platforms.linux; + description = "Image manipulation library"; + + longDescription = '' + This is the Imlib 2 library - a library that does image file loading and + saving as well as rendering, manipulation, arbitrary polygon support, etc. + It does ALL of these operations FAST. Imlib2 also tries to be highly + intelligent about doing them, so writing naive programs can be done + easily, without sacrificing speed. + ''; + + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ spwhitt ]; }; } diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 1f396fff1cf..41c570ee554 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap }: +{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }: let pname = "krb5"; @@ -15,7 +15,9 @@ stdenv.mkDerivation (rec { sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd"; }; - buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]; + buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ] + # Provides the mig command used by the build scripts + ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ; unpackPhase = '' tar -xf $src @@ -31,7 +33,7 @@ stdenv.mkDerivation (rec { description = "MIT Kerberos 5"; homepage = webpage; license = "MPL"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 23fafb44c81..21666ed3034 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + configureFlags = if (stdenv.cc.cc.isClang or false) + then [ "--disable-werror" ] else null; + CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h meta = { diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index d85b0d0dff9..dd0de49a4bd 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: +let version = "1.9.7"; in stdenv.mkDerivation rec { - version = "1.9.7"; name = "libcli-${version}"; - src = fetchurl { - url = "https://github.com/dparrish/libcli/archive/v${version}.tar.gz"; - sha256 = "0v4867jbach5zd1nq0sspq5q95vvbpnljzm2yf64k8a4w2vadpbx"; + src = fetchFromGitHub { + sha256 = "08pmjhqkwldhmcwjhi2l27slf1fk6nxxfaihnk2637pqkycy8z0c"; + rev = "v${version}"; + repo = "libcli"; + owner = "dparrish"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 66d07b547c5..43b1f347093 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { # errors configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64"; + # fixes a cast in inline asm: easier than patching + buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; + meta = with stdenv.lib; { description = "A library of simple functions that are optimized for various CPUs"; homepage = http://liboil.freedesktop.org; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 465b03b88fd..ff7886d0513 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -19,11 +19,18 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + + # Clang generates warnings in Boost's header files + # -Werror causes these warnings to be interpreted as errors + # Simplest solution: disable -Werror + configureFlags = if (stdenv.cc.cc.isClang or false) + then [ "--disable-werror" ] else null; + meta = { inherit (s) version; description = ''A base library for writing document import filters''; license = stdenv.lib.licenses.mpl20 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 08ada463a54..d5055d213fb 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, glib, dbus_libs, unzip, automake, libtool, autoconf, m4, docbook_xsl, - intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }: +{ stdenv, fetchurl, glib, dbus_libs, unzip, docbook_xsl +, intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt +}: stdenv.mkDerivation rec { - version = "0.16"; + version = "0.18"; name = "libsecret-${version}"; src = fetchurl { - url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip"; - sha256 = "1yf4zvzfa45wr5bqlh54g3bmd0lgcsa8hnhppa99czca0zj7bkks"; + url = "mirror://gnome/sources/libsecret/${version}/${name}.tar.xz"; + sha256 = "1qq29c01xxjyx5sl6y5h22w8r0ff4c73bph3gfx3h7mx5mvalwqc"; }; propagatedBuildInputs = [ glib dbus_libs ]; nativeBuildInputs = [ unzip ]; - buildInputs = [ gtk_doc automake libtool autoconf intltool gobjectIntrospection pkgconfig libxslt libgcrypt m4 docbook_xsl ]; - - configureScript = "./autogen.sh"; + buildInputs = [ gtk_doc intltool gobjectIntrospection pkgconfig libxslt libgcrypt docbook_xsl ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index c015e7473bd..d03fabcc653 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "A library providing ability to interpret and import visio diagrams into various applications"; homepage = http://www.freedesktop.org/wiki/Software/libvisio; - platforms = stdenv.lib.platforms.gnu; # random choice + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libzrtpcpp/1.6.nix b/pkgs/development/libraries/libzrtpcpp/1.6.nix deleted file mode 100644 index 79d95e07bb8..00000000000 --- a/pkgs/development/libraries/libzrtpcpp/1.6.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, commoncpp2, openssl, pkgconfig, ccrtp }: - -stdenv.mkDerivation rec { - name = "libzrtpcpp-1.6.0"; - - src = fetchurl { - url = "mirror://gnu/ccrtp/${name}.tar.gz"; - sha256 = "17aayr4f27rp4fvminxn6jx7kq56kkk341l7ypqb9h0k6kns27kb"; - }; - - buildInputs = [ commoncpp2 openssl pkgconfig ccrtp ]; - - meta = { - description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; - homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index 9962efa7f1e..9c4affd9032 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake pkgconfig ]; - - propagatedBuildInputs = [ openssl ccrtp ]; + buildInputs = [ openssl ccrtp ]; meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix new file mode 100644 index 00000000000..1b0c1186f28 --- /dev/null +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "mbedtls-1.3.10"; + + src = fetchurl { + url = "https://polarssl.org/download/${name}-gpl.tgz"; + sha256 = "0zj0vdmam52hk7c6s3y81bdb4mqawi9fskkcqlgnj8v61j7dhvvl"; + }; + + nativeBuildInputs = [ perl ]; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ + "SHARED=1" + ]; + + installFlags = [ + "DESTDIR=\${out}" + ]; + + postInstall = '' + rm $out/lib/lib{mbedtls.so.8,polarssl.{a,so}} + ln -s libmbedtls.so $out/lib/libmbedtls.so.8 + ln -s libmbedtls.so $out/lib/libpolarssl.so + ln -s libmbedtls.a $out/lib/libpolarssl.a + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://polarssl.org/; + description = "Portable cryptographic and SSL/TLS library, aka polarssl"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index d8a2ea6ee37..586a10bd1a8 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,20 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio, -libv4l, libtheora, intltool, libvpx, gsm, mesa, libX11, libXv, libXext, -glew, libopus, libupnp, vim }: +{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, pulseaudio, speex, gsm +, libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp +, ortp, libv4l, libpcap, srtp, vim +}: stdenv.mkDerivation rec { - name = "mediastreamer-2.10.0"; + name = "mediastreamer-2.11.1"; src = fetchurl { url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "1sp1vjcz0rx518l7cfmkb4802xa5wyylr2b5hxlpjk3ygg28g3c0"; + sha256 = "0gfv4k2rsyvyq838xjgsrxmmn0fkw40apqs8vakzjwzsz2c9z8pd"; }; -# TODO: make it load plugins from *_PLUGIN_PATH - nativeBuildInputs = [pkgconfig intltool]; + postPatch = '' + sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure + ''; - propagatedBuildInputs = [ alsaLib ffmpeg speex ortp pulseaudio libX11 - libXv libXext libv4l libtheora libvpx gsm mesa glew libopus libupnp vim ]; + # TODO: make it load plugins from *_PLUGIN_PATH + nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = "--enable-external-ortp"; + propagatedBuildInputs = [ + alsaLib pulseaudio speex gsm libopus + ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp + ortp libv4l libpcap srtp + vim + ]; + + configureFlags = [ + "--enable-external-ortp" + "--with-srtp=${srtp}" + ]; + + meta = with stdenv.lib; { + description = "a powerful and lightweight streaming engine specialized for voice/video telephony applications"; + homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview; + license = licenses.gpl2; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 7814e88f693..e0b8dcca1af 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -2,21 +2,16 @@ , fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip , enableBloat ? false }: -let v = "2.4.10"; in +let v = "2.4.11"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip"; - sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v"; + sha256 = "1shz5g7ahvbb41gprxzvavllf235qhx0fpkjd7iwa3gv83ym46dg"; }; - patches = [(fetchpatch { - url = "https://github.com/Itseez/opencv/commit/ea50be0529c24.diff"; - sha256 = "0nm02v7rmfcndj3jzmv3mrqh3hk5n6axx6gdxndyhabn201hqswn"; - })]; - buildInputs = [ unzip libjpeg libpng libtiff ] ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index ff7536de403..561d0df4e80 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,19 +1,17 @@ -{stdenv, fetchurl, srtp, libzrtpcpp, pkgconfig }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ortp-0.22.0"; + name = "ortp-0.24.1"; src = fetchurl { url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; - sha256 = "02rdm6ymgblbx8fnjfvivkl4qkgbdizrf35fyb0vln9m7jdy4dvf"; + sha256 = "1mach7cdq4kydqkll8ra1kir818da07z253rf9pihifipqhcxv6i"; }; - configureFlags = "--enable-zrtp"; - - propagatedBuildInputs = [ srtp libzrtpcpp pkgconfig ]; - - meta = { + meta = with stdenv.lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = http://www.linphone.org/index.php/eng/code_review/ortp; + license = licenses.lgpl21; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index ca6491f0c7d..fe7e024ba4b 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -42,8 +42,6 @@ let self = { - qmake = callPackage ./qmake.nix { inherit (self) base; }; - activeqt = callPackage ( { qtSubmodule, base }: diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index c80b1bca685..33f5ba867d6 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { name = "schroedinger-1.0.11"; src = fetchurl { - url = http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz; + urls = [ + http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz + http://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz + ]; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index c6cf56e59d6..98cf160e8b5 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -1,51 +1,36 @@ -x@{builderDefsPackage - , autoconf, automake, libtool, doxygen, procps - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchFromGitHub, pkgconfig +, openssl ? null, libpcap ? null +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="srtp"; - version="1.4.4"; - name="${baseName}-${version}"; - url="mirror://sourceforge/${baseName}/${name}.tgz"; - hash="057k191hx7sf84wdvc8wr1nk4whhrvbg1vv3r4nyswjir6qwphnr"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +with stdenv.lib; +stdenv.mkDerivation rec { + name = "libsrtp-${version}"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "cisco"; + repo = "libsrtp"; + rev = "v${version}"; + sha256 = "0iy1il72gnjcwbi16wf4kzdqs1xx8is9qvs6m49pg37218s26gdw"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ pkgconfig ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; + # libsrtp.pc references -lcrypto -lpcap without -L + propagatedBuildInputs = [ openssl libpcap ]; - setVars = a.fullDepEntry '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" - '' ["minInit"]; + configureFlags = [ + "--disable-debug" + ] ++ optional (openssl != null) "--enable-openssl"; + + postInstall = '' + rmdir $out/bin + ''; meta = { - description = "Secure RTP"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + homepage = https://github.com/cisco/libsrtp; + description = "Secure RTP (SRTP) Reference Implementation"; + license = licenses.bsd3; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://srtp.sourceforge.net/download.html"; - }; - }; -}) x - +} diff --git a/pkgs/development/libraries/srtp/linphone.nix b/pkgs/development/libraries/srtp/linphone.nix deleted file mode 100644 index 9108be5e30c..00000000000 --- a/pkgs/development/libraries/srtp/linphone.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchgit, automake, autoconf, libtool }: - -stdenv.mkDerivation { - name = "srtp-linphone-git-20130530-1c9bd9065"; - - src = fetchgit { - url = git://git.linphone.org/srtp.git; - rev = "1c9bd9065"; - sha256 = "0r4wbrih8bggs69fnfmzm17z1pp1zp8x9qwcckcq6wc54b16d9g3"; - }; - - preConfigure = "autoreconf -vfi"; - - buildInputs = [ automake autoconf libtool ]; -} diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 0fc32513717..50d8f5e8745 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,17 +1,26 @@ -{ fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: +{ stdenv, fetchurl, pkgconfig +, openssl ? null, zlib ? null, gnutls ? null +}: + +let + xor = a: b: (a || b) && (!(a && b)); +in + +assert xor (openssl != null) (gnutls != null); +assert !(xor (openssl != null) (zlib != null)); stdenv.mkDerivation rec { - name = "ucommon-6.1.11"; + name = "ucommon-6.3.1"; src = fetchurl { url = "mirror://gnu/commoncpp/${name}.tar.gz"; - sha256 = "0hpwxiyd7c3qnzksk6vw94cdig1v8yy6khgcaa87a7hb3zbkv4zg"; + sha256 = "1marbwbqnllhm9nh22lvyfjy802pgy1wx7j7kkpkasbm9r0sb6mm"; }; - buildInputs = [ pkgconfig gnutls zlib ]; + buildInputs = [ pkgconfig ]; - # Propagate libgcrypt because it appears in `ucommon.pc'. - propagatedBuildInputs = [ libgcrypt ]; + # ucommon.pc has link time depdendencies on -lssl, -lcrypto, -lz, -lgnutls + propagatedBuildInputs = [ openssl zlib gnutls ]; doCheck = true; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 7eded3e4c5f..dbf2f376d0f 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -8,12 +8,12 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "3.26.31.15"; + version = "3.30.33.16"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/" + "${name}.tar.bz2"; - sha256 = "067pk6hr7wjx7yxhla5la0rnv51kf7837kfydzydjwapsbcx6m8l"; + sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45"; }; patchPhase = '' diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix new file mode 100644 index 00000000000..7c9829af771 --- /dev/null +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, automake, autoconf, libtool +, bzip2, snappy, zlib, db +}: + +stdenv.mkDerivation rec { + name = "wiredtiger-${version}"; + version = "2.5.2"; + + src = fetchFromGitHub { + repo = "wiredtiger"; + owner = "wiredtiger"; + rev = version; + sha256 = "1rk26gfs4zpz88mkbdkhz65q4admpgf46x5zsnghl0ndirmnvq3p"; + }; + + nativeBuildInputs = [ automake autoconf libtool ]; + buildInputs = [ bzip2 snappy zlib db ]; + + configureFlags = [ + "--with-berkeleydb=${db}" + "--enable-bzip2" + "--enable-leveldb" + "--enable-snappy" + "--enable-zlib" + ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = http://wiredtiger.com/; + description = ""; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 89acb751604..4d47d513437 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.4.1"; + version = "6.5"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "0w41h5m51mfswdrqpgyjs73x4qr73scswv34f5zwckcih4dvsdzz"; + sha256 = "1231rzmk7kzv77hpa0jj227152br9ahjdvxvzifk0mdfw0b34rdl"; }; installPhase = '' diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 01d75a5bb01..7b61d96e3e7 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -2,11 +2,11 @@ , pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "global-6.3.4"; + name = "global-6.4"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "0hcplcayyjf42d8ygzla6142b5dq4ybq4wg3n3cgx3b5yfhvic85"; + sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri"; }; buildInputs = [ libtool ncurses makeWrapper ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 0872560f431..72a364e682a 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.9"; + name = "intel-gpu-tools-1.10"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "1lqy1adplb2bqpddznsavjc2fxn6rvzxnndmi8cnq7pyw25c5r0x"; + sha256 = "0x4q7gv14yaniycgdxym9nazlj6wzcvjjhg40bbm5lkw5pqvxwkd"; }; buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index c0518921383..45586c1e9bd 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }: let - version = if nightly then "1.5.2-nightly201503173c8ae2d934" else "1.5.1"; + version = if nightly then "1.6.5-nightly20150409ff74931107" else "1.6.4"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; @@ -11,8 +11,8 @@ in stdenv.mkDerivation { then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz" else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; sha256 = if nightly - then "10blf1hr80fknrzyrbj7qy2xn7wilnyn6y2r7ijrw2gns4ia3d0h" - else "0zdxdb9n0yk6dp6j6x3bka7vrnf7kz8jjcpl6fw5fr9f742s9s26"; + then "04f7r4iv8p0jfylw4sxg3vsv14rbsi6n9hbqnwvdh6554yrm6d35" + else "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7"; }; prePatch = '' diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs index 3140c5e842b..4e01ecfd63e 100755 --- a/pkgs/development/web/iojs/update-iojs +++ b/pkgs/development/web/iojs/update-iojs @@ -3,6 +3,8 @@ # Fetch the latest io.js release (stable/nightly) and update # `default.nix` in this directory. # +# Call this from the root of your nixpkgs directory. +# set -e @@ -21,12 +23,13 @@ latest_log() { } url() { - nix-instantiate -A "$1" 2> /dev/null | xargs cat \ + nix-instantiate -A "$1" \ + | xargs cat \ | sed 's/.*"urls","//;s/".*//' } hash() { - nix-prefetch-url "$1" 2> /dev/null + nix-prefetch-url "$1" } hash_log() { diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 53d09178fc9..ee121d6788a 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -8,7 +8,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = if unstableVersion then "0.11.13" else "0.12.0"; + version = "0.12.0"; deps = { inherit openssl zlib libuv; @@ -32,9 +32,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = if unstableVersion - then "1642zj3sajhqflfhb8fsvy84w9mm85wagm8w8300gydd2q6fkmhm" - else "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p"; + sha256 = "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix new file mode 100644 index 00000000000..df8321cfca8 --- /dev/null +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares +, pkgconfig, runCommand, which +}: + +let + dtrace = runCommand "dtrace-native" {} '' + mkdir -p $out/bin + ln -sv /usr/sbin/dtrace $out/bin + ''; + + version = "0.10.38"; + + # !!! Should we also do shared libuv? + deps = { + inherit openssl zlib; + + # disabled system v8 because v8 3.14 no longer receives security fixes + # we fall back to nodejs' internal v8 copy which receives backports for now + # inherit v8 + } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { + inherit http-parser; + }) + // ({ cares = c-ares; }); + + sharedConfigureFlags = name: [ + "--shared-${name}" + "--shared-${name}-includes=${builtins.getAttr name deps}/include" + "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" + ]; + + inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; +in stdenv.mkDerivation { + name = "nodejs-${version}"; + + src = fetchurl { + url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; + sha256 = "12xpa9jzry5g0j41908498qqs8v0q6miqkv6mggyzas8bvnshgai"; + }; + + configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); + + prePatch = '' + sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure + ''; + + patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null; + + postPatch = if stdenv.isDarwin then '' + (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) + '' else null; + + buildInputs = [ python which ] + ++ (optional stdenv.isLinux utillinux) + ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ]; + setupHook = ./setup-hook.sh; + + meta = { + description = "Event-driven I/O framework for the V8 JavaScript engine"; + homepage = http://nodejs.org; + license = licenses.mit; + maintainers = [ maintainers.goibhniu maintainers.shlevy ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 8f9c6461fd8..f00da83f628 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: let - version = "2.2.2"; + version = "2.2.3"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.sourceforge.net/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "14aln69vvr7frsbjdfmzgf0rd45zf247xbfsnhx3hlfsqlj58wd3"; + sha256 = "0g01z5z7777pwlsv63gwx4ly61hgqxv53hhb6g22dc5ydaq4965h"; }; NIX_LDFLAGS = "-llua -lgcc_s"; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index e913b0bb2a8..854f9595a7d 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -1,90 +1,154 @@ -{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer, makeWrapper } : +{ stdenv, fetchurl, pkgconfig, unzip, zlib, libpng, bzip2, SDL, SDL_mixer +, buildEnv, config +}: let - result = withPak (mkPak pak128); + # Choose your "paksets" of objects, images, text, music, etc. + paksets = config.simutrans.paksets or "pak64 pak128"; - ver_1 = "112"; - ver_2 = "3"; - ver_h2 = "${ver_1}-${ver_2}"; + result = with stdenv.lib; withPaks ( + if paksets == "*" then attrValues pakSpec # taking all + else map (name: pakSpec.${name}) (splitString " " paksets) + ); - # "pakset" of objects, images, text, music, etc. - mkPak = src: stdenv.mkDerivation { - name = "simutrans-pakset"; - inherit src; - unpackPhase = "true"; - buildInputs = [ unzip ]; - installPhase = '' - mkdir -p $out - cd $out - unzip ${src} - mv simutrans/*/* . - rm -rf simutrans - ''; - }; - pak64 = fetchurl { - url = "mirror://sourceforge/simutrans/pak64/${ver_h2}/simupak64-${ver_h2}.zip"; - sha256 = "1ng963n2gvnwmsj73iy3gp9i5iqf5g6qk1gh1jnfm86gnjrsrq4m"; - }; - pak128 = fetchurl { - url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.3.0--${ver_1}.2.zip"; - sha256 = "0jcif6mafsvpvxh1njyd6z2f6sab0fclq3f3nlg765yp3i1bfgff"; + ver1 = "120"; + ver2 = "0"; + ver3 = "1"; + version = "${ver1}.${ver2}.${ver3}"; + ver_dash = "${ver1}-${ver2}-${ver3}"; + ver2_dash = "${ver1}-${ver2}"; + + binary_src = fetchurl { + url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; + sha256 = "10rn259nxq2hhfpar8zwgxi1p4djvyygcm2f6qhih7l9clvnw2h1"; }; - withPak = pak: stdenv.mkDerivation { + + # As of 2015/03, many packsets still didn't have a release for version 120. + pakSpec = stdenv.lib.mapAttrs + (pakName: attrs: mkPak (attrs // {inherit pakName;})) + { + pak64 = { + srcPath = "${ver2_dash}/simupak64-${ver_dash}"; + sha256 = "0y5v1ncpjyhjkkznqmk13kg5d0slhjbbvg1y8q5jxhmhlkghk9q2"; + }; + "pak64.japan" = { + srcPath = "${ver2_dash}/simupak64.japan-${ver_dash}"; + sha256 = "14swy3h4ij74bgaw7scyvmivfb5fmp21nixmhlpk3mav3wr3167i"; + }; + + pak128 = { + srcPath = "pak128%20for%20ST%20120%20%282.5.2%2B%20nightly%20r1560%2C%20bugfixes%29/pak128-r1560--ST120"; + sha256 = "1wd51brc4aglqi3w7s8fxgxrw0k7f653w4wbnmk83k07fwfdyf24"; + }; + "pak128.britain" = { + srcPath = "pak128.Britain%20for%20${ver2_dash}/pak128.Britain.1.16-${ver2_dash}"; + sha256 = "1rww9rnpk22l2z3s1d7y2gmd6iwhv72s7pff8krnh7z0q386waak"; + }; + "pak128.cs" = { # note: it needs pak128 to work + url = "mirror://sourceforge/simutrans/Pak128.CS/pak128.cz_v.0.2.1.zip"; + sha256 = "008d8x1s0vxsq78rkczlnf57pv1n5hi1v5nbd1l5w3yls7lk11sc"; + }; + "pak128.german" = { + url = "mirror://sourceforge/simutrans/PAK128.german/" + + "PAK128.german_0.7_${ver1}.x/PAK128.german_0.7.0.1_${ver1}.x.zip"; + sha256 = "1575akms18raxaijy2kfyqm07wdx6y5q85n7wgvq2fqydrnx33w8"; + }; + + /* This release contains accented filenames that prevent unzipping. + "pak192.comic" = { + srcPath = "pak192comic%20for%20${ver2_dash}/pak192comic-0.4-${ver2_dash}up"; + sha256 = throw ""; + }; + */ + }; + + + mkPak = { + sha256, pakName, srcPath ? null + , url ? "mirror://sourceforge/simutrans/${pakName}/${srcPath}.zip" + }: + stdenv.mkDerivation { + name = "simutrans-${pakName}"; + unpackPhase = "true"; + installPhase = let src = fetchurl { inherit url sha256; }; + in '' + mkdir -p "$out/share/simutrans/${pakName}" + cd "$out/share/simutrans/${pakName}" + "${unzip}/bin/unzip" "${src}" + chmod -R +w . # some zipfiles need that + + set +o pipefail # no idea why it's needed + toStrip=`find . -iname '*.pak' | head -n 1 | sed 's|\./\(.*\)/[^/]*$|\1|'` + echo "Detected path '$toStrip' to strip" + mv ./"$toStrip"/* . + rmdir -p "$toStrip" + ''; + }; + + /* The binaries need all data in one directory; the default is directory + of the executable, and another option is the current directory :-/ */ + withPaks = paks: buildEnv { inherit (binaries) name; - unpackPhase = "true"; - buildInputs = [ makeWrapper ]; - installPhase = ''makeWrapper "${binaries}/bin/simutrans" "$out/bin/simutrans" --add-flags -objects --add-flags "${pak}"''; - inherit (binaries) meta; + paths = [binaries] ++ paks; + postBuild = '' + rm "$out/bin" && mkdir "$out/bin" + cat > "$out/bin/simutrans" < config.default + configurePhase = let + # Configuration as per the readme.txt and config.template + platform = + if stdenv.isLinux then "linux" else + if stdenv.isDarwin then "mac" else throw "add your platform"; + config = '' + BACKEND = mixer_sdl + COLOUR_DEPTH = 16 + OSTYPE = ${platform} + VERBOSE = 1 + ''; + #TODO: MULTI_THREAD = 1 is "highly recommended", + # but it's roughly doubling CPU usage for me + in '' + echo "${config}" > config.default - # Different default data dir - sed -i -e 's:argv\[0\]:"'$out'/share/simutrans/":' \ - simmain.cc + # Use ~/.simutrans instead of ~/simutrans + substituteInPlace simsys.cc --replace '%s/simutrans' '%s/.simutrans' - # Use ~/.simutrans instead of ~/simutrans ##not working - #sed -i -e 's@%s/simutrans@%s/.simutrans@' simsys_s.cc - - # No optimization overriding - sed -i -e '/-O$/d' Makefile + # use -O2 optimization (defaults are -O or -O3) + sed -i -e '/CFLAGS += -O/d' Makefile + export CFLAGS+=-O2 ''; + enableParallelBuilding = true; + installPhase = '' mkdir -p $out/share/ mv simutrans $out/share/ - unzip -o ${resources} -d $out/share/ mkdir -p $out/bin/ mv build/default/sim $out/bin/simutrans ''; - meta = { + meta = with stdenv.lib; { description = "A simulation game in which the player strives to run a successful transport system"; longDescription = '' Simutrans is a cross-platform simulation game in which the @@ -94,10 +158,11 @@ let ''; homepage = http://www.simutrans.com/; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ kkallio vcunat ]; + platforms = with platforms; linux ++ darwin; }; }; in result + diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix new file mode 100644 index 00000000000..43d453f71d7 --- /dev/null +++ b/pkgs/games/the-powder-toy/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }: + +let version = "90.2.322"; +in +stdenv.mkDerivation rec { + name = "the-powder-toy-${version}"; + src = fetchFromGitHub { + owner = "simtr"; + repo = "The-Powder-Toy"; + rev = "v${version}"; + sha256 = "1rlxnk8icymalnr3j4bgpklq1dhhs0rpsyjx97isqqcwm2ys03q3"; + }; + + patches = [ ./fix-env.patch ]; + + nativeBuildInputs = [ scons pkgconfig ]; + + buildInputs = [ SDL lua fftwFloat ]; + + buildPhase = "scons DESTDIR=$out/bin --tool='' -j$NIX_BUILD_CORES"; + + installPhase = '' + install -Dm 755 build/powder* "$out/bin/powder" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A free 2D physics sandbox game"; + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/games/the-powder-toy/fix-env.patch b/pkgs/games/the-powder-toy/fix-env.patch new file mode 100644 index 00000000000..79d2bb2a2e0 --- /dev/null +++ b/pkgs/games/the-powder-toy/fix-env.patch @@ -0,0 +1,16 @@ +diff --git a/SConscript b/SConscript +index fd08935..4d879b2 100644 +--- a/SConscript ++++ b/SConscript +@@ -93,9 +93,9 @@ if msvc and platform != "Windows": + + #Create SCons Environment + if platform == "Windows" and not GetOption('msvc'): +- env = Environment(tools = ['mingw'], ENV = {'PATH' : os.environ['PATH']}) ++ env = Environment(tools = ['mingw'], ENV = os.environ) + else: +- env = Environment(tools = ['default'], ENV = {'PATH' : os.environ['PATH']}) ++ env = Environment(tools = ['default'], ENV = os.environ) + + #attempt to automatically find cross compiler + if not tool and compilePlatform == "Linux" and compilePlatform != platform: diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 1e7d908fd95..f635e0f149b 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.45"; + name = "xlockmore-5.46"; src = fetchurl { - url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; - sha256 = "1xqm61bbfn5q056w57vp16gvai8nqpcw570ysxlm5h46nh6ai0bz"; + url = "http://www.tux.org/~bagleyd/xlock/${name}.tar.xz"; + sha256 = "1ps0dmnh912x8mwns94y2607xk90rjxrjn5s1pkmmpjg5h9bxcrj"; }; # Optionally, it can use GTK+. diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 6a8a019f946..56dd79f2837 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -544,15 +544,18 @@ rec { }; }; - YouCompleteMe = buildVimPlugin { + YouCompleteMe = buildVimPlugin { src = fetchgit { - rev = "56dc60ddc88d075902a5f13f10446923b009ad2f"; - url = "https://github.com/Valloric/YouCompleteMe.git"; - sha256 = "1i4qv2g9vhd8999iv7ly0pxyp9l99dzq3rjf4snkb8rpcrimgbkj"; + rev = "2f8109020644ad28e5cd795c29bc1150f87b3cb4"; + url = "https://github.com/Valloric/YouCompleteMe"; + sha256 = "15d3dhxan602qxz2wixjf4pjrf210qwa51ckzyjyh5kqak9lx8pi"; }; - name = "youcompleteme-2015-03-25"; + name = "youcompleteme-2015-03-27"; - buildInputs = [ python cmake llvmPackages.clang ]; + buildInputs = [ + python cmake + llvmPackages.clang-unwrapped llvmPackages.llvm + ]; configurePhase = ":"; diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix index 788297ba339..0243c2aa456 100644 --- a/pkgs/os-specific/linux/apparmor/2.9/default.nix +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -17,7 +17,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "a63b8724c36c29ed438c9e3ca403bfeeb6c998a45990e300aa1b10faa23a0a22"; + sha256 = "08ha7aigl40vm80f742rljcckdpfpw1s8g4yii1ysabcqcj8ffx6"; }; prePatchCommon = '' @@ -54,7 +54,7 @@ let buildPhase = '' cd ./libraries/libapparmor ./autogen.sh - ./configure --prefix="$out" --with-python + ./configure --prefix="$out" --with-python --with-perl make ''; diff --git a/pkgs/os-specific/linux/kernel/btrfs-fix-deadlock.patch b/pkgs/os-specific/linux/kernel/btrfs-fix-deadlock.patch new file mode 100644 index 00000000000..9430d583387 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/btrfs-fix-deadlock.patch @@ -0,0 +1,43 @@ +From 9c4f61f01d269815bb7c37be3ede59c5587747c6 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Fri, 2 Jan 2015 19:12:57 +0100 +Subject: btrfs: simplify insert_orphan_item + +We can search and add the orphan item in one go, +btrfs_insert_orphan_item will find out if the item already exists. + +Signed-off-by: David Sterba + +diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c +index 5be45c1..25a1c36 100644 +--- a/fs/btrfs/tree-log.c ++++ b/fs/btrfs/tree-log.c +@@ -1254,21 +1254,13 @@ out: + } + + static int insert_orphan_item(struct btrfs_trans_handle *trans, +- struct btrfs_root *root, u64 offset) ++ struct btrfs_root *root, u64 ino) + { + int ret; +- struct btrfs_path *path; +- +- path = btrfs_alloc_path(); +- if (!path) +- return -ENOMEM; + +- ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID, +- offset, BTRFS_ORPHAN_ITEM_KEY, NULL); +- if (ret > 0) +- ret = btrfs_insert_orphan_item(trans, root, offset); +- +- btrfs_free_path(path); ++ ret = btrfs_insert_orphan_item(trans, root, ino); ++ if (ret == -EEXIST) ++ ret = 0; + + return ret; + } +-- +cgit v0.10.2 + diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index ea5a9f927d4..8289235cd6e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -10,6 +10,13 @@ import ./generic.nix (args // rec { sha256 = "1pq4i97vys38rl8ylx4s08qgh9yz3cl840j1f70yzakmc2017byc"; }; + # FIXME: remove with the next point release. + kernelPatches = args.kernelPatches ++ + [ { name = "btrfs-fix-deadlock"; + patch = ./btrfs-fix-deadlock.patch; + } + ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 9e85c5397c6..8f1d9bd2765 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -9,6 +9,13 @@ import ./generic.nix (args // rec { sha256 = "19di7k38adnwimxddd1v6flgdsvxhgf8iswjwfyqi2p2bdcb0p5d"; }; + # FIXME: remove with the next point release. + kernelPatches = args.kernelPatches ++ + [ { name = "btrfs-fix-deadlock"; + patch = ./btrfs-fix-deadlock.patch; + } + ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 10c6215f871..e42775f0356 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -10,6 +10,13 @@ import ./generic.nix (args // rec { sha256 = "0nis1r9fg562ysirzlyvfxvirpcfhxhhpfv3s13ccz20qiqiy46f"; }; + # FIXME: remove with the next point release. + kernelPatches = args.kernelPatches ++ + [ { name = "btrfs-fix-deadlock"; + patch = ./btrfs-fix-deadlock.patch; + } + ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index de13f8394d8..769381355d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0-rc6"; - modDirVersion = "4.0.0-rc6"; + version = "4.0-rc7"; + modDirVersion = "4.0.0-rc7"; extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1f6xqrc9lqssr2gyzd6d82dk2niikbr1swg68vfc250am0l55vw8"; + sha256 = "1261p44zmsaq7gf08b8sd9xng2y46d4v7jyfipjlgrrmlkyfgqki"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 57992428cda..0b17c44be98 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,4 +87,5 @@ rec { { name = "crc-backport-regression"; patch = ./crc-regression.patch; }; + } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f34e593b961..e660004d172 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,10 +12,7 @@ assert (!libsOnly) -> kernel != null; let - # TODO: Remove the use of the beta driver for kernel 4.0 in - # nixos/modules/hardware/video/nvidia.nix when this driver supports - # kernel 4.0 - versionNumber = "346.47"; + versionNumber = "346.59"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; @@ -31,12 +28,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0vkayz6nhw00kn2nvxvr9hsh4sa555nbbr9swlx5x1frziym48dv"; + sha256 = "0a91mmv9846chyx6rbf3hx39gr344cffmgic45a9sf82rky87kv5"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0xqnjs54i281pnkky7dnz4n7jcn2vqjba0kra8da1wnyklm6gdni"; + sha256 = "0rz7pdzdviz1086w8ks6qiv83ah84y13h3051xr1p4wa4kll2yac"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 4e13aa2687c..1367be74c63 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,14 +1,14 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.3-1.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "1d4gdlkhshlyfkswbqx06fhs8m5lxgk3vhds6g7ipd3q93ngrczx"; + sha256 = "1jja3aqkm2whb4rcw5k5dr9c4gx6hax1w3f82fb9ks2sy731as6r"; }; - patches = [ ./install_prefix.patch ./const.patch ]; + patches = [ ./const.patch ./install_prefix.patch ]; }) diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index e60af32ea91..7559562965d 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,13 +1,13 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-04-03"; + version = "2015-04-08"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "ae26dd003911277e0c7134b3e4e3a41c300a2fd5"; - sha256 = "0wq1raz68b9msbn00q1zg89rm5l7l2018k7m31s4b4gj17w38h5b"; + rev = "cd69f020e4b0f9c416dd07a264e48c9488a7633f"; + sha256 = "1fy5zlh8cs65s52vixkp00ihrlrhs2frd6vwxwjqmpzyb7fnh3m8"; }; - patches = [ ./const.patch ./install_prefix-git.patch ]; + patches = [ ./const.patch ./install_prefix.patch ]; }) diff --git a/pkgs/os-specific/linux/spl/install_prefix-git.patch b/pkgs/os-specific/linux/spl/install_prefix-git.patch deleted file mode 100644 index 0f12f531f7a..00000000000 --- a/pkgs/os-specific/linux/spl/install_prefix-git.patch +++ /dev/null @@ -1,173 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 89af931..674420c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,10 +12,10 @@ endif - if CONFIG_KERNEL - SUBDIRS += module - --extradir = @prefix@/src/spl-$(VERSION) -+extradir = @prefix@/libexec/spl - extra_HEADERS = spl.release.in spl_config.h.in - --kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) -+kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) - nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) - endif - -diff --git a/include/Makefile.am b/include/Makefile.am -index 3200222..4a47aaa 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -13,6 +13,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include -+kerneldir = @prefix@/libexec/spl/include - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am -index e0da4b3..d6d7af0 100644 ---- a/include/fs/Makefile.am -+++ b/include/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/fs -+kerneldir = @prefix@/libexec/spl/include/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 1cca44a..e0d843b 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -19,6 +19,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/linux -+kerneldir = @prefix@/libexec/spl/include/linux - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am -index cfc8246..4fbd33d 100644 ---- a/include/rpc/Makefile.am -+++ b/include/rpc/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc -+kerneldir = @prefix@/libexec/spl/include/rpc - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am -index 10e7093..febecdf 100644 ---- a/include/sharefs/Makefile.am -+++ b/include/sharefs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs -+kerneldir = @prefix@/libexec/spl/include/sharefs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 2d21c57..3958cfd 100644 ---- a/include/sys/Makefile.am -+++ b/include/sys/Makefile.am -@@ -104,7 +104,7 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys -+kerneldir = @prefix@/libexec/spl/include/sys - kernel_HEADERS = $(KERNEL_H) - endif - -diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am -index 2821cbe..a84ce8e 100644 ---- a/include/sys/fm/Makefile.am -+++ b/include/sys/fm/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm -+kerneldir = @prefix@/libexec/spl/include/sys/fm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am -index 581083e..0c35fb7 100644 ---- a/include/sys/fs/Makefile.am -+++ b/include/sys/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs -+kerneldir = @prefix@/libexec/spl/include/sys/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am -index 63d9af3..de1aa18 100644 ---- a/include/sys/sysevent/Makefile.am -+++ b/include/sys/sysevent/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -+kerneldir = @prefix@/libexec/spl/include/sys/sysevent - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/util/Makefile.am b/include/util/Makefile.am -index b721b50..cbb9a05 100644 ---- a/include/util/Makefile.am -+++ b/include/util/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/util -+kerneldir = @prefix@/libexec/spl/include/util - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am -index 7faab0a..8148b3d 100644 ---- a/include/vm/Makefile.am -+++ b/include/vm/Makefile.am -@@ -10,6 +10,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/vm -+kerneldir = @prefix@/libexec/spl/include/vm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/module/Makefile.in b/module/Makefile.in -index 41c1010..3141397 100644 ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -21,15 +21,15 @@ clean: - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ -+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ - KERNELRELEASE=@LINUX_VERSION@ - @# Remove extraneous build products when packaging -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ -+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index 6b3bd515bd0..0f12f531f7a 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -1,274 +1,173 @@ -diff -rc spl-0.6.1.orig/include/fs/Makefile.am spl-0.6.1/include/fs/Makefile.am -*** spl-0.6.1.orig/include/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/fs/Makefile.am 2013-04-05 22:10:41.436764000 -0700 -*************** -*** 8,13 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/fs - kernel_HEADERS = $(KERNEL_H) - endif ---- 8,13 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/linux/Makefile.am spl-0.6.1/include/linux/Makefile.am -*** spl-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/linux/Makefile.am 2013-04-05 22:10:27.789139000 -0700 -*************** -*** 23,28 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/linux - kernel_HEADERS = $(KERNEL_H) - endif ---- 23,28 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/linux - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/Makefile.am spl-0.6.1/include/Makefile.am -*** spl-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/Makefile.am 2013-04-05 22:10:45.108623000 -0700 -*************** -*** 16,21 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include - kernel_HEADERS = $(KERNEL_H) - endif ---- 16,21 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/rpc/Makefile.am spl-0.6.1/include/rpc/Makefile.am -*** spl-0.6.1.orig/include/rpc/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/rpc/Makefile.am 2013-04-05 22:11:08.724410000 -0700 -*************** -*** 9,14 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/rpc - kernel_HEADERS = $(KERNEL_H) - endif ---- 9,14 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/rpc - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/sharefs/Makefile.am spl-0.6.1/include/sharefs/Makefile.am -*** spl-0.6.1.orig/include/sharefs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/sharefs/Makefile.am 2013-04-05 22:10:38.852722000 -0700 -*************** -*** 8,13 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/sharefs - kernel_HEADERS = $(KERNEL_H) - endif ---- 8,13 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/sharefs - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/sys/fm/Makefile.am spl-0.6.1/include/sys/fm/Makefile.am -*** spl-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/sys/fm/Makefile.am 2013-04-05 22:10:59.964334000 -0700 -*************** -*** 9,14 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm - kernel_HEADERS = $(KERNEL_H) - endif ---- 9,14 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/sys/fm - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/sys/fs/Makefile.am spl-0.6.1/include/sys/fs/Makefile.am -*** spl-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/sys/fs/Makefile.am 2013-04-05 22:10:57.860366000 -0700 -*************** -*** 8,13 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs - kernel_HEADERS = $(KERNEL_H) - endif ---- 8,13 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/sys/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/sys/Makefile.am spl-0.6.1/include/sys/Makefile.am -*** spl-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/sys/Makefile.am 2013-04-05 22:11:05.788303000 -0700 -*************** -*** 104,110 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/sys - kernel_HEADERS = $(KERNEL_H) - endif - ---- 104,110 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/sys - kernel_HEADERS = $(KERNEL_H) - endif - -diff -rc spl-0.6.1.orig/include/sys/sysevent/Makefile.am spl-0.6.1/include/sys/sysevent/Makefile.am -*** spl-0.6.1.orig/include/sys/sysevent/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/sys/sysevent/Makefile.am 2013-04-05 22:10:54.364458000 -0700 -*************** -*** 8,13 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent - kernel_HEADERS = $(KERNEL_H) - endif ---- 8,13 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/sys/sysevent - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/util/Makefile.am spl-0.6.1/include/util/Makefile.am -*** spl-0.6.1.orig/include/util/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/util/Makefile.am 2013-04-05 22:10:49.452569000 -0700 -*************** -*** 9,14 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/util - kernel_HEADERS = $(KERNEL_H) - endif ---- 9,14 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/util - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/include/vm/Makefile.am spl-0.6.1/include/vm/Makefile.am -*** spl-0.6.1.orig/include/vm/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/include/vm/Makefile.am 2013-04-05 22:10:47.444535000 -0700 -*************** -*** 10,15 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = /usr/src/spl-$(VERSION)/include/vm - kernel_HEADERS = $(KERNEL_H) - endif ---- 10,15 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL -! kerneldir = @prefix@/libexec/spl/include/vm - kernel_HEADERS = $(KERNEL_H) - endif -diff -rc spl-0.6.1.orig/Makefile.am spl-0.6.1/Makefile.am -*** spl-0.6.1.orig/Makefile.am 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/Makefile.am 2013-04-05 22:09:52.429676000 -0700 -*************** -*** 9,18 **** - if CONFIG_KERNEL - SUBDIRS += module - -! extradir = /usr/src/spl-$(VERSION) - extra_HEADERS = spl.release.in spl_config.h.in - -! kerneldir = /usr/src/spl-$(VERSION)/$(LINUX_VERSION) - nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) - endif - ---- 9,18 ---- - if CONFIG_KERNEL - SUBDIRS += module - -! extradir = @prefix@/libexec/spl - extra_HEADERS = spl.release.in spl_config.h.in - -! kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) - nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) - endif - -diff -rc spl-0.6.1.orig/module/Makefile.in spl-0.6.1/module/Makefile.in -*** spl-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:39.000000000 -0700 ---- spl-0.6.1/module/Makefile.in 2013-03-28 10:21:59.093481000 -0700 -*************** -*** 21,41 **** - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) - @# Remove extraneous build products when packaging -! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ - list='$(subdir-m)'; for subdir in $$list; do \ - $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ - done ---- 21,41 ---- - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) - @# Remove extraneous build products when packaging -! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ - list='$(subdir-m)'; for subdir in $$list; do \ - $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ - done +diff --git a/Makefile.am b/Makefile.am +index 89af931..674420c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,10 +12,10 @@ endif + if CONFIG_KERNEL + SUBDIRS += module + +-extradir = @prefix@/src/spl-$(VERSION) ++extradir = @prefix@/libexec/spl + extra_HEADERS = spl.release.in spl_config.h.in + +-kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) ++kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) + endif + +diff --git a/include/Makefile.am b/include/Makefile.am +index 3200222..4a47aaa 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -13,6 +13,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include ++kerneldir = @prefix@/libexec/spl/include + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am +index e0da4b3..d6d7af0 100644 +--- a/include/fs/Makefile.am ++++ b/include/fs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/fs ++kerneldir = @prefix@/libexec/spl/include/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am +index 1cca44a..e0d843b 100644 +--- a/include/linux/Makefile.am ++++ b/include/linux/Makefile.am +@@ -19,6 +19,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/linux ++kerneldir = @prefix@/libexec/spl/include/linux + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am +index cfc8246..4fbd33d 100644 +--- a/include/rpc/Makefile.am ++++ b/include/rpc/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc ++kerneldir = @prefix@/libexec/spl/include/rpc + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am +index 10e7093..febecdf 100644 +--- a/include/sharefs/Makefile.am ++++ b/include/sharefs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs ++kerneldir = @prefix@/libexec/spl/include/sharefs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am +index 2d21c57..3958cfd 100644 +--- a/include/sys/Makefile.am ++++ b/include/sys/Makefile.am +@@ -104,7 +104,7 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys ++kerneldir = @prefix@/libexec/spl/include/sys + kernel_HEADERS = $(KERNEL_H) + endif + +diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am +index 2821cbe..a84ce8e 100644 +--- a/include/sys/fm/Makefile.am ++++ b/include/sys/fm/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm ++kerneldir = @prefix@/libexec/spl/include/sys/fm + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am +index 581083e..0c35fb7 100644 +--- a/include/sys/fs/Makefile.am ++++ b/include/sys/fs/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs ++kerneldir = @prefix@/libexec/spl/include/sys/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am +index 63d9af3..de1aa18 100644 +--- a/include/sys/sysevent/Makefile.am ++++ b/include/sys/sysevent/Makefile.am +@@ -8,6 +8,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent ++kerneldir = @prefix@/libexec/spl/include/sys/sysevent + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/util/Makefile.am b/include/util/Makefile.am +index b721b50..cbb9a05 100644 +--- a/include/util/Makefile.am ++++ b/include/util/Makefile.am +@@ -9,6 +9,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/util ++kerneldir = @prefix@/libexec/spl/include/util + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am +index 7faab0a..8148b3d 100644 +--- a/include/vm/Makefile.am ++++ b/include/vm/Makefile.am +@@ -10,6 +10,6 @@ USER_H = + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/spl-$(VERSION)/include/vm ++kerneldir = @prefix@/libexec/spl/include/vm + kernel_HEADERS = $(KERNEL_H) + endif +diff --git a/module/Makefile.in b/module/Makefile.in +index 41c1010..3141397 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -21,15 +21,15 @@ clean: + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ +- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ ++ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ + KERNELRELEASE=@LINUX_VERSION@ + @# Remove extraneous build products when packaging +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ ++ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ + if [ -n $$kmoddir ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ ++ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 3f456802286..06aca23369e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,17 +1,14 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.3-1.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "08m5ah8a6zp96djz2xj9rb94zq973dwwfpc26jy0adzdq2q20zb4"; + sha256 = "0xlj2w6gadip3rr3f1lri1n93lkjpzyksnk01sbl5wsrbkry3xjq"; }; - patches = [ - ./mount_zfs_prefix.patch - ./nix-build.patch # Remove in >=0.6.4 - ]; + patches = [ ./nix-build.patch ]; }) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index a8313867339..a7d312c4041 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,17 +1,15 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-04-03"; + version = "2015-04-08"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "40d06e3c78c23b199dfd9284809e710fab549391"; - sha256 = "1yxpx7lylbbr6jlm8g2x6xsmh6wmzb8prfg7shks7sib750a4slx"; + rev = "d07a16360c1ee219b8820f80d035e56a18c58b84"; + sha256 = "0yyc0n960bzd4fmrg1mwp0xy1db7yn90g33ds44chh4g74mrfgdz"; }; - patches = [ - ./nix-build-git.patch - ]; + patches = [ ./nix-build.patch ]; spl = spl_git; }) diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch deleted file mode 100644 index 82b5999cf9e..00000000000 --- a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -crN '--exclude=.git' zfs-0.60-rc11/cmd/mount_zfs/Makefile.am zfs/cmd/mount_zfs/Makefile.am -*** zfs-0.60-rc11/cmd/mount_zfs/Makefile.am 2012-10-22 10:26:07.066205000 -0700 ---- zfs/cmd/mount_zfs/Makefile.am 2012-10-22 11:16:21.859286000 -0700 -*************** -*** 7,14 **** - # - # Ignore the prefix for the mount helper. It must be installed in /sbin/ - # because this path is hardcoded in the mount(8) for security reasons. - # -- sbindir=/sbin - sbin_PROGRAMS = mount.zfs - - mount_zfs_SOURCES = \ ---- 7,16 ---- - # - # Ignore the prefix for the mount helper. It must be installed in /sbin/ - # because this path is hardcoded in the mount(8) for security reasons. -+ # -+ # ... except on nixos, where it really is /var/run/current-system/sw/bin, -+ # which is where this will end up if we put it in ${out}/sbin. - # - sbin_PROGRAMS = mount.zfs - - mount_zfs_SOURCES = \ diff --git a/pkgs/os-specific/linux/zfs/nix-build-git.patch b/pkgs/os-specific/linux/zfs/nix-build-git.patch deleted file mode 100644 index ae8e82f703a..00000000000 --- a/pkgs/os-specific/linux/zfs/nix-build-git.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 49b417a..f4af44d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,10 +12,10 @@ endif - if CONFIG_KERNEL - SUBDIRS += module - --extradir = @prefix@/src/zfs-$(VERSION) -+extradir = @prefix@/libexec/zfs-$(VERSION) - extra_HEADERS = zfs.release.in zfs_config.h.in - --kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION) -+kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION) - nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) - endif - -diff --git a/include/Makefile.am b/include/Makefile.am -index a94cad5..a160fe2 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = @prefix@/src/zfs-$(VERSION)/include -+kerneldir = @prefix@/include - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index d00b1c8..3242d2e 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux -+kerneldir = @prefix@/include/linux - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 7ddace0..8da3870 100644 ---- a/include/sys/Makefile.am -+++ b/include/sys/Makefile.am -@@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys -+kerneldir = @prefix@/include/sys - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am -index 8bca5d8..a5eafcd 100644 ---- a/include/sys/fm/Makefile.am -+++ b/include/sys/fm/Makefile.am -@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm -+kerneldir = @prefix@/include/sys/fm - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am -index fdc9eb5..807c47c 100644 ---- a/include/sys/fm/fs/Makefile.am -+++ b/include/sys/fm/fs/Makefile.am -@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs -+kerneldir = @prefix@/include/sys/fm/fs - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am -index 0859b9f..b0c6eec 100644 ---- a/include/sys/fs/Makefile.am -+++ b/include/sys/fs/Makefile.am -@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) - endif - - if CONFIG_KERNEL --kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs -+kerneldir = @prefix@/include/sys/fs - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff --git a/module/Makefile.in b/module/Makefile.in -index 686402b..9cbf598 100644 ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -18,9 +18,9 @@ modules: - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -- /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ -+ cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -- /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ -+ cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ - "*** Missing spl symbols ensure you have built the spl:\n" \ -@@ -28,6 +28,8 @@ modules: - "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \ - exit 1; \ - fi -+ @# when copying a file out of the nix store, we need to make it writable again. -+ chmod +w @SPL_SYMBOLS@ - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@ - - clean: -@@ -42,15 +44,15 @@ clean: - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ -+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ - KERNELRELEASE=@LINUX_VERSION@ - @# Remove extraneous build products when packaging -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ -+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi diff --git a/pkgs/os-specific/linux/zfs/nix-build.patch b/pkgs/os-specific/linux/zfs/nix-build.patch index af4b94e355d..ae8e82f703a 100644 --- a/pkgs/os-specific/linux/zfs/nix-build.patch +++ b/pkgs/os-specific/linux/zfs/nix-build.patch @@ -1,214 +1,133 @@ -diff -rc zfs-0.6.1.orig/include/linux/Makefile.am zfs-0.6.1/include/linux/Makefile.am -*** zfs-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:47.000000000 -0700 ---- zfs-0.6.1/include/linux/Makefile.am 2013-03-28 11:07:10.099129000 -0700 -*************** -*** 16,21 **** - endif - - if CONFIG_KERNEL -! kerneldir = /usr/src/zfs-$(VERSION)/include/linux - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif ---- 16,21 ---- - endif - - if CONFIG_KERNEL -! kerneldir = @prefix@/include/linux - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff -rc zfs-0.6.1.orig/include/Makefile.am zfs-0.6.1/include/Makefile.am -*** zfs-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:47.000000000 -0700 ---- zfs-0.6.1/include/Makefile.am 2013-03-28 11:07:38.810870000 -0700 -*************** -*** 28,33 **** - endif - - if CONFIG_KERNEL -! kerneldir = /usr/src/zfs-$(VERSION)/include - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif ---- 28,33 ---- - endif - - if CONFIG_KERNEL -! kerneldir = @prefix@/include - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff -rc zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am zfs-0.6.1/include/sys/fm/fs/Makefile.am -*** zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700 ---- zfs-0.6.1/include/sys/fm/fs/Makefile.am 2013-03-28 11:07:36.074756000 -0700 -*************** -*** 13,18 **** - endif - - if CONFIG_KERNEL -! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm/fs - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif ---- 13,18 ---- - endif - - if CONFIG_KERNEL -! kerneldir = @prefix@/include/sys/fm/fs - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff -rc zfs-0.6.1.orig/include/sys/fm/Makefile.am zfs-0.6.1/include/sys/fm/Makefile.am -*** zfs-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:47.000000000 -0700 ---- zfs-0.6.1/include/sys/fm/Makefile.am 2013-03-28 11:07:32.265896000 -0700 -*************** -*** 16,21 **** - endif - - if CONFIG_KERNEL -! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif ---- 16,21 ---- - endif - - if CONFIG_KERNEL -! kerneldir = @prefix@/include/sys/fm - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff -rc zfs-0.6.1.orig/include/sys/fs/Makefile.am zfs-0.6.1/include/sys/fs/Makefile.am -*** zfs-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700 ---- zfs-0.6.1/include/sys/fs/Makefile.am 2013-03-28 11:07:27.592339000 -0700 -*************** -*** 13,18 **** - endif - - if CONFIG_KERNEL -! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fs - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif ---- 13,18 ---- - endif - - if CONFIG_KERNEL -! kerneldir = @prefix@/include/sys/fs - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff -rc zfs-0.6.1.orig/include/sys/Makefile.am zfs-0.6.1/include/sys/Makefile.am -*** zfs-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:47.000000000 -0700 ---- zfs-0.6.1/include/sys/Makefile.am 2013-03-28 11:07:19.045717000 -0700 -*************** -*** 91,96 **** - endif - - if CONFIG_KERNEL -! kerneldir = /usr/src/zfs-$(VERSION)/include/sys - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif ---- 91,96 ---- - endif - - if CONFIG_KERNEL -! kerneldir = @prefix@/include/sys - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - endif -diff -rc zfs-0.6.1.orig/Makefile.am zfs-0.6.1/Makefile.am -*** zfs-0.6.1.orig/Makefile.am 2013-03-26 09:37:47.000000000 -0700 ---- zfs-0.6.1/Makefile.am 2013-04-05 23:49:39.763623000 -0700 -*************** -*** 9,18 **** - if CONFIG_KERNEL - SUBDIRS += module - -! extradir = /usr/src/zfs-$(VERSION) - extra_HEADERS = zfs.release.in zfs_config.h.in - -! kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION) - nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) - endif - ---- 9,18 ---- - if CONFIG_KERNEL - SUBDIRS += module - -! extradir = @prefix@/libexec/zfs-$(VERSION) - extra_HEADERS = zfs.release.in zfs_config.h.in - -! kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION) - nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) - endif - -diff -rc zfs-0.6.1.orig/module/Makefile.in zfs-0.6.1/module/Makefile.in -*** zfs-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:47.000000000 -0700 ---- zfs-0.6.1/module/Makefile.in 2013-04-05 23:50:41.497876000 -0700 -*************** -*** 18,26 **** - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ - "*** Missing spl symbols ensure you have built the spl:\n" \ ---- 18,26 ---- - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ - "*** Missing spl symbols ensure you have built the spl:\n" \ -*************** -*** 28,33 **** ---- 28,35 ---- - "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \ - exit 1; \ - fi -+ @# when copying a file out of the nix store, we need to make it writable again. -+ chmod +w @SPL_SYMBOLS@ - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@ - - clean: -*************** -*** 42,62 **** - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) - @# Remove extraneous build products when packaging -! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ - list='$(subdir-m)'; for subdir in $$list; do \ - $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ - done ---- 44,64 ---- - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) - @# Remove extraneous build products when packaging -! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ - list='$(subdir-m)'; for subdir in $$list; do \ - $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ - done +diff --git a/Makefile.am b/Makefile.am +index 49b417a..f4af44d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,10 +12,10 @@ endif + if CONFIG_KERNEL + SUBDIRS += module + +-extradir = @prefix@/src/zfs-$(VERSION) ++extradir = @prefix@/libexec/zfs-$(VERSION) + extra_HEADERS = zfs.release.in zfs_config.h.in + +-kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION) ++kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION) + nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) + endif + +diff --git a/include/Makefile.am b/include/Makefile.am +index a94cad5..a160fe2 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) + endif + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/zfs-$(VERSION)/include ++kerneldir = @prefix@/include + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am +index d00b1c8..3242d2e 100644 +--- a/include/linux/Makefile.am ++++ b/include/linux/Makefile.am +@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) + endif + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux ++kerneldir = @prefix@/include/linux + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am +index 7ddace0..8da3870 100644 +--- a/include/sys/Makefile.am ++++ b/include/sys/Makefile.am +@@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) + endif + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys ++kerneldir = @prefix@/include/sys + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am +index 8bca5d8..a5eafcd 100644 +--- a/include/sys/fm/Makefile.am ++++ b/include/sys/fm/Makefile.am +@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) + endif + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm ++kerneldir = @prefix@/include/sys/fm + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am +index fdc9eb5..807c47c 100644 +--- a/include/sys/fm/fs/Makefile.am ++++ b/include/sys/fm/fs/Makefile.am +@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) + endif + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs ++kerneldir = @prefix@/include/sys/fm/fs + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am +index 0859b9f..b0c6eec 100644 +--- a/include/sys/fs/Makefile.am ++++ b/include/sys/fs/Makefile.am +@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) + endif + + if CONFIG_KERNEL +-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs ++kerneldir = @prefix@/include/sys/fs + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + endif +diff --git a/module/Makefile.in b/module/Makefile.in +index 686402b..9cbf598 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -18,9 +18,9 @@ modules: + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +- /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ ++ cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +- /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ ++ cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ + "*** Missing spl symbols ensure you have built the spl:\n" \ +@@ -28,6 +28,8 @@ modules: + "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \ + exit 1; \ + fi ++ @# when copying a file out of the nix store, we need to make it writable again. ++ chmod +w @SPL_SYMBOLS@ + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@ + + clean: +@@ -42,15 +44,15 @@ clean: + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ +- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ ++ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ + KERNELRELEASE=@LINUX_VERSION@ + @# Remove extraneous build products when packaging +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ ++ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ + if [ -n $$kmoddir ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ ++ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index ff21c4f508e..456580cc199 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -12,10 +12,10 @@ with stdenv.lib; let - version = "1.6.2"; + version = "1.6.3"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "060s77qxhkn02fjkcndsr0xppj2bppjzkj0gn84svrykb4lqqq5m"; + sha256 = "0mz7nx1ffw4f024yb4w9kpjd33z1f16zmq9iyd160kbf6rdyk60a"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index dbfaf313d8a..303159cb7f4 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,25 +1,33 @@ { stdenv, fetchurl, scons, boost, gperftools, pcre, snappy -, libyamlcpp, sasl, openssl, libpcap }: +, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger +}: with stdenv.lib; -let version = "2.6.8"; +let version = "3.0.1"; system-libraries = [ "pcre" + "wiredtiger" "boost" "snappy" + "zlib" + # "v8" # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs) "yaml" - # "v8" - ] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ]; + ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; buildInputs = [ sasl boost gperftools pcre snappy - libyamlcpp sasl openssl libpcap + zlib libyamlcpp sasl openssl libpcap wiredtiger ]; other-args = concatStringsSep " " ([ + "--c++11=on" "--ssl" + #"--rocksdb" # Don't have this packaged yet + "--wiredtiger=on" + "--js-engine=v8-3.25" "--use-sasl-client" + "--variant-dir=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld "--extrapath=${concatStringsSep "," buildInputs}" ] ++ map (lib: "--use-system-${lib}") system-libraries); @@ -28,36 +36,29 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "01hs65xswggy628hxka2f63qvwz5rfhqlkb05kr20wz1kl6zd5qr"; + sha256 = "04qjw7b98h37g8rcih7va3rvg2z95ly38bg181a4nfkak50hd638"; }; nativeBuildInputs = [ scons ]; inherit buildInputs; postPatch = '' - # fix yaml-cpp detection - sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct - - # bug #482576 - sed -i -e "/-Werror/d" src/third_party/v8/SConscript - - # fix inclusion of std::swap - sed -i '1i #include ' src/mongo/shell/linenoise_utf8.h - # fix environment variable reading substituteInPlace SConstruct \ - --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" + --replace "env = Environment(" "env = Environment(ENV = os.environ," ''; buildPhase = '' - scons all --release ${other-args} + scons -j $NIX_BUILD_CORES core --release ${other-args} ''; installPhase = '' mkdir -p $out/lib - scons install --release --prefix=$out ${other-args} + scons -j $NIX_BUILD_CORES install --release --prefix=$out ${other-args} ''; + enableParallelBuilding = true; + meta = { description = "a scalable, high-performance, open source NoSQL database"; homepage = http://www.mongodb.org; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index e39fe85fa6a..137e536e5d8 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,14 +1,26 @@ -{ stdenv, fetchurl, postgresql }: +{ stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }: stdenv.mkDerivation rec { - name = "pgpool-II-3.4.1"; + name = "pgpool-II-3.4.2"; src = fetchurl { + name = "${name}.tar.gz"; url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; - sha256 = "11fy4lvh2n04zmywy4vhp229yxdw8fbirrlvz44j1vnarkb664pd"; + sha256 = "0lf3fvwc2ib4md25a3hnv822nhy9ac06vg0ndw8q9bry66hzwcfh"; }; - buildInputs = [ postgresql ]; + buildInputs = [ postgresql openssl pam libmemcached ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-openssl" + ] ++ stdenv.lib.optional (pam != null) "--with-pam" + ++ stdenv.lib.optional (libmemcached != null) "--with-memcached=${libmemcached}"; + + installFlags = [ + "sysconfdir=\${out}/etc" + ]; meta = with stdenv.lib; { homepage = http://pgpool.net/mediawiki/index.php; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 684a06eff4a..631073da4d4 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -1,11 +1,16 @@ -{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, libidn, openssl, makeWrapper, fetchhg, withLibevent ? false }: +{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg +, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null +, withLibevent ? true, withZlib ? true }: assert withLibevent -> luaevent != null; +assert withZlib -> luazlib != null; with stdenv.lib; let - libs = [ luasocket luasec luaexpat luafilesystem luabitop ] ++ optional withLibevent luaevent; + libs = [ luasocket luasec luaexpat luafilesystem luabitop ] + ++ optional withLibevent luaevent + ++ optional withZlib luazlib; getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; getLuaPath = lib : getPath lib "lua"; getLuaCPath = lib : getPath lib "so"; @@ -29,7 +34,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] - ++ optional withLibevent luaevent; + ++ optional withLibevent luaevent + ++ optional withZlib luazlib; configureFlags = [ "--ostype=linux" diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index a37aa26cf7c..d924ae0b7d5 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonPackage rec { name = "awscli-${version}"; - version = "1.7.0"; + version = "1.7.21"; namePrefix = ""; src = fetchzip { url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; - sha256 = "14cbfvwx18vs2l8hhvamy1mbvjwa3xrm58l8yyalhrh5pqq952mi"; + sha256 = "1hm2m5ycsyn4lap8549d6glryp9b9mvar9xwbpmpdcf698lcxzsj"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index d7d9fc0c0a2..26e82886b6f 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, valgrind }: +{ stdenv, fetchFromGitHub, valgrind }: +let version = "128"; in stdenv.mkDerivation rec { - version = "128"; name = "lz4-${version}"; - src = fetchurl { - url = "https://github.com/Cyan4973/lz4/archive/r${version}.tar.gz"; - sha256 = "1lf7a0gqm2q7p1qs28lmajmls3pwfk2p0w3hljjlmshbkndaj26b"; + src = fetchFromGitHub { + sha256 = "00jrnic2jddj81av8jjipf4rdkx6x6cdf8zpsz3mp5kbmqzd0h9a"; + rev = "r${version}"; + repo = "lz4"; + owner = "Cyan4973"; }; # valgrind is required only by `make test` diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 89aca9c06c2..7fd547099a2 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { name="ceph-${version}"; - version="0.93"; + version="0.94"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "0fk6svs1c4ng3gwgj0albzz2hxny74ld44gq16cpgkgrdk4bsyi5"; + sha256 = "0xqfmfg34w8yngv2qg4kwbpv9xhc8rn9hzsrgpw68f5hrs3dfimz"; }; patches = [ diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index d178be0f0fa..0f9bff82967 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoreconfHook, gettext }: +{ stdenv, fetchFromGitHub, autoreconfHook, gettext }: +let version = "0.5.2"; in stdenv.mkDerivation rec { name = "duff-${version}"; - version = "0.5.2"; - src = fetchurl { - url = "https://github.com/elmindreda/duff/archive/${version}.tar.gz"; - sha256 = "149dd80f9758085ed199c37aa32ad869409fa5e2c8da8a51294bd64ca886e058"; + src = fetchFromGitHub { + sha256 = "0yfm910wjj6z0f0cg68x59ykf4ql5m49apzy8sra00f8kv4lpn53"; + rev = version; + repo = "duff"; + owner = "elmindreda"; }; buildInputs = [ autoreconfHook gettext ]; @@ -25,6 +27,8 @@ stdenv.mkDerivation rec { -i configure.ac ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Quickly find duplicate files."; homepage = http://duff.dreda.org/; diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 5bcb738d709..253f335ae4a 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: +let version = "0.91"; in stdenv.mkDerivation rec { - version = "0.91"; name = "mp3fs-${version}"; src = fetchurl { diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 4761980a18d..4f9de84a223 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.5.1"; + version = "0.5.2"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "1fr80p5c3hd3956gn7ri5pv3gblaxw95xkpf6wz1llkmrr2i8ncp"; + sha256 = "090wzhcd4sr3358p1f640psy42r4kd3kkhgnf8196qsh2vcx8arc"; }; buildInputs = [ go fuse ]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 984f644c28d..eb308f9de4f 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -6,17 +6,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc}/lib64"; - sha256 = "09kw7f0qsvx3vx1c1zb117yf3yk7kkz66agspz5xx9b0zh6i82jw"; + sha256 = "061kl186vllqhl1443d9cwvp4qdhqc42yf3x72a1w0bjvn0i3z1i"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc}/lib"; - sha256 = "0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426"; + sha256 = "1l9mxlin41w83dn70cvdk1n1vn1dll3d8r120jkqn5jfhicrgvv3"; }; in stdenv.mkDerivation rec { - name = "yandex-disk-0.1.4.504"; + name = "yandex-disk-${version}"; + version = "0.1.5.870"; src = fetchurl { url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 41c479e414b..64a45b975b0 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "fdupes-1.50-PR2"; + name = "fdupes-1.51"; src = fetchurl { - url = http://fdupes.googlecode.com/files/fdupes-1.50-PR2.tar.gz; - sha256 = "068nxcn3xilaphq53sywli9ndydy4gijfi2mz7h45kpy0q9cgwjs"; + url = https://github.com/adrianlopezroche/fdupes/archive/fdupes-1.51.tar.gz; + sha256 = "11j96vxl9vg3jsnxqxskrv3gad6dh7hz2zpyc8n31xzyxka1c7kn"; }; # workaround: otherwise make install fails (should be fixed in trunk) diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 3200c7016b6..c62bd45fef8 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "17qi3nfky240pq6qcmf5qg324mxm83vk9r3nvsdhsvinyqm5d3kg"; }; - makeFlags = "CFLAGS=-lgcc_s USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1" + - stdenv.lib.optionalString stdenv.isi686 " USE_LARGE_FILES=1"; + makeFlags = "USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1" + + stdenv.lib.optionalString stdenv.isi686 " USE_LARGE_FILES=1" + + stdenv.lib.optionalString stdenv.isLinux "CFLAGS=-lgcc_s"; preInstall = '' installFlags=PREFIX=$out @@ -21,7 +22,7 @@ stdenv.mkDerivation { homepage = http://mktorrent.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 53b650405fe..27d5e624589 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20150222"; + name = "parallel-20150322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1302snh0aac8978842ci1rvjjjwki7xgj8bd4hq3f2hxp3zdspv7"; + sha256 = "1zsj1bd4zbwb4n9i0jgzs7vd5wkyg3xvj6s1q6s5fyn0pff7j01c"; }; patchPhase = diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 1f6db50a2df..9934620c11f 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-0.1.5"; + name = "yubico-piv-tool-0.1.6"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "1zii90f0d1j9cinvxqlzs9h8w7a856ksd8ghgqz12jywmjz0blxq"; + sha256 = "1fsr7wkbg2ff9igc3d8bfqijdxj88wpfnj7zlidzgzakj4b6bxzg"; }; buildInputs = [ pkgconfig openssl pcsclite ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 78d69b792a9..8e606de68c1 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yubikey-personalization, qt, libyubikey }: stdenv.mkDerivation rec { - name = "yubikey-personalization-gui-3.1.18"; + name = "yubikey-personalization-gui-3.1.20"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; - sha256 = "1jxi7izg9j4nd2jxra7pc18wp2b6a9i9zyix8yzvwkl4yjzpbqw3"; + sha256 = "157ra39m4rv7ni28q9n7v3n102h89fn43kccvs91fmqbj02i3qvh"; }; buildInputs = [ pkgconfig yubikey-personalization qt libyubikey ]; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index e420b1705a1..f6b14635d29 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.16.2"; + version = "1.17.1"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "0841iddqbs6f43wwr058algkibyhyp143b9c034zagrmslvsfb9b"; + sha256 = "1i399z23skvyfdr3fp7a340qi3ynfcwdqr1y540swjy9pg1awssm"; }; buildInputs = [ pkgconfig libusb libyubikey json_c ]; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index d5695709a3c..47efe53c0a9 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, openssl, pkgconfig, db }: +{ fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl }: stdenv.mkDerivation rec { name = "isync-1.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0n8fwvv88h7ps7qs122kgh1yx5308765fiwqav5h7m272vg7hf43"; }; - buildInputs = [ openssl pkgconfig db ]; + buildInputs = [ openssl pkgconfig db cyrus_sasl ]; meta = { homepage = http://isync.sourceforge.net/; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 4c0b893b91d..93dad85ce1e 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,23 +1,18 @@ -{ stdenv, fetchurl, libcap, autoreconfHook }: +{ stdenv, fetchurl, autoreconfHook, libcap ? null }: assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "ntp-4.2.8"; + name = "ntp-4.2.8p2"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "1vnqa1542d01xmlkw8f3rq57y360b2j7yxkkg9b11955nvw0v4if"; + sha256 = "0ccv9kh5asxpk7bjn73vwrqimbkbfl743bgx0km47bfajl7bqs8d"; }; - patches = [ ./no-openssl.patch ]; + configureFlags = stdenv.lib.optional (libcap != null) "--enable-linuxcaps"; - configureFlags = '' - --without-crypto - ${if stdenv.isLinux then "--enable-linuxcaps" else ""} - ''; - - buildInputs = [ autoreconfHook ] ++ stdenv.lib.optional stdenv.isLinux libcap; + buildInputs = [ autoreconfHook libcap ]; postInstall = "rm -rf $out/share/doc"; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 55147464416..202cb4c6ba6 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -21,15 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - installFlags = [ "DESTDIR=\${out}" ]; - - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - ''; + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; meta = with stdenv.lib; { homepage = "http://www.openntpd.org/"; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index dd3a6ba3cf0..36d3d77c9f9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.9pre4087_afa433e"; + name = "nix-1.9pre4088_1711679"; src = fetchurl { - url = "http://hydra.nixos.org/build/21053128/download/4/${name}.tar.xz"; - sha256 = "05dda3644ed68364bbff87d0ec662ca18d8542f921683cb2e1f308281d6bf384"; + url = "http://hydra.nixos.org/build/21171422/download/4/${name}.tar.xz"; + sha256 = "37240acbb9ea9a3a0f141a85296787e1d4b7c2ab987c218be2f8007b28167b03"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 88f6e359d2b..a8f6ae81e04 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook gtk2 pcsclite pkgconfig ]; + enableParallelBuilding = true; + doCheck = true; postInstall = '' diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index b77f1694772..03e193dacc7 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -14,7 +14,8 @@ pythonPackages.buildPythonPackage { buildInputs = [ unzip ]; - pythonPath = [ systemd python.modules.sqlite3 gamin ]; + pythonPath = (stdenv.lib.optional stdenv.isLinux systemd) + ++ [ python.modules.sqlite3 gamin ]; preConfigure = '' substituteInPlace setup.cfg \ diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index db3fe3197fa..1237890f621 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks }: stdenv.mkDerivation rec { - name = "tor-0.2.5.11"; + name = "tor-0.2.5.12"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0sb7ai8r9c0nvdagjrbfqpri6x4njfxv954fxrjv46rzkkpgmq5f"; + sha256 = "0j9byw3i2b7ji88vsqwmsxxg2nlxwkk45k5qbc1y7hdlzvzxl3sm"; }; # Note: torsocks is specified as a dependency, as the distributed @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # ./configure time check for any of this. buildInputs = [ libevent openssl zlib torsocks ]; - CFLAGS = "-lgcc_s"; + CFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lgcc_s"; # Patch 'torify' to point directly to torsocks. patchPhase = '' @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ phreedom doublec thoughtpolice ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 3e6e5028111..b91dc65219b 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "0w1vq2fvk0ik503vz02znk80ywpnsybx0sc6906q7sbk3i7ggxp1" else - "1yljz43kyl6pmri1xnxmfxh6nphczvwgbrdgdsimc05zsfbrh363"; + "d954510bf812f624945bdba8e1c37e23573de89e2f159d7c89a3e3589a765559" else + "89ce71312f5d73fc2af637a93d7697587b2132fce0e9f6e815b25ddba66518d0"; }; patchPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1517632013..a56439f4b18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1806,6 +1806,7 @@ let nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; }; nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; + nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { }; nodePackages = callPackage ./node-packages.nix { self = nodePackages; }; @@ -2162,7 +2163,9 @@ let ntopng = callPackage ../tools/networking/ntopng { }; - ntp = callPackage ../tools/networking/ntp { }; + ntp = callPackage ../tools/networking/ntp { + libcap = if stdenv.isLinux then libcap else null; + }; numdiff = callPackage ../tools/text/numdiff { }; @@ -5457,6 +5460,8 @@ let beecrypt = callPackage ../development/libraries/beecrypt { }; + belle-sip = callPackage ../development/libraries/belle-sip { }; + boehmgc = callPackage ../development/libraries/boehm-gc { }; boolstuff = callPackage ../development/libraries/boolstuff { }; @@ -5495,6 +5500,7 @@ let scmccid = callPackage ../development/libraries/scmccid { }; ccrtp = callPackage ../development/libraries/ccrtp { }; + ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { }; celt = callPackage ../development/libraries/celt {}; @@ -6176,6 +6182,7 @@ let openldap = openldap.override { cyrus_sasl = cyrus_sasl.override { kerberos = null; }; }; + inherit (darwin) bootstrap_cmds; }; LASzip = callPackage ../development/libraries/LASzip { }; @@ -6926,9 +6933,6 @@ let libzdb = callPackage ../development/libraries/libzdb { }; libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; - libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix { - ccrtp = ccrtp_1_8; - }; libwacom = callPackage ../development/libraries/libwacom { }; @@ -6966,6 +6970,8 @@ let matio = callPackage ../development/libraries/matio { }; + mbedtls = callPackage ../development/libraries/mbedtls { }; + mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds = callPackage ../development/libraries/mdds { }; @@ -7200,9 +7206,7 @@ let }; }; - ortp = callPackage ../development/libraries/ortp { - srtp = srtp_linphone; - }; + ortp = callPackage ../development/libraries/ortp { }; p11_kit = callPackage ../development/libraries/p11-kit { }; @@ -7246,6 +7250,8 @@ let poker-eval = callPackage ../development/libraries/poker-eval { }; + polarssl = mbedtls; + polkit = callPackage ../development/libraries/polkit { spidermonkey = spidermonkey_17; }; @@ -7554,9 +7560,9 @@ let srm = callPackage ../tools/security/srm { }; - srtp = callPackage ../development/libraries/srtp {}; - - srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; + srtp = callPackage ../development/libraries/srtp { + libpcap = if stdenv.isLinux then libpcap else null; + }; stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; @@ -7674,7 +7680,17 @@ let uthash = callPackage ../development/libraries/uthash { }; - ucommon = callPackage ../development/libraries/ucommon { }; + ucommon = ucommon_openssl; + + ucommon_openssl = callPackage ../development/libraries/ucommon { + gnutls = null; + }; + + ucommon_gnutls = lowPrio (ucommon.override { + openssl = null; + zlib = null; + gnutls = gnutls; + }); v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (pythonPackages) gyp; @@ -7740,6 +7756,8 @@ let wildmidi = callPackage ../development/libraries/wildmidi { }; + wiredtiger = callPackage ../development/libraries/wiredtiger { }; + wvstreams = callPackage ../development/libraries/wvstreams { }; wxGTK = wxGTK28; @@ -8256,8 +8274,7 @@ let prosody = callPackage ../servers/xmpp/prosody { lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent; - withLibevent = true; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; }; elasticmq = callPackage ../servers/elasticmq { }; @@ -8456,20 +8473,15 @@ let seabios = callPackage ../applications/virtualization/seabios { }; - pgpool92 = callPackage ../servers/sql/pgpool/default.nix { - postgresql = postgresql92; - }; + pgpool92 = pgpool.override { postgresql = postgresql92; }; + pgpool93 = pgpool.override { postgresql = postgresql93; }; + pgpool94 = pgpool.override { postgresql = postgresql94; }; - pgpool93 = callPackage ../servers/sql/pgpool/default.nix { - postgresql = postgresql93; + pgpool = callPackage ../servers/sql/pgpool/default.nix { + pam = if stdenv.isLinux then pam else null; + libmemcached = null; # Detection is broken upstream }; - pgpool94 = callPackage ../servers/sql/pgpool/default.nix { - postgresql = postgresql94; - }; - - pgpool = pgpool92; - postgresql = postgresql92; postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { }; @@ -8743,7 +8755,7 @@ let perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared }; - apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { }; + apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { swig = swig2; }; libapparmor = apparmor_2_9.libapparmor; apparmor-pam = apparmor_2_9.apparmor-pam; apparmor-parser = apparmor_2_9.apparmor-parser; @@ -9234,7 +9246,7 @@ let }; # The current default kernel / kernel modules. - linuxPackages = linuxPackages_3_14; + linuxPackages = linuxPackages_3_18; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! @@ -9687,10 +9699,18 @@ let cacert = callPackage ../data/misc/cacert { }; + caladea = callPackage ../data/fonts/caladea {}; + cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { }; + carlito = callPackage ../data/fonts/carlito {}; + + comfortaa = callPackage ../data/fonts/comfortaa {}; + comic-neue = callPackage ../data/fonts/comic-neue { }; + comic-relief = callPackage ../data/fonts/comic-relief {}; + corefonts = callPackage ../data/fonts/corefonts { }; wrapFonts = paths : ((import ../data/fonts/fontWrap) { @@ -9702,6 +9722,8 @@ let cm_unicode = callPackage ../data/fonts/cm-unicode {}; + crimson = callPackage ../data/fonts/crimson {}; + dejavu_fonts = callPackage ../data/fonts/dejavu-fonts { inherit (perlPackages) FontTTF; }; @@ -9736,6 +9758,8 @@ let eb-garamond = callPackage ../data/fonts/eb-garamond { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; + fira = callPackage ../data/fonts/fira { }; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -9778,6 +9802,8 @@ let lmodern = callPackage ../data/fonts/lmodern { }; + lobster-two = callPackage ../data/fonts/lobster-two {}; + lohit-fonts = callPackage ../data/fonts/lohit-fonts { }; manpages = callPackage ../data/documentation/man-pages { }; @@ -9806,6 +9832,8 @@ let opensans-ttf = callPackage ../data/fonts/opensans-ttf { }; + pecita = callPackage ../data/fonts/pecita {}; + poly = callPackage ../data/fonts/poly { }; posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; @@ -9830,6 +9858,10 @@ let poppler_data = callPackage ../data/misc/poppler-data { }; + quattrocento = callPackage ../data/fonts/quattrocento {}; + + quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {}; + r3rs = callPackage ../data/documentation/rnrs/r3rs.nix { }; r4rs = callPackage ../data/documentation/rnrs/r4rs.nix { }; @@ -10117,6 +10149,8 @@ let enableNetworkManager = config.networking.networkmanager.enable or false; }; + clipgrab = callPackage ../applications/video/clipgrab { }; + clipit = callPackage ../applications/misc/clipit { }; bomi = callPackage ../applications/video/bomi { @@ -11112,11 +11146,7 @@ let links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { - inherit (gnome) libglade; - libexosip = libexosip_3; - libosip = libosip_3; - }; + linphone = callPackage ../applications/networking/instant-messengers/linphone rec { }; linuxsampler = callPackage ../applications/audio/linuxsampler { bison = bison2; @@ -11280,10 +11310,6 @@ let pulseSupport = config.pulseaudio or false; } // (config.mplayer or {})); - mplayer2 = callPackage ../applications/video/mplayer2 { - ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386 - }; - MPlayerPlugin = browser: callPackage ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { inherit browser; @@ -12796,6 +12822,8 @@ let }; simutrans = callPackage ../games/simutrans { }; + # get binaries without data built by Hydra + simutrans_binaries = lowPrio simutrans.binaries; soi = callPackage ../games/soi {}; @@ -12822,7 +12850,11 @@ let synthv1 = callPackage ../applications/audio/synthv1 { }; - tbe = callPackage ../games/the-butterfly-effect {}; + the-powder-toy = callPackage ../games/the-powder-toy { + lua = lua5_1; + }; + + tbe = callPackage ../games/the-butterfly-effect { }; teetertorture = callPackage ../games/teetertorture { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3cf2f60386f..a4f5310ab95 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -270,16 +270,32 @@ let self = _self // overrides; company = melpaBuild rec { pname = "company"; - version = "0.8.6"; + version = "0.8.12"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; rev = version; - sha256 = "1xwxyqg5dan8m1qkdxyzm066ryf24h07karpdlm3s09izfdny33f"; + sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0"; }; meta = { license = gpl3Plus; }; }; + company-ghc = melpaBuild rec { + pname = "company-ghc"; + version = "0.1.10"; + src = fetchFromGitHub { + owner = "iquiw"; + repo = "company-ghc"; + rev = "v${version}"; + sha256 = "0lzwmjf91fxhkknk4z9m2v6whk1fzpa7n1rspp61lwmyh5gakj3x"; + }; + packageRequires = [ company ghc-mod ]; + meta = { + description = "company-mode completion backend for haskell-mode via ghc-mod"; + license = gpl3Plus; + }; + }; + dash = melpaBuild rec { pname = "dash"; version = "2.9.0"; @@ -352,6 +368,38 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + evil-indent-textobject = melpaBuild rec { + pname = "evil-indent-textobject"; + version = "0.2"; + src = fetchFromGitHub { + owner = "cofi"; + repo = pname; + rev = "70a1154a531b7cfdbb9a31d6922482791e20a3a7"; + sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz"; + }; + packageRequires = [ evil ]; + meta = { + description = "Textobject for evil based on indentation"; + license = gpl2Plus; + }; + }; + + evil-leader = melpaBuild rec { + pname = "evil-leader"; + version = "0.4.3"; + src = fetchFromGitHub { + owner = "cofi"; + repo = pname; + rev = version; + sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5"; + }; + packageRequires = [ evil ]; + meta = { + description = " key for evil"; + license = gpl3Plus; + }; + }; + evil-surround = melpaBuild rec { pname = "evil-surround"; version = "20140616"; @@ -461,6 +509,21 @@ let self = _self // overrides; meta = { license = bsd3; }; }; + git-auto-commit-mode = melpaBuild rec { + pname = "git-auto-commit-mode"; + version = "4.4.0"; + src = fetchFromGitHub { + owner = "ryuslash"; + repo = pname; + rev = version; + sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh"; + }; + meta = { + description = "Automatically commit to git after each save"; + license = gpl3Plus; + }; + }; + git-commit-mode = melpaBuild rec { pname = "git-commit-mode"; version = "1.0.0"; @@ -487,6 +550,21 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + git-timemachine = melpaBuild rec { + pname = "git-timemachine"; + version = "2.3"; + src = fetchFromGitHub { + owner = "pidu"; + repo = pname; + rev = version; + sha256 = "1lm6rgbzbxnwfn48xr6bg05lb716grfr4nqm8lvjm64nabh5y9bh"; + }; + meta = { + description = "Step through historic revisions of git controlled files"; + license = gpl3Plus; + }; + }; + gitattributes-mode = melpaBuild rec { pname = "gitattributes-mode"; version = "1.0.0"; @@ -579,12 +657,12 @@ let self = _self // overrides; haskell-mode = melpaBuild rec { pname = "haskell-mode"; - version = "20150101"; + version = "13.12"; src = fetchFromGitHub { owner = "haskell"; repo = pname; - rev = "0db5efaaeb3b22e5a3fdafa600729e14c1716ee2"; - sha256 = "0d63cgzj579cr8zbrnl0inyy35b26sxinqxr7bgrjsngpmhm52an"; + rev = "v${version}"; + sha256 = "1l8sby2626hpp0li23mic3qq8w7jirsp1hd08hkx2z84gvz4j6fz"; }; meta = { license = gpl3Plus; }; }; @@ -627,6 +705,18 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + ibuffer-vc = melpaBuild rec { + pname = "ibuffer-vc"; + version = "0.10"; + src = fetchFromGitHub { + owner = "purcell"; + repo = pname; + rev = version; + sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8"; + }; + meta = { license = gpl3Plus; }; + }; + ido-ubiquitous = melpaBuild rec { pname = "ido-ubiquitous"; version = "2.17"; @@ -736,10 +826,10 @@ let self = _self // overrides; org-plus-contrib = melpaBuild rec { pname = "org-plus-contrib"; - version = "20141020"; + version = "20150406"; src = fetchurl { url = "http://orgmode.org/elpa/${pname}-${version}.tar"; - sha256 = "02njxmdbmias2f5psvwqc115dyakcwm2g381gfdv8qz4sqav0r77"; + sha256 = "1ny2myg4rm75ab2gl5rqrwy7h53q0vv18df8gk3zv13kljj76c6i"; }; buildPhase = '' cp $src ${pname}-${version}.tar @@ -807,6 +897,21 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + rainbow-delimiters = melpaBuild rec { + pname = "rainbow-delimiters"; + version = "2.1.1"; + src = fetchFromGitHub { + owner = "Fanael"; + repo = pname; + rev = version; + sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd"; + }; + meta = { + description = "Highlight delimiters with colors according to their depth"; + license = gpl3Plus; + }; + }; + request = melpaBuild rec { pname = "request"; version = "0.2.0"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ce75904418d..766ff90d5b7 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -7,7 +7,7 @@ { fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk, python, glib, gobjectIntrospection, libevent +, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib }: let @@ -205,6 +205,37 @@ let }; }; + luazlib = buildLuaPackage rec { + name = "zlib-${version}"; + version = "0.4"; + + src = fetchurl { + url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz"; + sha256 = "1l32nwyh8b4vicxvlhbv9qhkhklbhvjfn8wd72bjk7ac9kz172rd"; + }; + + buildInputs = [ zlib ]; + + preBuild = '' + makeFlagsArray=( + linux + LUAPATH="$out/share/lua/${lua.luaversion}" + LUACPATH="$out/lib/lua/${lua.luaversion}" + INCDIR="-I${lua}/include" + LIBDIR="-L$out/lib"); + ''; + + preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}"; + + meta = with stdenv.lib; { + homepage = https://github.com/brimworks/lua-zlib; + hydraPlatforms = platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.koral ]; + }; + }; + + luastdlib = buildLuaPackage { name = "stdlib"; src = fetchurl { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f49c7ecb993..d97d6e182e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10042,6 +10042,18 @@ let self = _self // overrides; _self = with self; { }; }; + threads = buildPerlPackage { + name = "threads-2.01"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-2.01.tar.gz; + sha256 = "429fea88757e0a347dac2cf9e414dfe8f06c8ca3c5445f6da4a95c2f883b6399"; + }; + meta = { + description = "Perl interpreter-based threads"; + license = "perl"; + }; + }; + Throwable = buildPerlPackage rec { name = "Throwable-0.200010"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ae641af660..1d3d0d179af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -37,7 +37,6 @@ let inherit (pkgs) stdenv fetchurl; self = pythonPackages; } -# Python packages for all python versions // { inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName buildPythonPackage; @@ -661,20 +660,21 @@ let })); azure = buildPythonPackage rec { - version = "0.9.0"; + version = "0.10.0"; name = "azure-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/azure/${name}.zip"; - md5 = "9616767cf45c1c00794624e2a0889f23"; + md5 = "305b0036df5696d68369807835f554ae"; }; - propagatedBuildInputs = with self; [ dateutil ]; + propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; meta = with stdenv.lib; { description = "Microsoft Azure SDK for Python"; homepage = "http://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; + maintainers = [ maintainers.olcai ]; }; }; @@ -746,11 +746,11 @@ let }; bcdoc = buildPythonPackage rec { - name = "bcdoc-0.12.1"; + name = "bcdoc-0.13.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.12.1.tar.gz"; - md5 = "7c8617347c294ea4d36ec73fb5b2c26e"; + url = "https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.13.0.tar.gz"; + md5 = "819882458be7b642e00ddc9846073d89"; }; buildInputs = with self; [ self.docutils self.six ]; @@ -1200,12 +1200,12 @@ let }; botocore = buildPythonPackage rec { - version = "0.81.0"; + version = "0.102.0"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "0mdkkk0038ng6557cw5520xy624sqgv0avjx387bc3fbgxi8bksj"; + sha256 = "1266hwkcchzr9r2z1q1150zmk20p3d4a75p6nppi6w9bhsywxhnr"; }; propagatedBuildInputs = @@ -1752,14 +1752,14 @@ let colander = buildPythonPackage rec { - name = "colander-1.0b1"; + name = "colander-1.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz"; - md5 = "89f2cf4b5c87d43f7917d6a0d4872e6a"; + md5 = "058576123da7216288c079c9f47693f8"; }; - propagatedBuildInputs = with self; [ self.translationstring ]; + propagatedBuildInputs = with self; [ self.translationstring self.iso8601 ]; meta = { maintainers = [ @@ -5881,11 +5881,11 @@ let jmespath = buildPythonPackage rec { - name = "jmespath-0.5.0"; + name = "jmespath-0.6.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jmespath/${name}.tar.gz"; - sha256 = "1hiqqaz1a9qv1j8n02r9c2c010krr0ar2sf35j2z2kci7ywky963"; + sha256 = "1f7nxk62yifh6zwhf34w4fgwxvyls8x2daphljgrg4lh0i2sgwgr"; }; propagatedBuildInputs = with self; [ ply ]; @@ -10983,19 +10983,19 @@ let sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; - version = "1.4.2"; + version = "2.3.1"; disabled = isPy3k; configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile"; src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; - sha256 = "f6e6de7ab5f20e8ae08966b8811462e4271833db4f7fbab58ffba4e5c07ab114"; + sha256 = "1n3g1zg3zgdybikdla0qdqvpa06vn1ka2asr61lb8kk6xbvqkljv"; }; - propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib]; + propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ]; - buildInputs = with self; [ pkgs.alsaLib ]; + buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite ]; installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out"; @@ -14349,14 +14349,9 @@ let }; }; - -# python2.7 specific packages -} // optionalAttrs isPy27 ( - with self; - -{ boto-230 = buildPythonPackage rec { name = "boto-2.30.0"; + disabled = ! isPy27; src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/b/boto/boto-2.30.0.tar.gz; sha256 = "12gl8azmx1vv8dbv9jhnsbhjpc2dd1ng0jlbcg734k6ggwq1h6hh"; @@ -14371,6 +14366,7 @@ let gcs-oauth2-boto-plugin = buildPythonPackage rec { name = "gcs-oauth2-boto-plugin-1.8"; + disabled = ! isPy27; src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz; sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb"; @@ -14385,6 +14381,7 @@ let gsutil = buildPythonPackage rec { name = "gsutil-4.6"; + disabled = ! isPy27; meta = { homepage = https://developers.google.com/storage/docs/gsutil; description = "Google Cloud Storage Tool"; @@ -14405,6 +14402,7 @@ let pypi2nix = self.buildPythonPackage rec { rev = "04a68d8577acbceb88bdf51b1231a9dbdead7003"; name = "pypi2nix-1.0_${rev}"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; @@ -14423,6 +14421,7 @@ let svg2tikz = self.buildPythonPackage { name = "svg2tikz-1.0.0"; + disabled = ! isPy27; propagatedBuildInputs = with self; [lxml]; @@ -14443,6 +14442,7 @@ let syncserver = buildPythonPackage rec { name = "syncserver-${version}"; version = "1.5.0"; + disabled = ! isPy27; src = pkgs.fetchgit { url = https://github.com/mozilla-services/syncserver.git; @@ -14465,6 +14465,7 @@ let serversyncstorage = buildPythonPackage rec { name = "serversyncstorage-${version}"; version = "1.5.11"; + disabled = ! isPy27; src = pkgs.fetchgit { url = https://github.com/mozilla-services/server-syncstorage.git; rev = "refs/tags/${version}"; @@ -14482,6 +14483,7 @@ let thumbor = self.buildPythonPackage rec { name = "thumbor-4.0.4"; + disabled = ! isPy27; propagatedBuildInputs = with self; [ tornado @@ -14513,6 +14515,7 @@ let thumborPexif = self.buildPythonPackage rec { name = "thumbor-pexif-0.14"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/thumbor-pexif/${name}.tar.gz"; @@ -14530,6 +14533,7 @@ let version = "1.4"; baseName = "pync"; name = "${baseName}-${version}"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/${baseName}/${name}.tar.gz"; @@ -14555,6 +14559,7 @@ let weboob = buildPythonPackage rec { name = "weboob-1.0"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://symlink.me/attachments/download/289/${name}.tar.gz"; @@ -14575,6 +14580,7 @@ let datadiff = buildPythonPackage rec { name = "datadiff-1.1.6"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/datadiff/datadiff-1.1.6.zip"; @@ -14592,6 +14598,7 @@ let termcolor = buildPythonPackage rec { name = "termcolor-1.1.0"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/termcolor/termcolor-1.1.0.tar.gz"; @@ -14607,6 +14614,7 @@ let html2text = buildPythonPackage rec { name = "html2text-2014.12.29"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/html2text/html2text-2014.12.29.tar.gz"; @@ -14622,6 +14630,7 @@ let pychart = buildPythonPackage rec { name = "pychart-1.39"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "http://download.gna.org/pychart/PyChart-1.39.tar.gz"; @@ -14637,6 +14646,7 @@ let parsimonious = buildPythonPackage rec { name = "parsimonious-0.6.0"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://github.com/erikrose/parsimonious/archive/0.6.tar.gz"; sha256 = "7ad992448b69a3f3d943bac0be132bced3f13937c8ca150ba2fd1d7b6534f846"; @@ -14653,6 +14663,7 @@ let networkx = buildPythonPackage rec { name = "networkx-1.9.1"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/networkx/networkx-1.9.1.tar.gz"; @@ -14670,6 +14681,7 @@ let basemap = buildPythonPackage rec { name = "basemap-1.0.7"; + disabled = ! isPy27; src = pkgs.fetchurl { url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; @@ -14704,5 +14716,21 @@ let licences = [ licenses.mit licenses.gpl2 ]; }; }; + + dicttoxml = buildPythonPackage rec { + name = "dicttoxml-1.6.4"; -}); in pythonPackages + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dicttoxml/dicttoxml-1.6.4.tar.gz"; + md5 = "154b47d2b7405280b871a81502a05657"; + }; + + propagatedBuildInputs = with self; [ ]; + + meta = with stdenv.lib; { + description = "Summary"; + homepage = https://github.com/quandyfactory/dicttoxml; + }; + }; + +}; in pythonPackages