Commit Graph

479 Commits

Author SHA1 Message Date
Mathijs Kwik
1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs
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
2013-09-11 10:53:31 +02:00
Shea Levy
b8872549b7 Fix peerDependency handling in buildNodePackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-08-30 09:02:44 -04:00
Rob Vermaas
115e78216e Update nodejs to 0.10.12 2013-08-21 21:45:28 +02:00
Mathijs Kwik
4b6d254ed7 nodejs: explicitly put openssl in buildInputs
the linker won't find it otherwise :multiple-outputs:
2013-08-21 17:35:53 +02:00
Shea Levy
7188cc39fa Add karma nodePackage
Required updating to npm2nix 5.1.0 for peerDependency cycle management

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-08-20 18:56:20 -04:00
Shea Levy
67eb2c8ad3 Handle peerDependencies in nodePackages
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-08-18 19:28:51 -04:00
Rok Garbas
a646dee027 removing existing plone packages 2013-08-12 10:10:44 +02:00
Sander van der Burg
c1fcb0c2e6 Make the setup-hook work again now that nodejs modules reside in lib/node_modules 2013-07-30 13:00:05 +02:00
Shea Levy
5c66a46bc6 buildNodePackage: Fix $out/bin symlink
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-28 11:46:40 -04:00
Shea Levy
93cdc526c3 buildNodePackages: Move /node_modules to /lib/node_modules to make nix profiles usable as an npm prefix
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-27 13:23:35 -04:00
Shea Levy
b73021a475 buildNodePackage: Handle all node/coffee shebang possibilities
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-18 15:45:02 -04:00
Shea Levy
483755e9ab buildNodePacakge: Create man page symlinks when needed
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-14 14:07:39 -04:00
Shea Levy
021c40c72d buildNodePackage: Handle bundledDependencies by nuking them
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-13 22:25:18 -04:00
Rok Garbas
53f6bd73ad plone: updating plone.app.discussion to 2.2.7 2013-07-04 20:26:06 +02:00
Rok Garbas
e84ba407f9 plone: adding collective_recipe_filestorage package 2013-07-03 04:44:01 +02:00
Rok Garbas
7816aa4ada plone: adding collective_recipe_template package 2013-07-03 04:26:27 +02:00
Rok Garbas
52dd19be1b plone: plone_recipe_varnish updated to 1.3dev to support varnish >= 3 2013-07-03 02:47:14 +02:00
Rok Garbas
79ec396f6f plone: z3c.form downgraded to 3.0 2013-07-03 02:32:01 +02:00
Rok Garbas
c590a5b4c3 plone: updating 4.3.0 to 4.3.1, minor renaming of nix files 2013-07-03 00:21:22 +02:00
Rickard Nilsson
070ddf8367 New package: Twitter Bootstrap 2.3.2, a front-end framework for web development. 2013-07-01 16:14:52 +02:00
Rok Garbas
fd5e631e7d Plone: fix for 4.1 2013-06-10 20:59:58 +02:00
Mathijs Kwik
b5ba5959cf fix node packages with binary (native) extensions 2013-06-06 22:38:24 +02:00
Zef Hemel
69cf3dede6 Bump to 0.10.10 2013-06-05 20:39:07 +02:00
Shea Levy
8247806090 buildNodePackage: Move dependency symlinks out of the top-level node_modules directory
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-05 12:25:41 -04:00
Shea Levy
d749196f68 buildNodePackage: Utilize the node setup hook
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-29 11:53:36 -04:00
Shea Levy
5ddae35596 Get node.js building on darwin
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Shea Levy
b0e6c66ad7 nodejs: Update to v0.10.8
I removed darwin-specific bits, as I can't test them right now. If
it's broken, let me know and I'll fix on darwin.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-27 02:08:24 -04:00
Rok Garbas
8ea9b3fbac plone: adding version 4.2.5 and 4.1.6 2013-04-17 02:28:45 +02:00
Rok Garbas
0416e77d82 plone: some versions got pinned wrong 2013-04-17 01:57:40 +02:00
Rok Garbas
a690941f21 plone: update to 4.3 2013-04-17 01:27:59 +02:00
Rok Garbas
df76d7f6a9 nodejs: update to 0.8.23 2013-04-16 18:19:16 +02:00
Rok Garbas
d8fe87bbe1 Revert "plone43Packages.zc_buildout: 2.1.0"
new zc_buildout doesn't pick eggs from "system" site-packages

This reverts commit abf49f299e.
2013-04-06 23:10:31 +02:00
Rok Garbas
abf49f299e plone43Packages.zc_buildout: 2.1.0 2013-04-06 17:59:23 +02:00
Rok Garbas
86e5e52d99 plone: upgrading to 4.3rc1 2013-03-31 08:53:23 +02:00
Sander van der Burg
0576a0054b Implemented an unelegant workaround that allows nodejs to be used on darwin using xcode 2013-03-14 13:52:45 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Cillian de Róiste
e44f4ef3ce #283 add a set of Plone packages, a popular Python CMS
This set of packages for Plone was generated using
cillianderoiste/python2nix, which is forked from garbase/python2nix.

It uses ```buildout annotate``` to dump a set of packages and their
versions based on an installed Plone instance and then looks up these
packages on pypi, gets the relevant download url and sets some
(minimal) buildInputs where required.

The packages are not ready to be used on their own yet, since they
lack complete dependencies. In the future we can move complete package
expressions into a better location so that they can be re-used.

The packages are also lacking metadata. They are all available under
Free licenses (mostly Zope Public License, GPL or BSD), but the script
does not yet fill that information in. It should be pretty easy to get
hold of it, plus the short description and home page from pypi, this
will be added to the script in the future so that the license
information is accurate.
2013-02-06 01:44:44 +01:00
Sander van der Burg
c89187cc3c Added setup hook that adds a Node package automatically to NODE_PATH, if included in the buildInputs parameter 2013-02-04 15:21:33 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Rob Vermaas
d6571f932f Fix nodejs 2013-01-07 21:30:57 +01:00
Sander van der Burg
03621d4cd8 Remove my darwin workarounds for node.js 2013-01-07 17:01:50 +01:00
Sander van der Burg
5b0ca88d97 - Added xcodeenv: experimental support to build iOS apps through Nix
- Moved mobile development tools into a separate folder
2013-01-07 16:52:42 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Shea Levy
389df7d0c3 nodejs v0.8.15 2012-12-03 10:05:39 -05:00
Mathijs Kwik
4afe7286c3 node.js: upgrade to v0.8.12 2012-10-27 13:06:53 +02:00
Shea Levy
309ec44f40 build-node-package: make fewer assumptions about the name of the node tarball 2012-09-20 14:45:31 -04:00
Shea Levy
7d5bb08534 Add cipher-block-size node package and remove the nativeDeps argument to build-node-package (buildInputs can just be specified directly) 2012-09-18 12:08:16 -04:00
Mathijs Kwik
baa6223904 node-packages: ability to build npms that have native extensions 2012-09-17 09:56:49 +02:00
Mathijs Kwik
68f6866ab6 node.js: upgrade to 0.8.9
- espipe patch no longer needed
- linkV8 headers replaced by buildNodePackage's upcoming binary support
2012-09-15 20:53:19 +02:00
Shea Levy
270c7f2209 nodejs: Bump and backport fix to support ESPIPE 2012-08-22 18:54:47 -04:00
Shea Levy
cdc0c13c00 buildNodePackage: Remove absolute path to source tarball to avoid runtime dependency 2012-08-22 15:35:00 -04:00
Shea Levy
695ca8c498 node.js: Bump 2012-08-22 09:14:05 -04:00
Shea Levy
c516517656 Add empty node-packages.nix using build-node-package.nix from npm2nix.
buildNodePackage is a function to build npm packages.

npm2nix (https://bitbucket.org/shlevy/npm2nix) can be used to generate subexpressions to go in node-packages.nix
2012-07-25 17:46:21 -04:00
Shea Levy
6a3ea47c4e node: Update to 0.8.3 2012-07-25 10:45:04 -04:00
Mathijs Kwik
2cedd7021b node.js: copy v8 headers
most npm's that want to build binary stuff (bindings) look for the v8 headers at NODE_BINARY_PATH/../include
Ideally, we get something like npm2nix someday and fix these build scripts.

Until then, this little hack does the trick.
2012-07-05 12:01:23 +02:00
Lluís Batlle
0067a945d4 Updating nodejs to 0.6.19. 2012-06-22 14:50:58 +02:00
Lluís Batlle
a4045a92d7 Making 'npm' work from commandline (fix interpreter). 2012-06-22 14:50:58 +02:00
Mathijs Kwik
459de475ee node.js : upgraded to 0.6.18
svn path=/nixpkgs/trunk/; revision=34266
2012-05-29 07:43:56 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Shea Levy
68f739cc45 nodejs/v8: Bump
svn path=/nixpkgs/trunk/; revision=33673
2012-04-08 14:32:00 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Mathijs Kwik
a92fe14103 upgraded nodejs to 0.6.11
svn path=/nixpkgs/trunk/; revision=32760
2012-03-04 12:28:45 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Shea Levy
385f242a40 node.js: Get building on darwin
svn path=/nixpkgs/trunk/; revision=32563
2012-02-25 19:36:24 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Shea Levy
f77fa09f56 v8: Get building on darwin
svn path=/nixpkgs/trunk/; revision=32168
2012-02-10 05:22:58 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons
66a1330589 v8/nodejs: upgraded to 3.6.6.20 and 0.6.9
svn path=/nixpkgs/trunk/; revision=32079
2012-02-06 19:08:56 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Peter Simons
f94f871b67 node.js: use shared v8 instead of bundled one
svn path=/nixpkgs/trunk/; revision=31650
2012-01-18 20:32:26 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
67f921896e * nodejs 0.6.7 breaks npm, so go back to 0.6.6.
svn path=/nixpkgs/trunk/; revision=31594
2012-01-16 16:56:57 +00:00
Eelco Dolstra
fd6238d2c8 * NodeJS updated to 0.6.7.
svn path=/nixpkgs/trunk/; revision=31593
2012-01-16 16:34:13 +00:00
Peter Simons
957397a749 upgraded nodejs
svn path=/nixpkgs/trunk/; revision=30836
2011-12-11 19:38:57 +00:00
Cillian de Roiste
694dbfe845 Adding csslint, this uses node as an interpreter. It detects problems in CSS files.
svn path=/nixpkgs/trunk/; revision=28731
2011-08-21 21:34:17 +00:00
Cillian de Roiste
2dd19f6d72 Updating node to version 0.5.4
svn path=/nixpkgs/trunk/; revision=28726
2011-08-21 19:42:55 +00:00
Cillian de Roiste
4cc923b4bb Fixing the download url
svn path=/nixpkgs/trunk/; revision=28015
2011-07-31 08:56:09 +00:00
Cillian de Roiste
0942a5b164 Updating node to 0.5.2
svn path=/nixpkgs/trunk/; revision=28014
2011-07-31 08:49:03 +00:00
Cillian de Roiste
28096838d0 Adding node.js, a javascript web development platform
svn path=/nixpkgs/trunk/; revision=27168
2011-05-05 22:38:04 +00:00