summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-02-03 18:37:20 -0500
committerShea Levy <shea@shealevy.com>2014-02-03 18:37:20 -0500
commit3c9ed5b51a88d41742415245c9cbb2a32f1ff400 (patch)
tree21527456127d222b023b2ae6aedde00ef0f183cd /pkgs
parent72b5403ee8434bc6dca570740897d4641bf24db4 (diff)
downloadnixpkgs-3c9ed5b51a88d41742415245c9cbb2a32f1ff400.tar
nixpkgs-3c9ed5b51a88d41742415245c9cbb2a32f1ff400.tar.gz
nixpkgs-3c9ed5b51a88d41742415245c9cbb2a32f1ff400.tar.bz2
nixpkgs-3c9ed5b51a88d41742415245c9cbb2a32f1ff400.tar.lz
nixpkgs-3c9ed5b51a88d41742415245c9cbb2a32f1ff400.tar.xz
nixpkgs-3c9ed5b51a88d41742415245c9cbb2a32f1ff400.tar.zst
nixpkgs-3c9ed5b51a88d41742415245c9cbb2a32f1ff400.zip
http-parser: Bump
Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/http-parser/default.nix4
-rw-r--r--pkgs/development/web/nodejs/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index ca61a00f034..5ced635aa66 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }:
 
 let
-  version = "2.1";
+  version = "2.2.1";
 in stdenv.mkDerivation {
   name = "http-parser-${version}";
 
   src = fetchurl {
     url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";
-    sha256 = "16a2w5z4g2bma25fqcrkpidqzlq8a2jxkk93ajl721q85406j105";
+    sha256 = "0p8wmchqsj9kwa8pg2is7v0h83q5lqns3vnm6sxrld7gaz979zh5";
   };
 
   patches = [ ./build-shared.patch ];
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 7c10bcb51de..b54918a6994 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http_parser, c-ares, pkgconfig, runCommand }:
+{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
 
 let
   dtrace = runCommand "dtrace-native" {} ''
@@ -10,9 +10,8 @@ let
 
   # !!! Should we also do shared libuv?
   deps = {
-    inherit v8 openssl zlib;
+    inherit v8 openssl zlib http-parser;
     cares = c-ares;
-    http-parser = http_parser;
   };
 
   sharedConfigureFlags = name: [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c14a91e489..d4048429fdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4447,7 +4447,7 @@ let
 
   hsqldb = callPackage ../development/libraries/java/hsqldb { };
 
-  http_parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; };
+  http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; };
 
   hunspell = callPackage ../development/libraries/hunspell { };