Commit Graph

27229 Commits

Author SHA1 Message Date
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
Evgeny Egorochkin
bcf66c1c1b Merge pull request #642 from lovek323/tree
tree: fix compilation on darwin
2013-06-17 22:33:28 -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
Eelco Dolstra
15c1ca9d21 nix-generate-from-cpan: Hack to handle non-UTF-8 META.yml files 2013-06-16 18:34:32 +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