Commit Graph

26870 Commits

Author SHA1 Message Date
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
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