mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00
Code Issues Wiki Activity
27729 commits 237 branches 124 tags 7.4 GiB
Commit graph

27335 commits

Author SHA1 Message Date
Peter Simons 933f77f10d Merge pull request #662 from rnons/yesod-bin 
yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin.
 2013-06-22 05:09:35 -07:00
Evgeny Egorochkin 09e6ae577b Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by 
building argparse, compiling from cli, compiling using py_compile.
 2013-06-22 09:45:01 +03:00
Shea Levy a3bf1ca3b1 Linux 3.9.7 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-21 17:21:03 -04:00
Domen Kozar dbe9bf7e59 networkmanagerapplet: 0.9.8.0 -> 0.9.8.2 
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
 2013-06-21 19:59:20 +02:00
Evgeny Egorochkin a0ba1a20e9 Add a stdenv version which tries harder to make builds repeatable. 2013-06-21 18:22:07 +03:00
Evgeny Egorochkin 76fbbb73c6 Make most of Ruby Gem builds repeatable 2013-06-21 18:22:07 +03:00
rnons f84119331c yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin. 2013-06-21 22:55:37 +08:00
aszlig 467608f614
synergy: Only pass cryptopp on Linux platforms. 
The second failure, and the last one I'm going to try today:

http://hydra.nixos.org/build/5404634

On the bright side there is at least the fact that version 1.4.10 has failed on
Darwin already, so I guess we don't have a lot of Mac users using Synergy.

Latest (failed) build of 1.4.10:

http://hydra.nixos.org/build/5359408

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 13:46:22 +02:00
aszlig cfd284443e
synergy: Use bundled crypto++ on non-Linux archs. 
Seems that crypto++ in nixpkgs doesn't build on Darwin, so let's use bundled
crypto++ until the version in nixpkgs works well.

This refers to the following build:

http://hydra.nixos.org/build/5404516

Hopefully, this will fix it on Mac OS X, because I don't have a Darwin machine
for testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 13:21:43 +02:00
aszlig 467962b185
synergy: Take over maintenance. 
I'm heavily using synergy for daily work, so I'm most probably going to watch
out for changes/improvements/bugs :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:18:21 +02:00
aszlig 60ba4485b1
zabbix2: Add optional XMPP support using iksemel. 
This uses recurseForDerivations directly after using callPackage magic to ensure
that the input attributes can be overriden *and* nix-env shows the package as in
recurseIntoAttrs.

The reason for making this optional is because there probably is only a minority
of people who want to use XMPP and we don't want to introduce an additional
dependency for the majority, do we?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:56 +02:00
aszlig f974573a5e
iksemel: Add new package with version 1.4. 
This library is used by Zabbix in order to send XMPP alerts/notifications.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:55 +02:00
aszlig b0601f6d6f
chromium: Update all channels to latest versions. 
Chromium 28.0.1500.52 finally is stable, so the release channels are now:

stable: 28.0.1500.52 (builds fine, tested)
beta:   28.0.1500.52 (same as stable)
dev:    29.0.1541.2  (patch rebased, builds fine, tested)

The user namespace patch doesn't apply for version 29, so I had to rebase it
against the current trunk (revision 207742).

And as version 27 is outdated, we no longer need to distinguish versions for
patching the hardcoded gcc path in core/core.gypi.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:55 +02:00
aszlig 1709571b3f
ninja: Update to v1.3.4 and drop unzip dependency. 
Version 1.2.0 is way too old in order to build the latest chromium (29) version,
so let's get it up to date (especially because no other package is referencing
ninja, so it should be non-critical).

The dependency on unzip is not needed here, because GitHub also provides
archives in tar.gz format.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:55 +02:00
aszlig 8b425e2ae3
chromium: Mark beta and dev versions lowPrio. 
I'm still wondering why noone has reported this, but I found out about this
while trying to introduce someone to NixOS, eventually wondering why it is going
to install version 29 when using "nix-env -i chromium".

So, in hope that everyone out there using the package is using the attribute,
let's make _stable_ the default here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:54 +02:00
aszlig e0ea957d64
php53: Don't use bundled version of libgd. 
This fixes a copy & paste error I made in 486e918, which resulted in PHP being
built with the bundled version of GD instead of the one we have in nixpkgs.

Thanks to @peti for noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:54 +02:00
aszlig 9a37a306b8
synergy: Enable unit tests. 
Integration tests don't seem to work right now, so let's see if we can figure
out a way to enable them later. But at least running unit tests is better than
not running any tests :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:54 +02:00
aszlig d9e0c355a0
synergy: Add support for Xinput2. 
This is needed in order to support devices such as gamepads or tablets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:53 +02:00
aszlig ea4afb73d8
synergy: Add support for XrandR. 
Nowadays, multiple monitor setups are quite common, so I suppose we'd want
support for that. Especially because users might get confused if synergy is
unable to pick the right screen resolution and thus cause edges to be cut off
from the available pointing area.

The postPatch hook is to force cmake into thinking that we have XRRNotifyEvent,
which we _do_ have with the xrandr version shipped in nixpkgs. Automatic
detection from CMakeLists.txt fails here because it tries to search for the
symbol within the libX11 store path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:53 +02:00
aszlig 57dee2a27e
synergy: Update to new upstream version 1.4.12. 
This brings in support for encryption and thus requires the crypto++ library as
an additional dependency. Unfortunately the upstream integration isn't quite the
way we'd like it to be, so we need to add a small patch to ignore the bundled
version and use the package from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:53 +02:00
Lluís Batlle i Rossell 1b8548fc72 Updating umurmur to 0.2.13 
Now opus works.
 2013-06-21 12:16:15 +02:00
Lluís Batlle i Rossell 34cf9baaa6 Update mumble to 1.2.4 
Now it should have opus. The source code of opus comes with mumble.
 2013-06-21 11:10:41 +02:00
Domen Kožar 9177be20b6 Merge pull request #660 from lovek323/vim-coffee-script 
vim-coffee-script: add expression
 2013-06-20 23:21:47 -07:00
Domen Kožar 5a0902456e Merge pull request #648 from lovek323/vim 
vim_configurable: fix python on darwin
 2013-06-20 23:19:51 -07:00
Jason "Don" O'Conal d195372eba php53-xdebug: add expression 2013-06-21 15:12:21 +10:00
Jason "Don" O'Conal 60fd718856 vim-coffee-script: add expression 2013-06-21 15:11:07 +10:00
Lluís Batlle i Rossell b38308553b Adding cjdns. 
The executable runs; I haven't tried to run a node.
 2013-06-20 20:53:37 +02:00
Vladimír Čunát 2cfbe7b292 wpa_supplicant: update 1.1 -> 2.0 
It works fine for me, GUI as well.
 2013-06-20 19:13:29 +02:00
Lluís Batlle i Rossell 3b67955fcf skype: update from 4.1.0.20 to 4.2.0.11 2013-06-20 17:13:46 +02:00
Shea Levy 97b95d60d8 Chromedriver: update to 2.0 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-20 09:21:25 -04:00
Vladimír Čunát 87fca9cf72 audacious: update 3.2.2 -> 3.3.4, now needs gtk3 
Also build on Linux platforms.
Seems to work fine for me.
 2013-06-20 14:24:19 +02:00
Domen Kozar ebd26e2d67 tarman: 1.0 -> 1.0.1 2013-06-20 13:43:32 +02:00
Peter Simons 8c2b28b4a6 haskell-mongoDB: update to version 1.4.1 2013-06-20 12:37:54 +02:00
Peter Simons b2b6c81d4c haskell-ghc-heap-view: update to version 0.5.1 2013-06-20 12:37:54 +02:00
Peter Simons 513d717d47 Merge pull request #654 from lovek323/sup 
sup: update to latest version
 2013-06-20 03:09:46 -07:00
Jason "Don" O'Conal a7746e3585 php53: restore nix gd version 2013-06-20 19:58:00 +10:00
Jason "Don" O'Conal 6ae1241934 php53: add optional pcntl flag 2013-06-20 17:42:09 +10:00
Domen Kožar a80642ccbf Merge pull request #656 from offlinehacker/amdappsdk_fix 
amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully
 2013-06-19 23:57:51 -07:00
Evgeny Egorochkin 8cb0da5dd1 Merge pull request #653 from lovek323/irssi 
irssi: fix build on darwin
 2013-06-19 19:37:04 -07:00
Evgeny Egorochkin 7ddbfaed8e Merge pull request #652 from lovek323/guile 
guile: remove gcc_s dep, skip check on darwin
 2013-06-19 19:30:45 -07:00
Jaka Hudoklin d16f175934 amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully 2013-06-20 02:22:18 +00:00
Jason "Don" O'Conal cf2b5daa15 sup: update to latest version 2013-06-20 10:09:15 +10:00
Jason "Don" O'Conal 657ef3959b irssi: fix build on darwin 
* use `gccApple` (so we can cope with `-no-cpp-precompile`)
* add `libintlOrEmpty`
 2013-06-20 09:25:54 +10:00
Jason "Don" O'Conal 438034483a guile: remove gcc_s dep, skip check on darwin 2013-06-20 09:11:04 +10:00
Jason "Don" O'Conal f4d648ed5c shishi: fix compilation on darwin 2013-06-20 09:08:09 +10:00
Lluís Batlle i Rossell 5f28fb15af Note about the source of previous build fix in glext85 2013-06-19 17:38:38 +02:00
Lluís Batlle i Rossell d4aa6099bd Fixing vaapi-vdpau build with newer mesa. 2013-06-19 17:33:44 +02:00
Lluís Batlle i Rossell 4c6a981070 Adding 'weka'. 2013-06-19 16:19:06 +02:00
Peter Simons 962e2aede8 haskell-postgresql-simple: update to version 0.3.3.2 2013-06-19 10:42:43 +02:00
Peter Simons c7097891e0 haskell-persistent-template: update to version 1.2.0.2 2013-06-19 10:42:43 +02:00
Peter Simons f14d6839b1 haskell-hakyll: update to version 4.3.1.0 2013-06-19 10:42:43 +02:00
Peter Simons 5e5b04d00a haskell-JuicyPixels: update to version 3.1 2013-06-19 10:42:43 +02:00
Peter Simons 7154e32f65 Dropped obsolete Haskell packages primitive-0.4.1, vector-0.9.1, and vector-0.10. 2013-06-19 10:42:42 +02:00
Vladimír Čunát 4255b343e8 pango, gtk3: non-Linux attempts to fix 2013-06-19 09:00:06 +02:00
Evgeny Egorochkin 6b4eaf71fe Merge pull request #636 from craff/glsurf 
Glsurf (3D drawing of implicit surfaces and curves)
 2013-06-18 22:34:08 -07:00
Jason "Don" O'Conal ed3a63b5d7 php53: fix on darwin 
* add libssh2 to build inputs (configure fails without this)
* link with stdc++
* add icu/lib directory to DYLD_LIBRARY_PATH (and wrap binaries with this
  environment variable
* add libiconv to build inputs
* fix --with-iconv configure flag (was --with-iconv-dir which is not a valid
  flag)
 2013-06-19 14:15:55 +10:00
Christophe Raffalli 102216f8c9 Drop useless dependencies in glsurf 2013-06-19 05:03:42 +02:00
Christophe Raffalli 101aad1467 camlimages ... still wasn't ok. Now better. 2013-06-19 04:39:55 +02:00
Evgeny Egorochkin e77a7d21dc Fix attr name to match version 2013-06-19 05:15:05 +03:00
Jason "Don" O'Conal 719b488b10 vim_configurable: fix python on darwin 
* was not linking to the correct python library on darwin (using the OS
  X framework, which is not what we want)
 2013-06-19 12:06:55 +10:00
Evgeny Egorochkin f5f76e6446 ocamlPackages.deriving: fix version 2013-06-19 03:20:00 +03:00
Evgeny Egorochkin ec349e58b7 Merge pull request #647 from ocharles/vector-0.9.1 
haskellPackages: vector-0.9.1 fix 'primitive' dependency
 2013-06-18 17:18:11 -07:00
Evgeny Egorochkin bfd5bc0ba7 Merge pull request #645 from errge/master 
Update xpra to 0.9.5
 2013-06-18 17:16:30 -07:00
Marc Weber d25d1e4d24 ocaml adding deriving 2013-06-19 03:07:27 +03:00
Marc Weber ccb2e9a832 Adding multiple versions of sbt. Probably you want to use the latest(default). 2013-06-19 02:45:40 +03:00
Oliver Charles 81b564b52e haskellPackages: vector-0.9.1 fix 'primitive' dependency 2013-06-19 00:28:30 +01:00
Moritz Ulrich 4d60fa66f1 Add sha256 for python-obfsproxy. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-06-19 01:02:57 +02:00
Vladimír Čunát e366dc565a Fix the hash changes accidentally caused in 98436616 
Moreover I'm not sure It's legal to add *lists inside* buildInputs.
 2013-06-18 23:59:23 +02:00
Vladimír Čunát 1f81984293 non-Linux: more adjustments 
Also reordered stuff in all-packages.nix.
 2013-06-18 23:59:23 +02:00
Lluís Batlle i Rossell 83dee22f4a Fixing a crash bug in dropbear. 2013-06-18 23:35:53 +02:00
Lluís Batlle i Rossell ae98b61850 dropbear: update to 2013.58, and build dynamically 
I had to do a trick with GNU make, to allow it to find libs.
 2013-06-18 23:35:53 +02:00
Vladimír Čunát f0417726d1 Merge pull request #533 from MarcWeber/submit/eclipses 
eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more...
 2013-06-18 14:20:10 -07:00
Domen Kozar 35431a7d7b libgnomeprint: build on linux 2013-06-18 22:50:15 +02:00
Domen Kozar d7be74adc0 acpid: build on linux 2013-06-18 22:48:34 +02:00
Domen Kozar 1a23f715f4 tig: built for linux 2013-06-18 22:42:12 +02:00
Vladimír Čunát 2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Vladimír Čunát 3cba755596 qt48: minimize default dependencies on non-Linux 2013-06-18 22:03:35 +02:00
Sander van der Burg 98436616a5 Replaced ad-hoc gettext buildinput by libintlOrEmpty 2013-06-18 22:01:40 +02:00
Vladimír Čunát 92ecf99373 qt48, gstreamer: attempt to fix on non-Linux 2013-06-18 18:34:25 +02:00
Vladimír Čunát 3adf8e6429 vala, libusb1, deps of libjpeg: attempt to fix on non-Linux 2013-06-18 17:52:09 +02:00
Vladimír Čunát ab7d7333be dbus: attempt to fix build on FreeBSD and Darwin 
Also build it there.
 2013-06-18 17:52:09 +02:00
Sander van der Burg aeaaa0a7e7 libv8 still broken in chroots, but this scons patch script fixes it 2013-06-18 17:14:17 +02:00
Gergely Risko 79c2db389c Update xpra to 0.9.5 2013-06-18 15:36:42 +02:00
Vladimír Čunát a8f153267c qt48: security fix for CVE-2013-0254 
Taken from Gentoo.
 2013-06-18 13:57:15 +02:00
Peter Simons d815e5eba2 gnucash: fix build (by removing the obsolete potfiles patch) 2013-06-18 13:11:03 +02:00
Peter Simons e006c2fd49 celestia: fix compilation and linking after x-updates merge 2013-06-18 13:11:03 +02:00
Sander van der Burg 1d4c7f50ec libv8 ruby gem has hardcoded reference to /usr/bin/env, so that it won't build in a chroot -> fix this 2013-06-18 13:05:43 +02:00
Domen Kozar cd1b531867 gnucash: add me as maintainer 2013-06-18 13:04:05 +02:00
Vladimír Čunát 53fa11cfc9 poppler: attempt to fix missing libiconv on non-Linux 2013-06-18 12:53:19 +02:00
Peter Simons efac6d8e73 celestia: help the package find the gtk related libraries 2013-06-18 12:44:24 +02:00
Peter Simons 3e241c3f83 celestia: add patch to support libpng 1.6 2013-06-18 12:44:24 +02:00
Peter Simons e6c48a73f8 celestia: update hashes for the downloaded patches 2013-06-18 12:44:23 +02:00
Sander van der Burg 37b25a712e Fix graphviz building on darwin 2013-06-18 12:24:40 +02:00
Sander van der Burg 23f43527e1 harfbuzz needs libintl on non glibc platforms 2013-06-18 10:36:28 +02:00
Michael Raskin 4ecbe3bf5d Adding pandas - Python data analsysis library 2013-06-18 11:51:35 +04:00
Jason \"Don\" O'Conal 85bfa943f7 glib: fix on darwin (merge #644) 
* include Foundation.h header
* add myself to maintainers
* build with gccApple

@vcunat: minor refactoring.
 2013-06-18 08:17:36 +02:00
Evgeny Egorochkin 5de6c72638 Merge pull request #640 from lovek323/pygit 
pygit: add DYLD_LIBRARY_PATH to compile on darwin
 2013-06-17 22:40:45 -07:00
Evgeny Egorochkin 0e57725261 Merge pull request #633 from lovek323/httpd 
apacheHttpd: fix build on darwin
 2013-06-17 22:38:29 -07:00
Evgeny Egorochkin d8806940d6 Merge pull request #641 from lovek323/ruby19 
ruby-1.9: disable tk when compiling on darwin
 2013-06-17 22:36:44 -07:00
Jason "Don" O'Conal 9b409f2cae tree: fix compilation on darwin 2013-06-18 14:02:21 +10:00
Jason "Don" O'Conal 02eef5b0f4 ruby-1.9: disable tk when compiling on darwin 2013-06-18 13:59:00 +10:00
Jason "Don" O'Conal f3fade60fc pygit: add DYLD_LIBRARY_PATH to compile on darwin 2013-06-18 13:23:52 +10:00
Evgeny Egorochkin 88eff1efac Merge pull request #619 from lovek323/sdcv 
sdcv: add expression
 2013-06-17 16:29:53 -07:00
Eelco Dolstra 5bc8275075 nix: Update to 1.5.3 2013-06-18 00:56:00 +02:00
Eelco Dolstra efde9567d1 flightgear: Remove from channel 
It's 264 MiB compressed...
 2013-06-17 22:51:37 +02:00
Vladimír Čunát 6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Vladimír Čunát afdc7fdfb6 fix evaluation on non-Linux, should fix tarball 2013-06-17 22:06:36 +02:00
Vladimír Čunát 0b875c8706 Merge pull request #635 from lovek323/ruby 
ruby19: fix on darwin
 2013-06-17 10:39:06 -07:00
Domen Kožar 25777d2aca Merge pull request #637 from the-kenny/fix-dropbox-cli 
Fix dropbox cli
 2013-06-17 08:54:40 -07:00
Domen Kozar ad14e4c90d add tarman-0.1 2013-06-17 17:53:46 +02:00
Vladimír Čunát 0f7e530c9d mesa_noglu: make it meaningful even on darwin 
In future we should change the mess, e.g. have libGL, libGLU and similar
attributes.
 2013-06-17 16:14:46 +02:00
Shea Levy 8179bad658 Merge branch 'allow-imports-in-submodules' into upstream-master 
This allows submodules to use the full power of the module system.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-17 10:06:08 -04:00
Shea Levy abfca0ad14 When printing submodule keys, print just the file name if known 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-17 10:05:46 -04:00
Peter Simons d5dac74d94 gnuplot: update to version 4.6.3 2013-06-17 15:25:03 +02:00
Eelco Dolstra f83a4dd41d Add Forks::Super 2013-06-17 15:14:40 +02:00
Jason \"Don\" O'Conal 8ce7550a9f cairo-1.12.2: fix pixman include path 2013-06-17 14:14:09 +02:00
Lluís Batlle i Rossell 2c71506929 nlopt: build octave plugins 2013-06-17 12:47:45 +02:00
Vladimír Čunát cba6d9b11a qt48: I give up, switching off parallel building 
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
#   (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	core
#	dev.diff
#	pkgs/applications/networking/browsers/firefox/cairo-test.patch
#	pkgs/applications/video/flowblade/
#	pkgs/desktops/gnome-3/core/dconf/
#	pkgs/desktops/gnome-3/core/eog/
#	pkgs/desktops/gnome-3/core/libsecret/
#	pkgs/development/libraries/ncurses/builder.sh
#	pkgs/servers/x11/xorg/download-cache/
#	pkgs/servers/x11/xorg/still-missing.txt
 2013-06-17 10:06:23 +02:00
Peter Simons a33fd118f5 pkgs/top-level/release-haskell.nix: move this file into a separate repository 
Hydra doesn't build this file anyway, so there seems to be no point in
having it in Nixpkgs.
 2013-06-17 10:00:34 +02:00
Peter Simons 41a0ef966b haskell-Chart: use the homepage URL specified in the cabal file 2013-06-17 09:57:37 +02:00
Gergely Risko 7a602e5f86 Hackage: upgrade Chart to 0.17, timeplot to 1.0.21 and add Chart-gtk 2013-06-17 09:53:28 +02:00
Domen Kožar 50a0d55b3e Merge pull request #638 from offlinehacker/cgminer 
Add cgminer, crypto currency mining application and all relevant dependecies
 2013-06-16 23:37:31 -07:00
Jaka Hudoklin 4d76f87c13 Add cgminer: gpu, fpga and asic crypto currencies mining application 2013-06-16 21:51:27 +00:00
Eelco Dolstra da862fb61b Add Net::Amazon::S3 
As usual with Perl modules, adding one pulls in 30 more...
 2013-06-16 23:45:50 +02:00
Moritz Ulrich edaca7bdf0 Add myself as a maintainer of dropbox-cli. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-06-16 23:40:43 +02:00
Jaka Hudoklin a826c359c2 Add amdadl-sdk: amd display library sdk, usefull for ati gpu statistics 2013-06-16 21:39:54 +00:00
Jaka Hudoklin 4817f34f2b Add amdapp-sdk: accelerated parallel processing sdk with OpenCL support 2013-06-16 21:39:43 +00:00
Moritz Ulrich 1570336325 Fix dropbox-cli. 
Dropbox doesn't version the CLI. This broke the download. This patch
also fixes the `dropbox-cli start' command.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-06-16 23:38:33 +02:00
Christophe Raffalli cb980d97d7 added glsurf package 2013-06-16 22:33:47 +02:00
Christophe Raffalli ce2efd0b5b fixed dependencies of camlimages 2013-06-16 22:33:44 +02:00
Christophe Raffalli c205449003 upgraded freeglut to 2.8.1 (menu are broken in 2.8.0) 2013-06-16 22:33:41 +02:00
Christophe Raffalli 27bf590d3c upgraded ocaml-mysql to 1.1.1 2013-06-16 22:33:38 +02:00
Christophe Raffalli fc36c19834 Added OCaml gmp bindings mlgmp 2013-06-16 22:33:33 +02:00
Jason "Don" O'Conal cfab5a8ecf ruby19: fix on darwin 
* seems to require readline even when cursesSupport is not enabled
 2013-06-16 21:39:09 +10:00
Vladimír Čunát c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates 
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
 2013-06-16 10:13:51 +02:00
Jason "Don" O'Conal 85f2674e22 apacheHttpd: minor modifications to meta attrs 
* add myself as a maintainer
* use reference to `stdenv.lib.licenses.asl20` rather than literal
  string
 2013-06-16 12:10:19 +10:00
Rob Vermaas ccda14879e Add unionfs-fuse and ntfs-3g to the channel 2013-06-15 20:47:47 +02:00
Domen Kožar 1be45ef6c4 Merge pull request #632 from lovek323/vim-syntastic 
Add vim syntastic plugin
 2013-06-15 10:45:45 -07:00
Domen Kožar 0d15be335c Merge pull request #629 from lovek323/vim_configurable 
vim_configurable: improvements
 2013-06-15 10:36:51 -07:00
Aristid Breitkreuz c63f00c337 linux 3.9.6 2013-06-15 19:32:20 +02:00
Peter Simons 84c1d5f03b all-packages.nix: use blanks instead of tabs 2013-06-15 17:14:57 +02:00
Peter Simons 38d22b4851 ess: add Emacs Speaks Statistics mode 2013-06-15 17:13:37 +02:00
Michael Raskin 81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Mathijs Kwik 1f4c079bc3 Re-propagate libdrm 2013-06-15 17:15:07 +04:00
Peter Simons 43822c1a36 haskell-cabal2nix: update to version 1.52 2013-06-15 13:40:59 +02:00
Peter Simons 9ce5dec479 cosmetic 2013-06-15 13:40:59 +02:00
Peter Simons 362a77ad85 Merge pull request #630 from lovek323/sup 
sup: add missing dependencies
 2013-06-15 04:27:37 -07:00
Peter Simons 5a1e9a9cf2 haskell-binary: re-add version 0.6.0.0 for the benefit of GHC 6.10.4 2013-06-15 13:18:51 +02:00
Jason "Don" O'Conal d166efdff5 sup: add missing dependencies 
* rubygems `locale` and `text` were missing from the sup expression
 2013-06-15 21:03:01 +10:00
Peter Simons b7cba63031 Add moderntimeline extension for moderncv. 2013-06-15 13:00:02 +02:00
Peter Simons 9df1684126 moderncv: update to version 1.5.1 2013-06-15 13:00:02 +02:00
Jason "Don" O'Conal b7b98f04a2 vim_configurable: improvements 
* add ruby interpreter (may have been accidentally removed, or may never
  have existed)
* allow selection of GUI options by setting `config.vim.gui`
 2013-06-15 20:48:20 +10:00
Peter Simons 0ec9ca98a9 haskell-shake: update to version 0.10.5 2013-06-15 12:39:16 +02:00
Peter Simons 67fc03f1e4 haskell-accelerate: update to version 0.13.0.5 2013-06-15 12:39:16 +02:00
Peter Simons 41b4c3da48 haskell-accelerate-io: update to version 0.13.0.2 2013-06-15 12:39:16 +02:00
Peter Simons ad8413ac0b haskell-accelerate-cuda: update to version 0.13.0.3 2013-06-15 12:39:16 +02:00
Peter Simons 9c771de1a8 Agda: drop redundant overrides 2013-06-15 12:39:16 +02:00
Peter Simons 0f25c404bc haskell-hashable: add version 1.2.0.10 2013-06-15 12:39:15 +02:00
Peter Simons c0d78bf9a6 Merge pull request #621 from errge/xtest 
Add haskell/xtest
 2013-06-15 03:37:39 -07:00
Peter Simons c7ee3ca11c Merge pull request #622 from errge/hit 
Add hit and (it's dependency,) bytedump
 2013-06-15 03:37:12 -07:00
Peter Simons c9192f5ed5 Merge pull request #624 from errge/template-default 
Add template-default
 2013-06-15 03:36:42 -07:00
Peter Simons 4399352078 Merge pull request #625 from errge/vector 
Add vectorThUnbox
 2013-06-15 03:34:13 -07:00
Peter Simons fc165c0db9 Merge pull request #626 from lovek323/sup 
sup: add required gems and separate dependencies
 2013-06-15 03:26:10 -07:00
Peter Simons bc73915b72 Merge pull request #628 from craff/pgf-tikz/update 
Pgf tikz/update
 2013-06-15 03:22:16 -07:00
Peter Simons 12c9251a3d haskell-defaults.nix: add overrides to fix the latest cabal-install build with older GHC versions 2013-06-15 12:12:08 +02:00
Peter Simons 7d67e76664 release-haskell.nix: build the latest version of Cabal and cabal-install with all GHC major releases 2013-06-15 12:01:19 +02:00
Peter Simons e049b5b972 gnucash: update to version 2.4.13 2013-06-15 11:53:13 +02:00
Christophe Raffalli ec41f1928a fix pgf hash 2013-06-15 07:07:26 +00:00
Christophe Raffalli f53c60c8bb upgrading pgf/tikz to 2.10 2013-06-15 06:57:06 +00:00
Jason "Don" O'Conal 4968acde6b Add vim syntastic plugin 2013-06-15 13:22:11 +10:00
Russell O'Connor 74d7c12e3a Merge branch 'master' of github.com:NixOS/nixpkgs 2013-06-14 12:18:27 -04:00
Russell O'Connor c9f5959285 Update Coq to version 8.4pl2. 2013-06-14 12:16:52 -04:00
aszlig cfb697b013
chromium: Update beta and dev release channels. 
The following new versions were introduced:

beta: 28.0.1500.45 - builds fine and tested
dev:  29.0.1521.3  - builds fine and tested

Although the version from the dev release channel isn't the latest found on
omahaproxy but it's the latest one, that actually has tarballs available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:37 +02:00
aszlig 777351bce4
chromium/updater: Avoid downgrading versions. 
Previously we have just checked for equality. When going back in history, that
way if the history is somewhat out-of-sync, we could end up "updating" to an
older version, which we definitely don't want.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:36 +02:00
aszlig 872fb3e2ff
chromium/updater: Fetch more previous versions. 
Omahaproxy has an URL which lists a history of the published versions, which
allows to not only go back one versions, but several. Now it is ensured, that we
always have the latest _available_ version in sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:36 +02:00
aszlig 5a6242a401
chromium/updater: Fall back to previous version. 
This is especially annoying for the dev channel, as it happens quite frequently
that tarballs are unavailable. So if fetching the latest version doesn't work,
try the second latest version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:36 +02:00
aszlig 8cf68e5645
chromium/updater: Remove workaround for <= v26. 
We no longer need the tar.bz2 archives, so let's remove the switch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:35 +02:00
aszlig ea87598a71
zabbix20: Update to version 2.0.6. 
Release notes for this version and 2.0.5:

http://www.zabbix.com/rn2.0.6.php
http://www.zabbix.com/rn2.0.5.php

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:35 +02:00
aszlig 486e918215
php: Fix support for JPEG and PNG over GD. 
Set an explicit path to the location of libjpeg for version 5.4 and an explicit
path to libjpeg _and_ libpng for version 5.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:35 +02:00
Eelco Dolstra 935a054de9 libXrender, libXvMC: Update 2013-06-14 14:53:36 +02:00
Mathijs Kwik 4d19da7e99 gtk-2: remove unneeded argument 2013-06-14 13:49:35 +02:00
Eelco Dolstra 672ae93687 jquery-ui: Update to 1.10.3 
Also add a symlink jquery.js (jquery.min.js is gone).
 2013-06-14 13:38:37 +02:00
Eelco Dolstra a0c5ff6571 nixUnstable: Update to 1.5.3pre3141_1b6ee8f 2013-06-14 13:38:36 +02:00
Gergely Risko fab2610bcf Add vectorThUnbox 2013-06-14 13:09:11 +02:00
Gergely Risko 4d49435cf6 Add template-default 2013-06-14 13:04:40 +02:00
Gergely Risko 89f28c9923 Add hit and (it's dependency,) bytedump 2013-06-14 11:57:24 +02:00
Gergely Risko efb46727cb Add haskell/xtest 2013-06-14 11:35:52 +02:00
Jason "Don" O'Conal 2735e9c8d6 apacheHttpd: fix build on darwin 
* remove the gcc_s library from NIX_LDFLAGS (not available on darwin)
 2013-06-14 18:16:37 +10:00
Jason "Don" O'Conal d0d9470519 sup: add required gems and separate dependencies 2013-06-14 18:06:14 +10:00
Michael Raskin 7093dd2c70 Some fixes 2013-06-14 07:46:33 +04:00
Lluís Batlle i Rossell 7346eb64bf Adding comment about psmouse-alps. 2013-06-13 23:25:52 +02:00
Michael Raskin 1a41887398 Fix a missing option declaration after merge 2013-06-14 00:11:34 +04:00
Michael Raskin 605c5a55a8 Merge branch 'x-updates-failed-merge-2013-06-13' into x-updates 2013-06-14 00:10:35 +04:00
Vladimír Čunát 94d8de2b99 dbus: fix build on non-Linux platforms 
We do not want systemd there.
This should fix the tarball job systemd assertion problems.
 2013-06-13 21:02:00 +02:00
Vladimír Čunát 84bf7818a4 dbus: minor update, fixing DOS CVE-2013-2168 
I tried building some X apps, all seems fine.
 2013-06-13 20:57:41 +02:00
Vladimír Čunát fa6caedfea qt48: hopefully a version that works for all possibilities 
All builds were OK on my 8-thread testing machine, but it's probably too
little parallelism to show these problems.
 2013-06-13 19:18:34 +02:00
Eelco Dolstra 197b166f0c Update some Perl packages 2013-06-13 15:56:23 +02:00
Eelco Dolstra 629daa2102 Rewrite the CPAN generator to Perl 
Also:

- It's now installable by doing "nix-env -i nix-generate-from-cpan".

- It maps dependencies to the correct attribute (e.g. HTML::HeadParser
  is mapped to HTMLParser).

- It automatically selects buildPerlPackage or buildPerlModule.

- It's documented in the manual.
 2013-06-13 15:56:23 +02:00
Eelco Dolstra a79076b7aa Consistent whitespace 2013-06-13 15:56:23 +02:00
Eelco Dolstra de1c72f686 buildPerlModule: Call "./Build build" 
Some modules require this.
 2013-06-13 15:56:23 +02:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Malcolm Matalka ebaf0c01d3 Fixes rebar shebang, also fixes source of leveldb zip to be the canonical one from github 2013-06-13 14:45:41 +02:00
Michael Raskin ed51d54610 Merge pull request #606 from fignuts/master 
Add keepass password manager and update mono DLLMap.
 2013-06-13 05:42:53 -07:00
Michael Raskin 27bbff463f Merge pull request #601 from craff/ocaml/upgrade_and_new 
Ocaml/upgrade and new
 2013-06-13 05:41:59 -07:00
Michael Raskin c7536d2fa6 Merge pull request #617 from lovek323/vim_configurable 
Get vim_configurable compiling on darwin
 2013-06-13 05:41:12 -07:00
Jason "Don" O'Conal 2956b5db46 sdcv: add expression 2013-06-13 22:33:52 +10:00
Jason "Don" O'Conal 6baad4d4d6 vim_configurable: fix compilation on darwin 
* compile with gccApple
* enable darwinSupport by default
* do not use patchelf
 2013-06-13 22:20:54 +10:00
Sander van der Burg e5c7533b6c titaniumsdk: Bump to version 3.1.1 2013-06-13 13:58:32 +02:00
Vladimír Čunát ca67fccbfe pyGtkGlade: fix eval 
I didn't expect the file to be imported on two places.
 2013-06-13 13:12:39 +02:00
Vladimír Čunát 84262c18e3 pygtk: propagate gtk (fixes solfege build) 2013-06-13 13:02:24 +02:00
Vladimír Čunát 3d1491c166 kde410.kdepimlibs: add pkgconfig 
Accidentally noticed the request in logs.
 2013-06-13 13:02:24 +02:00
Vladimír Čunát 34f152e0d3 qt48: hopefully a good fix for parallel builds, finally 
It caused rare failures, mainly for Qt for creator build.
 2013-06-13 13:02:23 +02:00
Peter Simons 21e1ec9079 haskell-hakyll: update to version 4.3.0.0 2013-06-13 10:43:40 +02:00
Peter Simons 01c57234db haskell-concurrent-extra: update to version 0.7.0.6 2013-06-13 10:43:40 +02:00
Peter Simons 7b3ebfe8c5 haskell-haddock: add version 2.13.2.1 2013-06-13 10:43:35 +02:00
Mathijs Kwik 0813e7b748 firefox-21: make "use system cairo" optional, defaulting to false 2013-06-13 10:21:47 +02:00
Jason "Don" O'Conal 8232b0eef1 pango: add correct cairo include path 2013-06-13 18:11:36 +10:00
Jason "Don" O'Conal dc0c630e54 gtk2: fix compilation on darwin 
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
 2013-06-13 18:10:53 +10:00
Vladimír Čunát e931f3b935 libgcrypt: attempt to fix i686-freebsd builds, #616 
It would probably be better to get newer "as" from somewhere, but I
don't see how.
 2013-06-13 10:00:04 +02:00
Jason "Don" O'Conal 930b88c2a9 cairo: add correct include path for pixman.h 2013-06-13 16:47:29 +10:00
Jason "Don" O'Conal d884c2b639 gdk-pixbuf: add libintlOrEmpty to build inputs 2013-06-13 16:36:47 +10:00
Peter Simons 71439b3e96 Merge pull request #610 from lovek323/sup 
Add sup expression
 2013-06-12 23:33:19 -07:00
Jason "Don" O'Conal 7e52e251e8 atk: add libintlOrEmpty as build input 2013-06-13 16:30:27 +10:00
Peter Simons 128166a1f0 Merge pull request #613 from errge/hflags 
Add hflags
 2013-06-12 23:30:04 -07:00
Jason "Don" O'Conal b31db11a69 ghostscript: add libiconvOrEmpty to build inputs 2013-06-13 15:52:55 +10:00
Jason "Don" O'Conal 6f50a9d4f0 sup: use libiconvOrEmpty instead of plain old libiconv 2013-06-13 14:21:20 +10:00
Jason "Don" O'Conal b62aa175a2 gnupg: use libiconvOrEmpty instead of libiconv (not required for glibc platforms) 2013-06-13 14:17:27 +10:00
Jason "Don" O'Conal 150a6a7063 Rename ruby gpgme gem to ruby-gpgme 2013-06-13 14:14:44 +10:00
Jason "Don" O'Conal a5e65e66b1 sup: separate dependencies 
create separate expressions for gems requiring native extensions to be
built:

* gpgme
* ncursesw_sup
* xapian_full_alaveteli
 2013-06-13 10:45:51 +10:00
Jason "Don" O'Conal ee00c7aa4e Add gpgme build input for sup 2013-06-13 10:45:42 +10:00
Jason "Don" O'Conal 593228f18d Compile libusb with gccApple on darwin 2013-06-13 10:42:38 +10:00
Jason "Don" O'Conal 4fe22e28cb Add sup expression 2013-06-13 10:42:30 +10:00
Lluís Batlle i Rossell 4970ec637e Adding psmouse-alps, a touchpad kernel driver. 
Some laptops use these new touchpads, and this driver is
supposed to provide proper support for them.
 2013-06-12 22:55:58 +02:00
Lluís Batlle i Rossell ce9f40f5a7 gnunet-svn: updating to latest 2013-06-12 22:55:58 +02:00
Lluís Batlle i Rossell f2256276af irssi_otr: update to latest master 2013-06-12 22:55:57 +02:00
Gergely Risko c51077b222 Add hflags 2013-06-12 21:25:53 +02:00
Eelco Dolstra 6dbb6f78bb subversion: Update to 1.7.10 
CVE-2013-1968, CVE-2013-2088, CVE-2013-2112.
 2013-06-12 15:56:40 +02:00
Lluís Batlle i Rossell ceea8a18fc weechat: update to 0.4.1 2013-06-12 14:19:00 +02:00
Song Wenwu 92ba0a0913 gtk+: enable NLS support (merge #611) 
@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
 2013-06-12 10:18:38 +02:00
Peter Simons acc6039e2c haskell-iteratee: jailbreak to fix build with recent versions of ListLike 2013-06-12 08:45:34 +02:00
Peter Simons 70b10b6267 haskell-snap-core: update to version 0.9.4.0 2013-06-12 08:45:34 +02:00
Peter Simons 0e169b92ec haskell-persistent: update to version 1.2.0.2 2013-06-12 08:45:34 +02:00
Peter Simons a7c884eb18 haskell-acid-state: update to version 0.10.0 2013-06-12 08:45:34 +02:00
Peter Simons fd1291e985 haskell-ListLike: update to version 4.0.0 2013-06-12 08:45:34 +02:00
Peter Simons 97f45745bd haskell-Agda: update to version 2.3.2.1 2013-06-12 08:45:33 +02:00
Domen Kozar 808cadd390 tesseract: simplify 2013-06-12 00:50:52 +02:00
Domen Kozar 1b64fc9360 tesseract: upgrade to 3.02.02 and add some languages 2013-06-11 19:22:30 +02:00
Vladimír Čunát 6b433019fa libvpx: update 
Also set the shared-vpx for firefox, just to be sure.
Firefox, Chromium, and other seem to work fine.
 2013-06-11 18:03:48 +02:00
Vladimír Čunát f724a5314b flac: update, enable tests 
Fix includes in VLC.
Tried a few other programs using it, seems fine.
 2013-06-11 15:48:42 +02:00
Sander van der Burg 6fff888ae8 nijs: bump to 0.0.8 2013-06-11 15:09:10 +02:00
Mathijs Kwik c1bec6fb5b firefox-21: use more system libraries 
Conflicts:
	pkgs/applications/networking/browsers/firefox/21.0.nix
 2013-06-11 14:05:15 +02:00
Michael Raskin 1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin 55249de924 Update Julia to today's revision 2013-06-11 15:44:56 +04:00
Peter Simons 1db5bd4aa9 haskell-hsdns: update to version 1.6.1 2013-06-11 13:14:28 +02:00
Peter Simons a2680cdc48 groff: explicitly disable X11 support in configure to avoid impure builds 
Without this flag, the configure script will find /usr/X11 on host system and
assume that it can build with X11 support.
 2013-06-11 12:14:49 +02:00
Eelco Dolstra eaf98cf26e nixUnstable: Update to 1.5.3pre3134_5c06e52 2013-06-11 12:08:37 +02:00
Peter Simons c662109f8a Merge pull request #607 from ocharles/perl-packages 
Add lots more Perl packages
 2013-06-11 02:22:47 -07:00
Peter Simons a2328d7b80 Merge pull request #609 from coroa/ppp-ipv6 
ppp: enable ipv6 support
 2013-06-11 02:21:42 -07:00
Peter Simons a5a74c9c44 release.nix: remove emacs-ecb from nixos-tarball 
ecb mode is a part of Emacs and no longer exists as a separate package in Nixpkgs.
 2013-06-11 11:05:42 +02:00
Mathijs Kwik fcfbce4b80 Revert "firefox: Revert to 20.0" 
This reverts commit 9875413c48.
 2013-06-11 09:32:39 +02:00
Mathijs Kwik 1fb979b4f5 firefox-21: fix search box not working when built on xulrunner 2013-06-11 09:32:39 +02:00
Mathijs Kwik ad5970b680 firefox-21: fix building with system cairo 2013-06-11 09:32:38 +02:00
Michael Raskin 46cd2d0d68 Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins 
vim: supporting multiple sources & complicated plugins
 2013-06-10 23:06:56 -07:00
Evgeny Egorochkin 2e939a0fba Merge pull request #608 from ocharles/fabric 
fabric: new expression
 2013-06-10 23:01:59 -07:00
Jonas Hoersch b39a6ef532 ppp: enable ipv6 support 
networkmanager requires pppd to have ipv6 support for managing mobile
connections since version 0.9.5.95, ref. to commit 7575f4d.
 2013-06-11 01:07:06 +02:00
Oliver Charles d67c4690d3 fabric: new expression 2013-06-10 23:33:39 +01:00
Oliver Charles c078f67a7a perlPackages.TestMagpie: new expression 2013-06-10 23:06:08 +01:00
Oliver Charles 6a7882ed8d perlPackages.LWPUserAgentMockable: new expression 2013-06-10 23:05:08 +01:00
Oliver Charles 15700d49c1 perlPackages.TemplatePluginClass: new expression 2013-06-10 23:04:08 +01:00
Oliver Charles 1c94ac90b4 perlPackages.MethodSignaturesSimple: new expression 2013-06-10 23:03:19 +01:00
Oliver Charles 18b9044ec8 perlPackages.HTMLSelectorXPath: new expression 2013-06-10 23:01:14 +01:00
Evgeny Egorochkin dbcfef8c41 Ruby 1.9: update and reenable parallel build, since there's a chance it was fixed. 2013-06-11 00:59:26 +03:00
Oliver Charles ad136350c1 perlPackages.TestXPath: new expression 2013-06-10 22:58:22 +01:00
Oliver Charles 652425af07 perlPackages.MooseXRunnable: new expression 2013-06-10 22:57:32 +01:00
Oliver Charles 6d5b82416e perlPackages.TemplatePluginJavaScript: new expression 2013-06-10 22:56:40 +01:00
Oliver Charles 8a11acd8ac perlPackages.EnvPath: new expression 2013-06-10 22:56:01 +01:00
Oliver Charles 7e3f666673 perlPackages.TestJSON: new expression 2013-06-10 22:55:13 +01:00
Oliver Charles 912710ee9e perlPackages.XMLSemanticDiff: new expression 2013-06-10 22:54:29 +01:00
Oliver Charles 3a72c70ff4 perlPackages.TestMockClass: new expression 2013-06-10 22:53:59 +01:00
Oliver Charles cba31c7778 perlPackages.TestRoutine: new expression 2013-06-10 22:47:53 +01:00
Oliver Charles ac45df073d perlPackages.StringShellQuote: new expression 2013-06-10 22:47:21 +01:00
Oliver Charles 9130659599 perlPackages.DBIxConnector: new expression 2013-06-10 22:46:38 +01:00
Oliver Charles 51e8ad1c2b perlPackages.HTMLTreeBuilderXPath: new expression 2013-06-10 22:45:25 +01:00
Oliver Charles 32829201a4 perlPackages.IOAll: new expression 2013-06-10 22:44:14 +01:00
Oliver Charles 746b9fdaca perlPackages.DigestMD5File: new expression 2013-06-10 22:43:09 +01:00
Oliver Charles c20fa8b209 perlPackages.StringTT: new expression 2013-06-10 22:41:35 +01:00
Oliver Charles db0e68a37b perlPackages.EmailMIME: new expression 2013-06-10 22:39:50 +01:00
Oliver Charles 2aa2fff2d9 perlPackages.NetCoverArtArchive: new expression 2013-06-10 22:38:32 +01:00
Oliver Charles 3cbfa75086 perlPackages.NetAmazonS3Policy: new expression 2013-06-10 22:37:58 +01:00
Oliver Charles c332132cb1 perlPackages.NetAmazonAWSSign: new expression 2013-06-10 22:37:22 +01:00
Oliver Charles f7dcb609bf perlPackages.RSSParserLite: new expression 2013-06-10 22:36:24 +01:00
Oliver Charles 5fd1ae43fc perlPackages.CacheMemory: new expression 2013-06-10 22:35:29 +01:00
Oliver Charles 73d6af4767 perlPackages.MooseXABC: new expression 2013-06-10 22:32:57 +01:00
Oliver Charles 3c19030977 perlPackages.DateTimeFormatISO8601: new expression 2013-06-10 22:32:23 +01:00
Oliver Charles 7f41fb2ff0 perlPackages.MooseXTypesURI: new expression 2013-06-10 22:31:42 +01:00
Oliver Charles 63b7a6f25d perlPackages.MooseXClone: new expression 2013-06-10 22:30:32 +01:00
Oliver Charles 1abb47fc1f perlPackages.RESTUtils: new expression 2013-06-10 22:29:13 +01:00
Oliver Charles 195524c329 perlPackages.UnicodeICUCollator: new expression 2013-06-10 22:27:02 +01:00
Oliver Charles 98a9d9669b perlPackages.HTMLFormHandler: new expression 2013-06-10 22:25:39 +01:00
Oliver Charles 80a4e6f61f perlPackages.MooseXTypesStructured: new expression 2013-06-10 22:19:26 +01:00
Oliver Charles 69694da603 perlPackages.CGIExpand: new expression 2013-06-10 22:17:53 +01:00
Oliver Charles 9c7953d3b6 perlPackages.SetScalar: new expression 2013-06-10 22:17:22 +01:00
Oliver Charles 3a64c5d10f perlPackages.MathRandomSecure: new expression 2013-06-10 22:16:40 +01:00
Oliver Charles 78e81e0251 perlPackages.DataUUIDMT: new expression 2013-06-10 22:14:54 +01:00
Oliver Charles 1bb9fc728a perlPackages.CacheMemcachedFast: new expression 2013-06-10 22:12:28 +01:00
Oliver Charles c578c19ff1 perlPackages.CatalystPluginCache: new expression 2013-06-10 22:11:59 +01:00
Oliver Charles b5a700736e perlPackages.CatalystPluginUnicodeEncoding: new expression 2013-06-10 22:11:28 +01:00
Evgeny Egorochkin 24b1c74b7c Ruby 1.8: update 2013-06-11 00:10:34 +03:00
Oliver Charles bae4804ac3 perlPackages.Redis: new expression 2013-06-10 22:10:28 +01:00
Oliver Charles 107cfe7cee perlPackages.CatalystPluginCacheHTTP: new expression 2013-06-10 22:09:45 +01:00
Oliver Charles ae5a6b36b7 perlPackages.DateTimeFormatPg: new expression 2013-06-10 22:07:48 +01:00
Oliver Charles cd33c93a5b perlPackages.DigestHMAC_SHA1: new expression 2013-06-10 22:07:11 +01:00
Oliver Charles 2fc669c8a5 perlPackages.CatalystAuthenticationCredentialHttp: new expression 2013-06-10 22:06:34 +01:00
Oliver Charles 3e5878e90d perlPackages.TextWikiFormat: new expression 2013-06-10 22:04:43 +01:00
Oliver Charles bdebf13d9e perlPackages.TextTrim: new expression 2013-06-10 22:03:37 +01:00
Oliver Charles f41d722e8f perlPackages.TextUnaccent: new expression 2013-06-10 22:03:07 +01:00
Oliver Charles 2d458236a7 perlPackages.LogDispatch: new expression 2013-06-10 22:02:31 +01:00
Oliver Charles 65abb853f4 perlPackages.StatisticsBasic: new expression 2013-06-10 22:01:54 +01:00
Oliver Charles 7b8dbc338a perlPackages.PlackMiddlewareDebug: new expression 2013-06-10 22:00:55 +01:00
Oliver Charles 20784b09f4 perlPackages.ListUtilsBy: new expression 2013-06-10 21:59:09 +01:00
Oliver Charles 599c3b5f07 perlPackages.libintl_perl: new expression 2013-06-10 21:58:31 +01:00
Oliver Charles 21c4299c33 perlPackages.MooseXSingleton: new expression 2013-06-10 21:57:44 +01:00
Oliver Charles d1f04fe92c perlPackages.StringEscape: new package 2013-06-10 21:56:58 +01:00
Oliver Charles dfe33f6e20 perlPackages.CacheMemcached: new expression 2013-06-10 21:52:44 +01:00
Oliver Charles 4a517e4487 perlPackages.AlgorithmMerge: new expression 2013-06-10 21:50:48 +01:00
Evgeny Egorochkin b93ac14bf6 Ruby 1.9 parallel build sometimes fails due to races. 2013-06-10 23:34:06 +03:00
Rok Garbas cf5af0cbd0 pythonPackages.lxml: added 2.3 version 2013-06-10 21:01:24 +02:00
Rok Garbas 9f52473521 plone: 4.1 should use python 2.6 2013-06-10 21:00:37 +02:00
Rok Garbas fd5e631e7d Plone: fix for 4.1 2013-06-10 20:59:58 +02:00
Shea Levy 0af376815f Update nodePackages 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-10 10:18:48 -04:00
Sander van der Burg 35bd009680 nijs: Bump to 0.0.7 2013-06-10 16:13:27 +02:00
Peter Simons 2e618df532 bind: avoid build impurity by explicitly enabling/disabling features 
The BIND configure script finds extra dependencies in /usr/include and /usr/lib,
and activates additional features if it does. This may cause the build to fail
on systems that cannot use a chroot environment. Actively disabling those
additional features prevents this issue from occurring.
 2013-06-10 15:38:00 +02:00
Sander van der Burg ae5b6de50f Merge branch 'master' of github.com:NixOS/nixpkgs 2013-06-10 11:41:27 +02:00
Sander van der Burg 08dfdb8ebf nijs: Bumped to 0.0.6 2013-06-10 11:41:19 +02:00
Peter Simons 03a65dbb11 haskell-ghc-vis: update to version 0.7.1 2013-06-10 11:26:50 +02:00
Peter Simons d829182009 haskell-entropy: update to version 0.2.2.1 2013-06-10 11:26:50 +02:00
Peter Simons 977aaa93f9 haskell-contravariant: update to version 0.4.1 2013-06-10 11:26:50 +02:00
Peter Simons 6a7672d511 haskell-accelerate: update to version 0.13.0.4 2013-06-10 11:26:50 +02:00
Vladimír Čunát f06f6955bd qt4: fix build via adding dependency in generated makefile 
Also reorder attributes into the order in which they are run.
 2013-06-10 09:35:35 +02:00
Vladimír Čunát ce50fe26cb libgsf: maintenance update, use gdk_pixbuf now 2013-06-10 09:35:35 +02:00
Mathijs Kwik 9aa7f55017 firefox: use system jpeg library 2013-06-10 09:04:07 +02:00
Mathijs Kwik 5fb93bd27e firefox: enable the (enabled by default) elf hack 
It's supposed to speed things up but had some troubles in the past
that seem to have been fixed
 2013-06-10 08:58:54 +02:00
Mathijs Kwik 02b539ef47 add hsshellscript 2013-06-10 08:36:05 +02:00
Mathijs Kwik fc5946ac4b linux-3.9: upgrade to 3.9.5 2013-06-10 08:36:04 +02:00
Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/misc/emulators/wine/default.nix
 2013-06-10 10:04:46 +04:00
Evgeny Egorochkin 604652f1da riak: this is really strange. Lets hope this hash difference isn't malicious :( 2013-06-10 08:19:18 +03:00
Evgeny Egorochkin cdc21b40bd Fix typo :( 2013-06-10 08:11:10 +03:00
Evgeny Egorochkin 228ee94c88 Merge pull request #596 from ocharles/master 
haskell-pipes: use camelCase to name pipes packages, rather than separating words with hyphens
 2013-06-09 19:54:57 -07:00
Evgeny Egorochkin 009aa85060 Merge pull request #587 from orbitz/add-riak-1.3.1 
Add Riak 1.3.1
 2013-06-09 19:53:44 -07:00
Andrew Morsillo e1bd332758 Added keepass password manager. Updated mono DLLMap to allow mono to run WinForms applications (keepass). 2013-06-09 23:17:09 +02:00
Benjamin Cahill 923b3d032d rmlint: Remove unneeded dependency 2013-06-09 14:44:06 -05:00
Benjamin Cahill 6e6181bc89 Add rmlint, a tool for removing duplicate files 2013-06-09 13:34:50 -05:00
Peter Simons 75579b0ce3 all-packages.nix: fix typo in path to 'renpy' expression 2013-06-09 11:15:35 +02:00
Peter Simons cc6dc84603 Merge pull request #604 from iyzsong/renpy 
Add Ren'Py visual novel engine
 2013-06-09 02:10:21 -07:00
Peter Simons 504ae3f3a8 haskell-hlint: update to version 1.8.46 2013-06-09 10:47:15 +02:00
Peter Simons 49f1160f6d haskell-yesod: update to version 1.2.1 2013-06-09 10:47:15 +02:00
Peter Simons e09f13c188 haskell-yesod-routes: update to version 1.2.0.1 2013-06-09 10:47:15 +02:00
Peter Simons f702007252 haskell-yesod-platform: update to version 1.2.1 2013-06-09 10:47:15 +02:00
Peter Simons 1467b3bb07 haskell-yesod-persistent: update to version 1.2.1 2013-06-09 10:47:14 +02:00
Peter Simons b033cdc96e haskell-yesod-core: update to version 1.2.2 2013-06-09 10:47:14 +02:00
Peter Simons 57fbccae65 haskell-postgresql-simple: update to version 0.3.3.1 2013-06-09 10:47:14 +02:00
Peter Simons ed3ef0959c haskell-pipes-concurrency: update to version 1.2.0 2013-06-09 10:47:14 +02:00
Peter Simons bf46a57a84 haskell-monadcryptorandom: update to version 0.5.2 2013-06-09 10:47:14 +02:00
Peter Simons 827541c00b haskell-fingertree: update to version 0.1.0.0 2013-06-09 10:47:14 +02:00
Peter Simons 2535b7e5e1 haskell-classy-prelude: update to version 0.5.8 2013-06-09 10:47:14 +02:00
Peter Simons 221648a586 haskell-accelerate: update to version 0.13.0.2 2013-06-09 10:47:14 +02:00
Peter Simons 5aeffdbab3 haskell-accelerate-cuda: update to version 0.13.0.2 2013-06-09 10:47:14 +02:00
Song Wenwu d4c6b5924d add Ren'Py 6.15.5 
Ren'Py is a visual novel engine that helps you use words,
images, and sounds to tell stories with the computer.
This is just the minimal launcher.
 2013-06-09 12:45:56 +08:00
Song Wenwu 2ff588bb5d pygame: update to 1.9.1 
Enable PNG and JPEG support
Use pygame-v4l patch from AUR
 2013-06-09 12:12:15 +08:00
Evgeny Egorochkin dc54358ce9 Change package versions to conform to nixpkgs conventions. 2013-06-09 05:41:44 +03:00
Evgeny Egorochkin 8a7bd8b200 Wine: a crude fix to issue #542: "libgcc_s.so.1 must be installed for pthread_cancel to work". 2013-06-09 05:37:47 +03:00
Song Wenwu e094ccc10c glew: install libraries to $out/lib instead of $out/lib64 2013-06-09 08:33:34 +08:00
Evgeny Egorochkin c96c105c5c Merge pull request #600 from bencahill/master 
Add pianobar, a command-line Pandora client
 2013-06-08 14:36:39 -07:00
Peter Simons 3c05bb799f Merge pull request #603 from craff/emacs-mode/tuareg+update 
Added tuareg emacs mode and fixed some other emacs mode.
 2013-06-08 14:21:44 -07:00
Evgeny Egorochkin ce1c0f9877 Merge pull request #602 from craff/openconnect/upgrade 
Upgraded openconnect to 5.01.
 2013-06-08 14:20:28 -07:00
Benjamin Cahill 9350c1d5ce pianobar: Change license and clean up code 
The license was set to unfree so that Hydra doesn't build it; this is
for potential problems arising from the Pandora TOS.
 2013-06-08 14:13:36 -05:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Vladimír Čunát ba6c764a51 xorg: intel driver bugfix update 2013-06-08 15:40:39 +00:00
Jack Cummings bbbf625b7d Cherry-picking gphoto update by Jack Cummings, too 2013-06-08 19:32:52 +04:00
Vladimír Čunát 8c4a613f3a Merge pull request #599 from jcumming/gphoto2.130607 
(lib)gphoto2: update to 2.5.2
 2013-06-08 08:20:28 -07:00
Michael Raskin a3187cbba2 Update libgphoto2 - fix gphotofs 2013-06-08 16:51:43 +04:00
Christophe Raffalli a69cd62f71 Added tuareg emacs mode and fixed some other emacs mode. 
ecb emacs mode is commented out because it's dependency appears not to compile.
 2013-06-08 12:42:46 +02:00
Christophe Raffalli e4c2a5ddc7 Upgraded openconnect to 5.01. 
Added the new option --no-xmlpost to avoid a cisco server bug
 2013-06-08 12:38:12 +02:00
Christophe Raffalli d7223f3a3e simplify env-patoline and circumvert the bug with libgcc_s.so.1 2013-06-08 09:25:34 +02:00
Benjamin Cahill 00e720471b Add pianobar, a command-line Pandora client 2013-06-07 20:52:34 -05:00
Peter Simons c9208b9a23 haskell-bmp: update to version 1.2.5.2 2013-06-07 23:25:28 +02:00
Christophe Raffalli 356983074e Forgotten to add wanr.patch for omake. 2013-06-07 21:58:19 +02:00
Christophe Raffalli ac347e5cde Add the possibility to build a patoline environment with 
nix-env -i env-patoline.

This is the only reasonnable way to install patoline which require
ocaml compiler with a large set of libraries installed.
 2013-06-07 21:48:37 +02:00
Christophe Raffalli 270d929089 New ocaml packages: 
- ocaml-cairo
- camlimages
- dypgen
- patoline
 2013-06-07 21:40:38 +02:00
Christophe Raffalli 43faad8063 Upgraded ocamlnet to 3.6.3. Also enabled mot functionality of ocamlnet like nethttp 2013-06-07 21:40:38 +02:00
Christophe Raffalli 5765e186d2 upgraded ocaml/sqlite3 to 2.0.4 2013-06-07 21:40:37 +02:00
Christophe Raffalli 87e1089498 Upgraded omake to 0.9.8.6_rc1. kept the previous version as default because this is a rc1. 
This is necessary to compile the latest camlimages
 2013-06-07 21:40:37 +02:00
Christophe Raffalli b3fa714f1f upgraded lablgtk to version 2.16 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Christophe Raffalli 59877bd1ad upgraded camlzip to version 1.05 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Christophe Raffalli af7fd67e43 upgraded ocaml/cryptokit to 1.7 2013-06-07 21:40:37 +02:00
Jack Cummings b0cef0b6b8 gphoto2-2.5.2 and libgphoto2-2.5.2 2013-06-07 10:58:39 -07:00
aszlig 62176d3b4e
chromium: Update stable and beta channels. 
These new versions are introduced with this commit:

stable: 26.0.1410.63 -> 27.0.1453.93 (builds fine, tested)
beta:   27.0.1453.81 -> 28.0.1500.20 (builds fine, tested)

Unfortunately the tarball for the dev version 29.0.1530.2 isn't available at the
moment, so we're going to update it later.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-07 14:39:00 +02:00
Domen Kozar d4a2a56f3e gnutls: use lzma version of tarball 2013-06-07 13:39:49 +02:00
Peter Simons bfa846cd6e bind: update to 9.9.3-P1 to fix CVE-2013-3919 2013-06-07 13:27:12 +02:00
Michael Raskin eb946b4795 Luarocks: new package 2013-06-07 14:05:13 +04:00
Michael Raskin 2baaaebf57 Luarocks: new package 2013-06-07 14:04:15 +04:00
Domen Kozar 4213b4aacb fix eval 2013-06-07 11:18:33 +02:00
Shea Levy 6d64b1d92c Give unique keys to submodule components 
I'm not wed to the outPath values I chose, other options are probably
valid there too. It would be nice if we could track which file each
merged value came from as well.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-07 03:42:46 -04:00
Domen Kozar 74bde3bedd groff: let hydra build it 2013-06-07 09:35:20 +02:00
Michael Raskin 3fe8b9451a Update Wine 2013-06-07 10:27:19 +04:00
Michael Raskin 8615f6ef35 Update Wine 2013-06-07 10:23:48 +04:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Evgeny Egorochkin 61baf49624 Merge pull request #595 from grrwlf/fix-nmap 
nmap: fix GUI paths
 2013-06-06 15:28:34 -07:00
Evgeny Egorochkin a83d544f4e Merge pull request #597 from bjornfor/solfege 
Add Solfege, an ear training program
 2013-06-06 14:21:32 -07:00
Lluís Batlle i Rossell fad6bc90b3 Adding ZNC, irc bouncer. 2013-06-06 23:08:59 +02:00
Mathijs Kwik b5ba5959cf fix node packages with binary (native) extensions 2013-06-06 22:38:24 +02:00
Eelco Dolstra 9875413c48 firefox: Revert to 20.0 
The search box doesn't work anymore, will need to investigate why...
 2013-06-06 22:32:59 +02:00
Shea Levy d465d6764a Allow imports in submodules 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-06 14:00:10 -04:00
Bjørn Forsman 142fca279b solfege: new package 
Solfege is an ear training application.

This patch is based on the work of @mornfall.
 2013-06-06 19:30:41 +02:00
Bjørn Forsman aaac7100c8 txt2man: new package 
txt2man converts flat ASCII text to man page format. (Solfege, which is
added in the next commit, needs this.)
 2013-06-06 19:15:18 +02:00
Oliver Charles 7d8b2ea857 haskell-pipes: use camelCase to name pipes packages, rather than separating words with hyphens 2013-06-06 14:39:09 +01:00
Evgeny Egorochkin bc409a6e00 Merge pull request #593 from bjornfor/saleae-logic 
saleae-logic: new package
 2013-06-06 04:44:44 -07:00
Eelco Dolstra ebe6b96698 firefox: Update to 21.0 
Only problem was that the chrome resources were not in the right place
(and you only see that by running with the -jsconsole flag).
 2013-06-06 13:07:54 +02:00
Eelco Dolstra 4bd57f56a1 nspr: Update to 4.10 2013-06-06 13:04:26 +02:00
Eelco Dolstra 34dbf4face Remove Firefox 19 2013-06-06 11:59:05 +02:00
Domen Kozar 74b63a284f dont bootstrap distribute in IMAPClient 2013-06-06 10:57:01 +02:00
Peter Simons ae23b39350 all-packages.nix: drop trailing whitespace 2013-06-06 10:48:58 +02:00
Peter Simons 243a51b82d heimdal: cosmetic to make syntax highlightig happy 2013-06-06 10:48:58 +02:00
Peter Simons c65a3e198c heimdal: remove obsolete 1.3.x version 2013-06-06 10:48:58 +02:00
Christophe Raffalli d4ec61c717 grouped heimdal versions in all_packages.nix 2013-06-06 10:48:58 +02:00
Christophe Raffalli 4cf01f2115 rxvt_unicode with perl extension enabled by default 2013-06-06 10:48:58 +02:00
Christophe Raffalli 9f4b7508a6 Added rxvt_unicode_with_perl 2013-06-06 10:48:58 +02:00
Christophe Raffalli 55a8c050db Added heimdal 1.5.2, keeping version 1.3.3 2013-06-06 10:48:58 +02:00
Christophe Raffalli 8be8701db7 Added openconnect 2013-06-06 10:48:58 +02:00
Christophe Raffalli a7b8017583 Added imapfilter 2013-06-06 10:48:57 +02:00
Sergey Mironov ea82f6d0e9 nmap: help zenmap to find it's templates in nix-store 
Zenamp wrapper confuses python so it thinks that zenmap is launched as a script
and not as an executable. This leads to incorrect /share path and missing
templates. ./zenmap.patch cures that (a bit hacky as usual).
 2013-06-06 12:09:19 +04:00
Mathijs Kwik 0bcd97bb0b popplerQt4: force linking to poppler_glib 
to fix:
ldd /nix/store/...poppler-qt4-0.22.3/lib/libpoppler-qt4.so
libpoppler.so.36 => not found
 2013-06-06 09:13:44 +02:00
Mathijs Kwik 7717bc1573 vaapi-intel: fix compilation 2013-06-06 09:13:43 +02:00
Mathijs Kwik 35d3e38d54 add idris wrapper 2013-06-05 23:36:20 +02:00
Mathijs Kwik 3f9723e02e add idris wrapper 2013-06-05 23:30:38 +02:00
Lluís Batlle i Rossell a72ca55dd8 Bringing back glibc213Cross 
Issue #594. I don't know what triggred this glibc213Cross problem though.
I don't know why it disappeared, and I don't know why we have glibc213
there still.
 2013-06-05 23:00:14 +02:00
Mathijs Kwik c78ba70c2f mesa: propagate libraries 
- fixes libreoffice -
 2013-06-05 22:57:18 +02:00
Mathijs Kwik a479aafb75 Revert "Fixing LibreOffice configure for now" 
This reverts commit 9e4bee5270.
 2013-06-05 22:51:21 +02:00
Domen Kozar b6f7f05b35 adding unfree-redistributable-firmware 2013-06-05 22:44:17 +02:00
Peter Simons f37e7a92cf gnulib: update to version v0.0-7952-g439b0e9 2013-06-05 22:16:24 +02:00
Bjørn Forsman f425048875 saleae-logic: new package 
Add Saleae Logic - analyzer software for Saleae logic analyzators.

Also, add a small LD_PRELOAD library that is needed to make it work from
a read-only installation directory.
 2013-06-05 21:56:50 +02:00
Vladimír Čunát 619b024600 X security updates 
http://www.x.org/wiki/Development/Security/Advisory-2013-05-23

Three libs not released yet and without commit activity for around two
weeks, so I took the current master heads.
 2013-06-05 21:24:19 +02:00
Domen Kozar 1a1d8dfc69 Python: 2.7.4 -> 2.7.5 2013-06-05 21:07:46 +02:00
Zef Hemel 69cf3dede6 Bump to 0.10.10 2013-06-05 20:39:07 +02:00
Evgeny Egorochkin d2807428eb KDE 4.10: update to 4.10.4 2013-06-05 19:41:28 +03: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 ea7f862aeb Update nodePackages 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-05 11:22:42 -04:00
Shea Levy 2952d7d114 Merge submodule extraArgs and individualExtraArgs 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-05 11:20:59 -04:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00
Peter Simons 6cacb34fec haskell-bmp: jailbreak version 1.2.5.1 to support binary 0.7.x 2013-06-05 12:17:36 +02:00