Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0
.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell
971337a119
firefox update to 21.0
2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell
8442c7d122
libgphoto2: adding a 2.4 version, for kde 4.7 and 4.8.
2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell
4d682cc112
digikam: enable parallel building
2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell
f54c4c99e3
tcpdmup/libpcap udpate
2013-05-29 19:23:40 +02:00
Lluís Batlle i Rossell
21cb347f20
Adding babeld.
2013-05-29 19:16:02 +02:00
Lluís Batlle i Rossell
08f8371a50
Adding ahcpd.
2013-05-29 19:16:01 +02: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
2f024a2ea9
Update nodePackages
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-29 11:25:34 -04:00
Shea Levy
8e724713c6
Make the function to import npm2nix-generated packages accessible outside of node-packages.nix
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-29 11:22:23 -04:00
Sander van der Burg
2b1eff8e17
Override the KitchenSink's appName
2013-05-29 15:17:37 +02:00
Sander van der Burg
c30eed4b44
Allow one to override the app's name through the appName parameter
2013-05-29 15:16:21 +02:00
Sander van der Burg
a2b8fb3776
It's impossible to guess the name so we add an extra optional parameter to override it
2013-05-29 15:01:55 +02:00
Sander van der Burg
a7895de1fc
Use double quotes to expand wildcards
2013-05-29 14:50:24 +02:00
Sander van der Burg
cf512cf5c2
Use wildcard for the appname
2013-05-29 14:18:35 +02:00
Sander van der Burg
dde4a92c5c
Generate unique derivation names so that we can easily install them from a Nix channel
2013-05-29 13:50:53 +02:00
Peter Simons
317fcd3b86
Merge pull request #559 from bjornfor/mentor-codebench
...
Add Sourcery CodeBench Lite toolchain(s)
2013-05-29 02:17:46 -07:00
Peter Simons
93d7adcba3
Merge pull request #561 from offlinehacker/st
...
st: Update to 0.4.1 and add support for custom config
2013-05-29 02:16:56 -07:00
Peter Simons
b1781a1876
Merge pull request #571 from vcunat/p/hs
...
haskell: add pop3-client and smtp-mail (by cabal2nix)
2013-05-29 02:16:20 -07: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
9e01205659
Set library path properly for v8 on darwin
2013-05-28 18:38:22 -04:00
Shea Levy
47cbc4cead
Missed some darwin cflags in gyp
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Shea Levy
2794d74506
Fix http_parser build on darwin
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Shea Levy
c982e84df4
gyp: Fix on darwin
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Shea Levy
fe009bcbc4
cyrus-sasl: Fix build on darwin
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Domen Kozar
6cbadc4e23
waitress: 0.8.1 -> 0.8.5
2013-05-29 00:05:31 +02:00
Domen Kozar
637fa11b20
add pdf2htmlex and upgrade poppler
2013-05-29 00:02:26 +02:00
Lluís Batlle i Rossell
e1cb325f82
Adding batctl, control for batman
2013-05-28 23:02:22 +02:00
Lluís Batlle i Rossell
bf0d1f58dc
Adding batman-adv.
2013-05-28 22:58:25 +02:00
Lluís Batlle i Rossell
55eccc68bb
Adding oslrd.
2013-05-28 22:37:59 +02:00
Shea Levy
d5b33eec68
npm2nix now supports simple strings in the JSON file if no range is specified
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 13:19:44 -04:00
Shea Levy
4fe2e7c152
Add ansi-remover npm package
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 13:02:13 -04:00
Eelco Dolstra
6c03d641fa
openvpn: Update to 2.3.1
2013-05-28 14:48:56 +02:00
Eelco Dolstra
412decd2a4
Crypt::RandPasswd: Update to 0.03
...
http://hydra.nixos.org/build/5098835
2013-05-28 12:09:44 +02:00
Vladimír Čunát
43d4e53cd2
haskell: add pop3-client and smtp-mail (by cabal2nix)
2013-05-28 11:08:43 +02:00
Lluís Batlle i Rossell
2e3f53ed27
mumble: making hydra build it
2013-05-28 08:50:44 +02:00
Shea Levy
b385fea5fc
Merge branch 'node-update'
...
This branch updates node to 0.10.8, as well as updating its
dependencies. It also updates node-packages to use the new style
generated by npm2nix (some packages may have been lost in the switch,
please check!).
Note that 0.10 had some backwards-compatability breaks with 0.8,
particularly for readable streams. Please see the official documentation
for migration help.
Note that I have not yet tested this on darwin (node.js was already
broken there), but will do so soon and fix it if it's broken.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-27 23:00:24 -04:00
Shea Levy
4e5966e7aa
Add npm2nix nodePackage
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-27 22:57:49 -04:00
Shea Levy
239d532095
node-packages.nix: Convert to new npm2nix style
...
Starting with 1.0.0 (which is not released at the time of this commit
but will be before it is pushed), npm2nix takes a JSON file with a list
of names (and optionally version ranges) and generates a data-only (no
functions, no rec, no let, etc.) nix expression representing the
packages with those names and their dependencies.
node-packages.nix now builds its package list from that generated
expression. If a package needs native dependencies as build inputs, they
can be added to the nativeDeps attribute set. If a package cannot be
generated by npm2nix for some reason, it can be added manually to the
set.
I tried to capture the packages represented by the previous
node-packages.nix in the new node-packages.json, but I almost certainly
missed some that will have to be added manually.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-27 22:35:20 -04:00
Domen Kožar
1855b9bdec
Merge pull request #570 from the-kenny/btsync
...
Update bittorrent-sync to 1.0.134
2013-05-27 15:52:42 -07:00
Moritz Ulrich
2f1ab6b21b
Update bittorrent-sync to 1.0.134
2013-05-28 00:50:05 +02:00
Domen Kožar
80bd0dda53
Merge pull request #569 from errge/vboot_reference
...
Fix vboot_reference's libuuid overriding to work on systems wo libuuid
2013-05-27 14:39:50 -07:00
Gergely Risko
29b6370b0c
Fix vboot_reference's libuuid overriding to work on systems wo libuuid
2013-05-27 23:36:43 +02:00
Lluís Batlle i Rossell
bb66651d68
gnunet: removing 0.8
...
I don't think anyone uses it. Feel free to revert, otherwise.
2013-05-27 23:35:35 +02:00
Lluís Batlle i Rossell
42701dece8
Adding gnunet-svn and libgcrypt-git.
...
gnunet-svn can't interoperate with gnunet.
2013-05-27 23:35:34 +02:00
Lluís Batlle i Rossell
7d9acc0866
libgcrypt: update to 1.5.2. Newer is better.
2013-05-27 23:35:34 +02:00
Lluís Batlle i Rossell
296d11a0fb
Updating libgpg-error (required for libgcrypt-git)
2013-05-27 23:35:34 +02:00
Vladimír Čunát
d73c8ed79d
Revert "Merge pull request #555 from errge/master"
...
This reverts commit 8f7cfc0c73
, reversing
changes made to cc85ad4b1c
.
The merge changed stdenv (a bit surprisingly, see #555 for details).
2013-05-27 18:29:53 +02:00
Domen Kožar
8f7cfc0c73
Merge pull request #555 from errge/master
...
Add ncursesw compatibility link also for includes
2013-05-27 06:51:49 -07:00
Rob Vermaas
cc85ad4b1c
Merge pull request #564 from zefhemel/redisupgrade
...
Upgraded Redis version
2013-05-27 04:53:06 -07:00