public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'official/master' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Mathijs Kwik
2013-09-11 10:51:46 +02:00
parent 2d405ed4d5 aa8e8303e1
commit 1a55c4b89f
567 changed files with 12427 additions and 3449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/web/nodejs/build-node-package.nix
View File

@@ -52,7 +52,7 @@ stdenv.mkDerivation ({
fi
'') args.passthru.names)}
${concatStrings (concatMap (dep: map (name: ''
mv node_modules/${dep.name} $out/lib/node_modules
mv node_modules/${name} $out/lib/node_modules
'') dep.names) peerDependencies)}
mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
mv node_modules $out/.dependent-node-modules

4
pkgs/development/web/nodejs/default.nix
View File

@@ -6,7 +6,7 @@ let
ln -sv /usr/sbin/dtrace $out/bin
'';
version = "0.10.10";
version = "0.10.12";
# !!! 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 = "0p6ii9xgshv2aak1rb4hq54pszdjxip0nr5r9a3axirs5hfyfkd5";
sha256 = "1dlnjjr135h2xcxifb06g33yi2bc5zpvc06985x5cjj56g1sffbk";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);