JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,541 Commits 2 Branches 0 Tags 13 GiB
3e14bb6fdf
Commit Graph

27148 Commits

Author SHA1 Message Date
Song Wenwu
48e1e1cae6 add smplayer 0.8.5 2013-06-23 17:48:21 +08:00
Peter Simons
0205496d80 Merge pull request #667 from bjornfor/remake 
remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6
 2013-06-23 01:25:25 -07:00
Song Wenwu
c74b3e26f7 kmplayer: update to 0.11.3d 2013-06-23 14:53:18 +08:00
Domen Kozar
2c8acd9cec oiio: 1.1.8 -> 1.1.12 2013-06-23 00:11:50 +02:00
Aristid Breitkreuz
dbda1a2989 libcap needs to be a propagated build input for pulseaudio 2013-06-22 22:59:55 +02:00
Bjørn Forsman
860161dcb7 remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6 
This version needs readline. And the license is GPLv3. Also, add
meta.platforms and meta.maintainers attributes.
 2013-06-22 21:09:43 +02:00
Aristid Breitkreuz
ad06d4df18 update pulseaudio to 4.0 and sbc to 1.1 2013-06-22 17:25:47 +02:00
Peter Simons
01bc9204e0 git-annex: fix installation of git-annex-shell 2013-06-22 15:41:37 +02:00
Peter Simons
819dbd2539 haskell-hledger-irr: add version 0.1.1.2 2013-06-22 15:41:37 +02:00
Domen Kožar
7a4b10a51c Merge pull request #665 from offlinehacker/memtest_fix 
memtest86: udpate to 4.1.0, fix download url
 2013-06-22 05:23:11 -07:00
Domen Kožar
b1b70a02d9 Merge pull request #666 from offlinehacker/python_supervisor 
Add supervisor, a system for controlling process state under UNIX
 2013-06-22 05:22:54 -07:00
Jaka Hudoklin
2f4d1a5656 memtest86: udpate to 4.1.0, fix download url 2013-06-22 14:11:47 +02:00
Jaka Hudoklin
7b924a9ac4 Add supervisor, a system for controlling process state under UNIX 2013-06-22 14:10:10 +02:00
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