diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
| commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
| tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 | |
| parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
| parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
| download | nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.gz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.bz2 nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.lz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.xz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.zst nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.zip | |
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
395 files changed, 5523 insertions, 3224 deletions
diff --git a/lib/meta.nix b/lib/meta.nix index a5afce9e0cb..74e9cfb411c 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -1,6 +1,9 @@ /* Some functions for manipulating meta attributes, as well as the name attribute. */ +let lib = import ./default.nix; +in + rec { @@ -35,14 +38,30 @@ rec { appendToName = suffix: updateName (name: "${name}-${suffix}"); + /* Apply a function to each derivation and only to derivations in an attrset + */ + mapDerivationAttrset = f: set: lib.mapAttrs (name: pkg: if lib.isDerivation pkg then (f pkg) else pkg) set; + + /* Decrease the nix-env priority of the package, i.e., other versions/variants of the package will be preferred. */ lowPrio = drv: addMetaAttrs { priority = "10"; } drv; + + /* Apply lowPrio to an attrset with derivations + */ + lowPrioSet = set: mapDerivationAttrset lowPrio set; + + /* Increase the nix-env priority of the package, i.e., this version/variant of the package will be preferred. */ hiPrio = drv: addMetaAttrs { priority = "-10"; } drv; + + + /* Apply hiPrio to an attrset with derivations + */ + hiPrioSet = set: mapDerivationAttrset hiPrio set; } diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 75950f55a27..8a01c217eb5 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -68,6 +68,8 @@ in preStart = '' + PATH="$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin"; + # Initialise state data mkdir -p ${cfg.logsDir} diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index e31d77f13fe..73fcb1eeea8 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -55,11 +55,6 @@ in config = mkIf cfg.enable { - # Running minidlna only makes sense for serving files to the - # outside, so open up the required ports by default. - networking.firewall.allowedTCPPorts = [ port ]; - networking.firewall.allowedUDPPorts = [ 1900 ]; # SSDP - services.minidlna.config = '' port=${toString port} diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 56ae399c901..1be3587c3bb 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -223,9 +223,6 @@ in </Policy> ''; - # Allow CUPS to receive IPP printer announcements via UDP. - networking.firewall.allowedUDPPorts = [ 631 ]; - security.pam.services.cups = {}; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index f1b5b675161..423087991e1 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -72,11 +72,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.20.7"; + name= "mediawiki-1.20.8"; src = pkgs.fetchurl { url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz"; - sha256 = "0cdl2mq3nw1jymanlxn7pi3qbf5y5003q53kmc8dip73nvrwnfxm"; + sha256 = "0yfmh5vnfbgpvicfqh7nh4hwdk4qbc6gfniv02vchkg5al0nn7ag"; }; skins = config.skins; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index d20010c70a6..f06544fecc7 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -72,7 +72,8 @@ in pkgs.xfce.thunar_volman pkgs.xfce.gvfs pkgs.xfce.xfce4_appfinder - pkgs.xfce.tumbler + pkgs.xfce.tumbler # found via dbus + pkgs.xfce.xfce4notifyd # found via dbus ] ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager; diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 72ecb8fe2fd..bf9c3435503 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -42,8 +42,6 @@ in Xaccess=${pkgs.writeText "Xaccess" "localhost"} ''; - networking.firewall.allowedTCPPorts = [ 5900 ]; - systemd.sockets.terminal-server = { description = "Terminal Server Socket"; wantedBy = [ "sockets.target" ]; diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 2cbb5002d6c..87eff38a028 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -1,10 +1,14 @@ {pkgs, config, ...}: let - inherit (pkgs.lib) mkOption mkIf; + inherit (pkgs.lib) mkOption mkIf optionals literalExample; cfg = config.services.xserver.windowManager.xmonad; + xmonadEnv = cfg.haskellPackages.ghcWithPackages(self: [ + self.xmonad + ] ++ optionals cfg.enableContribAndExtras [ self.xmonadContrib self.xmonadExtras] + ++ optionals (cfg.extraPackages != null) (cfg.extraPackages self)); + xmessage = pkgs.xlibs.xmessage; in - { options = { services.xserver.windowManager.xmonad = { @@ -13,18 +17,53 @@ in example = true; description = "Enable the xmonad window manager."; }; + + haskellPackages = mkOption { + default = pkgs.haskellPackages; + defaultText = "pkgs.haskellPackages"; + example = literalExample "pkgs.haskellPackages_ghc701"; + description = '' + haskellPackages used to build Xmonad and other packages. + This can be used to change the GHC version used to build + Xmonad and the packages listed in + <varname>extraPackages</varname>. + ''; + }; + + extraPackages = mkOption { + default = null; + example = literalExample '' + haskellPackages: [ + haskellPackages.xmonadContrib + haskellPackages.monadLogger + ] + ''; + description = '' + Extra packages available to ghc when rebuilding Xmonad. The + value must be a function which receives the attrset defined + in <varname>haskellpackages</varname> as the sole argument. + ''; + }; + + enableContribAndExtras = mkOption { + default = false; + example = true; + type = pkgs.lib.types.bool; + description = "Enable xmonad-{contrib,extras} in Xmonad."; + }; }; }; - - config = { + config = mkIf cfg.enable { services.xserver.windowManager = { - session = mkIf cfg.enable [{ + session = [{ name = "xmonad"; - start = " - ${pkgs.haskellPackages.xmonad}/bin/xmonad & + start = '' + XMONAD_GHC=${xmonadEnv}/bin/ghc XMONAD_XMESSAGE=${xmessage}/bin/xmessage xmonad & waitPID=$! - "; + ''; }]; }; + + environment.systemPackages = [ cfg.haskellPackages.xmonad ]; }; } diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ee2f5e9b4f6..2b075bf6a6d 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -199,7 +199,7 @@ in "unix" # Misc. stuff. - "pcips2" "xtkbd" + "pcips2" "atkbd" # To wait for SCSI devices to appear. "scsi_wait_scan" diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 34e98ae620d..19c590330f6 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation { - name = "csound-5.18.02"; + name = "csound-5.19.01"; enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/csound/Csound5.18.02.tar.gz; - sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8"; + url = mirror://sourceforge/csound/Csound5.19.01.tar.gz; + sha256 = "078i69jwgadmxwa5ffn8h1py7cmd9asa8swnh38fyp56lzgzn669"; }; buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 10a2f0dcee9..728155c02bd 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib -, gtk, curl, mpd_clientlib, libsoup, gob2, vala +, gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique }: stdenv.mkDerivation rec { @@ -15,22 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib ]; }; - libunique = stdenv.mkDerivation { - name = "libunique-1.1.6"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.6.tar.gz; - sha256 = "2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea"; - }; - buildInputs = [ pkgconfig glib gtk ]; - - patches = [ - (fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/remove_G_CONST_RETURN.patch?h=packages/libunique"; - sha256 = "0da2qi7cyyax4rr1p25drlhk360h8d3lapgypi5w95wj9k6bykhr"; - }) - ]; - }; - src = fetchurl { url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz"; sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 97c39982a65..98fcb8943af 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jackaudio, pkgconfig }: stdenv.mkDerivation rec { - name = "jackmeter-0.3"; + name = "jackmeter-0.4"; src = fetchurl { url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz"; - sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp"; + sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; buildInputs = [ jackaudio pkgconfig ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 8f8fadb02e4..a8287b10a29 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mhwaveedit-${version}"; - version = "1.4.21"; + version = "1.4.23"; src = fetchurl { url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2"; - sha256 = "0jl7gvhwsz4fcn5d146h4m6i3hlxdsw4mmj280cv9g70p6zqi1w7"; + sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3"; }; buildInputs = diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index a543aa32eea..791763ced36 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}: +{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}: stdenv.mkDerivation rec { - name = "opus-tools-0.1.6"; + name = "opus-tools-0.1.8"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc"; + sha256 = "1xm2lhdz92n9zmk496lyagisyzja46kx8q340vay9i51krbqiqg4"; }; - buildInputs = [ libogg libao pkgconfig libopus ]; + buildInputs = [ libogg libao pkgconfig libopus flac ]; meta = { description = "Tools to work with opus encoded audio streams"; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix new file mode 100644 index 00000000000..50df35b974f --- /dev/null +++ b/pkgs/applications/audio/opusfile/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}: + +stdenv.mkDerivation rec { + name = "opusfile-0.4"; + src = fetchurl { + url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; + sha256 = "0h4iwyqgid0cibqwzckz3r94qfp09099nk1cx5nz6i3cf08yldlq"; + }; + + buildInputs = [ pkgconfig openssl libogg libopus ]; + + meta = { + description = "High-level API for decoding and seeking in .opus files"; + homepage = http://www.opus-codec.org/; + license = "BSD"; + }; +} diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index e70d51ce857..1531fd87b95 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }: stdenv.mkDerivation rec { - version = "0.3.9"; + version = "0.3.10"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y"; + sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw"; }; buildInputs = [ qt4 alsaLib jackaudio dbus ]; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 584b23b6a01..e2d7adc4a65 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.3.2"; + version = "0.3.5"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1j6q3ywbdsyhskc60p7k8ph058ylrrmjmri3q1wr2d2akcaqvb7m"; + sha256 = "1q4ggcbbz9lfrjh0ybr3grgipjkq6w5fb9gz5k5cryzz92p7ihw9"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 18e263dae67..c558b483e97 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo -, withX ? true +, withX ? !stdenv.isDarwin }: assert (libXft != null) -> libpng != null; # probably a bug diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix index a5b9cc184f3..46e20a58ee6 100644 --- a/pkgs/applications/editors/emacs-modes/ess/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Emacs Speaks Statistics"; homepage = "http://ess.r-project.org/"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix new file mode 100644 index 00000000000..74dbaf78dac --- /dev/null +++ b/pkgs/applications/editors/idea/default.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk +, coreutils, gnugrep, which, git +}: + +let + + buildIdea = + { name, src, description, license }: + + stdenv.mkDerivation rec { + inherit name src license; + ideaItem = makeDesktopItem { + name = "IDEA"; + exec = "idea"; + comment = "Integrated Development Environment"; + desktopName = "IntelliJ IDEA"; + genericName = "Integrated Development Environment"; + categories = "Application;Development;"; + }; + + buildInputs = [ makeWrapper patchelf p7zip ]; + + buildCommand = '' + tar xvzf $src + mkdir -p $out + cp -a $name $out + + interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + + 7z x $out/$name/lib/snappy-java-1.0.5.jar + rm $out/$name/lib/snappy-java-1.0.5.jar + if [ "${stdenv.system}" == "x86_64-linux" ];then + patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier64 + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so + else + patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier + patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so + fi + 7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar . + + mkdir -p $out/bin + makeWrapper $out/$name/bin/idea.sh $out/bin/idea \ + --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \ + --prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \ + --prefix JDK_HOME : ${jdk} \ + --prefix IDEA_JDK : ${jdk} + + mkdir -p $out/share/applications + cp ${ideaItem}/share/applications/* $out/share/applications + patchShebangs $out + ''; + + meta = { + homepage = http://www.jetbrains.com/idea/; + inherit description; + inherit license; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + platforms = stdenv.lib.platforms.linux; + }; + }; + +in { + + idea_community_1301 = buildIdea { + name = "idea-IC-133.331"; + description = "IntelliJ IDEA 13 Community Edition"; + license = stdenv.lib.licenses.asl20.shortName; + src = fetchurl { + url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.1.tar.gz; + sha256 = "6f268bb1dbe61ed0274fd2ea9b4b7403f50da11bdde208bcfc8c391d235d7c02"; + }; + }; + + idea_ultimate_1301 = buildIdea { + name = "idea-IU-133.331"; + description = "IntelliJ IDEA 13 Ultimate Edition"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.1.tar.gz; + sha256 = "d3638d97b719773459d5027ba096b52695325b241cbf5e31e535165a5f19849d"; + }; + }; + + idea_community_13 = buildIdea { + name = "idea-IC-133.193"; + description = "IntelliJ IDEA 13 Community Edition"; + license = stdenv.lib.licenses.asl20.shortName; + src = fetchurl { + url = http://download-ln.jetbrains.com/idea/ideaIC-13.tar.gz; + sha256 = "5cd88b8effc5e4e55d999df1cec6f54c53b5adf0b88e49400b3a185bef7db13a"; + }; + }; + + idea_ultimate_13 = buildIdea { + name = "idea-IU-133.193"; + description = "IntelliJ IDEA 13 Ultimate Edition"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = http://download-ln.jetbrains.com/idea/ideaIU-13.tar.gz; + sha256 = "211a782654d04f2fe5fce9084043edfb8355a7bc4dc41fee7dc79cfe604d4654"; + }; + }; + +} diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index a3d6eca4fa6..66a7f334dbd 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,14 +18,14 @@ }: let - version = "6.8.7-5"; + version = "6.8.7-6"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "1cn1kg7scs6r7r00qlqirhnmqjnmyczbidab3vgqarw9qszh2ri6"; + sha256 = "0cbfhk184kxdxz5czyyqxac29mbfiahygjji6k97z6hp8ngnqlvh"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 8d88e570f27..41a4b102a6f 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -5,11 +5,11 @@ mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : stdenv.mkDerivation rec { - name = "cinepaint-1.0"; + name = "cinepaint-1.1"; src = fetchurl { url = "mirror://sourceforge/cinepaint/${name}.tgz"; - sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7"; + sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w"; }; buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index d6b005e8e3d..af7d9e3399b 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: stdenv.mkDerivation rec { - name = "gimp-2.8.8"; + name = "gimp-2.8.10"; src = fetchurl { url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - md5 = "ef2547c3514a1096931637bd6250635a"; + sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7"; }; buildInputs = diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index f8160e4d688..8748c808dc0 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "196iq15waa2yyryiwhf6ynlpqnpknm4cc4azakg01xs70yiphsfl"; + sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6"; }; - buildInputs = [ + buildInputs = [ boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip ]; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 32b39c0160d..7b1ffb1f2be 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -6,11 +6,11 @@ assert gimpSupport -> gimp_2_8 != null; stdenv.mkDerivation rec { - name = "xsane-0.998"; + name = "xsane-0.999"; src = fetchurl { url = "http://www.xsane.org/download/${name}.tar.gz"; - sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3"; + sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; }; preConfigure = '' diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 6ec1c5fafdc..070244d67d2 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib -, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }: +, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }: stdenv.mkDerivation rec { - name = "ufraw-0.18"; + name = "ufraw-0.19.2"; src = fetchurl { # XXX: These guys appear to mutate uploaded tarballs! url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "01cjdc748vamjpaw2sbm8a9kwmb2hry4f200j3hlvqg9c6f77zi4"; + sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; }; buildInputs = [ pkgconfig gtk gtkimageview gettext bzip2 zlib - libjpeg libtiff cfitsio exiv2 lcms + libjpeg libtiff cfitsio exiv2 lcms lensfun ]; meta = { diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 36366d6ee72..cdaeb49f14c 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}: +{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}: stdenv.mkDerivation rec { - version = "2.9.1"; + version = "2.9.2"; name = "bibletime-${version}"; src = fetchurl { url = "mirror://sourceforge/bibletime/${name}.tar.bz2"; - sha256 = "1d8kh213rpx4d63sxl5mk1s94xv363l5prrq2kh06cpnl7a8d2ih"; + sha256 = "1j4kc24qvhqlbqspczmkxvw09mnvgg9m4zs1y9f68505kd0pfg1r"; }; prePatch = '' @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - export CLUCENE_HOME=${cluceneCore}; + export CLUCENE_HOME=${clucene_core}; export SWORD_HOME=${sword}; ''; - buildInputs = [ cmake sword qt4 boost cluceneCore ]; + buildInputs = [ cmake sword qt4 boost clucene_core ]; cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index a6a289168c4..9e20be0dcbc 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "0.8.6"; name = "bitcoin-${version}"; src = fetchurl { url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz"; - sha256 = "0qqzwx1lihlrj7r08alsyznjfqvwncfm0nnxi1pcx0jyvq83ym44"; + sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk"; }; buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6c007aadd32..67031e20722 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.14.0"; + name = "calibre-1.15.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1nwrahh8rkllazwjgwv1a5fxcg0x221760ixm3707ikz33i0qvx6"; + sha256 = "0kisdrvsbdpfkirg0p8ifzcm7fjidx74xsw4bdb96gry2wmpjwf7"; }; inherit python; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 6ceca2ea871..24edc0e128a 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, db45, gtk, bzip2 }: +{ stdenv, fetchurl, db4, gtk, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; - # Debian sources + # Debian sources src = fetchurl { url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz; sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; @@ -13,12 +13,12 @@ stdenv.mkDerivation { url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz; sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; }; - - buildInputs = [ db45 gtk bzip2 ]; + + buildInputs = [ db4 gtk bzip2 ]; configureFlags = "--without-libdb"; - meta = { + meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = http://atterer.net/jigdo/; license = "GPLv2"; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 078ea7fcbd8..92cd0de8b31 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi -, libtool }: +, libtool, makeWrapper }: stdenv.mkDerivation rec { - name = "nut-2.6.5"; + name = "nut-2.7.1"; src = fetchurl { - url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz"; - sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1"; + url = "http://www.networkupstools.org/source/2.7/${name}.tar.gz"; + sha256 = "1667n9h8jcz7k6h24fn615khqahlq5z22zxs4s0q046rsqxdg9ki"; }; buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; configureFlags = [ "--with-all" @@ -21,10 +21,17 @@ stdenv.mkDerivation rec { "--without-cgi" "--without-hal" "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" + "--with-udev-dir=$(out)/etc/udev" ]; enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ + "$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib" + ''; + meta = { description = "Network UPS Tools"; longDescription = '' @@ -33,6 +40,7 @@ stdenv.mkDerivation rec { It uses a layered approach to connect all of the parts. ''; homepage = http://www.networkupstools.org/; + repositories.git = https://github.com/networkupstools/nut.git; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pierron ]; priority = 10; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index aed55c67c10..c6bfa07cb88 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wxGTK, chmlib}: stdenv.mkDerivation { - name = "xchm-1.18"; + name = "xchm-1.23"; src = fetchurl { - url = mirror://sourceforge/xchm/xchm-1.18.tar.gz; - sha256 = "1wvvyzqbmj3c6i46x4vpxkawjwmmp276r84ifvlzaj5q4b52g5gw"; + url = mirror://sourceforge/xchm/xchm-1.23.tar.gz; + sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg"; }; buildInputs = [wxGTK chmlib]; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index b159dd282e2..215ea75105f 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -4,11 +4,11 @@ {stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: stdenv.mkDerivation rec { - name = "xfontsel-1.0.2"; + name = "xfontsel-1.0.5"; src = fetchurl { url = "mirror://xorg/individual/app/${name}.tar.bz2"; - sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks"; + sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p"; }; buildInputs = [libX11 makeWrapper pkgconfig libXaw]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index ef2d846dd2e..1d050182da3 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-281"; + name = "xterm-300"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "1yrjjya7z5s3fi0iiaxgna35jh0ib2zx1yafyng35jma6qbwhxx7"; + sha256 = "1k8p7q4d1gpk6zikb8hys8b30yq2v001nlp3r9g40my31ij9al31"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index b44a39d87aa..fc84f7fcecc 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20130817-1"; + name = "conkeror-1.0pre-20131116-1"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "refs/tags/debian-1.0--pre+git130817-1"; - sha256 = "aef3c782ac98c031e7b99852f42538e225e151cd226cde3094823a5cae015fcf"; + rev = "refs/tags/debian-1.0--pre+git131116-1"; + sha256 = "6fe0f30487c5bb8f2183dc7c2e15cf29df7cc8b1950b5fc15c26510c74a1f7d3"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 49c1e5951b6..27363482be0 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base +, cairo, gstreamer, gst_plugins_base, icu , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -33,11 +33,7 @@ rec { }; commonConfigureFlags = - [ "--enable-optimize" - #"--enable-profiling" - (if debugBuild then "--enable-debug" else "--disable-debug") - "--enable-strip" - "--with-system-jpeg" + [ "--with-system-jpeg" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" @@ -45,18 +41,24 @@ rec { "--with-system-libevent" "--with-system-libvpx" "--with-system-png" - "--enable-startup-notification" + "--with-system-icu" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" "--enable-system-cairo" + "--enable-gstreamer" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-installer" "--disable-updater" - ]; + ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--enable-optimize" "--enable-strip" ]); xulrunner = stdenv.mkDerivation rec { @@ -72,7 +74,7 @@ rec { xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base + gstreamer gst_plugins_base icu ]; configureFlags = @@ -138,7 +140,7 @@ rec { dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip pysqlite hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base + gstreamer gst_plugins_base icu ]; patches = [ diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index e39e377147a..b2ca7c42e76 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,51 +1,37 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - doPatchShebangs = args.doPatchShebangs; - makeManyWrappers = args.makeManyWrappers; +{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper +, gtk3, webkitgtk, librsvg, libnotify +, glib_networking, gsettings_desktop_schemas +}: - version = "0.4"; - release = "4"; - buildInputs = with args; [ - intltool python imagemagick gtk3 glib webkit libxml2 - gtksourceview pkgconfig which gettext makeWrapper - file libidn sqlite docutils libnotify libsoup vala - kbproto xproto scrnsaverproto libXScrnSaver dbus_glib - glib_networking - ]; -in -rec { - src = fetchurl { - url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2"; - sha256 = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2"; +stdenv.mkDerivation rec { + name = "midori-0.5.6"; + + meta = { + description = "Lightweight WebKitGTK+ web browser"; + homepage = "http://www.midori-browser.org"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ]; }; - inherit buildInputs; - configureFlags = ["--enable-gtk3"]; + src = fetchurl { + url = "${meta.homepage}/downloads/midori_0.5.6_all_.tar.bz2"; + sha256 = "0jpj8cw0dzamzylzslayamjhv0is0xd99dyaql4nyxrkk5fipgn5"; + }; - /* doConfigure should be specified separately */ - phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure" - "doMakeInstall" "shebangsInstalled" "wrapWK" - ]; + buildInputs = [ + cmake pkgconfig intltool vala makeWrapper + webkitgtk librsvg libnotify + ]; - setVars = args.fullDepEntry '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify" - '' []; - - shebangsHere = (doPatchShebangs "."); - shebangsInstalled = (doPatchShebangs "$out/bin"); - wrapWK = (makeManyWrappers "$out/bin/*" - '' - --set WEBKIT_IGNORE_SSL_ERRORS 1 \ - --prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules" - ''); + cmakeFlags = '' + -DHALF_BRO_INCOM_WEBKIT2=ON + -DUSE_ZEITGEIST=OFF + ''; - name = "midori-${version}.${release}"; - meta = { - description = "Light WebKit-based web browser with GTK GUI"; - maintainers = [args.lib.maintainers.raskin]; - platforms = with args.lib.platforms; - linux; - }; + postInstall = '' + wrapProgram $out/bin/midori \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gsettings_desktop_schemas}/share" + ''; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 7422654ec98..66bd28424c0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk3, gettext, intltool }: +{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }: let version = "1.0.2"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "d7cd9adf04fedf50b266a5c14ddb427cbb263d3bc160ee0ade03aca9d5356e5c"; }; - buildInputs = [ pkgconfig openssl libX11 gtk3 glib gettext intltool ]; + buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ]; patches = [ ./translation-xgettext-to-intltool.patch ./plugin-linkfix.patch diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index c8542ad7a52..3deabd42e01 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -3,11 +3,11 @@ assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 stdenv.mkDerivation rec { - name = "rekonq-1.70"; # >=1.80 need kde >=4.9.0 + name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0 src = fetchurl { url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; - sha256 = "05zqm329vajsn32l5b5nlbw92gl3irdcx8kifr4y921i9bkzigad"; + sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g"; }; buildInputs = [ kde4.kdelibs qca2 qoauth ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 2e1b745790a..a63468a9ee7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pidgin} : stdenv.mkDerivation { - name = "pidgin-msn-pecan-0.1.0"; + name = "pidgin-msn-pecan-0.1.4"; src = fetchurl { - url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.0.tar.bz2; - sha256 = "06cgkdlv2brv2g5hpx8g8p6j296cnvd29l8fap30i1k0mznbjxf4"; + url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2; + sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2"; }; meta = { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index b2fd13837d7..ffc29a52aa1 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "telepathy-haze"; - name = "${pname}-0.7.0"; + name = "${pname}-0.8.0"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1gaj8518ilm3gnzqf3lmiqgnwkay8wfbsqngcz15whzji8sl608b"; + sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 97683ff56de..5d44f97a1be 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }: stdenv.mkDerivation rec { - name = "${pname}-5.14.1"; + name = "${pname}-5.16.0"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb"; + sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd"; }; buildInputs = [ telepathy_glib ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index a60e207b752..538a8d7f6d2 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "telepathy-rakia"; - name = "${pname}-0.7.4"; + name = "${pname}-0.8.0"; src = fetchurl { url = "${meta.homepage}/releases/${pname}/${name}.tar.gz"; - sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf"; + sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv"; }; nativeBuildInputs = [pkgconfigUpstream libxslt python]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 4300ac15c99..b1341af7a9d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "telepathy-salut"; - name = "${pname}-0.8.0"; + name = "${pname}-0.8.1"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1kmmpwjbfph37bjvpkfphff8dzhr896i55knf311f778fbsgl17m"; + sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 63f18ee7dc4..ad8b677a2ec 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -12,11 +12,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="1.2.0"; + version="1.2.3"; baseName="vacuum-im"; name="${baseName}-${version}"; url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz"; - hash="55a2c27aaaf79c7a4de127c22d3845ede35970283d35ee57fd5ceca581b085fc"; + hash="037k2b2kkp2ywkrshqa0fj18mkd2jq60x4x62kzbrsvb85qcbbxh"; }; in rec { diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix index 15b1c6c6b4e..e49e2c6fe26 100644 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -5,14 +5,14 @@ , unrar, p7zip, par2cmdline, coreutils }: -let version = "0.8.1"; +let version = "0.8.4"; name = "kwooty-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/kwooty/${name}.tar.gz"; - sha256 = "746ed50ec3c067711932c89dc3ee5527c126f37c6922b3eda49535eb83c245e4"; + sha256 = "0i3zmh7y52n5k0yn3xc6zjpjz75f48nly40n394i6sxy89psgfc2"; }; patches = [ ./searchPath.patch ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 7e5fdc6ccd3..a5ca5e7b488 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison -, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip -, heimdal, python, lynx, lua5 -, makeDesktopItem +{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares, gnutls, libgcrypt +, geoip, heimdal, lua5, gtk, makeDesktopItem }: -let version = "1.8.11"; in +let version = "1.10.3"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "1nwgizs9z1dalicpp2fd9pqafidy49j0v3d1rml0spfqrkbjpfpw"; + sha256 = "1329zph63z5mcij9lp111bh6b2w88z3d40gvjld2rjmhmqv1nr61"; }; buildInputs = - [ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt - glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5 - ]; + [ bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls geoip libnl c-ares gtk ]; - configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor"; + configureFlags = "--disable-usr-local --enable-packet-editor --with-ssl"; desktopItem = makeDesktopItem { name = "Wireshark"; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 1bdc41d1fb5..0108f934693 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl -, bzip2, glib, goffice, gtk3, intltool, libglade, libgsf, libxml2 -, pango, pkgconfig, scrollkeeper, zlib +{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser +, goffice, makeWrapper, gtk3, gnome_icon_theme }: stdenv.mkDerivation rec { - name = "gnumeric-1.12.0"; + name = "gnumeric-1.12.9"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"; + sha256 = "1rv2ifw6rp0iza4fkf3bffvdkyi77dwvzdnvcbpqcyn2kxfsvlsc"; }; + preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs + configureFlags = "--disable-component"; + # ToDo: optional libgda, python, introspection? buildInputs = [ - bzip2 glib goffice gtk3 intltool libglade libgsf libxml2 - pango pkgconfig scrollkeeper zlib + pkgconfig intltool perl perlXMLParser + goffice gtk3 makeWrapper ]; - meta = { + postInstall = '' + wrapProgram "$out"/bin/gnumeric-* \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome_icon_theme}/share" + ''; + + meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; license = "GPLv2+"; homepage = http://projects.gnome.org/gnumeric/; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; }; } diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index f1de422fa24..de6517923b6 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -2,7 +2,7 @@ , xpdf, pil, pyopengl, pygame , setuptools, mesa, freeglut }: -let version = "0.10.2"; +let version = "0.10.3"; in stdenv.mkDerivation { # This project was formerly known as KeyJNote. @@ -12,7 +12,7 @@ in src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "1py36h9085ycxj3qnmqdps0dfghlr5qb2i62l0ynzngn55dgz950"; + sha256 = "0ppr9bckswpi3gav56dhrk91ibxvqbfhpxmm0zikzpxhdlvnaj5v"; }; # Note: We need to have `setuptools' in the path to be able to use diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index 8a29d9356df..ecc9f389502 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -1,15 +1,15 @@ { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }: let - rev = "0e5867bc5c"; + rev = "8d38060968"; in stdenv.mkDerivation { - name = "ledger3-2013.11.${rev}"; + name = "ledger3-2013.12.${rev}"; src = fetchgit { url = "https://github.com/ledger/ledger.git"; inherit rev; - sha256 = "16aa63z24rp5vin7al8b6nzdi4kqpawbzvh148wfr2wj60vdb1n5"; + sha256 = "e100f28d18e1804fc8aa8b0141cc33d6d95bbe329e803ba887622ac5f8d3d972"; }; buildInputs = [ cmake boost gmp mpfr libedit python texinfo ]; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index a4f5821c54c..250ce163e4f 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -3,11 +3,11 @@ , zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }: stdenv.mkDerivation rec { - name = "scribus-1.4.1"; + name = "scribus-1.4.3"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "1n67z2bk5ca2sxvv43jvj7yygfr4d2x5yc69zk70v38prm0gqlv8"; + sha256 = "1zxgl2g299rllfy5ihs5skicpv7zcmz149ahraami69gqcag6bn7"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index e45f5b645fd..1e9f3ee521b 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }: stdenv.mkDerivation rec { - name = "avogadro-1.0.3"; + name = "avogadro-1.1.1"; src = fetchurl { url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; - sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg"; + sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig doxygen ]; NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index bb4b969f062..0bc6b60e721 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-3.3.39"; + name = "gtkwave-3.3.53"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1va506anlbpbha7l6h94s44xjdy6ch22iv629swn4bh5m3qi33bg"; + sha256 = "1jmrk2p2azjca250h2bi4c8v0cp1gqd3c027dx18sxy3cgw1fsp1"; }; buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 579492248ea..493af97d156 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}: stdenv.mkDerivation { - name = "ng-spice-rework-24"; + name = "ng-spice-rework-25"; src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-24.tar.gz"; - sha256 = "0rgh75hbqrsljz767whbj65wi6369yc286v0qk8jxnv2da7p9ll6"; + url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz"; + sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h"; }; buildInputs = [ readline libX11 bison libICE libXaw libXext ]; diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 9bb8f8cde4c..07b87e3cf07 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -12,10 +12,10 @@ let ++ [(a.lib.overrideDerivation x.gmp (y: {dontDisableStatic=true;}))]; sourceInfo = rec { baseName="cvc3"; - version="2.2"; + version="2.4.1"; name="${baseName}-${version}"; url="http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz"; - hash="1dw12d5vrixfr6l9j6j7026vrr22zb433xyl6n5yxx4hgfywi0ji"; + hash="1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym"; }; in rec { diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 3043df15da7..a93386149bd 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gfortran, liblapack, blas}: stdenv.mkDerivation rec { - name = "JAGS-2.2.0"; + name = "JAGS-3.4.0"; src = fetchurl { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; - sha256 = "016xml4k99lmdwwjiabxin95k9p3q2zh4pcci8wwcqwlq5y205b6"; + sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib"; }; buildInputs = [gfortran liblapack blas]; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 5fda04fed4f..576a28b054f 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp, readline }: stdenv.mkDerivation rec { - name = "pari-2.5.4"; + name = "pari-2.5.5"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0gpsj5n8d1gyl7nq2y915sscs3d334ryrv8qgjdwqf3cr95f2dwz"; + sha256 = "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn"; }; buildInputs = [gmp readline]; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index de4bb171497..b9abf7b55b4 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { - name = "gromacs-4.5.5"; + name = "gromacs-4.6.5"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; - md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz"; + sha256 = "02ggrplh8fppqib86y3rfk4qm08yddlrb1yjgzl138b3b4qjy957"; }; buildInputs = [cmake fftw]; diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index 19a00d2b841..f10fb5e65ce 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -1,10 +1,10 @@ args : with args; rec { - version = "2.2.0"; + version = "2.5"; src = fetchurl { url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; - sha256 = "835e0dc2b3b798d3c88b960bf719fe3b4cec7ae241908aafeb6aafe4c83f591b"; + sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw"; }; buildInputs = []; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 0c9e642d265..b023ac5d160 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20131213"; - sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn"; + version = "5.20131221"; + sha256 = "1gkb8fc0fjjn0rigajgliqy381pmkpx4ha1rx65dcw15rqnrawb3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -42,11 +42,15 @@ cabal.mkDerivation (self: { -fDNS -fProduction -fTDFA"; - preConfigure = "patchShebangs ."; - installPhase = "./Setup install"; - checkPhase = '' + doCheck = false; + installPhase = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" + ./Setup install + ''; + checkPhase = '' + cp dist/build/git-annex/git-annex git-annex + ./git-annex test ''; meta = { homepage = "http://git-annex.branchable.com/"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index ef51eae716b..dad607c1462 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.5.1"; + version = "1.8.5.2"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m"; + sha256 = "12iyj6f89dmb1cn2pvym5lrf23g4m71mp9pwkbi1zscb9d998ih2"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix new file mode 100644 index 00000000000..7f8091067cb --- /dev/null +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation { + name = "git-repo-1.20"; + src = fetchurl { + # I could not find a versioned url for the 1.20 version. In case + # the sha mismatches, check the homepage for new version and sha. + url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo"; + sha1 = "e197cb48ff4ddda4d11f23940d316e323b29671c"; + }; + + unpackPhase = "true"; + installPhase = '' + mkdir -p $out/bin + sed -e 's,!/usr/bin/env python,!${python}/bin/python,' < $src > $out/bin/repo + chmod +x $out/bin/repo + ''; + + meta = { + homepage = "http://source.android.com/source/downloading.html"; + description = "Android's repo management tool"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 59fb1f5a867..6373eb9f7f9 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: +# the homepage mentions this is the final release. +# from now on, kdesvn will be part of the official kde software distribution stdenv.mkDerivation rec { - name = "kdesvn-1.5.5"; + name = "kdesvn-1.6.0"; - src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; - sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2"; + md5 = "7e6adc98ff4777a06d5752d3f2b58fa3"; }; prePatch = '' sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - patches = [ ./docbook.patch ./virtual_inheritance.patch ]; - - buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/version-management/kdesvn/docbook.patch b/pkgs/applications/version-management/kdesvn/docbook.patch deleted file mode 100644 index 54f43c77958..00000000000 --- a/pkgs/applications/version-management/kdesvn/docbook.patch +++ /dev/null @@ -1,13 +0,0 @@ -The name of the dtd changed in kdelibs 4.5, so we need to increase it. - -diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook -index 8747869..a9676aa 100644 ---- a/doc/nl/index.docbook -+++ b/doc/nl/index.docbook -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdesvn "<application>kdesvn</application>"> - <!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname--> - <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc --> diff --git a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch deleted file mode 100644 index faaf6afcd6b..00000000000 --- a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h -+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h -@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil - /** - @author Rajko Albrecht <ral@alwins-world.de> - */ --class RevGraphView : virtual public QGraphicsView -+class RevGraphView : public QGraphicsView - { - Q_OBJECT - public: diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix new file mode 100644 index 00000000000..cbbb23b04a0 --- /dev/null +++ b/pkgs/applications/video/aegisub/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl +, libX11, gettext, wxGTK +, libiconv, fontconfig, freetype +, mesa +, libass, fftw, ffms +, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies +, spellChecking ? true, hunspell ? null +, automationSupport ? true, lua ? null +, openalSupport ? false, openal ? null +, alsaSupport ? true, alsaLib ? null +, pulseaudioSupport ? true, pulseaudio ? null +, portaudioSupport ? false, portaudio ? null +}: + +assert spellChecking -> (hunspell != null); +assert automationSupport -> (lua != null); +assert openalSupport -> (openal != null); +assert alsaSupport -> (alsaLib != null); +assert pulseaudioSupport -> (pulseaudio != null); +assert portaudioSupport -> (portaudio != null); + +stdenv.mkDerivation rec { + name = "aegisub-${version}"; + version = "3.0.4"; + + src = fetchurl { + url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz"; + md5 = "0f22d63ed4c502f3801795fa623a4f41"; + }; + + buildInputs = with stdenv.lib; + [ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib ] + ++ optional spellChecking hunspell + ++ optional automationSupport lua + ++ optional openalSupport openal + ++ optional alsaSupport alsaLib + ++ optional pulseaudioSupport pulseaudio + ++ optional portaudioSupport portaudio + ; + + NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm"; + + preConfigure = "cd aegisub"; + + postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub"; + + meta = { + description = "An advanced subtitle editor"; + longDescription = '' + Aegisub is a free, cross-platform open source tool for creating and + modifying subtitles. Aegisub makes it quick and easy to time subtitles to + audio, and features many powerful tools for styling them, including a + built-in real-time video preview. + ''; + homepage = http://www.aegisub.org/; + license = "BSD"; # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd softwares + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 24f53884e39..74b74037e50 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -66,12 +66,12 @@ let in stdenv.mkDerivation rec { - name = "mplayer2-20130130"; + name = "mplayer2-20130428"; src = fetchgit { url = "git://git.mplayer2.org/mplayer2.git"; - rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225"; - sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys"; + rev = "6c87a981baa4972fd71c25dfddea017b5a972e89"; + sha256 = "b09c1331141dd0939dfa424ae14dc0bdf82c8a72bb32c78e3ad15e3ee1d2c851"; }; prePatch = '' diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index bb91ca5beb5..e382481b6f6 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -55,11 +55,12 @@ let in stdenv.mkDerivation rec { - name = "mpv-20130812"; + name = "mpv-20131222"; src = fetchgit { url = "https://github.com/mpv-player/mpv.git"; - rev = "62925a5c15a76568c155259bafa1361ec139c66b"; + rev = "e6bea0ec5a"; + sha256 = "984c7d19b1916b7e5befc370ffb7f6c31e560c64c47090b924a115d00c35a1a8"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index ab48d74c00d..8bd5b7c6160 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smplayer-0.8.5"; + name = "smplayer-0.8.6"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0vbfvaqg5c25vabq1mf9xg6kzgvxnpd0i172y1gjznnlpcw2fxrw"; + sha256 = "1p70929j8prc4mgqxvsbcjxy8zwp4r9jk0mp0iddxl7vfyck74g0"; }; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 2c1044d6937..913235287ac 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -2,30 +2,31 @@ , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev , libjpeg, pam, autoconf, automake, libtool }: -let version = "1.0.5"; in +let version = "1.3.1"; in stdenv.mkDerivation rec { name = "weston-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0"; + sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p"; }; - buildInputs = [ pkgconfig wayland mesa libxkbcommon - cairo libxcb libXcursor x11 udev libdrm mtdev - libjpeg pam autoconf automake libtool ]; + buildInputs = [ + pkgconfig wayland mesa libxkbcommon + cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam + ]; - preConfigure = "autoreconf -vfi"; + NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm"; - # prevent install target to chown root weston-launch, which fails - configureFlags = '' - --disable-setuid-install - ''; + configureFlags = [ + "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails + ]; meta = { description = "Reference implementation of a Wayland compositor"; homepage = http://wayland.freedesktop.org/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index 0b8b71db7e9..54ef0b274aa 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -13,6 +13,12 @@ cabal.mkDerivation (self: { mkdir -p $out/share/man/man1 mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/ ''; + + patches = [ + # Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available). + ./xmonad_ghc_var_0.11.patch + ]; + meta = { homepage = "http://xmonad.org"; description = "A tiling window manager"; diff --git a/pkgs/applications/window-managers/xmonad/xmonad_ghc_var_0.11.patch b/pkgs/applications/window-managers/xmonad/xmonad_ghc_var_0.11.patch new file mode 100644 index 00000000000..f0785773cc1 --- /dev/null +++ b/pkgs/applications/window-managers/xmonad/xmonad_ghc_var_0.11.patch @@ -0,0 +1,44 @@ +--- xmonad-0.11/XMonad/Core.hs 2013-01-01 01:31:47.000000000 +0000 ++++ new-xmonad/XMonad/Core.hs 2013-12-23 17:36:40.862146910 +0000 +@@ -47,6 +47,7 @@ + import System.Process + import System.Directory + import System.Exit ++import System.Environment (lookupEnv) + import Graphics.X11.Xlib + import Graphics.X11.Xlib.Extras (Event) + import Data.Typeable +@@ -452,6 +453,7 @@ + err = base ++ ".errors" + src = base ++ ".hs" + lib = dir </> "lib" ++ ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "XMONAD_GHC") + libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib + srcT <- getModTime src + binT <- getModTime bin +@@ -460,7 +462,7 @@ + -- temporarily disable SIGCHLD ignoring: + uninstallSignalHandlers + status <- bracket (openFile err WriteMode) hClose $ \h -> +- waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir) ++ waitForProcess =<< runProcess ghc ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir) + Nothing Nothing Nothing (Just h) + + -- re-enable SIGCHLD: +@@ -469,6 +471,7 @@ + -- now, if it fails, run xmessage to let the user know: + when (status /= ExitSuccess) $ do + ghcErr <- readFile err ++ xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE") + let msg = unlines $ + ["Error detected while loading xmonad configuration file: " ++ src] + ++ lines (if null ghcErr then show status else ghcErr) +@@ -476,7 +479,7 @@ + -- nb, the ordering of printing, then forking, is crucial due to + -- lazy evaluation + hPutStrLn stderr msg +- forkProcess $ executeFile "xmessage" True ["-default", "okay", msg] Nothing ++ forkProcess $ executeFile xmessage True ["-default", "okay", msg] Nothing + return () + return (status == ExitSuccess) + else return True diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 1368537c2a1..543a4894f30 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "lmodern-2.004.1"; + name = "lmodern-2.004.4"; src = fetchurl { - url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.1.orig.tar.gz; - sha256 = "1bvlf8p39667q58pvyfzy3yl0mylf0ak96flwp8vj01vqbi3rfaz"; + url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; + sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw"; }; installPhase = '' diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 553665396ec..1cf29db9dbc 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.12"; + name = "hicolor-icon-theme-0.13"; src = fetchurl { url = "http://icon-theme.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0wzc7g4ldb2l8zc0x2785ck808c03i857jji942ikakyc68adp4y"; + sha256 = "01ilkizzal3wq2naaj84rqmd850aari1ahiw9vfis3a82n4h72x3"; }; meta = { diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index aafb9104e22..ac5beaeee81 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20121229"; + name = "cacert-20131205"; src = fetchurl { url = "http://tarballs.nixos.org/${name}.pem.bz2"; - sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif"; + sha256 = "049cm3nrhawkh9xpfjhgis6w58zji5ppi4d9yyjzrr7mpw0a34df"; }; unpackPhase = "true"; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix new file mode 100644 index 00000000000..e158b489884 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, intltool +, glib, gobjectIntrospection, gdk_pixbuf, gtk3, gnome_common +, xorg, xkeyboard_config +}: + +let + version = "2.0.4"; +in +stdenv.mkDerivation { + name = "cinnamon-desktop-${version}"; + + src = fetchurl { + url = "http://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz"; + sha256 = "1cywin712558pv58c0cr73m25hfcv5x8pv5frvqjr9gwr2gpi6h3"; + }; + + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + buildInputs = with xorg; [ + pkgconfig autoreconfHook intltool + glib gobjectIntrospection gdk_pixbuf gtk3 gnome_common + xkeyboard_config libxkbfile libX11 libXrandr libXext + ]; + + postInstall = '' + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "Library and data for various Cinnamon modules"; + + longDescription = '' + The libcinnamon-desktop library provides API shared by several applications + on the desktop, but that cannot live in the platform for various + reasons. There is no API or ABI guarantee, although we are doing our + best to provide stability. Documentation for the API is available with + gtk-doc. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} + diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix new file mode 100644 index 00000000000..850dd4e6c5a --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-session.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib +, upower, json_glib,intltool, systemd, hicolor_icon_theme, xorg, makeWrapper, cinnamon-desktop }: + +let + version = "2.0.6"; +in +stdenv.mkDerivation { + name = "cinnamon-session-${version}"; + + src = fetchurl { + url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz"; + sha256 = "0rs5w7npj3wf3gkk3sfb83awks2h7vjd6cz8mvfgbh6m3grn66l3"; + }; + + + configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ; + + patches = [ ./remove-sessionmigration.patch ./timeout.patch]; + + buildInputs = [ + pkgconfig autoreconfHook + glib gettext gnome_common + gtk3 dbus_glib upower json_glib + intltool systemd xorg.xtrans + makeWrapper + ]; + + preBuild = "patchShebangs ./scripts"; + + + postInstall = '' + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + rm $out/share/icons/hicolor/icon-theme.cache + + for f in "$out"/bin/*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:${cinnamon-desktop}/share" + done + ''; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "The cinnamon session files" ; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} + diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix index 2d396947b89..a68a905f92e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "cinnamon-translations"; - version="2.0.3"; +{ stdenv, fetchurl }: +let + version = "2.0.3"; +in +stdenv.mkDerivation { + name = "cinnamon-translations-${version}"; src = fetchurl { url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"; sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc"; }; - installPhase = '' - mkdir -pv $out/usr/share/cinnamon/locale - cp -av mo-export/* $out/usr/share/cinnamon/locale/ + mkdir -pv $out/share/cinnamon/locale + cp -av mo-export/* $out/share/cinnamon/locale/ ''; meta = { @@ -25,5 +25,3 @@ stdenv.mkDerivation rec { }; } - - diff --git a/pkgs/desktops/cinnamon/cjs.nix b/pkgs/desktops/cinnamon/cjs.nix new file mode 100644 index 00000000000..3747262cdf4 --- /dev/null +++ b/pkgs/desktops/cinnamon/cjs.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, python +, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection +}: + +let + version="2.0.0"; +in +stdenv.mkDerivation rec { + name = "cjs-${version}"; + + src = fetchurl { + url = "http://github.com/linuxmint/cjs/archive/${version}.tar.gz"; + sha256 = "16iazd5h2z27v9jxs4a8imwls5c1c690wk7i05r5ds3c3r4nrsig"; + }; + + buildInputs = [ + pkgconfig autoreconfHook python + dbus_glib cairo spidermonkey_185 + gobjectIntrospection + ]; + + preBuild = "patchShebangs ./scripts"; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "JavaScript bindings for Cinnamon" ; + + longDescription = '' + This module contains JavaScript bindings based on gobject-introspection. + + Because JavaScript is pretty free-form, consistent coding style and unit tests + are critical to give it some structure and keep it readable. + We propose that all GNOME usage of JavaScript conform to the style guide + in doc/Style_Guide.txt to help keep things sane. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} diff --git a/pkgs/desktops/cinnamon/remove-sessionmigration.patch b/pkgs/desktops/cinnamon/remove-sessionmigration.patch new file mode 100644 index 00000000000..92e63549d96 --- /dev/null +++ b/pkgs/desktops/cinnamon/remove-sessionmigration.patch @@ -0,0 +1,19 @@ +--- a/cinnamon-session/csm-session-fill.c ++++ b/cinnamon-session/csm-session-fill.c +@@ -228,15 +228,6 @@ + load_standard_apps (CsmManager *manager, + GKeyFile *keyfile) + { +- GError *error; +- +- g_debug ("fill: *** Executing user migration"); +- error = NULL; +- if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) { +- g_warning ("Error while executing session-migration: %s", error->message); +- g_error_free (error); +- } +- + g_debug ("fill: *** Adding required components"); + handle_required_components (keyfile, !csm_manager_get_failsafe (manager), + append_required_components_helper, manager); + diff --git a/pkgs/desktops/cinnamon/timeout.patch b/pkgs/desktops/cinnamon/timeout.patch new file mode 100644 index 00000000000..59d1f9ab5f3 --- /dev/null +++ b/pkgs/desktops/cinnamon/timeout.patch @@ -0,0 +1,26 @@ +diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c +--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c 2012-02-02 15:33:01.000000000 +0100 ++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c 2012-06-10 02:39:46.184348462 +0200 +@@ -36,7 +36,7 @@ + #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider" + + /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */ +-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */ ++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */ + + typedef void (*GsmFillHandleProvider) (const char *provides, + const char *default_provider, +diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c +cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c +--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 ++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200 +@@ -30,7 +30,7 @@ + #include <X11/Xatom.h> + + /* Wait up to this long for a running check to finish */ +-#define PROPERTY_CHANGE_TIMEOUT 5000 ++#define PROPERTY_CHANGE_TIMEOUT 12000 + + /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ + #define NO_ACCEL 0 + diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 3d76ba72dae..cecd56ad4f2 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -1,4 +1,4 @@ -{ callPackage, self, stdenv, gettext, overrides ? {} }: +{ callPackage, self, stdenv, gettext, gvfs, libunique, overrides ? {} }: { __overrides = overrides; @@ -67,7 +67,7 @@ startup_notification = callPackage ./platform/startup-notification { }; # Required for nautilus - libunique = callPackage ./platform/libunique { }; + inherit (libunique); gtkglext = callPackage ./platform/gtkglext { }; @@ -79,7 +79,7 @@ libgweather = callPackage ./desktop/libgweather { }; - gvfs = callPackage ./desktop/gvfs { }; + gvfs = gvfs.override { gnome = self; }; libgnomekbd = callPackage ./desktop/libgnomekbd { }; diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix deleted file mode 100644 index a2044d1b270..00000000000 --- a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2 -, libcdio, libxml2, libtool, glib, intltool, GConf, libgnome_keyring, libsoup -, udev, avahi, libxslt, docbook_xsl }: - -stdenv.mkDerivation rec { - name = "gvfs-1.14.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; - sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; - }; - - buildInputs = - [ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 GConf - libgnome_keyring libsoup avahi libtool libxslt docbook_xsl - ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index 548783abf79..929ed44b752 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome }: +{ stdenv, fetchurl, fetchurl_gnome, which }: stdenv.mkDerivation rec { name = src.pkgname; @@ -8,4 +8,11 @@ stdenv.mkDerivation rec { major = "2"; minor = "34"; patchlevel = "0"; sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; + + propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which + + patches = [(fetchurl { + url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; + sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; + })]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index da7673de419..a19b20e86b5 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}: stdenv.mkDerivation { - name = "libgnomeprintui-2.18.4"; + name = "libgnomeprintui-2.18.6"; src = fetchurl { - url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2; - sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490"; + url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2; + sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; diff --git a/pkgs/desktops/gnome-2/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix deleted file mode 100644 index 6b9cee80042..00000000000 --- a/pkgs/desktops/gnome-2/platform/libunique/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl_gnome, pkgconfig, gtk}: - -stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurl_gnome { - project = "libunique"; - major = "1"; minor = "1"; patchlevel = "6"; - sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk ]; -} diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix index ab25845c413..aaea1b2e966 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix @@ -2,14 +2,14 @@ , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { - versionMajor = "2.8"; - versionMinor = "1"; + versionMajor = "2.10"; + versionMinor = "2"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "01pxfnksixrjj27ivllpla54r6nkwsjj34acb0phmp76zna9nrgb"; + sha256 = "1xfh89lydl8d18dhnzwvzcsyyybr5q3ik001qgq520l3qh8shj73"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix index 2d433486677..30b2367a5e9 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib , libX11, xextproto, libSM, libICE, libXtst, libXi }: -stdenv.mkDerivation rec { - - versionMajor = "2.8"; - versionMinor = "0"; +stdenv.mkDerivation (rec { + versionMajor = "2.10"; + versionMinor = "2"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0n64h6j10sn90ds9y70d9wlvvsbwnrym9fm0cyjxb0zmqw7s6q8q"; + sha256 = "1qfxlbmbaihgmqgkxnywnji9wkbvn8pvbv20x5glv3jc9zw5innk"; }; buildInputs = [ @@ -21,3 +20,8 @@ stdenv.mkDerivation rec { # ToDo: on non-NixOS we create a symlink from there? configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; } + // stdenv.lib.optionalAttrs stdenv.isDarwin { + NIX_LDFLAGS = "-lintl"; + } +) + diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 5983b74c0f4..9e08c6fa663 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -2,11 +2,11 @@ , gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }: stdenv.mkDerivation rec { - name = "gnome-keyring-3.6.2"; + name = "gnome-keyring-3.6.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz"; - sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f"; + sha256 = "0la107v75vh8v165lk391xg820h8hxa209766wr98pm22qzkl5g0"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gvfs/default.nix b/pkgs/desktops/gnome-3/core/gvfs/default.nix deleted file mode 100644 index 1eea518c4b7..00000000000 --- a/pkgs/desktops/gnome-3/core/gvfs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2 -, libcdio, libxml2, libtool, glib, intltool, gconf, libgnome_keyring, libsoup -, udev, avahi, libxslt, docbook_xsl }: - -stdenv.mkDerivation rec { - name = "gvfs-1.14.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; - sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; - }; - - buildInputs = - [ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 gconf - libgnome_keyring libsoup avahi libtool libxslt docbook_xsl - ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 079a6f169b2..2cf785b8cca 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libxml2, glib }: stdenv.mkDerivation rec { - name = "libcroco-0.6.6"; # 3.6.2 release + name = "libcroco-0.6.8"; src = fetchurl { url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j"; + sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; }; configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 48f37f6ba9d..d214a44aa0a 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -1,14 +1,16 @@ -{ callPackage, lib, self, stdenv, gettext, overrides ? {}, pkgs }: +{ callPackage, self, pkgs }: rec { - inherit (pkgs) fetchurl_gnome glib gtk3 atk pango; - gtk = gtk3; + inherit (pkgs) glib gtk2 gtk3 gnome2; + gtk = gtk3; # just to be sure inherit (pkgs.gnome2) gnome_common ORBit2; orbit = ORBit2; - inherit (lib) lowPrio hiPrio appendToName makeOverridable; - __overrides = overrides; +#### Overrides of libraries + + librsvg = pkgs.librsvg.override { inherit gtk2; }; # gtk2 mysteriously needed in librsvg for goffice (commented in Gentoo) + #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) @@ -31,9 +33,9 @@ rec { gnome_terminal = callPackage ./core/gnome-terminal { }; - gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { }); + gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; - gvfs = callPackage ./core/gvfs { }; + gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; }; libcroco = callPackage ./core/libcroco {}; @@ -43,16 +45,23 @@ rec { zenity = callPackage ./core/zenity { }; + #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) gnome_dictionary = callPackage ./desktop/gnome-dictionary { }; gnome_desktop = callPackage ./desktop/gnome-desktop { }; + # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; # scrollkeeper replacement rarian = callPackage ./desktop/rarian { }; + +#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + + goffice = callPackage ./misc/goffice { }; + } diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/desktops/gnome-3/misc/goffice/0.8.nix index 016b340c51f..02520a9f121 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/desktops/gnome-3/misc/goffice/0.8.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 , pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui, pcre }: +, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: stdenv.mkDerivation rec { name = "goffice-0.8.17"; @@ -31,18 +31,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { - description = "GOffice, a Glib/GTK+ set of document centric objects and utilities"; - - longDescription = '' - There are common operations for document centric applications that are - conceptually simple, but complex to implement fully: plugins, load/save - documents, undo/redo. - ''; - - license = "GPLv2"; - + meta = gnome3.goffice.meta // { maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/desktops/gnome-3/misc/goffice/default.nix b/pkgs/desktops/gnome-3/misc/goffice/default.nix new file mode 100644 index 00000000000..d708ab92113 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/goffice/default.nix @@ -0,0 +1,33 @@ +{ fetchurl, stdenv, pkgconfig, intltool, bzip2, glib, gdk_pixbuf, gtk3 +, libgsf, libxml2, cairo, pango, librsvg, libspectre }: + +stdenv.mkDerivation rec { + name = "goffice-0.10.9"; + + src = fetchurl { + url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; + sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg"; + }; + + propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? + pkgconfig intltool bzip2 glib gdk_pixbuf gtk3 + libgsf libxml2 cairo pango librsvg libspectre + ]; + + doCheck = true; + + meta = { + description = "A Glib/GTK+ set of document centric objects and utilities"; + + longDescription = '' + There are common operations for document centric applications that are + conceptually simple, but complex to implement fully: plugins, load/save + documents, undo/redo. + ''; + + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.gnu; + }; + passthru = { inherit meta; }; +} diff --git a/pkgs/development/libraries/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch index cd4ef3c9fed..cd4ef3c9fed 100644 --- a/pkgs/development/libraries/goffice/pcre_info.patch +++ b/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index 1c795a5a5fa..d891ad98fdc 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-terminal"; ver_maj = "0.6"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0d9vbkvbxxhv022mwyihrabmj8y9097bp57n1a412qyji0i454ix"; + sha256 = "023y0lkfijifh05yz8grimxadqpi98mrivr00sl18nirq8b4fbwi"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index 5873ef9cd68..ace7aa7a2c7 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-notifyd"; ver_maj = "0.2"; - ver_min = "3"; + ver_min = "4"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0fx6z89rxs6ypb8bb6l1pg8fdbxn995fgs413sbhnaxjkm6gch6x"; + sha256 = "1l6fpfk0fkizdx7vwbyjdyzzj5i2ng8pf7r8j49nv0cnjhpxczlc"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix deleted file mode 100644 index 9f048b18c06..00000000000 --- a/pkgs/desktops/xfce/common.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ pkgs, newScope, xfce_self }: rec { - - callPackage = newScope (deps // xfce_self); - - deps = rec { # xfce-global dependency overrides should be here - inherit (pkgs.gnome) libglade libwnck vte gtksourceview; - inherit (pkgs.perlPackages) URI; - - # The useful bits from ‘gnome-disk-utility’. - libgdu = callPackage ./support/libgdu.nix { }; - - # Gvfs is required by Thunar for the trash feature and for volume - # mounting. Should use the one from Gnome, but I don't want to mess - # with the Gnome packages (or pull in a zillion Gnome dependencies). - gvfs = callPackage ./support/gvfs.nix { }; - - # intelligent fetcher for Xfce - fetchXfce = rec { - generic = prepend : name : hash : - let lib = pkgs.lib; - p = builtins.parseDrvName name; - versions = lib.splitString "." p.version; - ver_maj = lib.concatStrings (lib.intersperse "." (lib.take 2 versions)); - name_low = lib.toLower p.name; - in pkgs.fetchurl { - url = "mirror://xfce/src/${prepend}/${name_low}/${ver_maj}/${name}.tar.bz2"; - sha256 = hash; - }; - core = generic "xfce"; - app = generic "apps"; - art = generic "art"; - }; - }; - - xfce_common = rec { - - inherit (deps) gvfs; # used by NixOS - - #### CORE - - garcon = callPackage ./core/garcon.nix { v= "0.2.0"; h= "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2"; }; - - # not used anymore TODO: really? Update to 2.99.2? - gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; - - # ToDo: segfaults after some work - tumbler = callPackage ./core/tumbler.nix { v= "0.1.27"; h= "0s9qj99b81asmlqa823nzykq8g6p9azcp2niak67y9bp52wv6q2c"; }; - - xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { v= "1.0.10"; h= "1w120k1sl4s459ijaxkqkba6g1p2sqrf9paljv05wj0wz12bpr40"; }; - - - #### APPLICATIONS - #TODO: correct links; more stuff - - xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; }; - gigolo = callPackage ./applications/gigolo.nix { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; }; - xfce4taskmanager = callPackage ./applications/xfce4-taskmanager.nix { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; }; - mousepad = callPackage ./applications/mousepad.nix { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; }; - thunar_volman = callPackage ./core/thunar-volman.nix { }; - thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; - - - #### ART - - xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { v= "4.4.3"; h= "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; - - #### PANEL PLUGINS - - xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; - xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; - xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; - - }; -} - diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix new file mode 100644 index 00000000000..2abdc51e4c6 --- /dev/null +++ b/pkgs/development/compilers/go/1.2.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: + +let + loader386 = "${glibc}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc}/lib/ld-linux.so.3"; +in + +stdenv.mkDerivation { + name = "go-1.2"; + + src = fetchurl { + url = http://go.googlecode.com/files/go1.2.src.tar.gz; + sha1 = "7dd2408d40471aeb30a9e0b502c6717b5bf383a5"; + }; + + buildInputs = [ bison glibc bash makeWrapper ]; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + + patchShebangs ./ # replace /bin/bash + # !!! substituteInPlace does not seems to be effective. + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go + + #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ + # -e 's,/bin/echo,${coreutils}/bin/echo,' \ + # src/pkg/exec/exec_test.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + ''; + + patches = [ ./cacert-1.2.patch ]; + + GOOS = "linux"; + GOARCH = if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + + installPhase = '' + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ pierron viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/go/cacert-1.2.patch b/pkgs/development/compilers/go/cacert-1.2.patch new file mode 100644 index 00000000000..1ad6910915f --- /dev/null +++ b/pkgs/development/compilers/go/cacert-1.2.patch @@ -0,0 +1,15 @@ +Go comes with hardcoded cacert. We add the usual in NixOS, +for easier NixOS life. + +diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go +index 76e79f4..6ef1dd3 100644 +--- a/src/pkg/crypto/x509/root_unix.go ++++ b/src/pkg/crypto/x509/root_unix.go +@@ -15,6 +15,7 @@ var certFiles = []string{ + "/etc/ssl/ca-bundle.pem", // OpenSUSE + "/etc/ssl/cert.pem", // OpenBSD + "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly ++ "/etc/ssl/certs/ca-bundle.crt", // NixOS + } + + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index d7e42d38948..4d4a129d573 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -39,9 +39,9 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "6"; + update = "40"; - build = "24"; + build = "43"; in @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}"; src = fetchurl { - url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip"; - sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9"; + url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip; + sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00"; }; -# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; + # outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; buildInputs = [ unzip @@ -90,10 +90,7 @@ stdenv.mkDerivation rec { openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ''; - patches = [ - ./cppflags-include-fix.patch - ./no-crypto-restrictions.patch - ]; + patches = [ ./cppflags-include-fix.patch ]; makeFlags = [ "SORT=${coreutils}/bin/sort" @@ -109,6 +106,7 @@ stdenv.mkDerivation rec { "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" "STATIC_CXX=false" + "UNLIMITED_CRYPTO=1" ]; configurePhase = '' @@ -118,6 +116,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out + + # Remove some broken manpages. + rm -rf $out/share/man/ja* + + # Remove crap from the installation. + rm -rf $out/demo $out/sample + + # Generate certificates. pushd $out/${if ! jreOnly then "jre/" else ""}lib/security rm cacerts perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt diff --git a/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch b/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch deleted file mode 100644 index 427ef353466..00000000000 --- a/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openjdk-orig/jdk/make/javax/crypto/Makefile openjdk/jdk/make/javax/crypto/Makefile ---- openjdk-orig/jdk/make/javax/crypto/Makefile 2011-06-27 13:18:45.000000000 -0400 -+++ openjdk/jdk/make/javax/crypto/Makefile 2012-11-08 14:12:01.360718616 -0500 -@@ -156,7 +156,7 @@ - # - - ifdef OPENJDK --all: build-jar install-jar build-policy install-limited -+all: build-jar install-jar build-policy install-unlimited - else # OPENJDK - ifeq ($(strip $(FILES_java)),) - all: diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 10945934d00..fd5a85967ed 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "orc-0.4.17"; + name = "orc-0.4.18"; src = fetchurl { url = "http://code.entropywave.com/download/orc/${name}.tar.gz"; - sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg"; + sha256 = "093a7a495bsy3j6i4wxaxqbqxk6hwg2hdhgvvkabwhlz4nkwilrl"; }; meta = { diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix index 3902d7f335c..1678a932379 100644 --- a/pkgs/development/interpreters/clojure/binary.nix +++ b/pkgs/development/interpreters/clojure/binary.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.5.1"; name = "clojure-binary-${version}"; src = fetchurl { url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; - sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171"; + sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy"; }; diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix index b418b50c089..80ad4c70a10 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.2"; + majorVersion = "2.2.1"; version = "${majorVersion}"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; - sha256 = "0kp0922d1739v3fqnxhrbwz1fg651dc5dmk3199ikq1rc2wgrzsh"; + sha256 = "0pq36n6bap96smpacx8gvgl8yvi9r7ddl4mlpsi5cdj4gqc4a815"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] @@ -56,7 +56,8 @@ let export HOME="$TMPDIR"; # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil' lib-python + # disable test_mhlib because it fails for unknown reason + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil -test_mhlib' lib-python ''; installPhase = '' diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 6b746185b6c..7c6516fe668 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm +, sqlite, tcl, tk, x11, openssl, readline, db45, ncurses, gdbm }: assert zlibSupport -> zlib != null; @@ -17,7 +17,7 @@ let url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; md5 = "c6e0420a21d8b23dee8b0195c9b9a125"; }; - + patches = [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. ./search-path.patch @@ -34,12 +34,12 @@ let [ bzip2 ] ++ optional zlibSupport zlib; - + # Build the basic Python interpreter without modules that have # external dependencies. python = stdenv.mkDerivation { name = "python-${version}"; - + inherit majorVersion version src patches buildInputs; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); @@ -146,7 +146,7 @@ let bsddb = buildInternalPythonModule { moduleName = "bsddb"; - deps = [ db4 ]; + deps = [ db45 ]; }; crypt = buildInternalPythonModule { @@ -193,5 +193,5 @@ let }; }; - + in python // { inherit modules; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index f45c96d2805..586c0a0acb9 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf echo "</fontconfig>" >> chroot-fontconfig/fonts.conf - + export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf cd src @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; + NIX_LDFLAGS = "-lgcc_s"; + postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ; diff --git a/pkgs/development/interpreters/ruby/ruby-18.nix b/pkgs/development/interpreters/ruby/ruby-18.nix index f37e8baa68d..356fce4913c 100644 --- a/pkgs/development/interpreters/ruby/ruby-18.nix +++ b/pkgs/development/interpreters/ruby/ruby-18.nix @@ -33,8 +33,19 @@ stdenv.mkDerivation rec { configureFlags = ["--enable-shared" "--enable-pthread"]; installFlags = stdenv.lib.optionalString docSupport "install-doc"; - # Bundler tries to create this directory - postInstall = "mkdir -pv $out/${passthru.gemPath}"; + + postInstall = '' + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook <<EOF + addGemPath() { + addToSearchPath GEM_PATH \$1/${passthru.gemPath} + } + + envHooks+=(addGemPath) + EOF + ''; meta = { license = "Ruby"; diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index 345439b593e..d18718184ba 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -48,8 +48,19 @@ stdenv.mkDerivation rec { ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]); installFlags = stdenv.lib.optionalString docSupport "install-doc"; - # Bundler tries to create this directory - postInstall = "mkdir -pv $out/${passthru.gemPath}"; + + postInstall = '' + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook <<EOF + addGemPath() { + addToSearchPath GEM_PATH \$1/${passthru.gemPath} + } + + envHooks+=(addGemPath) + EOF + ''; meta = { license = "Ruby"; diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.nix index 4ad2f8c515e..ae242107b96 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.nix @@ -46,7 +46,18 @@ stdenv.mkDerivation rec { installFlags = stdenv.lib.optionalString docSupport "install-doc"; # Bundler tries to create this directory - postInstall = "mkdir -pv $out/${passthru.gemPath}"; + postInstall = '' + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook <<EOF + addGemPath() { + addToSearchPath GEM_PATH \$1/${passthru.gemPath} + } + + envHooks+=(addGemPath) + EOF + ''; meta = { license = "Ruby"; diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix index 22076d5ed9e..13829c3f9f6 100644 --- a/pkgs/development/interpreters/ruby/rubygems.nix +++ b/pkgs/development/interpreters/ruby/rubygems.nix @@ -18,12 +18,6 @@ rec { cat > $out/nix-support/setup-hook <<EOF export RUBYOPT=rubygems addToSearchPath RUBYLIB $out/lib - - addGemPath() { - addToSearchPath GEM_PATH \$1/${ruby.gemPath} - } - - envHooks+=(addGemPath) EOF'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; /* doConfigure should be specified separately */ diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index 1c0d77345b7..d4af39ea16b 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoconf213, nspr, perl, python, readline, zip }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }: stdenv.mkDerivation rec { version = "185-1.0.0"; @@ -11,21 +11,30 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig autoconf213 perl python readline zip ]; + buildInputs = [ pkgconfig perl python zip ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" export LIBXUL_DIST=$out - autoconf ''; + configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ]; + + # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 + preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; + + enableParallelBuilding = true; + + doCheck = true; + preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522 + meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; - # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.goibhniu ]; + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + maintainers = [ maintainers.goibhniu ]; }; - } + diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 49cf0a6b94b..0b65fcba0cb 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - version = "3.9"; + version = "4.3"; name = "cgal-${version}"; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz"; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 1090a99915f..49f5fec1da3 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, SDL} : stdenv.mkDerivation rec { - name = "SDL_gfx-2.0.22"; + name = "SDL_gfx-2.0.25"; src = fetchurl { url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; - sha256 = "1w1bdpyypvqg1nmbjwkqnjhmngvpjmhc0zanwgq7z4pxffzffx8m"; + sha256 = "1h2rj34dxi5xlwpvm293v2d91gsirhnpzlmnjns9xwkcdg0fsvjm"; }; buildInputs = [ SDL ] ; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 54b38110e00..6def7a92efc 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "SDL_net"; - version = "1.2.7"; + version = "1.2.8"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; - sha256 = "2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53"; + sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; propagatedBuildInputs = [SDL]; diff --git a/pkgs/development/libraries/aalib/builder.sh b/pkgs/development/libraries/aalib/builder.sh deleted file mode 100644 index 5d4df565a6d..00000000000 --- a/pkgs/development/libraries/aalib/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--without-x --with-ncurses=$ncurses" - -genericBuild diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 897fc9db8de..fa21a9570c7 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses, automake}: stdenv.mkDerivation { - name = "aalib-1.4rc4"; - builder = ./builder.sh; + name = "aalib-1.4rc5"; + src = fetchurl { - url = mirror://sourceforge/aa-project/aalib-1.4rc4.tar.gz; - md5 = "d5aa8e9eae07b7441298b5c30490f6a6"; + url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz; + sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; # The fuloong2f is not supported by aalib still @@ -13,8 +13,9 @@ stdenv.mkDerivation { cp ${automake}/share/automake*/config.{sub,guess} . ''; - buildInputs = [ncurses]; - inherit ncurses; + buildInputs = [ ncurses ]; + + configureFlags = "--without-x --with-ncurses=${ncurses}"; meta = { description = "ASCII art graphics library"; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 2bfc57011fd..60634dc7db8 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,7 @@ x@{builderDefsPackage , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa - , kbproto + , kbproto, libjpeg, flac , ...}: builderDefsPackage (a : @@ -15,11 +15,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="allegro"; - version="5.0.4"; + version="5.0.10"; name="${baseName}-${version}"; project="alleg"; url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; - hash="0vm93kqvvw4rw2zx4l64c2i86xl5giwbqbyki4b2b83z0acpmc1n"; + hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i"; }; in rec { diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index acf53c708e0..039c2e85d63 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.5.3"; + name = "asio-1.10.1"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "08fdsv1zhwbfwlx3r3dzl1371lxy5gw92ms0kqcscxqn0ycf3rlj"; + sha256 = "16dxzkra0wmhm2vp2p9lb1h6qsdjk82sxfgj6zlz792n7jnms2l2"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index b1e8a008029..a93aaa5a43f 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,11 +1,15 @@ { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: +let + ver_maj = "2.10"; + ver_min = "0"; +in stdenv.mkDerivation rec { - name = "atk-2.8.0"; + name = "atk-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/atk/2.8/${name}.tar.xz"; - sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj"; + url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; + sha256 = "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3"; }; buildInputs = libintlOrEmpty; @@ -14,6 +18,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ]; + #doCheck = true; # no checks in there (2.10.0) + postInstall = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index b25432491fb..03f08efca98 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, atk, glibmm, pkgconfig }: stdenv.mkDerivation rec { - name = "atkmm-2.22.6"; + name = "atkmm-2.22.7"; src = fetchurl { - url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz; - sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a"; + url = "mirror://gnome/sources/atkmm/2.22/${name}.tar.xz"; + sha256 = "06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz"; }; propagatedBuildInputs = [ atk glibmm ]; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 45253b65edb..f5b68b7a843 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "suil-${version}"; - version = "0.6.10"; + version = "0.6.16"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1y7zgfciphr3icamikdfv2gh8xwix5blpq4npl426399i8f4ya5y"; + sha256 = "101xq7pd8kvnqwm4viaj4ikhn65jxrlrkg79ca954yqrdb9p9w8v"; }; buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 73f38f02814..497909cf25c 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, alsaLib }: stdenv.mkDerivation rec { - name = "audiofile-0.3.3"; + name = "audiofile-0.3.6"; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; src = fetchurl { url = "http://audiofile.68k.org/${name}.tar.gz"; - sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq"; + sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 9b5c25d4ca4..c1bd8a4b3a2 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -3,11 +3,11 @@ let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in stdenv.mkDerivation rec { - name = "boolstuff-0.1.13"; + name = "boolstuff-0.1.14"; src = fetchurl { url = "${baseurl}/${name}.tar.gz"; - sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn"; + sha256 = "1ccn9v3kxz44pv3mr8q0l2i9769jiigw1gfv47ia50mbspwb87r6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 17f2b545168..81f4f9a287e 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.5"; + version = "1.9.7"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "1njssjjvfalsfh37prkxwqi4hf0zj1d54qzggvjwpzkm424jjcii"; + sha256 = "1z2z77l41g01ra7v716c0q3x8s2kx30l4p1kf21ma8bdqa98arp6"; }; dontBuild = true; diff --git a/pkgs/development/libraries/cairo/1.12.2.nix b/pkgs/development/libraries/cairo/1.12.2.nix deleted file mode 100644 index e60af3a23a8..00000000000 --- a/pkgs/development/libraries/cairo/1.12.2.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ postscriptSupport ? true -, pdfSupport ? true -, pngSupport ? true -, xcbSupport ? false -, gobjectSupport ? true, glib -, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs -, zlib, libpng, pixman, libxcb ? null, xcbutil ? null -, libiconvOrEmpty, libintlOrEmpty -}: - -assert postscriptSupport -> zlib != null; -assert pngSupport -> libpng != null; -assert xcbSupport -> libxcb != null && xcbutil != null; - -stdenv.mkDerivation rec { - name = "cairo-1.12.2"; - - src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.xz"; - sha1 = "bc2ee50690575f16dab33af42a2e6cdc6451e3f9"; - }; - - buildInputs = - [ pkgconfig x11 fontconfig xlibs.libXrender ] - ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] - ++ libintlOrEmpty - ++ libiconvOrEmpty; - - propagatedBuildInputs = - [ freetype pixman ] ++ - stdenv.lib.optional gobjectSupport glib ++ - stdenv.lib.optional postscriptSupport zlib ++ - stdenv.lib.optional pngSupport libpng; - - NIX_CFLAGS_COMPILE = ( if stdenv.isDarwin - then "-I${pixman}/include/pixman-1" - else "" ); - - configureFlags = - [ "--enable-tee" ] - ++ stdenv.lib.optional xcbSupport "--enable-xcb" - ++ stdenv.lib.optional pdfSupport "--enable-pdf"; - - preConfigure = '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' - '' - - # On FreeBSD, `-ldl' doesn't exist. - + (stdenv.lib.optionalString stdenv.isFreeBSD - '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in - do - cat "$i" | sed -es/-ldl//g > t - mv t "$i" - done - ''); - - enableParallelBuilding = true; - - # The default `--disable-gtk-doc' is ignored. - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "A 2D graphics library with support for multiple output devices"; - - longDescription = '' - Cairo is a 2D graphics library with support for multiple output - devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. - - Cairo is designed to produce consistent output on all output - media while taking advantage of display hardware acceleration - when available (e.g., through the X Render Extension). - ''; - - homepage = http://cairographics.org/; - - licenses = [ "LGPLv2+" "MPLv1" ]; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 73ea5254182..daf36e28919 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: stdenv.mkDerivation { - name = "ccrtp-2.0.3"; + name = "ccrtp-2.0.6"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.3.tar.gz; - sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01"; + url = mirror://gnu/ccrtp/ccrtp-2.0.6.tar.gz; + sha256 = "06rqwk2w5sikfb3l5bcpxszhq4g7ra840gqx1f011xrmhvclrzir"; }; buildInputs = [ openssl pkgconfig libgcrypt ]; diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index 471a47de404..28e51efbc4b 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -10,10 +10,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="celt"; - version="0.11.1"; + version="0.11.3"; name="${baseName}-${version}"; url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz"; - hash="1gsc3pxydyzzra8w0r6hrrsalm76lrq4lw6bd283qa4bpagmghh1"; + hash="0dh893wqbh0q4a0x1xyqryykmnhpv7mkblpch019s04a99fq2r3y"; }; in rec { diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index d5471b9be75..d148c4d829a 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -4,17 +4,17 @@ let fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; - version = lib.attrByPath ["version"] "6.0.3" args; - majorVersion = lib.attrByPath ["majorVersion"] "6" args; + version = lib.attrByPath ["version"] "6.1.5" args; + majorVersion = lib.attrByPath ["majorVersion"] "6" args; buildInputs = with args; [ - cmake freeglut mesa + cmake freeglut mesa libX11 xproto inputproto libXi libXmu ]; in rec { src = fetchurl { url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "c6f550454bc1c63a2a63e0ff8febecb4781a528ab6d6b657a17933a6f567541a"; + sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7"; }; inherit buildInputs; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index df3ffc8f60f..808e67cd852 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -3,12 +3,16 @@ gobjectIntrospection }: -stdenv.mkDerivation { - name = "clutter-1.8.2"; +let + ver_maj = "1.16"; + ver_min = "2"; +in +stdenv.mkDerivation rec { + name = "clutter-${ver_maj}.${ver_min}"; src = fetchurl { - url = mirror://gnome/sources/clutter/1.8/clutter-1.8.2.tar.xz; - sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw"; + url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; + sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,6 +23,8 @@ stdenv.mkDerivation { configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK + #doCheck = true; # no tests possible without a display + meta = { description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 121f41a0f3c..c73e9594857 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "cminpack-1.1.2"; + name = "cminpack-1.3.2"; src = fetchurl { - url = http://devernay.free.fr/hacks/cminpack/cminpack-1.1.2.tar.gz; - sha256 = "0sd8gqk7npyiiiz2jym8q89d9gqx8fig0mnx63swkwmp4lqmmxww"; + url = http://devernay.free.fr/hacks/cminpack/cminpack-1.3.2.tar.gz; + sha256 = "09bqr44wqancbdsc39lvhdz7rci3hknmlrrrzv46skvwx6rgk9x0"; }; patchPhase = '' diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index b02319fd3e8..1fc1021156d 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,22 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite -, libXdamage, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty +, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland }: +let + ver_maj = "1.16"; + ver_min = "0"; +in stdenv.mkDerivation rec { - name = "cogl-1.8.2"; + name = "cogl-${ver_maj}.${ver_min}"; src = fetchurl { - url = mirror://gnome/sources/cogl/1.8/cogl-1.8.2.tar.xz; - sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc"; + url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; + sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm"; }; nativeBuildInputs = [ pkgconfig ]; - configureFlags = " --enable-introspection " ; - - propagatedBuildInputs = - [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage -gobjectIntrospection ] + configureFlags = [ + "--enable-introspection" + "--enable-gles1" + "--enable-gles2" + "--enable-kms-egl-platform" + "--enable-wayland-egl-platform" + "--enable-wayland-egl-server" + ]; + + propagatedBuildInputs = with xorg; [ + glib gdk_pixbuf gobjectIntrospection + mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland + ] ++ libintlOrEmpty; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; @@ -27,6 +38,8 @@ gobjectIntrospection ] NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + #doCheck = true; # all tests fail (no idea why) + meta = with stdenv.lib; { description = "A small open source library for using 3D graphics hardware for rendering"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 596720c542c..fd36a91e32a 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "cppunit-1.12.1"; + name = "cppunit-1.13.2"; src = fetchurl { - url = mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz; - sha256 = "0jm49v5rmc5qw34vqs56gy8xja1dhci73bmh23cig4kcir6a0a5c"; + url = http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz; + sha256 = "17s2kzmkw3kfjhpp72rfppyd7syr7bdq5s69syj2nvrlwd3d4irz"; }; meta = { diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index 7fb9089420d..e0c8d443ec8 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "cracklib-2.8.16"; + name = "cracklib-2.9.1"; src = fetchurl { url = "mirror://sourceforge/cracklib/${name}.tar.gz"; - sha256 = "1g3mchdvra9nihxlkl3rdz96as3xnfw5m59hmr5k17l7qa9a8fpw"; + sha256 = "0mni2sz7350d4acs7gdl8nilfmnb8qhcvmxnpf6dr5wsag10b2a0"; }; buildInputs = libintlOrEmpty; diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix index 86424fac567..a56a42f22ae 100644 --- a/pkgs/development/libraries/db4/db4-4.8.nix +++ b/pkgs/development/libraries/db4/db4-4.8.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: stdenv.mkDerivation { - name = "db4-4.8.26"; + name = "db4-4.8.30"; builder = ./builder.sh; src = fetchurl { - url = http://download.oracle.com/berkeley-db/db-4.8.26.tar.gz; - sha256 = "0hcxh0kb6m0wk3apjhs57p7b171zzn63rg4l3nkcavygg5gx2mgp"; + url = http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz; + sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; }; configureFlags = [ diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 8ec47f86e34..794128d054a 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,8 +3,8 @@ , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: let - version = "1.6.14"; # 1.7.* isn't recommended, even for gnome 3.8 - sha256 = "0v7mcxwfmpjf7vndnvf2kf02al61clrxs36bqii20s0lawfh2xjn"; + version = "1.6.16"; # 1.7.* isn't recommended, even for gnome 3.8 + sha256 = "0wrmh5azszb54zpy7d0zjsy456khcv8yc19ivqrygkdg7a3l4gs6"; inherit (stdenv) lib; diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 6df90622383..39a332223ea 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.1"; + name = "enet-1.3.9"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "1faszy5jvxcbjvnqzxaxpcm0rh8xib52pgn2zm1vyc9gg957hw99"; + sha256 = "0z4blmkyfjrkvgr12adjx7nnjrx4mvcm4zj8jp581m6rral7nf9y"; }; meta = { diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index fec9600b010..a7deb9f4c27 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, zlib, expat}: stdenv.mkDerivation rec { - name = "exiv2-0.22"; + name = "exiv2-0.23"; src = fetchurl { url = "http://www.exiv2.org/${name}.tar.gz"; - sha256 = "0ynf4r4fqijaa9yb0wfddk0a151p8cbcqxab54dyhc1xk83saf6k"; + sha256 = "04bbg2cg6mgcyz435zamx37sp5zw44n2alb59ki1daz71f851yl1"; }; propagatedBuildInputs = [zlib expat]; diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index 98a6c35c8b8..f51e3ccd3c0 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -21,13 +21,13 @@ assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.10"; - + name = "ffmpeg-0.10.10"; + src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3"; + sha256 = "14fbjhiwv5zg9yh0zk3k9h6id815xrikyz6l2cdl7z4vazbmhq4k"; }; - + # `--enable-gpl' (as well as the `postproc' and `swscale') mean that # the resulting library is GPL'ed, so it can only be used in GPL'ed # applications. @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional dc1394Support libdc1394; enableParallelBuilding = true; - + crossAttrs = { dontSetConfigureCross = true; configureFlags = configureFlags ++ [ diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index a2e01fdd41f..34d0a4e49fe 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -31,11 +31,11 @@ assert playSupport -> SDL != null; assert freetypeSupport -> freetype != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.2.3"; + name = "ffmpeg-1.2.4"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0nvilgwaivzvikgp9lpvrwi4p1clxl4w8j961599bg0r2v7n4x6r"; + sha256 = "1pqd544jmbggwisbkm0pj0l585b8a9x5n3jl9zbmqmw63g7ci5iv"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 38371ec276d..92146c12e30 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, zlib, ffmpeg, pkgconfig }: -stdenv.mkDerivation { - name = "ffms-2.17"; - +stdenv.mkDerivation rec { + name = "ffms-2.19"; + src = fetchurl { - url = http://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2; - sha256 = "0gb42hrwnldz3zjlk4llx85dvxysxlfrdf5yy3fay8r8k1vpl7wr"; + url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.19; + name = "${name}.tar.gz"; + sha256 = "0498si8bzwyxxq0f1yc6invzb1lv1ab436gwzn9418839x8pj4vg"; }; NIX_CFLAGS_COMPILE = "-fPIC"; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 2a7bb1dc31a..1d986275563 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -2,7 +2,7 @@ , libXrandr, mesa, libXft, libXfixes, xinput }: let - version = "1.6.48"; + version = "1.6.49"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - sha256 = "1i0q0357lrd41jjr2nkf2a7ls5ls2nwrkxbfc7202vy22942lb9k"; + sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; }; buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index dde95364337..a641040187a 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -9,7 +9,7 @@ composableDerivation.composableDerivation {} (fixed: { md5 = "f5592cff69b239166c9b64ff81943b1a"; }; - buildInputs = [ unzip libjpeg ]; + buildInputs = [ unzip libjpeg libtiff ]; # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0"; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 52d50369dc7..4b92c6470eb 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11 , jasper, libintlOrEmpty, gobjectIntrospection }: +let + ver_maj = "2.30"; + ver_min = "2"; +in stdenv.mkDerivation rec { - name = "gdk-pixbuf-2.28.2"; + name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz"; - sha256 = "05s6ksvy1yan6h6zny9n3bmvygcnzma6ljl6i0z9cci2xg116c8q"; + url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; + sha256 = "1gzczsv41h28is4rrxjfyj1qx8ifp23fq2ckh0k099m9fnhbzfna"; }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. @@ -20,6 +24,8 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" ; + doCheck = false; # broken animation tester + postInstall = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 2e7a8d33cb0..3c4c2703d6f 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, cmake, zlib, python}: stdenv.mkDerivation rec { - version = "0.18.0"; + version = "0.20.0"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - md5 = "50409ddb0c34713677b33ef617e92c94"; + sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj"; }; nativeBuildInputs = [ cmake python ]; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 313eec0bc7d..ef81f210d39 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: stdenv.mkDerivation rec { - name = "glew-1.9.0"; + name = "glew-1.10.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "11xpmsw7m5qn7y8fa2ihhqcislz1bdd83mp99didd5ac84756dlv"; + sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; diff --git a/pkgs/development/libraries/glfw/default.nix b/pkgs/development/libraries/glfw/default.nix index 1f4df39408e..292c15361b6 100644 --- a/pkgs/development/libraries/glfw/default.nix +++ b/pkgs/development/libraries/glfw/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, mesa, libX11, libXext }: stdenv.mkDerivation { - name = "glfw-2.6"; + name = "glfw-2.7.9"; src = fetchurl { - url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2; - sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv"; + url = mirror://sourceforge/glfw/glfw-2.7.9.tar.bz2; + sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; buildInputs = [ mesa libX11 libXext ]; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 97ad7da1626..812148c7adc 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -10,6 +10,13 @@ # Possible solution: disable compilation of this example somehow # Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i # $out/bin/gtester-report' to postInstall if this is solved +/* + * Use --enable-installed-tests for GNOME-related packages, + and use them as a separately installed tests runned by Hydra + (they should test an already installed package) + https://wiki.gnome.org/GnomeGoals/InstalledTests + * Support org.freedesktop.Application, including D-Bus activation from desktop files +*/ let # Some packages don't get "Cflags" from pkgconfig correctly @@ -24,15 +31,18 @@ let done ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true ''; + + ver_maj = "2.38"; + ver_min = "2"; in with { inherit (stdenv.lib) optionalString; }; stdenv.mkDerivation rec { - name = "glib-2.36.4"; + name = "glib-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz"; - sha256 = "0zmdbkg2yjyxdl72w34lxvrssbzqzdficskkfn22s0994dad4m7n"; + url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; + sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5"; }; # configure script looks for d-bus but it is (probably) only needed for tests diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 962b14bc788..6801012e855 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }: +{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: +let + ver_maj = "2.38"; + ver_min = "1"; +in stdenv.mkDerivation rec { - name = "glibmm-2.34.1"; + name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz"; - sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl"; + url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; + sha256 = "18n4czi6lh4ncj54apxms18xn9k8pmrp2ba9sxn0sk9w3pp2bja9"; }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ]; + propagatedBuildInputs = [ glib libsigcxx ]; + + #doCheck = true; # some tests need network meta = { description = "C++ interface to the GLib library"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 6a2caa28136..da746969ed7 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -4,12 +4,16 @@ # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated +let + ver_maj = "1.38"; + ver_min = "0"; +in stdenv.mkDerivation rec { - name = "gobject-introspection-1.36.0"; + name = "gobject-introspection-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/gobject-introspection/1.36/${name}.tar.xz"; - sha256 = "10v3idh489vra7pjn1g8f844nnl6719zgkgq3dv38xcf8afnvrz3"; + url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; + sha256 = "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m"; }; buildInputs = [ flex bison glib pkgconfig python ] diff --git a/pkgs/development/libraries/goffice/0.10.nix b/pkgs/development/libraries/goffice/0.10.nix deleted file mode 100644 index 793704be255..00000000000 --- a/pkgs/development/libraries/goffice/0.10.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 -, pango, libgsf, libxml2, libart, librsvg, intltool, gettext -, cairo, gconf, libgnomeui }: - -stdenv.mkDerivation rec { - name = "goffice-0.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439"; - }; - - buildInputs = [ - pkgconfig libglade bzip2 libart intltool gettext - gconf libgnomeui - ]; - - propagatedBuildInputs = [ - glib libgsf libxml2 gtk libglade libart librsvg cairo pango - ]; - - doCheck = true; - - meta = { - description = "GOffice, a Glib/GTK+ set of document centric objects and utilities"; - - longDescription = '' - There are common operations for document centric applications that are - conceptually simple, but complex to implement fully: plugins, load/save - documents, undo/redo. - ''; - - license = "GPLv2+"; - - platforms = stdenv.lib.platforms.gnu; - }; -} diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 76d1d8c41f7..c7c639f2adb 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.0"; + name = "gperftools-2.1"; src = fetchurl { url = "https://gperftools.googlecode.com/files/${name}.tar.gz"; - sha1 = "da7181a7ba9b5ee7302daf6c16e886c179fe8d1b"; + sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk"; }; - patches = [ ./glibc-2.16.patch ]; - buildInputs = [ libunwind ]; + # some packages want to link to the static tcmalloc_minimal + # to drop the runtime dependency on gperftools + dontDisableStatic = true; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/gperftools/glibc-2.16.patch b/pkgs/development/libraries/gperftools/glibc-2.16.patch deleted file mode 100644 index b17e0d57f5f..00000000000 --- a/pkgs/development/libraries/gperftools/glibc-2.16.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gperftools-2.0/src/base/linuxthreads.cc -=================================================================== ---- gperftools-2.0.orig/src/base/linuxthreads.cc -+++ gperftools-2.0/src/base/linuxthreads.cc -@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t - /* Signal handler to help us recover from dying while we are attached to - * other threads. - */ --static void SignalHandler(int signum, siginfo_t *si, void *data) { -+static void SignalHandler(int signum, struct siginfo *si, void *data) { - if (sig_pids != NULL) { - if (signum == SIGABRT) { - while (sig_num_threads-- > 0) { diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index c33457544f5..2c14451ba78 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libsoup, glib, libxml2}: stdenv.mkDerivation { - name = "gssdp-0.12.1"; + name = "gssdp-0.12.2.1"; src = fetchurl { - url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.1.tar.xz; - sha256 = "0irkbzaj9raais6zdnbj3ysjkmdqhmdvfn0p1sz6x0s9ab6b9b0n"; + url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz; + sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj"; }; buildInputs = [pkgconfig libsoup glib libxml2]; diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix index e7aaaa46a96..49c612f59e7 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm +{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc , useInternalFfmpeg ? false, ffmpeg ? null }: stdenv.mkDerivation rec { - name = "gst-ffmpeg-0.10.12"; + name = "gst-ffmpeg-0.10.13"; src = fetchurl { urls = [ "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi"; + sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; }; # Upstream strongly recommends against using --with-system-ffmpeg, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; buildInputs = - [ pkgconfig bzip2 gst_plugins_base ] + [ pkgconfig bzip2 gst_plugins_base orc ] ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); meta = { diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix index 2d1309f3a3c..a433d717039 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix @@ -1,19 +1,19 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base -, libdvdnav, libdvdread }: +, libdvdnav, libdvdread, orc }: stdenv.mkDerivation rec { - name = "gst-plugins-bad-0.10.22"; + name = "gst-plugins-bad-0.10.23"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "030728gf0zjg62yng4qy9yapaffbvkziawa28rk0gspz8cpi1xyq"; + sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf"; }; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ]; + [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread orc ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index d6717d799f1..59ee86da86d 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia -, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo +, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintlOrEmpty , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { }; patchPhase = '' + sed -i 's@/bin/echo@echo@g' configure sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in ''; # TODO : v4l, libvisual buildInputs = - [ pkgconfig glib cairo ] + [ pkgconfig glib cairo orc ] # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) @@ -37,9 +38,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; propagatedBuildInputs = [ gstreamer ]; - + postInstall = "rm -rf $out/share/gtk-doc"; - + meta = with stdenv.lib; { homepage = http://gstreamer.freedesktop.org; description = "Base plug-ins for GStreamer"; @@ -48,4 +49,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 85468b309c5..a09f8279760 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo -, flac, libjpeg, zlib, speex, libpng, libdv, libcaca -, libiec61883, libavc1394, taglib, pulseaudio +, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx +, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2 }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883 aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex - taglib bzip2 + taglib bzip2 libvpx gdk_pixbuf orc ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix index b85fb983880..769de911fd6 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix @@ -1,19 +1,19 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base -, libmad, libdvdread, libmpeg2, libcdio, a52dec }: +, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.10.18"; + name = "gst-plugins-ugly-0.10.19"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "054fdkb2riy5knda39cp6w3xp9lzax52bn12cklglscjrm46ghgr"; + sha256 = "1w4d5iz9ffvh43l261zdp997i6s2iwd61lflf755s3sw4xch1a8w"; }; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ]; + [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/gst-python/default.nix index fedb44068eb..e960aa90421 100644 --- a/pkgs/development/libraries/gstreamer/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-python/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "gst-python-0.10.19"; + name = "gst-python-0.10.22"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "956f81a8c15daa3f17e688a0dc5a5d18a3118141066952d3b201a6ac0c52b415"; + sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg"; }; buildInputs = diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 76424d79d7a..e3237f83b74 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gettext -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs, x11, gobjectIntrospection +{ stdenv, fetchurl, pkgconfig, gettext, perl +, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection +, xlibs, x11, wayland, libxkbcommon , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: @@ -7,17 +8,23 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; +let + ver_maj = "3.10"; + ver_min = "5"; # .6 needs currently unreleased wayland for introspection (wl_proxy_marshal_constructor) +in stdenv.mkDerivation rec { - name = "gtk+-3.8.4"; + name = "gtk+-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/3.8/${name}.tar.xz"; - sha256 = "1qlj0qdhkp8j5xiris4l4xnx47g4pbk4qnj3nf8rwa82fwb610xh"; + url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz"; + sha256 = "1iyc566r61d3jfdiq5knwbssq5bsqsn8hqzdm30vmw6dx3cgd49i"; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; + + buildInputs = [ wayland libxkbcommon ]; propagatedBuildInputs = with xlibs; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ] diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index ec7f01a8be5..c7ae2ee5312 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -5,14 +5,16 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "gtkmm"; - major = "2"; minor = "24"; patchlevel = "2"; extension = "xz"; - sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; + major = "2"; minor = "24"; patchlevel = "4"; extension = "xz"; + sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"; }; nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; + doCheck = true; + meta = { description = "C++ interface to the GTK+ graphical user interface library"; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 5c4a13fe507..8649abec637 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,17 +1,23 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: +let + ver_maj = "3.10"; + ver_min = "1"; +in stdenv.mkDerivation rec { - name = "gtkmm-3.7.12"; # gnome 3.8 release; stable 3.6 has problems with our new glibc + name = "gtkmm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/3.7/${name}.tar.xz"; - sha256 = "05nrilm34gid7kqlq09hcdd7942prn2vbr1qgqvdhgy4x8pvz9p9"; + url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; + sha256 = "0f1587pc6x8hn268vqj5zr4dvyisj5zd9zpsfxyfm1pkbjmcv9bg"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; + doCheck = true; + meta = { description = "C++ interface to the GTK+ graphical user interface library"; @@ -29,7 +35,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; - maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index c70d8fcb0c2..ca92bb82a73 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }: stdenv.mkDerivation { - name = "gupnp-0.18.1"; + name = "gupnp-0.18.4"; src = fetchurl { - url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.1.tar.xz; - sha256 = "1bn98mw4zicg0a7a2xjr4j93ksnpwkhccii8y8zy08g7x2jg3dhk"; + url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz; + sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb"; }; propagatedBuildInputs = [ libxml2 libsoup gssdp ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 067d3dc9383..083d0a10cdf 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -4,12 +4,16 @@ , libxml2, libxslt, docbook_xsl , lightWeight ? true, gnome, samba, makeWrapper }: +let + ver_maj = "1.18"; + version = "${ver_maj}.3"; +in stdenv.mkDerivation rec { - name = "gvfs-1.14.2"; + name = "gvfs-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; - sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; + url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz"; + sha256 = "0b27vidnrwh6yb2ga9a1k9qlrz6lrzsaz2hcxqbc1igivhb9g0hx"; }; nativeBuildInputs = [ pkgconfig intltool libtool ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 78e016c1582..4cee49bea51 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,19 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, - icu ? null, graphite2 ? null, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty +, icu, graphite2 +, withIcu ? false # recommended by upstream as default, but most don't needed and it's big +, withGraphite2 ? true # it is small and major distros do include it +}: + +# TODO: split non-icu and icu lib into different outputs? +# (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.12"; + name = "harfbuzz-0.9.24"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6"; + sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd"; }; - buildInputs = [ pkgconfig glib freetype ] + configureFlags = [ + ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default + ( "--with-icu=" + (if withIcu then "yes" else "no") ) + ]; + + buildInputs = [ pkgconfig glib freetype cairo ] # recommended by upstream ++ libintlOrEmpty; propagatedBuildInputs = [] - ++ (stdenv.lib.optionals (icu != null) [icu]) - ++ (stdenv.lib.optionals (graphite2 != null) [graphite2]) + ++ stdenv.lib.optional withGraphite2 graphite2 + ++ stdenv.lib.optional withIcu icu ; meta = { diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index a04aea993fa..36d3b41583f 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,13 +1,13 @@ -{ cabal, ObjectName, openal, StateVar, Tensor }: +{ cabal, openal, OpenGL }: cabal.mkDerivation (self: { pname = "OpenAL"; - version = "1.4.0.2"; - sha256 = "19q4pd5i2w330qh895z0cgim4m4f4gxqf4ya1192fchqmgcz1svz"; - buildDepends = [ ObjectName StateVar Tensor ]; + version = "1.6.0.0"; + sha256 = "0bw20ykn8vi3g4im4nsrfz7p1qq9qwnx8da83zwdbr3wjm9934gd"; + buildDepends = [ OpenGL ]; extraLibraries = [ openal ]; meta = { - homepage = "http://connect.creativelabs.com/openal/"; + homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix index abc520e7b4b..bfb340147a8 100644 --- a/pkgs/development/libraries/haskell/assert-failure/default.nix +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1"; sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr"; buildDepends = [ prettyShow text ]; + jailbreak = true; meta = { homepage = "https://github.com/Mikolaj/assert-failure"; description = "Syntactic sugar improving 'assert' and 'error'"; diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix index bffc72cf73e..8fa1eb5ca42 100644 --- a/pkgs/development/libraries/haskell/circle-packing/default.nix +++ b/pkgs/development/libraries/haskell/circle-packing/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "circle-packing"; - version = "0.1.0.2"; - sha256 = "182fadwlf6j3jhlfjskaddaickgcb07wlb7fh42yip2680gh9k1j"; + version = "0.1.0.3"; + sha256 = "1df284n181ny3i7ajx0j6x5grxw404zzz6y8iybmh5qgba1537g2"; meta = { description = "Simple heuristic for packing discs of varying radii in a circle"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index df9f686383e..ec23761003c 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index f83488b850d..c107c4c3c3c 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.3.0"; - sha256 = "1im9247mvqngknvkjncjrjj3wydz2k9wlsin53vyddjcqbqxa54g"; + version = "0.8.3.1"; + sha256 = "11hrp3j3pz1ljp4mh5770fn70bga90kxgwqrm1fl6ki10q2q6z2h"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix index 7dc259cef93..9ffd3ca728d 100644 --- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "direct-sqlite"; - version = "2.3.8"; - sha256 = "0qvqacjymrm6yy093p8biq3swdinh3lx75m27iz1p3ckdkw10lva"; + version = "2.3.9"; + sha256 = "0haq14acdijd41jvah6f6l6qlqc4wjp3mwkx57pz4q5m6qvxrz44"; buildDepends = [ text ]; testDepends = [ base16Bytestring HUnit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix new file mode 100644 index 00000000000..16b73d9bfb3 --- /dev/null +++ b/pkgs/development/libraries/haskell/event-list/default.nix @@ -0,0 +1,16 @@ +{ cabal, nonNegative, QuickCheck, transformers, utilityHt }: + +cabal.mkDerivation (self: { + pname = "event-list"; + version = "0.1.0.2"; + sha256 = "01j48871nijhkbqdsfvbvq01yr9b5a056fn03ccgazikfsd368ri"; + isLibrary = true; + isExecutable = true; + buildDepends = [ nonNegative QuickCheck transformers utilityHt ]; + meta = { + homepage = "http://code.haskell.org/~thielema/event-list/"; + description = "Event lists with relative or absolute time stamps"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 025ed14869f..a0816b5e7aa 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.2"; - sha256 = "0aif7a28qs8ya7q9sklp02gb5228jyj8k4jabbp2sia7j4khrkpv"; + version = "0.2.0.1"; + sha256 = "1fvkfgjwsh0cr6ay4djxc8wg0vqfw2vcq3clqjz0zi8zyyjpv8rx"; buildDepends = [ lens newtype vectorSpace vectorSpacePoints ]; meta = { description = "Simple force-directed layout"; diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index bfedbdb776d..a768a101145 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.2"; - sha256 = "1mb33fafi212a6wawnd8601r80qjb1bja6nbj6jqrd91y96dxdll"; + version = "0.7.2.1"; + sha256 = "160b45bgiz2ckva70dnmkf6i9bvffaavm5wzia2lk8c65pnvc9ih"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 74368defc9c..9db0055922d 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -5,14 +5,13 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.7.2"; - sha256 = "0w8m8ybzb63j1631v2a6xpm727zbj19dv98cml9fyzlxzlvlg5fs"; + version = "0.7.3"; + sha256 = "0cb7smydndigkcib4y8pbsycsqyzg45g5vrglyq1h245rd4j6s37"; buildDepends = [ aeson attoparsec caseInsensitive conduit dataDefault failure hashable HTTP httpConduit httpTypes network text time unorderedContainers vector ]; - patches = [ ./fix-build.patch ]; jailbreak = true; meta = { homepage = "https://github.com/fpco/github"; diff --git a/pkgs/development/libraries/haskell/github/fix-build.patch b/pkgs/development/libraries/haskell/github/fix-build.patch deleted file mode 100644 index 2d3483b38ec..00000000000 --- a/pkgs/development/libraries/haskell/github/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ubr github-0.7.2-orig/Github/Private.hs github-0.7.2/Github/Private.hs ---- github-0.7.2-orig/Github/Private.hs 2013-12-15 19:45:00.611789227 +0100 -+++ github-0.7.2/Github/Private.hs 2013-12-15 19:45:46.359954006 +0100 -@@ -104,9 +104,6 @@ - in Just (Data.List.takeWhile (/= '>') s') - else Nothing - --doHttps :: Method -> String -> Maybe GithubAuth -- -> Maybe (RequestBody (ResourceT IO)) -- -> IO (Either E.SomeException (Response LBS.ByteString)) - doHttps reqMethod url auth body = do - let reqBody = fromMaybe (RequestBodyBS $ BS.pack "") body - reqHeaders = maybe [] getOAuth auth diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index b77cd134dc8..ac1cf83ac5e 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.2"; - sha256 = "0imr0kgxkm2j2xx9ryll5s1b5bn8s4bkwpqdvvb4z44jhrgcgz7b"; + version = "0.3.2.4"; + sha256 = "1m3p64kkm8zv2diwila0zdincykavf2fvxpqzpsmfndwb24f5b3p"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix new file mode 100644 index 00000000000..7e3ebb6476b --- /dev/null +++ b/pkgs/development/libraries/haskell/haskore/default.nix @@ -0,0 +1,21 @@ +{ cabal, dataAccessor, eventList, haskellSrc, markovChain, midi +, nonNegative, parsec, random, transformers, utilityHt +}: + +cabal.mkDerivation (self: { + pname = "haskore"; + version = "0.2.0.3"; + sha256 = "0vg4m2cmy1fabfnck9v22jicflb0if64h0wjvyrgpn2ykb9wwbpa"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + dataAccessor eventList haskellSrc markovChain midi nonNegative + parsec random transformers utilityHt + ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Haskore"; + description = "The Haskore Computer Music System"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix index df4b49b47f3..1c47b68f06c 100644 --- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-client-conduit"; - version = "0.2.0.0"; - sha256 = "1pb47mms5qfi185nrz675if4pb7xji97xdqpmyrplqaxqygwih1y"; + version = "0.2.0.1"; + sha256 = "0fy9vkxh7hvmp9ijifq8nx6y5y92n6d3s1vdyg53ln65pclc6jn5"; buildDepends = [ conduit httpClient resourcet transformers ]; meta = { homepage = "https://github.com/snoyberg/http-client"; diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index f92ddcd7d55..82866abe9c3 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.0.0"; - sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; + version = "0.2.0.2"; + sha256 = "0v5730rssddc28f1q6ndkcjrfz8r5a1wmxk1azpmdxlq6nh4i9q9"; buildDepends = [ connection dataDefault httpClient network tls ]; testDepends = [ hspec httpClient httpTypes ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index b041957e555..bb237f16d58 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.2"; - sha256 = "0ypwn63brdjxyh70x10wb26xbsymj5x9v664nzc3nwvlh22ldhyw"; + version = "2.0.0.3"; + sha256 = "1s3nyc3wwpqildhmkv5fps2a0552yrnwcqjv4bxcvg581k5sj42i"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix new file mode 100644 index 00000000000..5907fce4f17 --- /dev/null +++ b/pkgs/development/libraries/haskell/markov-chain/default.nix @@ -0,0 +1,14 @@ +{ cabal, random, transformers }: + +cabal.mkDerivation (self: { + pname = "markov-chain"; + version = "0.0.3.2"; + sha256 = "0shld9b6vdi5274wyhwpw5ggfm6xi5j7m3ag989bxarhrfzjxgdk"; + buildDepends = [ random transformers ]; + meta = { + homepage = "http://code.haskell.org/~thielema/markov-chain/"; + description = "Markov Chains for generating random sequences with a user definable behaviour"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix new file mode 100644 index 00000000000..e50843c6ff2 --- /dev/null +++ b/pkgs/development/libraries/haskell/midi/default.nix @@ -0,0 +1,21 @@ +{ cabal, binary, eventList, explicitException, monoidTransformer +, nonNegative, QuickCheck, random, transformers, utilityHt +}: + +cabal.mkDerivation (self: { + pname = "midi"; + version = "0.2.1"; + sha256 = "0i767y0835979s9i3wm8qwzh2awhhmfvhc5zvq2lkn8xlsp3wa6y"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary eventList explicitException monoidTransformer nonNegative + QuickCheck random transformers utilityHt + ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/MIDI"; + description = "Handling of MIDI messages and files"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix index 06dcfaa1139..08865132701 100644 --- a/pkgs/development/libraries/haskell/minimorph/default.nix +++ b/pkgs/development/libraries/haskell/minimorph/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "minimorph"; - version = "0.1.4.0"; - sha256 = "16ri9hfriszrgqcm111b1pp5x65s034hrc35kjz5qax32mnc9rn6"; + version = "0.1.5.0"; + sha256 = "00dnvv0pap2xr74xwzldz89783iw320z7p1rdw0lwjjpbqa3v00g"; buildDepends = [ text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 83cd57ce39b..afd96822710 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.3.1"; - sha256 = "1amihx9jl42w7sm01ihnldvgv9cilg89im7gr9l0x2f6q4nbhbl2"; + version = "0.3.3.2"; + sha256 = "0s75q974q6jwp89xj5kkqziy4crm9484dqvrpgd8ms7rw613jjz6"; buildDepends = [ conduit fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text transformers transformersBase diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 2d269fc7a92..448fd3b2f5f 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -1,14 +1,15 @@ -{ cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl -, network, parsec, random, randomShuffle, text, transformersBase +{ cabal, binary, bson, cryptohash, hashtables, liftedBase +, monadControl, mtl, network, parsec, random, randomShuffle, text +, transformersBase }: cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.4.1.1"; - sha256 = "1c9980x3i0jgacgz7mx65l5nyp3h83mqp9b52pzxq90lix6xnwhi"; + version = "1.4.4"; + sha256 = "11v0k2i0ix67zwm19w1215dslnnqllkc4jlhbs5yva2ix4z7d4gh"; buildDepends = [ - binary bson cryptohash liftedBase monadControl mtl network parsec - random randomShuffle text transformersBase + binary bson cryptohash hashtables liftedBase monadControl mtl + network parsec random randomShuffle text transformersBase ]; meta = { homepage = "http://github.com/selectel/mongodb-haskell"; diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix new file mode 100644 index 00000000000..d4e5962ec85 --- /dev/null +++ b/pkgs/development/libraries/haskell/monoid-transformer/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "monoid-transformer"; + version = "0.0.2"; + sha256 = "0hd8jb1iw6lbgml3f08n680bdij56cjanpkr4fc1jr7qn6yzzb2j"; + meta = { + description = "Monoid counterparts to some ubiquitous monad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 4195a048458..0db0a816eea 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.2.1"; - sha256 = "04gl1qdhag60q4j2r61qr1skim1wcyx2vq34j51qk1a62wyqsdrl"; + version = "1.2.1.3"; + sha256 = "0chr8bs0823rkpf9cfx56ghjf29s9xaw23qx5a8g27x7dw5xvc12"; buildDepends = [ aeson blazeBuilder conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index a336ab4fb88..8ca5a919f5c 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.2.3.0"; - sha256 = "0bil1932rnh3my9yjyc4sk24g0qwkkgv8b48nrn7fm007vyf173m"; + version = "1.2.3.2"; + sha256 = "18kail3v524k10gjx2j6yh462bvf89lq49gya0hiwxkmqsbx9fdn"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 720f8e67629..2208955a9d8 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.5"; - sha256 = "102sakvff53dald2s7pbf22m2rgv9761251hj7bwy125jssxcd15"; + version = "0.8.2.6"; + sha256 = "0n3lqffscwc6pq0rfy4yjild9hcgnkpq9a8icbvgxv4si13ipsgh"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 4203c0cd84c..ac34064972c 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -5,14 +5,14 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.3.9.1"; - sha256 = "0byzlmcbwlycvlk35w0gdp5x7860jcc589ypbdx0vm08aq5vz87v"; + version = "0.4.0.1"; + sha256 = "03lj7z0n6yx55xap9606slcp0yiignwild7sibkrmg05jkb193nn"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers uuid vector ]; testDepends = [ - base16Bytestring cryptohash HUnit text time vector + aeson base16Bytestring cryptohash HUnit text time vector ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.3.nix index ea3b7ed27cb..6979213cc29 100644 --- a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix +++ b/pkgs/development/libraries/haskell/pretty-show/1.6.3.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.6.2"; - sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp"; + version = "1.6.3"; + sha256 = "161zhbsqa86s1gqa7ss8pimw2msdlvgjlldh6ryizc17579dfcfw"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellLexer ]; diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix new file mode 100644 index 00000000000..7b14fabd8b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix @@ -0,0 +1,14 @@ +{ cabal, protocolBuffers }: + +cabal.mkDerivation (self: { + pname = "protocol-buffers-descriptor"; + version = "2.0.14"; + sha256 = "0xbpmm9a4fg42c9zbarawqdl4klfjjc233ilbsibb7asa3v7zmj3"; + buildDepends = [ protocolBuffers ]; + meta = { + homepage = "http://code.haskell.org/protocol-buffers/"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix new file mode 100644 index 00000000000..bf74e4fc4d6 --- /dev/null +++ b/pkgs/development/libraries/haskell/protocol-buffers/default.nix @@ -0,0 +1,14 @@ +{ cabal, binary, filepath, mtl, syb, utf8String }: + +cabal.mkDerivation (self: { + pname = "protocol-buffers"; + version = "2.0.14"; + sha256 = "1wihnpvc7kjq345a6v702s42gmrqd9cjm50safc7kigyvhr5vm1i"; + buildDepends = [ binary filepath mtl syb utf8String ]; + meta = { + homepage = "http://code.haskell.org/protocol-buffers/"; + description = "Parse Google Protocol Buffer specifications"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index 0b29a55ce5f..9d76f7aef7b 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "quickcheck-instances"; - version = "0.3.4"; - sha256 = "10kkjqn530cd4bz5jfnvfvpswk25glyjnmy21qj253db6ja8xns1"; + version = "0.3.5"; + sha256 = "1ak55d3yi6ii01921zihn8mk12mws78w05gmhk766kpylhhgni5f"; buildDepends = [ QuickCheck text time ]; meta = { homepage = "https://github.com/aslatter/qc-instances"; diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix index 67073790d25..004bd9d7052 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.1.8"; sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x"; buildDepends = [ mtl parsec regexBase ]; + patches = [ ./fix-build-with-array5.patch ]; meta = { homepage = "http://hackage.haskell.org/package/regex-tdfa"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch b/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch new file mode 100644 index 00000000000..2460e6bfc7a --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch @@ -0,0 +1,120 @@ +diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs +--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs 2011-03-12 00:46:39.000000000 +0100 ++++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs 2013-12-19 12:42:27.048813869 +0100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + -- | This is the code for the main engine. This captures the posix + -- subexpressions. There is also a non-capturing engine, and a + -- testing engine. +@@ -20,7 +21,12 @@ + + import Prelude hiding ((!!)) + import Control.Monad(when,unless,forM,forM_,liftM2,foldM) ++#if MIN_VERSION_array(0,4,0) ++import Data.Array.MArray(MArray(..)) ++import Data.Array.Unsafe(unsafeFreeze) ++#else + import Data.Array.MArray(MArray(..),unsafeFreeze) ++#endif + import Data.Array.IArray(Array,bounds,assocs,Ix(range)) + import qualified Data.IntMap.CharMap2 as CMap(findWithDefault) + import Data.IntMap(IntMap) +@@ -574,7 +580,7 @@ + case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) -> + (# s2#, () #) }} + {- +-#else /* !__GLASGOW_HASKELL__ */ ++-- #else /* !__GLASGOW_HASKELL__ */ + + copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e) + copySTU source destination = do +@@ -585,5 +591,5 @@ + forM_ (range b) $ \index -> + set destination index =<< source !! index + return destination +-#endif /* !__GLASGOW_HASKELL__ */ ++-- #endif /* !__GLASGOW_HASKELL__ */ + -} +diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs +--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs 2011-03-12 00:46:39.000000000 +0100 ++++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs 2013-12-19 12:42:27.049813918 +0100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + -- | This is the code for the main engine. This captures the posix subexpressions. This 'execMatch' + -- also dispatches to "Engine_NC", "Engine_FA", and "Engine_FC_NA" + -- +@@ -19,7 +20,12 @@ + -} + import Prelude hiding ((!!)) + ++#if MIN_VERSION_array(0,4,0) ++import Data.Array.MArray(MArray(..)) ++import Data.Array.Unsafe(unsafeFreeze) ++#else + import Data.Array.MArray(MArray(..),unsafeFreeze) ++#endif + import Data.Array.IArray(Array,bounds,assocs,Ix(rangeSize,range)) + import qualified Data.IntMap.CharMap2 as CMap(findWithDefault) + import Data.IntMap(IntMap) +@@ -716,7 +722,7 @@ + case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) -> + (# s2#, () #) }} + {- +-#else /* !__GLASGOW_HASKELL__ */ ++-- #else /* !__GLASGOW_HASKELL__ */ + + copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e) + copySTU source destination = do +@@ -727,5 +733,5 @@ + forM_ (range b) $ \index -> + set destination index =<< source !! index + return destination +-#endif /* !__GLASGOW_HASKELL__ */ ++-- #endif /* !__GLASGOW_HASKELL__ */ + -} +diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs +--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs 2011-03-12 00:46:39.000000000 +0100 ++++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs 2013-12-19 12:42:27.048813869 +0100 +@@ -1,10 +1,16 @@ ++{-# LANGUAGE CPP #-} + -- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String + module Text.Regex.TDFA.NewDFA.Engine_NC_FA(execMatch) where + + import Control.Monad(unless) + import Prelude hiding ((!!)) + ++#if MIN_VERSION_array(0,4,0) ++import Data.Array.MArray(MArray(newArray)) ++import Data.Array.Unsafe(unsafeFreeze) ++#else + import Data.Array.MArray(MArray(newArray),unsafeFreeze) ++#endif + import Data.Array.ST(STArray) + import qualified Data.IntMap.CharMap2 as CMap(findWithDefault) + import qualified Data.IntMap as IMap(null) +diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs +--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs 2011-03-12 00:46:39.000000000 +0100 ++++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs 2013-12-19 12:42:27.048813869 +0100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + -- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String + module Text.Regex.TDFA.NewDFA.Engine_NC(execMatch) where + +@@ -5,7 +6,12 @@ + import Data.Array.Base(unsafeRead,unsafeWrite) + import Prelude hiding ((!!)) + ++#if MIN_VERSION_array(0,4,0) ++import Data.Array.MArray(MArray(..)) ++import Data.Array.Unsafe(unsafeFreeze) ++#else + import Data.Array.MArray(MArray(..),unsafeFreeze) ++#endif + import Data.Array.IArray(Ix) + import Data.Array.ST(STArray,STUArray) + import qualified Data.IntMap.CharMap2 as CMap(findWithDefault) +@@ -248,4 +254,3 @@ + wsToGroup (WScratch start stop) = do + ma <- newArray (0,0) (start,stop-start) :: S.ST s (STArray s Int (MatchOffset,MatchLength)) + unsafeFreeze ma +- diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index b4d0fccd8a0..913e77483e4 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.9"; - sha256 = "1jpaphmwvykjshjqwmmyfx64w1j99f6dphy9ygrzc32fjffk5laz"; + version = "0.4.10"; + sha256 = "0mgwcgacf4ilyh54s862p8jqv1f42dkp287sdkpswyai1pxlvipz"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix new file mode 100644 index 00000000000..4a299e9f556 --- /dev/null +++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix @@ -0,0 +1,21 @@ +{ cabal, aeson, attoparsec, dataDefault, mtl, network +, protocolBuffers, protocolBuffersDescriptor, text, time +, unorderedContainers, utf8String, vector +}: + +cabal.mkDerivation (self: { + pname = "rethinkdb"; + version = "1.8.0.5"; + sha256 = "1s3mzbs0b2jdvs1gfdxb2fp2lw7978ja63411iz43yjd29d3pwzq"; + buildDepends = [ + aeson attoparsec dataDefault mtl network protocolBuffers + protocolBuffersDescriptor text time unorderedContainers utf8String + vector + ]; + meta = { + homepage = "http://github.com/atnnn/haskell-rethinkdb"; + description = "RethinkDB is a distributed document store with a powerful query language"; + license = self.stdenv.lib.licenses.asl20; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index d72aed42852..b3ca635ac21 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "scotty"; - version = "0.6.1"; - sha256 = "1fcrd1fxlmgkm9d6xfyb76pmn68pgk0a367lpmyh77kp0zr3f7ib"; + version = "0.6.2"; + sha256 = "0szki6wcmhj20kxhmgidgf930xwhiq03qrk8m0x8aklcjzkhvy69"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat text transformers wai waiExtra warp diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 74646c9acca..c430dfc36a6 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.8.0"; - sha256 = "1wjrn4cq47jjmqkb2zv02x90l2mv6n7zh4mvcav25s9bwvvca10r"; + version = "0.5.9.0"; + sha256 = "1iy0d437yd6hgmxmiqa0b6lvg4gw838jxqwn83kdpy1mlykqwmgq"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 6ba25cdc99b..c88e3c268d2 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -1,13 +1,14 @@ -{ cabal, ansiTerminal, deepseq, mtl, optparseApplicative +{ cabal, ansiTerminal, deepseq, either, mtl, optparseApplicative , regexPosix, stm, tagged }: cabal.mkDerivation (self: { pname = "tasty"; - version = "0.5.2.1"; - sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym"; + version = "0.6"; + sha256 = "00mf8pxwingzywnzgh7dypask1spp18kpiwqjbf1y11dqbs6ib6w"; buildDepends = [ - ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged + ansiTerminal deepseq either mtl optparseApplicative regexPosix stm + tagged ]; meta = { description = "Modern and extensible testing framework"; diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix index bf5f2f0d0a7..ac6cfdd43ae 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix @@ -18,7 +18,8 @@ cabal.mkDerivation (self: { substituteInPlace trifecta.cabal \ --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," + --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ + --replace "comonad == 3.*," "comonad >= 3 && < 5," ''; meta = { homepage = "http://github.com/ekmett/trifecta/"; diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix index f7b9a7aea81..de876fa7f67 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix @@ -18,7 +18,8 @@ cabal.mkDerivation (self: { substituteInPlace trifecta.cabal \ --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," + --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ + --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," ''; meta = { homepage = "http://github.com/ekmett/trifecta/"; diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix index 4a730891998..e88433a79c0 100644 --- a/pkgs/development/libraries/haskell/type-eq/default.nix +++ b/pkgs/development/libraries/haskell/type-eq/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "type-eq"; - version = "0.3"; - sha256 = "094m8mk4a1iiqgrnqw0yk89rimp5ffj7i4n61nx3lzxqs5mw0kws"; + version = "0.4"; + sha256 = "1cvbqxwkiybxbpzr98yl2pnx5w4zrr340z86q40zirgr1f0ch674"; meta = { - homepage = "http://github.com/glehel/type-eq"; + homepage = "http://github.com/glaebhoerl/type-eq"; description = "Type equality evidence you can carry around"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index 8470a2d3f82..a52f9fe04fb 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.2.1"; - sha256 = "0zix8m38dza95g6ijip4r5nxz6y9vkh5jy8ksg4qpx1v2ib1m2cc"; + version = "0.2.2.2"; + sha256 = "0an4lwwkzr902r0rxa35i9kdm5cpgdfmg5m06zsxzbck3mry7871"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index 083f269255a..e800b3cee47 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-text"; - version = "1.1.0.0"; - sha256 = "18xgsrxg20sk18m9dwds6161vl4hgdp052qbb0cg9jqy50vhddis"; + version = "1.1.0.1"; + sha256 = "1rb5jmryxzcn6j8xalvsgwr61d1qzmsjyfp3iiq10n565bja70za"; buildDepends = [ text ]; meta = { description = "A Wadler/Leijen Pretty Printer for Text values"; diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 7119705b357..700a838f894 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4.1"; - sha256 = "1k1ci9lq8l9bx8ks7rdng9jjj6d7hcwgmfbz757al85m1q17xa64"; + version = "0.2.4.2"; + sha256 = "0a5wmwcl3akw1n9xgdhvlrbvphvy9s528daax28137ixaphvrl0f"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; meta = { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 87cbe9f3d43..9de464d8ae3 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.4"; - sha256 = "1bpcz8ihjqdhyxxm4ib4yhgj5h491lxv34mpc3x55wl2daq731qi"; + version = "1.2.5.1"; + sha256 = "163snl6165zkndcmr3iy48yl04rs7cp67kq77yxglxm420y8391h"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 87b4d059dc5..1c2922fe069 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.3"; - sha256 = "0p2640bbsx1lmxd0wq6qwicp6rbh1c54hjb6kiaczj63yahn04y3"; + version = "1.2.0.4"; + sha256 = "1c3fpfvcdx8ijvjxxfjwld5zl6x4xl2587a8gdj2qmsr94f8lgb9"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 932c8114c0f..2ab163d4b33 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -3,7 +3,7 @@ let pname = "icu4c"; - version = "51.1"; + version = "52.1"; in stdenv.mkDerivation { name = pname + "-" + version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "0sv6hgkm92pm27zgjxgk284lcxxbsl0syi40ckw2b7yj7d8sxrc7"; + sha256 = "14l0kl17nirc34frcybzg0snknaks23abhdxkmsqg3k9sil5wk9g"; }; postUnpack = '' diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 4e6614345c1..3c408e6bc78 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.40"; + name = "iso-codes-3.49"; src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "0iph96n8vh4khidxg2zzhmcqnphfzg50agn0lv9cjhmnx0i712pr"; + sha256 = "1ryk5i467p7xxrbrqynb35ci046yj9k9b4d3hfxzass962lz9q04"; }; patchPhase = '' for i in `find . -name \*.py` diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index e84bd0656c4..ecd63e98f19 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}: stdenv.mkDerivation { - name = "leptonica-1.68"; + name = "leptonica-1.69"; src = fetchurl { - url = http://www.leptonica.org/source/leptonica-1.68.tar.gz; - sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc"; + url = http://www.leptonica.org/source/leptonica-1.69.tar.gz; + sha256 = "0bd7w0zpmwwfn1cnrlyzjw3jf8x59r0rhdmvk7rigr57rnfnddry"; }; buildInputs = [ libpng libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 287ac32fff5..6678984ebbe 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -27,7 +27,7 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { libav_9 = libavFun "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3"; - libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79"; + libav_0_8 = libavFun "0.8.9" "0zzphhkpwsdp2k3ijqr8miqsp4vk7dgcrcrv06qda1s09qb82lag"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index b8410380aba..f183d9c3cd0 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "libcaca-0.99.beta17"; + name = "libcaca-0.99.beta18"; src = fetchurl { url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz"; - sha256 = "1mpicj3xf4d0mf8papb1zbks5yzi4lnj6yh5cvpq7sb176gawmb3"; + sha256 = "189kdh7zi88gxb3w33rh0p5l0yhn7s1c2xjgrpf24q2a7xihdskp"; }; configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 00159e1de46..856d5124a3f 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.90"; + name = "libcdio-0.92"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "0kpp6gr5sjr30pb9klncc37fhkw0wi6r41d2fmvmw17cbj176zmg"; + sha256 = "1b9zngn8nnxb1yyngi1kwi73nahp4lsx59j17q1bahzz58svydik"; }; buildInputs = [ libcddb pkgconfig ncurses help2man ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index cd784a4de6a..f92bc585524 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libraw1394, libusb1 }: stdenv.mkDerivation rec { - name = "libdc1394-2.2.0"; + name = "libdc1394-2.2.1"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "0v7y8r8zxpkcw8fhwr6x08wkbpfzs5snw5s589fpqmn569f1grn6"; + sha256 = "1wkcx4ff094qba1fwllmlr81i7xg7l8dzq7y7pvy3wlbpwd3634j"; }; buildInputs = [ libraw1394 libusb1 ]; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 970a1cf05e9..8d7049dc29a 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, imagemagick }: stdenv.mkDerivation rec { - name = "libdmtx-0.7.2"; + name = "libdmtx-0.7.4"; src = fetchurl { url = "mirror://sourceforge/libdmtx/${name}.tar.bz2"; - sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk"; + sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index cf3febfc455..5aa54582fdc 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.46"; + name = "libdrm-2.4.50"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1wah4qmrrcv0gnx65lhrlxb6gprxch92wy8lhxv6102fml6k5krk"; + sha256 = "0idh6cwqr2rilig7vygb3gxvivchp0q1iq4md79jq340v96d48rq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 73755ab3386..40fa337bd66 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libdvdcss-1.2.10"; + name = "libdvdcss-1.2.13"; src = fetchurl { - url = http://download.videolan.org/pub/libdvdcss/1.2.10/libdvdcss-1.2.10.tar.bz2; - sha256 = "0812zxg4b6yjkckzwdzfzb4jnffykr9567f9v29barmb2d8ag513"; + url = http://download.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2; + sha256 = "0b5s25awn2md4jr00rwg5siwvi3kivyaxkjgfxzzh7ggrykbpwc4"; }; meta = { diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index a3122dcf9a9..309816b65e5 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.0.1"; + name = "libextractor-1.2"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1khy9s86vq6667h02zp2fvb16sqm27xlmr0xchgfxvsd6ascnl9j"; + sha256 = "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96"; }; preConfigure = diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix new file mode 100644 index 00000000000..f5f8297bc6c --- /dev/null +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -0,0 +1,44 @@ +{ fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }: + +stdenv.mkDerivation rec { + name = "libgcrypt-1.6.0"; + + src = fetchurl { + url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; + sha256 = "024plbybsmnxbp39hs92lp6dzvkz2cb70nv69qrwr55d02350bb6"; + }; + + nativeBuildInputs = [ transfig ghostscript texinfo ]; + + propagatedBuildInputs = [ libgpgerror ]; + + preBuild = '' + (cd doc; make stamp-vti) + ''; + + doCheck = true; + + # For some reason the tests don't find `libgpg-error.so'. + checkPhase = '' + LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \ + make check + ''; + + meta = { + description = "GNU Libgcrypt, a general-pupose cryptographic library"; + + longDescription = '' + GNU Libgcrypt is a general purpose cryptographic library based on + the code from GnuPG. It provides functions for all + cryptographic building blocks: symmetric ciphers, hash + algorithms, MACs, public key algorithms, large integer + functions, random numbers and a lot of supporting functions. + ''; + + license = "LGPLv2+"; + + homepage = https://www.gnu.org/software/libgcrypt/; + repositories.git = git://git.gnupg.org/libgcrypt.git; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index eb0de7aa2be..da142a957ad 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash }: stdenv.mkDerivation (rec { - name = "libgpg-error-1.11"; + name = "libgpg-error-1.12"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1h0ql8j65ns2rmhj9wnc9035026crzkg226xg8614fq71947ccxf"; + sha256 = "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"; }; doCheck = true; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index a4aa1cf44b4..8976e743192 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0d0jwdmj3h89bxdxlwrys2mw18mqcj4rzgb5l2ndpah8zj600mr6"; }; + patches = [ ./libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch ]; + buildInputs = [ nasm ]; doCheck = true; diff --git a/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch b/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch new file mode 100644 index 00000000000..8c0f9c75054 --- /dev/null +++ b/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch @@ -0,0 +1,40 @@ +Thanks to the sources below; this patch discovered via Gentoo. + +http://bugzilla.redhat.com/show_bug.cgi?id=1031734 +http://bugzilla.redhat.com/show_bug.cgi?id=1031749 +http://sourceforge.net/p/libjpeg-turbo/code/1090/ + +--- libjpeg-turbo-1.3.0/jdmarker.c ++++ libjpeg-turbo-1.3.0/jdmarker.c +@@ -304,7 +304,7 @@ + /* Process a SOS marker */ + { + INT32 length; +- int i, ci, n, c, cc; ++ int i, ci, n, c, cc, pi; + jpeg_component_info * compptr; + INPUT_VARS(cinfo); + +@@ -348,6 +348,13 @@ + + TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc, + compptr->dc_tbl_no, compptr->ac_tbl_no); ++ ++ /* This CSi (cc) should differ from the previous CSi */ ++ for (pi = 0; pi < i; pi++) { ++ if (cinfo->cur_comp_info[pi] == compptr) { ++ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc); ++ } ++ } + } + + /* Collect the additional scan parameters Ss, Se, Ah/Al. */ +@@ -465,6 +472,8 @@ + for (i = 0; i < count; i++) + INPUT_BYTE(cinfo, huffval[i], return FALSE); + ++ MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8)); ++ + length -= count; + + if (index & 0x10) { /* AC table definition */ diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index b724f915150..9ab1962806a 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cyrus_sasl, libevent }: stdenv.mkDerivation rec { - name = "libmemcached-1.0.7"; + name = "libmemcached-1.0.8"; src = fetchurl { - url = https://launchpad.net/libmemcached/1.0/1.0.7/+download/libmemcached-1.0.7.tar.gz; - sha256 = "10cdczkgqiirjy7jwfdk49namqi4jiv1djqrf5fxbaiyfg4qdyiy"; + url = https://launchpad.net/libmemcached/1.0/1.0.8/+download/libmemcached-1.0.8.tar.gz; + sha256 = "198wcvhrqjnak0cjnkxmjsr3xkjc1k6yq2a77nlk852gcf8ypx03"; }; buildInputs = [ cyrus_sasl libevent ]; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 81878917384..b58e2dd257d 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,18 +1,14 @@ -{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake110x, autoconf, libtool }: +{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: stdenv.mkDerivation rec { - name = "libmng-1.0.10"; + name = "libmng-2.0.2"; src = fetchurl { - url = "mirror://sourceforge/libmng/${name}.tar.bz2"; - sha256 = "06415s40gz833s1v1q7c04c0m49p4sc87ich0vpdid2ldj0pf53v"; + url = "mirror://sourceforge/libmng/${name}.tar.xz"; + sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317"; }; - preConfigure = "unmaintained/autogen.sh"; - - nativeBuildInputs = [ automake110x autoconf libtool ]; - - propagatedBuildInputs = [ zlib libpng libjpeg lcms ]; + propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; meta = { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 7a8b2d36143..d02217afd3e 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libmspack-0.3alpha"; + name = "libmspack-0.4alpha"; src = fetchurl { - url = http://www.cabextract.org.uk/libmspack/libmspack-0.3alpha.tar.gz; - sha256 = "03rlzhvzd3qm7sb029gs14syq1z6xjmczvwb9kbz5sl20sjngidh"; + url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz; + sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp"; }; meta = { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 95d060df7f7..10bc9e5eebf 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.5"; + name = "libmtp-1.1.6"; propagatedBuildInputs = [ libusb1 ]; buildInputs = [ pkgconfig ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "0fn6y7kirgln6sfizmwvjsy7qkdb0p3rccf0zkr3r2xg3cbpjxkq"; + sha256 = "02nbf1cigxmv9sak201f4m5c1d21q6avgzjlxd941plimy1iq71s"; }; meta = { diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index ab8034c781e..00308bf9471 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { ver_maj = "0.7"; - ver_min = "5"; + ver_min = "6"; name = "libnotify-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz"; - sha256 = "0lmnzy16vdjs9vlgdm0b7wfyi1nh526hv2dpb7vxb92bhx3wny23"; + sha256 = "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf"; }; src_m4 = fetchurl { url = "mirror://gentoo/distfiles/introspection-20110205.m4.tar.bz2"; diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index f3c2d3b766d..b11b1202080 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "libogg-1.3.0"; + name = "libogg-1.3.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3"; + sha256 = "1ynwij1qdibwb2nvcl3ixri0c6pvq1higl96hf87iyqsv1wasnrs"; }; nativeBuildInputs = [ xz ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 6702cdec9c1..f120bca50c6 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.4"; - sha256 = "15pqany43q2hzaxqn84p9dba071xmvqi8h1bhnjxnxdf3g64zayg"; - patch_src = fetchurl { # not released yet, hopefully OK - url = "mirror://sourceforge/libpng-apng/libpng-1.6.3-apng.patch.gz"; - sha256 = "0fjnb6cgbj2c7ggl0qzcnliml2ylrjxzigp89vw0hxq221k5mlsx"; + version = "1.6.8"; + sha256 = "109h2fcjspd792lvh5q4xnkpsv7rjczmrdl15i4ajx0xbs5kvxr4"; + patch_src = fetchurl { + url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; + sha256 = "0wysnv0d8h7pyz7gfagnkwra2k7malqga1cn6wbk2l7a8k2r53qi"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 4658cf28335..500acdfb2ec 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, libxslt, curl }: stdenv.mkDerivation rec { - name = "raptor2-2.0.8"; # 2.0.9 misses a header and so fails liblrdf + name = "raptor2-2.0.12"; # 2.0.9 misses a header and so fails liblrdf src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1mz7cxnfw73saf74c9if06n2mlsvn2rnn67vy7j2mq3wkhy0hcb0"; + sha256 = "1644a1nnw5k6168v9gjfx1rcbij6ybjximd35a3zhcvyyijmb5di"; }; buildInputs = [ libxml2 libxslt ]; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 6d6f9d05808..1acc7c1d73c 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: stdenv.mkDerivation rec { - name = "rasqal-0.9.30"; + name = "rasqal-0.9.31"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1z8wifq79kivcwpwzmjnjdrbr65zam190gpxhgrvsyfch0yykw5b"; + sha256 = "1vkzifr488i31vxdnykyf2aq87023vx4bag4d94b1rdhy74l7mr8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 15e07af9f1e..808407877e9 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -6,7 +6,7 @@ # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.36.4"; + name = "librsvg-2.36.4"; # 2.37 needs pango 1.32.6, 2.40 doesn't support gtk2 src = fetchurl { url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 57eaf529a63..708d8989304 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, fftw, libsndfile }: stdenv.mkDerivation rec { - name = "libsamplerate-0.1.7"; + name = "libsamplerate-0.1.8"; src = fetchurl { url = "http://www.mega-nerd.com/SRC/${name}.tar.gz"; - sha256 = "1k3z09b13c0z10mqfn6w48pxsdx569s3wslg0x52q5mzy6gmvvbq"; + sha256 = "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck"; }; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index b1e4f31c567..a127e7322eb 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, pkgconfig, gnum4 }: stdenv.mkDerivation rec { - name = "libsigc++-2.2.10"; + name = "libsigc++-2.2.11"; src = fetchurl { url = "mirror://gnome/sources/libsigc++/2.2/${name}.tar.xz"; - sha256 = "8ceb6f2732f5399ef50d5b70f433d49945a12e0900b8f9f43c135866a2e5bf47"; + sha256 = "0ms93q7r8zznsqkfdj1ds9533f0aqfaw3kdkqv154rzmfigh8d4q"; }; buildInputs = [ pkgconfig gnum4 ]; + doCheck = true; + meta = { homepage = http://libsigc.sourceforge.net/; description = "A typesafe callback system for standard C++"; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 8164b79e61b..8b0eeeb8e57 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: stdenv.mkDerivation rec { - name = "libsndfile-1.0.23"; + name = "libsndfile-1.0.25"; src = fetchurl { url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz"; - sha256 = "0k9x4804gfh9d9zd4rm1v2izm8l716rzk4d6jlrjcf45b5sw7jal"; + sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar"; }; buildInputs = [ pkgconfig flac libogg libvorbis ]; diff --git a/pkgs/development/libraries/libsoup/2.40.nix b/pkgs/development/libraries/libsoup/2.44.nix index ca37ceb941c..4bef93ff8cd 100644 --- a/pkgs/development/libraries/libsoup/2.40.nix +++ b/pkgs/development/libraries/libsoup/2.44.nix @@ -1,32 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, sqlite, intltool, python -, gnomeSupport ? true, libgnome_keyring, glib_networking +{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection +, glib, libxml2, sqlite, glib_networking +, gnomeSupport ? true, libgnome_keyring }: stdenv.mkDerivation { - name = "libsoup-2.44.1"; + name = "libsoup-2.44.2"; - src = fetchurl { - url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.1.tar.xz; - sha256 = "07acjwvik3gagcsdjzi85g44ga4pd3nh4ww6722bfzjzvlqw6cn5"; + meta = { + description = "HTTP client/server library"; + license = stdenv.lib.licenses.lgpl2Plus; }; + src = fetchurl { + url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz; + sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77"; + }; preConfigure = '' substituteInPlace libsoup/tld-parser.py \ --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}" ''; - buildInputs = [ pkgconfig intltool python ]; - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ]; + propagatedBuildInputs = [ glib libxml2 sqlite ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; + passthru.propagatedUserEnvPackages = [ glib_networking ]; # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - meta = { -# inherit (glib.meta) maintainers platforms; - }; } diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index a57e2f8d3b8..0a06452d5d8 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "libssh-0.5.4"; + name = "libssh-0.5.5"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/41/libssh-0.5.4.tar.gz"; - sha256 = "106a9nzmr8q5kw809p5zdhmjrqv7p6609ai5c1n7xi7pxg52af2z"; + url = "https://red.libssh.org/attachments/download/51/${name}.tar.gz"; + sha256 = "17cfdff4hc0ijzrr15biq29fiabafz0bw621zlkbwbc1zh2hzpy0"; }; buildInputs = [ zlib libgcrypt ]; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index e073717de56..2c99199664d 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,7 +1,13 @@ -{ stdenv, fetchurl, zlib, libjpeg }: - -let version = "4.0.3"; in +{ stdenv, fetchurl, fetchsvn, pkgconfig, zlib, libjpeg, xz }: +let + version = "4.0.3"; + patchDir = fetchsvn { + url = svn://svn.archlinux.org/packages/libtiff/trunk; + rev = "198247"; + sha256 = "0a47l0zkc1zz7wxg64cyjv9z1djdvfyxgmwd03znlsac4zijkcy4"; + }; +in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -13,10 +19,27 @@ stdenv.mkDerivation rec { sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"; }; - propagatedBuildInputs = [ zlib libjpeg ]; + patchPhase = '' + for p in ${patchDir}/*-{2013-4244,2012-4447,2012-4564,2013-1960,2013-1961,libjpeg-turbo}.patch; do + patch -p1 < "$p" + done + ( + cd tools + for p in ${patchDir}/*-CVE-{2013-4231,2013-4232}.patch; do + patch -p0 < "$p" + done + ) + patch -p0 < ${patchDir}/${if stdenv.isDarwin then "tiff-4.0.3" else "*"}-tiff2pdf-colors.patch + ''; # ^ sh on darwin seems not to expand globs in redirects, and I don't want to rebuild all again elsewhere + + nativeBuildInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) enableParallelBuilding = true; + doCheck = true; + meta = { description = "Library and utilities for working with the TIFF image file format"; homepage = http://www.remotesensing.org/libtiff/; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 7c3e7ed69a9..035077e12a6 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python }: +{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconvOrNull, geoip }: stdenv.mkDerivation rec { name = "libtorrent-rasterbar-${version}"; - version = "0.16.12"; + version = "0.16.13"; src = fetchurl { url = "http://libtorrent.googlecode.com/files/${name}.tar.gz"; - sha256 = "0s2nxhz4d93xcl6hchmfgi8hq7aw8mrkgixh5an7fbk4shswpcg8"; + sha256 = "1sr788hhip6pgfb842110nl36hqdc1vz2s9n5vzypm0jy7qklmvm"; }; - buildInputs = [ boost pkgconfig openssl zlib python ]; + buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ]; configureFlags = [ "--with-boost=${boost}/include/boost" "--with-boost-libdir=${boost}/lib" "--enable-python-binding" + "--with-libgeoip=system" + "--with-libiconv=yes" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 603759d47c0..125cb890008 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gtk dbus_glib ]; # don't make deprecated usages hard errors - preBuildPhases = "preBuild"; preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; doCheck = true; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 5c3670e2365..75139ea988b 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,13 +1,15 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, xz}: stdenv.mkDerivation rec { - name = "libunwind-1.0.1"; + name = "libunwind-1.1"; src = fetchurl { url = "mirror://savannah/libunwind/${name}.tar.gz"; - sha256 = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f"; + sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"; }; - + + propagatedBuildInputs = [ xz ]; + NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; preInstall = '' mkdir -p "$out/lib" diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 74c6b8fa615..44daabe6a73 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.7.7"; + version = "0.8.1"; name = "liburcu-${version}"; src = fetchurl { url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a"; + sha256 = "07p0lh43j7i1606m4l1dxm195z6fcfz74fmx7q2d7mrhn2bzc240"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index f06eacb67a9..dfb8f1c54a1 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,10 +1,13 @@ { stdenv, fetchurl, pkgconfig, udev }: +let + version = "1.0.17"; +in stdenv.mkDerivation rec { - name = "libusb-1.0.17"; + name = "libusb-${version}"; src = fetchurl { - url = "mirror://sourceforge/libusbx/libusbx-1.0.17.tar.bz2"; + url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2"; sha256 = "1f25a773x9x5n48a0mcigyk77ay0hkiz6y6bi4588wzf7wn8svw7"; }; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 835e2711a77..cc8b3f59529 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, xlibs }: stdenv.mkDerivation rec { - name = "libvdpau-0.6"; + name = "libvdpau-0.7"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "0x9dwxzw0ilsy88kqlih3170z1zfrrsx1dr9jbwbn0cbkpnbwmcv"; + sha256 = "1q5wx6fmqg2iiw57wxwh5vv4yszqs4nlvlzhzdn9vig8gi30ip14"; }; buildInputs = with xlibs; [ pkgconfig dri2proto libXext ]; propagatedBuildInputs = [ xlibs.libX11 ]; - + configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ]; meta = { diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 59355f3c37d..17393fab074 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -10,4 +10,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ libX11 gtk3 ]; + + configureFlags = [ "--disable-introspection" ]; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 4a1327778d4..e7923f3df5b 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, yacc, flex, xkeyboard_config }: +{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.2.0"; + name = "libxkbcommon-0.3.1"; src = fetchurl { - url = "http://xkbcommon.org/download/${name}.tar.bz2"; - sha256 = "0hpvfa8p4bhvhc1gcb578m354p5idd192xb8zlaq16d33h90msvl"; + url = "http://xkbcommon.org/download/${name}.tar.xz"; + sha256 = "13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww"; }; - buildInputs = [ yacc flex xkeyboard_config ]; + buildInputs = [ pkgconfig yacc flex xkeyboard_config ]; configureFlags = '' --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ee369ddc58b..fd84c53c88f 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; - sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"; + sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz"; }; buildInputs = [ libxml2 ]; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 0856832c188..9d07f033eda 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-1.0.4"; + name = "log4cplus-1.1.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "c2bb01b5f4bff5fa768700e98ead4a79dfd556096c9f3f0401849da7ab80fbef"; + sha256 = "14zdfaxnxjrnfdjipmcrvsqp8pj1s4wscphvg4jvbp3kd34mcvf4"; }; meta = { diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 983fabc041e..e62fa2fa1c5 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost -, apr, aprutil, db45, expat +, apr, aprutil, db4, expat }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src/main/cpp/socketoutputstream.cpp ''; - buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat]; + buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat]; meta = { homepage = http://logging.apache.org/log4cxx/index.html; diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix new file mode 100644 index 00000000000..9c6c8e5e334 --- /dev/null +++ b/pkgs/development/libraries/mdds/0.7.1.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.7.1"; + name = "mdds-${version}"; + + src = fetchurl { + url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2"; + sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy"; + }; + + meta = { + homepage = https://code.google.com/p/multidimalgorithm/; + description = "A collection of multi-dimensional data structure and indexing algorithm"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 9c6c8e5e334..8ff2cac539c 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.7.1"; + version = "0.8.1"; name = "mdds-${version}"; src = fetchurl { url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2"; - sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy"; + sha256 = "12w8rs8kb8yffndsw0g7qfjvy4gpnppkdzc7r7vvc9n800ixl1gn"; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b613f4c8964..f7ff87b34cc 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -3,8 +3,8 @@ , libdrm, xorg, wayland, udev, llvm, libffi , libvdpau , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt -, enableR600LlvmCompiler ? false # current llvm-3.3 + mesa-9.1.6 don't configure -, enableExtraFeatures ? false # add ~15 MB to mesa_drivers +, enableR600LlvmCompiler ? true, libelf +, enableExtraFeatures ? false # not maintained }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then @@ -16,23 +16,26 @@ else This or the mesa attribute (which also contains GLU) are small (~ 2.2 MB, mostly headers) and are designed to be the buildInput of other packages. - DRI and EGL drivers are compiled into $drivers output, - which is bigger (~13 MB) and depends on LLVM (~40 MB). - These should be searched at runtime in /run/current-system/sw/lib/* + which is bigger (~13 MB) and depends on LLVM (~44 MB). + These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*" and so are kind-of impure (given by NixOS). (I suppose on non-NixOS one would create the appropriate symlinks from there.) + - libOSMesa is in $osmesa (~4.2 MB) */ let - version = "9.1.7"; + version = "9.2.5"; # this is the default search path for DRI drivers (note: X server introduces an overriding env var) driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in +with { inherit (stdenv.lib) optional optionals optionalString; }; + stdenv.mkDerivation { name = "mesa-noglu-${version}"; - src = fetchurl { + src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "1824p185ys7z9bah46xasp7khv44n9wv2c4p38i1dispniwbirih"; + sha256 = "1w3bxclgwl2hwyxk3za7dbdakb8jsya7afck35cz0v8pxppvjsml"; }; prePatch = "patchShebangs ."; @@ -40,7 +43,6 @@ stdenv.mkDerivation { patches = [ ./static-gallium.patch ./dricore-gallium.patch - ./fix-rounding.patch ./werror-wundef.patch ]; @@ -50,11 +52,11 @@ stdenv.mkDerivation { -i src/egl/main/Makefile.am ''; - outputs = ["out" "drivers"]; + outputs = ["out" "drivers" "osmesa"]; preConfigure = "./autogen.sh"; - configureFlags = with stdenv.lib; [ + configureFlags = [ "--with-dri-driverdir=$(drivers)/lib/dri" "--with-egl-driver-dir=$(drivers)/lib/egl" "--with-dri-searchpath=${driverLink}/lib/dri" @@ -65,70 +67,84 @@ stdenv.mkDerivation { "--enable-driglx-direct" # seems enabled anyway "--enable-gallium-llvm" "--with-llvm-shared-libs" "--enable-xa" # used in vmware driver + "--enable-gles1" "--enable-gles2" + "--enable-vdpau" + "--enable-osmesa" # used by wine "--with-dri-drivers=i965,r200,radeon" - "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" # radeonsi complains about R600 missing in LLVM + ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" + + optionalString enableR600LlvmCompiler ",radeonsi") "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi" ] - ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler" # complains about R600 missing in LLVM + ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler" ++ optional enableTextureFloats "--enable-texture-float" ++ optionals enableExtraFeatures [ - "--enable-gles1" "--enable-gles2" - "--enable-osmesa" "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful #"--enable-xvmc" # tests segfault with 9.1.{1,2,3} - "--enable-vdpau" #"--enable-opencl" # ToDo: opencl seems to need libclc for clover ]; nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ] - ++ - stdenv.lib.optionals stdenv.isLinux [libdrm] - ; + ++ optionals stdenv.isLinux [libdrm] + ; buildInputs = with xorg; [ autoconf automake libtool intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt - libffi wayland - ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ] - ++ stdenv.lib.optional stdenv.isLinux [udev] - ; + libffi wayland libvdpau + ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] + ++ optional stdenv.isLinux udev + ++ optional enableR600LlvmCompiler libelf + ; enableParallelBuilding = true; - doCheck = true; + #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672 + # TODO: best fix this before merging >=9.2 to master - # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; + # also move libOSMesa to $osmesa, as it's relatively big # ToDo: probably not all .la files are completely fixed, but it shouldn't matter postInstall = with stdenv.lib; '' mv -t "$drivers/lib/" \ '' + optionalString enableExtraFeatures '' `#$out/lib/libXvMC*` \ - $out/lib/vdpau \ - $out/lib/libOSMesa* \ $out/lib/gbm $out/lib/libgbm* \ $out/lib/gallium-pipe \ '' + '' $out/lib/libdricore* \ $out/lib/libgallium* \ + $out/lib/vdpau \ $out/lib/libxatracker* + mkdir -p {$osmesa,$drivers}/lib/pkgconfig + mv -t $osmesa/lib/ \ + $out/lib/libOSMesa* + + mv -t $drivers/lib/pkgconfig/ \ + $out/lib/pkgconfig/xatracker.pc + + mv -t $osmesa/lib/pkgconfig/ \ + $out/lib/pkgconfig/osmesa.pc + '' + /* now fix references in .la files */ '' sed "/^libdir=/s,$out,$drivers," -i \ '' + optionalString enableExtraFeatures '' `#$drivers/lib/libXvMC*.la` \ - $drivers/lib/vdpau/*.la \ - $drivers/lib/libOSMesa*.la \ $drivers/lib/gallium-pipe/*.la \ '' + '' $drivers/lib/libgallium.la \ + $drivers/lib/vdpau/*.la \ $drivers/lib/libdricore*.la sed "s,$out\(/lib/\(libdricore[0-9\.]*\|libgallium\).la\),$drivers\1,g" \ -i $drivers/lib/*.la $drivers/lib/*/*.la + sed "/^libdir=/s,$out,$osmesa," -i \ + $osmesa/lib/libOSMesa*.la + '' + /* work around bug #529, but maybe $drivers should also be patchelf-ed */ '' - find $drivers/ -type f -executable -print0 | xargs -0 strip -S || true + find $drivers/ $osmesa/ -type f -executable -print0 | xargs -0 strip -S || true '' + /* add RPATH so the drivers can find the moved libgallium and libdricore9 */ '' for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do @@ -138,6 +154,8 @@ stdenv.mkDerivation { done '' + /* set the default search path for DRI drivers; used e.g. by X server */ '' substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" + '' + /* move vdpau drivers to $drivers/lib, so they are found */ '' + mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau ''; #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM @@ -148,6 +166,6 @@ stdenv.mkDerivation { homepage = http://www.mesa3d.org/; license = "bsd"; platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons vcunat ]; }; } diff --git a/pkgs/development/libraries/mesa/fix-rounding.patch b/pkgs/development/libraries/mesa/fix-rounding.patch deleted file mode 100644 index f81760a6708..00000000000 --- a/pkgs/development/libraries/mesa/fix-rounding.patch +++ /dev/null @@ -1,357 +0,0 @@ -From c25ae5d27b114e23d5734f846002df1a05759658 Mon Sep 17 00:00:00 2001 -From: Roland Scheidegger <sroland@vmware.com> -Date: Thu, 31 Jan 2013 19:27:49 +0000 -Subject: gallivm: fix issues with trunc/round/floor/ceil with no arch rounding - -The emulation of these if there's no rounding instruction available -is a bit more complicated than what the code did. -In particular, doing fp-to-int/int-to-fp will not work if the exponent -is large enough (and with NaNs, Infs). Hence such values need to be filtered -out and the original value returned in this case (which fortunately should -always be exact). This comes at the expense of performance (if your cpu -doesn't support rounding instructions). -Furthermore, floor/ifloor/ceil/iceil were affected by precision issues for -values near negative (for floor) or positive (for ceil) zero, fix that as well -(fixing this issue might not actually be slower except for ceil/iceil if the -type is not signed which is probably rare - note iceil has no callers left -in any case). - -Also add some new rounding test values in lp_test_arit to actually test -for that stuff (which previously would have failed without sse41). - -This fixes https://bugs.freedesktop.org/show_bug.cgi?id=59701. ---- -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c -index b4e9f23..ec05026 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c -@@ -1590,12 +1590,37 @@ lp_build_trunc(struct lp_build_context *bld, - return lp_build_round_arch(bld, a, LP_BUILD_ROUND_TRUNCATE); - } - else { -- LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type); -- LLVMTypeRef int_vec_type = lp_build_int_vec_type(bld->gallivm, type); -- LLVMValueRef res; -- res = LLVMBuildFPToSI(builder, a, int_vec_type, ""); -- res = LLVMBuildSIToFP(builder, res, vec_type, ""); -- return res; -+ const struct lp_type type = bld->type; -+ struct lp_type inttype; -+ struct lp_build_context intbld; -+ LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24); -+ LLVMValueRef trunc, res, anosign, mask; -+ LLVMTypeRef int_vec_type = bld->int_vec_type; -+ LLVMTypeRef vec_type = bld->vec_type; -+ -+ assert(type.width == 32); /* might want to handle doubles at some point */ -+ -+ inttype = type; -+ inttype.floating = 0; -+ lp_build_context_init(&intbld, bld->gallivm, inttype); -+ -+ /* round by truncation */ -+ trunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); -+ res = LLVMBuildSIToFP(builder, trunc, vec_type, "floor.trunc"); -+ -+ /* mask out sign bit */ -+ anosign = lp_build_abs(bld, a); -+ /* -+ * mask out all values if anosign > 2^24 -+ * This should work both for large ints (all rounding is no-op for them -+ * because such floats are always exact) as well as special cases like -+ * NaNs, Infs (taking advantage of the fact they use max exponent). -+ * (2^24 is arbitrary anything between 2^24 and 2^31 should work.) -+ */ -+ anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, ""); -+ cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, ""); -+ mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval); -+ return lp_build_select(bld, mask, a, res); - } - } - -@@ -1620,11 +1645,36 @@ lp_build_round(struct lp_build_context *bld, - return lp_build_round_arch(bld, a, LP_BUILD_ROUND_NEAREST); - } - else { -- LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type); -- LLVMValueRef res; -+ const struct lp_type type = bld->type; -+ struct lp_type inttype; -+ struct lp_build_context intbld; -+ LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24); -+ LLVMValueRef res, anosign, mask; -+ LLVMTypeRef int_vec_type = bld->int_vec_type; -+ LLVMTypeRef vec_type = bld->vec_type; -+ -+ assert(type.width == 32); /* might want to handle doubles at some point */ -+ -+ inttype = type; -+ inttype.floating = 0; -+ lp_build_context_init(&intbld, bld->gallivm, inttype); -+ - res = lp_build_iround(bld, a); - res = LLVMBuildSIToFP(builder, res, vec_type, ""); -- return res; -+ -+ /* mask out sign bit */ -+ anosign = lp_build_abs(bld, a); -+ /* -+ * mask out all values if anosign > 2^24 -+ * This should work both for large ints (all rounding is no-op for them -+ * because such floats are always exact) as well as special cases like -+ * NaNs, Infs (taking advantage of the fact they use max exponent). -+ * (2^24 is arbitrary anything between 2^24 and 2^31 should work.) -+ */ -+ anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, ""); -+ cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, ""); -+ mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval); -+ return lp_build_select(bld, mask, a, res); - } - } - -@@ -1648,11 +1698,52 @@ lp_build_floor(struct lp_build_context *bld, - return lp_build_round_arch(bld, a, LP_BUILD_ROUND_FLOOR); - } - else { -- LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type); -- LLVMValueRef res; -- res = lp_build_ifloor(bld, a); -- res = LLVMBuildSIToFP(builder, res, vec_type, ""); -- return res; -+ const struct lp_type type = bld->type; -+ struct lp_type inttype; -+ struct lp_build_context intbld; -+ LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24); -+ LLVMValueRef trunc, res, anosign, mask; -+ LLVMTypeRef int_vec_type = bld->int_vec_type; -+ LLVMTypeRef vec_type = bld->vec_type; -+ -+ assert(type.width == 32); /* might want to handle doubles at some point */ -+ -+ inttype = type; -+ inttype.floating = 0; -+ lp_build_context_init(&intbld, bld->gallivm, inttype); -+ -+ /* round by truncation */ -+ trunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); -+ res = LLVMBuildSIToFP(builder, trunc, vec_type, "floor.trunc"); -+ -+ if (type.sign) { -+ LLVMValueRef tmp; -+ -+ /* -+ * fix values if rounding is wrong (for non-special cases) -+ * - this is the case if trunc > a -+ */ -+ mask = lp_build_cmp(bld, PIPE_FUNC_GREATER, res, a); -+ /* tmp = trunc > a ? 1.0 : 0.0 */ -+ tmp = LLVMBuildBitCast(builder, bld->one, int_vec_type, ""); -+ tmp = lp_build_and(&intbld, mask, tmp); -+ tmp = LLVMBuildBitCast(builder, tmp, vec_type, ""); -+ res = lp_build_sub(bld, res, tmp); -+ } -+ -+ /* mask out sign bit */ -+ anosign = lp_build_abs(bld, a); -+ /* -+ * mask out all values if anosign > 2^24 -+ * This should work both for large ints (all rounding is no-op for them -+ * because such floats are always exact) as well as special cases like -+ * NaNs, Infs (taking advantage of the fact they use max exponent). -+ * (2^24 is arbitrary anything between 2^24 and 2^31 should work.) -+ */ -+ anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, ""); -+ cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, ""); -+ mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval); -+ return lp_build_select(bld, mask, a, res); - } - } - -@@ -1676,11 +1767,48 @@ lp_build_ceil(struct lp_build_context *bld, - return lp_build_round_arch(bld, a, LP_BUILD_ROUND_CEIL); - } - else { -- LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type); -- LLVMValueRef res; -- res = lp_build_iceil(bld, a); -- res = LLVMBuildSIToFP(builder, res, vec_type, ""); -- return res; -+ const struct lp_type type = bld->type; -+ struct lp_type inttype; -+ struct lp_build_context intbld; -+ LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24); -+ LLVMValueRef trunc, res, anosign, mask, tmp; -+ LLVMTypeRef int_vec_type = bld->int_vec_type; -+ LLVMTypeRef vec_type = bld->vec_type; -+ -+ assert(type.width == 32); /* might want to handle doubles at some point */ -+ -+ inttype = type; -+ inttype.floating = 0; -+ lp_build_context_init(&intbld, bld->gallivm, inttype); -+ -+ /* round by truncation */ -+ trunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); -+ trunc = LLVMBuildSIToFP(builder, trunc, vec_type, "ceil.trunc"); -+ -+ /* -+ * fix values if rounding is wrong (for non-special cases) -+ * - this is the case if trunc < a -+ */ -+ mask = lp_build_cmp(bld, PIPE_FUNC_LESS, trunc, a); -+ /* tmp = trunc < a ? 1.0 : 0.0 */ -+ tmp = LLVMBuildBitCast(builder, bld->one, int_vec_type, ""); -+ tmp = lp_build_and(&intbld, mask, tmp); -+ tmp = LLVMBuildBitCast(builder, tmp, vec_type, ""); -+ res = lp_build_add(bld, trunc, tmp); -+ -+ /* mask out sign bit */ -+ anosign = lp_build_abs(bld, a); -+ /* -+ * mask out all values if anosign > 2^24 -+ * This should work both for large ints (all rounding is no-op for them -+ * because such floats are always exact) as well as special cases like -+ * NaNs, Infs (taking advantage of the fact they use max exponent). -+ * (2^24 is arbitrary anything between 2^24 and 2^31 should work.) -+ */ -+ anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, ""); -+ cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, ""); -+ mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval); -+ return lp_build_select(bld, mask, a, res); - } - } - -@@ -1826,32 +1954,30 @@ lp_build_ifloor(struct lp_build_context *bld, - res = lp_build_round_arch(bld, a, LP_BUILD_ROUND_FLOOR); - } - else { -- /* Take the sign bit and add it to 1 constant */ -- LLVMTypeRef vec_type = bld->vec_type; -- unsigned mantissa = lp_mantissa(type); -- LLVMValueRef mask = lp_build_const_int_vec(bld->gallivm, type, -- (unsigned long long)1 << (type.width - 1)); -- LLVMValueRef sign; -- LLVMValueRef offset; -+ struct lp_type inttype; -+ struct lp_build_context intbld; -+ LLVMValueRef trunc, itrunc, mask; - -- /* sign = a < 0 ? ~0 : 0 */ -- sign = LLVMBuildBitCast(builder, a, int_vec_type, ""); -- sign = LLVMBuildAnd(builder, sign, mask, ""); -- sign = LLVMBuildAShr(builder, sign, -- lp_build_const_int_vec(bld->gallivm, type, -- type.width - 1), -- "ifloor.sign"); -+ assert(type.floating); -+ assert(lp_check_value(type, a)); - -- /* offset = -0.99999(9)f */ -- offset = lp_build_const_vec(bld->gallivm, type, -- -(double)(((unsigned long long)1 << mantissa) - 10)/((unsigned long long)1 << mantissa)); -- offset = LLVMConstBitCast(offset, int_vec_type); -+ inttype = type; -+ inttype.floating = 0; -+ lp_build_context_init(&intbld, bld->gallivm, inttype); - -- /* offset = a < 0 ? offset : 0.0f */ -- offset = LLVMBuildAnd(builder, offset, sign, ""); -- offset = LLVMBuildBitCast(builder, offset, vec_type, "ifloor.offset"); -+ /* round by truncation */ -+ itrunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); -+ trunc = LLVMBuildSIToFP(builder, itrunc, bld->vec_type, "ifloor.trunc"); - -- res = LLVMBuildFAdd(builder, res, offset, "ifloor.res"); -+ /* -+ * fix values if rounding is wrong (for non-special cases) -+ * - this is the case if trunc > a -+ * The results of doing this with NaNs, very large values etc. -+ * are undefined but this seems to be the case anyway. -+ */ -+ mask = lp_build_cmp(bld, PIPE_FUNC_GREATER, trunc, a); -+ /* cheapie minus one with mask since the mask is minus one / zero */ -+ return lp_build_add(&intbld, itrunc, mask); - } - } - -@@ -1883,35 +2009,30 @@ lp_build_iceil(struct lp_build_context *bld, - res = lp_build_round_arch(bld, a, LP_BUILD_ROUND_CEIL); - } - else { -- LLVMTypeRef vec_type = bld->vec_type; -- unsigned mantissa = lp_mantissa(type); -- LLVMValueRef offset; -+ struct lp_type inttype; -+ struct lp_build_context intbld; -+ LLVMValueRef trunc, itrunc, mask; - -- /* offset = 0.99999(9)f */ -- offset = lp_build_const_vec(bld->gallivm, type, -- (double)(((unsigned long long)1 << mantissa) - 10)/((unsigned long long)1 << mantissa)); -+ assert(type.floating); -+ assert(lp_check_value(type, a)); - -- if (type.sign) { -- LLVMValueRef mask = lp_build_const_int_vec(bld->gallivm, type, -- (unsigned long long)1 << (type.width - 1)); -- LLVMValueRef sign; -+ inttype = type; -+ inttype.floating = 0; -+ lp_build_context_init(&intbld, bld->gallivm, inttype); - -- /* sign = a < 0 ? 0 : ~0 */ -- sign = LLVMBuildBitCast(builder, a, int_vec_type, ""); -- sign = LLVMBuildAnd(builder, sign, mask, ""); -- sign = LLVMBuildAShr(builder, sign, -- lp_build_const_int_vec(bld->gallivm, type, -- type.width - 1), -- "iceil.sign"); -- sign = LLVMBuildNot(builder, sign, "iceil.not"); -- -- /* offset = a < 0 ? 0.0 : offset */ -- offset = LLVMConstBitCast(offset, int_vec_type); -- offset = LLVMBuildAnd(builder, offset, sign, ""); -- offset = LLVMBuildBitCast(builder, offset, vec_type, "iceil.offset"); -- } -+ /* round by truncation */ -+ itrunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); -+ trunc = LLVMBuildSIToFP(builder, itrunc, bld->vec_type, "iceil.trunc"); - -- res = LLVMBuildFAdd(builder, a, offset, "iceil.res"); -+ /* -+ * fix values if rounding is wrong (for non-special cases) -+ * - this is the case if trunc < a -+ * The results of doing this with NaNs, very large values etc. -+ * are undefined but this seems to be the case anyway. -+ */ -+ mask = lp_build_cmp(bld, PIPE_FUNC_LESS, trunc, a); -+ /* cheapie plus one with mask since the mask is minus one / zero */ -+ return lp_build_sub(&intbld, itrunc, mask); - } - - /* round to nearest (toward zero) */ -diff --git a/src/gallium/drivers/llvmpipe/lp_test_arit.c b/src/gallium/drivers/llvmpipe/lp_test_arit.c -index 99928b8..f14e4b3 100644 ---- a/src/gallium/drivers/llvmpipe/lp_test_arit.c -+++ b/src/gallium/drivers/llvmpipe/lp_test_arit.c -@@ -207,6 +207,18 @@ const float round_values[] = { - -10.0, -1, 0.0, 12.0, - -1.49, -0.25, 1.25, 2.51, - -0.99, -0.01, 0.01, 0.99, -+ 1.401298464324817e-45f, // smallest denormal -+ -1.401298464324817e-45f, -+ 1.62981451e-08f, -+ -1.62981451e-08f, -+ 1.62981451e15f, // large number not representable as 32bit int -+ -1.62981451e15f, -+ FLT_EPSILON, -+ -FLT_EPSILON, -+ 1.0f - 0.5f*FLT_EPSILON, -+ -1.0f + FLT_EPSILON, -+ FLT_MAX, -+ -FLT_MAX - }; - - static float fractf(float x) --- -cgit v0.9.0.2-2-gbebe diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index bc361b39dd6..66e98a9d961 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,7 +11,7 @@ let secLoadPatch = fetchurl { name = "security_load.patch"; - urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.3-1/85_security_load.patch; + urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.3.1-1/85_security_load.patch; sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds"; }; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index e7368e4f60b..7c9c9304f77 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.attrByPath ["version"] "0.11.1" args; + version = lib.attrByPath ["version"] "0.12" args; buildInputs = with args; [ ]; @@ -11,7 +11,7 @@ in rec { src = fetchurl { url = "mirror://sourceforge/opende/ode-${version}.tar.bz2"; - sha256 = "1883gbsnn7zldrpwfdh6kwj20g627n5bspz3yb2z6lrxdal88y47"; + sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; }; inherit buildInputs; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 684d6475c63..47a51b68d03 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "onig-5.9.3"; + name = "onig-5.9.4"; src = fetchurl { - url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.3.tar.gz; - sha256 = "0ahz0l64v2xv4jbh0w3q697xjff8jzdq2264h9jhwxl459msdfy3"; + url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.4.tar.gz; + sha256 = "15q62c2id918fj2i7xbdrcc79xrdafdc75lhhld98rgq3y8j30lq"; }; meta = { diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index a7e514a5780..ea858417b2f 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg , pkgconfig, gstreamer, xineLib, glib, python27, python27Packages }: -let v = "2.4.5"; in +let v = "2.4.7"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/opencv-${v}.tar.gz"; - sha256 = "14k2w07jcchp11c9v6p5x49h3h1zmg2m9brm2sypz5sp9g7yw2yk"; + sha256 = "0hravl3yhyv4r4n7vb055d4qnp893q2hc0fcmmncfh7sbdrnr3f4"; }; buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index d32cbd51606..6e61b743a56 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gfortran}: stdenv.mkDerivation { - name = "openmpi-1.6.4"; + name = "openmpi-1.6.5"; src = fetchurl { - url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.4.tar.bz2 ; - sha1 = "38095d3453519177272f488d5058a98f7ebdbf10"; + url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2 ; + sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy"; }; buildInputs = [ gfortran ]; meta = { diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/default.nix index 6843ff7a307..f71c52e670b 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,11 +1,15 @@ { stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }: +let + ver_maj = "2.34"; + ver_min = "0"; +in stdenv.mkDerivation rec { - name = "pangomm-2.28.4"; + name = "pangomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = mirror://gnome/sources/pangomm/2.28/pangomm-2.28.4.tar.xz; - sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp"; + url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz"; + sha256 = "0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index ce5adc4b0a5..5948fd0ef2b 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }: let - v = "4.7.0"; + v = "4.7.1"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz"; - sha256 = "1sxrnwm16dxy32xmrqf26762wmbqing1zx8i4vlvzgzvd9xy39ac"; + sha256 = "0pdpj7xnalr511zx12akxg6smz7x5gybkpliclb5f5dcxqnq1xsg"; }; buildInputs = [ qt4 pulseaudio ]; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 23bfbeeb808..cb76a1b615f 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-0.30.2"; + name = "pixman-0.32.4"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "1sgnpx34pj3245a9v8056jddc4cg4xxkqdjvvw6k2hnprhh8k65x"; + sha256 = "113ycngcssbrps217dyajq96hm9xghsfch82h14yffla1r1fviw0"; }; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index c438849e0cd..0db3722e6aa 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,8 +4,8 @@ }: let - version = "0.24.3"; # even major numbers are stable - sha256 = "0kip6mxp4lscr3wvgfashqk7ymhx2w1hgdilfpgig0a5kr805kfj"; + version = "0.24.4"; # even major numbers are stable + sha256 = "1qh1gk6hq5cfpkqyxxgkpyl78na8dckmh6zbgsqbpw762yd518y8"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.22 diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 79209017188..16bd1ee65d2 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -49,6 +49,16 @@ stdenv.mkDerivation rec { patches = [ ./glib-2.32.patch + (fetchurl { + name = "CVE-2013-4549.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/CVE-2013-4549.patch?h=packages/qt4"; + sha256 = "0xz60fmspzvsyhd0f013pvh2bbm87976128fphbckfcwiqr1hanw"; + }) + (fetchurl { + name = "libmng2.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/libmng2.patch?h=packages/qt4"; + sha256 = "1sgnrl3qzr370ad5bqc66f7sp0gk046jnsy1811x24f16cs04xzh"; + }) (substituteAll { src = ./dlopen-absolute-paths.diff; inherit cups icu libXfixes; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 0a36efbc982..3212d13ce35 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig, cmake }: +{ stdenv, fetchurl, pkgconfig, freetype, cmake }: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.2.4"; name = "graphite2-${version}"; - + src = fetchurl { url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz"; - sha256 = "1xgwnd81gm6p293x8paxb3yisnvpj5qnv1dzr7bjdi7b7h00ls7g"; + sha256 = "00xhv1mp640fr3wmdzwn4yz0g56jd4r9fb7b02mc1g19h0bdbhsb"; }; - buildInputs = [pkgconfig freetype libXft pango fontconfig cmake]; - - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + buildInputs = [ pkgconfig freetype cmake ]; meta = { description = "An advanced font engine"; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index cb534cfbf31..0525043b6cf 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -13,11 +13,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="simgear"; - version="2.12.0"; + version="2.12.1"; name="${baseName}-${version}"; extension="tar.bz2"; url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}"; - hash="0spl6afk8rm96ss4lh7zy5561m5m2qgwsnqjyp35jr1gyyrc944f"; + hash="0w8drzglgp01019frx96062qcigzfflsyq59f8shpwmzjb2hzli4"; }; in rec { diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index ff1bfa7d4eb..acba85ec43b 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "snappy-1.1.0"; + name = "snappy-1.1.1"; src = fetchurl { url = "http://snappy.googlecode.com/files/${name}.tar.gz"; - sha256 = "0q31cx3zkw0apx1fy8z3xlh2lvivssvykqn0vxsgm4xvi32jpa0z"; + sha256 = "1czscb5i003jg1amw3g1fmasv8crr5g3d922800kll8b3fj097yp"; }; # -DNDEBUG for speed diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index f62bc2eb11d..f8c5a213ee3 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, icu, cluceneCore, curl}: +{stdenv, fetchurl, pkgconfig, icu, clucene_core, curl}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1fc71avaxkhx6kckjiflw6j02lpg569b9bzaksq49i1m87awfxmg"; }; - buildInputs = [ pkgconfig icu cluceneCore curl ]; + buildInputs = [ pkgconfig icu clucene_core curl ]; # because curl/types.h disappeared since at least curl 7.21.7 patches = [ ./dont_include_curl_types_h.patch ./gcc47.patch ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { }; } - diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 12bbe0914e0..b2c2f0d0851 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcllib-${version}"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; - sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x"; + sha256 = "1zdzaqdpxljsaabgknq3paakgs262qy255ib4p329knsv608jc3d"; }; passthru = { diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 8c08a342a90..f44e4cbcd8b 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.20.4"; + name = "telepathy-glib-0.22.0"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "0v5izjmgm1phy51l2y5whfrgzqx8510lqp16d2y5hb21bp40g8y9"; + sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232"; }; propagatedBuildInputs = [dbus_glib glib python]; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 699da60768f..2ec478d7a76 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "ucommon-6.0.5"; + name = "ucommon-6.0.7"; src = fetchurl { - url = mirror://gnu/commoncpp/ucommon-6.0.5.tar.gz; - sha256 = "0w5nl2a2l630n4kvfaz22by1s92ybd87g0q1zpcmsl8i5d00789l"; + url = mirror://gnu/commoncpp/ucommon-6.0.7.tar.gz; + sha256 = "1rlvchmg6qq8jq79qjgv0l0wqi1dqhmm4ng1qj9f012dbhwcap3x"; }; buildInputs = [ pkgconfig gnutls zlib ]; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 8854a41210b..e9ad56bdbf1 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: -let version = "1.0.5"; in +let version = "1.3.0"; in stdenv.mkDerivation rec { name = "wayland-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w"; + sha256 = "0vhd8z74r4zmm7hrbb8l450sb6slqkdrvmk4k78sq9lays2pd09f"; }; buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix new file mode 100644 index 00000000000..766bb715474 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex +, pkgconfig, which, gettext, gobjectIntrospection +, gtk2, gtk3, wayland, libwebp, enchant +, libxml2, libsoup, libsecret, libxslt, harfbuzz +}: + +stdenv.mkDerivation rec { + name = "webkitgtk-2.2.3"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = "http://webkitgtk.org/"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "01a69v0aw3bv2zkx6jzk71r3pjlf2xfhxavjnma89kmd78qb7g4l"; + }; + + patches = [ ./webcore-svg-libxml-cflags.patch ]; + + prePatch = '' + patchShebangs Tools/gtk + + for i in $(find . -name '*.p[l|m]'); do + sed -e 's@/usr/bin/gcc@gcc@' -i $i + done + ''; + + configureFlags = [ + "--disable-geolocation" + "--disable-video" # TODO: gsteramer-1.0 + "--enable-introspection" + ]; + + dontAddDisableDepTrack = true; + + nativeBuildInputs = [ + perl python ruby bison gperf flex + pkgconfig which gettext gobjectIntrospection + ]; + + buildInputs = [ + gtk2 wayland libwebp enchant + libxml2 libsecret libxslt harfbuzz + ]; + + propagatedBuildInputs = [ gtk3 libsoup ]; + + #enableParallelBuilding = true; # build problems on Hydra +} diff --git a/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch b/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch new file mode 100644 index 00000000000..03fc3f3f97d --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch @@ -0,0 +1,8 @@ +--- webkitgtk-2.2.3-orig/GNUmakefile.in 2013-12-04 17:56:28.000000000 +0800 ++++ webkitgtk-2.2.3/GNUmakefile.in 2013-12-05 17:32:37.976689248 +0800 +@@ -21911,6 +21911,7 @@ + @ENABLE_SVG_TRUE@ $(CAIRO_CFLAGS) \ + @ENABLE_SVG_TRUE@ $(FREETYPE_CFLAGS) \ + @ENABLE_SVG_TRUE@ $(LIBSOUP_CFLAGS) \ ++@ENABLE_SVG_TRUE@ $(LIBXML_CFLAGS) \ + @ENABLE_SVG_TRUE@ $(UNICODE_CFLAGS) diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 45c60acfa89..11ba5df80ca 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.2"; + name = "xine-lib-1.2.4"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1"; + sha256 = "1pdv7bs683ily548arv4wsxabslyf3x3laij5jb921dxyx71nnww"; }; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index 7f834688e63..ad6569d9478 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,8 +1,8 @@ -{stdenv}: +{stdenv, version ? "5.0"}: rec { xcodewrapper = import ./xcodewrapper.nix { - inherit stdenv; + inherit stdenv version; }; buildApp = import ./build-app.nix { diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 7515fcdd121..71e34ee5127 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "5.0"}: +{stdenv, version}: stdenv.mkDerivation { name = "xcode-wrapper-"+version; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" # Check if we have the xcodebuild version that we want - if [ -z "$($out/bin/xcodebuild -version | grep ${version})" ] + if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ] then echo "We require xcodebuild version: ${version}" exit 1 diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index f6396af8b65..4017d8f5ca5 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -1,11 +1,11 @@ {fetchurl, buildPerlPackage, db4}: buildPerlPackage rec { - name = "DB_File-1.826"; + name = "DB_File-1.831"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "c39828ef3cfecff8197ff057cb1c6127b87107c051d182b87c6b9ac79d23f09c"; + sha256 = "0hq2vvcsa3nkb5bpcl0nkfsxhk8wyrsp3p3ara18rscrfd783hjs"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 6ba7f9f8d02..c26347c5243 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python, db4}: -stdenv.mkDerivation { - name = "bsddb3-4.5.0"; +stdenv.mkDerivation rec { + name = "bsddb3-6.0.1"; src = fetchurl { - url = mirror://sourceforge/pybsddb/bsddb3-4.5.0.tar.gz; - sha256 = "1h09kij32iikr9racp5p7qrb4li2gf2hs0lyq6d312qarja4d45v"; + url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; + md5 = "2b22ab1b4d896961c30e4106660e9139"; }; buildInputs = [python]; buildPhase = "true"; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index bfce358a2aa..32ef97bf29c 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools }: stdenv.mkDerivation rec { - name = "dbus-python-1.1.1"; + name = "dbus-python-1.2.0"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz"; - sha256 = "122yj5y0mndk9axh735qvwwckck6s6x0q84dw6p97mplp17wl5w9"; + sha256 = "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71"; }; postPatch = "patchShebangs ."; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index 0623632936d..2adaaf3c031 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "findbugs-1.3.2"; + name = "findbugs-2.0.3"; src = fetchurl { - url = mirror://sourceforge/findbugs/findbugs-1.3.2.tar.gz; - sha256 = "0mbwxzz5m9vizxlbg0i6rh5ywywiiw9zpabq5li7map43768apvr"; + url = mirror://sourceforge/findbugs/findbugs-2.0.3.tar.gz; + sha256 = "17s93vszc5s2b7pwi0yk8d6w54gandxrr7vflhzmpbl6sxj2mfjr"; }; buildPhase = '' diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix index f6edcf54463..cd01cf059d6 100644 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ b/pkgs/development/tools/documentation/docutils/default.nix @@ -2,15 +2,15 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.10" a; + version = a.lib.attrByPath ["version"] "0.11" a; buildInputs = with a; [ - python pil makeWrapper + python pil makeWrapper ]; in rec { src = fetchurl { url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz"; - sha256 = "0gk0733w34zibzvi6paqqfbbajzaxajc4z5i5wpxlwv73gk281ip"; + sha256 = "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s"; }; inherit buildInputs; diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index f7d67f4be66..6c24b509db5 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -1,23 +1,26 @@ -{ cabal, cmdtheline, deepseq, Diff, filepath, ghcMod, ghcPaths -, ghcSybUtils, hslogger, hspec, HUnit, mtl, parsec, QuickCheck -, rosezipper, silently, StrafunskiStrategyLib, stringbuilder, syb -, syz, time, transformers +{ cabal, deepseq, Diff, dualTree, filepath, ghcMod, ghcPaths +, ghcSybUtils, hslogger, hspec, HUnit, monoidExtras, mtl, parsec +, QuickCheck, rosezipper, semigroups, silently +, StrafunskiStrategyLib, stringbuilder, syb, syz, time +, transformers }: cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.0.7"; - sha256 = "0pgl5mav4sqc453by7nddf5fz7nj231072bklzj6crcph7qw4zy4"; + version = "0.7.0.9"; + sha256 = "1a3kf6hdzchcyb743l6ikyw3nclcy8g7a5kaj4jgxqvmss9z73f1"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdtheline filepath ghcMod ghcPaths ghcSybUtils hslogger mtl parsec - rosezipper StrafunskiStrategyLib syb syz time transformers + dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger monoidExtras + mtl parsec rosezipper semigroups StrafunskiStrategyLib syb syz time + transformers ]; testDepends = [ - deepseq Diff filepath ghcMod ghcPaths ghcSybUtils hslogger hspec - HUnit mtl QuickCheck rosezipper silently StrafunskiStrategyLib - stringbuilder syb syz time transformers + deepseq Diff dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger + hspec HUnit monoidExtras mtl QuickCheck rosezipper semigroups + silently StrafunskiStrategyLib stringbuilder syb syz time + transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index 71a0835713c..fc8c0e3f052 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.22"; - sha256 = "1dp1prcx3d6a0fr3xrdj6flp27sy7qbng5bbdjgjbb7rq8497if9"; + version = "1.0.23"; + sha256 = "0z87yzqv1bjclvyslzpclhrbfm4vcyz0q32jr4kbnfwjk3s8zyi2"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 165ea131dd9..d61746ddbe1 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.50"; - sha256 = "0vyydqgmyl590ry63ibwshfpj2w9dd2v0nmr4jqlfw0m0d9ff50j"; + version = "0.9.50.2"; + sha256 = "1f587g4lf1gc5j9wd2fzxhjrny0a9axkpj6znxwsiylcpqw39dqs"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ]; diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index cd4f19694b2..308183cb6fc 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, guile, which, libffi }: -let version = "5.17"; in +let version = "5.18"; in stdenv.mkDerivation { name = "autogen-${version}"; src = fetchurl { url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz"; - sha256 = "065mg9gfb605wxbsk3inf93528ygcjgg6j8ml51691f6ghj363ff"; + sha256 = "1h2d3wpzkla42igxyisaqh2nwpq01vwad1wp9671xmm5ahvkw5f7"; }; buildInputs = [ guile which libffi ]; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 133e1c38194..89e848df03b 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -3,11 +3,11 @@ let edf = composableDerivation.edf; in composableDerivation.composableDerivation {} rec { - name="avrdude-5.11"; + name="avrdude-6.0.1"; src = fetchurl { url = "mirror://savannah/avrdude/${name}.tar.gz"; - sha256 = "1mwmslqysak25a3x61pj97wygqgk79s5qpp50xzay6yb1zrz85v3"; + sha256 = "0hfy1qkc6a5vpqsp9ahi1fpf9x4s10wq4bpyblc26sx9vxl4d066"; }; configureFlags = [ "--disable-dependency-tracking" ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 05a0d9bbeb5..3dd634274f3 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -3,10 +3,10 @@ let ccache = stdenv.mkDerivation { - name = "ccache-3.1.7"; + name = "ccache-3.1.9"; src = fetchurl { - url = http://samba.org/ftp/ccache/ccache-3.1.7.tar.gz; - sha256 = "04ax6ks49b6rn57hx4v9wbvmsfmw6ipn0wyfqwhh4lzw70flv3r7"; + url = http://samba.org/ftp/ccache/ccache-3.1.9.tar.gz; + sha256 = "0ixlxqv1xyacwgg0k9b4a6by07c7k75y0xbr8dp76jvyada0c9x2"; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/1.0.0.nix index c36d0004992..f8f680ef4a5 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/1.0.0.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { maintainers = stdenv.lib.maintainers.orbitz; - description = "A package manager for ocaml"; + description = "A package manager for OCaml"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix new file mode 100644 index 00000000000..c5093db107d --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/1.1.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: + +# Opam 1.1 only works with ocaml >= 3.12.1 according to ./configure +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; + +let + srcs = { + cudf = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz"; + sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665"; + }; + extlib = fetchurl { + url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; + sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; + }; + ocaml_re = fetchurl { + url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; + sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; + }; + ocamlgraph = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz"; + sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43"; + }; + dose3 = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz"; + sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3"; + }; + cmdliner = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz"; + sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; + }; + opam = fetchurl { + url = "https://github.com/ocaml/opam/archive/1.1.0.zip"; + sha256 = "38a5edc1428f9e8e0d13e7017c97e1614dd651b75b4c234c80ff22f103d38bf7"; + }; + }; +in +stdenv.mkDerivation rec { + name = "opam-1.1.0"; + + buildInputs = [unzip curl ncurses ocaml]; + + src = srcs.opam; + + postUnpack = '' + ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} + ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} + ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} + ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} + ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} + ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} + ''; + + # Dirty, but apparently ocp-build requires a TERM + makeFlags = ["TERM=screen"]; + + doCheck = false; + + meta = { + maintainers = [stdenv.lib.maintainers.orbitz]; + description = "A package manager for OCaml"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index e80f903db12..2e3a4f8d497 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, flex }: stdenv.mkDerivation rec { - name = "bison-3.0"; + name = "bison-3.0.2"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "1ll22hcfslyl9n3pgvvphzdp18w9cyic8m0qimfnb8mrs1syrdz5"; + sha256 = "1vc17y6242jlwp0gdj7wsim3nvc1ws7q3j0v3065nz8g9hd9vwnd"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optionals doCheck [ flex ]; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 668ff6a7f4a..4a6cdc3aa34 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, nodejs }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.10.0"; name = "csslint-${version}"; src = fetchurl { url = "http://registry.npmjs.org/csslint/-/${name}.tgz"; - sha256 = "ee7a79c8f2af1c228d4b7869b6681d0d02a93568774dbf51c7a45aa1ffa1da14"; + sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid"; }; # node is the interpreter used to run this script diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index b9b66f4be69..c9fd9706c0e 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { hashable keys miniutter mtl prettyShow random stm text transformers unorderedContainers zlib ]; + jailbreak = true; meta = { homepage = "http://github.com/kosmikus/LambdaHack"; description = "A roguelike game engine in early and active development"; diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 211e388b871..7669c443321 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -11,11 +11,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="atanks"; - version="4.7"; + version="4.9"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; - hash="0kd98anwb785irv4qm1gqpk2xnh1q0fxnfazkjqpwjvgrliyj2rh"; + hash="015nwh8jk4k24ci6ilihii8idkyf6g266r4vl50csvykc82slrvd"; }; in rec { diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix index 471eca78cf1..ca348592d1d 100644 --- a/pkgs/games/d1x-rebirth/default.nix +++ b/pkgs/games/d1x-rebirth/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: stdenv.mkDerivation rec { - name = "d1x-rebirth-0.57.3"; + name = "d1x-rebirth-0.58.1"; src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.57.3-src.tar.gz"; - sha256 = "07dbjza5flsczdsas0adb5xhn13gmhlpixa8ycp8hjm20y9kw1za"; + url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz"; + sha256 = "13p3nfqaa78h6bl0k8mdsn90ai99wbqaj6qlsjsgsn8imficivsv"; }; buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix index b52e2995198..644c2703599 100644 --- a/pkgs/games/d2x-rebirth/default.nix +++ b/pkgs/games/d2x-rebirth/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: stdenv.mkDerivation rec { - name = "d2x-rebirth-0.57.3"; + name = "d2x-rebirth-0.58.1"; src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.57.3-src.tar.gz"; - sha256 = "0yyandmxz12bbpnd746nddjlqh5i7dylwm006shixis3w3giz77c"; + url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.58.1-src.tar.gz"; + sha256 = "08mg831afc1v068c0ds70lhmxk8a54494jls7s9hwf02ffhv3sx8"; }; buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index aae7241cf88..31e8ae05d00 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -3,11 +3,11 @@ assert stdenv.gcc.libc != null; stdenv.mkDerivation rec { - name = "gemrb-0.6.1"; + name = "gemrb-0.8.0.1"; src = fetchurl { url = "mirror://sourceforge/gemrb/${name}.tar.gz"; - sha256 = "1jnid5nrasy0lglnx71zkvv2p59cxsnhvagy7r8lsmjild1k5l93"; + sha256 = "0v9iypls4iawnfkc91hcdnmc4vyg3ix7v7lmw3knv73q145v0ksd"; }; buildInputs = [ cmake python openal SDL zlib libpng libvorbis ]; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 6d6370bb97b..cbc445f6216 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, curl, gtk, gtkdatabox }: stdenv.mkDerivation rec { - name = "klavaro-1.9.5"; + name = "klavaro-2.00"; src = fetchurl { url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; - sha256 = "06c35247866fb74f7c1a52a2350b352fdb44dace7216fdbebc1fa54990d14fc9"; + sha256 = "1w94r7r132sg7554xhcgvymxxxgfas99lkgv6j3nmxa8m2fzhwlq"; }; buildInputs = [ pkgconfig intltool curl gtk gtkdatabox ]; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index ff2ce6bb819..ad633d15a8c 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -30,10 +30,12 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; configureFlags = "CFLAGS=\"-include ${zlib}/include/zlib.h\""; + patches = [ ./gcc-fix.patch ]; + meta = { description = "Ballistics turn-based battle game between teams"; maintainers = with a.lib.maintainers; diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch new file mode 100644 index 00000000000..1ac476b92a3 --- /dev/null +++ b/pkgs/games/warmux/gcc-fix.patch @@ -0,0 +1,36 @@ +## i-love-you-lordheavy.patch [diff] +diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp +--- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100 +@@ -81,7 +81,7 @@ + } + + // Build an action from a network packet +-Action::Action(const char *buffer, DistantComputer* _creator) ++Action::Action(char *buffer, DistantComputer* _creator) + { + m_creator = _creator; + +diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h +--- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100 +@@ -168,7 +168,7 @@ + Action(Action_t type, Double value1, Double value2); + + // Build an action from a network packet +- Action(const char* buffer, DistantComputer* _creator); ++ Action(char* buffer, DistantComputer* _creator); + + ~Action(); + +Description: Fix FTBFS with gcc 4.7. +Author: Felix Geyer <debfx-pkg@fobos.de> + +--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp ++++ warmux-11.04.1+repack/tools/list_games/main.cpp +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <unistd.h> + #include <WARMUX_types.h> + #include <WARMUX_network.h> + #include <WARMUX_index_server.h> diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 483ec7aab97..1ed74c57435 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cups}: stdenv.mkDerivation rec { - name = "cups-bjnp-0.5.4"; + name = "cups-bjnp-1.2.1"; src = fetchurl { url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz"; - sha256 = "1q5npis0jgs44yvczrr6pz87glk1d9lv3vr2s4nqrk3l0q4xplf6"; + sha256 = "0fjpp0mmmwfcr790hfjs0brsxxb7dz7v2xab6wc30rwzkqmgz95x"; }; preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index ff03770014d..f618a28b4d6 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, cups, dbus }: stdenv.mkDerivation rec { - name = "foomatic-filters-4.0.12"; + name = "foomatic-filters-4.0.17"; src = fetchurl { url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz"; - sha256 = "17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8"; + sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; buildInputs = [ pkgconfig perl cups dbus ]; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 4e499a499fd..5b1576bd97c 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip, zlib, SDL}: stdenv.mkDerivation { - name = "atari800-2.0.2"; + name = "atari800-2.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/atari800/atari800-2.0.2.tar.gz; - md5 = "a81f8a5ace5fd89eb6094faef7c936af"; + url = mirror://sourceforge/atari800/atari800-2.2.1.tar.gz; + sha256 = "0gkhlb3jc0rd7fcqjm41877fsqr7als3a0n552qmnjzrlcczf5yz"; }; rom = fetchurl { url = mirror://sourceforge/atari800/xf25.zip; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index a98e6db2db4..8bc53da8f0c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, which +{ stdenv, fetchgit, pkgconfig, which , SDL, mesa, alsaLib +, libXxf86vm, libXinerama, libXv }: stdenv.mkDerivation rec { - name = "retroarch-0.9.9"; + name = "retroarch-0.9.9.7"; - src = fetchurl { - url = "http://themaister.net/retroarch-dl/${name}.tar.gz"; - sha256 = "08xlndpl14c4ccgp752ixx3a7ajf3xp93nawhinwxq0cw801prda"; + src = fetchgit { + url = "https://github.com/libretro/RetroArch.git"; + rev = "ea0c4880556e0f9d1fe8253ddc713bc743b00e1b"; + sha256 = "1jhyh7f8ijy67fxslxqsp8pjl2lwayjljp06hp4n5cn33yajpbd7"; }; buildInputs = [ pkgconfig which SDL mesa alsaLib + libXxf86vm libXinerama libXv ]; preConfigure = '' configureFlags="--global-config-dir=$out/etc" ''; - + meta = { - description = "A cross-platform multi-system emulator"; - homepage = "http://themaister.net/retroarch.html"; + description = "Modular multi-system game/emulator system"; + homepage = "http://www.libretro.com/"; license = stdenv.lib.licenses.gpl3Plus; - platform = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; } diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix index a9e0aacba26..5bec6a310d1 100644 --- a/pkgs/misc/emulators/wine/stable.nix +++ b/pkgs/misc/emulators/wine/stable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib +{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper }: @@ -34,7 +34,8 @@ in stdenv.mkDerivation rec { inherit version name src; buildInputs = [ - xlibs.xlibs flex bison xlibs.libXi mesa + pkgconfig + xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite alsaLib ncurses libpng libjpeg lcms fontforge @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa libdrm + freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 2c649900034..0cb81a8185a 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib +{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper }: @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.7"; + version = "1.7.8"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "19xcspll0ljbr2v0y7xy4943pgqalya2zrzndqsl2d7kpyv061hi"; + sha256 = "010qa6xn0b0161kcmm43yr0bp39iddb6d5i27mpl229shrgpzq9h"; }; gecko = fetchurl { @@ -34,7 +34,8 @@ in stdenv.mkDerivation rec { inherit version name src; buildInputs = [ - xlibs.xlibs flex bison xlibs.libXi mesa + pkgconfig + xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite alsaLib ncurses libpng libjpeg lcms fontforge @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa libdrm + freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index e3932744286..3bf2e316dea 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "5.19"; + version = "5.26"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0"; + sha256 = "0m8v9zxl1pyqndqqinhsvpc8s3byg397vy6i4ihkjiqrw5kdr91c"; }; buildInputs = diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 3a619220bcf..fb51985afd1 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -2,12 +2,12 @@ cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.3.4"; + version = "1.4.1"; name = "oxygen-gtk2-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj"; + sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd"; }; buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/misc/themes/mate-icon-theme/default.nix index 65965e46b32..fe19a45b2ac 100644 --- a/pkgs/misc/themes/mate-icon-theme/default.nix +++ b/pkgs/misc/themes/mate-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }: stdenv.mkDerivation { - name = "mate-icon-theme-1.6.1"; + name = "mate-icon-theme-1.6.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz"; - sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x"; + url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.2.tar.xz"; + sha256 = "1ahijywk6vj8yyiglqdpc56dkczyj1v99ziblaaclmhi4sxxb5jm"; }; buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ]; diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix index 0f0f41af638..32d1a24cbf4 100644 --- a/pkgs/misc/themes/mate-themes/default.nix +++ b/pkgs/misc/themes/mate-themes/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation { - name = "mate-themes-1.6.1"; + name = "mate-themes-1.6.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz"; - sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp"; + url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.2.tar.xz"; + sha256 = "145mjdijjvkpjjgqdfwjp30jvvs0qzxlnh15q6mig8df6drg5fn6"; }; buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 01ce5f423c3..40a0d7af496 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which }: +{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit }: /* About Vim and plugins @@ -197,6 +197,22 @@ in rec }; }; + golang = simpleDerivation { + name = "vim-golang-20131127"; + src = fetchgit { + url = "https://github.com/jnwhiteh/vim-golang.git"; + rev = "832d64e5a813511ed52217aa24f0255c49671bab"; + }; + path = "golang"; + meta = with stdenv.lib; { + description = "Vim plugins for Go"; + homepage = https://github.com/jnwhiteh/vim-golang; + license = licenses.publicDomain; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + }; + ipython = simpleDerivation { name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960"; src = fetchurl { diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 2ff9d214bbb..88c7ffd93ee 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - ver = "2013.2.0"; + ver = "2013.4.0"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha1 = "0ba6520c813c9dd2e59e6205e8ea2e60a0c85f52"; + sha256 = "0k6b695h38m92a8wn5gvb3z746m3fm0ygv58yyn163adcsvf7sjd"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 3f5d85e8f6f..4938f7f4470 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.8"; + name = "bluez-5.12"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1l33lq1lpg7hy26138ir5dj4gl3mql2qxpj20rjnnwyckc3jk700"; + sha256 = "0zk183gjsxissq9gma962cyvyqxydai8n6jgslxx0mpk2m7mgvvm"; }; pythonPath = with pythonPackages; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 842d2911f77..569b8a89196 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.4"; + version = "3.12.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb"; + sha256 = "085c4d6663f7e85afe8ae196231f291b28187d4237e46492fa63e1726db04412"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 4d555f59c37..f966180a8b6 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -8,10 +8,11 @@ assert stdenv.lib.hasSuffix "/" mediaDir; stdenv.mkDerivation rec { - name = "pmount-0.9.23"; + name = "pmount-${version}"; + version = "0.9.23"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/3310/${name}.tar.gz"; + url = "mirror://debian/pool/main/p/pmount/pmount_${version}.orig.tar.bz2"; sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; @@ -36,5 +37,6 @@ stdenv.mkDerivation rec { homepage = http://pmount.alioth.debian.org/; description = "Mount removable devices as normal user"; license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 4de8ad6db0f..702ebc5d828 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.2"; + name = "powertop-2.5"; src = fetchurl { url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; - sha256 = "0a5haxawcjrlwwxx4j5kd4ad05gjmcr13v8gswfwfxcn7fyf2f8k"; + sha256 = "02rwqbpasdayl201v0549gbp2f82rd0hqiv3i111r7npanjhhb4b"; }; buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 28cdbe18978..537b17550da 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "udisks-2.1.0"; + name = "udisks-2.1.1"; src = fetchurl { url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2"; - sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii"; + sha256 = "1yw6h3l13y796adwgj6m4j3hijv58lgpf98mq24nn9da73zhjfq1"; }; patches = [ ./force-path.patch ]; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 8e6584465d0..c220d2d2dd0 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -4,11 +4,11 @@ assert withQt4 -> qt4 != null; stdenv.mkDerivation rec { - name = "v4l-utils-0.9.3"; + name = "v4l-utils-1.0.0"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0gaag38x47wlvmp4j60wgf9ma1rxzfyg7i12zxxxi4m3cpcb0bah"; + sha256 = "0c2z500ijxr1ldzb4snasfpwi2icp04f8pk7akiqjkp0k4h8iqqx"; }; buildInputs = [ which ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index ae50091add1..5e86d60871d 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison, readline }: stdenv.mkDerivation rec { - name = "bird-1.3.11"; + name = "bird-1.4.0"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "15c4d9cyd6l8jdlrvmzvwmpga81llm8zxqvbsir9gvwgzn6zbmna"; + sha256 = "1ickqvzpnyycq4a0l4d0kvf25pvq2vjayc0whqfv1233nb5426ys"; }; buildInputs = [ flex bison readline ]; diff --git a/pkgs/servers/http/jetty/6.1/default.nix b/pkgs/servers/http/jetty/6.1/default.nix index 10913a65641..894a21fdece 100644 --- a/pkgs/servers/http/jetty/6.1/default.nix +++ b/pkgs/servers/http/jetty/6.1/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "jetty-6.1.21"; + name = "jetty-6.1.26"; builder = ./bin-builder.sh; buildInputs = [unzip]; src = fetchurl { - url = http://dist.codehaus.org/jetty/jetty-6.1.21/jetty-6.1.21.zip; - sha256 = "1nrjglrmf29m1j1c80nskngmlqmc5vc7c48fggczn605l722cwaw"; + url = http://dist.codehaus.org/jetty/jetty-6.1.26/jetty-6.1.26.zip; + sha256 = "11w1ciayv8zvxjg45xzs0kwc7k45x97sbnxkqb62sxy3gsw8xh4n"; }; } diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index cb29c9ebc89..46cf742c452 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}: stdenv.mkDerivation rec { - name = "dovecot-2.1.8"; + name = "dovecot-2.1.17"; buildInputs = [openssl pam bzip2 zlib inotifyTools openldap]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; - sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028"; + sha256 = "06j2s5bcrmc0dhjsyavqiss3k65p6xn00a7sffpsv6w3yngv777m"; }; # It will hardcode this for /var/lib/dovecot. diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index f4fde2dadef..c9976581a51 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -5,11 +5,11 @@ assert enableJabber -> minmay != null; let - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "057fjqww0qzs56nm8m3c36kbrhwriysvjvqzgwm9j2bg9ylixvym"; + sha256 = "0p86m634j08w0gbr2rwqr3h5p6md7k0c688w5yxc1ii3l9fmnhbi"; }; preConfigure = diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 22c10a6e972..bf0366f20b1 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.18rc1"; + version = "1.8.19"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "1pa4656dcl5r7r36nwk05zy38z49np6j717wjmmd8sqlz6szw01n"; + sha256 = "0xgki1lrqyhfvx2691v8mk7a868zz35cnvrhiyqgksq2kshm11ph"; }; preConfigure = diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix new file mode 100644 index 00000000000..e81ccb39632 --- /dev/null +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, which, protobuf, v8, ncurses, gperftools, boost, m4 }: + +stdenv.mkDerivation rec { + name = "rethinkdb-1.11.2"; + + src = fetchurl { + url = "http://download.rethinkdb.com/dist/${name}.tgz"; + sha256 = "04wz07y891vygc5ksrvkk1ch05xj16nahv20bnxwcllkbl4gf9lj"; + }; + + preConfigure = '' + export ALLOW_WARNINGS=1 + patchShebangs . + ''; + + configureFlags = "--lib-path ${gperftools}/lib"; + + buildInputs = [ protobuf v8 ncurses boost ]; + + nativeBuildInputs = [ which m4 ]; + + + meta = { + description = "An open-source distributed database built with love"; + longDescription = '' + RethinkDB is built to store JSON documents, and scale to multiple machines with very little + effort. It has a pleasant query language that supports really useful queries like table joins + and group by, and is easy to setup and learn. + ''; + homepage = http://www.rethinkdb.com; + license = "AGPLv3"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index a94c05d5627..a41343c0cf9 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -30,10 +30,10 @@ rec { }; squid32 = squid30.merge rec { - name = "squid-3.2.2"; + name = "squid-3.2.13"; src = args.fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2"; - sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l"; + sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j"; }; buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2 libtool openssl]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 852d7ab9841..1be17e623f7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -790,11 +790,11 @@ let })) // {inherit libICE kbproto libSM libX11 xproto ;}; libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) { - name = "libXtst-1.2.1"; + name = "libXtst-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2; - sha256 = "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky"; + url = mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2; + sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg"; }; buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; @@ -1370,11 +1370,11 @@ let })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.6.2"; + name = "xf86-input-synaptics-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2; - sha256 = "082rlbyw63sashjbwd7dd0a0smp5n8yv9bihy19c706lhnhddxy3"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2; + sha256 = "13mmpcwp1d69w6c458a4fdqgwl24bpvrnq3zd6833chz1rk2an6v"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1420,11 +1420,11 @@ let })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) { - name = "xf86-video-ast-0.97.0"; + name = "xf86-video-ast-0.98.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2; - sha256 = "0xlfk64pa0vbg74m261fw8cn4vw6jw3nxm6wys9m4j3n2rwd9z18"; + url = mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2; + sha256 = "188nv73w0p5xhfxz2dffli44yzyn1qhhq3qkwc8wva9dhg25n8lh"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1440,31 +1440,31 @@ let })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) { - name = "xf86-video-cirrus-1.5.1"; + name = "xf86-video-cirrus-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2; - sha256 = "0my54x52fsa82bsh196hz79750xjlv8ddbvin7230ck7pnf44md9"; + url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2; + sha256 = "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) { - name = "xf86-video-dummy-0.3.6"; + name = "xf86-video-dummy-0.3.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2; - sha256 = "16773lxa74d9v2x758bx0byrmxssplqygnjn09q3klr605j5ncs4"; + url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2; + sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) { - name = "xf86-video-fbdev-0.4.3"; + name = "xf86-video-fbdev-0.4.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2; - sha256 = "0ca8khgy3wv0fys7s4087apvnp8j86blxj5m5m70l10hs5x06yzz"; + url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; + sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; @@ -1540,14 +1540,14 @@ let })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) { - name = "xf86-video-neomagic-1.2.7"; + name = "xf86-video-neomagic-1.2.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2; - sha256 = "0xnbk2y5pzs1g3w2rmjc4k3nyq6kazf67bv4q3dnbywalsgfh1lz"; + url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2; + sha256 = "0x48sxs1p3kmwk3pq1j7vl93y59gdmgkq1x5xbnh0yal0angdash"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ]; + })) // {inherit fontsproto libpciaccess xorgserver xproto ;}; xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) { name = "xf86-video-newport-0.2.4"; @@ -1680,11 +1680,11 @@ let })) // {inherit randrproto videoproto xorgserver xproto ;}; xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) { - name = "xf86-video-vesa-2.3.2"; + name = "xf86-video-vesa-2.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2; - sha256 = "1qqf97baii1dcsm3y8gqw674j4r8llhkbqsavhyn11iwmvzifjhl"; + url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2; + sha256 = "1y5fsg0c4bgmh1cfsbnaaf388fppyy02i7mcy9vax78flkjpb2yf"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -1900,11 +1900,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.13.4"; + name = "xorg-server-1.14.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2; - sha256 = "1kwq5hqgl3qmm4nxh5iwpa0wwwzsj67fxqiiglzhyyrwgy46kjd2"; + url = mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2; + sha256 = "1lb1fkscy7nwnabfj0d2shvxga16i047g11if18plj0n2jzhc3wd"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c8e20f1f0b9..3e27b874343 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -165,6 +165,13 @@ in ]; }; + xf86videonv = attrs: attrs // { + patches = [( args.fetchurl { + url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da; + sha256 = "0ikbnz6048ygs1qahb6ylnxkyjhfjcqr2gm9bk95ca90v57j7i0f"; + })]; + }; + xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker }; @@ -198,11 +205,7 @@ in "--with-default-font-path= " # there were only paths containing "${prefix}", # and there are no fonts in this package anyway ]; - patches = - [ ./xorgserver-dri-path.patch - ./xorgserver-xkbcomp-path.patch - ./xorgserver-cve-2013-4396.patch - ]; + patches = [ ./xorgserver-xkbcomp-path.patch ]; buildInputs = attrs.buildInputs ++ [ xtrans ]; propagatedBuildInputs = [ args.zlib args.udev args.mesa args.dbus.libs diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4464aeea9b8..4cf9c0362e0 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -77,7 +77,7 @@ mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2 +mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXvMC-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 @@ -116,15 +116,15 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.1.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 @@ -132,7 +132,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 @@ -146,7 +146,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 @@ -164,7 +164,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch b/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch deleted file mode 100644 index 4b6727e61c0..00000000000 --- a/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Mon, 16 Sep 2013 21:47:16 -0700 -Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText() - [CVE-2013-4396] - -Save a pointer to the passed in closure structure before copying it -and overwriting the *c pointer to point to our copy instead of the -original. If we hit an error, once we free(c), reset c to point to -the original structure before jumping to the cleanup code that -references *c. - -Since one of the errors being checked for is whether the server was -able to malloc(c->nChars * itemSize), the client can potentially pass -a number of characters chosen to cause the malloc to fail and the -error path to be taken, resulting in the read from freed memory. - -Since the memory is accessed almost immediately afterwards, and the -X server is mostly single threaded, the odds of the free memory having -invalid contents are low with most malloc implementations when not using -memory debugging features, but some allocators will definitely overwrite -the memory there, leading to a likely crash. - -Reported-by: Pedro Ribeiro <pedrib@gmail.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Julien Cristau <jcristau@debian.org> ---- - dix/dixfonts.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/dix/dixfonts.c b/dix/dixfonts.c -index feb765d..2e34d37 100644 ---- a/dix/dixfonts.c -+++ b/dix/dixfonts.c -@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - GC *pGC; - unsigned char *data; - ITclosurePtr new_closure; -+ ITclosurePtr old_closure; - - /* We're putting the client to sleep. We need to - save some state. Similar problem to that handled -@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c) - err = BadAlloc; - goto bail; - } -+ old_closure = c; - *new_closure = *c; - c = new_closure; - - data = malloc(c->nChars * itemSize); - if (!data) { - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } -@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - if (!pGC) { - free(c->data); - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } -@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - FreeScratchGC(pGC); - free(c->data); - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } --- -1.7.9.2 diff --git a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch deleted file mode 100644 index 3a5f061eb9a..00000000000 --- a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur xorg-server-1.12.2-orig/glx/glxdricommon.c xorg-server-1.12.2/glx/glxdricommon.c ---- xorg-server-1.12.2-orig/glx/glxdricommon.c 2012-05-17 13:09:02.000000000 -0400 -+++ xorg-server-1.12.2/glx/glxdricommon.c 2012-07-14 14:57:37.972791909 -0400 -@@ -219,10 +219,14 @@ - int i; - void *driver; - char filename[PATH_MAX]; -+ char *real_dri_driver_path; - const __DRIextension **extensions; - -+ real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH"); -+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path; -+ - snprintf(filename, sizeof filename, "%s/%s_dri.so", -- dri_driver_path, driverName); -+ real_dri_driver_path, driverName); - - driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (driver == NULL) { diff --git a/pkgs/servers/x11/xorg/xorgserver12-CVE-1940.patch b/pkgs/servers/x11/xorg/xorgserver12-CVE-1940.patch deleted file mode 100644 index d85494f9029..00000000000 --- a/pkgs/servers/x11/xorg/xorgserver12-CVE-1940.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@gmail.com> -Date: Wed, 10 Apr 2013 06:09:01 +0000 -Subject: xf86: fix flush input to work with Linux evdev devices. - -So when we VT switch back and attempt to flush the input devices, -we don't succeed because evdev won't return part of an event, -since we were only asking for 4 bytes, we'd only get -EINVAL back. - -This could later cause events to be flushed that we shouldn't have -gotten. - -This is a fix for CVE-2013-1940. - -Signed-off-by: Dave Airlie <airlied@redhat.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c -index ab3757a..4d08c1e 100644 ---- a/hw/xfree86/os-support/shared/posix_tty.c -+++ b/hw/xfree86/os-support/shared/posix_tty.c -@@ -421,7 +421,8 @@ xf86FlushInput(int fd) - { - fd_set fds; - struct timeval timeout; -- char c[4]; -+ /* this needs to be big enough to flush an evdev event. */ -+ char c[256]; - - DebugF("FlushingSerial\n"); - if (tcflush(fd, TCIFLUSH) == 0) --- -cgit v0.9.0.2-2-gbebe diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 3918be2afc1..a66ab994c81 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.6"; - + name = "dash-0.5.7"; + src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "0qnqx14y70ay1mn0w0hrknpll9266pvj0426k8niww9s7fzv89w5"; + sha256 = "0fafpbpq6jghs0fr392x525dybym9kq1s3kly2679ds526gzm2df"; }; - + meta = { homepage = http://gondor.apana.org.au/~herbert/dash/; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 23233861a06..0b1d889d700 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xlibs, libvdpau }: stdenv.mkDerivation rec { - name = "vdpauinfo-0.0.6"; - + name = "vdpauinfo-0.1"; + src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "0m2llqjnwh3x6y56hik3znym2mfk1haq81a15p54m60ngf0mvfsj"; + sha256 = "17q1spsrd5i4jzhpacbs0bb4blf74j8s45rpg0znyc1yjfk5dj5h"; }; buildInputs = [ pkgconfig xlibs.libX11 libvdpau ]; diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 8acb11833da..a8c249116c0 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "A VNC server connected to a real X11 screen"; homepage = http://www.karlrunge.com/x11vnc/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b8995430f92..d7d1533b3be 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, buildPythonPackage , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo -, ffmpeg_1, x264, libvpx, pil, libwebp }: +, ffmpeg, x264, libvpx, pil, libwebp }: buildPythonPackage rec { name = "xpra-0.9.5"; - + src = fetchurl { url = "http://xpra.org/src/${name}.tar.bz2"; sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw"; }; - buildInputs = [ - python cython pkgconfig + buildInputs = [ + python cython pkgconfig xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto @@ -21,10 +21,10 @@ buildPythonPackage rec { pango cairo gdk_pixbuf atk gtk glib - ffmpeg_1 libvpx x264 libwebp + ffmpeg libvpx x264 libwebp ]; - propagatedBuildInputs = [ + propagatedBuildInputs = [ pil pygtk pygobject ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" python ./setup.py build --enable-Xdummy ''; - + meta = { homepage = http://xpra.org/; description = "Persistent remote applications for X"; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index be42fb4d2a5..596c950b1f3 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { do patch -p1 < $a done - patch -p1 < ../xserver113.patch autoreconf -vfi ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" make TIGERVNC_SRCDIR=`pwd`/../.. diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index c5b45743c34..6d5dd6ffca0 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -17,11 +17,13 @@ stdenv.mkDerivation rec { ./autogen.sh ''; + # work around a problem related to gtk3 updates + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + postInstall = '' ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; description = ""; license = licenses.gpl2; maintainers = with maintainers; [ iElectric ]; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 6d550e95a9d..f6a51eb3193 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.4"; + version = "1.6"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz"; - sha256 = "0gipbhh20p9n1x1cdpcil8vg3i20f1saa0xyz2wydb9xl4l2mjff"; + sha256 = "1vg0kppbyngvm7wi2pbg3himixy9v3h8z66lcps6pclw43s1kgpm"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 514b69a1992..62a802ebab5 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,16 +1,16 @@ -{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }: +{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: stdenv.mkDerivation rec { - name = "xorriso-1.2.2"; + name = "xorriso-1.3.4"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "0kw4fiqn24vya3zhay6minzrbz10zlxm8sjs272z7l5s2kwcjypx"; + sha256 = "0wvxbvkpdydcbmqi9xz7nv8cna6vp9726ahmmxxyx56cz4xifr4x"; }; doCheck = true; - buildInputs = [ libcdio zlib bzip2 readline ] + buildInputs = [ libcdio zlib bzip2 readline attr ] ++ stdenv.lib.optional stdenv.isLinux acl; meta = { diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 4df2947d137..2dd4d7eb794 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ucl, zlib}: stdenv.mkDerivation { - name = "upx-3.07"; + name = "upx-3.09"; src = fetchurl { - url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2; - sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs"; + url = mirror://sourceforge/upx/upx-3.09-src.tar.bz2; + sha256 = "16jwynharr1silfd6vlxl9i94fs8mg79qp72dr48r3wv9mlra6pn"; }; buildInputs = [ ucl zlib ]; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 8c7593121bb..4c00252fc2a 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.6.1"; + name = "archivemount-0.8.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "9235d6377a70a7c25aa288dab6b0e8ef906d1d219d43e5b8fcdb8cf3ace98e01"; + sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277"; }; buildInputs = [ pkgconfig fuse libarchive ]; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 21a93774758..26ffc9d50c2 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,17 +1,17 @@ -{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }: +{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }: stdenv.mkDerivation rec { - name = "netatalk-3.0.5"; + name = "netatalk-3.1.0"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; - sha256 = "1adlcj509czxsx60r1s96qlznspp5nz7dxc5fws11danidr4fhl8"; + sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq"; }; - buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ]; + buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ]; configureFlags = [ - "--with-bdb=${db48}" + "--with-bdb=${db4}" "--with-openssl=${openssl}" ]; diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 6f8ec54c4c0..d43540a8b99 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -9,11 +9,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="0.98"; + version="0.99"; baseName="barcode"; name="${baseName}-${version}"; url="mirror://gnu/${baseName}/${name}.tar.gz"; - hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2"; + hash="0r2b2lwg7a9i9ic5spkbnavy1ynrppmrldv46vsl44l1xgriq0vw"; }; in rec { diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 515858bd439..f3f17692df8 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xproto, libXt, libX11 }: stdenv.mkDerivation { - name = "gifsicle-1.52"; + name = "gifsicle-1.78"; src = fetchurl { - url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz; - sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk"; + url = http://www.lcdf.org/gifsicle/gifsicle-1.78.tar.gz; + sha256 = "0dzp5sg82klji4lbj1m4cyg9fb3l837gkipdx657clib97klyv53"; }; buildInputs = [ xproto libXt libX11 ]; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 23d57f5b652..e0f9ce2a2bf 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -6,6 +6,7 @@ , libXt ? null , libXpm ? null , libXaw ? null +, aquaterm ? false , wxGTK ? null , pango ? null , cairo ? null @@ -15,7 +16,9 @@ , coreutils ? null }: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); - +let + withX = libX11 != null && !aquaterm; +in stdenv.mkDerivation rec { name = "gnuplot-4.6.3"; @@ -25,14 +28,18 @@ stdenv.mkDerivation rec { }; buildInputs = - [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw + [ zlib gd texinfo readline emacs lua texLive pango cairo pkgconfig makeWrapper ] + ++ stdenv.lib.optionals withX [ libX11 libXpm libXt libXaw ] # compiling with wxGTK causes a malloc (double free) error on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK; - configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; + configureFlags = + (if withX then ["--with-x"] else ["--without-x"]) + ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]) + ; - postInstall = stdenv.lib.optionalString (libX11 != null) '' + postInstall = stdenv.lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ @@ -43,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gnuplot.info; description = "A portable command-line driven graphing utility for many platforms"; - platforms = platforms.all; + hydraPlatforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 39e134ad906..2e3274ca0ff 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation { sha256 = "0csx6g0ci66nx1a6z0a9dkpfp66mdvcpp5r7g6zrx4jp18r9hzb2"; }; + postPatch = /* CVE-2005-2471, from Arch */ '' + substituteInPlace converter/other/pstopnm.c \ + --replace '"-DSAFER"' '"-DPARANOIDSAFER"' + ''; + NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 libtiff ]; @@ -18,9 +23,7 @@ stdenv.mkDerivation { cp config.mk.in config.mk substituteInPlace "config.mk" \ --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \ - --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" \ - --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \ - --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N" + --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" ''; preBuild = '' diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 2ec7f433596..09d8e888837 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, flex, bdb}: +{fetchurl, stdenv, flex, db4}: stdenv.mkDerivation rec { name = "bogofilter-1.2.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # FIXME: We would need `pax' as a "propagated build input" (for use # by the `bf_tar' script) but we don't have it currently. - buildInputs = [ flex bdb ]; + buildInputs = [ flex db4 ]; meta = { homepage = http://bogofilter.sourceforge.net/; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 03b3719c9f0..909e44d9809 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "byobu-5.37"; + name = "byobu-5.68"; src = fetchurl { - url = "https://launchpad.net/byobu/trunk/5.37/+download/byobu_5.37.orig.tar.gz"; - sha256 = "e9fec9c03ebdfbeb42d08e8e7a7e45d873e1a5d5f7984a39793e37fe7cc30688"; + url = "https://launchpad.net/byobu/trunk/5.68/+download/byobu_5.68.orig.tar.gz"; + sha256 = "1xf2m18zx3075c0qvx4fzvn5afm274j5dl0jps7p2lbaq4k1lyhm"; }; doCheck = true; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 285160e50d6..7c84d913157 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "desktop-file-utils-0.16"; + name = "desktop-file-utils-0.22"; src = fetchurl { - url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.bz2"; - sha256 = "18y9am8n43rrnnldd1cy09ls39xz1gx3qczax2c4cjxayx5vwq3r"; + url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; + sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"; }; buildInputs = [ pkgconfig glib ]; diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index b4a159745d4..777f7b48675 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation rec { - name = "disper-0.3.0"; + name = "disper-0.3.1"; buildInputs = [python]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.0.tar.gz; - sha256 = "1mfqidm5c89nknzksabqgjygdp57xpszz7hy2dxh39hpgrsk3l58"; + url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz; + sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw"; }; meta = { diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 90d345daa13..01b45cd6d8b 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ethtool-3.10"; + name = "ethtool-3.11"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "0h0wvi0s6s80v26plkh66aiyybpfyi18sjg5pl9idrd0ccdr93gq"; + sha256 = "1m1gc2g5ym7xmbq64ysw9avp9bbsagbi7x624mzki5ba3535agym"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 488f8020b63..7f22a35e8de 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "figlet-2.2.4"; + name = "figlet-2.2.5"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.4.tar.gz; - sha256 = "19qcmm9cmf78w1z7gbpyj9wmrfjzjl25sax9f2j37sijznrh263f"; + url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz; + sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; installPhase = "make prefix=$out install"; diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 19bebcf2823..805dbd3f17c 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation { - name = "multitail-5.2.12"; + name = "multitail-5.2.13"; src = fetchurl { - url = http://www.vanheusden.com/multitail/multitail-5.2.12.tgz; - sha256 = "681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c"; + url = http://www.vanheusden.com/multitail/multitail-5.2.13.tgz; + sha256 = "1axgbdm1xkg570j0p150492x7p3mf11shwvn6dz8g4rha7cak4l6"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 0eceea4a57e..54697f98414 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2 }: stdenv.mkDerivation rec { - name = "parcellite-1.1.6"; + name = "parcellite-1.1.7"; src = fetchurl { url = "mirror://sourceforge/parcellite/${name}.tar.gz"; - sha256 = "0nz951ykj162mfbcn3w9zk525ww6qcqn5yqdx13nx70fnn6rappi"; + sha256 = "0pszw3yd4a08p6jsz7asayr7jir08bxbwvfb16k01cj7ya4kf3w7"; }; buildInputs = [ pkgconfig intltool gtk2 ]; diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 2257fb50293..befe517c225 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."; licence = "GPLv2"; maintainers = with stdenv.lib.maintainers; [ vlstill ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 01ef17845c4..eb6baf41fe4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2013.12.11.2"; + version = "2013.12.20"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1ar0shbk22dfnq37z8kxd1bv7dk3vm3439f4zhgc9ylvn6n0hnkq"; + sha256 = "0cqr0rpa247gfk5fg65sj94x4d9a1s85343gnqmc763h5h8v50zb"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix index f6432f8aa22..2cd3892eede 100644 --- a/pkgs/tools/networking/aria/default.nix +++ b/pkgs/tools/networking/aria/default.nix @@ -1,11 +1,11 @@ args : with args; -let version="0.14.0"; in +let version="0.16.2"; in rec { src = /* Here a fetchurl expression goes */ fetchurl { url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2"; - sha256 = "0d6vpy7f4228byahsg4dlhalfkbscx941klhdlxd0y5c3mxxwkfr"; + sha256 = "02qj3j7a1r477pmk969nd3aa93m33kh4101azy001i9jacpjvzrp"; }; buildInputs = []; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 75b6492a851..87613695be7 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }: stdenv.mkDerivation rec { - name = "aria2-1.17.1"; + name = "aria2-1.18.1"; src = fetchurl { url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "0v0cdbv6v7fb4870rz5s9vscsj74fzbj70gsa2y4hysai4a0im3y"; + sha256 = "0fwm5d0i4nr9yzckmd8yc80yj4h1acrv6jca3h1vjji0rbgk49zy"; }; buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ]; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 91061a457d4..ae0007c1f2d 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python, sysstat, unzip }: stdenv.mkDerivation rec { - version = "3.8.0"; + version = "4.0.1"; name = "dd-agent-${version}"; src = fetchurl { url = "https://github.com/DataDog/dd-agent/archive/${version}.zip"; - sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx"; + sha256 = "0gybdbjkj7qwnzic03xkypagb30zhm22gp3nkwrdhi8fdmwz3nm1"; }; buildInputs = [ python unzip ]; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 06e7789eca3..80d29835da5 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "getmail-4.42.0"; + name = "getmail-4.43.0"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0n6sxp8vwa19ffr7bagzwp0hvxfjiy43xpz9sa1qmsyjs7c3xdqj"; + sha256 = "0abcj4d2jp9y56c85kq7265d8wcij91w9lpzib9q6j9lcs4la8hy"; }; doCheck = false; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index e42dfee7cae..f959ad1d573 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile -, gtk3, webkit, libsoup, icu }: +, gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: stdenv.mkDerivation rec { version = "0.9.9.5"; @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1hwkliyb8fjrz5sw9fcisssig0jkdxzhccw0ld0l9a10q1l9mqhp"; }; - buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile - gtk3 webkit libsoup icu ]; + buildInputs = + [ sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu ] + ++ stdenv.lib.optional withMug [ gtk3 webkit ]; preBuild = '' # Fix mu4e-builddir (set it to $out) @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { ''; # Install mug and msg2pdf - postInstall = '' + postInstall = stdenv.lib.optionalString withMug '' cp -v toys/msg2pdf/msg2pdf $out/bin/ cp -v toys/mug/mug $out/bin/ ''; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 1d66d30aaba..5ea6c8f6895 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "ndisc6-1.0.1"; + name = "ndisc6-1.0.2"; src = fetchurl { url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; - sha256 = "1pggc9x3zki1sv08rs8x4fm7pmd3sn1nwkan3szax19xg049xbqx"; + sha256 = "0ynacanjhlib4japqmf7n2c0bv5f2qq6rx2nhk4kmylyrfhcikka"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix index 18fdae2a44f..44f32e93474 100644 --- a/pkgs/tools/networking/oslrd/default.nix +++ b/pkgs/tools/networking/oslrd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "olsrd-0.6.5.4"; + name = "olsrd-0.6.6.1"; src = fetchurl { url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2"; - sha256 = "757327b9a22b066bd0cab2a8e1cdd1c462f474bb99864a175388aa5f0c70504c"; + sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8"; }; buildInputs = [ bison flex ]; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index e30192598cc..4c3ee0c4d6f 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -2,14 +2,14 @@ let name = "gtk-gnutella"; - version = "0.97"; + version = "1.0.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0l2gdzp517hjk31318djq0sww6kzckzl9rfqvhgspihn874lm9hb"; + sha256 = "11nri43q99zbxql9wg3pkq98vcgzvbndpzc3a1jlg3lzh7css0hc"; }; buildInputs = [pkgconfig glib gtk libxml2 bison gettext zlib]; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 15ca99f47e9..26b4b680a6e 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -1,21 +1,14 @@ -{ stdenv, fetchgit, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: -stdenv.mkDerivation rec { - name = "speedtest-cli-dev"; +pythonPackages.buildPythonPackage rec { + name = "speedtest-cli-${version}"; + version = "0.2.4"; - src = fetchgit { - url = "https://github.com/sivel/speedtest-cli.git"; - rev = "fe0940c5744ebe74ca31ad44e6b181d82a89edab"; - sha256 = "0iywcmgqi58bhldcf8qn1nr7mihypi5fp9s13d4vqc7797xvb28k"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; + sha256 = "1mz9lx0sdgjz5w3w2lrfh4g7mdyas0ywqfvwh7hwmmpg0fvqiq5q"; }; - buildInputs = [ pythonPackages.python ]; - - installPhase = '' - mkdir -p $out/bin - cp speedtest-cli $out/bin/ - ''; - meta = with stdenv.lib; { homepage = https://github.com/sivel/speedtest-cli; description = "Command line interface for testing internet bandwidth using speedtest.net"; diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index bd3a1135a84..401e252a294 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "surfraw-2.2.8"; + name = "surfraw-2.2.9"; src = fetchurl { - url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.8.tar.gz"; - sha256 = "925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec"; + url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.9.tar.gz"; + sha256 = "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa"; }; configureFlags = [ @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; homepage = "http://surfraw.alioth.debian.org"; maintainers = []; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index f987d6fa6ba..acea2d6da6a 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.4.0"; + name = "tcpdump-4.5.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1g9h2p31xwpdg88v7wv9hc8calq8sjs25800vzd9i45q5knln9qj"; + sha256 = "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index ea9719dd9b2..d95c5b5f6bb 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, expat, libevent, ldns }: stdenv.mkDerivation rec { - name = "unbound-1.4.13"; + name = "unbound-1.4.21"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "04r379gma1ghr9zjc1fmncpw8kka4f0mpcmrzidsp264aqkxriw3"; + sha256 = "0w09m2rbn688rsk37k5xm3vkk5h2hxhivsr374j7h7vjf9x82bsh"; }; buildInputs = [openssl expat libevent ldns]; diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 13c5a5d9260..e9c102817e1 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="wavemon"; - version="0.7.2"; + version="0.7.5"; name="${baseName}-${version}"; url="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${name}.tar.bz2"; - hash="1w1nq082mpjkcj7q6qs80104vki9kddwqv1wch6nmwwh0l72dgma"; + hash="0b1fx00aar2fsw49a10w5bpiyjpz8h8f4nrlwb1acfw36yi1pfkd"; }; in rec { diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index 192970b5cae..362ec3a25bb 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.15"; + name = "gnupg-1.4.16"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha1 = "63ebf0ab375150903c65738070e4105200197fd4"; + sha256 = "0bsa1yqa3ybhvmc4ys73amdpcmckrlq1fsxjl2980cxada778fvv"; }; buildInputs = [ readline bzip2 ]; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 543c5d81ba1..81efd4841a6 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,11 +6,11 @@ assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { - name = "pinentry-0.8.2"; + name = "pinentry-0.8.3"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "1c9r99ck8072y7nkirddg3p372xadl95y65hyc1m6wn5mavbg12h"; + sha256 = "1bd047crf7xb8g61mval8v6qww98rddlsw2dz6j8h8qbnl4hp2sn"; }; buildInputs = let opt = stdenv.lib.optional; in [] diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index 1095d702d25..cd9519590cc 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -1,15 +1,13 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "acct-6.5.5"; + name = "acct-6.6.1"; src = fetchurl { url = "mirror://gnu/acct/${name}.tar.gz"; - sha256 = "1mbg18acrva5m7kxc9pzhaknsqm4r90nrp7ax9jkm9wjkrxwhqs1"; + sha256 = "1jzz601cavml7894fjalw661gz28ia35002inw990agr3rhiaiam"; }; - patches = [ ./no-gets.patch ]; - doCheck = true; meta = { diff --git a/pkgs/tools/system/acct/no-gets.patch b/pkgs/tools/system/acct/no-gets.patch deleted file mode 100644 index 3478b66de9d..00000000000 --- a/pkgs/tools/system/acct/no-gets.patch +++ /dev/null @@ -1,22 +0,0 @@ -hack until acct pulls a newer gnulib version - -From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 -From: Eric Blake <eblake@redhat.com> -Date: Thu, 29 Mar 2012 13:30:41 -0600 -Subject: [PATCH] stdio: don't assume gets any more - -Gnulib intentionally does not have a gets module, and now that C11 -and glibc have dropped it, we should be more proactive about warning -any user on a platform that still has a declaration of this dangerous -interface. - ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -125,7 +125,6 @@ - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 82377aa92f5..2bfa77164b8 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.1.3"; + name = "freeipmi-1.3.4"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "11kawxzk8cp9g3q5hdm1sqgzanprc2gagjdnm33lyz5df8xjfkmk"; + sha256 = "0gadf3yj019y3rvgf34pxk502p0p6nrhy6nwldvvir5rknndxh63"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index c4e955056f4..97020ce2e42 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}: +{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}: stdenv.mkDerivation { - name = "rsyslog-7.2.7"; + name = "rsyslog-7.4.7"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz; - sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8"; + url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz; + sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21"; }; - buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls]; + buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd]; - configureFlags = "--enable-gnutls"; + preConfigure = '' + export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system" + ''; meta = { homepage = "http://www.rsyslog.com/"; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index dcc4116813b..a0033771b67 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation { - name = "dos2unix-5.3.1"; + name = "dos2unix-6.0.3"; src = fetchurl { - url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-5.3.1.tar.gz; - sha256 = "0bwqw3wi0j4f1x8d39xw5v57ac0bc58j41vjx8v2qm1smg9jyci1"; + url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.3.tar.gz; + sha256 = "014sxyidqmjvc5xp5dmcimxd3apl8gyv6whc44vkb65151dqq9pm"; }; configurePhase = '' diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index ce1c7401a4e..23223572bb2 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libiconv ? null }: +{ stdenv, fetchurl, libiconvOrNull, recode }: stdenv.mkDerivation rec { - name = "enca-1.13"; + name = "enca-1.15"; src = fetchurl { url = "http://dl.cihar.com/enca/${name}.tar.bz2"; - sha256 = "6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432"; + sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv"; }; - buildInputs = (stdenv.lib.optional (libiconv != null) libiconv); + buildInputs = [ recode libiconvOrNull ]; meta = { homepage = http://freecode.com/projects/enca; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 40a3bcf78ea..9bca0a91d4f 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, getopt, lua, boost }: stdenv.mkDerivation rec { - name = "highlight-3.5"; + name = "highlight-3.9"; src = fetchurl { url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "0jpidd2fwn5mbrgzjmh53qvfmqqp6g0mah7i5zsf9bd71ga1lp28"; + sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja"; }; buildInputs = [ getopt lua boost ]; diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index feaf3afe52b..551d0b9f74a 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, bison, flex }: stdenv.mkDerivation rec { - name = "mairix-0.22"; + name = "mairix-0.23"; src = fetchurl { url = "mirror://sourceforge/mairix/${name}.tar.gz"; - sha256 = "0kwxq738nbv8ip5gkq2bw320qs1vg0pnv7wsc0p5cxwzxxrv47ql"; + sha256 = "1yzjpmsih6c60ks0d0ia153z9g35nj7dmk98383m0crw31dj6kl0"; }; buildInputs = [ zlib bzip2 bison flex ]; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 9f019440775..21024c4aaad 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "namazu-2.0.20"; + name = "namazu-2.0.21"; src = fetchurl { url = "http://namazu.org/stable/${name}.tar.gz"; - sha256 = "1czw3l6wmz8887wfjpgds9di8hcg0hsmbc0mc6bkahj8g7lvrnyd"; + sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 1eae8c4d527..d5f8bb9ff35 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "5.6.1"; + version = "5.8.1"; in stdenv.mkDerivation { name = "numdiff-${version}"; src = fetchurl { url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; - sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx"; + sha256 = "00zm9955gjsid0daa94sbw69klk0vrnrrh0ihijza99kysnvmblr"; }; meta = { description = '' diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix new file mode 100644 index 00000000000..90b2ff61f34 --- /dev/null +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, perl, makeWrapper, zip, libxslt, PerlMagick }: + +stdenv.mkDerivation rec { + name = "docbook2odf-0.244"; + + src = fetchurl { + url = "http://open.comsultia.com/docbook2odf/dwn/${name}.tar.gz"; + sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; + }; + + buildInputs = [ perl makeWrapper ]; + + installPhase = '' + mkdir -p "$out/bin/" + mkdir -p "$out/share/docbook2odf/" + mkdir -p "$out/share/doc/docbook2odf/" + mkdir -p "$out/share/man/man1/" + mkdir -p "$out/share/applications/" + + cp utils/docbook2odf "$out/bin/" + cp docs/docbook2odf.1 "$out/share/man/man1/" + cp -r examples/ "$out/share/doc/docbook2odf/" + cp -r xsl/ "$out/share/docbook2odf/" + cp bindings/desktop/docbook2odf.desktop "$out/share/applications/" + + sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf" + + wrapProgram "$out/bin/docbook2odf" \ + --prefix PATH : "${zip}/bin:${libxslt}/bin" \ + --prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}" + ''; + + meta = with stdenv.lib; { + description = "Convert DocBook to OpenDocument Format (ODF)"; + longDescription = '' + Docbook2odf is a toolkit that automaticaly converts DocBook to OASIS + OpenDocument (ODF, the ISO standardized format used for texts, + spreadsheets and presentations). Conversion is based on a XSLT which + makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these + documents are XML based. + ''; + homepage = http://open.comsultia.com/docbook2odf/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 3a8b41da660..b3c09952e43 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation ( rec { pname = "auctex"; - version = "11.85"; + version = "11.87"; name = "${pname}-${version}"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e"; + sha256 = "1wjwpmvhpj8q0zd78lj7vyzqhx4rbdhkflslylkzgnw5wllp5mb3"; }; buildInputs = [ emacs texLive ]; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index b48cc7cddcc..8e7fbdaeaf3 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "swfmill-0.3.2"; + name = "swfmill-0.3.3"; src = fetchurl { url = "http://swfmill.org/releases/${name}.tar.gz"; - sha256 = "077agf62q0xz95dxj4cq9avcqwin94vldrpb80iqwjskvkwpz9gy"; + sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r"; }; buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39838ae4fd5..12aa3a611f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -392,13 +392,19 @@ let acct = callPackage ../tools/system/acct { }; - acoustidFingerprinter = callPackage - ../tools/audio/acoustid-fingerprinter { }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { + ffmpeg = ffmpeg_1; + }; actdiag = pythonPackages.actdiag; aefs = callPackage ../tools/filesystems/aefs { }; + aegisub = callPackage ../applications/video/aegisub { + wxGTK = wxGTK29; + lua = lua5_1; + }; + aespipe = callPackage ../tools/security/aespipe { }; aescrypt = callPackage ../tools/misc/aescrypt { }; @@ -610,9 +616,7 @@ let inherit unzip; }; - bogofilter = callPackage ../tools/misc/bogofilter { - bdb = db4; - }; + bogofilter = callPackage ../tools/misc/bogofilter { }; bsdiff = callPackage ../tools/compression/bsdiff { }; @@ -641,8 +645,7 @@ let cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cfdg = builderDefsPackage ../tools/graphics/cfdg { - inherit libpng bison flex; - ffmpeg = ffmpeg_1; + inherit libpng bison flex ffmpeg; }; checkinstall = callPackage ../tools/package-management/checkinstall { }; @@ -788,6 +791,10 @@ let dmg2img = callPackage ../tools/misc/dmg2img { }; + docbook2odf = callPackage ../tools/typesetting/docbook2odf { + inherit (perlPackages) PerlMagick; + }; + docbook2x = callPackage ../tools/typesetting/docbook2x { inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; texinfo = texinfo5; @@ -1010,6 +1017,9 @@ let else stdenv; }; + # must have AquaTerm installed separately + gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; + gnused = callPackage ../tools/text/gnused { }; gnutar = callPackage ../tools/archivers/gnutar { }; @@ -1197,7 +1207,9 @@ let klavaro = callPackage ../games/klavaro {}; - minidlna = callPackage ../tools/networking/minidlna { }; + minidlna = callPackage ../tools/networking/minidlna { + ffmpeg = ffmpeg_0_10; + }; mmv = callPackage ../tools/misc/mmv { }; @@ -2780,7 +2792,9 @@ let else callPackage ../development/compilers/go/1.1.nix { }; - go = go_1_1; + go_1_2 = callPackage ../development/compilers/go/1.2.nix { }; + + go = go_1_2; gprolog = callPackage ../development/compilers/gprolog { }; @@ -3011,7 +3025,9 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; - opam = callPackage ../development/tools/ocaml/opam { }; + opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; + opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; + opam = opam_1_1; }; ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1; @@ -3321,7 +3337,6 @@ let regina = callPackage ../development/interpreters/regina {}; renpy = callPackage ../development/interpreters/renpy { - ffmpeg = ffmpeg_1; wrapPython = pythonPackages.wrapPython; }; @@ -3999,9 +4014,9 @@ let clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; - clucene_core = callPackage ../development/libraries/clucene-core { }; + clucene_core_1 = callPackage ../development/libraries/clucene-core { }; - cluceneCore = clucene_core; # !!! remove this + clucene_core = clucene_core_1; clutter = callPackage ../development/libraries/clutter { }; @@ -4034,7 +4049,7 @@ let cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { }; - db4 = db45; + db4 = db48; db44 = callPackage ../development/libraries/db4/db4-4.4.nix { }; @@ -4106,20 +4121,20 @@ let fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg = callPackage ../development/libraries/ffmpeg { + ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { vpxSupport = !stdenv.isMips; - - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; }; - ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { + ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { vpxSupport = !stdenv.isMips; }; - ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { + ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { vpxSupport = !stdenv.isMips; + + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; }; ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { @@ -4132,6 +4147,8 @@ let texinfo = texinfo5; }; + ffmpeg = ffmpeg_2; + ffms = callPackage ../development/libraries/ffms { }; fftw = callPackage ../development/libraries/fftw { @@ -4206,7 +4223,7 @@ let geoclue = callPackage ../development/libraries/geoclue {}; geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix { - libsoup = libsoup_2_40; + libsoup = libsoup_2_44; }; geoip = builderDefsPackage ../development/libraries/geoip { @@ -4332,19 +4349,6 @@ let gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; - goffice = callPackage ../development/libraries/goffice { - inherit (gnome) libglade libgnomeui; - gconf = gnome.GConf; - libart = gnome.libart_lgpl; - }; - - goffice_0_10 = callPackage ../development/libraries/goffice/0.10.nix { - inherit (gnome) libglade libgnomeui; - gconf = gnome.GConf; - libart = gnome.libart_lgpl; - gtk = gtk3; - }; - goocanvas = callPackage ../development/libraries/goocanvas { }; gperftools = callPackage ../development/libraries/gperftools { }; @@ -4370,7 +4374,9 @@ let gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {}; - gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {}; + gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg { + ffmpeg = ffmpeg_0_10; + }; gst_python = callPackage ../development/libraries/gstreamer/gst-python {}; @@ -4447,13 +4453,10 @@ let glSupport = config.cairo.gl or (stdenv.isLinux && !stdenv.isArm && !stdenv.isMips); }; - cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; - pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { - cairo = cairo_1_12_2; - }; + pangomm = callPackage ../development/libraries/pangomm { }; pangox_compat = callPackage ../development/libraries/pangox-compat { }; @@ -4506,10 +4509,7 @@ let heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; - harfbuzz = callPackage ../development/libraries/harfbuzz { - icu = null; - graphite2 = null; - }; + harfbuzz = callPackage ../development/libraries/harfbuzz { }; hawknl = callPackage ../development/libraries/hawknl { }; @@ -4802,6 +4802,8 @@ let libgcrypt = callPackage ../development/libraries/libgcrypt { }; + libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { }); + libgcrypt_git = lowPrio (callPackage ../development/libraries/libgcrypt/git.nix { }); libgdiplus = callPackage ../development/libraries/libgdiplus { }; @@ -4932,7 +4934,7 @@ let libmowgli = callPackage ../development/libraries/libmowgli { }; - libmng = callPackage ../development/libraries/libmng { lcms = lcms2; }; + libmng = callPackage ../development/libraries/libmng { }; libmnl = callPackage ../development/libraries/libmnl { }; @@ -5033,7 +5035,7 @@ let libsodium = callPackage ../development/libraries/libsodium { }; libsoup = callPackage ../development/libraries/libsoup { }; - libsoup_2_40 = callPackage ../development/libraries/libsoup/2.40.nix { }; + libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { }; libssh = callPackage ../development/libraries/libssh { }; @@ -5127,7 +5129,8 @@ let libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = callPackage ../development/libraries/libwnck { }; + libwnck = libwnck2; + libwnck2 = callPackage ../development/libraries/libwnck { }; libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; libwpd = callPackage ../development/libraries/libwpd { }; @@ -5200,12 +5203,11 @@ let lzo = callPackage ../development/libraries/lzo { }; + mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds = callPackage ../development/libraries/mdds { }; # failed to build - mediastreamer = callPackage ../development/libraries/mediastreamer { - ffmpeg = ffmpeg_1; - }; + mediastreamer = callPackage ../development/libraries/mediastreamer { }; mesaSupported = lib.elem system lib.platforms.mesaPlatforms; @@ -5249,9 +5251,7 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mlt = callPackage ../development/libraries/mlt { - ffmpeg = ffmpeg_1; - }; + mlt = callPackage ../development/libraries/mlt { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -5345,12 +5345,9 @@ let openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { - ffmpeg = ffmpeg_0_6_90; - }; + opencv = callPackage ../development/libraries/opencv { }; opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { - ffmpeg = ffmpeg_0_6_90; libpng = libpng12; }; @@ -5375,6 +5372,7 @@ let openscenegraph = callPackage ../development/libraries/openscenegraph { giflib = giflib_4_1; + ffmpeg = ffmpeg_0_10; }; openssl = callPackage ../development/libraries/openssl { @@ -5812,21 +5810,31 @@ let inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild inherit gtk3 glib atk cairo pango fontconfig freetype; inherit (gnome) gtkdoc libsoup; - inherit pkgconfig libtool intltool autoconf automake gperf bison flex + inherit pkgconfig libtool intltool autoconf automake gperf flex libjpeg libpng libtiff libxml2 libxslt sqlite icu curl which libproxy geoclue enchant python ruby perl mesa xlibs; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; + bison = bison2; }; webkit_gtk2 = builderDefsPackage ../development/libraries/webkit/gtk2.nix { inherit gtk2 glib atk cairo pango fontconfig freetype; inherit (gnome) gtkdoc libsoup; - inherit pkgconfig libtool intltool autoconf automake gperf bison flex + inherit pkgconfig libtool intltool autoconf automake gperf flex libjpeg libpng libtiff libxml2 libxslt sqlite icu curl which libproxy geoclue enchant python ruby perl mesa xlibs; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; + bison = bison2; + }; + + webkitgtk = callPackage ../development/libraries/webkitgtk { + stdenv = overrideGCC stdenv gcc47; + libsoup = libsoup_2_44; + harfbuzz = harfbuzz.override { + withIcu = true; }; + }; wildmidi = callPackage ../development/libraries/wildmidi { }; @@ -5869,7 +5877,9 @@ let xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; - xineLib = callPackage ../development/libraries/xine-lib { }; + xineLib = callPackage ../development/libraries/xine-lib { + ffmpeg = ffmpeg_1; + }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -6243,9 +6253,7 @@ let mailman = callPackage ../servers/mail/mailman { }; - mediatomb = callPackage ../servers/mediatomb { - ffmpeg = ffmpeg_0_6_90; - }; + mediatomb = callPackage ../servers/mediatomb { }; memcached = callPackage ../servers/memcached {}; @@ -6373,6 +6381,8 @@ let restund = callPackage ../servers/restund {}; + rethinkdb = callPackage ../servers/nosql/rethinkdb { }; + spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL; @@ -6674,7 +6684,7 @@ let # Install gcc plugins. These are needed for compiling dependant packages. postInstall = '' ${args.postInstall or ""} - cp tools/gcc/*.so $out/lib/modules/$version/build/tools/gcc/ + cp "tools/gcc/"*.so $out/lib/modules/$version/build/tools/gcc/ ''; # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins) # include libgmp headers, so we need these extra tweaks @@ -7444,7 +7454,9 @@ let audacious = callPackage ../applications/audio/audacious { }; - audacity = callPackage ../applications/audio/audacity { }; + audacity = callPackage ../applications/audio/audacity { + ffmpeg = ffmpeg_0_10; + }; milkytracker = callPackage ../applications/audio/milkytracker { }; @@ -7472,7 +7484,9 @@ let }; awesome = awesome-3-5; - baresip = callPackage ../applications/networking/instant-messengers/baresip {}; + baresip = callPackage ../applications/networking/instant-messengers/baresip { + ffmpeg = ffmpeg_1; + }; batik = callPackage ../applications/graphics/batik { }; @@ -7489,9 +7503,7 @@ let bibletime = callPackage ../applications/misc/bibletime { }; - bitcoin = callPackage ../applications/misc/bitcoin { - db4 = db48; - }; + bitcoin = callPackage ../applications/misc/bitcoin { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { # For some reason, TLS support is broken when using GnuTLS 3.0 (can't @@ -7840,7 +7852,6 @@ let inherit (gnome3) evince; keepass = callPackage ../applications/misc/keepass { }; - evolution_data_server = newScope (gnome) ../servers/evolution-data-server { }; exrdisplay = callPackage ../applications/graphics/exrdisplay { @@ -7883,8 +7894,9 @@ let lib flex bison cairo fontconfig gdal zlib ncurses gdbm proj pkgconfig swig blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python - readline sqlite tcl tk libtiff freetype ffmpeg makeWrapper wxGTK; + readline sqlite tcl tk libtiff freetype makeWrapper wxGTK; fftw = fftwSinglePrec; + ffmpeg = ffmpeg_0_10; motif = lesstif; opendwg = libdwg; wxPython = wxPython28; @@ -7962,13 +7974,13 @@ let xfontsel = callPackage ../applications/misc/xfontsel { }; xlsfonts = callPackage ../applications/misc/xlsfonts { }; - freerdp = callPackage ../applications/networking/remote/freerdp { }; + freerdp = callPackage ../applications/networking/remote/freerdp { + ffmpeg = ffmpeg_1; + }; freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { }; - freicoin = callPackage ../applications/misc/freicoin { - db4 = db48; - }; + freicoin = callPackage ../applications/misc/freicoin { }; fspot = callPackage ../applications/graphics/f-spot { inherit (gnome) libgnome libgnomeui; @@ -8003,6 +8015,10 @@ let gitFull = gitAndTools.gitFull; gitSVN = gitAndTools.gitSVN; + gitRepo = callPackage ../applications/version-management/git-repo { + python = python27; + }; + giv = callPackage ../applications/graphics/giv { pcre = pcre.override { unicodeSupport = true; }; }; @@ -8014,7 +8030,15 @@ let gconf = gnome2.GConf; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; + goffice = goffice_0_8; }; + goffice_0_8 = callPackage ../desktops/gnome-3/misc/goffice/0.8.nix { + inherit (gnome2) libglade libgnomeui; + gconf = gnome2.GConf; + libart = gnome2.libart_lgpl; + }; # latest version: gnome3.goffice + + ideas = recurseIntoAttrs (callPackage ../applications/editors/idea { }); libquvi = callPackage ../applications/video/quvi/library.nix { }; @@ -8042,14 +8066,13 @@ let }; gnumeric = callPackage ../applications/office/gnumeric { - goffice = goffice_0_10; - inherit (gnome) libglade scrollkeeper; + inherit (gnome3) goffice gnome_icon_theme; }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { - libgcrypt = libgcrypt_git; + libgcrypt = libgcrypt_1_6; }); gocr = callPackage ../applications/graphics/gocr { }; @@ -8310,6 +8333,7 @@ let poppler = poppler_0_18; clucene_core = clucene_core_2; lcms = lcms2; + mdds = mdds_0_7_1; }; liferea = callPackage ../applications/networking/newsreaders/liferea { }; @@ -8369,15 +8393,7 @@ let mid2key = callPackage ../applications/audio/mid2key { }; - midori = builderDefsPackage (import ../applications/networking/browsers/midori) { - inherit imagemagick intltool python pkgconfig webkit libxml2 - which gettext makeWrapper file libidn sqlite docutils libnotify - vala dbus_glib glib_networking; - inherit gtk3 glib; - inherit (gnome) gtksourceview; - inherit (webkit.passthru.args) libsoup; - inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto; - }; + midori = callPackage ../applications/networking/browsers/midori { }; midoriWrapper = wrapFirefox { browser = midori; browserName = "midori"; desktopName = "Midori"; @@ -8454,9 +8470,7 @@ let pulseSupport = config.pulseaudio or false; }; - mplayer2 = callPackage ../applications/video/mplayer2 { - ffmpeg = ffmpeg_1; - }; + mplayer2 = callPackage ../applications/video/mplayer2 { }; MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { @@ -8467,7 +8481,6 @@ let }; mpv = callPackage ../applications/video/mpv { - ffmpeg = ffmpeg_1; bs2bSupport = true; quviSupport = true; cacaSupport = true; @@ -8590,6 +8603,8 @@ let inherit (pkgs.kde4) kdelibs; }; + opusfile = callPackage ../applications/audio/opusfile { }; + opusTools = callPackage ../applications/audio/opus-tools { }; pan = callPackage ../applications/networking/newsreaders/pan { @@ -9048,9 +9063,7 @@ let inherit (xlibs) libX11; }; - vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_1; - }; + vlc = callPackage ../applications/video/vlc { }; vnstat = callPackage ../applications/networking/vnstat { }; @@ -9071,11 +9084,7 @@ let gnutls = gnutls32; }; - weston = callPackage ../applications/window-managers/weston { - cairo = cairo.override { - glSupport = true; - }; - }; + weston = callPackage ../applications/window-managers/weston { }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; @@ -9135,10 +9144,8 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ); - libs = - if cfg.enableQuakeLive or false - then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] - else [ ]; + libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) + (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); gtk_modules = [ libcanberra ]; }; @@ -9158,7 +9165,9 @@ let xbindkeys = callPackage ../tools/X11/xbindkeys { }; - xbmc = callPackage ../applications/video/xbmc { }; + xbmc = callPackage ../applications/video/xbmc { + ffmpeg = ffmpeg_1; + }; xca = callPackage ../applications/misc/xca { }; @@ -9594,9 +9603,18 @@ let ### DESKTOP ENVIRONMENTS - cinnamon = recurseIntoAttrs { - cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; - }; + cinnamon = recurseIntoAttrs rec { + callPackage = newScope pkgs.cinnamon; + inherit (gnome3) gnome_common; + + cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ; + + cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { }; + + cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; + + cjs = callPackage ../desktops/cinnamon/cjs.nix { }; + }; enlightenment = callPackage ../desktops/enlightenment { }; @@ -9624,12 +9642,13 @@ let kde4 = recurseIntoAttrs pkgs.kde410; + kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde411 ); + kde410 = kdePackagesFor (pkgs.kde410 // { boost = boost149; eigen = eigen2; libotr = libotr_3_2; libusb = libusb1; - ffmpeg = ffmpeg_1; libcanberra = libcanberra_kde; }) ../desktops/kde-4.10; @@ -9638,7 +9657,6 @@ let eigen = eigen2; libotr = libotr_3_2; libusb = libusb1; - ffmpeg = ffmpeg_1; libcanberra = libcanberra_kde; }) ../desktops/kde-4.11; @@ -10273,7 +10291,7 @@ let libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - inherit icu graphite2; + withIcu = true; withGraphite2 = true; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 37d560ff439..4f42f991255 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -981,6 +981,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x esqueleto = callPackage ../development/libraries/haskell/esqueleto {}; + eventList = callPackage ../development/libraries/haskell/event-list {}; + exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; }; exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; @@ -1205,6 +1207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; + haskore = callPackage ../development/libraries/haskell/haskore {}; + hastache = callPackage ../development/libraries/haskell/hastache {}; hexpat = callPackage ../development/libraries/haskell/hexpat {}; @@ -1498,6 +1502,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; + markovChain = callPackage ../development/libraries/haskell/markov-chain {}; + maude = callPackage ../development/libraries/haskell/maude {}; MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; @@ -1506,6 +1512,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {}; + midi = callPackage ../development/libraries/haskell/midi {}; + minimorph = callPackage ../development/libraries/haskell/minimorph {}; miniutter = callPackage ../development/libraries/haskell/miniutter {}; @@ -1552,6 +1560,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {}; + monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {}; + mongoDB = callPackage ../development/libraries/haskell/mongoDB {}; monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {}; @@ -1658,7 +1668,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x oeis = callPackage ../development/libraries/haskell/oeis {}; - OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL { + OpenGL = self.OpenGL_2_9_1_0; + }; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; @@ -1666,7 +1678,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; + OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix { + OpenGLRaw = self.OpenGLRaw_1_4_0_0; + }; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; @@ -1778,10 +1792,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix { + prettyShow_1_6_3 = callPackage ../development/libraries/haskell/pretty-show/1.6.3.nix { happy = self.happy_1_19_2; }; - prettyShow = self.prettyShow_1_6_2; + prettyShow = self.prettyShow_1_6_3; punycode = callPackage ../development/libraries/haskell/punycode {}; @@ -1809,6 +1823,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fgl = self.fgl_5_4_2_4; }; + protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {}; + + protocolBuffersDescriptor = callPackage ../development/libraries/haskell/protocol-buffers-descriptor {}; + PSQueue = callPackage ../development/libraries/haskell/PSQueue {}; publicsuffixlist = callPackage ../development/libraries/haskell/publicsuffixlist {}; @@ -1921,6 +1939,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x resourcet = callPackage ../development/libraries/haskell/resourcet {}; + rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {}; + rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {}; rosezipper = callPackage ../development/libraries/haskell/rosezipper {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 9baf51c2d3d..c96f8c2c28b 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -2,20 +2,21 @@ { by-spec."CSSselect"."0.x" = - self.by-version."CSSselect"."0.3.11"; - by-version."CSSselect"."0.3.11" = lib.makeOverridable self.buildNodePackage { - name = "CSSselect-0.3.11"; + self.by-version."CSSselect"."0.4.0"; + by-version."CSSselect"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "CSSselect-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.11.tgz"; - sha1 = "0779a069d12da9ff5875dd125a0287599c05b6a5"; + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.0.tgz"; + name = "CSSselect-0.4.0.tgz"; + sha1 = "0ddaecd7d157f482d101dfbe154d3accd9166331"; }) ]; buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ self.by-version."CSSwhat"."0.4.1" - self.by-version."domutils"."1.2.2" + self.by-version."domutils"."1.3.0" ]; peerDependencies = [ ]; @@ -28,6 +29,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.1.tgz"; + name = "CSSwhat-0.4.1.tgz"; sha1 = "fe6580461b2a3ad550d2a7785a051234974dfca7"; }) ]; @@ -46,6 +48,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/StringScanner/-/StringScanner-0.0.3.tgz"; + name = "StringScanner-0.0.3.tgz"; sha1 = "bf06ecfdc90046711f4e6175549243b78ceb38aa"; }) ]; @@ -64,6 +67,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; + name = "abbrev-1.0.4.tgz"; sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd"; }) ]; @@ -86,6 +90,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; + name = "active-x-obfuscator-0.0.1.tgz"; sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; }) ]; @@ -105,6 +110,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.0.tgz"; + name = "addressparser-0.2.0.tgz"; sha1 = "853383313b7b60259ba4558ef1c0bc30efac08fc"; }) ]; @@ -123,6 +129,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz"; + name = "adm-zip-0.2.1.tgz"; sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }) ]; @@ -141,6 +148,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.3.tgz"; + name = "adm-zip-0.4.3.tgz"; sha1 = "28d6a3809abb7845a0ffa38f9fff455c2c6f6f6c"; }) ]; @@ -159,6 +167,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/almond/-/almond-0.2.7.tgz"; + name = "almond-0.2.7.tgz"; sha1 = "9cda2385a3198cbd8fea8e0c6edc79d5a2c354c2"; }) ]; @@ -178,6 +187,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; + name = "amdefine-0.1.0.tgz"; sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227"; }) ]; @@ -199,6 +209,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"; + name = "ansi-0.2.1.tgz"; sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017"; }) ]; @@ -217,6 +228,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz"; + name = "ansi-remover-0.0.2.tgz"; sha1 = "7020086289f10e195d85d828de065ccdd50e6e66"; }) ]; @@ -236,6 +248,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.1.2.tgz"; + name = "ansi-styles-0.1.2.tgz"; sha1 = "5bab27c2e0bbe944ee42057cf23adee970abc7c6"; }) ]; @@ -254,6 +267,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.2.0.tgz"; + name = "ansi-styles-0.2.0.tgz"; sha1 = "359ab4b15dcd64ba6d74734b72c36360a9af2c19"; }) ]; @@ -265,6 +279,25 @@ ]; passthru.names = [ "ansi-styles" ]; }; + by-spec."ansi-styles"."~1.0.0" = + self.by-version."ansi-styles"."1.0.0"; + by-version."ansi-styles"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "ansi-styles-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; + name = "ansi-styles-1.0.0.tgz"; + sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi-styles" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ansi-styles" ]; + }; by-spec."ansicolors"."~0.2.1" = self.by-version."ansicolors"."0.2.1"; by-version."ansicolors"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -272,6 +305,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz"; + name = "ansicolors-0.2.1.tgz"; sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef"; }) ]; @@ -283,6 +317,44 @@ ]; passthru.names = [ "ansicolors" ]; }; + by-spec."ansicolors"."~0.3.2" = + self.by-version."ansicolors"."0.3.2"; + by-version."ansicolors"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "ansicolors-0.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + name = "ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }) + ]; + buildInputs = + (self.nativeDeps."ansicolors" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ansicolors" ]; + }; + by-spec."ansistyles"."~0.1.3" = + self.by-version."ansistyles"."0.1.3"; + by-version."ansistyles"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "ansistyles-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; + name = "ansistyles-0.1.3.tgz"; + sha1 = "5de60415bda071bb37127854c864f41b23254539"; + }) + ]; + buildInputs = + (self.nativeDeps."ansistyles" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ansistyles" ]; + }; by-spec."apparatus".">= 0.0.4" = self.by-version."apparatus"."0.0.8"; by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -290,6 +362,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz"; + name = "apparatus-0.0.8.tgz"; sha1 = "14e8aeb84189208b7f8d77f09d9f0307778b079a"; }) ]; @@ -302,13 +375,14 @@ ]; passthru.names = [ "apparatus" ]; }; - by-spec."archiver"."~0.4.6" = + by-spec."archiver"."~0.4.10" = self.by-version."archiver"."0.4.10"; by-version."archiver"."0.4.10" = lib.makeOverridable self.buildNodePackage { name = "archiver-0.4.10"; src = [ (fetchurl { url = "http://registry.npmjs.org/archiver/-/archiver-0.4.10.tgz"; + name = "archiver-0.4.10.tgz"; sha1 = "df0feac8f1d1295e5eceb3a205559072d21f4747"; }) ]; @@ -329,6 +403,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz"; + name = "archy-0.0.2.tgz"; sha1 = "910f43bf66141fc335564597abc189df44b3d35e"; }) ]; @@ -349,6 +424,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + name = "argparse-0.1.15.tgz"; sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; }) ]; @@ -364,6 +440,27 @@ }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.15"; + by-spec."ascli"."*" = + self.by-version."ascli"."0.3.0"; + by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "ascli-0.3.0"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; + name = "ascli-0.3.0.tgz"; + sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; + }) + ]; + buildInputs = + (self.nativeDeps."ascli" or []); + deps = [ + self.by-version."colour"."0.7.1" + self.by-version."optjs"."3.2.1-boom" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ascli" ]; + }; by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { @@ -371,6 +468,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }) ]; @@ -383,25 +481,26 @@ passthru.names = [ "asn1" ]; }; by-spec."assert"."*" = - self.by-version."assert"."1.0.0"; - by-version."assert"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "assert-1.0.0"; + self.by-version."assert"."1.0.3"; + by-version."assert"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "assert-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/assert/-/assert-1.0.0.tgz"; - sha1 = "11e0629e3bbc13e293bf79570c9febe98b2d7997"; + url = "http://registry.npmjs.org/assert/-/assert-1.0.3.tgz"; + name = "assert-1.0.3.tgz"; + sha1 = "b4876fe43cd32fa93679f49e082e5c47e0e42db1"; }) ]; buildInputs = (self.nativeDeps."assert" or []); deps = [ - self.by-version."util"."0.10.0" + self.by-version."util"."0.10.2" ]; peerDependencies = [ ]; passthru.names = [ "assert" ]; }; - "assert" = self.by-version."assert"."1.0.0"; + "assert" = self.by-version."assert"."1.0.3"; by-spec."assert-plus"."0.1.2" = self.by-version."assert-plus"."0.1.2"; by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -409,6 +508,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + name = "assert-plus-0.1.2.tgz"; sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; }) ]; @@ -427,6 +527,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz"; + name = "assertion-error-1.0.0.tgz"; sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b"; }) ]; @@ -445,6 +546,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + name = "async-0.2.9.tgz"; sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; }) ]; @@ -464,6 +566,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/async/-/async-0.1.15.tgz"; + name = "async-0.1.15.tgz"; sha1 = "2180eaca2cf2a6ca5280d41c0585bec9b3e49bd3"; }) ]; @@ -482,6 +585,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; + name = "async-0.1.22.tgz"; sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; }) ]; @@ -510,34 +614,36 @@ by-spec."async"."~0.2.9" = self.by-version."async"."0.2.9"; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.0-rc1"; - by-version."aws-sdk"."2.0.0-rc1" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.0-rc1"; + self.by-version."aws-sdk"."2.0.0-rc4"; + by-version."aws-sdk"."2.0.0-rc4" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.0.0-rc4"; src = [ - (self.patchSource fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc1.tgz"; - sha1 = "8f3b045ffa2050695a692f12ea76eff6d01a2349"; + (fetchurl { + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc4.tgz"; + name = "aws-sdk-2.0.0-rc4.tgz"; + sha1 = "21c23ef7c162f7ec8eed36cef57e3425b0814e8d"; }) ]; buildInputs = (self.nativeDeps."aws-sdk" or []); deps = [ self.by-version."xml2js"."0.2.4" - self.by-version."xmlbuilder"."1.0.2" + self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc1"; + "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc4"; by-spec."aws-sdk".">=1.2.0 <2" = - self.by-version."aws-sdk"."1.13.0"; - by-version."aws-sdk"."1.13.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.13.0"; + self.by-version."aws-sdk"."1.16.0"; + by-version."aws-sdk"."1.16.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-1.16.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.13.0.tgz"; - sha1 = "575b56296006d555bc0d14c1109174d44c194545"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.16.0.tgz"; + name = "aws-sdk-1.16.0.tgz"; + sha1 = "07a150d6009c2681d67b10faf9b356ddb70da952"; }) ]; buildInputs = @@ -557,6 +663,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; + name = "aws-sign-0.2.0.tgz"; sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; }) ]; @@ -575,6 +682,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"; + name = "aws-sign-0.3.0.tgz"; sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9"; }) ]; @@ -586,6 +694,25 @@ ]; passthru.names = [ "aws-sign" ]; }; + by-spec."aws-sign2"."~0.5.0" = + self.by-version."aws-sign2"."0.5.0"; + by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sign2-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }) + ]; + buildInputs = + (self.nativeDeps."aws-sign2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "aws-sign2" ]; + }; by-spec."backbone"."*" = self.by-version."backbone"."1.1.0"; by-version."backbone"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -593,6 +720,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/backbone/-/backbone-1.1.0.tgz"; + name = "backbone-1.1.0.tgz"; sha1 = "a3c845ea707dc210aa12b0dc16fceca4bbc18a3e"; }) ]; @@ -613,6 +741,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz"; + name = "backoff-2.1.0.tgz"; sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09"; }) ]; @@ -631,6 +760,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + name = "base64id-0.1.0.tgz"; sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; }) ]; @@ -642,6 +772,25 @@ ]; passthru.names = [ "base64id" ]; }; + by-spec."batch"."0.5.0" = + self.by-version."batch"."0.5.0"; + by-version."batch"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "batch-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz"; + name = "batch-0.5.0.tgz"; + sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3"; + }) + ]; + buildInputs = + (self.nativeDeps."batch" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "batch" ]; + }; by-spec."bcrypt"."*" = self.by-version."bcrypt"."0.7.7"; by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage { @@ -649,6 +798,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz"; + name = "bcrypt-0.7.7.tgz"; sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868"; }) ]; @@ -669,6 +819,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + name = "binary-0.3.0.tgz"; sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; }) ]; @@ -689,6 +840,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz"; + name = "bindings-1.1.1.tgz"; sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3"; }) ]; @@ -707,6 +859,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz"; + name = "bindings-1.0.0.tgz"; sha1 = "c3ccde60e9de6807c6f1aa4ef4843af29191c828"; }) ]; @@ -725,6 +878,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + name = "block-stream-0.0.7.tgz"; sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; }) ]; @@ -746,6 +900,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz"; + name = "blueimp-md5-1.1.0.tgz"; sha1 = "041ed794862f3c5f2847282a7481329f1d2352cd"; }) ]; @@ -764,6 +919,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; + name = "boom-0.3.8.tgz"; sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; }) ]; @@ -783,6 +939,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; }) ]; @@ -802,6 +959,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower/-/bower-1.2.8.tgz"; + name = "bower-1.2.8.tgz"; sha1 = "f63c0804a267d5ffaf2fd3fd488367e73dce202f"; }) ]; @@ -814,8 +972,8 @@ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-json"."0.4.0" self.by-version."bower-logger"."0.2.1" - self.by-version."bower-registry-client"."0.1.5" - self.by-version."cardinal"."0.4.2" + self.by-version."bower-registry-client"."0.1.6" + self.by-version."cardinal"."0.4.3" self.by-version."chalk"."0.2.1" self.by-version."chmodr"."0.1.0" self.by-version."decompress-zip"."0.0.3" @@ -825,7 +983,7 @@ self.by-version."graceful-fs"."2.0.1" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" - self.by-version."junk"."0.2.1" + self.by-version."junk"."0.2.2" self.by-version."mkdirp"."0.3.5" self.by-version."mout"."0.7.1" self.by-version."nopt"."2.1.2" @@ -837,12 +995,12 @@ self.by-version."request"."2.27.0" self.by-version."request-progress"."0.3.1" self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."semver"."2.1.0" self.by-version."stringify-object"."0.1.7" self.by-version."sudo-block"."0.2.1" - self.by-version."tar"."0.1.18" - self.by-version."tmp"."0.0.22" + self.by-version."tar"."0.1.19" + self.by-version."tmp"."0.0.23" self.by-version."update-notifier"."0.1.7" self.by-version."which"."1.0.5" self.by-version."p-throttler"."0.0.1" @@ -863,6 +1021,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.5.tgz"; + name = "bower-config-0.4.5.tgz"; sha1 = "baa7cee382f53b13bb62a4afaee7c05f20143c13"; }) ]; @@ -885,6 +1044,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz"; + name = "bower-config-0.5.0.tgz"; sha1 = "d081d43008816b1beb876dee272219851dd4c89c"; }) ]; @@ -907,6 +1067,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz"; + name = "bower-endpoint-parser-0.2.1.tgz"; sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f"; }) ]; @@ -925,6 +1086,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz"; + name = "bower-json-0.4.0.tgz"; sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766"; }) ]; @@ -946,6 +1108,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz"; + name = "bower-logger-0.2.1.tgz"; sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }) ]; @@ -958,13 +1121,14 @@ passthru.names = [ "bower-logger" ]; }; by-spec."bower-registry-client"."~0.1.4" = - self.by-version."bower-registry-client"."0.1.5"; - by-version."bower-registry-client"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "bower-registry-client-0.1.5"; + self.by-version."bower-registry-client"."0.1.6"; + by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "bower-registry-client-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.5.tgz"; - sha1 = "1c64d70bfca833c95121ffc23da48a54527912d3"; + url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.6.tgz"; + name = "bower-registry-client-0.1.6.tgz"; + sha1 = "c3ae74a98f24f50a373bbcb0ef443558be01d4b7"; }) ]; buildInputs = @@ -976,36 +1140,13 @@ self.by-version."lru-cache"."2.3.1" self.by-version."request"."2.27.0" self.by-version."request-replay"."0.2.0" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."mkdirp"."0.3.5" ]; peerDependencies = [ ]; passthru.names = [ "bower-registry-client" ]; }; - by-spec."broadway"."0.2.7" = - self.by-version."broadway"."0.2.7"; - by-version."broadway"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "broadway-0.2.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz"; - sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762"; - }) - ]; - buildInputs = - (self.nativeDeps."broadway" or []); - deps = [ - self.by-version."cliff"."0.1.8" - self.by-version."eventemitter2"."0.4.11" - self.by-version."nconf"."0.6.7" - self.by-version."winston"."0.6.2" - self.by-version."utile"."0.1.7" - ]; - peerDependencies = [ - ]; - passthru.names = [ "broadway" ]; - }; by-spec."broadway"."0.2.9" = self.by-version."broadway"."0.2.9"; by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { @@ -1013,6 +1154,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/broadway/-/broadway-0.2.9.tgz"; + name = "broadway-0.2.9.tgz"; sha1 = "887008b2257f4171089de5cb9b656969b6c8c9e8"; }) ]; @@ -1038,6 +1180,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz"; + name = "browserchannel-1.0.8.tgz"; sha1 = "96da83d139d8943f5bd616c334f148bd008dbac4"; }) ]; @@ -1045,8 +1188,8 @@ (self.nativeDeps."browserchannel" or []); deps = [ self.by-version."hat"."0.0.3" - self.by-version."connect"."2.11.2" - self.by-version."request"."2.27.0" + self.by-version."connect"."2.12.0" + self.by-version."request"."2.30.0" ]; peerDependencies = [ ]; @@ -1060,6 +1203,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; + name = "bson-0.1.8.tgz"; sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; }) ]; @@ -1078,6 +1222,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz"; + name = "bson-0.2.2.tgz"; sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60"; }) ]; @@ -1096,7 +1241,8 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.3.tgz"; - sha1 = "d9f6c343fd9f146e27da03b60f2e13e1406a1aea"; + name = "bson-0.2.3.tgz"; + sha1 = "7651d2c4ec7cb90d10b5de0ef61663273b784839"; }) ]; buildInputs = @@ -1108,6 +1254,25 @@ ]; passthru.names = [ "bson" ]; }; + by-spec."bson"."0.2.5" = + self.by-version."bson"."0.2.5"; + by-version."bson"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "bson-0.2.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz"; + name = "bson-0.2.5.tgz"; + sha1 = "835b266883fc91e00e440efa2a905e9ac8c6c9f9"; + }) + ]; + buildInputs = + (self.nativeDeps."bson" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "bson" ]; + }; by-spec."buffer-crc32"."0.1.1" = self.by-version."buffer-crc32"."0.1.1"; by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1115,6 +1280,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; + name = "buffer-crc32-0.1.1.tgz"; sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526"; }) ]; @@ -1133,6 +1299,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + name = "buffer-crc32-0.2.1.tgz"; sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; }) ]; @@ -1153,6 +1320,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; + name = "buffers-0.1.1.tgz"; sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; }) ]; @@ -1165,12 +1333,33 @@ passthru.names = [ "buffers" ]; }; by-spec."buffertools"."*" = + self.by-version."buffertools"."2.0.0"; + by-version."buffertools"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "buffertools-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.0.tgz"; + name = "buffertools-2.0.0.tgz"; + sha1 = "925a0333a6b089e86a58c0c25c9dda8d515b25e8"; + }) + ]; + buildInputs = + (self.nativeDeps."buffertools" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "buffertools" ]; + }; + "buffertools" = self.by-version."buffertools"."2.0.0"; + by-spec."buffertools".">=1.1.1 <2.0.0" = self.by-version."buffertools"."1.1.1"; by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "buffertools-1.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz"; + name = "buffertools-1.1.1.tgz"; sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d"; }) ]; @@ -1182,9 +1371,6 @@ ]; passthru.names = [ "buffertools" ]; }; - "buffertools" = self.by-version."buffertools"."1.1.1"; - by-spec."buffertools".">=1.1.1 <2.0.0" = - self.by-version."buffertools"."1.1.1"; by-spec."bunyan"."0.21.1" = self.by-version."bunyan"."0.21.1"; by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage { @@ -1192,6 +1378,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz"; + name = "bunyan-0.21.1.tgz"; sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a"; }) ]; @@ -1205,6 +1392,26 @@ ]; passthru.names = [ "bunyan" ]; }; + by-spec."bytebuffer".">=2.1 && <3" = + self.by-version."bytebuffer"."2.1.0"; + by-version."bytebuffer"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bytebuffer-2.1.0"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.1.0.tgz"; + name = "bytebuffer-2.1.0.tgz"; + sha1 = "931ae9a46fcb3868614ad3368a569dc7ce4e9ab9"; + }) + ]; + buildInputs = + (self.nativeDeps."bytebuffer" or []); + deps = [ + self.by-version."long"."1.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bytebuffer" ]; + }; by-spec."bytes"."0.1.0" = self.by-version."bytes"."0.1.0"; by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -1212,6 +1419,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; + name = "bytes-0.1.0.tgz"; sha1 = "c574812228126d6369d1576925a8579db3f8e5a2"; }) ]; @@ -1230,6 +1438,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; + name = "bytes-0.2.0.tgz"; sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; }) ]; @@ -1248,6 +1457,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; + name = "bytes-0.2.1.tgz"; sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; }) ]; @@ -1262,13 +1472,14 @@ by-spec."bytes"."~0.2.1" = self.by-version."bytes"."0.2.1"; by-spec."cardinal"."~0.4.0" = - self.by-version."cardinal"."0.4.2"; - by-version."cardinal"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "cardinal-0.4.2"; + self.by-version."cardinal"."0.4.3"; + by-version."cardinal"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "cardinal-0.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.2.tgz"; - sha1 = "b6563a882f58a56c1abd574baec64b5d0b7ef942"; + url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.3.tgz"; + name = "cardinal-0.4.3.tgz"; + sha1 = "7b74c3d1541002bd3d5b555048206719af91d313"; }) ]; buildInputs = @@ -1288,6 +1499,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chai/-/chai-1.8.1.tgz"; + name = "chai-1.8.1.tgz"; sha1 = "cc77866d5e7ebca2bd75144b1edc370a88785f72"; }) ]; @@ -1309,6 +1521,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + name = "chainsaw-0.1.0.tgz"; sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; }) ]; @@ -1328,6 +1541,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.1.1.tgz"; + name = "chalk-0.1.1.tgz"; sha1 = "fe6d90ae2c270424720c87ed92d36490b7d36ea0"; }) ]; @@ -1348,6 +1562,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.2.1.tgz"; + name = "chalk-0.2.1.tgz"; sha1 = "7613e1575145b21386483f7f485aa5ffa8cbd10c"; }) ]; @@ -1363,45 +1578,67 @@ }; by-spec."chalk"."~0.2.1" = self.by-version."chalk"."0.2.1"; - by-spec."character-parser"."1.2.0" = - self.by-version."character-parser"."1.2.0"; - by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "character-parser-1.2.0"; + by-spec."chalk"."~0.3.0" = + self.by-version."chalk"."0.3.0"; + by-version."chalk"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "chalk-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"; - sha1 = "94134d6e5d870a39be359f7d22460935184ddef6"; + url = "http://registry.npmjs.org/chalk/-/chalk-0.3.0.tgz"; + name = "chalk-0.3.0.tgz"; + sha1 = "1c98437737f1199ebcc1d4c48fd41b9f9c8e8f23"; }) ]; buildInputs = - (self.nativeDeps."character-parser" or []); + (self.nativeDeps."chalk" or []); deps = [ + self.by-version."has-color"."0.1.1" + self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ ]; - passthru.names = [ "character-parser" ]; + passthru.names = [ "chalk" ]; }; - by-spec."cheerio"."~0.10.8" = - self.by-version."cheerio"."0.10.8"; - by-version."cheerio"."0.10.8" = lib.makeOverridable self.buildNodePackage { - name = "cheerio-0.10.8"; + by-spec."chalk"."~0.4.0" = + self.by-version."chalk"."0.4.0"; + by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "chalk-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.10.8.tgz"; - sha1 = "ece5ad0c8baa9b9adc87394bbdb1c68bc4552ba0"; + url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + name = "chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; }) ]; buildInputs = - (self.nativeDeps."cheerio" or []); + (self.nativeDeps."chalk" or []); deps = [ - self.by-version."cheerio-select"."0.0.3" - self.by-version."htmlparser2"."2.6.0" - self.by-version."underscore"."1.4.4" - self.by-version."entities"."0.3.0" + self.by-version."has-color"."0.1.1" + self.by-version."ansi-styles"."1.0.0" + self.by-version."strip-ansi"."0.1.1" ]; peerDependencies = [ ]; - passthru.names = [ "cheerio" ]; + passthru.names = [ "chalk" ]; + }; + by-spec."character-parser"."1.2.0" = + self.by-version."character-parser"."1.2.0"; + by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "character-parser-1.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"; + name = "character-parser-1.2.0.tgz"; + sha1 = "94134d6e5d870a39be359f7d22460935184ddef6"; + }) + ]; + buildInputs = + (self.nativeDeps."character-parser" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "character-parser" ]; }; by-spec."cheerio"."~0.12.0" = self.by-version."cheerio"."0.12.4"; @@ -1410,6 +1647,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.4.tgz"; + name = "cheerio-0.12.4.tgz"; sha1 = "c199626e9e1eb0d4233a91a4793e7f8aaa69a18b"; }) ]; @@ -1434,13 +1672,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cheerio-select/-/cheerio-select-0.0.3.tgz"; + name = "cheerio-select-0.0.3.tgz"; sha1 = "3f2420114f3ccb0b1b075c245ccfaae5d617a388"; }) ]; buildInputs = (self.nativeDeps."cheerio-select" or []); deps = [ - self.by-version."CSSselect"."0.3.11" + self.by-version."CSSselect"."0.4.0" ]; peerDependencies = [ ]; @@ -1453,6 +1692,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"; + name = "child-process-close-0.1.1.tgz"; sha1 = "c153ede7a5eb65ac69e78a38973b1a286377f75f"; }) ]; @@ -1471,6 +1711,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz"; + name = "chmodr-0.1.0.tgz"; sha1 = "e09215a1d51542db2a2576969765bcf6125583eb"; }) ]; @@ -1482,14 +1723,15 @@ ]; passthru.names = [ "chmodr" ]; }; - by-spec."chokidar"."~0.7.0" = - self.by-version."chokidar"."0.7.1"; - by-version."chokidar"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.7.1"; + by-spec."chokidar"."~0.8.0" = + self.by-version."chokidar"."0.8.1"; + by-version."chokidar"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.8.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.7.1.tgz"; - sha1 = "a5a5b2d5df265f96d90b9888f45a9e604254112c"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz"; + name = "chokidar-0.8.1.tgz"; + sha1 = "8ee0c99ef48420902fded73b862eac2dd75da4a6"; }) ]; buildInputs = @@ -1507,6 +1749,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz"; + name = "chownr-0.0.1.tgz"; sha1 = "51d18189d9092d5f8afd623f3288bfd1c6bf1a62"; }) ]; @@ -1519,13 +1762,14 @@ passthru.names = [ "chownr" ]; }; by-spec."clean-css"."2.0.x" = - self.by-version."clean-css"."2.0.2"; - by-version."clean-css"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.0.2"; + self.by-version."clean-css"."2.0.4"; + by-version."clean-css"."2.0.4" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.0.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.2.tgz"; - sha1 = "69ca3c124f4a476a154c081e9d5a54f1bcdec9c4"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.4.tgz"; + name = "clean-css-2.0.4.tgz"; + sha1 = "1447e54e14d4bd0fa801f507bb32938cebe77627"; }) ]; buildInputs = @@ -1538,7 +1782,7 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.0.0" = - self.by-version."clean-css"."2.0.2"; + self.by-version."clean-css"."2.0.4"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -1546,6 +1790,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; + name = "cli-0.4.5.tgz"; sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; }) ]; @@ -1565,6 +1810,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz"; + name = "cli-color-0.2.3.tgz"; sha1 = "0a25ceae5a6a1602be7f77d28563c36700274e88"; }) ]; @@ -1578,25 +1824,6 @@ ]; passthru.names = [ "cli-color" ]; }; - by-spec."cli-table"."~0.2.0" = - self.by-version."cli-table"."0.2.0"; - by-version."cli-table"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "cli-table-0.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cli-table/-/cli-table-0.2.0.tgz"; - sha1 = "34c63eb532c206e9e5e4ae0cb0104bd1fd27317c"; - }) - ]; - buildInputs = - (self.nativeDeps."cli-table" or []); - deps = [ - self.by-version."colors"."0.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cli-table" ]; - }; by-spec."cliff"."0.1.8" = self.by-version."cliff"."0.1.8"; by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -1604,6 +1831,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz"; + name = "cliff-0.1.8.tgz"; sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272"; }) ]; @@ -1625,6 +1853,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; + name = "clone-0.1.5.tgz"; sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042"; }) ]; @@ -1643,6 +1872,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; + name = "clone-0.1.6.tgz"; sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; }) ]; @@ -1661,6 +1891,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz"; + name = "cmd-shim-1.1.1.tgz"; sha1 = "348b292db32ed74c8283fcf6c48549b84c6658a7"; }) ]; @@ -1681,6 +1912,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; + name = "coffee-script-1.6.3.tgz"; sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }) ]; @@ -1706,6 +1938,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"; + name = "coffee-script-1.3.3.tgz"; sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4"; }) ]; @@ -1719,13 +1952,13 @@ }; by-spec."coffee-script"."~1.6" = self.by-version."coffee-script"."1.6.3"; - by-spec."coffee-script-redux"."git://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" = + by-spec."coffee-script-redux"."git+https://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" = self.by-version."coffee-script-redux"."2.0.0-beta4"; by-version."coffee-script-redux"."2.0.0-beta4" = lib.makeOverridable self.buildNodePackage { name = "coffee-script-redux-2.0.0-beta4"; src = [ (fetchgit { - url = "git://github.com/michaelficarra/CoffeeScriptRedux.git"; + url = "https://github.com/michaelficarra/CoffeeScriptRedux.git"; rev = "9895cd1641fdf3a2424e662ab7583726bb0e35b3"; sha256 = "d70e659aa7cdb50a98959dec0e2a8c916200e31cb770f04faa2ae92a55d1e66d"; }) @@ -1747,6 +1980,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/color/-/color-0.4.4.tgz"; + name = "color-0.4.4.tgz"; sha1 = "f8bae8a848854616328704e64ce4a94ab336b7b5"; }) ]; @@ -1767,6 +2001,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/color-convert/-/color-convert-0.2.1.tgz"; + name = "color-convert-0.2.1.tgz"; sha1 = "363cab23c94b31a0d64db71048b8c6a940f8c68c"; }) ]; @@ -1785,6 +2020,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/color-string/-/color-string-0.1.2.tgz"; + name = "color-string-0.1.2.tgz"; sha1 = "a413fb7dd137162d5d4ea784cbeb36d931ad9b4a"; }) ]; @@ -1797,24 +2033,6 @@ ]; passthru.names = [ "color-string" ]; }; - by-spec."colors"."0.3.0" = - self.by-version."colors"."0.3.0"; - by-version."colors"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.3.0.tgz"; - sha1 = "c247d64d34db0ca4dc8e43f3ecd6da98d0af94e7"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; by-spec."colors"."0.5.x" = self.by-version."colors"."0.5.1"; by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -1822,6 +2040,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; + name = "colors-0.5.1.tgz"; sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; }) ]; @@ -1840,6 +2059,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz"; + name = "colors-0.6.0-1.tgz"; sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; }) ]; @@ -1858,6 +2078,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }) ]; @@ -1875,6 +2096,25 @@ self.by-version."colors"."0.6.2"; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; + by-spec."colour"."*" = + self.by-version."colour"."0.7.1"; + by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "colour-0.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; + name = "colour-0.7.1.tgz"; + sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; + }) + ]; + buildInputs = + (self.nativeDeps."colour" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "colour" ]; + }; by-spec."combined-stream"."~0.0.4" = self.by-version."combined-stream"."0.0.4"; by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -1882,6 +2122,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz"; + name = "combined-stream-0.0.4.tgz"; sha1 = "2d1a43347dbe9515a4a2796732e5b88473840b22"; }) ]; @@ -1901,6 +2142,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + name = "commander-2.1.0.tgz"; sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }) ]; @@ -1919,6 +2161,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + name = "commander-0.6.1.tgz"; sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }) ]; @@ -1937,6 +2180,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + name = "commander-1.3.2.tgz"; sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; }) ]; @@ -1956,6 +2200,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; + name = "commander-2.0.0.tgz"; sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; }) ]; @@ -1978,6 +2223,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz"; + name = "config-0.4.15.tgz"; sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; }) ]; @@ -1999,6 +2245,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz"; + name = "config-chain-1.1.8.tgz"; sha1 = "0943d0b7227213a20d4eaff4434f4a1c0a052cad"; }) ]; @@ -2015,22 +2262,24 @@ by-spec."config-chain"."~1.1.8" = self.by-version."config-chain"."1.1.8"; by-spec."configstore"."~0.1.0" = - self.by-version."configstore"."0.1.5"; - by-version."configstore"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "configstore-0.1.5"; + self.by-version."configstore"."0.1.7"; + by-version."configstore"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "configstore-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/configstore/-/configstore-0.1.5.tgz"; - sha1 = "807cfd60ef69c87f4a7b60561d940190a438503e"; + url = "http://registry.npmjs.org/configstore/-/configstore-0.1.7.tgz"; + name = "configstore-0.1.7.tgz"; + sha1 = "57dc701bc2a51eb804d6e1733c8abb9d82a5cede"; }) ]; buildInputs = (self.nativeDeps."configstore" or []); deps = [ - self.by-version."lodash"."1.3.1" + self.by-version."lodash"."2.4.1" self.by-version."mkdirp"."0.3.5" self.by-version."js-yaml"."2.1.3" self.by-version."osenv"."0.0.3" + self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ ]; @@ -2043,6 +2292,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + name = "connect-1.9.2.tgz"; sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; }) ]; @@ -2064,6 +2314,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; + name = "connect-2.11.0.tgz"; sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; }) ]; @@ -2089,20 +2340,22 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.11.2" = - self.by-version."connect"."2.11.2"; - by-version."connect"."2.11.2" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.11.2"; + by-spec."connect"."2.12.0" = + self.by-version."connect"."2.12.0"; + by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.12.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.11.2.tgz"; - sha1 = "cd05c661f686dfe9bcd2e1220c85fe82848db010"; + url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz"; + name = "connect-2.12.0.tgz"; + sha1 = "31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a"; }) ]; buildInputs = (self.nativeDeps."connect" or []); deps = [ - self.by-version."qs"."0.6.5" + self.by-version."batch"."0.5.0" + self.by-version."qs"."0.6.6" self.by-version."cookie-signature"."1.0.1" self.by-version."buffer-crc32"."0.2.1" self.by-version."cookie"."0.1.0" @@ -2128,6 +2381,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; + name = "connect-2.3.9.tgz"; sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }) ]; @@ -2154,6 +2408,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz"; + name = "connect-2.7.5.tgz"; sha1 = "139111b4b03f0533a524927a88a646ae467b2c02"; }) ]; @@ -2182,6 +2437,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; + name = "connect-2.7.6.tgz"; sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738"; }) ]; @@ -2204,7 +2460,7 @@ passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.11.2"; + self.by-version."connect"."2.12.0"; by-spec."connect"."~2.8.4" = self.by-version."connect"."2.8.8"; by-version."connect"."2.8.8" = lib.makeOverridable self.buildNodePackage { @@ -2212,6 +2468,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz"; + name = "connect-2.8.8.tgz"; sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d"; }) ]; @@ -2242,6 +2499,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz"; + name = "connect-flash-0.1.1.tgz"; sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30"; }) ]; @@ -2261,6 +2519,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; + name = "connect-flash-0.1.0.tgz"; sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; }) ]; @@ -2273,25 +2532,26 @@ passthru.names = [ "connect-flash" ]; }; by-spec."connect-jade-static"."*" = - self.by-version."connect-jade-static"."0.1.1"; - by-version."connect-jade-static"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "connect-jade-static-0.1.1"; + self.by-version."connect-jade-static"."0.1.3"; + by-version."connect-jade-static"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "connect-jade-static-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.1.tgz"; - sha1 = "11d16fa00aca28cb004e89cd0a7d6b0fa0342cdb"; + url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.3.tgz"; + name = "connect-jade-static-0.1.3.tgz"; + sha1 = "ad0e0538c9124355d6da03de13fae63f7b5e0b1b"; }) ]; buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = [ - self.by-version."jade"."0.35.0" + self.by-version."jade"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "connect-jade-static" ]; }; - "connect-jade-static" = self.by-version."connect-jade-static"."0.1.1"; + "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3"; by-spec."connect-mongo"."*" = self.by-version."connect-mongo"."0.4.0"; by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -2299,19 +2559,39 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz"; + name = "connect-mongo-0.4.0.tgz"; sha1 = "4cb33728334a8f10f2d9e43d31369dbc2f856336"; }) ]; buildInputs = (self.nativeDeps."connect-mongo" or []); deps = [ - self.by-version."mongodb"."1.3.20" + self.by-version."mongodb"."1.3.23" ]; peerDependencies = [ ]; passthru.names = [ "connect-mongo" ]; }; "connect-mongo" = self.by-version."connect-mongo"."0.4.0"; + by-spec."connection-parse"."0.0.x" = + self.by-version."connection-parse"."0.0.7"; + by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "connection-parse-0.0.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + name = "connection-parse-0.0.7.tgz"; + sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; + }) + ]; + buildInputs = + (self.nativeDeps."connection-parse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "connection-parse" ]; + }; by-spec."console-browserify"."0.1.x" = self.by-version."console-browserify"."0.1.6"; by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -2319,6 +2599,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz"; + name = "console-browserify-0.1.6.tgz"; sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c"; }) ]; @@ -2330,20 +2611,21 @@ ]; passthru.names = [ "console-browserify" ]; }; - by-spec."constantinople"."~1.0.1" = + by-spec."constantinople"."~1.0.2" = self.by-version."constantinople"."1.0.2"; by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "constantinople-1.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz"; + name = "constantinople-1.0.2.tgz"; sha1 = "0e64747dc836644d3f659247efd95231b48c3e71"; }) ]; buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.6" + self.by-version."uglify-js"."2.4.8" ]; peerDependencies = [ ]; @@ -2356,6 +2638,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; + name = "cookie-0.0.4.tgz"; sha1 = "5456bd47aee2666eac976ea80a6105940483fe98"; }) ]; @@ -2374,6 +2657,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; + name = "cookie-0.0.5.tgz"; sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; }) ]; @@ -2392,6 +2676,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; + name = "cookie-0.1.0.tgz"; sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; }) ]; @@ -2410,6 +2695,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; + name = "cookie-jar-0.2.0.tgz"; sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; }) ]; @@ -2428,6 +2714,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"; + name = "cookie-jar-0.3.0.tgz"; sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc"; }) ]; @@ -2446,6 +2733,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz"; + name = "cookie-signature-1.0.0.tgz"; sha1 = "0044f332ac623df851c914e88eacc57f0c9704fe"; }) ]; @@ -2464,6 +2752,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; + name = "cookie-signature-1.0.1.tgz"; sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; }) ]; @@ -2482,6 +2771,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz"; + name = "cookiejar-1.3.0.tgz"; sha1 = "dd00b35679021e99cbd4e855b9ad041913474765"; }) ]; @@ -2500,6 +2790,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookies/-/cookies-0.3.8.tgz"; + name = "cookies-0.3.8.tgz"; sha1 = "92fe50918f3d55aec4ae9d978bcddda2ada28ce9"; }) ]; @@ -2518,6 +2809,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.0.tgz"; + name = "core-util-is-1.0.0.tgz"; sha1 = "740c74c400e72707b95cc75d509543f8ad7f83de"; }) ]; @@ -2536,13 +2828,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.19.tgz"; + name = "couch-login-0.1.19.tgz"; sha1 = "5c472f64670dfb43fc381d290629b223edb64afa"; }) ]; buildInputs = (self.nativeDeps."couch-login" or []); deps = [ - self.by-version."request"."2.27.0" + self.by-version."request"."2.30.0" ]; peerDependencies = [ ]; @@ -2551,13 +2844,14 @@ by-spec."couch-login"."~0.1.18" = self.by-version."couch-login"."0.1.19"; by-spec."coveralls"."*" = - self.by-version."coveralls"."2.5.0"; - by-version."coveralls"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "coveralls-2.5.0"; + self.by-version."coveralls"."2.6.1"; + by-version."coveralls"."2.6.1" = lib.makeOverridable self.buildNodePackage { + name = "coveralls-2.6.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.5.0.tgz"; - sha1 = "96d9bdb844438cd98ee9cdcb435a4d6d6aea326f"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.6.1.tgz"; + name = "coveralls-2.6.1.tgz"; + sha1 = "0de635bba15fd48f4fc557ae9ac21309c013d2de"; }) ]; buildInputs = @@ -2572,7 +2866,7 @@ ]; passthru.names = [ "coveralls" ]; }; - "coveralls" = self.by-version."coveralls"."2.5.0"; + "coveralls" = self.by-version."coveralls"."2.6.1"; by-spec."crc"."0.2.0" = self.by-version."crc"."0.2.0"; by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -2580,6 +2874,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; + name = "crc-0.2.0.tgz"; sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; }) ]; @@ -2598,6 +2893,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz"; + name = "crossroads-0.12.0.tgz"; sha1 = "24114f9de3abfa0271df66b4ec56c3b984b7f56e"; }) ]; @@ -2617,6 +2913,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; + name = "cryptiles-0.1.3.tgz"; sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; }) ]; @@ -2636,6 +2933,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; }) ]; @@ -2655,6 +2953,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; + name = "crypto-0.0.3.tgz"; sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0"; }) ]; @@ -2673,6 +2972,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz"; + name = "css-1.0.8.tgz"; sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; }) ]; @@ -2693,6 +2993,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; + name = "css-parse-1.0.4.tgz"; sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; }) ]; @@ -2711,6 +3012,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; + name = "css-stringify-1.0.5.tgz"; sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; }) ]; @@ -2729,6 +3031,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz"; + name = "cssom-0.2.5.tgz"; sha1 = "2682709b5902e7212df529116ff788cd5b254894"; }) ]; @@ -2747,6 +3050,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz"; + name = "ctype-0.5.0.tgz"; sha1 = "672673ec67587eb495c1ed694da1abb964ff65e3"; }) ]; @@ -2765,6 +3069,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + name = "ctype-0.5.2.tgz"; sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; }) ]; @@ -2777,13 +3082,14 @@ passthru.names = [ "ctype" ]; }; by-spec."cycle"."1.0.x" = - self.by-version."cycle"."1.0.2"; - by-version."cycle"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "cycle-1.0.2"; + self.by-version."cycle"."1.0.3"; + by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "cycle-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cycle/-/cycle-1.0.2.tgz"; - sha1 = "269aca6f1b8d2baeefc8ccbc888b459f322c4e60"; + url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + name = "cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }) ]; buildInputs = @@ -2801,6 +3107,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dargs/-/dargs-0.1.0.tgz"; + name = "dargs-0.1.0.tgz"; sha1 = "2364ad9f441f976dcd5fe9961e21715665a5e3c3"; }) ]; @@ -2819,6 +3126,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; + name = "dateformat-1.0.2-1.2.3.tgz"; sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; }) ]; @@ -2831,13 +3139,14 @@ passthru.names = [ "dateformat" ]; }; by-spec."dateformat"."~1.0.6" = - self.by-version."dateformat"."1.0.6-1.2.3"; - by-version."dateformat"."1.0.6-1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "dateformat-1.0.6-1.2.3"; + self.by-version."dateformat"."1.0.7-1.2.3"; + by-version."dateformat"."1.0.7-1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "dateformat-1.0.7-1.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.6-1.2.3.tgz"; - sha1 = "6b3de9f974f698d8b2d3ff9094bbaac8d696c16b"; + url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz"; + name = "dateformat-1.0.7-1.2.3.tgz"; + sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c"; }) ]; buildInputs = @@ -2855,6 +3164,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + name = "debug-0.7.4.tgz"; sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }) ]; @@ -2873,6 +3183,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; + name = "debug-0.5.0.tgz"; sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; }) ]; @@ -2891,6 +3202,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz"; + name = "debug-0.7.0.tgz"; sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08"; }) ]; @@ -2917,6 +3229,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz"; + name = "debuglog-0.0.2.tgz"; sha1 = "6c0dcf07e2c3f74524629b741668bd46c7b362eb"; }) ]; @@ -2928,6 +3241,32 @@ ]; passthru.names = [ "debuglog" ]; }; + by-spec."decompress"."~0.1.0" = + self.by-version."decompress"."0.1.5"; + by-version."decompress"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "decompress-0.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/decompress/-/decompress-0.1.5.tgz"; + name = "decompress-0.1.5.tgz"; + sha1 = "0925d42a2164bead83f0822a7a2b4ad02e99c76c"; + }) + ]; + buildInputs = + (self.nativeDeps."decompress" or []); + deps = [ + self.by-version."adm-zip"."0.4.3" + self.by-version."mkdirp"."0.3.5" + self.by-version."mout"."0.6.0" + self.by-version."rimraf"."2.2.5" + self.by-version."stream-combiner"."0.0.4" + self.by-version."tar"."0.1.19" + self.by-version."temp"."0.6.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "decompress" ]; + }; by-spec."decompress-zip"."~0.0.3" = self.by-version."decompress-zip"."0.0.3"; by-version."decompress-zip"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -2935,6 +3274,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.3.tgz"; + name = "decompress-zip-0.0.3.tgz"; sha1 = "14b174e5b6a528f0aa6c2e2157b7aa0152e7915a"; }) ]; @@ -2959,6 +3299,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; + name = "deep-eql-0.1.3.tgz"; sha1 = "ef558acab8de25206cd713906d74e56930eb69f2"; }) ]; @@ -2972,13 +3313,14 @@ passthru.names = [ "deep-eql" ]; }; by-spec."deep-equal"."*" = - self.by-version."deep-equal"."0.1.0"; - by-version."deep-equal"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.1.0"; + self.by-version."deep-equal"."0.1.2"; + by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "deep-equal-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.0.tgz"; - sha1 = "81fcefc84551d9d67cccdd80e1fced7f355e146f"; + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + name = "deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; }) ]; buildInputs = @@ -2996,6 +3338,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; + name = "deep-equal-0.0.0.tgz"; sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; }) ]; @@ -3014,6 +3357,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.6.tgz"; + name = "deep-extend-0.2.6.tgz"; sha1 = "1f767e02b46d88d0a4087affa4b11b1b0b804250"; }) ]; @@ -3034,6 +3378,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; }) ]; @@ -3052,6 +3397,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz"; + name = "di-0.0.1.tgz"; sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; }) ]; @@ -3070,6 +3416,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; + name = "diff-1.0.7.tgz"; sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; }) ]; @@ -3082,11 +3429,28 @@ passthru.names = [ "diff" ]; }; by-spec."diff"."~1.0.3" = - self.by-version."diff"."1.0.7"; + self.by-version."diff"."1.0.8"; + by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage { + name = "diff-1.0.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + name = "diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }) + ]; + buildInputs = + (self.nativeDeps."diff" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "diff" ]; + }; by-spec."diff"."~1.0.4" = - self.by-version."diff"."1.0.7"; + self.by-version."diff"."1.0.8"; by-spec."diff"."~1.0.7" = - self.by-version."diff"."1.0.7"; + self.by-version."diff"."1.0.8"; by-spec."director"."1.1.10" = self.by-version."director"."1.1.10"; by-version."director"."1.1.10" = lib.makeOverridable self.buildNodePackage { @@ -3094,6 +3458,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/director/-/director-1.1.10.tgz"; + name = "director-1.1.10.tgz"; sha1 = "e6c1d64f2f079216f19ea83b566035dde9901179"; }) ]; @@ -3112,6 +3477,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz"; + name = "dkim-signer-0.1.0.tgz"; sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b"; }) ]; @@ -3132,6 +3498,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz"; + name = "domelementtype-1.1.1.tgz"; sha1 = "7887acbda7614bb0a3dbe1b5e394f77a8ed297cf"; }) ]; @@ -3150,6 +3517,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/domhandler/-/domhandler-2.0.3.tgz"; + name = "domhandler-2.0.3.tgz"; sha1 = "889f8df626403af0788e29d66d5d5c6f7ebf0fd6"; }) ]; @@ -3162,24 +3530,25 @@ ]; passthru.names = [ "domhandler" ]; }; - by-spec."domutils"."1.0" = - self.by-version."domutils"."1.0.1"; - by-version."domutils"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.0.1"; + by-spec."domhandler"."2.1" = + self.by-version."domhandler"."2.1.0"; + by-version."domhandler"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "domhandler-2.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.0.1.tgz"; - sha1 = "58b58d774774911556c16b8b02d99c609d987869"; + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz"; + name = "domhandler-2.1.0.tgz"; + sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"; }) ]; buildInputs = - (self.nativeDeps."domutils" or []); + (self.nativeDeps."domhandler" or []); deps = [ self.by-version."domelementtype"."1.1.1" ]; peerDependencies = [ ]; - passthru.names = [ "domutils" ]; + passthru.names = [ "domhandler" ]; }; by-spec."domutils"."1.1" = self.by-version."domutils"."1.1.6"; @@ -3188,6 +3557,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz"; + name = "domutils-1.1.6.tgz"; sha1 = "bddc3de099b9a2efacc51c623f28f416ecc57485"; }) ]; @@ -3200,14 +3570,15 @@ ]; passthru.names = [ "domutils" ]; }; - by-spec."domutils"."1.2" = - self.by-version."domutils"."1.2.2"; - by-version."domutils"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.2.2"; + by-spec."domutils"."1.3" = + self.by-version."domutils"."1.3.0"; + by-version."domutils"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "domutils-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.2.2.tgz"; - sha1 = "bd59d149cf2c034fec81a1ce063bc20fb572a2ab"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; + name = "domutils-1.3.0.tgz"; + sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192"; }) ]; buildInputs = @@ -3219,6 +3590,30 @@ ]; passthru.names = [ "domutils" ]; }; + by-spec."download"."~0.1.6" = + self.by-version."download"."0.1.7"; + by-version."download"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "download-0.1.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/download/-/download-0.1.7.tgz"; + name = "download-0.1.7.tgz"; + sha1 = "d2a941a878a6d2fdaba60588ffffadab32b788b4"; + }) + ]; + buildInputs = + (self.nativeDeps."download" or []); + deps = [ + self.by-version."decompress"."0.1.5" + self.by-version."each-async"."0.1.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."request"."2.25.0" + self.by-version."through2"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "download" ]; + }; by-spec."dtrace-provider"."0.2.8" = self.by-version."dtrace-provider"."0.2.8"; by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage { @@ -3226,6 +3621,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz"; + name = "dtrace-provider-0.2.8.tgz"; sha1 = "e243f19219aa95fbf0d8f2ffb07f5bd64e94fe20"; }) ]; @@ -3237,6 +3633,44 @@ ]; passthru.names = [ "dtrace-provider" ]; }; + by-spec."duplexer"."~0.1.1" = + self.by-version."duplexer"."0.1.1"; + by-version."duplexer"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "duplexer-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + name = "duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }) + ]; + buildInputs = + (self.nativeDeps."duplexer" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "duplexer" ]; + }; + by-spec."each-async"."~0.1.1" = + self.by-version."each-async"."0.1.1"; + by-version."each-async"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "each-async-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/each-async/-/each-async-0.1.1.tgz"; + name = "each-async-0.1.1.tgz"; + sha1 = "32bcef7e3cdc741d630e29846348be4ecca624ff"; + }) + ]; + buildInputs = + (self.nativeDeps."each-async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "each-async" ]; + }; by-spec."editor"."0.0.5" = self.by-version."editor"."0.0.5"; by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -3244,6 +3678,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz"; + name = "editor-0.0.5.tgz"; sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a"; }) ]; @@ -3262,6 +3697,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; + name = "ejs-0.8.3.tgz"; sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f"; }) ]; @@ -3280,6 +3716,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/emitter-component/-/emitter-component-0.0.6.tgz"; + name = "emitter-component-0.0.6.tgz"; sha1 = "c155d82f6d0c01b5bee856d58074a4cc59795bca"; }) ]; @@ -3298,6 +3735,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz"; + name = "emitter-component-1.0.0.tgz"; sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f"; }) ]; @@ -3316,6 +3754,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/encoding/-/encoding-0.1.7.tgz"; + name = "encoding-0.1.7.tgz"; sha1 = "25cc19b34e9225d120c2ea769f9136c91cecc908"; }) ]; @@ -3335,6 +3774,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/entities/-/entities-0.3.0.tgz"; + name = "entities-0.3.0.tgz"; sha1 = "6ccead6010fee0c5a06f538d242792485cbfa256"; }) ]; @@ -3353,6 +3793,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz"; + name = "es5-ext-0.9.2.tgz"; sha1 = "d2e309d1f223b0718648835acf5b8823a8061f8a"; }) ]; @@ -3365,13 +3806,14 @@ passthru.names = [ "es5-ext" ]; }; by-spec."escape-html"."*" = - self.by-version."escape-html"."1.0.0"; - by-version."escape-html"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "escape-html-1.0.0"; + self.by-version."escape-html"."1.0.1"; + by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "escape-html-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.0.tgz"; - sha1 = "fedcd79564444ddaf2bd85b22c9961b3a3a38bf5"; + url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + name = "escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; }) ]; buildInputs = @@ -3382,22 +3824,24 @@ ]; passthru.names = [ "escape-html" ]; }; - "escape-html" = self.by-version."escape-html"."1.0.0"; + "escape-html" = self.by-version."escape-html"."1.0.1"; by-spec."escodegen"."*" = - self.by-version."escodegen"."1.0.0"; - by-version."escodegen"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.0.0"; + self.by-version."escodegen"."1.0.1"; + by-version."escodegen"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.0.tgz"; - sha1 = "8428e45aec9f8d15ccd57859a83c34a91688fd2d"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.1.tgz"; + name = "escodegen-1.0.1.tgz"; + sha1 = "84c92c4a07440271b90e6b78e620973bf721226e"; }) ]; buildInputs = (self.nativeDeps."escodegen" or []); deps = [ self.by-version."esprima"."1.0.4" - self.by-version."estraverse"."1.4.0" + self.by-version."estraverse"."1.5.0" + self.by-version."esutils"."1.0.0" self.by-version."source-map"."0.1.31" ]; peerDependencies = [ @@ -3411,6 +3855,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.23.tgz"; + name = "escodegen-0.0.23.tgz"; sha1 = "9acf978164368e42276571f18839c823b3a844df"; }) ]; @@ -3432,6 +3877,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + name = "esprima-1.0.4.tgz"; sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; }) ]; @@ -3449,6 +3895,8 @@ self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.2" = self.by-version."esprima"."1.0.4"; + by-spec."esprima"."~1.0.4" = + self.by-version."esprima"."1.0.4"; by-spec."estraverse"."*" = self.by-version."estraverse"."1.5.0"; by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage { @@ -3456,6 +3904,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.0.tgz"; + name = "estraverse-1.5.0.tgz"; sha1 = "248ec3f0d4bf39a940109c92a05ceb56d59e53ee"; }) ]; @@ -3474,6 +3923,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz"; + name = "estraverse-0.0.4.tgz"; sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2"; }) ]; @@ -3485,23 +3935,26 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse"."~1.4.0" = - self.by-version."estraverse"."1.4.0"; - by-version."estraverse"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.4.0"; + by-spec."estraverse"."~1.5.0" = + self.by-version."estraverse"."1.5.0"; + by-spec."esutils"."~1.0.0" = + self.by-version."esutils"."1.0.0"; + by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "esutils-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.4.0.tgz"; - sha1 = "c6e1ad13b3f1b389da32214f2debe4788382bfc6"; + url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + name = "esutils-1.0.0.tgz"; + sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; }) ]; buildInputs = - (self.nativeDeps."estraverse" or []); + (self.nativeDeps."esutils" or []); deps = [ ]; peerDependencies = [ ]; - passthru.names = [ "estraverse" ]; + passthru.names = [ "esutils" ]; }; by-spec."event-emitter"."~0.2.2" = self.by-version."event-emitter"."0.2.2"; @@ -3510,6 +3963,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz"; + name = "event-emitter-0.2.2.tgz"; sha1 = "c81e3724eb55407c5a0d5ee3299411f700f54291"; }) ]; @@ -3529,6 +3983,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + name = "event-stream-0.5.3.tgz"; sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; }) ]; @@ -3541,24 +3996,6 @@ ]; passthru.names = [ "event-stream" ]; }; - by-spec."eventemitter2"."0.4.11" = - self.by-version."eventemitter2"."0.4.11"; - by-version."eventemitter2"."0.4.11" = lib.makeOverridable self.buildNodePackage { - name = "eventemitter2-0.4.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.11.tgz"; - sha1 = "8bbf2b6ac7b31e2eea0c8d8f533ef41f849a9e2c"; - }) - ]; - buildInputs = - (self.nativeDeps."eventemitter2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "eventemitter2" ]; - }; by-spec."eventemitter2"."0.4.12" = self.by-version."eventemitter2"."0.4.12"; by-version."eventemitter2"."0.4.12" = lib.makeOverridable self.buildNodePackage { @@ -3566,6 +4003,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz"; + name = "eventemitter2-0.4.12.tgz"; sha1 = "6cf14249fdc8799be7416e871e73fd2bb89e35e0"; }) ]; @@ -3584,6 +4022,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz"; + name = "eventemitter2-0.4.13.tgz"; sha1 = "0a8ab97f9c1b563361b8927f9e80606277509153"; }) ]; @@ -3604,6 +4043,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; + name = "events.node-0.4.9.tgz"; sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }) ]; @@ -3622,6 +4062,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; + name = "everyauth-0.4.5.tgz"; sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; }) ]; @@ -3636,7 +4077,7 @@ self.by-version."node-swt"."0.1.1" self.by-version."node-wsfederation"."0.1.1" self.by-version."debug"."0.5.0" - self.by-version."express"."3.4.6" + self.by-version."express"."3.4.7" ]; peerDependencies = [ ]; @@ -3649,6 +4090,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + name = "exit-0.1.2.tgz"; sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }) ]; @@ -3661,19 +4103,20 @@ passthru.names = [ "exit" ]; }; by-spec."express"."*" = - self.by-version."express"."3.4.6"; - by-version."express"."3.4.6" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.6"; + self.by-version."express"."3.4.7"; + by-version."express"."3.4.7" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.6.tgz"; - sha1 = "85b6004076f9004f806e9f49c90487d1f6f89c43"; + url = "http://registry.npmjs.org/express/-/express-3.4.7.tgz"; + name = "express-3.4.7.tgz"; + sha1 = "3b939c47d2aa44dfecf77d50da2123c5bd313366"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."connect"."2.11.2" + self.by-version."connect"."2.12.0" self.by-version."commander"."1.3.2" self.by-version."range-parser"."0.0.4" self.by-version."mkdirp"."0.3.5" @@ -3683,13 +4126,14 @@ self.by-version."methods"."0.1.0" self.by-version."send"."0.1.4" self.by-version."cookie-signature"."1.0.1" + self.by-version."merge-descriptors"."0.0.1" self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."3.4.6"; + "express" = self.by-version."express"."3.4.7"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -3697,6 +4141,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; + name = "express-2.5.11.tgz"; sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; }) ]; @@ -3719,6 +4164,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz"; + name = "express-3.2.0.tgz"; sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; }) ]; @@ -3748,6 +4194,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz"; + name = "express-3.4.4.tgz"; sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; }) ]; @@ -3771,7 +4218,7 @@ passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.4.6"; + self.by-version."express"."3.4.7"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -3779,6 +4226,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz"; + name = "express-3.1.2.tgz"; sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7"; }) ]; @@ -3802,9 +4250,9 @@ passthru.names = [ "express" ]; }; by-spec."express"."~3.4" = - self.by-version."express"."3.4.6"; + self.by-version."express"."3.4.7"; by-spec."express"."~3.4.4" = - self.by-version."express"."3.4.6"; + self.by-version."express"."3.4.7"; by-spec."express-form"."*" = self.by-version."express-form"."0.10.1"; by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage { @@ -3812,6 +4260,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz"; + name = "express-form-0.10.1.tgz"; sha1 = "542f43cf276c33f8ec8836b571aa3365505609a8"; }) ]; @@ -3823,7 +4272,7 @@ self.by-version."async"."0.2.9" ]; peerDependencies = [ - self.by-version."express"."3.4.6" + self.by-version."express"."3.4.7" ]; passthru.names = [ "express-form" ]; }; @@ -3835,6 +4284,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; + name = "express-partials-0.0.6.tgz"; sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; }) ]; @@ -3853,6 +4303,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + name = "extend-1.2.1.tgz"; sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }) ]; @@ -3872,6 +4323,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz"; + name = "extract-opts-2.2.0.tgz"; sha1 = "1fa28eba7352c6db480f885ceb71a46810be6d7d"; }) ]; @@ -3891,6 +4343,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; + name = "extsprintf-1.0.0.tgz"; sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }) ]; @@ -3909,6 +4362,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + name = "extsprintf-1.0.2.tgz"; sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }) ]; @@ -3927,6 +4381,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }) ]; @@ -3947,6 +4402,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.1.tgz"; + name = "faye-websocket-0.7.1.tgz"; sha1 = "72fe630d122333e0f36ac453f593ed70e1cb6baa"; }) ]; @@ -3967,6 +4423,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; + name = "faye-websocket-0.7.0.tgz"; sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be"; }) ]; @@ -3979,6 +4436,32 @@ ]; passthru.names = [ "faye-websocket" ]; }; + by-spec."file-utils"."~0.1.1" = + self.by-version."file-utils"."0.1.5"; + by-version."file-utils"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "file-utils-0.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz"; + name = "file-utils-0.1.5.tgz"; + sha1 = "dc8153c855387cb4dacb0a1725531fa444a6b48c"; + }) + ]; + buildInputs = + (self.nativeDeps."file-utils" or []); + deps = [ + self.by-version."lodash"."2.1.0" + self.by-version."iconv-lite"."0.2.11" + self.by-version."rimraf"."2.2.5" + self.by-version."glob"."3.2.7" + self.by-version."minimatch"."0.2.14" + self.by-version."findup-sync"."0.1.2" + self.by-version."isbinaryfile"."0.1.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "file-utils" ]; + }; by-spec."fileset"."0.1.x" = self.by-version."fileset"."0.1.5"; by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -3986,13 +4469,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz"; + name = "fileset-0.1.5.tgz"; sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94"; }) ]; buildInputs = (self.nativeDeps."fileset" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."glob"."3.2.7" ]; peerDependencies = [ @@ -4006,6 +4490,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz"; + name = "findit-1.1.0.tgz"; sha1 = "7104c60060f838d2298bd526b16add6ce733f9ac"; }) ]; @@ -4017,6 +4502,27 @@ ]; passthru.names = [ "findit" ]; }; + by-spec."findup"."~0.1.3" = + self.by-version."findup"."0.1.3"; + by-version."findup"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "findup-0.1.3"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/findup/-/findup-0.1.3.tgz"; + name = "findup-0.1.3.tgz"; + sha1 = "df2b8ecf06fdaa9cc13dc4ba58bf950e3a176941"; + }) + ]; + buildInputs = + (self.nativeDeps."findup" or []); + deps = [ + self.by-version."nopt"."1.0.10" + self.by-version."colors"."0.6.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "findup" ]; + }; by-spec."findup-sync"."~0.1.0" = self.by-version."findup-sync"."0.1.2"; by-version."findup-sync"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -4024,6 +4530,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz"; + name = "findup-sync-0.1.2.tgz"; sha1 = "da2b96ca9f800e5a13d0a11110f490b65f62e96d"; }) ]; @@ -4040,13 +4547,14 @@ by-spec."findup-sync"."~0.1.2" = self.by-version."findup-sync"."0.1.2"; by-spec."flatiron"."*" = - self.by-version."flatiron"."0.3.9"; - by-version."flatiron"."0.3.9" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.3.9"; + self.by-version."flatiron"."0.3.11"; + by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage { + name = "flatiron-0.3.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.9.tgz"; - sha1 = "e18cc2490e6a0f771c77afe75a1644645ec4a406"; + url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.11.tgz"; + name = "flatiron-0.3.11.tgz"; + sha1 = "1cb0190fc2bd9d860f018e04d95fd35f9bd12555"; }) ]; buildInputs = @@ -4061,30 +4569,9 @@ ]; passthru.names = [ "flatiron" ]; }; - "flatiron" = self.by-version."flatiron"."0.3.9"; - by-spec."flatiron"."0.3.5" = - self.by-version."flatiron"."0.3.5"; - by-version."flatiron"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.5.tgz"; - sha1 = "a91fe730f6a7fc1ea655a0ca48eaa977bef64625"; - }) - ]; - buildInputs = - (self.nativeDeps."flatiron" or []); - deps = [ - self.by-version."broadway"."0.2.7" - self.by-version."optimist"."0.3.5" - self.by-version."prompt"."0.2.9" - self.by-version."director"."1.1.10" - self.by-version."pkginfo"."0.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "flatiron" ]; - }; + "flatiron" = self.by-version."flatiron"."0.3.11"; + by-spec."flatiron"."~0.3.11" = + self.by-version."flatiron"."0.3.11"; by-spec."follow-redirects"."0.0.3" = self.by-version."follow-redirects"."0.0.3"; by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -4092,6 +4579,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; + name = "follow-redirects-0.0.3.tgz"; sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }) ]; @@ -4111,6 +4599,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.0.tgz"; + name = "forEachAsync-2.2.0.tgz"; sha1 = "093b32ce868cb69f5166dcf331fae074adc71cee"; }) ]; @@ -4123,37 +4612,57 @@ ]; passthru.names = [ "forEachAsync" ]; }; + by-spec."foreach"."~2.0.1" = + self.by-version."foreach"."2.0.4"; + by-version."foreach"."2.0.4" = lib.makeOverridable self.buildNodePackage { + name = "foreach-2.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/foreach/-/foreach-2.0.4.tgz"; + name = "foreach-2.0.4.tgz"; + sha1 = "cc5d0d8ae1d46cc9a555c2682f910977859935df"; + }) + ]; + buildInputs = + (self.nativeDeps."foreach" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "foreach" ]; + }; by-spec."forever"."*" = - self.by-version."forever"."0.10.9"; - by-version."forever"."0.10.9" = lib.makeOverridable self.buildNodePackage { - name = "forever-0.10.9"; + self.by-version."forever"."0.10.11"; + by-version."forever"."0.10.11" = lib.makeOverridable self.buildNodePackage { + name = "forever-0.10.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.10.9.tgz"; - sha1 = "e4849f459ec27d5a6524fd466e67dfd6222bd9bb"; + url = "http://registry.npmjs.org/forever/-/forever-0.10.11.tgz"; + name = "forever-0.10.11.tgz"; + sha1 = "925cae528c074a29c0119809ca08e382ef194ad0"; }) ]; buildInputs = (self.nativeDeps."forever" or []); deps = [ - self.by-version."colors"."0.6.0-1" + self.by-version."colors"."0.6.2" self.by-version."cliff"."0.1.8" - self.by-version."flatiron"."0.3.5" + self.by-version."flatiron"."0.3.11" self.by-version."forever-monitor"."1.2.3" - self.by-version."nconf"."0.6.7" + self.by-version."nconf"."0.6.9" self.by-version."nssocket"."0.5.1" - self.by-version."optimist"."0.4.0" + self.by-version."optimist"."0.6.0" self.by-version."pkginfo"."0.3.0" - self.by-version."timespan"."2.0.1" - self.by-version."watch"."0.7.0" - self.by-version."utile"."0.1.7" - self.by-version."winston"."0.7.1" + self.by-version."timespan"."2.3.0" + self.by-version."watch"."0.8.0" + self.by-version."utile"."0.2.1" + self.by-version."winston"."0.7.2" ]; peerDependencies = [ ]; passthru.names = [ "forever" ]; }; - "forever" = self.by-version."forever"."0.10.9"; + "forever" = self.by-version."forever"."0.10.11"; by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -4161,6 +4670,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; + name = "forever-agent-0.2.0.tgz"; sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; }) ]; @@ -4179,6 +4689,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz"; + name = "forever-agent-0.5.0.tgz"; sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0"; }) ]; @@ -4197,6 +4708,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz"; + name = "forever-monitor-1.2.3.tgz"; sha1 = "b27ac3acb6fdcc7315d6cd85830f2d004733028b"; }) ]; @@ -4204,7 +4716,7 @@ (self.nativeDeps."forever-monitor" or []); deps = [ self.by-version."broadway"."0.2.9" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."pkginfo"."0.3.0" self.by-version."ps-tree"."0.0.3" self.by-version."watch"."0.5.1" @@ -4222,6 +4734,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz"; + name = "forever-monitor-1.1.0.tgz"; sha1 = "439ce036f999601cff551aea7f5151001a869ef9"; }) ]; @@ -4248,6 +4761,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz"; + name = "form-data-0.0.8.tgz"; sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5"; }) ]; @@ -4269,6 +4783,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; + name = "form-data-0.0.10.tgz"; sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }) ]; @@ -4290,6 +4805,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; + name = "form-data-0.1.2.tgz"; sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; }) ]; @@ -4311,6 +4827,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; + name = "formidable-1.0.11.tgz"; sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; }) ]; @@ -4329,6 +4846,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz"; + name = "formidable-1.0.13.tgz"; sha1 = "70caf0f9d69692a77e04021ddab4f46b01c82aea"; }) ]; @@ -4347,6 +4865,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + name = "formidable-1.0.14.tgz"; sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; }) ]; @@ -4365,6 +4884,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz"; + name = "formidable-1.0.9.tgz"; sha1 = "419e3bccead3e8874d539f5b3e72a4c503b31a98"; }) ]; @@ -4385,6 +4905,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; + name = "fresh-0.1.0.tgz"; sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; }) ]; @@ -4403,6 +4924,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; + name = "fresh-0.2.0.tgz"; sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; }) ]; @@ -4421,6 +4943,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; + name = "fs-extra-0.6.4.tgz"; sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; }) ]; @@ -4430,7 +4953,7 @@ self.by-version."ncp"."0.4.2" self.by-version."mkdirp"."0.3.5" self.by-version."jsonfile"."1.0.1" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" ]; peerDependencies = [ ]; @@ -4443,6 +4966,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz"; + name = "fs-walk-0.0.1.tgz"; sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335"; }) ]; @@ -4463,6 +4987,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz"; + name = "fs.extra-1.2.1.tgz"; sha1 = "060bf20264f35e39ad247e5e9d2121a2a75a1733"; }) ]; @@ -4484,13 +5009,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz"; + name = "fstream-0.1.25.tgz"; sha1 = "deef2db7c7898357c2b37202212a9e5b36abc732"; }) ]; buildInputs = (self.nativeDeps."fstream" or []); deps = [ - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."mkdirp"."0.3.5" self.by-version."graceful-fs"."2.0.1" self.by-version."inherits"."2.0.1" @@ -4503,7 +5029,7 @@ self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.22" = self.by-version."fstream"."0.1.25"; - by-spec."fstream"."~0.1.23" = + by-spec."fstream"."~0.1.25" = self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.8" = self.by-version."fstream"."0.1.25"; @@ -4514,13 +5040,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + name = "fstream-ignore-0.0.7.tgz"; sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; }) ]; buildInputs = (self.nativeDeps."fstream-ignore" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."fstream"."0.1.25" self.by-version."inherits"."2.0.1" ]; @@ -4537,6 +5064,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz"; + name = "fstream-npm-0.1.6.tgz"; sha1 = "1369323075d9bd85cfcc9409f33f0d6fe5be104d"; }) ]; @@ -4551,27 +5079,30 @@ passthru.names = [ "fstream-npm" ]; }; by-spec."generator-angular"."*" = - self.by-version."generator-angular"."0.6.0-rc.2"; - by-version."generator-angular"."0.6.0-rc.2" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.6.0-rc.2"; + self.by-version."generator-angular"."0.7.1"; + by-version."generator-angular"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "generator-angular-0.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0-rc.2.tgz"; - sha1 = "775a858e5dd9dc9f0a85730274d02c6af5d232b1"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.7.1.tgz"; + name = "generator-angular-0.7.1.tgz"; + sha1 = "51f9faed8d7c0e9d972004101cc1c16ecd1ebf65"; }) ]; buildInputs = (self.nativeDeps."generator-angular" or []); deps = [ self.by-version."yeoman-generator"."0.13.4" + self.by-version."chalk"."0.3.0" + self.by-version."wiredep"."0.4.2" ]; peerDependencies = [ self.by-version."generator-karma"."0.6.0" - self.by-version."yo"."1.0.4" + self.by-version."yo"."1.0.7-pre.2" ]; passthru.names = [ "generator-angular" ]; }; - "generator-angular" = self.by-version."generator-angular"."0.6.0-rc.2"; + "generator-angular" = self.by-version."generator-angular"."0.7.1"; by-spec."generator-karma"."~0.6.0" = self.by-version."generator-karma"."0.6.0"; by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -4579,6 +5110,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.6.0.tgz"; + name = "generator-karma-0.6.0.tgz"; sha1 = "e89b6195c186771e8bdddde37441abb6ce07e1a0"; }) ]; @@ -4588,52 +5120,55 @@ self.by-version."yeoman-generator"."0.13.4" ]; peerDependencies = [ - self.by-version."yo"."1.0.4" + self.by-version."yo"."1.0.7-pre.2" ]; passthru.names = [ "generator-karma" ]; }; by-spec."generator-mocha"."~0.1.1" = - self.by-version."generator-mocha"."0.1.1"; - by-version."generator-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "generator-mocha-0.1.1"; + self.by-version."generator-mocha"."0.1.3"; + by-version."generator-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "generator-mocha-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.1.tgz"; - sha1 = "818f7028a1c149774a882a0e3c7c04ba9852d7d1"; + url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.3.tgz"; + name = "generator-mocha-0.1.3.tgz"; + sha1 = "d54977bc0839b30c9b15fdd900e0ecd42afe14c8"; }) ]; buildInputs = (self.nativeDeps."generator-mocha" or []); deps = [ - self.by-version."yeoman-generator"."0.10.5" + self.by-version."yeoman-generator"."0.14.2" ]; peerDependencies = [ + self.by-version."yo"."1.0.7-pre.2" ]; passthru.names = [ "generator-mocha" ]; }; by-spec."generator-webapp"."*" = - self.by-version."generator-webapp"."0.4.4"; - by-version."generator-webapp"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "generator-webapp-0.4.4"; + self.by-version."generator-webapp"."0.4.6"; + by-version."generator-webapp"."0.4.6" = lib.makeOverridable self.buildNodePackage { + name = "generator-webapp-0.4.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.4.tgz"; - sha1 = "a7f5d7440943e3e5afbd2ad627675faf2456b74e"; + url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.6.tgz"; + name = "generator-webapp-0.4.6.tgz"; + sha1 = "6f51516b615aaf807e221a8ac713845fd680648f"; }) ]; buildInputs = (self.nativeDeps."generator-webapp" or []); deps = [ - self.by-version."yeoman-generator"."0.13.4" + self.by-version."yeoman-generator"."0.14.2" self.by-version."cheerio"."0.12.4" ]; peerDependencies = [ - self.by-version."yo"."1.0.4" - self.by-version."generator-mocha"."0.1.1" + self.by-version."yo"."1.0.7-pre.2" + self.by-version."generator-mocha"."0.1.3" ]; passthru.names = [ "generator-webapp" ]; }; - "generator-webapp" = self.by-version."generator-webapp"."0.4.4"; + "generator-webapp" = self.by-version."generator-webapp"."0.4.6"; by-spec."getmac"."~1.0.6" = self.by-version."getmac"."1.0.6"; by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage { @@ -4641,6 +5176,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz"; + name = "getmac-1.0.6.tgz"; sha1 = "f222c8178be9de24899df5a04e77557fbaf4e522"; }) ]; @@ -4660,6 +5196,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"; + name = "getobject-0.1.0.tgz"; sha1 = "047a449789fa160d018f5486ed91320b6ec7885c"; }) ]; @@ -4678,6 +5215,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; + name = "github-url-from-git-1.1.1.tgz"; sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; }) ]; @@ -4698,6 +5236,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; + name = "github-url-from-username-repo-0.0.2.tgz"; sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; }) ]; @@ -4716,13 +5255,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.7.tgz"; + name = "glob-3.2.7.tgz"; sha1 = "275f39a0eee805694790924f36eac38e1db6d802"; }) ]; buildInputs = (self.nativeDeps."glob" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ @@ -4736,13 +5276,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + name = "glob-3.2.3.tgz"; sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; }) ]; buildInputs = (self.nativeDeps."glob" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."graceful-fs"."2.0.1" self.by-version."inherits"."2.0.1" ]; @@ -4761,13 +5302,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; + name = "glob-3.1.21.tgz"; sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; }) ]; buildInputs = (self.nativeDeps."glob" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."graceful-fs"."1.2.3" self.by-version."inherits"."1.0.0" ]; @@ -4790,6 +5332,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; + name = "graceful-fs-2.0.1.tgz"; sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; }) ]; @@ -4808,6 +5351,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + name = "graceful-fs-1.2.3.tgz"; sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; }) ]; @@ -4826,6 +5370,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.1.14.tgz"; + name = "graceful-fs-1.1.14.tgz"; sha1 = "07078db5f6377f6321fceaaedf497de124dc9465"; }) ]; @@ -4845,6 +5390,8 @@ self.by-version."graceful-fs"."2.0.1"; by-spec."graceful-fs"."~2.0.0" = self.by-version."graceful-fs"."2.0.1"; + by-spec."graceful-fs"."~2.0.1" = + self.by-version."graceful-fs"."2.0.1"; by-spec."gridfs-stream"."*" = self.by-version."gridfs-stream"."0.4.0"; by-version."gridfs-stream"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -4852,6 +5399,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz"; + name = "gridfs-stream-0.4.0.tgz"; sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a"; }) ]; @@ -4871,6 +5419,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz"; + name = "growl-1.7.0.tgz"; sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da"; }) ]; @@ -4889,6 +5438,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt/-/grunt-0.4.2.tgz"; + name = "grunt-0.4.2.tgz"; sha1 = "895b4f28a6102bffd41d365a65e8be2d6a293d93"; }) ]; @@ -4904,7 +5454,7 @@ self.by-version."glob"."3.1.21" self.by-version."hooker"."0.2.3" self.by-version."iconv-lite"."0.2.11" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."nopt"."1.0.10" self.by-version."rimraf"."2.0.3" self.by-version."lodash"."0.9.2" @@ -4931,6 +5481,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-bower-task/-/grunt-bower-task-0.3.4.tgz"; + name = "grunt-bower-task-0.3.4.tgz"; sha1 = "6f713725ae96bb22ed60b1173cf4c522bbb8583b"; }) ]; @@ -4956,6 +5507,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.11.tgz"; + name = "grunt-cli-0.1.11.tgz"; sha1 = "a0d785b7f8633983ecb5e6af8397feb6e39dd0a8"; }) ]; @@ -4980,13 +5532,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.7.0.tgz"; + name = "grunt-contrib-cssmin-0.7.0.tgz"; sha1 = "a5735e9f1d263149e49fe035294e429d8c670bab"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ - self.by-version."clean-css"."2.0.2" + self.by-version."clean-css"."2.0.4" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -4996,34 +5549,36 @@ }; "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.7.0"; by-spec."grunt-contrib-jshint"."*" = - self.by-version."grunt-contrib-jshint"."0.7.2"; - by-version."grunt-contrib-jshint"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-jshint-0.7.2"; + self.by-version."grunt-contrib-jshint"."0.8.0"; + by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-jshint-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.7.2.tgz"; - sha1 = "29859ddcf42e7f6c54c43fe75da3c4bd90384a8e"; + url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.8.0.tgz"; + name = "grunt-contrib-jshint-0.8.0.tgz"; + sha1 = "6bd52325dcce1d995dbbf648030c59e1a606acda"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.by-version."jshint"."2.3.0" + self.by-version."jshint"."2.4.0" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-jshint" ]; }; - "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.7.2"; + "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.8.2"; - by-version."grunt-contrib-less"."0.8.2" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-less-0.8.2"; + self.by-version."grunt-contrib-less"."0.8.3"; + by-version."grunt-contrib-less"."0.8.3" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-less-0.8.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.2.tgz"; - sha1 = "d94e5c69251aec1a48ee154147b808a10ff6f711"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.3.tgz"; + name = "grunt-contrib-less-0.8.3.tgz"; + sha1 = "8a0e9183577339ad08729f57a9a4adeff6c41410"; }) ]; buildInputs = @@ -5037,7 +5592,7 @@ ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.2"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.3"; by-spec."grunt-contrib-requirejs"."*" = self.by-version."grunt-contrib-requirejs"."0.4.1"; by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage { @@ -5045,6 +5600,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.1.tgz"; + name = "grunt-contrib-requirejs-0.4.1.tgz"; sha1 = "862ba167141b8a8f36af5444feab3272bb8cf4bd"; }) ]; @@ -5066,13 +5622,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.7.tgz"; + name = "grunt-contrib-uglify-0.2.7.tgz"; sha1 = "e6bda51e0c40a1459f6cead423c65efd725a1bf7"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.by-version."uglify-js"."2.4.6" + self.by-version."uglify-js"."2.4.8" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -5082,13 +5639,14 @@ }; "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.2.7"; by-spec."grunt-karma"."*" = - self.by-version."grunt-karma"."0.7.1"; - by-version."grunt-karma"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-karma-0.7.1"; + self.by-version."grunt-karma"."0.7.2"; + by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "grunt-karma-0.7.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.1.tgz"; - sha1 = "7fb8c40988b8e88da454afb821a7a925ed05ff81"; + url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.2.tgz"; + name = "grunt-karma-0.7.2.tgz"; + sha1 = "1d041d9833671c2bca671cd66bd874c96b2a631e"; }) ]; buildInputs = @@ -5098,11 +5656,11 @@ ]; peerDependencies = [ self.by-version."grunt"."0.4.2" - self.by-version."karma"."0.10.7" + self.by-version."karma"."0.11.11" ]; passthru.names = [ "grunt-karma" ]; }; - "grunt-karma" = self.by-version."grunt-karma"."0.7.1"; + "grunt-karma" = self.by-version."grunt-karma"."0.7.2"; by-spec."grunt-lib-contrib"."~0.6.0" = self.by-version."grunt-lib-contrib"."0.6.1"; by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -5110,6 +5668,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz"; + name = "grunt-lib-contrib-0.6.1.tgz"; sha1 = "3f56adb7da06e814795ee2415b0ebe5fb8903ebb"; }) ]; @@ -5131,6 +5690,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz"; + name = "grunt-sed-0.1.1.tgz"; sha1 = "2613d486909319b3f8f4bd75dafb46a642ec3f82"; }) ]; @@ -5152,6 +5712,7 @@ src = [ (fetchurl { url = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854"; + name = "guifi-earth-0.2.1.tgz"; sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }) ]; @@ -5159,7 +5720,7 @@ (self.nativeDeps."guifi-earth" or []); deps = [ self.by-version."coffee-script"."1.6.3" - self.by-version."jade"."0.35.0" + self.by-version."jade"."1.0.0" self.by-version."q"."0.9.7" self.by-version."xml2js"."0.4.0" self.by-version."msgpack"."0.2.1" @@ -5176,6 +5737,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz"; + name = "gzippo-0.2.0.tgz"; sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733"; }) ]; @@ -5196,6 +5758,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.12.tgz"; + name = "handlebars-1.0.12.tgz"; sha1 = "18c6d3440c35e91b19b3ff582b9151ab4985d4fc"; }) ]; @@ -5218,6 +5781,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/has-color/-/has-color-0.1.1.tgz"; + name = "has-color-0.1.1.tgz"; sha1 = "28cc90127bc5448f99e76096dc97470a94a66720"; }) ]; @@ -5236,6 +5800,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; + name = "hasher-1.2.0.tgz"; sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }) ]; @@ -5248,6 +5813,27 @@ ]; passthru.names = [ "hasher" ]; }; + by-spec."hashring"."1.0.1" = + self.by-version."hashring"."1.0.1"; + by-version."hashring"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "hashring-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz"; + name = "hashring-1.0.1.tgz"; + sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c"; + }) + ]; + buildInputs = + (self.nativeDeps."hashring" or []); + deps = [ + self.by-version."connection-parse"."0.0.7" + self.by-version."simple-lru-cache"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hashring" ]; + }; by-spec."hat"."*" = self.by-version."hat"."0.0.3"; by-version."hat"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -5255,6 +5841,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; + name = "hat-0.0.3.tgz"; sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; }) ]; @@ -5273,6 +5860,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; + name = "hawk-0.10.2.tgz"; sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; }) ]; @@ -5297,6 +5885,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz"; + name = "hawk-0.13.1.tgz"; sha1 = "3617958821f58311e4d7f6de291fca662b412ef4"; }) ]; @@ -5319,6 +5908,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + name = "hawk-1.0.0.tgz"; sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; }) ]; @@ -5341,6 +5931,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz"; + name = "he-0.3.6.tgz"; sha1 = "9d7bc446e77963933301dd602d5731cb861135e0"; }) ]; @@ -5359,6 +5950,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/hipache/-/hipache-0.2.4.tgz"; + name = "hipache-0.2.4.tgz"; sha1 = "1d6a06bf88cac084b5fcd01959392c8b4889ec65"; }) ]; @@ -5377,13 +5969,14 @@ }; "hipache" = self.by-version."hipache"."0.2.4"; by-spec."hiredis"."*" = - self.by-version."hiredis"."0.1.15"; - by-version."hiredis"."0.1.15" = lib.makeOverridable self.buildNodePackage { - name = "hiredis-0.1.15"; + self.by-version."hiredis"."0.1.16"; + by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "hiredis-0.1.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.15.tgz"; - sha1 = "00eb2205c85dcf50de838203e513896dc304dd49"; + url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz"; + name = "hiredis-0.1.16.tgz"; + sha1 = "f6cee1add2589b8b71cef3c4d3936a9fcd638640"; }) ]; buildInputs = @@ -5402,6 +5995,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; + name = "hoek-0.7.6.tgz"; sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; }) ]; @@ -5420,6 +6014,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz"; + name = "hoek-0.8.5.tgz"; sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f"; }) ]; @@ -5438,6 +6033,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; }) ]; @@ -5456,6 +6052,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"; + name = "hooker-0.2.3.tgz"; sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959"; }) ]; @@ -5474,6 +6071,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; + name = "hooks-0.2.1.tgz"; sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; }) ]; @@ -5485,41 +6083,44 @@ ]; passthru.names = [ "hooks" ]; }; - by-spec."htmlparser2"."2.x" = - self.by-version."htmlparser2"."2.6.0"; - by-version."htmlparser2"."2.6.0" = lib.makeOverridable self.buildNodePackage { - name = "htmlparser2-2.6.0"; + by-spec."htmlparser2"."3.1.4" = + self.by-version."htmlparser2"."3.1.4"; + by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage { + name = "htmlparser2-3.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-2.6.0.tgz"; - sha1 = "b28564ea9d1ba56a104ace6a7b0fdda2f315836f"; + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.1.4.tgz"; + name = "htmlparser2-3.1.4.tgz"; + sha1 = "72cbe7d5d56c01acf61fcf7b933331f4e45b36f0"; }) ]; buildInputs = (self.nativeDeps."htmlparser2" or []); deps = [ self.by-version."domhandler"."2.0.3" - self.by-version."domutils"."1.0.1" + self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" + self.by-version."readable-stream"."1.0.17" ]; peerDependencies = [ ]; passthru.names = [ "htmlparser2" ]; }; - by-spec."htmlparser2"."3.1.4" = - self.by-version."htmlparser2"."3.1.4"; - by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage { - name = "htmlparser2-3.1.4"; + by-spec."htmlparser2"."3.3.x" = + self.by-version."htmlparser2"."3.3.0"; + by-version."htmlparser2"."3.3.0" = lib.makeOverridable self.buildNodePackage { + name = "htmlparser2-3.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.1.4.tgz"; - sha1 = "72cbe7d5d56c01acf61fcf7b933331f4e45b36f0"; + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz"; + name = "htmlparser2-3.3.0.tgz"; + sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe"; }) ]; buildInputs = (self.nativeDeps."htmlparser2" or []); deps = [ - self.by-version."domhandler"."2.0.3" + self.by-version."domhandler"."2.1.0" self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" self.by-version."readable-stream"."1.0.17" @@ -5535,6 +6136,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; + name = "http-auth-2.0.7.tgz"; sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3"; }) ]; @@ -5580,6 +6182,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz"; + name = "http-signature-0.9.11.tgz"; sha1 = "9e882714572315e6790a5d0a7955efff1f19e653"; }) ]; @@ -5601,6 +6204,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; + name = "http-signature-0.10.0.tgz"; sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; }) ]; @@ -5624,6 +6228,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz"; + name = "i-0.3.2.tgz"; sha1 = "b2e2d6ef47900bd924e281231ff4c5cc798d9ea8"; }) ]; @@ -5642,6 +6247,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/i18next/-/i18next-1.7.1.tgz"; + name = "i18next-1.7.1.tgz"; sha1 = "39616a1fe88258edbdd0da918b9ee49a1bd1e124"; }) ]; @@ -5655,23 +6261,24 @@ passthru.names = [ "i18next" ]; }; "i18next" = self.by-version."i18next"."1.7.1"; - by-spec."ibrik"."~0.0.4" = - self.by-version."ibrik"."0.0.4"; - by-version."ibrik"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "ibrik-0.0.4"; + by-spec."ibrik"."~1.0.1" = + self.by-version."ibrik"."1.0.1"; + by-version."ibrik"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "ibrik-1.0.1"; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/ibrik/-/ibrik-0.0.4.tgz"; - sha1 = "1ce60747afe56ecee03cd1f6f0db30ce579961e4"; + url = "http://registry.npmjs.org/ibrik/-/ibrik-1.0.1.tgz"; + name = "ibrik-1.0.1.tgz"; + sha1 = "ba9c0cf9302c51a812dc4a92038b3de579c0aefb"; }) ]; buildInputs = (self.nativeDeps."ibrik" or []); deps = [ self.by-version."coffee-script-redux"."2.0.0-beta4" - self.by-version."istanbul"."0.1.46" + self.by-version."istanbul"."0.2.1" self.by-version."optimist"."0.6.0" - self.by-version."escodegen"."1.0.0" + self.by-version."escodegen"."1.0.1" self.by-version."mkdirp"."0.3.5" self.by-version."which"."1.0.5" self.by-version."estraverse"."1.5.0" @@ -5687,6 +6294,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"; + name = "iconv-lite-0.2.11.tgz"; sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8"; }) ]; @@ -5700,6 +6308,25 @@ }; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; + by-spec."indexof"."~0.0.1" = + self.by-version."indexof"."0.0.1"; + by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "indexof-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + name = "indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }) + ]; + buildInputs = + (self.nativeDeps."indexof" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "indexof" ]; + }; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5707,6 +6334,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; + name = "inherits-1.0.0.tgz"; sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; }) ]; @@ -5727,6 +6355,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; }) ]; @@ -5738,6 +6367,8 @@ ]; passthru.names = [ "inherits" ]; }; + by-spec."inherits"."2.0.1" = + self.by-version."inherits"."2.0.1"; by-spec."inherits"."~1.0.0" = self.by-version."inherits"."1.0.0"; by-spec."inherits"."~2.0.0" = @@ -5749,6 +6380,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + name = "ini-1.1.0.tgz"; sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; }) ]; @@ -5764,14 +6396,15 @@ self.by-version."ini"."1.1.0"; by-spec."ini"."~1.1.0" = self.by-version."ini"."1.1.0"; - by-spec."init-package-json"."0.0.13" = - self.by-version."init-package-json"."0.0.13"; - by-version."init-package-json"."0.0.13" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-0.0.13"; + by-spec."init-package-json"."0.0.14" = + self.by-version."init-package-json"."0.0.14"; + by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-0.0.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.13.tgz"; - sha1 = "ce58dd49dc54b4ce516775ab8f9a43066d685bcb"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz"; + name = "init-package-json-0.0.14.tgz"; + sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7"; }) ]; buildInputs = @@ -5794,6 +6427,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz"; + name = "inquirer-0.2.5.tgz"; sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6"; }) ]; @@ -5816,6 +6450,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.5.tgz"; + name = "inquirer-0.3.5.tgz"; sha1 = "a78be064ac9abf168147c02169a931d9a483a9f6"; }) ]; @@ -5833,14 +6468,15 @@ }; by-spec."inquirer"."~0.3.1" = self.by-version."inquirer"."0.3.5"; - by-spec."insight"."~0.2.0" = - self.by-version."insight"."0.2.0"; - by-version."insight"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "insight-0.2.0"; + by-spec."insight"."~0.3.0" = + self.by-version."insight"."0.3.0"; + by-version."insight"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "insight-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/insight/-/insight-0.2.0.tgz"; - sha1 = "3b430f3c903558d690d1b96c7479b6f1b9186a5e"; + url = "http://registry.npmjs.org/insight/-/insight-0.3.0.tgz"; + name = "insight-0.3.0.tgz"; + sha1 = "9d922133f560f7633abfc8f91451bda5e2cf2f71"; }) ]; buildInputs = @@ -5848,7 +6484,7 @@ deps = [ self.by-version."chalk"."0.2.1" self.by-version."request"."2.27.0" - self.by-version."configstore"."0.1.5" + self.by-version."configstore"."0.1.7" self.by-version."async"."0.2.9" self.by-version."lodash"."1.3.1" self.by-version."inquirer"."0.2.5" @@ -5864,6 +6500,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz"; + name = "intersect-0.0.3.tgz"; sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920"; }) ]; @@ -5882,6 +6519,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.9.tgz"; + name = "ironhorse-0.0.9.tgz"; sha1 = "9cfaf75e464a0bf394d511a05c0a8b8de080a1d9"; }) ]; @@ -5893,23 +6531,61 @@ self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" self.by-version."async"."0.2.9" - self.by-version."express"."3.4.6" - self.by-version."jade"."0.35.0" + self.by-version."express"."3.4.7" + self.by-version."jade"."1.0.0" self.by-version."passport"."0.1.17" self.by-version."passport-http"."0.2.2" - self.by-version."js-yaml"."2.1.3" - self.by-version."mongoose"."3.8.1" + self.by-version."js-yaml"."3.0.1" + self.by-version."mongoose"."3.8.3" self.by-version."gridfs-stream"."0.4.0" self.by-version."temp"."0.6.0" self.by-version."kue"."0.6.2" - self.by-version."redis"."0.9.1" - self.by-version."hiredis"."0.1.15" + self.by-version."redis"."0.10.0" + self.by-version."hiredis"."0.1.16" ]; peerDependencies = [ ]; passthru.names = [ "ironhorse" ]; }; "ironhorse" = self.by-version."ironhorse"."0.0.9"; + by-spec."is"."~0.2.6" = + self.by-version."is"."0.2.6"; + by-version."is"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "is-0.2.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is/-/is-0.2.6.tgz"; + name = "is-0.2.6.tgz"; + sha1 = "36681b7c4328a75a6dd4b6d8f7131e4f81de55c0"; + }) + ]; + buildInputs = + (self.nativeDeps."is" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "is" ]; + }; + by-spec."is-object"."~0.1.2" = + self.by-version."is-object"."0.1.2"; + by-version."is-object"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "is-object-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz"; + name = "is-object-0.1.2.tgz"; + sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7"; + }) + ]; + buildInputs = + (self.nativeDeps."is-object" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "is-object" ]; + }; by-spec."is-promise"."~1" = self.by-version."is-promise"."1.0.0"; by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5917,6 +6593,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz"; + name = "is-promise-1.0.0.tgz"; sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f"; }) ]; @@ -5935,6 +6612,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"; + name = "isbinaryfile-0.1.9.tgz"; sha1 = "15eece35c4ab708d8924da99fb874f2b5cc0b6c4"; }) ]; @@ -5946,13 +6624,66 @@ ]; passthru.names = [ "isbinaryfile" ]; }; + by-spec."isbinaryfile"."~0.1.9" = + self.by-version."isbinaryfile"."0.1.9"; + by-spec."isbinaryfile"."~2.0.0" = + self.by-version."isbinaryfile"."2.0.0"; + by-version."isbinaryfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "isbinaryfile-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.0.tgz"; + name = "isbinaryfile-2.0.0.tgz"; + sha1 = "309c09010811d04ebed7c8d026df443d565e9f26"; + }) + ]; + buildInputs = + (self.nativeDeps."isbinaryfile" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "isbinaryfile" ]; + }; by-spec."istanbul"."*" = + self.by-version."istanbul"."0.2.1"; + by-version."istanbul"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.1.tgz"; + name = "istanbul-0.2.1.tgz"; + sha1 = "21755f7ff0d7627a0747e571ffcea7f2ee9627d8"; + }) + ]; + buildInputs = + (self.nativeDeps."istanbul" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."escodegen"."0.0.23" + self.by-version."handlebars"."1.0.12" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.1.2" + self.by-version."fileset"."0.1.5" + self.by-version."which"."1.0.5" + self.by-version."async"."0.2.9" + self.by-version."abbrev"."1.0.4" + self.by-version."wordwrap"."0.0.2" + self.by-version."resolve"."0.5.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "istanbul" ]; + }; + "istanbul" = self.by-version."istanbul"."0.2.1"; + by-spec."istanbul"."~0.1.45" = self.by-version."istanbul"."0.1.46"; by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage { name = "istanbul-0.1.46"; src = [ (fetchurl { url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.46.tgz"; + name = "istanbul-0.1.46.tgz"; sha1 = "cefeb1c787d125a6db23bd0f63b0eb9390b0b40d"; }) ]; @@ -5975,17 +6706,15 @@ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.1.46"; - by-spec."istanbul"."~0.1.45" = - self.by-version."istanbul"."0.1.46"; by-spec."jade"."*" = - self.by-version."jade"."0.35.0"; - by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { - name = "jade-0.35.0"; + self.by-version."jade"."1.0.0"; + by-version."jade"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz"; - sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9"; + url = "http://registry.npmjs.org/jade/-/jade-1.0.0.tgz"; + name = "jade-1.0.0.tgz"; + sha1 = "388fab59603843eb4836211a3684f5206cb93b66"; }) ]; buildInputs = @@ -5996,14 +6725,14 @@ self.by-version."transformers"."2.1.0" self.by-version."character-parser"."1.2.0" self.by-version."monocle"."1.1.50" - self.by-version."with"."1.1.1" + self.by-version."with"."2.0.0" self.by-version."constantinople"."1.0.2" ]; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."0.35.0"; + "jade" = self.by-version."jade"."1.0.0"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -6011,6 +6740,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + name = "jade-0.26.3.tgz"; sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; }) ]; @@ -6031,6 +6761,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; + name = "jade-0.27.0.tgz"; sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }) ]; @@ -6045,15 +6776,16 @@ passthru.names = [ "jade" ]; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."0.35.0"; + self.by-version."jade"."1.0.0"; by-spec."jayschema"."*" = - self.by-version."jayschema"."0.2.0"; - by-version."jayschema"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "jayschema-0.2.0"; + self.by-version."jayschema"."0.2.1"; + by-version."jayschema"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "jayschema-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.0.tgz"; - sha1 = "ab250dd51224ef36ac8119ce143e0525300d99d4"; + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.1.tgz"; + name = "jayschema-0.2.1.tgz"; + sha1 = "b951c66c9cf48c510d5b920198c2755590f3b691"; }) ]; buildInputs = @@ -6065,7 +6797,7 @@ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.by-version."jayschema"."0.2.0"; + "jayschema" = self.by-version."jayschema"."0.2.1"; by-spec."jedediah"."~0.1.0" = self.by-version."jedediah"."0.1.1"; by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -6073,6 +6805,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jedediah/-/jedediah-0.1.1.tgz"; + name = "jedediah-0.1.1.tgz"; sha1 = "51f33021ebec6847d844cb53bbc086ee38877f84"; }) ]; @@ -6085,13 +6818,14 @@ passthru.names = [ "jedediah" ]; }; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."2.1.3"; - by-version."js-yaml"."2.1.3" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-2.1.3"; + self.by-version."js-yaml"."3.0.1"; + by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; - sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; + name = "js-yaml-3.0.1.tgz"; + sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; }) ]; buildInputs = @@ -6104,7 +6838,7 @@ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."2.1.3"; + "js-yaml" = self.by-version."js-yaml"."3.0.1"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -6112,6 +6846,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; + name = "js-yaml-0.3.7.tgz"; sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"; }) ]; @@ -6130,6 +6865,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; + name = "js-yaml-2.1.0.tgz"; sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; }) ]; @@ -6150,6 +6886,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz"; + name = "js-yaml-2.0.5.tgz"; sha1 = "a25ae6509999e97df278c6719da11bd0687743a8"; }) ]; @@ -6165,6 +6902,25 @@ }; by-spec."js-yaml"."~2.1.0" = self.by-version."js-yaml"."2.1.3"; + by-version."js-yaml"."2.1.3" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-2.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; + name = "js-yaml-2.1.3.tgz"; + sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; + }) + ]; + buildInputs = + (self.nativeDeps."js-yaml" or []); + deps = [ + self.by-version."argparse"."0.1.15" + self.by-version."esprima"."1.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "js-yaml" ]; + }; by-spec."jsesc"."0.4.3" = self.by-version."jsesc"."0.4.3"; by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage { @@ -6172,6 +6928,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz"; + name = "jsesc-0.4.3.tgz"; sha1 = "a9c7f90afd5a1bf2ee64df6c416dab61672d2ae9"; }) ]; @@ -6183,14 +6940,17 @@ ]; passthru.names = [ "jsesc" ]; }; + by-spec."jsesc"."~0.4.3" = + self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.3.0"; - by-version."jshint"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.3.0"; + self.by-version."jshint"."2.4.0"; + by-version."jshint"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.3.0.tgz"; - sha1 = "19504455a2c20c46ee183361eb87f3a1c0b7dc47"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.4.0.tgz"; + name = "jshint-2.4.0.tgz"; + sha1 = "31717646cee2137cdd7f1b773c3fce58f4d99fc5"; }) ]; buildInputs = @@ -6199,16 +6959,17 @@ self.by-version."shelljs"."0.1.4" self.by-version."underscore"."1.4.4" self.by-version."cli"."0.4.5" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" + self.by-version."htmlparser2"."3.3.0" self.by-version."console-browserify"."0.1.6" ]; peerDependencies = [ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.3.0"; - by-spec."jshint"."~2.3.0" = - self.by-version."jshint"."2.3.0"; + "jshint" = self.by-version."jshint"."2.4.0"; + by-spec."jshint"."~2.4.0" = + self.by-version."jshint"."2.4.0"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -6216,6 +6977,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + name = "json-schema-0.2.2.tgz"; sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; }) ]; @@ -6234,6 +6996,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; + name = "json-stringify-safe-3.0.0.tgz"; sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; }) ]; @@ -6252,6 +7015,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz"; + name = "json-stringify-safe-4.0.0.tgz"; sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54"; }) ]; @@ -6270,6 +7034,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; }) ]; @@ -6288,6 +7053,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; + name = "jsonfile-1.0.1.tgz"; sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; }) ]; @@ -6306,6 +7072,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.1.tgz"; + name = "jsontool-7.0.1.tgz"; sha1 = "d5a705e46e305d7377ede769707c072e6d957977"; }) ]; @@ -6325,6 +7092,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; + name = "jsprim-0.3.0.tgz"; sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; }) ]; @@ -6340,13 +7108,14 @@ passthru.names = [ "jsprim" ]; }; by-spec."junk"."~0.2.0" = - self.by-version."junk"."0.2.1"; - by-version."junk"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "junk-0.2.1"; + self.by-version."junk"."0.2.2"; + by-version."junk"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "junk-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/junk/-/junk-0.2.1.tgz"; - sha1 = "e8a4c42c421746da34b354d0510507cb79f3c583"; + url = "http://registry.npmjs.org/junk/-/junk-0.2.2.tgz"; + name = "junk-0.2.2.tgz"; + sha1 = "d595eb199b37930cecd1f2c52820847e80e48ae7"; }) ]; buildInputs = @@ -6358,20 +7127,14 @@ passthru.names = [ "junk" ]; }; by-spec."karma"."*" = - self.by-version."karma"."0.11.7"; - "karma" = self.by-version."karma"."0.11.7"; - by-spec."karma".">=0.9" = - self.by-version."karma"."0.11.7"; - by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.11.7"; - by-spec."karma"."~0.10.0" = - self.by-version."karma"."0.10.7"; - by-version."karma"."0.10.7" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.7"; + self.by-version."karma"."0.11.11"; + by-version."karma"."0.11.11" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.11.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.7.tgz"; - sha1 = "de49e2323a187ecb688470c2ad3be6a30bc7c270"; + url = "http://registry.npmjs.org/karma/-/karma-0.11.11.tgz"; + name = "karma-0.11.11.tgz"; + sha1 = "c5e0fa2220dfee7bb08a3bb085895b40e82197a8"; }) ]; buildInputs = @@ -6379,9 +7142,9 @@ deps = [ self.by-version."di"."0.0.1" self.by-version."socket.io"."0.9.16" - self.by-version."chokidar"."0.7.1" + self.by-version."chokidar"."0.8.1" self.by-version."glob"."3.1.21" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."http-proxy"."0.10.3" self.by-version."optimist"."0.3.7" self.by-version."coffee-script"."1.6.3" @@ -6396,134 +7159,63 @@ self.by-version."connect"."2.8.8" ]; peerDependencies = [ - self.by-version."karma-jasmine"."0.1.3" - self.by-version."karma-requirejs"."0.2.0" - self.by-version."karma-coffee-preprocessor"."0.1.1" - self.by-version."karma-html2js-preprocessor"."0.1.0" - self.by-version."karma-chrome-launcher"."0.1.1" - self.by-version."karma-firefox-launcher"."0.1.2" - self.by-version."karma-phantomjs-launcher"."0.1.1" - self.by-version."karma-script-launcher"."0.1.0" ]; passthru.names = [ "karma" ]; }; + "karma" = self.by-version."karma"."0.11.11"; + by-spec."karma".">=0.11.11" = + self.by-version."karma"."0.11.11"; + by-spec."karma".">=0.9" = + self.by-version."karma"."0.11.11"; + by-spec."karma".">=0.9.3" = + self.by-version."karma"."0.11.11"; + by-spec."karma"."~0.11.0" = + self.by-version."karma"."0.11.11"; by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.1"; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.1"; - by-spec."karma-coffee-preprocessor"."*" = - self.by-version."karma-coffee-preprocessor"."0.1.1"; - by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.1.3"; - by-version."karma-coverage"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "karma-coverage-0.1.3"; + self.by-version."karma-chrome-launcher"."0.1.2"; + by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "karma-chrome-launcher-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.3.tgz"; - sha1 = "4a936fa89a2c06c339ad953a10c6d25eb6794204"; + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.2.tgz"; + name = "karma-chrome-launcher-0.1.2.tgz"; + sha1 = "f7154d03be01f4c246368d56d43d7232e14ccce6"; }) ]; buildInputs = - (self.nativeDeps."karma-coverage" or []); + (self.nativeDeps."karma-chrome-launcher" or []); deps = [ - self.by-version."istanbul"."0.1.46" - self.by-version."ibrik"."0.0.4" - self.by-version."dateformat"."1.0.6-1.2.3" ]; peerDependencies = [ - self.by-version."karma"."0.11.7" + self.by-version."karma"."0.11.11" ]; - passthru.names = [ "karma-coverage" ]; + passthru.names = [ "karma-chrome-launcher" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.1.3"; - by-spec."karma-firefox-launcher"."*" = - self.by-version."karma-firefox-launcher"."0.1.2"; - by-spec."karma-html2js-preprocessor"."*" = - self.by-version."karma-html2js-preprocessor"."0.1.0"; - by-spec."karma-jasmine"."*" = - self.by-version."karma-jasmine"."0.1.3"; - by-version."karma"."0.11.7" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-requirejs"."0.2.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-firefox-launcher"."0.1.2" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-script-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-jasmine"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "karma-jasmine-0.1.3"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2"; + by-spec."karma-coverage"."*" = + self.by-version."karma-coverage"."0.1.4"; + by-version."karma-coverage"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "karma-coverage-0.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz"; - sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.7.tgz"; - sha1 = "86f44de1c44016e5af3492bceb6dea99799b18fb"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.0.tgz"; - sha1 = "62facf19e1f4be956b90b67c4bebba7bb84fb054"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.1.tgz"; - sha1 = "32285f28a5f6c97ceeeae3b8a48e0d087c1a952a"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz"; - sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.1.tgz"; - sha1 = "9fc3410063cefc88e06043d233f839651a16a98c"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.2.tgz"; - sha1 = "bf451d98a80a3f3368514db693dfddb70786fd5f"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.1.tgz"; - sha1 = "e3c9511177f45f9dfe65b404be0ddd7190887c95"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"; - sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.4.tgz"; + name = "karma-coverage-0.1.4.tgz"; + sha1 = "53766bad4dc2aa26dcc1be95ded7809be8032d8e"; }) ]; buildInputs = - (self.nativeDeps."karma-jasmine" or []) - ++ (self.nativeDeps."karma" or []) - ++ (self.nativeDeps."karma-requirejs" or []) - ++ (self.nativeDeps."karma-coffee-preprocessor" or []) - ++ (self.nativeDeps."karma-html2js-preprocessor" or []) - ++ (self.nativeDeps."karma-chrome-launcher" or []) - ++ (self.nativeDeps."karma-firefox-launcher" or []) - ++ (self.nativeDeps."karma-phantomjs-launcher" or []) - ++ (self.nativeDeps."karma-script-launcher" or []); + (self.nativeDeps."karma-coverage" or []); deps = [ - self.by-version."di"."0.0.1" - self.by-version."socket.io"."0.9.16" - self.by-version."chokidar"."0.7.1" - self.by-version."glob"."3.1.21" - self.by-version."minimatch"."0.2.12" - self.by-version."http-proxy"."0.10.3" - self.by-version."optimist"."0.3.7" - self.by-version."coffee-script"."1.6.3" - self.by-version."rimraf"."2.1.4" - self.by-version."q"."0.9.7" - self.by-version."colors"."0.6.0-1" - self.by-version."lodash"."1.1.1" - self.by-version."mime"."1.2.11" - self.by-version."log4js"."0.6.9" - self.by-version."useragent"."2.0.7" - self.by-version."graceful-fs"."1.2.3" - self.by-version."connect"."2.8.8" - self.by-version."phantomjs"."1.9.2-4" + self.by-version."istanbul"."0.1.46" + self.by-version."ibrik"."1.0.1" + self.by-version."dateformat"."1.0.7-1.2.3" ]; peerDependencies = [ - self.by-version."requirejs"."2.1.9" + self.by-version."karma"."0.11.11" ]; - passthru.names = [ "karma-jasmine" "karma" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; + passthru.names = [ "karma-coverage" ]; }; + "karma-coverage" = self.by-version."karma-coverage"."0.1.4"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.1"; by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -6531,6 +7223,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.1.tgz"; + name = "karma-junit-reporter-0.2.1.tgz"; sha1 = "ae125962683a0d1286dc7768fbf66a8f02e448fc"; }) ]; @@ -6540,7 +7233,7 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.11.7" + self.by-version."karma"."0.11.11" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -6552,6 +7245,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.1.tgz"; + name = "karma-mocha-0.1.1.tgz"; sha1 = "5edddb3e2d2c6fd47e9ad26f0af1595fe852c756"; }) ]; @@ -6560,43 +7254,59 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.7" - self.by-version."mocha"."1.15.1" + self.by-version."karma"."0.11.11" + self.by-version."mocha"."1.16.2" ]; passthru.names = [ "karma-mocha" ]; }; "karma-mocha" = self.by-version."karma-mocha"."0.1.1"; - by-spec."karma-phantomjs-launcher"."*" = - self.by-version."karma-phantomjs-launcher"."0.1.1"; by-spec."karma-requirejs"."*" = - self.by-version."karma-requirejs"."0.2.0"; - "karma-requirejs" = self.by-version."karma-requirejs"."0.2.0"; + self.by-version."karma-requirejs"."0.2.1"; + by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "karma-requirejs-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz"; + name = "karma-requirejs-0.2.1.tgz"; + sha1 = "7f3ac5df67bccd9d832a928ec658d733ec983c5d"; + }) + ]; + buildInputs = + (self.nativeDeps."karma-requirejs" or []); + deps = [ + ]; + peerDependencies = [ + self.by-version."karma"."0.11.11" + self.by-version."requirejs"."2.1.9" + ]; + passthru.names = [ "karma-requirejs" ]; + }; + "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1"; by-spec."karma-sauce-launcher"."*" = - self.by-version."karma-sauce-launcher"."0.1.5"; - by-version."karma-sauce-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "karma-sauce-launcher-0.1.5"; + self.by-version."karma-sauce-launcher"."0.2.0"; + by-version."karma-sauce-launcher"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "karma-sauce-launcher-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.5.tgz"; - sha1 = "9e95e2b91556ff073105777c838e55d8b57db318"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.0.tgz"; + name = "karma-sauce-launcher-0.2.0.tgz"; + sha1 = "0994da49a1774be876ff1b107fd47e8768e3ead0"; }) ]; buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.1.5" - self.by-version."sauce-connect-launcher"."0.1.11" + self.by-version."wd"."0.2.8" + self.by-version."sauce-connect-launcher"."0.2.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" ]; peerDependencies = [ - self.by-version."karma"."0.11.7" + self.by-version."karma"."0.11.11" ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.5"; - by-spec."karma-script-launcher"."*" = - self.by-version."karma-script-launcher"."0.1.0"; + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.0"; by-spec."keen.io"."0.0.3" = self.by-version."keen.io"."0.0.3"; by-version."keen.io"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -6604,6 +7314,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.3.tgz"; + name = "keen.io-0.0.3.tgz"; sha1 = "2d6ae2baa6d24b618f378b2a44413e1283fbcb63"; }) ]; @@ -6624,6 +7335,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; + name = "keep-alive-agent-0.0.1.tgz"; sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; }) ]; @@ -6642,6 +7354,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz"; + name = "kerberos-0.0.3.tgz"; sha1 = "4285d92a0748db2784062f5adcec9f5956cb818a"; }) ]; @@ -6660,6 +7373,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; + name = "kew-0.1.7.tgz"; sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }) ]; @@ -6678,6 +7392,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + name = "keypress-0.1.0.tgz"; sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }) ]; @@ -6696,6 +7411,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz"; + name = "knox-0.8.8.tgz"; sha1 = "aeeadd22b0a4b1e4d858a15174af2da060ab6774"; }) ]; @@ -6719,6 +7435,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/kue/-/kue-0.6.2.tgz"; + name = "kue-0.6.2.tgz"; sha1 = "9a6a95081842cf4ee3da5c61770bc23616a943f2"; }) ]; @@ -6744,6 +7461,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; + name = "lazy-1.0.11.tgz"; sha1 = "daa068206282542c088288e975c297c1ae77b690"; }) ]; @@ -6762,6 +7480,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.4.tgz"; + name = "lcov-parse-0.0.4.tgz"; sha1 = "3853a4f132f04581db0e74c180542d90f0d1c66b"; }) ]; @@ -6780,6 +7499,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-0.0.2.tgz"; + name = "lcov-result-merger-0.0.2.tgz"; sha1 = "72a538c09f76e5c79b511bcd1053948d4aa98f10"; }) ]; @@ -6793,13 +7513,14 @@ passthru.names = [ "lcov-result-merger" ]; }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; - by-spec."less"."~1.5.0" = + by-spec."less"."~1.5.1" = self.by-version."less"."1.5.1"; by-version."less"."1.5.1" = lib.makeOverridable self.buildNodePackage { name = "less-1.5.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/less/-/less-1.5.1.tgz"; + name = "less-1.5.1.tgz"; sha1 = "633313130efd12a3b78c56aa799dab3eeffffff4"; }) ]; @@ -6807,9 +7528,9 @@ (self.nativeDeps."less" or []); deps = [ self.by-version."mime"."1.2.11" - self.by-version."request"."2.27.0" + self.by-version."request"."2.30.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."2.0.2" + self.by-version."clean-css"."2.0.4" self.by-version."source-map"."0.1.31" ]; peerDependencies = [ @@ -6823,6 +7544,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.8.1.tgz"; + name = "libxmljs-0.8.1.tgz"; sha1 = "b8b1d3962a92dbc5be9dc798bac028e09db8d630"; }) ]; @@ -6842,6 +7564,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.2.tgz"; + name = "libyaml-0.2.2.tgz"; sha1 = "a22d5f699911b6b622d6dc323fb62320c877c9c8"; }) ]; @@ -6861,6 +7584,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz"; + name = "lockfile-0.4.2.tgz"; sha1 = "ab91f5d3745bc005ae4fa34d078910d1f2b9612d"; }) ]; @@ -6879,6 +7603,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-0.10.0.tgz"; + name = "lodash-0.10.0.tgz"; sha1 = "5254bbc2c46c827f535a27d631fd4f2bff374ce7"; }) ]; @@ -6897,6 +7622,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"; + name = "lodash-0.9.2.tgz"; sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c"; }) ]; @@ -6915,6 +7641,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"; + name = "lodash-1.0.1.tgz"; sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc"; }) ]; @@ -6933,6 +7660,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.1.1.tgz"; + name = "lodash-1.1.1.tgz"; sha1 = "41a2b2e9a00e64d6d1999f143ff6b0755f6bbb24"; }) ]; @@ -6944,8 +7672,6 @@ ]; passthru.names = [ "lodash" ]; }; - by-spec."lodash"."~1.1.1" = - self.by-version."lodash"."1.1.1"; by-spec."lodash"."~1.2.1" = self.by-version."lodash"."1.2.1"; by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -6953,6 +7679,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.2.1.tgz"; + name = "lodash-1.2.1.tgz"; sha1 = "ed47b16e46f06b2b40309b68e9163c17e93ea304"; }) ]; @@ -6971,6 +7698,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; + name = "lodash-1.3.1.tgz"; sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770"; }) ]; @@ -6984,6 +7712,44 @@ }; by-spec."lodash"."~1.3.1" = self.by-version."lodash"."1.3.1"; + by-spec."lodash"."~2.1.0" = + self.by-version."lodash"."2.1.0"; + by-version."lodash"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "lodash-2.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"; + name = "lodash-2.1.0.tgz"; + sha1 = "0637eaaa36a8a1cfc865c3adfb942189bfb0998d"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash" ]; + }; + by-spec."lodash"."~2.2.1" = + self.by-version."lodash"."2.2.1"; + by-version."lodash"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "lodash-2.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz"; + name = "lodash-2.2.1.tgz"; + sha1 = "ca935fd14ab3c0c872abacf198b9cda501440867"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash" ]; + }; by-spec."lodash"."~2.3.0" = self.by-version."lodash"."2.3.0"; by-version."lodash"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -6991,6 +7757,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.3.0.tgz"; + name = "lodash-2.3.0.tgz"; sha1 = "dfbdac99cf87a59a022c474730570d8716c267dd"; }) ]; @@ -7002,6 +7769,25 @@ ]; passthru.names = [ "lodash" ]; }; + by-spec."lodash"."~2.4.1" = + self.by-version."lodash"."2.4.1"; + by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "lodash-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"; + name = "lodash-2.4.1.tgz"; + sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash" ]; + }; by-spec."log-driver"."1.2.1" = self.by-version."log-driver"."1.2.1"; by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -7009,6 +7795,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.1.tgz"; + name = "log-driver-1.2.1.tgz"; sha1 = "ada8202a133e99764306652e195e28268b0bea5b"; }) ]; @@ -7027,6 +7814,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/log4js/-/log4js-0.6.9.tgz"; + name = "log4js-0.6.9.tgz"; sha1 = "2e327189c1c0dec17448ec5255f58cd0fddf4596"; }) ]; @@ -7041,6 +7829,25 @@ ]; passthru.names = [ "log4js" ]; }; + by-spec."long"."*" = + self.by-version."long"."1.1.2"; + by-version."long"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "long-1.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz"; + name = "long-1.1.2.tgz"; + sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53"; + }) + ]; + buildInputs = + (self.nativeDeps."long" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "long" ]; + }; by-spec."lru-cache"."2" = self.by-version."lru-cache"."2.5.0"; by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { @@ -7048,6 +7855,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; + name = "lru-cache-2.5.0.tgz"; sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; }) ]; @@ -7066,6 +7874,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; + name = "lru-cache-2.2.0.tgz"; sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }) ]; @@ -7084,6 +7893,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; + name = "lru-cache-2.2.4.tgz"; sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; }) ]; @@ -7102,6 +7912,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz"; + name = "lru-cache-2.3.0.tgz"; sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a"; }) ]; @@ -7120,6 +7931,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz"; + name = "lru-cache-1.0.6.tgz"; sha1 = "aa50f97047422ac72543bda177a9c9d018d98452"; }) ]; @@ -7138,6 +7950,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + name = "lru-cache-2.3.1.tgz"; sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; }) ]; @@ -7149,8 +7962,8 @@ ]; passthru.names = [ "lru-cache" ]; }; - by-spec."lru-cache"."~2.3.1" = - self.by-version."lru-cache"."2.3.1"; + by-spec."lru-cache"."~2.5.0" = + self.by-version."lru-cache"."2.5.0"; by-spec."mailcomposer".">= 0.1.27" = self.by-version."mailcomposer"."0.2.6"; by-version."mailcomposer"."0.2.6" = lib.makeOverridable self.buildNodePackage { @@ -7158,6 +7971,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.6.tgz"; + name = "mailcomposer-0.2.6.tgz"; sha1 = "fa785ae7505daeb7a11f7cecf2b374d7801d1b87"; }) ]; @@ -7181,6 +7995,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/meat/-/meat-0.2.5.tgz"; + name = "meat-0.2.5.tgz"; sha1 = "8f277ec68f51794365e271166c7b7bba8d046869"; }) ]; @@ -7206,6 +8021,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz"; + name = "memoizee-0.2.6.tgz"; sha1 = "bb45a7ad02530082f1612671dab35219cd2e0741"; }) ]; @@ -7220,6 +8036,25 @@ ]; passthru.names = [ "memoizee" ]; }; + by-spec."merge-descriptors"."0.0.1" = + self.by-version."merge-descriptors"."0.0.1"; + by-version."merge-descriptors"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "merge-descriptors-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.1.tgz"; + name = "merge-descriptors-0.0.1.tgz"; + sha1 = "2ff0980c924cf81d0b5d1fb601177cb8bb56c0d0"; + }) + ]; + buildInputs = + (self.nativeDeps."merge-descriptors" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "merge-descriptors" ]; + }; by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -7227,6 +8062,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + name = "methods-0.0.1.tgz"; sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; }) ]; @@ -7245,6 +8081,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + name = "methods-0.1.0.tgz"; sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; }) ]; @@ -7263,6 +8100,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; }) ]; @@ -7281,6 +8119,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + name = "mime-1.2.4.tgz"; sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; }) ]; @@ -7299,6 +8138,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; + name = "mime-1.2.5.tgz"; sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13"; }) ]; @@ -7317,6 +8157,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; + name = "mime-1.2.6.tgz"; sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }) ]; @@ -7335,6 +8176,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + name = "mime-1.2.9.tgz"; sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; }) ]; @@ -7367,6 +8209,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; + name = "mimelib-0.2.14.tgz"; sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; }) ]; @@ -7381,13 +8224,14 @@ passthru.names = [ "mimelib" ]; }; by-spec."minimatch"."0" = - self.by-version."minimatch"."0.2.12"; - by-version."minimatch"."0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-0.2.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; }) ]; buildInputs = @@ -7407,6 +8251,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; + name = "minimatch-0.0.5.tgz"; sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de"; }) ]; @@ -7420,23 +8265,25 @@ passthru.names = [ "minimatch" ]; }; by-spec."minimatch"."0.2.x" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."0.x" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."0.x.x" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch".">=0.2.4" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.0" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.11" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.12" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; + by-spec."minimatch"."~0.2.14" = + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimist"."~0.0.1" = self.by-version."minimist"."0.0.5"; by-version."minimist"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -7444,6 +8291,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz"; + name = "minimist-0.0.5.tgz"; sha1 = "d7aa327bcecf518f9106ac6b8f003fa3bcea8566"; }) ]; @@ -7455,6 +8303,45 @@ ]; passthru.names = [ "minimist" ]; }; + by-spec."ministyle"."~0.1.3" = + self.by-version."ministyle"."0.1.3"; + by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "ministyle-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz"; + name = "ministyle-0.1.3.tgz"; + sha1 = "d7a639f29e9450b9d5ebf2255d1fa8d1d9d89900"; + }) + ]; + buildInputs = + (self.nativeDeps."ministyle" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ministyle" ]; + }; + by-spec."miniwrite"."~0.1.3" = + self.by-version."miniwrite"."0.1.3"; + by-version."miniwrite"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "miniwrite-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz"; + name = "miniwrite-0.1.3.tgz"; + sha1 = "9e893efb435f853454ca0321b86a44378e8c50c6"; + }) + ]; + buildInputs = + (self.nativeDeps."miniwrite" or []); + deps = [ + self.by-version."mkdirp"."0.3.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "miniwrite" ]; + }; by-spec."mkdirp"."*" = self.by-version."mkdirp"."0.3.5"; by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -7462,6 +8349,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }) ]; @@ -7485,6 +8373,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + name = "mkdirp-0.3.0.tgz"; sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; }) ]; @@ -7515,6 +8404,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; + name = "mkpath-0.1.0.tgz"; sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; }) ]; @@ -7527,13 +8417,14 @@ passthru.names = [ "mkpath" ]; }; by-spec."mocha"."*" = - self.by-version."mocha"."1.15.1"; - by-version."mocha"."1.15.1" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.15.1"; + self.by-version."mocha"."1.16.2"; + by-version."mocha"."1.16.2" = lib.makeOverridable self.buildNodePackage { + name = "mocha-1.16.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.15.1.tgz"; - sha1 = "308c3268e16b0b1690d88335355c9d18d4664fc4"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.16.2.tgz"; + name = "mocha-1.16.2.tgz"; + sha1 = "57766843f016a1308fe9fddb22f74676d6721ace"; }) ]; buildInputs = @@ -7551,28 +8442,31 @@ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.15.1"; + "mocha" = self.by-version."mocha"."1.16.2"; by-spec."mocha-unfunk-reporter"."*" = - self.by-version."mocha-unfunk-reporter"."0.3.7"; - by-version."mocha-unfunk-reporter"."0.3.7" = lib.makeOverridable self.buildNodePackage { - name = "mocha-unfunk-reporter-0.3.7"; + self.by-version."mocha-unfunk-reporter"."0.4.0"; + by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "mocha-unfunk-reporter-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.7.tgz"; - sha1 = "3d51ac1804dce71ecd471e4e7aa96ce2e9a6dfec"; + url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz"; + name = "mocha-unfunk-reporter-0.4.0.tgz"; + sha1 = "59eda97aec6ae6e26d7af4173490a65b7b082d20"; }) ]; buildInputs = (self.nativeDeps."mocha-unfunk-reporter" or []); deps = [ self.by-version."jsesc"."0.4.3" - self.by-version."diff"."1.0.7" + self.by-version."unfunk-diff"."0.0.1" + self.by-version."miniwrite"."0.1.3" + self.by-version."ministyle"."0.1.3" ]; peerDependencies = [ ]; passthru.names = [ "mocha-unfunk-reporter" ]; }; - "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.7"; + "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7580,6 +8474,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + name = "moment-2.1.0.tgz"; sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; }) ]; @@ -7598,6 +8493,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz"; + name = "moment-2.4.0.tgz"; sha1 = "06dd8dfbbfdb53a03510080ac788163c9490e75d"; }) ]; @@ -7610,13 +8506,14 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.3.20"; - by-version."mongodb"."1.3.20" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.20"; + self.by-version."mongodb"."1.4.0-rc3"; + by-version."mongodb"."1.4.0-rc3" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.4.0-rc3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.20.tgz"; - sha1 = "257f1570295fe020248ea8329b58d47ec9ceac62"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc3.tgz"; + name = "mongodb-1.4.0-rc3.tgz"; + sha1 = "e605a2c85a337f85d766e2ed221a4caa201c0b4f"; }) ]; buildInputs = @@ -7629,7 +8526,7 @@ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.3.20"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc3"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -7637,6 +8534,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; + name = "mongodb-1.2.14.tgz"; sha1 = "269665552066437308d0942036646e6795c3a9a3"; }) ]; @@ -7656,6 +8554,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; + name = "mongodb-1.3.19.tgz"; sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4"; }) ]; @@ -7670,15 +8569,35 @@ passthru.names = [ "mongodb" ]; }; by-spec."mongodb"."1.3.x" = - self.by-version."mongodb"."1.3.20"; + self.by-version."mongodb"."1.3.23"; + by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.3.23"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz"; + name = "mongodb-1.3.23.tgz"; + sha1 = "874a5212162b16188aeeaee5e06067766c8e9e86"; + }) + ]; + buildInputs = + (self.nativeDeps."mongodb" or []); + deps = [ + self.by-version."bson"."0.2.5" + self.by-version."kerberos"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "mongodb" ]; + }; by-spec."mongoose"."*" = - self.by-version."mongoose"."3.8.1"; - by-version."mongoose"."3.8.1" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.8.1"; + self.by-version."mongoose"."3.8.3"; + by-version."mongoose"."3.8.3" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-3.8.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.1.tgz"; - sha1 = "1efe17d259ae2905330a3b2d91ba4085a090f6b8"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.3.tgz"; + name = "mongoose-3.8.3.tgz"; + sha1 = "74425eb9ee9ca4a34c87b4624dc055131e0c7d0c"; }) ]; buildInputs = @@ -7705,6 +8624,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; + name = "mongoose-3.6.7.tgz"; sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc"; }) ]; @@ -7730,6 +8650,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz"; + name = "mongoose-3.6.20.tgz"; sha1 = "47263843e6b812ea207eec104c40a36c8d215f53"; }) ]; @@ -7757,6 +8678,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz"; + name = "mongoose-lifecycle-1.0.0.tgz"; sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }) ]; @@ -7775,6 +8697,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz"; + name = "mongoose-schema-extend-0.1.7.tgz"; sha1 = "50dc366ba63227d00c4cd3db9bb8bf95e9629910"; }) ]; @@ -7795,6 +8718,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz"; + name = "monocle-1.1.50.tgz"; sha1 = "e21b059d99726d958371f36240c106b8a067fa7d"; }) ]; @@ -7814,6 +8738,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mout/-/mout-0.6.0.tgz"; + name = "mout-0.6.0.tgz"; sha1 = "ce7abad8130d796b09d7fb509bcc73b09be024a6"; }) ]; @@ -7832,6 +8757,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mout/-/mout-0.7.1.tgz"; + name = "mout-0.7.1.tgz"; sha1 = "218de2b0880b220d99f4fbaee3fc0c3a5310bda8"; }) ]; @@ -7850,6 +8776,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; + name = "mpath-0.1.1.tgz"; sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; }) ]; @@ -7868,6 +8795,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; + name = "mpromise-0.2.1.tgz"; sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; }) ]; @@ -7887,6 +8815,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.3.0.tgz"; + name = "mpromise-0.3.0.tgz"; sha1 = "cb864c2f642eb2192765087e3692e1dc152afe4b"; }) ]; @@ -7906,6 +8835,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mquery/-/mquery-0.3.2.tgz"; + name = "mquery-0.3.2.tgz"; sha1 = "074cb82c51ec1b15897d8afb80a7b3567a2f8eca"; }) ]; @@ -7927,6 +8857,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; + name = "ms-0.1.0.tgz"; sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; }) ]; @@ -7945,6 +8876,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.1.tgz"; + name = "msgpack-0.2.1.tgz"; sha1 = "5da246daa2138b4163640e486c00c4f3961e92ac"; }) ]; @@ -7963,6 +8895,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; + name = "multiparty-2.2.0.tgz"; sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; }) ]; @@ -7983,6 +8916,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; + name = "muri-0.3.1.tgz"; sha1 = "861889c5c857f1a43700bee85d50731f61727c9a"; }) ]; @@ -8001,6 +8935,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz"; + name = "mute-stream-0.0.3.tgz"; sha1 = "f09c090d333b3063f615cbbcca71b349893f0152"; }) ]; @@ -8019,6 +8954,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; + name = "mute-stream-0.0.4.tgz"; sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; }) ]; @@ -8037,6 +8973,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz"; + name = "mv-0.0.5.tgz"; sha1 = "15eac759479884df1131d6de56bce20b654f5391"; }) ]; @@ -8055,6 +8992,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; + name = "nan-0.3.2.tgz"; sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }) ]; @@ -8073,6 +9011,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.4.4.tgz"; + name = "nan-0.4.4.tgz"; sha1 = "9db58eae63cee119807a0d01afd0655d956bea75"; }) ]; @@ -8084,6 +9023,25 @@ ]; passthru.names = [ "nan" ]; }; + by-spec."nan"."~0.6.0" = + self.by-version."nan"."0.6.0"; + by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "nan-0.6.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz"; + name = "nan-0.6.0.tgz"; + sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; by-spec."natural"."0.0.69" = self.by-version."natural"."0.0.69"; by-version."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage { @@ -8091,6 +9049,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/natural/-/natural-0.0.69.tgz"; + name = "natural-0.0.69.tgz"; sha1 = "60d9ce23797a54ec211600eb721cc66779b954d3"; }) ]; @@ -8112,6 +9071,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; + name = "nconf-0.6.9.tgz"; sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; }) ]; @@ -8127,30 +9087,10 @@ passthru.names = [ "nconf" ]; }; "nconf" = self.by-version."nconf"."0.6.9"; - by-spec."nconf"."0.6.7" = - self.by-version."nconf"."0.6.7"; - by-version."nconf"."0.6.7" = lib.makeOverridable self.buildNodePackage { - name = "nconf-0.6.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz"; - sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c"; - }) - ]; - buildInputs = - (self.nativeDeps."nconf" or []); - deps = [ - self.by-version."async"."0.1.22" - self.by-version."ini"."1.1.0" - self.by-version."optimist"."0.3.7" - self.by-version."pkginfo"."0.2.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "nconf" ]; - }; by-spec."nconf"."0.6.9" = self.by-version."nconf"."0.6.9"; + by-spec."nconf"."~0.6.9" = + self.by-version."nconf"."0.6.9"; by-spec."ncp"."0.2.x" = self.by-version."ncp"."0.2.7"; by-version."ncp"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -8158,6 +9098,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz"; + name = "ncp-0.2.7.tgz"; sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1"; }) ]; @@ -8176,6 +9117,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + name = "ncp-0.4.2.tgz"; sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }) ]; @@ -8198,6 +9140,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz"; + name = "negotiator-0.2.5.tgz"; sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec"; }) ]; @@ -8216,6 +9159,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; + name = "negotiator-0.3.0.tgz"; sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; }) ]; @@ -8234,6 +9178,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz"; + name = "net-ping-1.1.7.tgz"; sha1 = "49f5bca55a30a3726d69253557f231135a637075"; }) ]; @@ -8253,6 +9198,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/next-tick/-/next-tick-0.1.0.tgz"; + name = "next-tick-0.1.0.tgz"; sha1 = "1912cce8eb9b697d640fbba94f8f00dec3b94259"; }) ]; @@ -8271,6 +9217,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz"; + name = "nib-0.5.0.tgz"; sha1 = "ad0a7dfa2bca8680c8cb8adaa6ab68c80e5221e5"; }) ]; @@ -8289,13 +9236,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nijs/-/nijs-0.0.12.tgz"; + name = "nijs-0.0.12.tgz"; sha1 = "23bb40746b409e8556f9a4fe97ca314410a685df"; }) ]; buildInputs = (self.nativeDeps."nijs" or []); deps = [ - self.by-version."optparse"."1.0.4" + self.by-version."optparse"."1.0.5" ]; peerDependencies = [ ]; @@ -8303,32 +9251,35 @@ }; "nijs" = self.by-version."nijs"."0.0.12"; by-spec."node-expat"."*" = - self.by-version."node-expat"."2.0.0"; - by-version."node-expat"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-expat-2.0.0"; + self.by-version."node-expat"."2.1.4"; + by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-expat-2.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.0.0.tgz"; - sha1 = "a10271b3463484fa4b59895df61693a1de4ac735"; + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz"; + name = "node-expat-2.1.4.tgz"; + sha1 = "e55a82249b71afbce09ffa880705ec37553c5121"; }) ]; buildInputs = (self.nativeDeps."node-expat" or []); deps = [ + self.by-version."nan"."0.6.0" ]; peerDependencies = [ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.0.0"; + "node-expat" = self.by-version."node-expat"."2.1.4"; by-spec."node-gyp"."*" = - self.by-version."node-gyp"."0.12.1"; - by-version."node-gyp"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.12.1"; + self.by-version."node-gyp"."0.12.2"; + by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.12.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.1.tgz"; - sha1 = "6da8a1c248b9dc73d2e14e1cd216efef3bdd7911"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; + name = "node-gyp-0.12.2.tgz"; + sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; }) ]; buildInputs = @@ -8337,39 +9288,40 @@ self.by-version."glob"."3.2.7" self.by-version."graceful-fs"."2.0.1" self.by-version."fstream"."0.1.25" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."mkdirp"."0.3.5" self.by-version."nopt"."2.1.2" self.by-version."npmlog"."0.0.6" self.by-version."osenv"."0.0.3" - self.by-version."request"."2.27.0" - self.by-version."rimraf"."2.2.4" + self.by-version."request"."2.30.0" + self.by-version."rimraf"."2.2.5" self.by-version."semver"."2.2.1" - self.by-version."tar"."0.1.18" + self.by-version."tar"."0.1.19" self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.by-version."node-gyp"."0.12.1"; + "node-gyp" = self.by-version."node-gyp"."0.12.2"; by-spec."node-gyp"."~0.12.0" = - self.by-version."node-gyp"."0.12.1"; + self.by-version."node-gyp"."0.12.2"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.6.1"; - by-version."node-inspector"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.6.1"; + self.by-version."node-inspector"."0.7.0-1"; + by-version."node-inspector"."0.7.0-1" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.0-1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.1.tgz"; - sha1 = "9ed1b1dd4410fe4f2929b93c98c55378a3edd6f0"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-1.tgz"; + name = "node-inspector-0.7.0-1.tgz"; + sha1 = "13964415403ee7642fd7554f87c2c7a51af64090"; }) ]; buildInputs = (self.nativeDeps."node-inspector" or []); deps = [ self.by-version."socket.io"."0.9.16" - self.by-version."express"."3.4.6" + self.by-version."express"."3.4.7" self.by-version."async"."0.2.9" self.by-version."glob"."3.2.7" self.by-version."rc"."0.3.2" @@ -8380,7 +9332,27 @@ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.6.1"; + "node-inspector" = self.by-version."node-inspector"."0.7.0-1"; + by-spec."node-protobuf"."*" = + self.by-version."node-protobuf"."1.0.9"; + by-version."node-protobuf"."1.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-protobuf-1.0.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.9.tgz"; + name = "node-protobuf-1.0.9.tgz"; + sha1 = "6b2e7682bb65e01a10e19179f8e162ac9a66a6e6"; + }) + ]; + buildInputs = + (self.nativeDeps."node-protobuf" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-protobuf" ]; + }; + "node-protobuf" = self.by-version."node-protobuf"."1.0.9"; by-spec."node-swt".">=0.1.1" = self.by-version."node-swt"."0.1.1"; by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -8388,6 +9360,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; + name = "node-swt-0.1.1.tgz"; sha1 = "af0903825784be553b93dbae57d99d59060585dd"; }) ]; @@ -8399,14 +9372,15 @@ ]; passthru.names = [ "node-swt" ]; }; - by-spec."node-syslog"."1.1.3" = - self.by-version."node-syslog"."1.1.3"; - by-version."node-syslog"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-syslog-1.1.3"; + by-spec."node-syslog"."1.1.7" = + self.by-version."node-syslog"."1.1.7"; + by-version."node-syslog"."1.1.7" = lib.makeOverridable self.buildNodePackage { + name = "node-syslog-1.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.3.tgz"; - sha1 = "dce11e3091d39889a2af166501e67e0098a0bb64"; + url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz"; + name = "node-syslog-1.1.7.tgz"; + sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb"; }) ]; buildInputs = @@ -8424,6 +9398,7 @@ src = [ (fetchurl { url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7"; + name = "node-uptime-3.2.0.tgz"; sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746"; }) ]; @@ -8457,6 +9432,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; }) ]; @@ -8476,6 +9452,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; + name = "node-uuid-1.3.3.tgz"; sha1 = "d3db4d7b56810d9e4032342766282af07391729b"; }) ]; @@ -8494,6 +9471,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"; + name = "node-uuid-1.4.0.tgz"; sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65"; }) ]; @@ -8516,6 +9494,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; + name = "node-wsfederation-0.1.1.tgz"; sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; }) ]; @@ -8535,6 +9514,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; + name = "node.extend-1.0.0.tgz"; sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; }) ]; @@ -8553,6 +9533,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; + name = "nodemailer-0.3.35.tgz"; sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19"; }) ]; @@ -8568,13 +9549,14 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."0.9.10"; - by-version."nodemon"."0.9.10" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-0.9.10"; + self.by-version."nodemon"."0.9.17"; + by-version."nodemon"."0.9.17" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-0.9.17"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.10.tgz"; - sha1 = "4faca02a4df262cda9334ef24bfadca14c5c3112"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.17.tgz"; + name = "nodemon-0.9.17.tgz"; + sha1 = "31fbc65cbda162ebff4d9ff5f774fdd3006bb50b"; }) ]; buildInputs = @@ -8586,7 +9568,7 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."0.9.10"; + "nodemon" = self.by-version."nodemon"."0.9.17"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -8594,6 +9576,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; + name = "nomnom-1.6.2.tgz"; sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971"; }) ]; @@ -8614,6 +9597,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; + name = "nopt-2.1.2.tgz"; sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; }) ]; @@ -8633,6 +9617,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; + name = "nopt-2.0.0.tgz"; sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; }) ]; @@ -8647,14 +9632,15 @@ }; by-spec."nopt"."2.1.x" = self.by-version."nopt"."2.1.2"; - by-spec."nopt"."~1.0.10" = + by-spec."nopt"."https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress" = self.by-version."nopt"."1.0.10"; by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage { name = "nopt-1.0.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress"; + name = "nopt-1.0.10.tgz"; + sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad"; }) ]; buildInputs = @@ -8666,18 +9652,21 @@ ]; passthru.names = [ "nopt" ]; }; + by-spec."nopt"."~1.0.10" = + self.by-version."nopt"."1.0.10"; by-spec."nopt"."~2.1.1" = self.by-version."nopt"."2.1.2"; by-spec."nopt"."~2.1.2" = self.by-version."nopt"."2.1.2"; by-spec."normalize-package-data"."~0.2.7" = - self.by-version."normalize-package-data"."0.2.7"; - by-version."normalize-package-data"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "normalize-package-data-0.2.7"; + self.by-version."normalize-package-data"."0.2.8"; + by-version."normalize-package-data"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "normalize-package-data-0.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.7.tgz"; - sha1 = "0f075fa2d1f9ba23a854c4c56818c4077638f72a"; + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.8.tgz"; + name = "normalize-package-data-0.2.8.tgz"; + sha1 = "95dc1bcb54c8d46b3be345c05afbab27e48e2f69"; }) ]; buildInputs = @@ -8692,13 +9681,14 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.3.15"; - by-version."npm"."1.3.15" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.15"; + self.by-version."npm"."1.3.22"; + by-version."npm"."1.3.22" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.22"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.15.tgz"; - sha1 = "25987c35a87d01379ddacb9d5db58e3697369dc6"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.22.tgz"; + name = "npm-1.3.22.tgz"; + sha1 = "6ebc09f97f83ed3fd524b85faea5e30574e08c99"; }) ]; buildInputs = @@ -8709,34 +9699,34 @@ self.by-version."slide"."1.1.5" self.by-version."abbrev"."1.0.4" self.by-version."graceful-fs"."2.0.1" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."nopt"."2.1.2" - self.by-version."rimraf"."2.2.4" - self.by-version."request"."2.27.0" + self.by-version."rimraf"."2.2.5" + self.by-version."request"."2.30.0" self.by-version."which"."1.0.5" - self.by-version."tar"."0.1.18" + self.by-version."tar"."0.1.19" self.by-version."fstream"."0.1.25" self.by-version."block-stream"."0.0.7" self.by-version."mkdirp"."0.3.5" self.by-version."read"."1.0.5" - self.by-version."lru-cache"."2.3.1" - self.by-version."node-gyp"."0.12.1" + self.by-version."lru-cache"."2.5.0" + self.by-version."node-gyp"."0.12.2" self.by-version."fstream-npm"."0.1.6" self.by-version."uid-number"."0.0.3" self.by-version."archy"."0.0.2" self.by-version."chownr"."0.0.1" self.by-version."npmlog"."0.0.6" self.by-version."ansi"."0.2.1" - self.by-version."npm-registry-client"."0.2.30" + self.by-version."npm-registry-client"."0.3.3" self.by-version."read-package-json"."1.1.4" self.by-version."read-installed"."0.2.5" self.by-version."glob"."3.2.7" - self.by-version."init-package-json"."0.0.13" + self.by-version."init-package-json"."0.0.14" self.by-version."osenv"."0.0.3" self.by-version."lockfile"."0.4.2" self.by-version."retry"."0.6.0" self.by-version."once"."1.3.0" - self.by-version."npmconf"."0.1.6" + self.by-version."npmconf"."0.1.9" self.by-version."opener"."1.3.0" self.by-version."chmodr"."0.1.0" self.by-version."cmd-shim"."1.1.1" @@ -8746,14 +9736,18 @@ self.by-version."npm-user-validate"."0.0.3" self.by-version."github-url-from-git"."1.1.1" self.by-version."github-url-from-username-repo"."0.0.2" + self.by-version."text-table"."0.2.0" + self.by-version."ansicolors"."0.3.2" + self.by-version."ansistyles"."0.1.3" + self.by-version."path-is-inside"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.3.15"; + "npm" = self.by-version."npm"."1.3.22"; by-spec."npm"."~1.3.14" = - self.by-version."npm"."1.3.15"; + self.by-version."npm"."1.3.22"; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { @@ -8761,19 +9755,20 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; + name = "npm-registry-client-0.2.27.tgz"; sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.27.0" + self.by-version."request"."2.30.0" self.by-version."graceful-fs"."2.0.1" self.by-version."semver"."2.0.11" self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."retry"."0.6.0" self.by-version."couch-login"."0.1.19" self.by-version."npmlog"."0.0.6" @@ -8782,26 +9777,27 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.2.29" = - self.by-version."npm-registry-client"."0.2.30"; - by-version."npm-registry-client"."0.2.30" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.2.30"; + by-spec."npm-registry-client"."~0.3.2" = + self.by-version."npm-registry-client"."0.3.3"; + by-version."npm-registry-client"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.30.tgz"; - sha1 = "f01cae5c51aa0a1c5dc2516cbad3ebde068d3eaa"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.3.tgz"; + name = "npm-registry-client-0.3.3.tgz"; + sha1 = "da08bb681fb24aa5c988ca71f8c10f27f09daf4a"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.27.0" + self.by-version."request"."2.30.0" self.by-version."graceful-fs"."2.0.1" self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."retry"."0.6.0" self.by-version."couch-login"."0.1.19" self.by-version."npmlog"."0.0.6" @@ -8817,6 +9813,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"; + name = "npm-user-validate-0.0.3.tgz"; sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e"; }) ]; @@ -8829,13 +9826,14 @@ passthru.names = [ "npm-user-validate" ]; }; by-spec."npm2nix"."*" = - self.by-version."npm2nix"."5.4.0"; - by-version."npm2nix"."5.4.0" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.4.0"; + self.by-version."npm2nix"."5.4.2"; + by-version."npm2nix"."5.4.2" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.0.tgz"; - sha1 = "6185ed1261856a09f2a935eec733ccf1c1843726"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.2.tgz"; + name = "npm2nix-5.4.2.tgz"; + sha1 = "03184775d310c75117c82303eecb50f6b26f93d0"; }) ]; buildInputs = @@ -8854,7 +9852,7 @@ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.by-version."npm2nix"."5.4.0"; + "npm2nix" = self.by-version."npm2nix"."5.4.2"; by-spec."npmconf"."0.0.24" = self.by-version."npmconf"."0.0.24"; by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { @@ -8862,6 +9860,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz"; + name = "npmconf-0.0.24.tgz"; sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; }) ]; @@ -8888,6 +9887,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; + name = "npmconf-0.1.1.tgz"; sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1"; }) ]; @@ -8908,13 +9908,14 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.6"; - by-version."npmconf"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.6"; + self.by-version."npmconf"."0.1.9"; + by-version."npmconf"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-0.1.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.6.tgz"; - sha1 = "e23b5c028758877d31ef6daf8a566059442459b6"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.9.tgz"; + name = "npmconf-0.1.9.tgz"; + sha1 = "a6b256fdd23e347ef2465a2e6d57a9be4deb898f"; }) ]; buildInputs = @@ -8933,8 +9934,8 @@ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."~0.1.6" = - self.by-version."npmconf"."0.1.6"; + by-spec."npmconf"."~0.1.7" = + self.by-version."npmconf"."0.1.9"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -8942,6 +9943,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz"; + name = "npmlog-0.0.6.tgz"; sha1 = "685043fe71aa1665d6e3b2acef180640caf40873"; }) ]; @@ -8965,6 +9967,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz"; + name = "nssocket-0.5.1.tgz"; sha1 = "11f0428335ad8d89ff9cf96ab2852a23b1b33b71"; }) ]; @@ -8985,6 +9988,7 @@ src = [ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; + name = "oauth-0.9.10.tgz"; sha256 = "c0c59efccbd34819ed51e912bc74b872e812a0157784dc8604434378a14cf64a"; }) ]; @@ -9003,6 +10007,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; + name = "oauth-sign-0.2.0.tgz"; sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; }) ]; @@ -9021,6 +10026,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }) ]; @@ -9039,6 +10045,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz"; + name = "object-additions-0.5.1.tgz"; sha1 = "ac624e0995e696c94cc69b41f316462b16a3bda4"; }) ]; @@ -9050,6 +10057,28 @@ ]; passthru.names = [ "object-additions" ]; }; + by-spec."object-keys"."~0.2.0" = + self.by-version."object-keys"."0.2.0"; + by-version."object-keys"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "object-keys-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz"; + name = "object-keys-0.2.0.tgz"; + sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67"; + }) + ]; + buildInputs = + (self.nativeDeps."object-keys" or []); + deps = [ + self.by-version."foreach"."2.0.4" + self.by-version."indexof"."0.0.1" + self.by-version."is"."0.2.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "object-keys" ]; + }; by-spec."once"."1.1.1" = self.by-version."once"."1.1.1"; by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -9057,6 +10086,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; + name = "once-1.1.1.tgz"; sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; }) ]; @@ -9077,6 +10107,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz"; + name = "once-1.3.0.tgz"; sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; }) ]; @@ -9095,6 +10126,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz"; + name = "open-0.0.2.tgz"; sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc"; }) ]; @@ -9113,6 +10145,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz"; + name = "open-0.0.4.tgz"; sha1 = "5de46a0858b9f49f9f211aa8f26628550657f262"; }) ]; @@ -9133,6 +10166,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz"; + name = "opener-1.3.0.tgz"; sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2"; }) ]; @@ -9151,6 +10185,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/openid/-/openid-0.5.5.tgz"; + name = "openid-0.5.5.tgz"; sha1 = "a4ce534ca82d68f81ccf45109fc92b4547b2cdd1"; }) ]; @@ -9169,6 +10204,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + name = "optimist-0.6.0.tgz"; sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; }) ]; @@ -9190,6 +10226,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; + name = "optimist-0.2.8.tgz"; sha1 = "e981ab7e268b457948593b55674c099a815cac31"; }) ]; @@ -9202,25 +10239,6 @@ ]; passthru.names = [ "optimist" ]; }; - by-spec."optimist"."0.3.5" = - self.by-version."optimist"."0.3.5"; - by-version."optimist"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.3.5.tgz"; - sha1 = "03654b52417030312d109f39b159825b60309304"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = [ - self.by-version."wordwrap"."0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; by-spec."optimist"."0.3.x" = self.by-version."optimist"."0.3.7"; by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -9228,6 +10246,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + name = "optimist-0.3.7.tgz"; sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }) ]; @@ -9240,25 +10259,6 @@ ]; passthru.names = [ "optimist" ]; }; - by-spec."optimist"."0.4.0" = - self.by-version."optimist"."0.4.0"; - by-version."optimist"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.4.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.4.0.tgz"; - sha1 = "cb8ec37f2fe3aa9864cb67a275250e7e19620a25"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = [ - self.by-version."wordwrap"."0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; by-spec."optimist"."0.6.0" = self.by-version."optimist"."0.6.0"; by-spec."optimist"."~0.3" = @@ -9276,6 +10276,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; + name = "options-0.0.5.tgz"; sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; }) ]; @@ -9287,14 +10288,34 @@ ]; passthru.names = [ "options" ]; }; + by-spec."optjs"."*" = + self.by-version."optjs"."3.2.1-boom"; + by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage { + name = "optjs-3.2.1-boom"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz"; + name = "optjs-3.2.1-boom.tgz"; + sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758"; + }) + ]; + buildInputs = + (self.nativeDeps."optjs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "optjs" ]; + }; by-spec."optparse"."*" = - self.by-version."optparse"."1.0.4"; - by-version."optparse"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "optparse-1.0.4"; + self.by-version."optparse"."1.0.5"; + by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "optparse-1.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz"; - sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1"; + url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + name = "optparse-1.0.5.tgz"; + sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }) ]; buildInputs = @@ -9305,9 +10326,9 @@ ]; passthru.names = [ "optparse" ]; }; - "optparse" = self.by-version."optparse"."1.0.4"; + "optparse" = self.by-version."optparse"."1.0.5"; by-spec."optparse".">= 1.0.3" = - self.by-version."optparse"."1.0.4"; + self.by-version."optparse"."1.0.5"; by-spec."osenv"."0" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -9315,6 +10336,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + name = "osenv-0.0.3.tgz"; sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }) ]; @@ -9335,6 +10357,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz"; + name = "owl-deepcopy-0.0.2.tgz"; sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88"; }) ]; @@ -9356,6 +10379,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.0.1.tgz"; + name = "p-throttler-0.0.1.tgz"; sha1 = "c341e3589ec843852a035e6f88e6c1e96150029b"; }) ]; @@ -9375,6 +10399,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; + name = "passport-0.1.17.tgz"; sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; }) ]; @@ -9402,6 +10427,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz"; + name = "passport-http-0.2.2.tgz"; sha1 = "2501314c0ff4a831e8a51ccfdb1b68f5c7cbc9f6"; }) ]; @@ -9423,6 +10449,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz"; + name = "passport-local-0.1.6.tgz"; sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db"; }) ]; @@ -9439,6 +10466,25 @@ "passport-local" = self.by-version."passport-local"."0.1.6"; by-spec."passport-local"."0.1.6" = self.by-version."passport-local"."0.1.6"; + by-spec."path-is-inside"."~1.0.0" = + self.by-version."path-is-inside"."1.0.0"; + by-version."path-is-inside"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "path-is-inside-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.0.tgz"; + name = "path-is-inside-1.0.0.tgz"; + sha1 = "8ec1c42a4c1a039e3e75f6e9e6029bd0c699016e"; + }) + ]; + buildInputs = + (self.nativeDeps."path-is-inside" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "path-is-inside" ]; + }; by-spec."pause"."0.0.1" = self.by-version."pause"."0.0.1"; by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -9446,6 +10492,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + name = "pause-0.0.1.tgz"; sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; }) ]; @@ -9457,14 +10504,15 @@ ]; passthru.names = [ "pause" ]; }; - by-spec."phantomjs"."~1.9" = - self.by-version."phantomjs"."1.9.2-4"; - by-version."phantomjs"."1.9.2-4" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.2-4"; + by-spec."phantomjs"."~1.9.1-2" = + self.by-version."phantomjs"."1.9.2-6"; + by-version."phantomjs"."1.9.2-6" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.2-6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-4.tgz"; - sha1 = "fbf6c8df9dc963f9a4020764495152e0099d6d42"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-6.tgz"; + name = "phantomjs-1.9.2-6.tgz"; + sha1 = "71db87e5275489570560a744dbaa649c2f9da0a0"; }) ]; buildInputs = @@ -9475,15 +10523,13 @@ self.by-version."ncp"."0.4.2" self.by-version."npmconf"."0.0.24" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "phantomjs" ]; }; - by-spec."phantomjs"."~1.9.1-2" = - self.by-version."phantomjs"."1.9.2-4"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -9491,6 +10537,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; + name = "pkginfo-0.2.3.tgz"; sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; }) ]; @@ -9509,6 +10556,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + name = "pkginfo-0.3.0.tgz"; sha1 = "726411401039fe9b009eea86614295d5f3a54276"; }) ]; @@ -9531,6 +10579,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.2.tgz"; + name = "plist-native-0.2.2.tgz"; sha1 = "6abde856b07a52f0d6bc027f7750f4d97ff93858"; }) ]; @@ -9551,6 +10600,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; + name = "policyfile-0.0.4.tgz"; sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; }) ]; @@ -9569,6 +10619,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/posix/-/posix-1.0.3.tgz"; + name = "posix-1.0.3.tgz"; sha1 = "f0efae90d59c56c4509c8f0ed222b421caa8188a"; }) ]; @@ -9588,6 +10639,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz"; + name = "posix-getopt-1.0.0.tgz"; sha1 = "42a90eca6119014c78bc4b9b70463d294db1aa87"; }) ]; @@ -9606,6 +10658,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; + name = "promise-2.0.0.tgz"; sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; }) ]; @@ -9625,6 +10678,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz"; + name = "prompt-0.2.11.tgz"; sha1 = "26d455af4b7fac15291dfcdddf2400328c1fa446"; }) ]; @@ -9633,7 +10687,7 @@ deps = [ self.by-version."pkginfo"."0.3.0" self.by-version."read"."1.0.5" - self.by-version."revalidator"."0.1.5" + self.by-version."revalidator"."0.1.6" self.by-version."utile"."0.2.1" self.by-version."winston"."0.6.2" ]; @@ -9641,29 +10695,6 @@ ]; passthru.names = [ "prompt" ]; }; - by-spec."prompt"."0.2.9" = - self.by-version."prompt"."0.2.9"; - by-version."prompt"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "prompt-0.2.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/prompt/-/prompt-0.2.9.tgz"; - sha1 = "fdd01e3f9654d0c44fbb8671f8d3f6ca009e3c16"; - }) - ]; - buildInputs = - (self.nativeDeps."prompt" or []); - deps = [ - self.by-version."pkginfo"."0.3.0" - self.by-version."read"."1.0.5" - self.by-version."revalidator"."0.1.5" - self.by-version."utile"."0.1.7" - self.by-version."winston"."0.6.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "prompt" ]; - }; by-spec."promptly"."~0.2.0" = self.by-version."promptly"."0.2.0"; by-version."promptly"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -9671,6 +10702,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz"; + name = "promptly-0.2.0.tgz"; sha1 = "73ef200fa8329d5d3a8df41798950b8646ca46d9"; }) ]; @@ -9690,6 +10722,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/promzard/-/promzard-0.2.0.tgz"; + name = "promzard-0.2.0.tgz"; sha1 = "766f33807faadeeecacf8057024fe5f753cfa3c1"; }) ]; @@ -9709,6 +10742,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz"; + name = "proto-list-1.2.2.tgz"; sha1 = "48b88798261ec2c4a785720cdfec6200d57d3326"; }) ]; @@ -9720,6 +10754,27 @@ ]; passthru.names = [ "proto-list" ]; }; + by-spec."protobufjs".">= 1.1.4" = + self.by-version."protobufjs"."2.0.1"; + by-version."protobufjs"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "protobufjs-2.0.1"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.1.tgz"; + name = "protobufjs-2.0.1.tgz"; + sha1 = "636e8c4a9e0488fbc9c8898c044d844884f8fd96"; + }) + ]; + buildInputs = + (self.nativeDeps."protobufjs" or []); + deps = [ + self.by-version."bytebuffer"."2.1.0" + self.by-version."ascli"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "protobufjs" ]; + }; by-spec."ps-tree"."0.0.x" = self.by-version."ps-tree"."0.0.3"; by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -9727,6 +10782,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; + name = "ps-tree-0.0.3.tgz"; sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; }) ]; @@ -9739,13 +10795,14 @@ ]; passthru.names = [ "ps-tree" ]; }; - by-spec."punycode"."~1.2.3" = + by-spec."punycode".">=0.2.0" = self.by-version."punycode"."1.2.3"; by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage { name = "punycode-1.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz"; + name = "punycode-1.2.3.tgz"; sha1 = "b4e304471082d783c73b3bafabf2fd9b6a486266"; }) ]; @@ -9757,13 +10814,16 @@ ]; passthru.names = [ "punycode" ]; }; - by-spec."q"."0.9.x" = + by-spec."punycode"."~1.2.3" = + self.by-version."punycode"."1.2.3"; + by-spec."q".">= 0.0.1" = self.by-version."q"."0.9.7"; by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage { name = "q-0.9.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + name = "q-0.9.7.tgz"; sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; @@ -9775,14 +10835,14 @@ ]; passthru.names = [ "q" ]; }; - by-spec."q".">= 0.0.1" = - self.by-version."q"."0.9.7"; by-spec."q"."~0.9" = self.by-version."q"."0.9.7"; by-spec."q"."~0.9.2" = self.by-version."q"."0.9.7"; by-spec."q"."~0.9.6" = self.by-version."q"."0.9.7"; + by-spec."q"."~0.9.7" = + self.by-version."q"."0.9.7"; by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -9790,6 +10850,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + name = "qs-0.4.2.tgz"; sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; }) ]; @@ -9810,6 +10871,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; + name = "qs-0.5.1.tgz"; sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; }) ]; @@ -9828,6 +10890,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.2.tgz"; + name = "qs-0.5.2.tgz"; sha1 = "e5734acb7009fb918e800fd5c60c2f5b94a7ff43"; }) ]; @@ -9846,6 +10909,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz"; + name = "qs-0.5.5.tgz"; sha1 = "b07f0d7ffe3efc6fc2fcde6c66a20775641423f3"; }) ]; @@ -9864,6 +10928,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + name = "qs-0.6.5.tgz"; sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; }) ]; @@ -9875,13 +10940,14 @@ ]; passthru.names = [ "qs" ]; }; - by-spec."qs".">= 0.4.0" = + by-spec."qs"."0.6.6" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { name = "qs-0.6.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; }) ]; @@ -9893,6 +10959,8 @@ ]; passthru.names = [ "qs" ]; }; + by-spec."qs".">= 0.4.0" = + self.by-version."qs"."0.6.6"; by-spec."qs"."~0.5.0" = self.by-version."qs"."0.5.6"; by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage { @@ -9900,6 +10968,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + name = "qs-0.5.6.tgz"; sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }) ]; @@ -9916,13 +10985,14 @@ by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; by-spec."rai"."~0.1" = - self.by-version."rai"."0.1.8"; - by-version."rai"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "rai-0.1.8"; + self.by-version."rai"."0.1.9"; + by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "rai-0.1.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rai/-/rai-0.1.8.tgz"; - sha1 = "f4ac41063cfe544a1eb3735441f096908219654b"; + url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz"; + name = "rai-0.1.9.tgz"; + sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc"; }) ]; buildInputs = @@ -9940,6 +11010,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; + name = "range-parser-0.0.4.tgz"; sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; }) ]; @@ -9958,6 +11029,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raven/-/raven-0.6.0.tgz"; + name = "raven-0.6.0.tgz"; sha1 = "440aa58143e95760cb7b73b7b23b3429ca9b5576"; }) ]; @@ -9978,6 +11050,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; + name = "raw-body-0.0.3.tgz"; sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; }) ]; @@ -9996,6 +11069,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz"; + name = "raw-body-1.1.2.tgz"; sha1 = "c74b3004dea5defd1696171106ac740ec31d62be"; }) ]; @@ -10015,6 +11089,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz"; + name = "raw-socket-1.2.2.tgz"; sha1 = "c9be873878a1ef70497a27e40b6e55b563d8f886"; }) ]; @@ -10033,6 +11108,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raw-stacktrace/-/raw-stacktrace-1.0.0.tgz"; + name = "raw-stacktrace-1.0.0.tgz"; sha1 = "f308881f17667785a9acd7c8fbd442e1b2acf1db"; }) ]; @@ -10053,6 +11129,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rbytes/-/rbytes-1.0.0.tgz"; + name = "rbytes-1.0.0.tgz"; sha1 = "4eeb85c457f710d8147329d5eed5cd02c798fa4d"; }) ]; @@ -10072,6 +11149,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rc/-/rc-0.3.2.tgz"; + name = "rc-0.3.2.tgz"; sha1 = "cd8f895690f764621ccec110516b225286e8f69f"; }) ]; @@ -10095,6 +11173,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; + name = "read-1.0.5.tgz"; sha1 = "007a3d169478aa710a491727e453effb92e76203"; }) ]; @@ -10120,6 +11199,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz"; + name = "read-installed-0.2.2.tgz"; sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab"; }) ]; @@ -10142,6 +11222,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz"; + name = "read-installed-0.2.5.tgz"; sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86"; }) ]; @@ -10164,6 +11245,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.4.tgz"; + name = "read-package-json-1.1.4.tgz"; sha1 = "c4effa9fac527deaee1cd84659c419693aa5294a"; }) ]; @@ -10172,7 +11254,7 @@ deps = [ self.by-version."glob"."3.2.7" self.by-version."lru-cache"."2.5.0" - self.by-version."normalize-package-data"."0.2.7" + self.by-version."normalize-package-data"."0.2.8" self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ @@ -10188,6 +11270,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.17.tgz"; + name = "readable-stream-1.0.17.tgz"; sha1 = "cbc295fdf394dfa1225d225d02e6b6d0f409fd4b"; }) ]; @@ -10208,6 +11291,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.9.tgz"; + name = "readable-stream-1.1.9.tgz"; sha1 = "d87130fbf8f9ee9c3b4058b3c58a3e30db2fcfdd"; }) ]; @@ -10230,13 +11314,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz"; + name = "readdirp-0.2.5.tgz"; sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb"; }) ]; buildInputs = (self.nativeDeps."readdirp" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" ]; peerDependencies = [ ]; @@ -10249,6 +11334,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz"; + name = "redeyed-0.4.2.tgz"; sha1 = "f0133b990cb972bdbcf2d2dce0aec36595f419bc"; }) ]; @@ -10262,13 +11348,14 @@ passthru.names = [ "redeyed" ]; }; by-spec."redis"."*" = - self.by-version."redis"."0.9.1"; - by-version."redis"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.9.1"; + self.by-version."redis"."0.10.0"; + by-version."redis"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "redis-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.9.1.tgz"; - sha1 = "eb7ad2355a2ea52c4c0bae043103fee96400439b"; + url = "http://registry.npmjs.org/redis/-/redis-0.10.0.tgz"; + name = "redis-0.10.0.tgz"; + sha1 = "76864475f71a745cbc3bbb27d794a6d01a96505c"; }) ]; buildInputs = @@ -10279,7 +11366,7 @@ ]; passthru.names = [ "redis" ]; }; - "redis" = self.by-version."redis"."0.9.1"; + "redis" = self.by-version."redis"."0.10.0"; by-spec."redis"."0.7.2" = self.by-version."redis"."0.7.2"; by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -10287,13 +11374,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz"; + name = "redis-0.7.2.tgz"; sha1 = "fa557fef4985ab3e3384fdc5be6e2541a0bb49af"; }) ]; buildInputs = (self.nativeDeps."redis" or []); deps = [ - self.by-version."hiredis"."0.1.15" + self.by-version."hiredis"."0.1.16" ]; peerDependencies = [ ]; @@ -10306,6 +11394,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; + name = "redis-0.7.3.tgz"; sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; }) ]; @@ -10324,6 +11413,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz"; + name = "redis-0.8.6.tgz"; sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8"; }) ]; @@ -10336,7 +11426,7 @@ passthru.names = [ "redis" ]; }; by-spec."redis".">= 0.6.6" = - self.by-version."redis"."0.9.1"; + self.by-version."redis"."0.10.0"; by-spec."reds"."0.1.4" = self.by-version."reds"."0.1.4"; by-version."reds"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -10344,6 +11434,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/reds/-/reds-0.1.4.tgz"; + name = "reds-0.1.4.tgz"; sha1 = "a97819180c30f6ecd01cad03cecb574eaabb4bee"; }) ]; @@ -10351,7 +11442,7 @@ (self.nativeDeps."reds" or []); deps = [ self.by-version."natural"."0.0.69" - self.by-version."redis"."0.9.1" + self.by-version."redis"."0.10.0" ]; peerDependencies = [ ]; @@ -10364,6 +11455,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + name = "reduce-component-1.0.1.tgz"; sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }) ]; @@ -10382,6 +11474,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz"; + name = "regexp-clone-0.0.1.tgz"; sha1 = "a7c2e09891fdbf38fbb10d376fb73003e68ac589"; }) ]; @@ -10400,6 +11493,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/replace/-/replace-0.2.7.tgz"; + name = "replace-0.2.7.tgz"; sha1 = "e22d08a9e2e6764337bb530166a4dd89c2558fda"; }) ]; @@ -10408,20 +11502,21 @@ deps = [ self.by-version."nomnom"."1.6.2" self.by-version."colors"."0.5.1" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" ]; peerDependencies = [ ]; passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.27.0"; - by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.27.0"; + self.by-version."request"."2.30.0"; + by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.30.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; - sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; + url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; + name = "request-2.30.0.tgz"; + sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; }) ]; buildInputs = @@ -10430,24 +11525,24 @@ self.by-version."qs"."0.6.6" self.by-version."json-stringify-safe"."5.0.0" self.by-version."forever-agent"."0.5.0" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign"."0.3.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."cookie-jar"."0.3.0" self.by-version."node-uuid"."1.4.1" self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.9.15" self.by-version."form-data"."0.1.2" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" ]; peerDependencies = [ ]; passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.27.0"; + self.by-version."request"."2.30.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.27.0"; + self.by-version."request"."2.30.0"; by-spec."request"."2.16.2" = self.by-version."request"."2.16.2"; by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { @@ -10455,6 +11550,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.16.2.tgz"; + name = "request-2.16.2.tgz"; sha1 = "83a028be61be4a05163e7e2e7a4b40e35df1bcb9"; }) ]; @@ -10484,6 +11580,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; + name = "request-2.16.6.tgz"; sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; }) ]; @@ -10513,6 +11610,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; + name = "request-2.9.203.tgz"; sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }) ]; @@ -10525,11 +11623,9 @@ passthru.names = [ "request" ]; }; by-spec."request".">=2.12.0" = - self.by-version."request"."2.27.0"; + self.by-version."request"."2.30.0"; by-spec."request"."~2" = - self.by-version."request"."2.27.0"; - by-spec."request"."~2.16.6" = - self.by-version."request"."2.16.6"; + self.by-version."request"."2.30.0"; by-spec."request"."~2.21.0" = self.by-version."request"."2.21.0"; by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage { @@ -10537,6 +11633,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.21.0.tgz"; + name = "request-2.21.0.tgz"; sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7"; }) ]; @@ -10567,6 +11664,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; + name = "request-2.25.0.tgz"; sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; }) ]; @@ -10592,6 +11690,68 @@ }; by-spec."request"."~2.27.0" = self.by-version."request"."2.27.0"; + by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.27.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; + name = "request-2.27.0.tgz"; + sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.0" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign"."0.3.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."cookie-jar"."0.3.0" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."form-data"."0.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + by-spec."request"."~2.29.0" = + self.by-version."request"."2.29.0"; + by-version."request"."2.29.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.29.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz"; + name = "request-2.29.0.tgz"; + sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.0" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.9.15" + self.by-version."form-data"."0.1.2" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + by-spec."request"."~2.30.0" = + self.by-version."request"."2.30.0"; by-spec."request-progress"."~0.3.0" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -10599,6 +11759,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; + name = "request-progress-0.3.1.tgz"; sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; }) ]; @@ -10618,6 +11779,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz"; + name = "request-replay-0.2.0.tgz"; sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60"; }) ]; @@ -10637,6 +11799,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.9.tgz"; + name = "requirejs-2.1.9.tgz"; sha1 = "624e10d22863e8db9aebfb8f21809ca59da42344"; }) ]; @@ -10657,6 +11820,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.5.1.tgz"; + name = "resolve-0.5.1.tgz"; sha1 = "15e4a222c4236bcd4cf85454412c2d0fb6524576"; }) ]; @@ -10675,6 +11839,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz"; + name = "resolve-0.3.1.tgz"; sha1 = "34c63447c664c70598d1c9b126fc43b2a24310a4"; }) ]; @@ -10693,6 +11858,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz"; + name = "restify-2.4.1.tgz"; sha1 = "35790a052bd0927e7f6a06cc3d079e56fabc9371"; }) ]; @@ -10721,6 +11887,27 @@ ]; passthru.names = [ "restify" ]; }; + by-spec."rethinkdb"."*" = + self.by-version."rethinkdb"."1.11.0-1"; + by-version."rethinkdb"."1.11.0-1" = lib.makeOverridable self.buildNodePackage { + name = "rethinkdb-1.11.0-1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-1.tgz"; + name = "rethinkdb-1.11.0-1.tgz"; + sha1 = "beab3376b9efa9ecf7f2fbf39c58ce80c8bd5dfd"; + }) + ]; + buildInputs = + (self.nativeDeps."rethinkdb" or []); + deps = [ + self.by-version."protobufjs"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "rethinkdb" ]; + }; + "rethinkdb" = self.by-version."rethinkdb"."1.11.0-1"; by-spec."retry"."0.6.0" = self.by-version."retry"."0.6.0"; by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -10728,6 +11915,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + name = "retry-0.6.0.tgz"; sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; }) ]; @@ -10742,13 +11930,14 @@ by-spec."retry"."~0.6.0" = self.by-version."retry"."0.6.0"; by-spec."revalidator"."0.1.x" = - self.by-version."revalidator"."0.1.5"; - by-version."revalidator"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "revalidator-0.1.5"; + self.by-version."revalidator"."0.1.6"; + by-version."revalidator"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "revalidator-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.5.tgz"; - sha1 = "205bc02e4186e63e82a0837498f29ba287be3861"; + url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.6.tgz"; + name = "revalidator-0.1.6.tgz"; + sha1 = "0af2bab68d7d0e766fc4249660ebc2be28b594ba"; }) ]; buildInputs = @@ -10766,6 +11955,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz"; + name = "rimraf-1.0.9.tgz"; sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1"; }) ]; @@ -10778,28 +11968,28 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.4"; - by-version."rimraf"."2.2.4" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.4"; + self.by-version."rimraf"."2.2.5"; + by-version."rimraf"."2.2.5" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.4.tgz"; - sha1 = "9f0b530f829f7b655a6e4d2fd8cf4c042336ef58"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.5.tgz"; + name = "rimraf-2.2.5.tgz"; + sha1 = "4e5c4f667b121afa806d0c5b58920996f9478aa0"; }) ]; buildInputs = (self.nativeDeps."rimraf" or []); deps = [ - self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2.x.x" = - self.by-version."rimraf"."2.2.4"; + self.by-version."rimraf"."2.2.5"; by-spec."rimraf"."~2" = - self.by-version."rimraf"."2.2.4"; + self.by-version."rimraf"."2.2.5"; by-spec."rimraf"."~2.0.2" = self.by-version."rimraf"."2.0.3"; by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10807,6 +11997,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.0.3.tgz"; + name = "rimraf-2.0.3.tgz"; sha1 = "f50a2965e7144e9afd998982f15df706730f56a9"; }) ]; @@ -10828,6 +12019,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + name = "rimraf-2.1.4.tgz"; sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; }) ]; @@ -10843,9 +12035,11 @@ by-spec."rimraf"."~2.1.4" = self.by-version."rimraf"."2.1.4"; by-spec."rimraf"."~2.2.0" = - self.by-version."rimraf"."2.2.4"; + self.by-version."rimraf"."2.2.5"; by-spec."rimraf"."~2.2.2" = - self.by-version."rimraf"."2.2.4"; + self.by-version."rimraf"."2.2.5"; + by-spec."rimraf"."~2.2.5" = + self.by-version."rimraf"."2.2.5"; by-spec."s3http"."*" = self.by-version."s3http"."0.0.3"; by-version."s3http"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10853,13 +12047,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/s3http/-/s3http-0.0.3.tgz"; + name = "s3http-0.0.3.tgz"; sha1 = "4d8965ae1c62c7fc2bbdc3fb6b95067429aac87a"; }) ]; buildInputs = (self.nativeDeps."s3http" or []); deps = [ - self.by-version."aws-sdk"."1.13.0" + self.by-version."aws-sdk"."1.16.0" self.by-version."commander"."2.0.0" self.by-version."http-auth"."2.0.7" self.by-version."express"."3.4.4" @@ -10873,14 +12068,15 @@ passthru.names = [ "s3http" ]; }; "s3http" = self.by-version."s3http"."0.0.3"; - by-spec."sauce-connect-launcher"."~0.1.10" = - self.by-version."sauce-connect-launcher"."0.1.11"; - by-version."sauce-connect-launcher"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "sauce-connect-launcher-0.1.11"; + by-spec."sauce-connect-launcher"."~0.2.2" = + self.by-version."sauce-connect-launcher"."0.2.2"; + by-version."sauce-connect-launcher"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "sauce-connect-launcher-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.1.11.tgz"; - sha1 = "71ac88bdab7bd8396a3f7d9feb165a4e457c3ecd"; + url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.2.2.tgz"; + name = "sauce-connect-launcher-0.2.2.tgz"; + sha1 = "cfd951c8b488af38d384aef14920261482e2e05a"; }) ]; buildInputs = @@ -10901,6 +12097,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"; + name = "saucelabs-0.1.1.tgz"; sha1 = "5e0ea1cf3d735d6ea15fde94b5bda6bc15d2c06d"; }) ]; @@ -10913,13 +12110,14 @@ passthru.names = [ "saucelabs" ]; }; by-spec."sax"."0.5.x" = - self.by-version."sax"."0.5.5"; - by-version."sax"."0.5.5" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.5.5"; + self.by-version."sax"."0.5.8"; + by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage { + name = "sax-0.5.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.5.5.tgz"; - sha1 = "b1ec13d77397248d059bcc18bb9530d8210bb5d3"; + url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + name = "sax-0.5.8.tgz"; + sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }) ]; buildInputs = @@ -10931,15 +12129,16 @@ passthru.names = [ "sax" ]; }; by-spec."sax".">=0.4.2" = - self.by-version."sax"."0.5.5"; + self.by-version."sax"."0.5.8"; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.37.0"; - by-version."selenium-webdriver"."2.37.0" = lib.makeOverridable self.buildNodePackage { - name = "selenium-webdriver-2.37.0"; + self.by-version."selenium-webdriver"."2.39.0"; + by-version."selenium-webdriver"."2.39.0" = lib.makeOverridable self.buildNodePackage { + name = "selenium-webdriver-2.39.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.37.0.tgz"; - sha1 = "02a8c9240203c22d0400d466253d4af3f63748b8"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.39.0.tgz"; + name = "selenium-webdriver-2.39.0.tgz"; + sha1 = "546225f2f4f53f1f490a3077e5f14092fad3d205"; }) ]; buildInputs = @@ -10950,7 +12149,7 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.37.0"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.39.0"; by-spec."semver"."*" = self.by-version."semver"."2.2.1"; by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -10958,6 +12157,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; }) ]; @@ -10977,6 +12177,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; + name = "semver-1.1.0.tgz"; sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; }) ]; @@ -10995,6 +12196,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; + name = "semver-1.1.4.tgz"; sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; }) ]; @@ -11025,6 +12227,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + name = "semver-2.0.11.tgz"; sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; }) ]; @@ -11043,6 +12246,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; + name = "semver-2.1.0.tgz"; sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; }) ]; @@ -11063,6 +12267,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz"; + name = "send-0.1.4.tgz"; sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; }) ]; @@ -11085,6 +12290,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz"; + name = "send-0.0.3.tgz"; sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184"; }) ]; @@ -11107,6 +12313,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz"; + name = "send-0.1.0.tgz"; sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }) ]; @@ -11131,6 +12338,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + name = "sequence-2.2.1.tgz"; sha1 = "7f5617895d44351c0a047e764467690490a16b03"; }) ]; @@ -11151,6 +12359,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz"; + name = "sha-1.2.3.tgz"; sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329"; }) ]; @@ -11171,6 +12380,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"; + name = "shelljs-0.1.4.tgz"; sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e"; }) ]; @@ -11184,14 +12394,34 @@ }; by-spec."shelljs"."~0.1.4" = self.by-version."shelljs"."0.1.4"; + by-spec."shelljs"."~0.2.6" = + self.by-version."shelljs"."0.2.6"; + by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "shelljs-0.2.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"; + name = "shelljs-0.2.6.tgz"; + sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378"; + }) + ]; + buildInputs = + (self.nativeDeps."shelljs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shelljs" ]; + }; by-spec."should"."*" = - self.by-version."should"."2.1.0"; - by-version."should"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "should-2.1.0"; + self.by-version."should"."2.1.1"; + by-version."should"."2.1.1" = lib.makeOverridable self.buildNodePackage { + name = "should-2.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-2.1.0.tgz"; - sha1 = "6bffa59a47892206fed91fe0f2b7217bda61e9ca"; + url = "http://registry.npmjs.org/should/-/should-2.1.1.tgz"; + name = "should-2.1.1.tgz"; + sha1 = "c648b13a8b464465c2f838ea0c93f12e4ae06c6b"; }) ]; buildInputs = @@ -11202,7 +12432,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."2.1.0"; + "should" = self.by-version."should"."2.1.1"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -11210,6 +12440,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; + name = "sigmund-1.0.0.tgz"; sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; }) ]; @@ -11228,6 +12459,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + name = "signals-1.0.0.tgz"; sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; }) ]; @@ -11243,6 +12475,25 @@ self.by-version."signals"."1.0.0"; by-spec."signals"."~1.0.0" = self.by-version."signals"."1.0.0"; + by-spec."simple-lru-cache"."0.0.x" = + self.by-version."simple-lru-cache"."0.0.1"; + by-version."simple-lru-cache"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "simple-lru-cache-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz"; + name = "simple-lru-cache-0.0.1.tgz"; + sha1 = "0334171e40ed4a4861ac29250eb1db23300be4f0"; + }) + ]; + buildInputs = + (self.nativeDeps."simple-lru-cache" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "simple-lru-cache" ]; + }; by-spec."simplesmtp".">= 0.1.22" = self.by-version."simplesmtp"."0.3.16"; by-version."simplesmtp"."0.3.16" = lib.makeOverridable self.buildNodePackage { @@ -11250,13 +12501,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.16.tgz"; + name = "simplesmtp-0.3.16.tgz"; sha1 = "c82ab64b957a5f979b10b96787094e3612877814"; }) ]; buildInputs = (self.nativeDeps."simplesmtp" or []); deps = [ - self.by-version."rai"."0.1.8" + self.by-version."rai"."0.1.9" self.by-version."xoauth2"."0.1.8" ]; peerDependencies = [ @@ -11270,6 +12522,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; + name = "sliced-0.0.3.tgz"; sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50"; }) ]; @@ -11288,6 +12541,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; + name = "sliced-0.0.4.tgz"; sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; }) ]; @@ -11306,6 +12560,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz"; + name = "sliced-0.0.5.tgz"; sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f"; }) ]; @@ -11324,6 +12579,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz"; + name = "slide-1.1.5.tgz"; sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d"; }) ]; @@ -11338,13 +12594,14 @@ by-spec."slide"."~1.1.5" = self.by-version."slide"."1.1.5"; by-spec."smartdc"."*" = - self.by-version."smartdc"."7.1.1"; - by-version."smartdc"."7.1.1" = lib.makeOverridable self.buildNodePackage { - name = "smartdc-7.1.1"; + self.by-version."smartdc"."7.1.2"; + by-version."smartdc"."7.1.2" = lib.makeOverridable self.buildNodePackage { + name = "smartdc-7.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.1.tgz"; - sha1 = "acc4378e0967b43dd8ded8c67f99e6508277bfb9"; + url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.2.tgz"; + name = "smartdc-7.1.2.tgz"; + sha1 = "11228af972ed5014d3798202ecc370e02f007872"; }) ]; buildInputs = @@ -11362,7 +12619,7 @@ ]; passthru.names = [ "smartdc" ]; }; - "smartdc" = self.by-version."smartdc"."7.1.1"; + "smartdc" = self.by-version."smartdc"."7.1.2"; by-spec."smartdc-auth"."1.0.1" = self.by-version."smartdc-auth"."1.0.1"; by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -11370,6 +12627,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz"; + name = "smartdc-auth-1.0.1.tgz"; sha1 = "520bbf918313bdf2da372927d33756d46356b87b"; }) ]; @@ -11393,6 +12651,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; + name = "sntp-0.1.4.tgz"; sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; }) ]; @@ -11412,6 +12671,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }) ]; @@ -11431,6 +12691,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; + name = "socket.io-0.9.14.tgz"; sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667"; }) ]; @@ -11453,6 +12714,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; + name = "socket.io-0.9.16.tgz"; sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76"; }) ]; @@ -11479,6 +12741,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz"; + name = "socket.io-client-0.9.11.tgz"; sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7"; }) ]; @@ -11501,6 +12764,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; + name = "socket.io-client-0.9.16.tgz"; sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6"; }) ]; @@ -11523,6 +12787,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz"; + name = "sockjs-0.3.8.tgz"; sha1 = "c083cb0505db1ea1a949d3bd12d8a1ea385a456c"; }) ]; @@ -11544,6 +12809,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; + name = "source-map-0.1.31.tgz"; sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; }) ]; @@ -11572,6 +12838,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz"; + name = "spdy-1.7.1.tgz"; sha1 = "4fde77e602b20c4ecc39ee8619373dd9bf669152"; }) ]; @@ -11590,6 +12857,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz"; + name = "ssh-agent-0.2.1.tgz"; sha1 = "3044e9eaeca88a9e6971dd7deb19bdcc20012929"; }) ]; @@ -11610,6 +12878,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.14.tgz"; + name = "ssh2-0.2.14.tgz"; sha1 = "6f93df62f1475cbe5b45924da568643b9ac7388a"; }) ]; @@ -11630,6 +12899,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz"; + name = "stack-trace-0.0.7.tgz"; sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff"; }) ]; @@ -11642,26 +12912,48 @@ passthru.names = [ "stack-trace" ]; }; by-spec."statsd"."*" = - self.by-version."statsd"."0.6.0"; - by-version."statsd"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "statsd-0.6.0"; + self.by-version."statsd"."0.7.0"; + by-version."statsd"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "statsd-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/statsd/-/statsd-0.6.0.tgz"; - sha1 = "9902dba319c46726f0348ced9b7b3e20184de1c4"; + url = "http://registry.npmjs.org/statsd/-/statsd-0.7.0.tgz"; + name = "statsd-0.7.0.tgz"; + sha1 = "13354345392c50a30221d3ab524bffcdda90272e"; }) ]; buildInputs = (self.nativeDeps."statsd" or []); deps = [ - self.by-version."node-syslog"."1.1.3" + self.by-version."node-syslog"."1.1.7" + self.by-version."hashring"."1.0.1" self.by-version."winser"."0.0.11" ]; peerDependencies = [ ]; passthru.names = [ "statsd" ]; }; - "statsd" = self.by-version."statsd"."0.6.0"; + "statsd" = self.by-version."statsd"."0.7.0"; + by-spec."stream-combiner"."~0.0.2" = + self.by-version."stream-combiner"."0.0.4"; + by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "stream-combiner-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + name = "stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-combiner" or []); + deps = [ + self.by-version."duplexer"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-combiner" ]; + }; by-spec."stream-counter"."~0.1.0" = self.by-version."stream-counter"."0.1.0"; by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -11669,6 +12961,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz"; + name = "stream-counter-0.1.0.tgz"; sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b"; }) ]; @@ -11688,6 +12981,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + name = "stream-counter-0.2.0.tgz"; sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; }) ]; @@ -11707,6 +13001,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz"; + name = "stream-splitter-transform-0.0.4.tgz"; sha1 = "0de54e94680633a8d703b252b20fa809ed99331c"; }) ]; @@ -11727,6 +13022,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + name = "streamsearch-0.1.2.tgz"; sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }) ]; @@ -11745,6 +13041,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz"; + name = "string-1.6.1.tgz"; sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; }) ]; @@ -11763,6 +13060,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.7.tgz"; + name = "stringify-object-0.1.7.tgz"; sha1 = "bb54d1ceed118b428c1256742b40a53f03599581"; }) ]; @@ -11774,6 +13072,25 @@ ]; passthru.names = [ "stringify-object" ]; }; + by-spec."strip-ansi"."~0.1.0" = + self.by-version."strip-ansi"."0.1.1"; + by-version."strip-ansi"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "strip-ansi-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; + name = "strip-ansi-0.1.1.tgz"; + sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; + }) + ]; + buildInputs = + (self.nativeDeps."strip-ansi" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "strip-ansi" ]; + }; by-spec."strong-data-uri"."~0.1.0" = self.by-version."strong-data-uri"."0.1.0"; by-version."strong-data-uri"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -11781,6 +13098,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.0.tgz"; + name = "strong-data-uri-0.1.0.tgz"; sha1 = "a41235806b8c3bf0f6f324dc57dfe85bbab681a0"; }) ]; @@ -11794,13 +13112,14 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.41.0"; - by-version."stylus"."0.41.0" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.41.0"; + self.by-version."stylus"."0.41.3"; + by-version."stylus"."0.41.3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.41.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.41.0.tgz"; - sha1 = "b9609d5663c9624d11b28952f3e6b23cde10ac28"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.41.3.tgz"; + name = "stylus-0.41.3.tgz"; + sha1 = "0a49c3f2f4f6b6719e7cca823052b9df87acaeb7"; }) ]; buildInputs = @@ -11809,13 +13128,13 @@ self.by-version."cssom"."0.2.5" self.by-version."mkdirp"."0.3.5" self.by-version."debug"."0.7.4" - self.by-version."sax"."0.5.5" + self.by-version."sax"."0.5.8" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.41.0"; + "stylus" = self.by-version."stylus"."0.41.3"; by-spec."stylus"."0.27.2" = self.by-version."stylus"."0.27.2"; by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { @@ -11823,6 +13142,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz"; + name = "stylus-0.27.2.tgz"; sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117"; }) ]; @@ -11844,6 +13164,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.2.1.tgz"; + name = "sudo-block-0.2.1.tgz"; sha1 = "b394820741b66c0fe06f97b334f0674036837ba5"; }) ]; @@ -11856,6 +13177,26 @@ ]; passthru.names = [ "sudo-block" ]; }; + by-spec."sudo-block"."~0.3.0" = + self.by-version."sudo-block"."0.3.0"; + by-version."sudo-block"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "sudo-block-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.3.0.tgz"; + name = "sudo-block-0.3.0.tgz"; + sha1 = "aec27fbde8763ee32e3e47b8ba3c70584da7eb9c"; + }) + ]; + buildInputs = + (self.nativeDeps."sudo-block" or []); + deps = [ + self.by-version."chalk"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "sudo-block" ]; + }; by-spec."superagent"."0.15.7" = self.by-version."superagent"."0.15.7"; by-version."superagent"."0.15.7" = lib.makeOverridable self.buildNodePackage { @@ -11863,6 +13204,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/superagent/-/superagent-0.15.7.tgz"; + name = "superagent-0.15.7.tgz"; sha1 = "095c70b8afffbc072f1458f39684d4854d6333a3"; }) ]; @@ -11889,6 +13231,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/superagent/-/superagent-0.13.0.tgz"; + name = "superagent-0.13.0.tgz"; sha1 = "ddfbfa5c26f16790f9c5bce42815ccbde2ca36f2"; }) ]; @@ -11915,6 +13258,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/supertest/-/supertest-0.8.2.tgz"; + name = "supertest-0.8.2.tgz"; sha1 = "2da3519f7c9dcfa8759e2de9c794f1d4acc0333b"; }) ]; @@ -11936,6 +13280,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz"; + name = "swig-0.14.0.tgz"; sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; }) ]; @@ -11956,6 +13301,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; + name = "sylvester-0.0.21.tgz"; sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7"; }) ]; @@ -11970,13 +13316,14 @@ by-spec."sylvester".">= 0.0.8" = self.by-version."sylvester"."0.0.21"; by-spec."tar"."*" = - self.by-version."tar"."0.1.18"; - by-version."tar"."0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.18"; + self.by-version."tar"."0.1.19"; + by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage { + name = "tar-0.1.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz"; - sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635"; + url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz"; + name = "tar-0.1.19.tgz"; + sha1 = "fe45941799e660ce1ea52d875d37481b4bf13eac"; }) ]; buildInputs = @@ -11990,9 +13337,9 @@ ]; passthru.names = [ "tar" ]; }; - "tar" = self.by-version."tar"."0.1.18"; + "tar" = self.by-version."tar"."0.1.19"; by-spec."tar"."0" = - self.by-version."tar"."0.1.18"; + self.by-version."tar"."0.1.19"; by-spec."tar"."0.1.17" = self.by-version."tar"."0.1.17"; by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage { @@ -12000,6 +13347,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + name = "tar-0.1.17.tgz"; sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; }) ]; @@ -12015,9 +13363,11 @@ passthru.names = [ "tar" ]; }; by-spec."tar"."~0.1.17" = - self.by-version."tar"."0.1.18"; + self.by-version."tar"."0.1.19"; by-spec."tar"."~0.1.18" = - self.by-version."tar"."0.1.18"; + self.by-version."tar"."0.1.19"; + by-spec."tar"."~0.1.19" = + self.by-version."tar"."0.1.19"; by-spec."temp"."*" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -12025,6 +13375,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; + name = "temp-0.6.0.tgz"; sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; }) ]; @@ -12041,6 +13392,8 @@ "temp" = self.by-version."temp"."0.6.0"; by-spec."temp"."0.6.0" = self.by-version."temp"."0.6.0"; + by-spec."temp"."~0.6.0" = + self.by-version."temp"."0.6.0"; by-spec."text-table"."~0.1.1" = self.by-version."text-table"."0.1.1"; by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -12048,6 +13401,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/text-table/-/text-table-0.1.1.tgz"; + name = "text-table-0.1.1.tgz"; sha1 = "9aa4347a39b6950cd24190264576f62db6e52d93"; }) ]; @@ -12059,6 +13413,25 @@ ]; passthru.names = [ "text-table" ]; }; + by-spec."text-table"."~0.2.0" = + self.by-version."text-table"."0.2.0"; + by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "text-table-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + name = "text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }) + ]; + buildInputs = + (self.nativeDeps."text-table" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "text-table" ]; + }; by-spec."throttleit"."~0.0.2" = self.by-version."throttleit"."0.0.2"; by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -12066,6 +13439,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; + name = "throttleit-0.0.2.tgz"; sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"; }) ]; @@ -12077,14 +13451,36 @@ ]; passthru.names = [ "throttleit" ]; }; - by-spec."timespan"."2.0.1" = - self.by-version."timespan"."2.0.1"; - by-version."timespan"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "timespan-2.0.1"; + by-spec."through2"."~0.1.0" = + self.by-version."through2"."0.1.0"; + by-version."through2"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "through2-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/timespan/-/timespan-2.0.1.tgz"; - sha1 = "479b45875937e14d0f4be1625f2abd08d801f68a"; + url = "http://registry.npmjs.org/through2/-/through2-0.1.0.tgz"; + name = "through2-0.1.0.tgz"; + sha1 = "54e756cc6a543c72bb5adf55e8a248686b84c9cc"; + }) + ]; + buildInputs = + (self.nativeDeps."through2" or []); + deps = [ + self.by-version."readable-stream"."1.0.17" + self.by-version."xtend"."2.0.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "through2" ]; + }; + by-spec."timespan"."~2.3.0" = + self.by-version."timespan"."2.3.0"; + by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "timespan-2.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; + name = "timespan-2.3.0.tgz"; + sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; }) ]; buildInputs = @@ -12102,6 +13498,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz"; + name = "timezone-0.0.23.tgz"; sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac"; }) ]; @@ -12121,6 +13518,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + name = "tinycolor-0.0.1.tgz"; sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }) ]; @@ -12133,13 +13531,14 @@ passthru.names = [ "tinycolor" ]; }; by-spec."tmp"."~0.0.20" = - self.by-version."tmp"."0.0.22"; - by-version."tmp"."0.0.22" = lib.makeOverridable self.buildNodePackage { - name = "tmp-0.0.22"; + self.by-version."tmp"."0.0.23"; + by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage { + name = "tmp-0.0.23"; src = [ (fetchurl { - url = "http://registry.npmjs.org/tmp/-/tmp-0.0.22.tgz"; - sha1 = "92133c8a93785fbbd3971c9454561921d58283cd"; + url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz"; + name = "tmp-0.0.23.tgz"; + sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74"; }) ]; buildInputs = @@ -12157,6 +13556,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz"; + name = "touch-0.0.2.tgz"; sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4"; }) ]; @@ -12169,6 +13569,26 @@ ]; passthru.names = [ "touch" ]; }; + by-spec."tough-cookie"."~0.9.15" = + self.by-version."tough-cookie"."0.9.15"; + by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { + name = "tough-cookie-0.9.15"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; + name = "tough-cookie-0.9.15.tgz"; + sha1 = "75617ac347e3659052b0350131885829677399f6"; + }) + ]; + buildInputs = + (self.nativeDeps."tough-cookie" or []); + deps = [ + self.by-version."punycode"."1.2.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tough-cookie" ]; + }; by-spec."traceback".">=0.3.0 && < 0.4" = self.by-version."traceback"."0.3.0"; by-version."traceback"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -12176,6 +13596,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/traceback/-/traceback-0.3.0.tgz"; + name = "traceback-0.3.0.tgz"; sha1 = "4e147f07cd332fbd0330ba510b942a5c9256a0ab"; }) ]; @@ -12194,6 +13615,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; + name = "transformers-2.1.0.tgz"; sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }) ]; @@ -12215,6 +13637,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; + name = "traverse-0.3.9.tgz"; sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; }) ]; @@ -12233,6 +13656,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/truncate/-/truncate-1.0.2.tgz"; + name = "truncate-1.0.2.tgz"; sha1 = "3221c41f6e747f83e8613f5466c8bfb596226a66"; }) ]; @@ -12251,6 +13675,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; + name = "tunnel-agent-0.2.0.tgz"; sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; }) ]; @@ -12269,6 +13694,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + name = "tunnel-agent-0.3.0.tgz"; sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; }) ]; @@ -12287,6 +13713,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; + name = "type-detect-0.1.1.tgz"; sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; }) ]; @@ -12305,6 +13732,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz"; + name = "typechecker-2.0.8.tgz"; sha1 = "e83da84bb64c584ccb345838576c40b0337db82e"; }) ]; @@ -12323,6 +13751,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; + name = "uglify-js-1.2.5.tgz"; sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; }) ]; @@ -12341,6 +13770,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz"; + name = "uglify-js-2.4.0.tgz"; sha1 = "a5f2b6b1b817fb34c16a04234328c89ba1e77137"; }) ]; @@ -12363,6 +13793,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; + name = "uglify-js-2.2.5.tgz"; sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; }) ]; @@ -12383,6 +13814,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + name = "uglify-js-2.3.6.tgz"; sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; }) ]; @@ -12398,13 +13830,14 @@ passthru.names = [ "uglify-js" ]; }; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.6"; - by-version."uglify-js"."2.4.6" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.6"; + self.by-version."uglify-js"."2.4.8"; + by-version."uglify-js"."2.4.8" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz"; - sha1 = "31766a4d822babf5f32c14096251ed9259298ad3"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.8.tgz"; + name = "uglify-js-2.4.8.tgz"; + sha1 = "70e33bd9bce9a27b896fd4fead4c7da434fcca09"; }) ]; buildInputs = @@ -12426,6 +13859,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.1.tgz"; + name = "uglify-to-browserify-1.0.1.tgz"; sha1 = "0e9ada5d4ca358a59a00bb33c8061e2f40ef97d2"; }) ]; @@ -12444,6 +13878,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; + name = "uid-number-0.0.3.tgz"; sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; }) ]; @@ -12462,6 +13897,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uid2/-/uid2-0.0.2.tgz"; + name = "uid2-0.0.2.tgz"; sha1 = "107fb155c82c1136620797ed4c88cf2b08f6aab8"; }) ]; @@ -12480,6 +13916,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; + name = "uid2-0.0.3.tgz"; sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }) ]; @@ -12498,6 +13935,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + name = "underscore-1.5.2.tgz"; sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }) ]; @@ -12517,6 +13955,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + name = "underscore-1.4.4.tgz"; sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }) ]; @@ -12549,6 +13988,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"; + name = "underscore.string-2.2.1.tgz"; sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19"; }) ]; @@ -12567,6 +14007,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + name = "underscore.string-2.3.3.tgz"; sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; }) ]; @@ -12578,6 +14019,30 @@ ]; passthru.names = [ "underscore.string" ]; }; + by-spec."underscore.string"."~2.3.3" = + self.by-version."underscore.string"."2.3.3"; + by-spec."unfunk-diff"."~0.0.1" = + self.by-version."unfunk-diff"."0.0.1"; + by-version."unfunk-diff"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "unfunk-diff-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.1.tgz"; + name = "unfunk-diff-0.0.1.tgz"; + sha1 = "fd01490b7e53bc268f069f222fda10704c8f1265"; + }) + ]; + buildInputs = + (self.nativeDeps."unfunk-diff" or []); + deps = [ + self.by-version."diff"."1.0.8" + self.by-version."jsesc"."0.4.3" + self.by-version."ministyle"."0.1.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "unfunk-diff" ]; + }; by-spec."ungit"."*" = self.by-version."ungit"."0.6.0"; by-version."ungit"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -12585,13 +14050,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ungit/-/ungit-0.6.0.tgz"; + name = "ungit-0.6.0.tgz"; sha1 = "fffc26cafc5d138bc6b3585fef3f15744f5f3d31"; }) ]; buildInputs = (self.nativeDeps."ungit" or []); deps = [ - self.by-version."express"."3.4.6" + self.by-version."express"."3.4.7" self.by-version."superagent"."0.15.7" self.by-version."lodash"."2.3.0" self.by-version."temp"."0.6.0" @@ -12604,7 +14070,7 @@ self.by-version."winston"."0.7.2" self.by-version."passport"."0.1.17" self.by-version."passport-local"."0.1.6" - self.by-version."npm"."1.3.15" + self.by-version."npm"."1.3.22" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" @@ -12631,6 +14097,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.7.tgz"; + name = "update-notifier-0.1.7.tgz"; sha1 = "b37fb55004835240fd2e7e360c52ccffde5219c9"; }) ]; @@ -12638,7 +14105,7 @@ (self.nativeDeps."update-notifier" or []); deps = [ self.by-version."request"."2.27.0" - self.by-version."configstore"."0.1.5" + self.by-version."configstore"."0.1.7" self.by-version."semver"."2.1.0" self.by-version."chalk"."0.2.1" ]; @@ -12655,6 +14122,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz"; + name = "useragent-2.0.7.tgz"; sha1 = "a44c07d157a15e13d73d4af4ece6aab70f298224"; }) ]; @@ -12667,19 +14135,21 @@ ]; passthru.names = [ "useragent" ]; }; - by-spec."util"."0.10.0" = - self.by-version."util"."0.10.0"; - by-version."util"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "util-0.10.0"; + by-spec."util"."0.10.2" = + self.by-version."util"."0.10.2"; + by-version."util"."0.10.2" = lib.makeOverridable self.buildNodePackage { + name = "util-0.10.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/util/-/util-0.10.0.tgz"; - sha1 = "b11c0823c74c077ea6911ad334394055b680fb5e"; + url = "http://registry.npmjs.org/util/-/util-0.10.2.tgz"; + name = "util-0.10.2.tgz"; + sha1 = "8180519cf690fb88bc56480fe55087531f446304"; }) ]; buildInputs = (self.nativeDeps."util" or []); deps = [ + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; @@ -12692,6 +14162,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz"; + name = "util-0.4.9.tgz"; sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3"; }) ]; @@ -12704,13 +14175,14 @@ ]; passthru.names = [ "util" ]; }; - by-spec."utile"."0.1.7" = + by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "utile-0.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; + name = "utile-0.1.7.tgz"; sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; }) ]; @@ -12718,7 +14190,7 @@ (self.nativeDeps."utile" or []); deps = [ self.by-version."async"."0.1.22" - self.by-version."deep-equal"."0.1.0" + self.by-version."deep-equal"."0.1.2" self.by-version."i"."0.3.2" self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.2.7" @@ -12728,8 +14200,6 @@ ]; passthru.names = [ "utile" ]; }; - by-spec."utile"."0.1.x" = - self.by-version."utile"."0.1.7"; by-spec."utile"."0.2.1" = self.by-version."utile"."0.2.1"; by-version."utile"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -12737,6 +14207,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; + name = "utile-0.2.1.tgz"; sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; }) ]; @@ -12744,11 +14215,11 @@ (self.nativeDeps."utile" or []); deps = [ self.by-version."async"."0.2.9" - self.by-version."deep-equal"."0.1.0" + self.by-version."deep-equal"."0.1.2" self.by-version."i"."0.3.2" self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.4.2" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" ]; peerDependencies = [ ]; @@ -12758,6 +14229,8 @@ self.by-version."utile"."0.2.1"; by-spec."utile"."~0.1.7" = self.by-version."utile"."0.1.7"; + by-spec."utile"."~0.2.1" = + self.by-version."utile"."0.2.1"; by-spec."uuid"."1.4.1" = self.by-version."uuid"."1.4.1"; by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { @@ -12765,6 +14238,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uuid/-/uuid-1.4.1.tgz"; + name = "uuid-1.4.1.tgz"; sha1 = "a337828580d426e375b8ee11bd2bf901a596e0b8"; }) ]; @@ -12783,6 +14257,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; + name = "validator-0.4.28.tgz"; sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4"; }) ]; @@ -12801,6 +14276,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"; + name = "vargs-0.1.0.tgz"; sha1 = "6b6184da6520cc3204ce1b407cac26d92609ebff"; }) ]; @@ -12819,6 +14295,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz"; + name = "vasync-1.3.3.tgz"; sha1 = "84917680717020b67e043902e63bc143174c8728"; }) ]; @@ -12839,6 +14316,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz"; + name = "verror-1.1.0.tgz"; sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0"; }) ]; @@ -12858,6 +14336,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz"; + name = "verror-1.3.3.tgz"; sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; }) ]; @@ -12877,6 +14356,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + name = "verror-1.3.6.tgz"; sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; }) ]; @@ -12896,6 +14376,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.3.tgz"; + name = "view-helpers-0.1.3.tgz"; sha1 = "97b061548a753eff5b432e6c1598cb10417bff02"; }) ]; @@ -12915,6 +14396,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; + name = "vows-0.7.0.tgz"; sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; }) ]; @@ -12922,7 +14404,7 @@ (self.nativeDeps."vows" or []); deps = [ self.by-version."eyes"."0.1.8" - self.by-version."diff"."1.0.7" + self.by-version."diff"."1.0.8" ]; peerDependencies = [ ]; @@ -12935,6 +14417,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz"; + name = "walk-2.2.1.tgz"; sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016"; }) ]; @@ -12957,6 +14440,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz"; + name = "watch-0.5.1.tgz"; sha1 = "50ea3a056358c98073e0bca59956de4afd20b213"; }) ]; @@ -12968,14 +14452,15 @@ ]; passthru.names = [ "watch" ]; }; - by-spec."watch"."0.7.0" = - self.by-version."watch"."0.7.0"; - by-version."watch"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "watch-0.7.0"; + by-spec."watch"."~0.8.0" = + self.by-version."watch"."0.8.0"; + by-version."watch"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "watch-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/watch/-/watch-0.7.0.tgz"; - sha1 = "3d6e715648af867ec7f1149302b526479e726856"; + url = "http://registry.npmjs.org/watch/-/watch-0.8.0.tgz"; + name = "watch-0.8.0.tgz"; + sha1 = "1bb0eea53defe6e621e9c8c63c0358007ecbdbcc"; }) ]; buildInputs = @@ -12986,14 +14471,15 @@ ]; passthru.names = [ "watch" ]; }; - by-spec."wd"."~0.1.5" = - self.by-version."wd"."0.1.5"; - by-version."wd"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.1.5"; + by-spec."wd"."~0.2.8" = + self.by-version."wd"."0.2.8"; + by-version."wd"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.1.5.tgz"; - sha1 = "c0a9c8fb5f62ed6628a6f6e1d1958f9316dadfec"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.8.tgz"; + name = "wd-0.2.8.tgz"; + sha1 = "397ccb8058e72af3ae6e7c485f4368f4fb514631"; }) ]; buildInputs = @@ -13005,19 +14491,21 @@ self.by-version."request"."2.21.0" self.by-version."archiver"."0.4.10" self.by-version."lodash"."1.3.1" + self.by-version."underscore.string"."2.3.3" ]; peerDependencies = [ ]; passthru.names = [ "wd" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.37.0-1"; - by-version."webdrvr"."2.37.0-1" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.37.0-1"; + self.by-version."webdrvr"."2.38.0-0"; + by-version."webdrvr"."2.38.0-0" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.38.0-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.37.0-1.tgz"; - sha1 = "8f1f2fbcc184b8964d26f0fca73264e0c1d595ea"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.38.0-0.tgz"; + name = "webdrvr-2.38.0-0.tgz"; + sha1 = "b5388a672ac512e09df24d00f80b3d619dc15e5c"; }) ]; buildInputs = @@ -13026,16 +14514,16 @@ self.by-version."adm-zip"."0.4.3" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.6" - self.by-version."phantomjs"."1.9.2-4" - self.by-version."tmp"."0.0.22" + self.by-version."npmconf"."0.1.9" + self.by-version."phantomjs"."1.9.2-6" + self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.37.0-1"; + "webdrvr" = self.by-version."webdrvr"."2.38.0-0"; by-spec."websocket-driver".">=0.3.0" = self.by-version."websocket-driver"."0.3.1"; by-version."websocket-driver"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -13043,6 +14531,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.1.tgz"; + name = "websocket-driver-0.3.1.tgz"; sha1 = "25f86b4e7ca9d8f8136cd225ffcee71a3d2869cf"; }) ]; @@ -13063,6 +14552,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/when/-/when-2.2.1.tgz"; + name = "when-2.2.1.tgz"; sha1 = "b1def994017350b8087f6e9a7596ab2833bdc712"; }) ]; @@ -13081,6 +14571,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz"; + name = "which-1.0.5.tgz"; sha1 = "5630d6819dda692f1464462e7956cb42c0842739"; }) ]; @@ -13105,6 +14596,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/winser/-/winser-0.0.11.tgz"; + name = "winser-0.0.11.tgz"; sha1 = "38474086a89ac72f90f9c6762e23375d12046c7c"; }) ]; @@ -13125,6 +14617,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; + name = "winston-0.7.2.tgz"; sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb"; }) ]; @@ -13133,7 +14626,7 @@ deps = [ self.by-version."async"."0.2.9" self.by-version."colors"."0.6.2" - self.by-version."cycle"."1.0.2" + self.by-version."cycle"."1.0.3" self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.3.0" self.by-version."request"."2.16.6" @@ -13151,6 +14644,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; + name = "winston-0.6.2.tgz"; sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; }) ]; @@ -13159,7 +14653,7 @@ deps = [ self.by-version."async"."0.1.22" self.by-version."colors"."0.6.2" - self.by-version."cycle"."1.0.2" + self.by-version."cycle"."1.0.3" self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.2.3" self.by-version."request"."2.9.203" @@ -13171,43 +14665,40 @@ }; by-spec."winston"."0.6.x" = self.by-version."winston"."0.6.2"; - by-spec."winston"."0.7.1" = - self.by-version."winston"."0.7.1"; - by-version."winston"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "winston-0.7.1"; + by-spec."winston"."0.7.2" = + self.by-version."winston"."0.7.2"; + by-spec."winston"."~0.7.2" = + self.by-version."winston"."0.7.2"; + by-spec."wiredep"."~0.4.2" = + self.by-version."wiredep"."0.4.2"; + by-version."wiredep"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "wiredep-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.7.1.tgz"; - sha1 = "e291ab24eddbf79ea40ff532619277a0d30b0eb3"; + url = "http://registry.npmjs.org/wiredep/-/wiredep-0.4.2.tgz"; + name = "wiredep-0.4.2.tgz"; + sha1 = "42d4cf07422576f26e3a04045edc163da101a66f"; }) ]; buildInputs = - (self.nativeDeps."winston" or []); + (self.nativeDeps."wiredep" or []); deps = [ - self.by-version."async"."0.2.9" - self.by-version."colors"."0.6.2" - self.by-version."cycle"."1.0.2" - self.by-version."eyes"."0.1.8" - self.by-version."pkginfo"."0.3.0" - self.by-version."request"."2.16.6" - self.by-version."stack-trace"."0.0.7" + self.by-version."lodash"."1.3.1" + self.by-version."chalk"."0.1.1" ]; peerDependencies = [ ]; - passthru.names = [ "winston" ]; + passthru.names = [ "wiredep" ]; }; - by-spec."winston"."0.7.2" = - self.by-version."winston"."0.7.2"; - by-spec."winston"."~0.7.2" = - self.by-version."winston"."0.7.2"; - by-spec."with"."~1.1.0" = - self.by-version."with"."1.1.1"; - by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "with-1.1.1"; + by-spec."with"."~2.0.0" = + self.by-version."with"."2.0.0"; + by-version."with"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "with-2.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz"; - sha1 = "66bd6664deb318b2482dd0424ccdebe822434ac0"; + url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz"; + name = "with-2.0.0.tgz"; + sha1 = "ec01ff021db9df05639047147ede012f5e6d0afd"; }) ]; buildInputs = @@ -13226,6 +14717,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + name = "wordwrap-0.0.2.tgz"; sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; }) ]; @@ -13248,6 +14740,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/wrench/-/wrench-1.4.4.tgz"; + name = "wrench-1.4.4.tgz"; sha1 = "7f523efdb71b0100e77dce834c06523cbe3d54e0"; }) ]; @@ -13266,6 +14759,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; + name = "ws-0.4.31.tgz"; sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; }) ]; @@ -13288,6 +14782,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/wu/-/wu-0.1.8.tgz"; + name = "wu-0.1.8.tgz"; sha1 = "619bcdf64974a487894a25755ae095c5208b4a22"; }) ]; @@ -13307,6 +14802,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/x509/-/x509-0.0.6.tgz"; + name = "x509-0.0.6.tgz"; sha1 = "b58747854ff33df7ff8f1653756bff6a32a8c838"; }) ]; @@ -13326,13 +14822,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz"; + name = "xml2js-0.2.4.tgz"; sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d"; }) ]; buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.5.5" + self.by-version."sax"."0.5.8" ]; peerDependencies = [ ]; @@ -13345,13 +14842,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; + name = "xml2js-0.2.8.tgz"; sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; }) ]; buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.5.5" + self.by-version."sax"."0.5.8" ]; peerDependencies = [ ]; @@ -13364,14 +14862,15 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.0.tgz"; + name = "xml2js-0.4.0.tgz"; sha1 = "124fc4114b4129c810800ecb2ac86cf25462cb9a"; }) ]; buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.5.5" - self.by-version."xmlbuilder"."1.0.2" + self.by-version."sax"."0.5.8" + self.by-version."xmlbuilder"."2.0.1" ]; peerDependencies = [ ]; @@ -13379,45 +14878,45 @@ }; by-spec."xml2js".">=0.1.7" = self.by-version."xml2js"."0.4.0"; - by-spec."xmlbuilder"."*" = - self.by-version."xmlbuilder"."1.0.2"; - by-version."xmlbuilder"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-1.0.2"; + by-spec."xmlbuilder"."0.4.2" = + self.by-version."xmlbuilder"."0.4.2"; + by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-1.0.2.tgz"; - sha1 = "f3939d049e91c8c8af6165411944380798ed8e82"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; + name = "xmlbuilder-0.4.2.tgz"; + sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; }) ]; buildInputs = (self.nativeDeps."xmlbuilder" or []); deps = [ - self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "xmlbuilder" ]; }; - by-spec."xmlbuilder"."0.4.2" = - self.by-version."xmlbuilder"."0.4.2"; - by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-0.4.2"; + by-spec."xmlbuilder".">=0.4.2" = + self.by-version."xmlbuilder"."2.0.1"; + by-version."xmlbuilder"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; - sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.0.1.tgz"; + name = "xmlbuilder-2.0.1.tgz"; + sha1 = "b0f9b16bd2a260e734f5f8e30d9bf1db217fe79b"; }) ]; buildInputs = (self.nativeDeps."xmlbuilder" or []); deps = [ + self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "xmlbuilder" ]; }; - by-spec."xmlbuilder".">=0.4.2" = - self.by-version."xmlbuilder"."1.0.2"; by-spec."xmlhttprequest"."1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { @@ -13425,6 +14924,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; + name = "xmlhttprequest-1.4.2.tgz"; sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500"; }) ]; @@ -13443,6 +14943,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; + name = "xoauth2-0.1.8.tgz"; sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; }) ]; @@ -13454,6 +14955,27 @@ ]; passthru.names = [ "xoauth2" ]; }; + by-spec."xtend"."~2.0.6" = + self.by-version."xtend"."2.0.6"; + by-version."xtend"."2.0.6" = lib.makeOverridable self.buildNodePackage { + name = "xtend-2.0.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz"; + name = "xtend-2.0.6.tgz"; + sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee"; + }) + ]; + buildInputs = + (self.nativeDeps."xtend" or []); + deps = [ + self.by-version."is-object"."0.1.2" + self.by-version."object-keys"."0.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "xtend" ]; + }; by-spec."yaml"."0.2.3" = self.by-version."yaml"."0.2.3"; by-version."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -13461,6 +14983,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/yaml/-/yaml-0.2.3.tgz"; + name = "yaml-0.2.3.tgz"; sha1 = "b5450e92e76ef36b5dd24e3660091ebaeef3e5c7"; }) ]; @@ -13472,60 +14995,65 @@ ]; passthru.names = [ "yaml" ]; }; - by-spec."yeoman-generator"."~0.10.0" = - self.by-version."yeoman-generator"."0.10.5"; - by-version."yeoman-generator"."0.10.5" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.10.5"; + by-spec."yeoman-generator"."~0.13.0" = + self.by-version."yeoman-generator"."0.13.4"; + by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.13.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.10.5.tgz"; - sha1 = "67b28a6c453addc785e43180236df65e2f93554a"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; + name = "yeoman-generator-0.13.4.tgz"; + sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34"; }) ]; buildInputs = (self.nativeDeps."yeoman-generator" or []); deps = [ - self.by-version."cheerio"."0.10.8" - self.by-version."request"."2.16.6" - self.by-version."rimraf"."2.1.4" - self.by-version."tar"."0.1.18" - self.by-version."diff"."1.0.7" + self.by-version."cheerio"."0.12.4" + self.by-version."request"."2.25.0" + self.by-version."rimraf"."2.2.5" + self.by-version."tar"."0.1.19" + self.by-version."diff"."1.0.8" self.by-version."mime"."1.2.11" self.by-version."underscore.string"."2.3.3" - self.by-version."lodash"."1.1.1" + self.by-version."lodash"."1.3.1" self.by-version."mkdirp"."0.3.5" - self.by-version."read"."1.0.5" - self.by-version."glob"."3.1.21" - self.by-version."nopt"."2.1.2" - self.by-version."cli-table"."0.2.0" + self.by-version."glob"."3.2.7" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" + self.by-version."dargs"."0.1.0" + self.by-version."async"."0.2.9" + self.by-version."inquirer"."0.3.5" + self.by-version."iconv-lite"."0.2.11" + self.by-version."shelljs"."0.1.4" + self.by-version."findup-sync"."0.1.2" + self.by-version."chalk"."0.2.1" + self.by-version."text-table"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "yeoman-generator" ]; }; - by-spec."yeoman-generator"."~0.13.0" = - self.by-version."yeoman-generator"."0.13.4"; - by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.13.4"; + by-spec."yeoman-generator"."~0.14.0" = + self.by-version."yeoman-generator"."0.14.2"; + by-version."yeoman-generator"."0.14.2" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.14.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; - sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.2.tgz"; + name = "yeoman-generator-0.14.2.tgz"; + sha1 = "6d3e306d1118c83c25ac12a9d3dcb7870aa53397"; }) ]; buildInputs = (self.nativeDeps."yeoman-generator" or []); deps = [ self.by-version."cheerio"."0.12.4" - self.by-version."request"."2.25.0" - self.by-version."rimraf"."2.2.4" - self.by-version."tar"."0.1.18" - self.by-version."diff"."1.0.7" + self.by-version."rimraf"."2.2.5" + self.by-version."diff"."1.0.8" self.by-version."mime"."1.2.11" self.by-version."underscore.string"."2.3.3" - self.by-version."lodash"."1.3.1" + self.by-version."lodash"."2.2.1" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.7" self.by-version."debug"."0.7.4" @@ -13534,41 +15062,82 @@ self.by-version."async"."0.2.9" self.by-version."inquirer"."0.3.5" self.by-version."iconv-lite"."0.2.11" - self.by-version."shelljs"."0.1.4" + self.by-version."shelljs"."0.2.6" self.by-version."findup-sync"."0.1.2" - self.by-version."chalk"."0.2.1" - self.by-version."text-table"."0.1.1" + self.by-version."chalk"."0.3.0" + self.by-version."text-table"."0.2.0" + self.by-version."download"."0.1.7" + self.by-version."request"."2.27.0" + self.by-version."file-utils"."0.1.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yeoman-generator" ]; + }; + by-spec."yeoman-generator"."~0.15.0" = + self.by-version."yeoman-generator"."0.15.0-pre.3"; + by-version."yeoman-generator"."0.15.0-pre.3" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.15.0-pre.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.15.0-pre.3.tgz"; + name = "yeoman-generator-0.15.0-pre.3.tgz"; + sha1 = "49ded1ed00a2f27fe101ec11f2bf797c6ba9d81f"; + }) + ]; + buildInputs = + (self.nativeDeps."yeoman-generator" or []); + deps = [ + self.by-version."cheerio"."0.12.4" + self.by-version."rimraf"."2.2.5" + self.by-version."diff"."1.0.8" + self.by-version."mime"."1.2.11" + self.by-version."underscore.string"."2.3.3" + self.by-version."lodash"."2.4.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."glob"."3.2.7" + self.by-version."debug"."0.7.4" + self.by-version."isbinaryfile"."2.0.0" + self.by-version."dargs"."0.1.0" + self.by-version."async"."0.2.9" + self.by-version."inquirer"."0.3.5" + self.by-version."iconv-lite"."0.2.11" + self.by-version."shelljs"."0.2.6" + self.by-version."findup-sync"."0.1.2" + self.by-version."chalk"."0.3.0" + self.by-version."text-table"."0.2.0" + self.by-version."download"."0.1.7" + self.by-version."request"."2.29.0" + self.by-version."file-utils"."0.1.5" ]; peerDependencies = [ ]; passthru.names = [ "yeoman-generator" ]; }; - by-spec."yeoman-generator"."~0.13.1" = - self.by-version."yeoman-generator"."0.13.4"; - by-spec."yeoman-generator"."~0.13.2" = - self.by-version."yeoman-generator"."0.13.4"; by-spec."yo"."*" = - self.by-version."yo"."1.0.4"; - by-version."yo"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "yo-1.0.4"; + self.by-version."yo"."1.0.7-pre.2"; + by-version."yo"."1.0.7-pre.2" = lib.makeOverridable self.buildNodePackage { + name = "yo-1.0.7-pre.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yo/-/yo-1.0.4.tgz"; - sha1 = "666b5965a8e920df877d351da793f89bd1c8707a"; + url = "http://registry.npmjs.org/yo/-/yo-1.0.7-pre.2.tgz"; + name = "yo-1.0.7-pre.2.tgz"; + sha1 = "0301500c8b92e81409a7a68459501e8dece0609f"; }) ]; buildInputs = (self.nativeDeps."yo" or []); deps = [ - self.by-version."yeoman-generator"."0.13.4" + self.by-version."yeoman-generator"."0.15.0-pre.3" self.by-version."nopt"."2.1.2" - self.by-version."lodash"."1.3.1" + self.by-version."lodash"."2.4.1" self.by-version."update-notifier"."0.1.7" - self.by-version."insight"."0.2.0" - self.by-version."sudo-block"."0.2.1" + self.by-version."insight"."0.3.0" + self.by-version."sudo-block"."0.3.0" self.by-version."async"."0.2.9" self.by-version."open"."0.0.4" - self.by-version."chalk"."0.2.1" + self.by-version."chalk"."0.4.0" + self.by-version."findup"."0.1.3" ]; peerDependencies = [ self.by-version."grunt-cli"."0.1.11" @@ -13576,9 +15145,11 @@ ]; passthru.names = [ "yo" ]; }; - "yo" = self.by-version."yo"."1.0.4"; + "yo" = self.by-version."yo"."1.0.7-pre.2"; + by-spec."yo".">=1.0.0" = + self.by-version."yo"."1.0.7-pre.2"; by-spec."yo".">=1.0.0-rc.1.1" = - self.by-version."yo"."1.0.4"; + self.by-version."yo"."1.0.7-pre.2"; by-spec."zeparser"."0.0.5" = self.by-version."zeparser"."0.0.5"; by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -13586,6 +15157,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; + name = "zeparser-0.0.5.tgz"; sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }) ]; @@ -13604,6 +15176,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.1.tgz"; + name = "zlib-browserify-0.0.1.tgz"; sha1 = "4fa6a45d00dbc15f318a4afa1d9afc0258e176cc"; }) ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 6e525d7bd4f..c11b7ee360e 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -110,4 +110,6 @@ , "meat" , "hipache" , "posix" +, "node-protobuf" +, "rethinkdb" ] diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 3daaa262280..448904ce385 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -5,6 +5,7 @@ rec { "node-expat" = [ pkgs.expat ]; "rbytes" = [ pkgs.openssl ]; "phantomjs" = [ pkgs.phantomjs ]; + "node-protobuf" = [ pkgs.protobuf ]; }; buildNodePackage = import ../development/web/nodejs/build-node-package.nix { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8d17c6c20f1..99571397ee5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1490,10 +1490,10 @@ rec { }; Coro = buildPerlPackage { - name = "Coro-6.31"; + name = "Coro-6.33"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.31.tar.gz; - sha256 = "a73ace48d940b28e3dfb32d2f3507205d3ddfdc6610075ecc72e19476bb6de44"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.33.tar.gz; + sha256 = "1497wd9df10y65rb0w5h4h6wiy3smw9maw7z0gbz6dir774znfb5"; }; propagatedBuildInputs = [ AnyEvent Guard CommonSense ]; meta = { @@ -1503,10 +1503,10 @@ rec { }; CPANChanges = buildPerlPackage { - name = "CPAN-Changes-0.23"; + name = "CPAN-Changes-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.23.tar.gz; - sha256 = "445a5c751d047c2a2e20680aa86d8bdab25e52891bac24681e9b4f24e98a347c"; + url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.27.tar.gz; + sha256 = "14dizyvgzp81hmg0djwnvvkdhqd3bsmms462cj0ai84z221scv1q"; }; meta = { description = "Read and write Changes files"; @@ -1571,10 +1571,10 @@ rec { }; CPANUploader = buildPerlPackage { - name = "CPAN-Uploader-0.103004"; + name = "CPAN-Uploader-0.103006"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103004.tar.gz; - sha256 = "cfaf6d4ad32a92cdefabb3abaf1f43c7c11aca5afd5561ea6f691065ac396e97"; + url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103006.tar.gz; + sha256 = "1hkbi2j0a9v4577jxfzw586rvpzw0af61qbiggh3dd7j9b183w39"; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive HTTPMessage LWP LWPProtocolhttps TermReadKey ]; meta = { @@ -1750,10 +1750,10 @@ rec { }; DataDump = buildPerlPackage { - name = "Data-Dump-1.21"; + name = "Data-Dump-1.22"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.21.tar.gz; - sha256 = "1fcy6q8p406ag8g50l7znns3kxazfb458l6kw8pbsp4axnkz9ydx"; + url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.22.tar.gz; + sha256 = "1ciqlwsy1q35s94dry9bjy1pwanbq6b7q4rhxm9z8prgkzbslg2k"; }; meta = { description = "Pretty printing of data structures"; @@ -1804,10 +1804,10 @@ rec { }; DataOptList = buildPerlPackage { - name = "Data-OptList-0.107"; + name = "Data-OptList-0.109"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.107.tar.gz; - sha256 = "0r2sbvh1kj69al5crg394v5j5wkffvqdb17fz1rjfgb6h3v93xi8"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.109.tar.gz; + sha256 = "1j44rm2spprlq3bc80cxni3dzs3gfjiqv1qc9q7820n1qj0wgmqw"; }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { @@ -1885,10 +1885,10 @@ rec { }; DataUUIDMT = buildPerlPackage { - name = "Data-UUID-MT-1.000"; + name = "Data-UUID-MT-1.001"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.000.tar.gz; - sha256 = "1bwrxv8fp4arwrmslsb7jlnafs8cww1p5f409d1l5kpyfj2vpsyp"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz; + sha256 = "0bb7qibq1c5lhaihxa1sck9pb744p8c7172jgx5zh4c32ac4nk1h"; }; buildInputs = [ ListAllUtils ]; propagatedBuildInputs = [ MathRandomMTAuto ]; @@ -1938,10 +1938,10 @@ rec { }; DateTime = buildPerlModule { - name = "DateTime-1.03"; + name = "DateTime-1.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.03.tar.gz; - sha256 = "384f97c73da02492d771d6b5c3b37f6b18c2e12f4db3246b1d61ff19c6d6ad6d"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.04.tar.gz; + sha256 = "1krnrp8hv0m4v1lxrvwgc3vvcycld21ygvjy5p7vaf5h1jpjzrwz"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; @@ -2110,10 +2110,10 @@ rec { }; DateTimeTimeZone = buildPerlPackage { - name = "DateTime-TimeZone-1.59"; + name = "DateTime-TimeZone-1.63"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.59.tar.gz; - sha256 = "b1d50f6abde68671da1db883168ef8d6793a11ba75de02174f42e1dfd16b2522"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.63.tar.gz; + sha256 = "02a3kyz3cyrag98b1949k19axm03fa5ri82gdc1y4lnxjvjvxkfw"; }; buildInputs = [ TestOutput ]; propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ]; @@ -2193,10 +2193,10 @@ rec { }; DBI = buildPerlPackage { - name = "DBI-1.625"; + name = "DBI-1.630"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.625.tar.gz; - sha256 = "1rl1bnirf1hshc0z04vk41qplx2ixzciabvwy50a1sld7vs46q4w"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.630.tar.gz; + sha256 = "18szayj2bl28fm9frf9v1dwncj67bx3rvw8ny1zwbvc6alshs5ji"; }; meta = { homepage = http://dbi.perl.org/; @@ -2431,10 +2431,10 @@ rec { }; DevelSymdump = buildPerlPackage rec { - name = "Devel-Symdump-2.08"; + name = "Devel-Symdump-2.11"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "0qzj68zw1yypk8jw77h0w5sdpdcrp4xcmgfghcfyddjr2aim60x5"; + sha256 = "0i5m2w8rsmp5lqi1y5y6b6938pidpz9hg92xahrshaddph00358i"; }; propagatedBuildInputs = [ TestPod /* cyclic dependency: TestPodCoverage */ @@ -2967,20 +2967,20 @@ rec { }; EmailValid = buildPerlPackage { - name = "Email-Valid-0.179"; + name = "Email-Valid-1.192"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-0.179.tar.gz; - sha256 = "13yfjll63cp1y4xqzdcr1mjhfncn48v6hckk5mvwi47w3ccj934a"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.192.tar.gz; + sha256 = "0vpqgbr5bj4bvrd7c2fh9hs1mz0m6nfybl2rdn5yb4h67bmxfkbp"; }; propagatedBuildInputs = [MailTools NetDNS]; doCheck = false; }; Encode = buildPerlPackage { - name = "Encode-2.44"; + name = "Encode-2.55"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.44.tar.gz; - sha256 = "c121f9c8ae03e718d1b5d5465d66bb3138af429188735966326656f99a9499c6"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.55.tar.gz; + sha256 = "0bpnfan0034k644gz6yg9xfddmsqxr2p7vbavijwbxc5k2c2sarz"; }; }; @@ -3106,10 +3106,10 @@ rec { }; ExtUtilsCBuilder = buildPerlPackage rec { - name = "ExtUtils-CBuilder-0.280205"; + name = "ExtUtils-CBuilder-0.280212"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0nfrr3zd71gnsbp5xacdb70n17slrzj421s4nyr11zg5cqsj3ngs"; + sha256 = "0zc4hkcb8wk7nm0b2b6pb1lpih52blx6x2w6x99bcr0d581807xg"; }; buildInputs = [ PerlOSType ]; }; @@ -3186,10 +3186,10 @@ rec { }; ExtUtilsMakeMaker = buildPerlPackage rec{ - name = "ExtUtils-MakeMaker-6.66"; + name = "ExtUtils-MakeMaker-6.84"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "1w9pbjajas60a9i29j8h10nz9jf86w7jb197llnfs9fqcf4yvfha"; + sha256 = "1s3fn1fkm9l6pjhz7dbzsc6nhw1jm2hpf08fqhsqh1h50nj5pv5b"; }; propagatedBuildInputs = [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta @@ -3198,18 +3198,18 @@ rec { }; ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.61"; + name = "ExtUtils-Manifest-1.63"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "18jj4lrip2g580b2fw5khxvdx6h3pavgihvb87snggrlgabpj20n"; + sha256 = "0p4hj03nb5n6mk7pskpw066n1i3hr80nq7k7rc3fgl329v6syfmg"; }; }; ExtUtilsParseXS = buildPerlPackage rec { - name = "ExtUtils-ParseXS-3.18"; + name = "ExtUtils-ParseXS-3.22"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0kvbx66vncgk2c72994z31bgh2w3rsrlnx0z7cmxqa7w3hlc4741"; + sha256 = "03i93xfm9064vg2z70mcfwpnbmciafzrng113vmb8w8g117pvr84"; }; }; @@ -3234,10 +3234,10 @@ rec { }; ExtUtilsTypemapsDefault = buildPerlModule rec { - name = "ExtUtils-Typemaps-Default-1.01"; + name = "ExtUtils-Typemaps-Default-1.05"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0k03rr7bmhnn6j0505w9id5apss85yvqnx76hxf3javn3klj1m5z"; + sha256 = "1phmha0ks95kvzl00r1kgnd5hvg7qb1q9jmzjmw01p5zgs1zbyix"; }; propagatedBuildInputs = [ ExtUtilsTypemap ExtUtilsParseXS ]; }; @@ -3303,10 +3303,10 @@ rec { }; Filechdir = buildPerlPackage rec { - name = "File-chdir-0.1006"; + name = "File-chdir-0.1008"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "b26e91f8b5480544da599412612ff9287007be9703d41c35251f09c5ff19879a"; + sha256 = "0n8dz80fgk3shfxncyr4aff5hnsd846c5np6d68kc0mxqj2g0flr"; }; }; @@ -3454,10 +3454,10 @@ rec { }; FileRemove = buildPerlPackage rec { - name = "File-Remove-1.42"; + name = "File-Remove-1.52"; src = fetchurl { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "2ec2643c4e1a721965ed70ce184b72ae831c82b577420612a59eba8a0ce2a504"; + sha256 = "1p8bal9qhwkjbghivxn1d5m3qdj2qwm1agrjbmakm6la9dbxqm21"; }; }; @@ -3592,10 +3592,10 @@ rec { }; GD = buildPerlPackage rec { - name = "GD-2.49"; + name = "GD-2.50"; src = fetchurl { url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; - sha256 = "03wwvhvni22cs7arai7d3wkb2qfa9p20grrb32hdxv41nqxqpihh"; + sha256 = "1qm8l0z2568byw4zmaqf954y3rm8nzx1nnz6cxnxd3d4cz894lvd"; }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype @@ -3630,20 +3630,20 @@ rec { }; GeoIP = buildPerlPackage rec { - name = "Geo-IP-1.39"; + name = "Geo-IP-1.43"; src = fetchurl { url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; - sha256 = "1yc0rn67nk4z8aq8d82axhfmgi0l91rkksqbf27ylasrhyb6ykx5"; + sha256 = "0p7mcn4rzvhrblx72f5a1yg88mqgv6f46mq0rvhhkmkpwckb0yjq"; }; makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; doCheck = false; # seems to access the network }; GetoptLong = buildPerlPackage rec { - name = "Getopt-Long-2.38"; + name = "Getopt-Long-2.42"; src = fetchurl { url = "mirror://cpan/authors/id/J/JV/JV/${name}.tar.gz"; - sha256 = "0lrsm8vlqhdnkzfvyaiyfivmaar0rirrnwa2v0qk6l130a497mky"; + sha256 = "12c5pvmx0jxx0mls8qll9ixb1lbacs7p1rwvmciv0dvw3w25dmr7"; }; }; @@ -3853,11 +3853,12 @@ rec { }; HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-0.09007"; + name = "HTML-FormFu-0.09010"; src = fetchurl { url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; - sha256 = "1yg9fy6s8f1jscfxf7a9hm91x43cjhk3ijw46z94sw8133h50rvy"; + sha256 = "08hf6z35yhfd1521ip8x5hpwb7h09k643s9sqf6ddmi9yvqini1k"; }; + buildInputs = [ CGISimple ]; propagatedBuildInputs = [ ClassAccessorChained Clone ConfigAny DateCalc ListMoreUtils EmailValid @@ -3888,10 +3889,10 @@ rec { }; HTMLParser = buildPerlPackage { - name = "HTML-Parser-3.69"; + name = "HTML-Parser-3.71"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.69.tar.gz; - sha256 = "01i4lj37dgwbj9mna756dzzz5lvx7adcnjk9s0hskqq0cn81r2vl"; + url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.71.tar.gz; + sha256 = "00nqzdgl7c3jilx7mil19k5jwcw3as14pvkjgxi97zyk94vqp4dy"; }; propagatedBuildInputs = [ HTMLTagset ]; meta = { @@ -3956,10 +3957,10 @@ rec { }; HTMLTokeParserSimple = buildPerlPackage rec { - name = "HTML-TokeParser-Simple-3.15"; + name = "HTML-TokeParser-Simple-3.16"; src = fetchurl { url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; - sha256 = "0ii1ww17h7wps1lcj7bxrjbisa37f6cvlm0xxpgfq1s6iy06q05b"; + sha256 = "17aa1v62sp8ycxcicwhankmj4brs6nnfclk9z7mf1rird1f164gd"; }; propagatedBuildInputs = [HTMLParser SubOverride]; buildInputs = [TestPod]; @@ -4163,10 +4164,10 @@ rec { }; IOAll = buildPerlPackage { - name = "IO-All-0.46"; + name = "IO-All-0.50"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/IO-All-0.46.tar.gz; - sha256 = "0rqv270gi7x4sjicfwf1hiqvicwlj3s0zyi2cxqwrc8q9hs2pdya"; + url = mirror://cpan/authors/id/I/IN/INGY/IO-All-0.50.tar.gz; + sha256 = "13mc913jqqfkaily48cd886x0n6x6zw59c00fmkhqc97xh1kdckc"; }; propagatedBuildInputs = [ IOString ]; meta = { @@ -4187,10 +4188,10 @@ rec { }; IOCompress = buildPerlPackage { - name = "IO-Compress-2.060"; + name = "IO-Compress-2.063"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.060.tar.gz; - sha256 = "03zaq9xzg0z9wcgj1hws8zhzdgdlwiz48nh6sy663bn7rzxm5k28"; + url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.063.tar.gz; + sha256 = "1198jqsfyshc8pc74dvn04gmqa0x6nwngkbf731zgd4chrjlylhd"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { @@ -4252,10 +4253,10 @@ rec { }; IOSocketInet6 = buildPerlPackage rec { - name = "IO-Socket-INET6-2.69"; + name = "IO-Socket-INET6-2.71"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "accd565643969d905e199e28e60e833213ccc2026c372432df01e49b044c3045"; + sha256 = "041iv3fdskvk7in73bf7253ah9aiqwxzi4zxfiwkn0jlb7mnqjrl"; }; propagatedBuildInputs = [Socket6]; doCheck = false; @@ -4330,10 +4331,10 @@ rec { }; IPCRun3 = buildPerlPackage rec { - name = "IPC-Run3-0.043"; + name = "IPC-Run3-0.046"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "96b534e07e1459529ac12a77393628366f30d122b0dfaaa3ed5ec032079097ad"; + sha256 = "033miv4z6g50q71blj8l1g846frngm1v5l3mcv38dslkjqimxxp4"; }; }; @@ -4346,11 +4347,11 @@ rec { }; ImageExifTool = buildPerlPackage rec { - name = "Image-ExifTool-8.41"; + name = "Image-ExifTool-9.27"; src = fetchurl { url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "1fdjic0bhbai8zzl3287i9wcs88khiv8qx5slx9n3gzvbnxacvqg"; + sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c"; }; meta = { @@ -4443,11 +4444,12 @@ rec { }; JSON = buildPerlPackage { - name = "JSON-2.53"; + name = "JSON-2.90"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.53.tar.gz; - sha256 = "0rfms17d0pkai26kqyzaylbr5wxcrrhyjkyshq85l41xb0g1iplh"; + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz; + sha256 = "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd"; }; + buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; license = "perl"; @@ -4468,10 +4470,10 @@ rec { }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-2.27200"; + name = "JSON-PP-2.27203"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27200.tar.gz; - sha256 = "1lv9riws9f72gya2fsp5jvbd1fbzyi8423x38a491ryy9cai2ph3"; + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27203.tar.gz; + sha256 = "0ljwya1fb4969pckcq2j1g6axgx8qh9yscxbs6qf62qxf8wkj1mp"; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -4689,10 +4691,10 @@ rec { }; LogDispatch = buildPerlPackage { - name = "Log-Dispatch-2.39"; + name = "Log-Dispatch-2.41"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.39.tar.gz; - sha256 = "1bi2nza0nc66i0ls2zkxi6bbwkh456pl0q8h57mq6skbhbmcwbb8"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.41.tar.gz; + sha256 = "0vsmlkx2g9lc13pl9v96kn575yszfvd79a236b8v0s1di83gm09z"; }; propagatedBuildInputs = [ ClassLoad ParamsValidate ]; meta = { @@ -4846,10 +4848,10 @@ rec { }; MailDKIM = buildPerlPackage rec { - name = "Mail-DKIM-0.39"; + name = "Mail-DKIM-0.40"; src = fetchurl { url = "mirror://cpan/authors/id/J/JA/JASLONG/${name}.tar.gz"; - sha256 = "b1425a540f514c483e80566fb3decc2c1db4162306f6ae8794cef72a2d73557b"; + sha256 = "1wd6mab4fp47v1nh85jfxsjmysnyv5mwvfv47cn5m2h2lb1s0piw"; }; propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ]; doCheck = false; # tries to access the domain name system @@ -5002,10 +5004,10 @@ rec { }; MIMEBase64 = buildPerlPackage rec { - name = "MIME-Base64-3.09"; + name = "MIME-Base64-3.14"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "1gi2zyxwkkmyng8jawfnbxpsybvybz6h6ryq0wfdljmmjpjbmzzc"; + sha256 = "1qbcipxij7pv25qhnfdc2lnkqi2cf60frlhlh86gjxslc8kr8nhj"; }; }; @@ -5019,10 +5021,10 @@ rec { }; MIMETypes = buildPerlPackage { - name = "MIME-Types-1.38"; + name = "MIME-Types-2.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.38.tar.gz; - sha256 = "12m8cvj80qbwxckj5jildl5zw6p1jincj3m1s77z6lnw3h59rj4l"; + url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.04.tar.gz; + sha256 = "13yci99n8kl8p4ac5n5f1j968p7va2phlvfc5qgpnn1d6yfhddi2"; }; meta = { description = "Definition of MIME types"; @@ -5081,10 +5083,10 @@ rec { }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-2.97"; + name = "Module-CoreList-3.01"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-2.97.tar.gz; - sha256 = "fa39c487d43088e7010467621f57d8e3f57b72d2bbf711fc509e87a501f35e09"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-3.01.tar.gz; + sha256 = "10vf18x9qk4hdpwazxq8c0qykals36dxj0bjazqqcbp5xfb4fnyg"; }; meta = { homepage = http://dev.perl.org/; @@ -5179,10 +5181,10 @@ rec { }; ModuleMetadata = buildPerlPackage rec { - name = "Module-Metadata-1.000005"; + name = "Module-Metadata-1.000019"; src = fetchurl { url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; - sha256 = "04xxs3542mqdadcs2bdlpyldmbbxdn9x0gwjnyy5p1d5c3ajnq9k"; + sha256 = "0m755qn44nasbaj578628jgdqg0k4ldyn6fm3880hdi1q16skz2s"; }; propagatedBuildInputs = [ version ]; }; @@ -5644,10 +5646,10 @@ rec { }; MooseXSetOnce = buildPerlPackage rec { - name = "MooseX-SetOnce-0.200001"; + name = "MooseX-SetOnce-0.200002"; src = fetchurl { url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6"; + sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose ]; @@ -6389,10 +6391,10 @@ rec { }; ParseCPANMeta = buildPerlPackage rec { - name = "Parse-CPAN-Meta-1.4404"; + name = "Parse-CPAN-Meta-1.4409"; src = fetchurl { url = "mirror://cpan/modules/by-module/Parse/${name}.tar.gz"; - sha256 = "1y4mr5hmkkl405x4v31kx2nmlahpg0c38k8s65vgqc4s28wxafmh"; + sha256 = "0b7cp78zajmwf4a0968p3b2bb00axkxj3a9nq1rx8cb17hhva819"; }; propagatedBuildInputs = [ CPANMetaYAML JSONPP ]; }; @@ -6512,10 +6514,10 @@ rec { }; PerlTidy = buildPerlPackage rec { - name = "Perl-Tidy-20090616"; + name = "Perl-Tidy-20130922"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz"; - sha256 = "c7ca21e287d23c769c235f6742fab7b5779b7c7bf58b6a55ba8cdc492e50a118"; + sha256 = "0qmp6308917lsvms5dbihdj85cnkhy821azc5i6q3p3703qdd375"; }; }; @@ -6658,10 +6660,10 @@ rec { }; Perl6Junction = buildPerlPackage rec { - name = "Perl6-Junction-1.40000"; + name = "Perl6-Junction-1.60000"; src = fetchurl { url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz"; - sha256 = "0sgv8hqrkhx73bcb5jyi8a0b3v5bxqr3aziram1zndx43i1knzp4"; + sha256 = "0r3in9pyrm6wfrhcvxbq5w1617x8x5537lxj9hdzks4pa7l7a8yh"; }; }; @@ -6680,10 +6682,10 @@ rec { }; PerlPrereqScanner = buildPerlPackage { - name = "Perl-PrereqScanner-1.016"; + name = "Perl-PrereqScanner-1.018"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.016.tar.gz; - sha256 = "1ab70723f3d036ef91684572beacab40bf99f5ed69922769aa077664c778c474"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.018.tar.gz; + sha256 = "11zkam8svpgcjhjda0ap3afd797a69ndcc64fy3xw0j8v8kxa6hc"; }; buildInputs = [ PPI TryTiny ]; propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ]; @@ -6827,10 +6829,10 @@ rec { }; PodWeaver = buildPerlPackage { - name = "Pod-Weaver-3.101638"; + name = "Pod-Weaver-4.004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-3.101638.tar.gz; - sha256 = "1232b761016221e331a266a42661fa352447d0da075ebdb41dc4c4d71e60629c"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.004.tar.gz; + sha256 = "0hw500qkbmnwm385za5x7ypijx0lqk8cfc9jq232v95ka0hqcg29"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli Moose MooseAutobox ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; @@ -7216,10 +7218,10 @@ rec { }; Starman = buildPerlModule { - name = "Starman-0.3011"; + name = "Starman-0.4008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.3011.tar.gz; - sha256 = "f700e1e9fa8a56609db1b75878ccfbbccfda32454c32e3c33912a1776f583cf2"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4008.tar.gz; + sha256 = "06fc3yp3nmi26d7lcfqanwwk5jxsmqmidyr8n2qfrsa0r7d07c88"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ DataDump HTTPDate HTTPMessage HTTPParserXS NetServer Plack TestTCP ]; @@ -7544,10 +7546,10 @@ rec { }; SubInstall = buildPerlPackage { - name = "Sub-Install-0.926"; + name = "Sub-Install-0.927"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.926.tar.gz; - sha256 = "0gkns6p11j46j6yzacanhbqgd4ws5r0ppg6yivz7cjbq8dk4kcmc"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.927.tar.gz; + sha256 = "0nmgsdbwi8f474jkyd6w9jfnpav99xp8biydcdri8qri623f6plm"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -8049,10 +8051,10 @@ rec { }; TestFatal = buildPerlPackage { - name = "Test-Fatal-0.010"; + name = "Test-Fatal-0.013"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.010.tar.gz; - sha256 = "01ck4wyrj4nqyr1cz3lcff6g9nryadsflpf85jmsa6vcl2bq8pl0"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.013.tar.gz; + sha256 = "1rrndzkjff3bdlzzdsfsd3fhng142la2m74ihkgv17islkp17yq2"; }; propagatedBuildInputs = [ TryTiny ]; meta = { @@ -8264,10 +8266,10 @@ rec { }; TestPod = buildPerlPackage { - name = "Test-Pod-1.45"; + name = "Test-Pod-1.48"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.45.tar.gz; - sha256 = "0yv0bglm4b9zfi9l5z6x2dy6pzlh8n5z9yl7py5v6h48mwgk74fk"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.48.tar.gz; + sha256 = "1hmwwhabyng4jrnll926b4ab73r40w3pfchlrvs0yx6kh6kwwy14"; }; meta = { homepage = http://search.cpan.org/dist/Test-Pod/; @@ -8409,10 +8411,10 @@ rec { }; TestTester = buildPerlPackage { - name = "Test-Tester-0.108"; + name = "Test-Tester-0.109"; src = fetchurl { - url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.108.tar.gz; - sha256 = "1pby9w41b7z0cgnxpgkh397x7z68855sjg5yda48r6lck3lga62h"; + url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.109.tar.gz; + sha256 = "0m9n28z09kq455r5nydj1bnr85lvmbfpcbjdkjfbpmfb5xgciiyk"; }; }; @@ -9308,10 +9310,10 @@ rec { }; XMLTwig = buildPerlPackage { - name = "XML-Twig-3.32"; + name = "XML-Twig-3.44"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.32.tar.gz; - sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v"; + url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.44.tar.gz; + sha256 = "1fi05ddq4dqpff7xvgsw2rr8p5bah401gmblyb3pvjg225ic2l96"; }; propagatedBuildInputs = [XMLParser]; doCheck = false; # requires lots of extra packages diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33d4f5734e2..74eef17950f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1000,6 +1000,29 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); + configshell_fb = buildPythonPackage rec { + version = "1.1.fb10"; + name = "configshell-fb-${version}"; + + src = fetchurl { + url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz"; + sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy"; + }; + + propagatedBuildInputs = [ + pyparsing + modules.readline + urwid + ]; + + meta = { + description = "A Python library for building configuration shells"; + homepage = "https://github.com/agrover/configshell-fb"; + platforms = stdenv.lib.platforms.linux; + }; + }; + + construct = buildPythonPackage rec { name = "construct-2.5.1"; @@ -4670,11 +4693,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pygit2 = buildPythonPackage rec { - name = "pygit2-0.18.1"; + name = "pygit2-0.20.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz"; - md5 = "8d27f84509a96d6791a6c393ae67d7c8"; + sha256 = "04132q7bn8k7q7ky7nj3bkza8r9xkzkdpfv462b6rgjsd1x6h340"; }; preConfigure = ( if stdenv.isDarwin then '' @@ -5360,11 +5383,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pysvn = pkgs.stdenv.mkDerivation { - name = "pysvn-1.7.6"; + name = "pysvn-1.7.8"; src = fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.6.tar.gz"; - sha256 = "0wwb9h3rw2r8hzqya8mv5z8pgjpa6y3i15a3cccdv2mil44289a7"; + url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.8.tar.gz"; + sha256 = "1qk7af0laby1f79bd07l9p0dxn5xmcmfwlcb9l1hk29zwwq6x4v0"; }; buildInputs = [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] @@ -5797,6 +5820,21 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + rtslib_fb = buildPythonPackage rec { + version = "2.1.fb43"; + name = "rtslib-fb-${version}"; + + src = fetchurl { + url = "https://github.com/agrover/rtslib-fb/archive/v${version}.tar.gz"; + sha256 = "1b59vyy12g6rix9l2fxx0hjiq33shkb79v57gwffs57vh74wc53v"; + }; + + meta = { + description = "A Python object API for managing the Linux LIO kernel target"; + homepage = "https://github.com/agrover/rtslib-fb"; + platforms = stdenv.lib.platforms.linux; + }; + }; seqdiag = buildPythonPackage rec { name = "seqdiag-0.9.0"; @@ -6460,6 +6498,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { # doCheck = false; # }; + targetcli_fb = buildPythonPackage rec { + version = "2.1.fb33"; + name = "targetcli-fb-${version}"; + + src = fetchurl { + url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz"; + sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42"; + }; + + propagatedBuildInputs = [ + configshell_fb + rtslib_fb + ]; + + meta = { + description = "A command shell for managing the Linux LIO kernel target"; + homepage = "https://github.com/agrover/targetcli-fb"; + platforms = stdenv.lib.platforms.linux; + }; + }; + taskcoach = buildPythonPackage rec { name = "TaskCoach-1.3.22"; @@ -6860,12 +6919,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { webob = buildPythonPackage rec { - version = "1.2.3"; + version = "1.3.1"; name = "webob-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.tar.gz"; - md5 = "11825b7074ba7043e157805e4e6e0f55"; + md5 = "20918251c5726956ba8fef22d1556177"; }; propagatedBuildInputs = [ nose modules.ssl ]; @@ -7620,11 +7679,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { cliapp = buildPythonPackage rec { name = "cliapp-${version}"; - version = "1.20130313"; + version = "1.20130808"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz"; - sha256 = "0rk13a68668gsrv6yqgzqxskffqnlyjar4qav6k5iyrp77amn7qm"; + sha256 = "0i9fqkahrc16mnxjw8fcr4hwrq3ibfrj2lzzbzzb7v5yk5dlr532"; }; buildInputs = [ sphinx ]; @@ -7713,11 +7772,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { tracing = buildPythonPackage rec { - name = "tracing-0.7"; + name = "tracing-${version}"; + version = "0.8"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.7.orig.tar.gz"; - sha256 = "9954a1b0cc6b957d15975b048f929bbdd46766d397a6fa51bf8f6498b9459276"; + url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; + sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0"; }; buildInputs = [ sphinx ]; @@ -7752,11 +7812,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { ttystatus = buildPythonPackage rec { name = "ttystatus-${version}"; - version = "0.22"; + version = "0.23"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz"; - sha256 = "1hzv0sbrvgcmafflhvzh7plci0dg7wcjlk39i8kqdasg6rw0ag6f"; + sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y"; }; buildInputs = [ sphinx ]; @@ -7773,11 +7833,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { larch = buildPythonPackage rec { name = "larch-${version}"; - version = "1.20130316"; + version = "1.20131130"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz"; - sha256 = "1mkvmy0jdzd7dlvdx2a75wsbj5qw1clawcgndx9jwl816a9iy225"; + sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7"; }; buildInputs = [ sphinx ]; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 05a3ea5fb81..fdf8a28fbca 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -334,7 +334,6 @@ let ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ffmpeg_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; |