diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-10-23 17:40:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-10-23 17:40:41 +0200 |
| commit | 2cf17b080206ef008d7b0d8f443f3cebd2c052ea (patch) | |
| tree | f49a9b7299028462ba3c8be0da456284917dda8a /pkgs/development/web | |
| parent | 3ecd4dcf722ae4837be7cb60cef30a59a13b0a12 (diff) | |
| parent | 8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f (diff) | |
| download | nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.gz nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.bz2 nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.lz nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.xz nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.tar.zst nixlib-2cf17b080206ef008d7b0d8f443f3cebd2c052ea.zip | |
Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/web/twitter-bootstrap/default.nix | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index deb5188750ae..3356a04729ee 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -10,12 +10,14 @@ let # !!! Should we also do shared libuv? deps = { - inherit openssl zlib http-parser; + inherit openssl zlib; cares = c-ares; # disabled system v8 because v8 3.14 no longer receives security fixes # we fall back to nodejs' internal v8 copy which receives backports for now # inherit v8 + } // stdenv.lib.optionalAttrs (!stdenv.isDarwin) { + inherit http-parser; }; sharedConfigureFlags = name: [ diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 9df7e3126d55..1057e9708654 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, lessc, closurecompiler }: +{ stdenv, fetchFromGitHub, lessc, closurecompiler }: stdenv.mkDerivation rec { name = "twitter-bootstrap-${version}"; version = "2.3.2"; - src = fetchgit { - url = https://github.com/twitter/bootstrap.git; - rev = "refs/tags/v${version}"; - sha256 = "093z4yxqhrr30vna67ksxz3bq146q2xr05hinh78pg2ls88k77la"; + src = fetchFromGitHub { + owner = "twitter"; + repo = "bootstrap"; + rev = "v${version}"; + sha256 = "0b4dsk9sqlkwwfgqqjlgi6p05qz2jssmmz4adm83f31sx70lgh4g"; }; buildInputs = [ lessc closurecompiler ]; |