3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

7106 commits

Author SHA1 Message Date
Eelco Dolstra 2f056c5237 subversion: Fix build on Darwin 2014-08-09 23:54:58 +02:00
Eelco Dolstra 0132e1bb48 emacs: On Darwin, don't depend on gconf and cairo 2014-08-09 19:08:37 +02:00
Eelco Dolstra a7c1541a21 emacs: Fix building on Darwin with recent versions of GCC
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
2014-08-09 19:08:37 +02:00
Cillian de Róiste d597651949 inkscape: add python to the PATH, fixes #3449 2014-08-09 17:02:36 +02:00
Peter Simons 5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00
Peter Simons 18250b97ae Remove 'andres' from the meta.maintainer section of all Haskell package where I
had added him earlier.
2014-08-09 13:49:24 +02:00
Eelco Dolstra 18e422d047 blender: Optionally build with CUDA support
This is required for GPU acceleration of the Cycles renderer.
2014-08-09 12:37:46 +02:00
John Wiegley 16ffd0638b Merge pull request #3266 from cstrahan/mesos
[WIP] mesos: Add package
2014-08-09 01:03:58 -05:00
John Wiegley 83cf279452 Add an expression for building Coq HEAD 2014-08-08 18:11:00 -05:00
Luca Bruno 4ee1fcc6b9 ekiga: bump version and resurrect for ZHF 2014-08-08 22:38:27 +02:00
Pascal Wittmann 17edebfe28 bibletime: fixed build by updating from 2.9.2 to 2.10.1
http://hydra.nixos.org/build/13061214
2014-08-08 22:28:26 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 7cfb9545c6 sox: Fix building on Darwin
Fixes #3493.
2014-08-08 18:16:56 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Pascal Wittmann 35fe93797e trayer: update trayer from 1.1.5 to 1.1.6 and adpot it 2014-08-08 10:28:11 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Pascal Wittmann 4ec55e64e0 calibre: update from 1.47.0 to 1.48.0 2014-08-08 09:31:51 +02:00
Aycan iRiCAN 68abd5bedf Merge remote-tracking branch 'upstream/master' 2014-08-07 16:39:47 +03:00
Peter Simons 09ea413e17 haskell-sloane: update to version 1.9.1 2014-08-07 12:41:55 +02:00
Christoph Hrdinka 83f78fa82d mcomix: add sqlite3 dependency 2014-08-07 08:57:02 +02:00
Emery Hemingway 420f18ef5b xscruiser: initial package expression
http://xcruiser.sourceforge.net/
2014-08-07 01:24:25 +02:00
NOTtheMessiah 682f215084 Update default.nix 2014-08-07 01:17:01 +02:00
NOTtheMessiah 9e9e628417 Added gcolor2 2014-08-07 01:17:01 +02:00
José Romildo Malaquias 5c0982a19b liferea: update from 1.10.9 to 1.10.10 2014-08-07 01:12:42 +02:00
José Romildo Malaquias ba9bfd39ad New packages: libgksu, gksu 2014-08-07 01:10:11 +02:00
Aycan iRiCAN c35224efb6 Merge remote-tracking branch 'upstream/master' 2014-08-06 10:21:57 +03:00
Eelco Dolstra b4c4e2d28d subversion: Update to 1.8.9 2014-08-05 11:46:04 +02:00
Bjørn Forsman 310400e0f5 intellij-idea: don't access 'shortName' license attribute
I don't think packages should poke into the license attributes.
2014-08-05 07:22:06 +02:00
Jascha Geerds eaad8d6923 Packaging PyCharm IDE 2014-08-05 07:15:43 +02:00
Thomas Tuegel cab7fd67ce firefox: bring back version 30.0 for zotero 2014-08-04 13:43:58 -05:00
Bjørn Forsman 2857418659 freerdp: mark the unstable version as broken (it fails to build) 2014-08-04 20:09:21 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Thomas Tuegel 77c99b10fc zotero: version bump 4.0.21.1 -> 4.0.21.2 2014-08-04 05:56:58 -05:00
aszlig 26440f41fb
chromium: Update beta and dev to latest versions.
beta: 37.0.2062.44 -> 37.0.2062.58 (builds fine, tested)
dev:  38.0.2101.0  -> 38.0.2107.3  (builds fine, tested)

Drop patch for fixing angle build for the dev version, because it was
applied upstream already.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-04 07:50:19 +02:00
Rok Garbas d8fa02b508 synergy: update to 1.5.0 2014-08-03 21:47:10 +02:00
Rok Garbas 4b052cb846 zathura: preBuild phase not needed in latest zathura 2014-08-03 21:34:19 +02:00
Michael Raskin 10f9730d64 Update compiz 2014-08-03 22:29:40 +04:00
Aycan iRiCAN 307a08c9a3 removed rev 2014-08-03 21:21:52 +03:00
Aycan iRiCAN 02dcf1e493 Upgrade js2-mod to 20140114 2014-08-03 21:20:26 +03:00
Rok Garbas 4c659bafa3 weechatDevel: update to latest 2014-08-03 14:37:39 +02:00
Rok Garbas 0b299403a6 msmtp: update to 1.4.32 2014-08-03 14:04:45 +02:00
Rok Garbas 14f9300402 notmuch: update to 0.18.1 2014-08-03 14:04:45 +02:00
Rok Garbas 16ae8c3e84 zathura: update to 0.2.9 2014-08-03 14:04:44 +02:00
Rok Garbas 3bf7d7c42a i3lock: update to 2.6 2014-08-03 14:04:44 +02:00
Rok Garbas 9d38aa6591 girara: update to 0.2.2 2014-08-03 14:04:44 +02:00
Bjørn Forsman 5fc4ab1dfe freecad: small cleanup
* FreeCAD v0.14 switched from pyqt4 to pyside, remove unneeded pyqt4 dependency
* cmake.patch is not used anymore, remove it
* License is now only LGPLv2+ (since v0.14)
* Homepage moved to http://www.freecadweb.org/

Ref. http://www.freecadweb.org/wiki/index.php?title=Release_notes_014
2014-08-03 13:26:14 +02:00
Cillian de Róiste 4143d9dfef shotcut: remove obsolete patch 2014-08-03 11:46:08 +02:00
Cillian de Róiste cc3b5291d9 shotcut: update from 14.07 to 14.08 2014-08-03 11:44:41 +02:00
Vladimír Čunát 1b169722a3 Merge branch 'x-updates'
Close #3147.
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
aszlig 6aabd17d51
i3: Don't override patchPhase.
Makes easier to provide a patches attribute through packageOverrides.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-02 17:25:16 +02:00
Cillian de Róiste d4fb2e83db kde4_next.kde_wacomtablet: update from 2.0 to 2.0.2, potentially fixes CVE-2012-4514, CVE-2012-4514 2014-08-02 11:33:06 +02:00
Cillian de Róiste 2702cedb53 yoshimi: update from 1.2.0 to 1.2.2 2014-08-02 11:31:30 +02:00
Cillian de Róiste e29021d502 qtractor: update from 0.6.1 to 0.6.2 2014-08-02 11:30:57 +02:00
Cillian de Róiste b67c978540 samplv1: update from 0.4.2 to 0.5.0 2014-08-02 11:30:46 +02:00
Cillian de Róiste 49f26425f9 synthv1: update from 0.4.2 to 0.5.0 2014-08-02 11:30:33 +02:00
Cillian de Róiste 664a4cb18f drumkv1: update from 0.4.2 to 0.5.0 2014-08-02 11:29:23 +02:00
Vladimír Čunát 4d6503e5b5 blender: fix parallel builds
(cherry picked from commits f63fb3fda0 + 5fa61a2904)
2014-08-02 11:17:25 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
aszlig 3d34dc39ac
i3: Only enable tests for x86_64-linux.
Right now, tests for i686-linux fail, see:

https://hydra.nixos.org/build/13024964

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 18:41:39 +02:00
Joachim Fasting 2fc0537018 nano: bump to version 2.3.6 2014-08-01 18:19:03 +02:00
Joachim Fasting decb4266f1 nano: support system-wide nanorc
This patch does two things
1. builds nano with sysconfdir=/etc; and
2. adds an option programs.nano.nanorc
2014-08-01 18:19:03 +02:00
Rob Vermaas 64561b437d Remove broken flag for xen, build with gcc45. 2014-08-01 17:18:27 +02:00
Lluís Batlle i Rossell 00b63f6655 Update mumble to 1.2.7.
(Chery picked from release-14.04)
2014-08-01 16:56:27 +02:00
Lluís Batlle i Rossell 5e35fef0eb freecad: updating to 0.14
I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
2014-08-01 16:56:27 +02:00
aszlig 32d7c4c435
i3: Remove CarpAlways from buildInputs.
Oops, it was a leftover from debugging.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 11:19:06 +02:00
Pascal Wittmann bb153cfe72 calibre: update from 1.46.0 to 1.47.0 2014-08-01 11:17:00 +02:00
aszlig fb1f257189
i3: Don't run test cases in parallel.
Unfortunately, running them in parallel sometimes lead to tests not even
starting up. Probably lock contention is the issue here, but haven't
investigated further so I'm deactivating parallel testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 08:04:09 +02:00
aszlig 57781346d7
Merge branch 'i3-tests'.
The reason I went through this whole journey of gathering dependencies
and debugging just in order to get i3 tests working was because I wanted
to supply test cases to a small patch I wrote for the upstream project.

This adds/updates quite a few Perl packages and a X dummy helper, which
are all needed in order to successfully run the test suite.
2014-08-01 05:51:57 +02:00
aszlig 31e77f5096
i3: Abort build if test suite is failing.
The exit code of the i3 test runner is always 0, regardless of whether
tests were failing or not, so let's quickly grep for a "not ok" in the
test logfile and if it occurs, the whole build is failing now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig 2c1d04a563
i3: Enable running test suite by default.
Finally, after going through the journey of debugging and gathering
dependencies, we now have tests for i3, hooray!

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
Austin Seipp 5b9be82617 Merge pull request #3415 from bodil/master
thunderbird-bin: Update to version 31.0.
2014-07-31 21:28:20 -05:00
Vladimír Čunát dac1791fb5 thunderbird: major update 17.* -> 31.0
- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra

(cherry picked from commit adc2edd5cf)
2014-07-31 16:30:04 +02:00
Pascal Wittmann 3e35b46519 Merge pull request #3413 from svenkeidel/gtkpod
version bump gtkpod from 1.0.0 to 2.1.4
2014-07-31 13:26:37 +02:00
Domen Kožar e07c2c2cfd add uTox 2014-07-31 12:59:03 +02:00
Bjørn Forsman 62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Bodil Stokke 5a329bbe23 thunderbird-bin: Update to version 31.0. 2014-07-31 03:08:07 +01:00
Sven Keidel 6a7d82d000 added meta information 2014-07-31 00:49:14 +02:00
Sven Keidel 2d31046a40 gtkpod: bump to 2.1.4 2014-07-31 00:41:17 +02:00
Vladimír Čunát cb8f8bdbff xlsfonts, xfontsel: fix meta typo 2014-07-30 19:32:53 +02:00
taku0 1cc6dc1984 firefox-bin: update to version 31.0 2014-07-30 16:16:23 +02:00
Matej Cotman b1ba1689bd zed: build from source, ditch the installer, upgrade node-webkit 2014-07-30 12:43:24 +02:00
Pascal Wittmann cf744cb715 org: update from 8.2.7b to 8.2.7c 2014-07-30 12:14:15 +02:00
Vladimír Čunát be07584397 vlc: minor update 2014-07-30 09:31:24 +02:00
Bjørn Forsman 18b27cf2e3 ardour: install a desktop file
I based it on the desktop file from Arch Linux.
2014-07-29 18:31:21 +02:00
Georges Dubus 938cd64a6a spotify: Fixed sha for i686 2014-07-29 14:01:39 +02:00
Rickard Nilsson 2b8b29c3dd spotify: Update from 0.9.10.17 to 0.9.11.27 (x86_64) 2014-07-29 11:56:29 +02:00
Cillian de Róiste 6259669355 SimpleScreenRecorder 0.2.2 -> 0.3.0 2014-07-29 00:15:53 +02:00
Paul Colomiets 9bc1676e5a Upgrade docker to 1.1.2 and add docker module
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
2014-07-28 21:45:49 +02:00
aszlig 9edfad2717
toxic: Update to latest upstream Git master.
Unfortunately they've changed their build system to be makefile-only and
they don't seem to include test cases in the CLI anymore, so we needed
to adapt accordingly. Also added freealut and openal to the buildInputs,
in order to allow audio support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:11 +02:00
Peter Simons 5cc55e9523 Partially revert 7a45996 some more.
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
2014-07-28 20:52:47 +02:00
Peter Simons 8e6c0afd0f haskell-nc-indicators: update to version 0.3 2014-07-28 20:32:52 +02:00
Peter Simons bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Rickard Nilsson ccc22bb662 New package: mopidy-moped, a web client for the mopidy music player daemon 2014-07-28 19:51:08 +02:00
Rickard Nilsson 5b3f2e9a5e mopidy-spotify: Update from 1.1.3 to 1.2.0 2014-07-28 19:49:41 +02:00
Rickard Nilsson f5905b5fd3 mopdiy: Update from 0.18.3 to 0.19.0 2014-07-28 19:49:10 +02:00
aszlig 4a108847af
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced:

stable: 35.0.1916.153 -> 36.0.1985.125
beta:   36.0.1985.84  -> 37.0.2062.44
dev:    37.0.2054.3   -> 38.0.2101.0

All builds were successfully tested on my machine, however in order to
update the beta and dev channels, a few additional modifications were
necessary:

 * Don't update address_input_strings.grdp anymore because this has been
   done/fixed upstream and was relevant in version 37.0.2054.3 _only_.
 * No need to fix references to /usr/bin/gcc in version 38 anymore.
 * Constrain patch for Angle (introduced in 4cbedd7) to version 37 only,
   because it already has been applied upstream in version 38.
 * Drop user namespaces patch for version 31 up until version 35,
   because version 36 is already in stable.
 * Don't try to build bundled Clang and/or even build using Clang.
 * Remove obsolete patchPhase commands that are specific to version 35
   and older.

While testing the dev version 38 I came accross a font rendering issue
which needs to be addressed ASAP (perhaps related to #3187), however the
browser works otherwise.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 15:58:14 +02:00
Evgeny Egorochkin 760d579652 quassel: fix wrapper for all flag values 2014-07-28 16:47:30 +03:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Peter Simons ad934ccc22 singular: cosmetic fix for syntax highlighting 2014-07-28 11:42:49 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Domen Kožar 0cb54d44ca Merge pull request #3256 from 1126/master
ncmpc: updated to version 0.23.
2014-07-27 14:17:56 +02:00
Domen Kožar e3319eb73d doc: modernize meta attributes documentation 2014-07-27 13:54:37 +02:00
Cillian de Róiste 077d989ad1 Merge branch 'shotcut'
Add Shotcut (video editor), update Kdenlive and MLT, add frei0r and movit plugins
2014-07-27 13:03:08 +02:00
Cillian de Róiste ab7349711b Add Shotcut: A free, open source, cross-platform video editor
Includes a patch which has already been applied upstream:
mltframework/shotcut#31
2014-07-27 12:53:57 +02:00
Cillian de Róiste 2723681a59 Kdenlive: 0.9.6 -> 0.9.8, add frei0r plugins, add myself to the maintainers 2014-07-27 12:53:56 +02:00
Moritz Ulrich e4f978d09f bbdb3: New package. 2014-07-27 10:55:43 +02:00
Bjørn Forsman c8c04841e1 qjackctl: version bump 0.3.10 -> 0.3.11 2014-07-26 17:16:07 +02:00
Matej Cotman dbc829f5d4 new package: zed 0.12.0 (installer) 2014-07-26 14:41:20 +02:00
Jaka Hudoklin 7f467aeeb2 Merge pull request #3315 from fignuts/master
Add SpiderOak secure backup service.
2014-07-26 02:19:51 +02:00
Sebastian Korten 620100a406 vimpc: initial install script 2014-07-25 15:32:04 +02:00
Pascal Wittmann 50510d1985 calibre: update from 1.45.0 to 1.46.0 2014-07-25 11:16:24 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Eelco Dolstra 5c5f115603 firefox: Build without xulrunner
Fixes #2950.
2014-07-23 17:28:36 +02:00
Eelco Dolstra 21c7ed54e3 firefox: Update to 31.0
Also boldly re-enable parallel building.
2014-07-23 17:28:36 +02:00
Eelco Dolstra 97ced6f718 firefox-3.6: Remove
This version is ancient.
2014-07-23 12:56:53 +02:00
Eelco Dolstra a1a3811506 flac: Disable tests
These take a stupid amount of time.
2014-07-23 10:48:27 +02:00
Bjørn Forsman 3a060bbcc6 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát adc2edd5cf thunderbird: major update 17.* -> 31.0
- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra
2014-07-22 22:18:24 +02:00
Bjørn Forsman 4597903ce9 espeakedit: version bump 1.46.02 -> 1.48.03 (and add to channel)
The one-liner gcc buildPhase doesn't work anymore, so I'm using upstream
Makefile instead. The Makefile needs a tiny patch to work (not nixpkgs
specific).

Also fixup path to 'sox' and espeak-data/ (runtime deps) by providing
full paths.

TODO:
Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even
thought I've told it to use $espeak/share/espeak-data. Have to contact
upstream to get this fixed.

Workaround:
  cp -r $(nix-build -A espeak)/share/espeak-data ~
  chmod +w ~/espeak-data
2014-07-22 21:33:25 +02:00
Bjørn Forsman 62adfd8570 espeak: version bump 1.46.02 -> 1.48.04 (and add to channel) 2014-07-22 21:24:25 +02:00
Vladimír Čunát 5fa61a2904 blender: use permanent URL for the patch
No hash changes.
2014-07-22 18:06:42 +02:00
Eelco Dolstra 6f11a6681d arb: Mark as broken 2014-07-22 15:12:21 +02:00
Peter Simons 62bb741348 haskell-github-backup: update to version 1.20140721 2014-07-22 14:20:57 +02:00
Eelco Dolstra 3ef40e5004 emacs: Remove 23.x 2014-07-22 13:50:52 +02:00
Eelco Dolstra 4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Sven Keidel 4ef371e1f6 added platform meta information to gpodder 2014-07-22 09:39:06 +02:00
Charles Strahan 1c77030fee mesos: Add package
Apache Mesos is a cluster manager that simplifies the complexity of running
applications on a shared pool of servers.
2014-07-22 00:35:59 -04:00
Sam Griffin 6ae6071c94 fixing whitespace 2014-07-21 23:59:26 -04:00
Sam Griffin 36aa19814b updating bitcoin to 0.9.2.1 2014-07-21 23:53:37 -04:00
Sven Keidel ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
lethalman 5cde295b1d Merge pull request #3327 from svenkeidel/gpodder
added gpodder package
2014-07-21 18:37:28 +02:00
Sven Keidel 75b3c9eb95 Use make install instead of setup.py directly.
Using setup.py results in the following error message:

    Missing file: share/applications/gpodder.desktop

    If you want to install, use "make install" instead of using
    setup.py directly. See the README file for more information.
2014-07-21 18:05:08 +02:00
Sven Keidel 1a484c8ba2 moved wrapper declaration to preFixup 2014-07-21 17:58:27 +02:00
_1126 70c46319d8 Merge remote-tracking branch 'upstream/master' 2014-07-21 16:01:40 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát 923bf0a3ff mpv: major update, incl. build fix with new ffmpeg
CC @AndersonTorres. The real build fix is in previous minor updates,
but I see no reason not to have the major updates as well.
2014-07-21 10:05:50 +02:00
Vladimír Čunát f63fb3fda0 blender: fix parallel builds 2014-07-21 09:57:16 +02:00
Cillian de Róiste bc8fe732d0 Add gimpPlugins.focusblur 2014-07-20 21:28:50 +02:00
Sven Keidel eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Linquize 4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
Cillian de Róiste 2405a94701 KDE Connect 0.7 -> 0.7.2 2014-07-19 18:02:17 +02:00
John Wiegley 73e0c50b30 haskell-git-annex: fix for darwin
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
2014-07-18 18:37:54 -05:00
Andrew Morsillo 7f96fff12b Add SpiderOak secure backup service. 2014-07-18 16:21:48 -04:00
Peter Simons 92faa6a009 haskell-git-annex: update to version 5.20140717 2014-07-18 17:30:47 +02:00
Pascal Wittmann a49e2f866d calibre: update from 1.44.0 to 1.45.0 2014-07-18 16:20:00 +02:00
Vladimír Čunát df99ec18dc inkscape: enableParallelBuilding, doCheck, add meta 2014-07-18 11:56:47 +02:00
Vladimír Čunát 7e9a0b8ec2 inkscape: maintenance update
Needed to fix build with poppler-0.26.
2014-07-18 11:56:44 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
_1126 33e9f3192d Merge remote-tracking branch 'upstream/master' 2014-07-17 13:47:37 +02:00
Eugene Akentyev 08ca4e2d59 Add Light Table editor. 2014-07-17 12:25:22 +02:00
Pascal Wittmann 70caf388eb org: update from 8.2.7 to 8.2.7b 2014-07-17 12:20:22 +02:00
Peter Simons f0de2bd4a1 Re-generate Haskell expressions with cabal2nix. 2014-07-16 12:10:10 +02:00
Ian-Woo Kim 02d6445409 update hoodle-types 0.2.2 -> 0.3, hoodle-builder 0.2.2.0 -> 0.3, hoodle-parser 0.2.2 -> 0.3, hoodle-render 0.3.2 -> 0.4, hoodle-core 0.13.0.0 -> 0.14, and hoodle 0.2.2.1 -> 0.3 2014-07-16 12:10:10 +02:00
John Wiegley d24df6e334 haskell-git-annex: corrections for darwin 2014-07-16 01:27:29 -05:00
Eelco Dolstra 327c2061d1 blender: Don't use system openjpeg
It was ignored anyway (instead using the internal openjpeg copy).
2014-07-15 23:34:34 +02:00
Eelco Dolstra 12fb52b08a blender: Enable ocean modifier 2014-07-15 23:34:24 +02:00
Eelco Dolstra 457e539048 blender: Fix jackaudio dependency 2014-07-15 23:33:09 +02:00
Eelco Dolstra 2d8e880c82 blender: Update to 2.71 2014-07-15 23:31:55 +02:00
Paul Colomiets ab2c7cfff7 vim: Add syntax on and set nocompatible by default
Its what everybody wants in 2014. They are enabled by default both in
ubuntu and archlinux.
2014-07-15 14:59:16 +02:00
Paul Colomiets e376e9731d vim: Update vim to 7.4.335 2014-07-15 14:59:16 +02:00
Paul Colomiets 5e99b0553c vim: Implement sourcing /etc/vimrc and /etc/vim/vimrc 2014-07-15 14:59:16 +02:00
Paul Colomiets abf19df497 Remove wrapVim
I don't see a reason for having wrapVim function and vimWrapper and
vimHugeXWrapper packages. If you need a system vimrc, whats wrong with
``environment.etc."vimrc".text`` ?

Also strictly speaking ``vimHugeXWrapper`` didn't wrap, X-version
properly. I.e. running ``gvim`` have console vim version.
2014-07-15 14:59:16 +02:00
Paul Colomiets 496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Vladimír Čunát 0ef81572d8 Merge pull request #3263 from cstrahan/finalterm
finalterm: New package
2014-07-15 14:50:25 +02:00
Eelco Dolstra b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Peter Simons 5bfb58a8a2 Re-generate Haskell packages with cabal2nix. 2014-07-14 17:33:52 +02:00
Peter Simons 56c569a9cd haskell-github-backup: update to version 1.20140707 2014-07-14 17:33:51 +02:00
Peter Simons af88d71b55 haskell-git-annex: update to version 5.20140709 2014-07-14 17:33:50 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Ricardo M. Correia dd41c19ab1 flashplayer: Update from 11.2.202.378 -> 11.2.202.394 2014-07-14 14:36:35 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
_1126 3fee3c05b1 ncmpc: updated to version 0.23. 2014-07-14 10:05:41 +02:00
Charles Strahan cd8063c4b2 finalterm: Add package 2014-07-13 19:36:43 -04:00
aszlig 4086f7c978
twister: Add new package, version 0.9.22.
This includes another source-only derivation for the web interface (and
patches the path into the twister binary), so there shouldn't be a need
to move it into ~/.twister/html separately.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-13 23:56:11 +02:00
Luca Bruno 6fb00303fb gitolite: fix aborted build due to non-deterministic fetchgit 2014-07-13 12:39:23 +02:00
Christoph Hrdinka 75518f748f hugin: update to version 2013.0.0 2014-07-12 13:18:22 +02:00
Rickard Nilsson 89a0bf43d1 mopidy: Update from 0.15.0 to 0.18.3
Also add the mopidy-spotify extension.
2014-07-12 09:34:52 +02:00
Pascal Wittmann e8ef98cea2 calibre: update from 1.35.0 to 1.44.0 2014-07-11 22:57:59 +02:00
Peter Simons 61b60fb1ad cdrtools: mark as broken
https://github.com/NixOS/nixos/issues/231
2014-07-10 13:11:32 +02:00
lethalman 1e806db8db Merge pull request #3174 from pSub/dconf-issue
Fixed settings issue.
2014-07-10 11:17:10 +02:00
John Wiegley a25c35b89b git-annex: Allow building on darwin again 2014-07-09 17:52:18 -05:00
Lluís Batlle i Rossell 8aca2c5fa0 Adding retroshare 0.6 (unstable) 2014-07-09 22:24:28 +02:00
Vladimír Čunát 5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Vladimír Čunát 4b263946dd qt3, graphicsmagick137, fox, neverball: fix build
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Peter Simons ac44601157 idea: minor cosmetic chance to fix syntax highlighting in Emacs 2014-07-09 16:10:50 +02:00
Peter Simons d4fa3e2e54 Rename 'idea_community_1313' attribute to 'idea_community', i.e. drop the
version number so that it's possible to refer to some "default version of the
package" without knowing what version number that actually is.

The same applies to idea_ultimate_1313.
2014-07-09 16:10:50 +02:00
Austin Seipp c734ec6952 Merge pull request #3201 from cstrahan/update-macvim
Update `macvim` package to v7.4.355
2014-07-08 11:47:09 -05:00
Peter Simons f7f1e3f842 haskell-git-annex: update to version 5.20140707 2014-07-08 15:58:22 +02:00
Pascal Wittmann a1b27f9806 Merge pull request #3131 from bennofs/dwb-wrapper
add dwb-wrapper for plugin support
2014-07-08 14:19:47 +02:00
Moritz Maxeiner 682aadfc91 eclipse: add Eclipse Standard 4.4 Luna 2014-07-08 00:34:56 +02:00
_1126 daa7f344ae ncmpc: update to version 0.22 2014-07-07 23:51:14 +02:00
Benno Fünfstück 52c8df4ad3 dwb: add wrapper and use GTK2 for plugin support 2014-07-07 21:00:53 +02:00
Oliver Charles 847a9a5c30 Merge pull request #3206 from bosu/mp3splt
Add mp3splt: utility to split mp3 files
2014-07-07 19:58:00 +01:00
Boris Sukholitko 70ad9ad8f9 Add mp3splt 2014-07-07 21:38:14 +03:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Charles Strahan 03391f9894 Update macvim package to v7.4.355
MacVim's maintenance has stagnated, so this moves `macvim` to a new maintainer.
Additionally, the `-headerpad_max_install_names` linker flag is passed to
prevent problems when setting the rpaths.
2014-07-07 00:16:55 -04:00
Luca Bruno 873832ab6d telepathy-gabble: build on hydra 2014-07-06 11:50:30 +02:00
John Wiegley 67e4df75dd Revert "mutt: update to 1.5.23"
This reverts commit 6a7d60c01a.
2014-07-04 15:48:14 -05:00
Michael Raskin 01d9778625 Update boinc 2014-07-04 22:18:49 +04:00
Pascal Wittmann a628da8b64 Update dwb to latest revision 2014-07-04 15:20:08 +02:00
Peter Simons 0d414a9399 haskell-sloane: update to version 1.8.2 2014-07-04 11:45:43 +02:00
Peter Simons 99c6b978a7 haskell-arbtt: update to version 0.8.1 2014-07-04 11:45:43 +02:00
Pascal Wittmann 6d13d1e521 Fixed settings issue.
The following warning was shown when I clicked on links:
'GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.'
2014-07-03 23:19:15 +02:00
Peter Simons 20a931aa8b xmobar: set the proper home page url 2014-07-03 16:52:23 +02:00
Ricardo M. Correia 3614b34c6a transmission: Update from 2.83 -> 2.84 2014-07-03 11:39:11 +02:00
Vladimír Čunát aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Austin Seipp f36252b7cd Merge pull request #3155 from doublec/inferno
Add inferno, a distributed cross-platform hosted OS
2014-07-02 13:48:15 -05:00
Austin Seipp 14aca4feff Merge pull request #3164 from 1126/master
mutt: update to 1.5.23
2014-07-02 13:45:57 -05:00
Austin Seipp f318c99f21 Merge pull request #3160 from cstrahan/vcprompt
vcprompt: new package
2014-07-02 13:45:27 -05:00
_1126 61c200391a mutt: added mailpath.patch. 2014-07-02 17:14:20 +02:00
_1126 6a7d60c01a mutt: update to 1.5.23
This commit rewrites the expression somewhat:

- it tries to simplify the expression.
- it changes from fetchurl to fetchhg.
- a patch to configure.ac is added in order to enable configuring the
  source on NixOS.
2014-07-02 17:08:45 +02:00
cillianderoiste 00cb266c4f Merge pull request #3163 from pSub/writegood-mode
Update writegood-mode from 1.3 to 2.0
2014-07-02 14:15:10 +02:00
Pascal Wittmann da8b931738 Update writegood-mode from 1.3 to 2.0 2014-07-02 13:03:01 +02:00
Charles Strahan 6c15656a06 vcprompt: new package
This adds the vcprompt utility, a little C program that prints a short string
with barebones information about the current working directory for various
version control systems.
2014-07-02 02:43:47 -04:00
Chris Double 91ac34b648 Add inferno, a distributed cross-platform hosted OS 2014-07-02 14:00:49 +12:00
_1126 5cc1245a11 xmobar: Updated to 0.21 2014-07-02 01:30:49 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin ce623950ad Update bip 2014-07-01 12:08:07 +04:00
Michael Raskin 0733404aca Update baresip 2014-07-01 11:54:09 +04:00
Oliver Charles e11813c8fe Merge pull request #3142 from pSub/dwb-dconf-issue
Fixed dwb startup issue
2014-07-01 08:43:50 +01:00
Oliver Charles 37e8ebc456 Merge pull request #3144 from wmertens/source-missing-fixes
Source missing fixes
2014-07-01 08:43:27 +01:00
Mihaly Barasz c3c41f4ba0 nc-indicators 0.1 -> 0.2 2014-06-30 16:16:38 +02:00
Wout Mertens ea4207f7a3 makeself: bump to 2.2.0 2014-06-30 16:10:04 +02:00
Michael Raskin 7caec74142 Merge pull request #3118 from NixOS/libreoffice-update-4.2.5
Libreoffice update 4.2.5
2014-06-30 17:39:12 +04:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Pascal Wittmann eb851b6a19 Fixed dwb startup issue 2014-06-30 14:36:51 +02:00
Michael Raskin 3a197214f9 Merge pull request #3068 from taku0/firefox-bin-30.0
add firefox-bin: the binary package for Firefox web browser
2014-06-30 10:31:43 +04:00
Chris Double de4d6f0447 Add namecoin cryptocurrency 2014-06-30 13:38:16 +12:00
John Wiegley 79aaef4846 Merge pull request #3038 from bennofs/fetch-rev-attr
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
2014-06-28 17:04:04 -07:00
Michael Raskin a72bb396a2 Do not create unneeded local-scope packages; disable a failing test
The test in question tries to fit a table into one page; I cannot find
what dependency update is needed to fix it and there are a few
depedendencies better updated on x-updates.
2014-06-28 23:33:42 +04:00
Cillian de Róiste 009196d02c KDE Connect 0.5.2 -> 0.7 2014-06-28 21:11:10 +02:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
John Wiegley bf610b79ff structured-haskell-mode: 1.0.2 > 1.0.3 2014-06-28 09:23:22 -07:00
Rok Garbas 71812277d3 git-remote-add: new package added 2014-06-28 14:15:31 +01:00
John Wiegley 34de04149e twelf: Fix the source URL 2014-06-27 10:46:24 -07:00
Michael Raskin 7788afd571 Libreoffice update: not succesful yet 2014-06-27 16:37:34 +04:00
Luca Bruno f5eb0f2883 Merge pull request #3052 with some additional changes 2014-06-27 11:38:00 +02:00
Jos van den Oever 6c20d83263 transcode: new package
Suite of command line utilities for transcoding video and audio codecs,
and for converting beween different container formats.

http://www.transcoding.org/
2014-06-27 11:34:29 +02:00
John Wiegley ad96cc8bf9 twelf: new expression; prover for PL theory and logic 2014-06-26 15:54:45 -07:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát 4e39e578f2 lmms: fix build with freetype-2.5 2014-06-26 21:56:47 +02:00
Shea Levy 731288059c Merge branch 'skype43' of git://github.com/nslqqq/nixpkgs
skype: 4.2.0.13 -> 4.3.0.37
2014-06-26 12:02:23 -04:00
Nikita Mikhailov e2ff019965 skype: 4.2.0.13 -> 4.3.0.37 2014-06-26 22:42:21 +07:00
Georges Dubus bf1f2c6b1f git: Updated to 2.0.1 (close #3096) 2014-06-26 16:54:48 +02:00
Austin Seipp 2711f5772c gitolite: fix default update hooks
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-26 00:24:05 -05:00
Austin Seipp 13162e8cdb Fix gitolite docs
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:55:43 -05:00
Austin Seipp ec4cd43ca8 gitolite: 3.6.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:54:18 -05:00