From 911507831480b6b5ea3cb8795a00748e0a0991b8 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 18 Oct 2013 12:27:14 +0100 Subject: [PATCH 01/25] haskellPackages.comonadTransformers: Do not build haddocks This package no library provides any modules, so there are no haddocks to build. --- .../libraries/haskell/comonad-transformers/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index 912b36057c0..943a0718e03 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -5,10 +5,12 @@ cabal.mkDerivation (self: { version = "4.0"; sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z"; buildDepends = [ comonad ]; + noHaddock = true; meta = { homepage = "http://github.com/ekmett/comonad-transformers/"; description = "This package has been merged into comonad 4.0"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) From 2087f8dec3bcf34452a12125c49cb4fae0ec6655 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Oct 2013 16:22:12 +0200 Subject: [PATCH 02/25] Remove unused manual file --- nixos/doc/manual/userconfiguration.xml | 80 -------------------------- 1 file changed, 80 deletions(-) delete mode 100644 nixos/doc/manual/userconfiguration.xml diff --git a/nixos/doc/manual/userconfiguration.xml b/nixos/doc/manual/userconfiguration.xml deleted file mode 100644 index 7c6540caf3a..00000000000 --- a/nixos/doc/manual/userconfiguration.xml +++ /dev/null @@ -1,80 +0,0 @@ - - -Configuration in home directory - - - - -
-Compiz Fusion - - Compiz Fusion is just a set of plugins for Compiz. Your best interest is to have - them found both by Compiz and by Compiz Configuration Settings (also in Compiz Fusion - distribution). By default they look in Compiz installation path and in home directory. - You do not need to track /nix/store manually - everything is already in - /run/current-system/sw/share. - - - $HOME/.compiz/plugins - should contain plugins you want to load. All the installed - plugins are available in - /run/current-system/sw/share/compiz-plugins/compiz/, - so you can use symlinks to this directory. - - - $HOME/.compiz/metadata - should contain metadata (definition of configuration options) for plugins - you want to load. All the installed metadata is available in - /run/current-system/sw/share/compiz/, - so you can use symlinks to this directory. - - - - Probably a way to load GConf configuration backend by default - should be found, but if you run Compiz with - GConf configuration (default for X server job - for now), you have to link - /run/current-system/sw/share/compizconfig/backends/ - into $HOME/.compizconfig/backends directory. - - - - - To summarize the above, these are the commands you have to execute - ln -s /run/current-system/sw/share/compiz/ $HOME/.compiz/metadata - ln -s /run/current-system/sw/share/compiz-plugins/compiz/ $HOME/.compiz/plugins - ln -s /run/current-system/sw/share/compizconfig/backends/ $HOME/.compizconfig/backends - - Now you can launch ccsm and configure everything. You should select - GConf as a backend in the preferences menu of ccsm - -
- -
-Pidgin-LaTeX - - To have pidgin-latex plugin working after installation, you need the following: - - - Symlink /run/current-system/sw/share/pidgin-latex/pidgin-latex.so - to $HOME/.purple/plugins/pidgin-latex.so - - - Enable smileys. If you do not want to, you can create - $HOME/.purple/smileys/empty/theme with the following contents: - - Name=Empty - Description=No predefined smileys - Author=Nobody - - Enabling this theme will enable smileys, but define none. - - - Enable the plugin. - - - -
- - From 2402a250a17c41c429dae423fb496127c0797a44 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Oct 2013 13:44:30 +0200 Subject: [PATCH 03/25] sleuthkit: Rewrite to mkDerivation --- pkgs/tools/system/sleuthkit/default.nix | 56 +++++++------------------ 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 86ec54ecb8f..0148e3c699e 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,48 +1,24 @@ -x@{builderDefsPackage - , libewf, afflib, openssl, zlib - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, libewf, afflib, openssl, zlib }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="sleuthkit"; - version="3.2.2"; - name="${baseName}-${version}"; - url="mirror://sourceforge/project/${baseName}/${baseName}/${version}/${name}.tar.gz"; - hash="02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "sleuthkit-3.2.2"; + + src = fetchurl { + url = "mirror://sourceforge/sleuthkit/${name}.tar.gz"; + sha256 = "02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + enableParallelBuilding = true; + + buildInputs = [ libewf afflib openssl zlib ]; + + # Hack to fix the RPATH. + preFixup = "rm -rf */.libs"; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { description = "A forensic/data recovery tool"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; license = "IBM Public License"; }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/sleuthkit/files/sleuthkit"; - }; - }; -}) x - +} From f5f1bfa30a37784222fac84c422f595273f8ef5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 18 Oct 2013 18:50:21 +0200 Subject: [PATCH 04/25] add ike: IPSec client --- pkgs/applications/ike/default.nix | 39 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/ike/default.nix diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix new file mode 100644 index 00000000000..52330b57b8f --- /dev/null +++ b/pkgs/applications/ike/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper, gcc }: + +# NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; +# launch with "iked -f /etc/iked.conf" + +stdenv.mkDerivation rec { + name = "ike-2.2.1"; + + src = fetchurl { + url = "https://www.shrew.net/download/ike/${name}-release.tgz"; + sha256 = "0fhyr2psd93b0zf7yfb72q3nqnh65mymgq5jpjcsj9jv5kfr6l8y"; + }; + + buildInputs = [ cmake openssl libedit flex bison qt4 makeWrapper ]; + + configurePhase = '' + mkdir -p $out/{bin,sbin,lib} + cmake -DQTGUI=YES -DETCDIR=$out/etc -DLIBDIR=$out/lib -DSBINDIR=$out/sbin -DBINDIR=$out/bin -DMANDIR=$out/man -DNATT=YES -DCMAKE_INSTALL_PREFIX:BOOL=$out + ''; + + buildPhase = '' + make + ''; + + installPhase = '' + make install + for file in "$out"/bin/* "$out"/sbin/*; do + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${libedit}/lib:${qt4}/lib" + done + ''; + + meta = with stdenv.lib; { + homepage = https://www.shrew.net/software; + description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; + platforms = platforms.unix; + maintainers = [ maintainers.iElectric ]; + license = "sleepycat"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e43fdd4243d..c0f7cb59d5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8029,6 +8029,8 @@ let ii = callPackage ../applications/networking/irc/ii { }; + ike = callPackage ../applications/ike { }; + ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext From 745a08d4c4f55106efea1d989c257495c9b8d992 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 18 Oct 2013 22:32:27 +0300 Subject: [PATCH 05/25] libtxc_dxtn: get rid of duplicate package, clean up build script. --- pkgs/development/libraries/libtxc_dxtn/default.nix | 11 +++++------ pkgs/development/libraries/libxtc_dxtn/default.nix | 12 ------------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/libxtc_dxtn/default.nix diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 9cf8decf4c8..33e01f86dac 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, mesa }: +{ stdenv, fetchurl, autoreconfHook, mesa }: let version = "1.0.1"; in @@ -6,15 +6,14 @@ stdenv.mkDerivation rec { name = "libtxc_dxtn-${version}"; src = fetchurl { - url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz"; - sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv"; + url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; - buildInputs = [ autoconf automake libtool mesa ]; - - preConfigure = "autoreconf -vfi"; + buildInputs = [ autoreconfHook mesa ]; meta = { homepage = http://dri.freedesktop.org/wiki/S3TC; + repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn; }; } diff --git a/pkgs/development/libraries/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix deleted file mode 100644 index 1f94bcbef99..00000000000 --- a/pkgs/development/libraries/libxtc_dxtn/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, mesa }: - -stdenv.mkDerivation rec { - name = "libtxc_dxtn-1.0.1"; - - src = fetchurl { - url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; - sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; - }; - - NIX_CFLAGS_COMPILE = "-I ${mesa}/include"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0f7cb59d5e..3bfa1e815ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5099,8 +5099,6 @@ let libxslt = callPackage ../development/libraries/libxslt { }; - libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { }; - libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { inherit fetchurl stdenv; }); From 5c1bafa4c3f9a01a949893bc7ea6bb2b64a11f2d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Oct 2013 15:55:14 -0400 Subject: [PATCH 06/25] Update nodePackages and add meat nodePackage Fixes #1057 Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 593 +++++++++++++++------ pkgs/top-level/node-packages.json | 1 + 2 files changed, 420 insertions(+), 174 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 52a9f33cafa..18ec19437db 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -183,11 +183,11 @@ passthru.names = [ "ambi" ]; }; full."amdefine"."*" = lib.makeOverridable self.buildNodePackage { - name = "amdefine-0.0.8"; + name = "amdefine-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz"; - sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0"; + url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; + sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227"; }) ]; buildInputs = @@ -200,11 +200,11 @@ }; "amdefine" = self.full."amdefine"."*"; full."amdefine".">=0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "amdefine-0.0.8"; + name = "amdefine-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz"; - sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0"; + url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; + sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227"; }) ]; buildInputs = @@ -643,11 +643,11 @@ passthru.names = [ "async" ]; }; full."aws-sdk"."*" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.7.1"; + name = "aws-sdk-1.9.0"; src = [ (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.7.1.tgz"; - sha1 = "802748ea85a6c508b8665bbf22050c879af17695"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.9.0.tgz"; + sha1 = "b4b0c2c954d07c40fa036447fae63181b4f83770"; }) ]; buildInputs = @@ -662,11 +662,11 @@ }; "aws-sdk" = self.full."aws-sdk"."*"; full."aws-sdk".">=1.2.0 <2" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.7.1"; + name = "aws-sdk-1.9.0"; src = [ (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.7.1.tgz"; - sha1 = "802748ea85a6c508b8665bbf22050c879af17695"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.9.0.tgz"; + sha1 = "b4b0c2c954d07c40fa036447fae63181b4f83770"; }) ]; buildInputs = @@ -712,11 +712,11 @@ passthru.names = [ "aws-sign" ]; }; full."backbone"."*" = lib.makeOverridable self.buildNodePackage { - name = "backbone-1.0.0"; + name = "backbone-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/backbone/-/backbone-1.0.0.tgz"; - sha1 = "5e146e1efa8a5361462e578377c39ed0f16b0b4c"; + url = "http://registry.npmjs.org/backbone/-/backbone-1.1.0.tgz"; + sha1 = "a3c845ea707dc210aa12b0dc16fceca4bbc18a3e"; }) ]; buildInputs = @@ -1178,11 +1178,11 @@ passthru.names = [ "broadway" ]; }; full."browserchannel"."*" = lib.makeOverridable self.buildNodePackage { - name = "browserchannel-1.0.7"; + name = "browserchannel-1.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.7.tgz"; - sha1 = "0966d021d6001011f3fae3377db4bd2992458b57"; + url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz"; + sha1 = "96da83d139d8943f5bd616c334f148bd008dbac4"; }) ]; buildInputs = @@ -1379,18 +1379,18 @@ passthru.names = [ "cardinal" ]; }; full."chai"."*" = lib.makeOverridable self.buildNodePackage { - name = "chai-1.8.0"; + name = "chai-1.8.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/chai/-/chai-1.8.0.tgz"; - sha1 = "1f7accbe91e2e71a08d8208b31bbbdc6862699ac"; + url = "http://registry.npmjs.org/chai/-/chai-1.8.1.tgz"; + sha1 = "cc77866d5e7ebca2bd75144b1edc370a88785f72"; }) ]; buildInputs = (self.nativeDeps."chai"."*" or []); deps = [ self.full."assertion-error"."1.0.0" - self.full."deep-eql"."0.1.2" + self.full."deep-eql"."0.1.3" ]; peerDependencies = [ ]; @@ -2090,23 +2090,6 @@ ]; passthru.names = [ "commander" ]; }; - full."commander"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "commander-1.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz"; - sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e"; - }) - ]; - buildInputs = - (self.nativeDeps."commander"."1.2.0" or []); - deps = [ - self.full."keypress"."0.1.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; - }; full."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage { name = "commander-2.0.0"; src = [ @@ -2212,6 +2195,25 @@ ]; passthru.names = [ "configstore" ]; }; + full."connect"."1.x" = lib.makeOverridable self.buildNodePackage { + name = "connect-1.9.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + }) + ]; + buildInputs = + (self.nativeDeps."connect"."1.x" or []); + deps = [ + self.full."qs".">= 0.4.0" + self.full."mime".">= 0.0.1" + self.full."formidable"."1.0.x" + ]; + peerDependencies = [ + ]; + passthru.names = [ "connect" ]; + }; full."connect"."2.7.11" = lib.makeOverridable self.buildNodePackage { name = "connect-2.7.11"; src = [ @@ -2290,16 +2292,16 @@ ]; passthru.names = [ "connect" ]; }; - full."connect"."2.9.0" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.9.0"; + full."connect"."2.9.1" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.9.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.9.0.tgz"; - sha1 = "ecf478b6f2723e72cf9a19d1c7d19d0b37b53746"; + url = "http://registry.npmjs.org/connect/-/connect-2.9.1.tgz"; + sha1 = "a0a733f2e629b8af85aa0701fbd0737f52549052"; }) ]; buildInputs = - (self.nativeDeps."connect"."2.9.0" or []); + (self.nativeDeps."connect"."2.9.1" or []); deps = [ self.full."qs"."0.6.5" self.full."cookie-signature"."1.0.1" @@ -2312,18 +2314,18 @@ self.full."uid2"."0.0.2" self.full."debug"."*" self.full."methods"."0.0.1" - self.full."multiparty"."2.1.8" + self.full."multiparty"."2.2.0" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; full."connect"."~2" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.9.0"; + name = "connect-2.9.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.9.0.tgz"; - sha1 = "ecf478b6f2723e72cf9a19d1c7d19d0b37b53746"; + url = "http://registry.npmjs.org/connect/-/connect-2.9.1.tgz"; + sha1 = "a0a733f2e629b8af85aa0701fbd0737f52549052"; }) ]; buildInputs = @@ -2340,7 +2342,7 @@ self.full."uid2"."0.0.2" self.full."debug"."*" self.full."methods"."0.0.1" - self.full."multiparty"."2.1.8" + self.full."multiparty"."2.2.0" ]; peerDependencies = [ ]; @@ -2604,6 +2606,22 @@ ]; passthru.names = [ "cookies" ]; }; + full."core-util-is"."~1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "core-util-is-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.0.tgz"; + sha1 = "740c74c400e72707b95cc75d509543f8ad7f83de"; + }) + ]; + buildInputs = + (self.nativeDeps."core-util-is"."~1.0.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "core-util-is" ]; + }; full."couch-login"."~0.1.15" = lib.makeOverridable self.buildNodePackage { name = "couch-login-0.1.18"; src = [ @@ -2936,29 +2954,45 @@ ]; passthru.names = [ "debug" ]; }; - full."deep-eql"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "deep-eql-0.1.2"; + full."debuglog"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "debuglog-0.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.2.tgz"; - sha1 = "b54feed3473a6448fbc198be6a6eca9b95d9c58a"; + url = "http://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz"; + sha1 = "83f4cd091f955f5da7053789727ad506f1010f1c"; }) ]; buildInputs = - (self.nativeDeps."deep-eql"."0.1.2" or []); + (self.nativeDeps."debuglog"."0.0.2" or []); deps = [ - self.full."type-detect"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "debuglog" ]; + }; + full."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "deep-eql-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; + sha1 = "ef558acab8de25206cd713906d74e56930eb69f2"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-eql"."0.1.3" or []); + deps = [ + self.full."type-detect"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "deep-eql" ]; }; full."deep-equal"."*" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.0.0"; + name = "deep-equal-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; - sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.0.tgz"; + sha1 = "81fcefc84551d9d67cccdd80e1fced7f355e146f"; }) ]; buildInputs = @@ -3541,18 +3575,18 @@ passthru.names = [ "events.node" ]; }; full."express"."*" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.0"; + name = "express-3.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.0.tgz"; - sha1 = "6ed289da0d5f55ac30997cf832e5fc36f784071e"; + url = "http://registry.npmjs.org/express/-/express-3.4.1.tgz"; + sha1 = "3b4fb8862b6a1dfce3dc760629833d0cfef9314c"; }) ]; buildInputs = (self.nativeDeps."express"."*" or []); deps = [ - self.full."connect"."2.9.0" - self.full."commander"."1.2.0" + self.full."connect"."2.9.1" + self.full."commander"."2.0.0" self.full."range-parser"."0.0.4" self.full."mkdirp"."0.3.5" self.full."cookie"."0.1.0" @@ -3568,6 +3602,26 @@ passthru.names = [ "express" ]; }; "express" = self.full."express"."*"; + full."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { + name = "express-2.5.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; + sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + }) + ]; + buildInputs = + (self.nativeDeps."express"."2.5.11" or []); + deps = [ + self.full."connect"."1.x" + self.full."mime"."1.2.4" + self.full."qs"."0.4.x" + self.full."mkdirp"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; full."express"."3.2.0" = lib.makeOverridable self.buildNodePackage { name = "express-3.2.0"; src = [ @@ -3623,18 +3677,18 @@ passthru.names = [ "express" ]; }; full."express"."3.x" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.0"; + name = "express-3.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.0.tgz"; - sha1 = "6ed289da0d5f55ac30997cf832e5fc36f784071e"; + url = "http://registry.npmjs.org/express/-/express-3.4.1.tgz"; + sha1 = "3b4fb8862b6a1dfce3dc760629833d0cfef9314c"; }) ]; buildInputs = (self.nativeDeps."express"."3.x" or []); deps = [ - self.full."connect"."2.9.0" - self.full."commander"."1.2.0" + self.full."connect"."2.9.1" + self.full."commander"."2.0.0" self.full."range-parser"."0.0.4" self.full."mkdirp"."0.3.5" self.full."cookie"."0.1.0" @@ -3677,18 +3731,18 @@ passthru.names = [ "express" ]; }; full."express"."~3.4" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.0"; + name = "express-3.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.0.tgz"; - sha1 = "6ed289da0d5f55ac30997cf832e5fc36f784071e"; + url = "http://registry.npmjs.org/express/-/express-3.4.1.tgz"; + sha1 = "3b4fb8862b6a1dfce3dc760629833d0cfef9314c"; }) ]; buildInputs = (self.nativeDeps."express"."~3.4" or []); deps = [ - self.full."connect"."2.9.0" - self.full."commander"."1.2.0" + self.full."connect"."2.9.1" + self.full."commander"."2.0.0" self.full."range-parser"."0.0.4" self.full."mkdirp"."0.3.5" self.full."cookie"."0.1.0" @@ -3855,17 +3909,18 @@ passthru.names = [ "faye-websocket" ]; }; "faye-websocket" = self.full."faye-websocket"."*"; - full."faye-websocket"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "faye-websocket-0.4.4"; + full."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "faye-websocket-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"; - sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc"; + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; + sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be"; }) ]; buildInputs = - (self.nativeDeps."faye-websocket"."0.4.4" or []); + (self.nativeDeps."faye-websocket"."0.7.0" or []); deps = [ + self.full."websocket-driver".">=0.3.0" ]; peerDependencies = [ ]; @@ -4003,11 +4058,11 @@ passthru.names = [ "forEachAsync" ]; }; full."forever"."*" = lib.makeOverridable self.buildNodePackage { - name = "forever-0.10.8"; + name = "forever-0.10.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.10.8.tgz"; - sha1 = "a78137a46fb8ca4adbf2f497d98816a526bb1f82"; + url = "http://registry.npmjs.org/forever/-/forever-0.10.9.tgz"; + sha1 = "e4849f459ec27d5a6524fd466e67dfd6222bd9bb"; }) ]; buildInputs = @@ -4016,7 +4071,7 @@ self.full."colors"."0.6.0-1" self.full."cliff"."0.1.8" self.full."flatiron"."0.3.5" - self.full."forever-monitor"."1.2.2" + self.full."forever-monitor"."1.2.3" self.full."nconf"."0.6.7" self.full."nssocket"."~0.5.1" self.full."optimist"."0.4.0" @@ -4108,19 +4163,19 @@ ]; passthru.names = [ "forever-monitor" ]; }; - full."forever-monitor"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "forever-monitor-1.2.2"; + full."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "forever-monitor-1.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz"; - sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684"; + url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz"; + sha1 = "b27ac3acb6fdcc7315d6cd85830f2d004733028b"; }) ]; buildInputs = - (self.nativeDeps."forever-monitor"."1.2.2" or []); + (self.nativeDeps."forever-monitor"."1.2.3" or []); deps = [ self.full."broadway"."0.2.x" - self.full."minimatch"."0.0.x" + self.full."minimatch"."0.2.x" self.full."pkginfo"."0.x.x" self.full."ps-tree"."0.0.x" self.full."watch"."0.5.x" @@ -4251,6 +4306,22 @@ ]; passthru.names = [ "formidable" ]; }; + full."formidable"."1.0.x" = lib.makeOverridable self.buildNodePackage { + name = "formidable-1.0.14"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + }) + ]; + buildInputs = + (self.nativeDeps."formidable"."1.0.x" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "formidable" ]; + }; full."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "fresh-0.1.0"; src = [ @@ -4460,11 +4531,11 @@ passthru.names = [ "fstream-ignore" ]; }; full."fstream-npm"."~0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "fstream-npm-0.1.5"; + name = "fstream-npm-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.5.tgz"; - sha1 = "8f9fdd38c0940f91f7b6ebda4b6611be88f97ec9"; + url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz"; + sha1 = "1369323075d9bd85cfcc9409f33f0d6fe5be104d"; }) ]; buildInputs = @@ -4478,11 +4549,11 @@ passthru.names = [ "fstream-npm" ]; }; full."generator-angular"."*" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.4.0"; + name = "generator-angular-0.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.4.0.tgz"; - sha1 = "4fbaaa87b829f3f2fc72fac3da1fa47ff801ca1d"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.5.0.tgz"; + sha1 = "f637a6c42984fd949678358be369e413a2e7c6e2"; }) ]; buildInputs = @@ -6073,7 +6144,7 @@ self.full."passport"."*" self.full."passport-http"."*" self.full."js-yaml"."*" - self.full."mongoose"."3.6.x" + self.full."mongoose"."*" self.full."gridfs-stream"."*" self.full."temp"."*" self.full."kue"."*" @@ -6214,6 +6285,24 @@ ]; passthru.names = [ "jade" ]; }; + full."jade"."0.27.0" = lib.makeOverridable self.buildNodePackage { + name = "jade-0.27.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; + sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; + }) + ]; + buildInputs = + (self.nativeDeps."jade"."0.27.0" or []); + deps = [ + self.full."commander"."0.6.1" + self.full."mkdirp"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "jade" ]; + }; full."jade".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { name = "jade-0.35.0"; src = [ @@ -6325,11 +6414,11 @@ passthru.names = [ "joe-reporter-console" ]; }; full."js-yaml"."*" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-2.1.2"; + name = "js-yaml-2.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.2.tgz"; - sha1 = "5404d58972f70112763e0b7e97ced20c39138bbd"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; + sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; }) ]; buildInputs = @@ -6396,11 +6485,11 @@ passthru.names = [ "js-yaml" ]; }; full."js-yaml"."~2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-2.1.2"; + name = "js-yaml-2.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.2.tgz"; - sha1 = "5404d58972f70112763e0b7e97ced20c39138bbd"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; + sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; }) ]; buildInputs = @@ -6414,11 +6503,11 @@ passthru.names = [ "js-yaml" ]; }; full."jshint"."*" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.1.11"; + name = "jshint-2.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.1.11.tgz"; - sha1 = "eb5108fef9ba5ddebb830983f572d242e49e3f96"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.2.0.tgz"; + sha1 = "9cd120e17c6635a5bfd6339531b088ed33eb5af2"; }) ]; buildInputs = @@ -6937,17 +7026,17 @@ full."karma-requirejs"."*" = self.full."karma"."~0.10.0"; "karma-requirejs" = self.full."karma-requirejs"."*"; full."karma-sauce-launcher"."*" = lib.makeOverridable self.buildNodePackage { - name = "karma-sauce-launcher-0.1.0"; + name = "karma-sauce-launcher-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.0.tgz"; - sha1 = "46be4b9888fda09e6512516cd5dc6ab8b114d392"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.1.tgz"; + sha1 = "34b82b8cb285c239b0fede1a8363488cc02f429b"; }) ]; buildInputs = (self.nativeDeps."karma-sauce-launcher"."*" or []); deps = [ - self.full."wd"."~0.0.32" + self.full."wd"."~0.1.5" self.full."sauce-connect-launcher"."~0.1.10" self.full."q"."~0.9.6" ]; @@ -7024,22 +7113,6 @@ ]; passthru.names = [ "kew" ]; }; - full."keypress"."0.1.x" = lib.makeOverridable self.buildNodePackage { - name = "keypress-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }) - ]; - buildInputs = - (self.nativeDeps."keypress"."0.1.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "keypress" ]; - }; full."knox"."*" = lib.makeOverridable self.buildNodePackage { name = "knox-0.8.6"; src = [ @@ -7117,11 +7190,11 @@ passthru.names = [ "lcov-parse" ]; }; full."lcov-result-merger"."*" = lib.makeOverridable self.buildNodePackage { - name = "lcov-result-merger-0.0.1"; + name = "lcov-result-merger-0.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-0.0.1.tgz"; - sha1 = "8b0e68a7f9136de084f62d92ecafcfa41ce9e4d9"; + url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-0.0.2.tgz"; + sha1 = "72a538c09f76e5c79b511bcd1053948d4aa98f10"; }) ]; buildInputs = @@ -7982,12 +8055,35 @@ ]; passthru.names = [ "match-stream" ]; }; - full."memoizee"."~0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "memoizee-0.2.5"; + full."meat"."*" = lib.makeOverridable self.buildNodePackage { + name = "meat-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/memoizee/-/memoizee-0.2.5.tgz"; - sha1 = "44ad0ce73439705f3954a58dbf5f792cd496c01c"; + url = "http://registry.npmjs.org/meat/-/meat-0.2.5.tgz"; + sha1 = "8f277ec68f51794365e271166c7b7bba8d046869"; + }) + ]; + buildInputs = + (self.nativeDeps."meat"."*" or []); + deps = [ + self.full."express"."2.5.11" + self.full."jade"."0.27.0" + self.full."open"."0.0.2" + self.full."winston"."0.6.2" + self.full."mkdirp"."0.3.0" + self.full."node.extend"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "meat" ]; + }; + "meat" = self.full."meat"."*"; + full."memoizee"."~0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "memoizee-0.2.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz"; + sha1 = "bb45a7ad02530082f1612671dab35219cd2e0741"; }) ]; buildInputs = @@ -8033,6 +8129,22 @@ ]; passthru.names = [ "mime" ]; }; + full."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage { + name = "mime-1.2.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + }) + ]; + buildInputs = + (self.nativeDeps."mime"."1.2.4" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; full."mime"."1.2.5" = lib.makeOverridable self.buildNodePackage { name = "mime-1.2.5"; src = [ @@ -8097,6 +8209,22 @@ ]; passthru.names = [ "mime" ]; }; + full."mime".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "mime-1.2.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }) + ]; + buildInputs = + (self.nativeDeps."mime".">= 0.0.1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; full."mime"."~1.2" = lib.makeOverridable self.buildNodePackage { name = "mime-1.2.11"; src = [ @@ -9004,19 +9132,19 @@ ]; passthru.names = [ "msgpack" ]; }; - full."multiparty"."2.1.8" = lib.makeOverridable self.buildNodePackage { - name = "multiparty-2.1.8"; + full."multiparty"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "multiparty-2.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/multiparty/-/multiparty-2.1.8.tgz"; - sha1 = "35a31834323578ee65f5d870568097914739cf4e"; + url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; + sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; }) ]; buildInputs = - (self.nativeDeps."multiparty"."2.1.8" or []); + (self.nativeDeps."multiparty"."2.2.0" or []); deps = [ - self.full."readable-stream"."~1.0.2" - self.full."stream-counter"."~0.1.0" + self.full."readable-stream"."~1.1.9" + self.full."stream-counter"."~0.2.0" ]; peerDependencies = [ ]; @@ -9260,11 +9388,11 @@ passthru.names = [ "nib" ]; }; full."nijs"."*" = lib.makeOverridable self.buildNodePackage { - name = "nijs-0.0.11"; + name = "nijs-0.0.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nijs/-/nijs-0.0.11.tgz"; - sha1 = "386894330e53135a84e1c42c317b0384c0f48b7a"; + url = "http://registry.npmjs.org/nijs/-/nijs-0.0.12.tgz"; + sha1 = "23bb40746b409e8556f9a4fe97ca314410a685df"; }) ]; buildInputs = @@ -9533,6 +9661,22 @@ ]; passthru.names = [ "node-uuid" ]; }; + full."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node.extend-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; + sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; + }) + ]; + buildInputs = + (self.nativeDeps."node.extend"."1.0.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "node.extend" ]; + }; full."nodemailer"."0.3.35" = lib.makeOverridable self.buildNodePackage { name = "nodemailer-0.3.35"; src = [ @@ -10200,6 +10344,22 @@ ]; passthru.names = [ "once" ]; }; + full."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "open-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz"; + sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc"; + }) + ]; + buildInputs = + (self.nativeDeps."open"."0.0.2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "open" ]; + }; full."open"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "open-0.0.4"; src = [ @@ -11083,6 +11243,22 @@ ]; passthru.names = [ "q" ]; }; + full."qs"."0.4.x" = lib.makeOverridable self.buildNodePackage { + name = "qs-0.4.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + }) + ]; + buildInputs = + (self.nativeDeps."qs"."0.4.x" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; full."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "qs-0.5.1"; src = [ @@ -11147,6 +11323,22 @@ ]; passthru.names = [ "qs" ]; }; + full."qs".">= 0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "qs-0.6.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; + }) + ]; + buildInputs = + (self.nativeDeps."qs".">= 0.4.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; full."qs"."~0.5.0" = lib.makeOverridable self.buildNodePackage { name = "qs-0.5.6"; src = [ @@ -11494,6 +11686,42 @@ ]; passthru.names = [ "readable-stream" ]; }; + full."readable-stream"."~1.1.8" = lib.makeOverridable self.buildNodePackage { + name = "readable-stream-1.1.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.9.tgz"; + sha1 = "d87130fbf8f9ee9c3b4058b3c58a3e30db2fcfdd"; + }) + ]; + buildInputs = + (self.nativeDeps."readable-stream"."~1.1.8" or []); + deps = [ + self.full."core-util-is"."~1.0.0" + self.full."debuglog"."0.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "readable-stream" ]; + }; + full."readable-stream"."~1.1.9" = lib.makeOverridable self.buildNodePackage { + name = "readable-stream-1.1.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.9.tgz"; + sha1 = "d87130fbf8f9ee9c3b4058b3c58a3e30db2fcfdd"; + }) + ]; + buildInputs = + (self.nativeDeps."readable-stream"."~1.1.9" or []); + deps = [ + self.full."core-util-is"."~1.0.0" + self.full."debuglog"."0.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "readable-stream" ]; + }; full."readdirp"."~0.2.3" = lib.makeOverridable self.buildNodePackage { name = "readdirp-0.2.5"; src = [ @@ -11529,11 +11757,11 @@ passthru.names = [ "redeyed" ]; }; full."redis"."*" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.8.6"; + name = "redis-0.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz"; - sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8"; + url = "http://registry.npmjs.org/redis/-/redis-0.9.0.tgz"; + sha1 = "b0f5b9c5619b4f1784837718677212c1af33ee67"; }) ]; buildInputs = @@ -11579,11 +11807,11 @@ passthru.names = [ "redis" ]; }; full."redis".">= 0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.8.6"; + name = "redis-0.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz"; - sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8"; + url = "http://registry.npmjs.org/redis/-/redis-0.9.0.tgz"; + sha1 = "b0f5b9c5619b4f1784837718677212c1af33ee67"; }) ]; buildInputs = @@ -12031,11 +12259,11 @@ passthru.names = [ "request-replay" ]; }; full."requirejs"."~2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "requirejs-2.1.8"; + name = "requirejs-2.1.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.8.tgz"; - sha1 = "f0dfa656d60d404947da796f9c661d92c1b0257a"; + url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.9.tgz"; + sha1 = "624e10d22863e8db9aebfb8f21809ca59da42344"; }) ]; buildInputs = @@ -12366,11 +12594,11 @@ passthru.names = [ "sax" ]; }; full."selenium-webdriver"."*" = lib.makeOverridable self.buildNodePackage { - name = "selenium-webdriver-2.35.2"; + name = "selenium-webdriver-2.37.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.35.2.tgz"; - sha1 = "e6bbb6ff26ea61224173caa006a8eb87d6a94c2d"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.37.0.tgz"; + sha1 = "02a8c9240203c22d0400d466253d4af3f63748b8"; }) ]; buildInputs = @@ -12803,11 +13031,11 @@ passthru.names = [ "shelljs" ]; }; full."should"."*" = lib.makeOverridable self.buildNodePackage { - name = "should-1.3.0"; + name = "should-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-1.3.0.tgz"; - sha1 = "20b71a09b5ed16146b903022bd306ef332efe873"; + url = "http://registry.npmjs.org/should/-/should-2.0.1.tgz"; + sha1 = "d244c90bb919f3e51dca472ef7d93c244eb7b79a"; }) ]; buildInputs = @@ -13214,18 +13442,18 @@ passthru.names = [ "socket.io-client" ]; }; full."sockjs"."*" = lib.makeOverridable self.buildNodePackage { - name = "sockjs-0.3.7"; + name = "sockjs-0.3.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.7.tgz"; - sha1 = "2950e0586d8a9d3044958a831ade68db197749cb"; + url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz"; + sha1 = "c083cb0505db1ea1a949d3bd12d8a1ea385a456c"; }) ]; buildInputs = (self.nativeDeps."sockjs"."*" or []); deps = [ self.full."node-uuid"."1.3.3" - self.full."faye-websocket"."0.4.4" + self.full."faye-websocket"."0.7.0" ]; peerDependencies = [ ]; @@ -13387,6 +13615,23 @@ ]; passthru.names = [ "stream-counter" ]; }; + full."stream-counter"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "stream-counter-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-counter"."~0.2.0" or []); + deps = [ + self.full."readable-stream"."~1.1.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-counter" ]; + }; full."stream-splitter-transform"."*" = lib.makeOverridable self.buildNodePackage { name = "stream-splitter-transform-0.0.3"; src = [ @@ -13977,16 +14222,16 @@ ]; passthru.names = [ "tunnel-agent" ]; }; - full."type-detect"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "type-detect-0.1.0"; + full."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "type-detect-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.0.tgz"; - sha1 = "81ed3ab764cd5139388b67d052eb01610edc1a57"; + url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; + sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; }) ]; buildInputs = - (self.nativeDeps."type-detect"."0.1.0" or []); + (self.nativeDeps."type-detect"."0.1.1" or []); deps = [ ]; peerDependencies = [ @@ -14328,11 +14573,11 @@ passthru.names = [ "underscore.string" ]; }; full."ungit"."*" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.3.1"; + name = "ungit-0.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.3.1.tgz"; - sha1 = "9541d6ba8545ea4a914cf05a413890da61bdd7ff"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.3.2.tgz"; + sha1 = "bb52c4af06280e81c6499cc92f13436e0fefa0d8"; }) ]; buildInputs = @@ -14738,23 +14983,23 @@ ]; passthru.names = [ "watch" ]; }; - full."wd"."~0.0.32" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.0.34"; + full."wd"."~0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.0.34.tgz"; - sha1 = "c8d00ccdbb2862f914b7bd5935330a53cfa88562"; + url = "http://registry.npmjs.org/wd/-/wd-0.1.5.tgz"; + sha1 = "c0a9c8fb5f62ed6628a6f6e1d1958f9316dadfec"; }) ]; buildInputs = - (self.nativeDeps."wd"."~0.0.32" or []); + (self.nativeDeps."wd"."~0.1.5" or []); deps = [ self.full."async"."0.2.x" - self.full."underscore"."1.4.x" self.full."vargs"."~0.1.0" self.full."q"."0.9.x" self.full."request"."~2.21.0" self.full."archiver"."~0.4.6" + self.full."lodash"."~1.3.1" ]; peerDependencies = [ ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 3e16f4e3df4..1057e3f6f28 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -106,4 +106,5 @@ , "plist-native" , "x509" , "owl-deepcopy" +, "meat" ] From a3757a2f675127d4f6ab0c5489429fd23da39e88 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 18 Oct 2013 22:59:36 +0300 Subject: [PATCH 07/25] i7z: update to 0.27.2, cleanup build, add git repository to metadata. --- pkgs/os-specific/linux/i7z/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 2d0fde3c783..33ac05aef47 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -1,19 +1,15 @@ { stdenv, fetchurl, qt4, ncurses}: stdenv.mkDerivation rec { - name = "i7z-0.27.1"; + name = "i7z-0.27.2"; src = fetchurl { url = "http://i7z.googlecode.com/files/${name}.tar.gz"; - sha256 = "0n3pry1qmpq4basnny3gddls2zlwz0813ixnas87092rvlgjhbc6"; + sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7"; }; buildInputs = [qt4 ncurses]; - patchPhase = '' - substituteInPlace Makefile --replace "/usr/sbin" "$out/sbin" - ''; - buildPhase = '' make cd GUI @@ -24,15 +20,15 @@ stdenv.mkDerivation rec { ''; installPhase = '' - pwd ensureDir $out/sbin - make install + make install prefix=$out install -Dm755 GUI/i7z_GUI $out/sbin/i7z-gui ''; meta = { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = http://code.google.com/p/i7z; + repositories.git = https://github.com/ajaiantilal/i7z.git; license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; From 89854548e7ca16f833b3e9fe5688267dd6d0707a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 19 Oct 2013 00:40:45 +0300 Subject: [PATCH 08/25] Add services.xserver.s3tcSupport option --- nixos/modules/services/x11/xserver.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 6e470e65e35..02ba680255b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -229,6 +229,14 @@ in ''; }; + s3tcSupport = mkOption { + default = false; + description = '' + Make S2TC via libtxc_dxtn available to OpenGL drivers. Using + this library may require a patent license depending on your location. + ''; + }; + startOpenSSHAgent = mkOption { default = true; description = '' @@ -410,7 +418,9 @@ in optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ]; environment.variables.LD_LIBRARY_PATH = - [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]; + [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ] + ++ pkgs.lib.optional cfg.s3tcSupport "${pkgs.libtxc_dxtn}/lib" + ++ pkgs.lib.optional (cfg.s3tcSupport && cfg.driSupport32Bit) "${pkgs_i686.libtxc_dxtn}/lib"; environment.etc = (optionals cfg.exportConfiguration From 73449533bafee31b1a9e1ccd077af687809733bf Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 19 Oct 2013 10:52:16 +0300 Subject: [PATCH 09/25] linux 3.12: fix url to match hash --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index f7cd2892051..f0929af1d29 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -4,7 +4,7 @@ import ./generic.nix (args // rec { version = "3.12-rc3"; src = fetchurl { - url = "https://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${version}.tar.gz"; + url = "https://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${version}.tar.xz"; sha256 = "1rayb0f4n81yp9ghcws0v36dpqyl9ks3naf37p2qy7jvrwagmj28"; }; From 78e8cd0f3757f17d880f4704ea01f85304a20719 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Oct 2013 17:03:36 +0200 Subject: [PATCH 10/25] haskell-active: update to version 0.1.0.8 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 92cf31226b2..1d6df75e5fa 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.7"; - sha256 = "18pcw98ni8fiy0yd7wmrqvpaf2wgav70rsikqfl571zjmdmzdw7p"; + version = "0.1.0.8"; + sha256 = "1q2zrx1i5j04c9bss7c19nm6lqasmwxyfzkh49my7yaik95k7bw9"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace From 88cf665d384b887b35b7ab87bd95904597582799 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Oct 2013 17:03:36 +0200 Subject: [PATCH 11/25] haskell-errors: update to version 1.4.3 --- pkgs/development/libraries/haskell/errors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index be061cfb443..1b0bc4282a7 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.4.2"; - sha256 = "1csry8bbz7r4gc7x3lf1ih10rvnig2i91nfij227p9744yndl2xw"; + version = "1.4.3"; + sha256 = "02xvfh0kfca7z5vhnkmqg5gw5i5ad5bc3jf8flxj75ry7wqggfmm"; buildDepends = [ either safe transformers ]; jailbreak = true; meta = { From 3138345c8fdb19ccc9f9d6dcc93fad965a7618ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Oct 2013 17:03:36 +0200 Subject: [PATCH 12/25] haskell-http-types: update to version 0.8.2 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index b0b68eec434..c099709e0da 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.8.1"; - sha256 = "07hxxlhgnwsvjr2dzqbswwwkjxwsc0pk6shpkvzgclrsyn3xrg7p"; + version = "0.8.2"; + sha256 = "1536wpmicmq90qvnvcvq1dzk2vfhj7ls6hz4pqp0ll9aksk3msr1"; buildDepends = [ blazeBuilder caseInsensitive text ]; testDepends = [ blazeBuilder hspec QuickCheck text ]; meta = { From 914369f732b2650eda70f734b2a9de4718e64da4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Oct 2013 17:03:36 +0200 Subject: [PATCH 13/25] haskell-optparse-applicative: update to version 0.7.0 --- .../libraries/haskell/optparse-applicative/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 44917d01c00..b8a992550c2 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.6.0"; - sha256 = "07wzsgwym0g6qd39jvgp6ndpqdn2w0c4sn9mcz19rqlb2am24ip8"; + version = "0.7.0"; + sha256 = "1mhf9jrkznd2aq11610rkss09i9q33i9f97f492z854bp86pfkk8"; buildDepends = [ transformers ]; testDepends = [ HUnit testFramework testFrameworkHunit testFrameworkThPrime From 803c55e5636f96e1b04b5508d298b50840135606 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Oct 2013 17:03:36 +0200 Subject: [PATCH 14/25] haskell-snap: update to version 0.13.0.4 --- pkgs/development/libraries/haskell/snap/snap.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 15fe497b88d..8df65404962 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.0.3"; - sha256 = "0gwcrsmcx5823w53nfi92gg2hkjnyxd3mp97qijp5p8y83mhh0l0"; + version = "0.13.0.4"; + sha256 = "1cbc42x7p87fmazm0dqc519rdaiiiwmkri8y1n4hgvr70kfi6569"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -20,7 +20,6 @@ cabal.mkDerivation (self: { unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; - patchPhase = "sed -i -e 's|lens .*|lens|' snap.cabal"; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From e271bb876eb62b7d8e7e7dadd17b41e57f18bb1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Oct 2013 17:03:36 +0200 Subject: [PATCH 15/25] haskell-unix-time: update to version 0.2.1 --- pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 846e3d88883..67dbdac3485 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.2.0"; - sha256 = "1gmchi6crbd3lpnw1j0zaaj7y0gib8dbqd8ip2s5p3f50qqlsxj8"; + version = "0.2.1"; + sha256 = "15kg1rxbw86p5jzig9ac7lsizmlvqkxikq7h8jfi04rri39a9jiy"; testDepends = [ doctest hspec QuickCheck time ]; meta = { description = "Unix time parser/formatter and utilities"; From 4665430ff6a64293b249e746562b4e0a19c15f73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Oct 2013 17:03:36 +0200 Subject: [PATCH 16/25] haskell-zip-archive: update to version 0.1.4 --- pkgs/development/libraries/haskell/zip-archive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 38290c8cd54..bddf09bc405 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.3.4"; - sha256 = "0hvndr3gb7fiv4qjwjvic5mg7wq7h7nw3c3v5xq8fnlr1l943vyb"; + version = "0.1.4"; + sha256 = "0ipk8gwa2k8iqg2gg4lbawr8l9sjwhy2p7b8qxazpq0i88dyy3lb"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl time utf8String zlib ]; From 7e3384d9a87aa1d9d9f0caf91db71cc891f7c6db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Oct 2013 11:26:04 +0200 Subject: [PATCH 17/25] haskell-amqp: update to version 0.7.0 --- .../libraries/haskell/amqp/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 70e86ef1ffb..432d353a0af 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -1,12 +1,19 @@ -{ cabal, binary, dataBinaryIeee754, network, text, xml }: +{ cabal, binary, clock, dataBinaryIeee754, hspec, hspecExpectations +, network, split, text, xml +}: cabal.mkDerivation (self: { pname = "amqp"; - version = "0.6.0"; - sha256 = "0rfczmhf46sc3pxxb5gwv4ggsxkqkvdi4kkqdnrdpdhs7p41im2n"; + version = "0.7.0"; + sha256 = "09zazmbdw8nphbjkmixn2dpwdgkjqjfbn6jv522ykvrcnsn35kc4"; isLibrary = true; isExecutable = true; - buildDepends = [ binary dataBinaryIeee754 network text xml ]; + buildDepends = [ + binary clock dataBinaryIeee754 network split text xml + ]; + testDepends = [ + binary dataBinaryIeee754 hspec hspecExpectations network split text + ]; meta = { homepage = "https://github.com/hreinhardt/amqp"; description = "Client library for AMQP servers (currently only RabbitMQ)"; From b4a967d771a1ce7c42b57903e394e6bf77ab431f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Oct 2013 11:26:04 +0200 Subject: [PATCH 18/25] haskell-hakyll: update to version 4.4.1.1 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 27f3d6629d5..cb4e80a4844 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.1.0"; - sha256 = "17bns61l5d0h8qyhbz5gnc4j9yjjajk57whp0j4gfshaq0s2aif9"; + version = "4.4.1.1"; + sha256 = "1jrswf9nk72n0a32mzarkv8x728dnjs68kijpgh35m6y10fsn4d8"; isLibrary = true; isExecutable = true; buildDepends = [ From cbc31042f86f4106330caced243fcf84803e410e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Oct 2013 11:26:04 +0200 Subject: [PATCH 19/25] haskell-monoid-extras: update to version 0.3.2.3 --- pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index e9c8691a8ce..8eb61453f9c 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.2.2"; - sha256 = "1fy0fk2mzan6n5chc11x303hz3iq3kpx6ma6c8xsi8va1b9ikpda"; + version = "0.3.2.3"; + sha256 = "1q7aw4adg082rszkc3skdvidcn86n06xvr3x8qarpjb285znsmc4"; buildDepends = [ groupoids groups semigroupoids semigroups ]; jailbreak = true; meta = { From 9ada1e9d507941eae35ab84bfa1519b9b684df16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Oct 2013 11:26:04 +0200 Subject: [PATCH 20/25] haskell-optparse-applicative: update to version 0.7.0.2 --- .../libraries/haskell/optparse-applicative/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index b8a992550c2..6f7ef601d61 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.7.0"; - sha256 = "1mhf9jrkznd2aq11610rkss09i9q33i9f97f492z854bp86pfkk8"; + version = "0.7.0.2"; + sha256 = "1pq620236x8fch9nkq4g4vganbzksnwj8z1bb80c2mwvf6sbg5ci"; buildDepends = [ transformers ]; testDepends = [ HUnit testFramework testFrameworkHunit testFrameworkThPrime From a9302d494c974956affce7dc90b4b6dc2501f62e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Oct 2013 12:43:56 +0200 Subject: [PATCH 21/25] haskell-clock: add version 0.4.0.1 --- .../development/libraries/haskell/clock/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/clock/default.nix diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix new file mode 100644 index 00000000000..65bfffec52e --- /dev/null +++ b/pkgs/development/libraries/haskell/clock/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "clock"; + version = "0.4.0.1"; + sha256 = "1bn6dalank30l680iifyam0mg9izxbyscgq0vmr1aw5brba5kv6j"; + meta = { + homepage = "http://corsis.github.com/clock/"; + description = "High-resolution clock functions: monotonic, realtime, cputime"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f46a9bca774..abd8522b1bc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -728,6 +728,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x clientsession = callPackage ../development/libraries/haskell/clientsession {}; + clock = callPackage ../development/libraries/haskell/clock {}; + cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; cmdlib = callPackage ../development/libraries/haskell/cmdlib {}; From 5215ad693cd3ce890345011dccc6e7c0ff3aecdc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Oct 2013 12:45:30 +0200 Subject: [PATCH 22/25] haskell-hakyll: update to version 4.4.1.2 --- pkgs/development/libraries/haskell/hakyll/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index cb4e80a4844..22cdf149ef7 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.1.1"; - sha256 = "1jrswf9nk72n0a32mzarkv8x728dnjs68kijpgh35m6y10fsn4d8"; + version = "4.4.1.2"; + sha256 = "0rbl0gl5ds63mv8cbcwb8aj0vic9padqs3zrdxr2ny70md1v9m9y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,9 +25,6 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - patchPhase = '' - sed -i -e 's|cryptohash.*,|cryptohash,|' -e 's|tagsoup.*,|tagsoup,|' hakyll.cabal - ''; doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; From cd5a60d590ff926db6699422ee0f8a6d7a51da15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Oct 2013 13:02:54 +0200 Subject: [PATCH 23/25] haskell-data-pprint: patch to fix build with older versions of 'pretty' --- pkgs/development/libraries/haskell/data-pprint/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix index e6a8e59853d..8b73d5be568 100644 --- a/pkgs/development/libraries/haskell/data-pprint/default.nix +++ b/pkgs/development/libraries/haskell/data-pprint/default.nix @@ -5,6 +5,10 @@ cabal.mkDerivation (self: { version = "0.2.2"; sha256 = "0cr69qv2j8fmmlir8rzlafcxk1cg3lg1z0zrwkz0lb7idm25fy36"; buildDepends = [ deepseq mtl parallel time ]; + patches = [ (fetchurl { url = "https://github.com/divipp/ActiveHs-misc/pull/3.patch"; + sha256 = "0wxvc7cbv4qpjl5zxy41863qpzda2ma75pmnnqx29qyh3rxp7biw"; + }) + ]; meta = { description = "Prettyprint and compare Data values"; license = self.stdenv.lib.licenses.bsd3; From 2656f1b4a1b7aa044066074f92b58b9432c19eab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Oct 2013 13:23:27 +0200 Subject: [PATCH 24/25] haskell-data-pprint: add missing fetchurl and '-p2' flag --- pkgs/development/libraries/haskell/data-pprint/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix index 8b73d5be568..351f1d83477 100644 --- a/pkgs/development/libraries/haskell/data-pprint/default.nix +++ b/pkgs/development/libraries/haskell/data-pprint/default.nix @@ -1,4 +1,4 @@ -{ cabal, deepseq, mtl, parallel, time }: +{ cabal, deepseq, mtl, parallel, time, fetchurl }: cabal.mkDerivation (self: { pname = "data-pprint"; @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { sha256 = "0wxvc7cbv4qpjl5zxy41863qpzda2ma75pmnnqx29qyh3rxp7biw"; }) ]; + patchFlags = "-p2"; meta = { description = "Prettyprint and compare Data values"; license = self.stdenv.lib.licenses.bsd3; From 92613863fe3e43c04d1ba48daa6f9dfc84af75ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 19 Oct 2013 13:51:57 +0200 Subject: [PATCH 25/25] nodejs: 0.10.12 -> 0.10.21 (security fixes) --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 610cdd09a71..f82fedb7226 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -6,7 +6,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.12"; + version = "0.10.21"; # !!! Should we also do shared libuv? deps = { @@ -27,7 +27,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1dlnjjr135h2xcxifb06g33yi2bc5zpvc06985x5cjj56g1sffbk"; + sha256 = "038l4j0ilrsmc6m2z2qprqs82z7p4940scb8597hcmhp5kr5n4kw"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);