Commit Graph

7085 Commits

Author SHA1 Message Date
Sven Keidel
fc152248ce cool-old-term: add 0.9 (close #3685, #3575) 2014-08-21 19:22:37 +02:00
lethalman
f25f21b78c Merge pull request #3713 from paulkoerbitz/clipit
Add package for ClipIt, a lightweight GTK clipboard manager
2014-08-21 16:32:10 +02:00
Paul Koerbitz
a5cf54a52b Add package for ClipIt, a lightweight GTK clipboard manager 2014-08-21 16:22:08 +02:00
Luca Bruno
3353e8550f sup: fix build for ZHF 2014-08-21 12:47:12 +02:00
Moritz Ulrich
10ba4b67e4 Emacs: Use gnutls instead of OpenSSL.
It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
2014-08-21 12:45:28 +02:00
Peter Simons
091eb25a79 Merge pull request #3698 from bjornfor/linuxstopmotion
Add Linux Stopmotion application
2014-08-21 12:39:55 +02:00
AndersonTorres
6a78135865 Bochs: update to version 2.6.6 2014-08-21 07:08:09 -03:00
AndersonTorres
49fcac0d6b Fluxbox: adding system support (as a module) 2014-08-21 07:03:37 -03:00
Vladimír Čunát
2d03fbf752 twinkle eval: fix the typo 2014-08-20 23:38:43 +02:00
Bjørn Forsman
006ebdfe78 linuxstopmotion: new package
Linux Stopmotion is a program for creating stop-motion animation movies.

http://linuxstopmotion.org/

I had to apply a small patch to make grabbing images from webcam work
(using uvccapture). I find it odd that it didn't work without the patch,
seeing that Arch Linux also have the v0.8.0 version, but with no patch.
Latest Ubuntu (14.04) has v0.7.2, which is unaffected.
2014-08-20 23:12:38 +02:00
Bjørn Forsman
c14f3e4039 uvccapture: new package
"Capture image from USB webcam at a specified interval"

I apply patches from Debian to make it build with V4L2 (instead of v1
API) and fix some warnings/bugs. Source code is also downloaded from
Debian, as uvccapture homepage is unavailable.

Homepage: http://linux-uvc.berlios.de/ (seems to have vanished...)
2014-08-20 23:12:37 +02:00
Vladimír Čunát
c198a36898 twinkle: fix build (fixes #3673)
Pulled patches from Debian and hacked around linking errors.
I'm able to ring my mobile phone now.
However, on exit the process is stuck and needs kill -9.

CC: maintainer @MarcWeber.
2014-08-20 21:32:19 +02:00
Peter Simons
e910c8d6c9 Disable Hydra builds for broken Haskell packages.
The following packages are broken with GHC 7.8.3:

 - filesystem-conduit version 1.0.0.2
 - ghc-events-analyze version 0.2.0
 - haskelldb version 2.2.2
 - haskell-mpi version 1.2.1
 - haxr-th version 3000.5
 - hoauth version 0.3.5
 - holy-project version 0.1.1.0
 - hoogle version 4.2.32
 - hspread version 0.3.3
 - instant-generics version 0.4
 - ivor version 0.1.14.1
 - jmacro-rpc-happstack version 0.3
 - lambdacube-engine version 0.2.4
 - language-c-inline version 0.6.0.0
 - lockfree-queue version 0.2.3
 - monad-peel version 0.1.1
 - network-transport-tests version 0.1.0.1
 - poppler version 0.12.3
 - profiteur version 0.1.2.1
 - prolog-graph-lib version 0.2.0.1
 - semigroupoid-extras version 4.0
 - setlocale version 0.0.3
 - sized-types version 0.5.0
 - snaplet-postgresql-simple version 0.5
 - snap-loader-dynamic version 0.10.0.2
 - uhc git version 20120502
 - uniqueid version 0.1.1
 - unix-process-conduit version 0.2.2.3
 - vado version 0.0.1
 - vcsgui version 0.0.4
 - xml-html-conduit-lens version 0.3.2.0

The following packages depend on one of the broken ones above:

 - hoodle-builder version 0.3
 - hoodle-core version 0.14
 - hoodle-extra version 0.1
 - hoodle-parser version 0.3
 - hoodle-render version 0.4
 - hoodle-types version 0.3
 - hoodle version 0.3
 - kansas-lava version 0.2.4
 - liblastfm version 0.4.0.0
 - prolog-graph version 0.1.0.2
 - vacuum-cairo version 0.5
 - wcwidth version 0.0.2
2014-08-20 20:26:57 +02:00
Moritz Ulrich
77437983a2 Slic3r: Bump to 1.1.7. 2014-08-20 16:27:47 +02:00
Peter Simons
3fad02dab8 haskell-git-annex: update to version 5.20140817 2014-08-19 23:47:59 +02:00
Emil Rangden
2c0610fb6f updated taffybar 2014-08-19 23:47:58 +02:00
John Wiegley
708e16e675 ssreflect: 1.4 -> 1.5 2014-08-19 16:03:33 -05:00
viric
e51ae0ecd3 Merge pull request #3640 from Fuuzetsu/tesseract-jpn
Add Japanese to default tesseract languages
2014-08-19 17:47:16 +02:00
Peter Simons
301be245c4 Merge pull request #3676 from ruediger/up/mplayer
mplayer: Update to 1.1.1.
2014-08-19 17:19:19 +02:00
Rüdiger Sonderfeld
d809e775e8 git: Add git-prompt.sh to /etc/bash_completion.d.
This will make the git-prompt.sh features available to bash users when
completions are enabled.  It is done in this way in Debian/Ubuntu as well.
2014-08-19 16:34:51 +02:00
Rüdiger Sonderfeld
4de6b9a0c7 mplayer: Add GNU FriBiDi support.
This is required by new versions of SMPlayer and other distros seem to
enable it by default now as well.
2014-08-19 16:24:58 +02:00
Rüdiger Sonderfeld
033c9bd18c mplayer: Update to 1.1.1. 2014-08-19 15:19:06 +02:00
AndersonTorres
fe270c011c Fluxbox: new package (1.3.5) 2014-08-19 06:19:33 -03:00
Georges Dubus
a82e9e4b5c Added e2fsprogs to docker dependencies.
Otherwise, it complains about mkfs.ext4 not being present at service
start (and stops).
2014-08-19 11:00:46 +02:00
AndersonTorres
7a8cdc66a4 MPV: update to 0.5.0
Many thanks matejc for the commit!
2014-08-18 08:14:26 -03:00
Shea Levy
c3c9e2d9bc Update dropbox
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-08-17 23:06:51 -04:00
Eelco Dolstra
5979946c41 chromium: Fix build
This works around ld-wrapper's --sysroot filter not working on '@'
command lines.

Fixes #3642.
2014-08-17 17:08:21 +02:00
Mateusz Kowalczyk
03a37d5851 Add Japanese to default tesseract languages 2014-08-17 11:54:25 +01:00
Linquize
1916bc0412 git: Update to 2.1.0 2014-08-17 06:18:38 +02:00
Domen Kožar
9b854cc70c Merge branch 'teamspeak_3_update' 2014-08-16 20:14:58 +02:00
Nathaniel Baxter
9c48f5160c teamspeak_client: Remove qt.conf to stop segfaults
teamspeak_client: Use the quazip library provided by teamspeak

This commit should be squashed before being commited to nixpkgs!

Signed-off-by: Domen Kožar <domen@dev.si>
2014-08-16 20:13:29 +02:00
Vladimír Čunát
d75cf6fffb meld: update to latest stable 2014-08-16 18:58:51 +02:00
John Wiegley
cfc70c60ab coq_HEAD: 8.5pre-fff9e2f7 -> 8.5pre-8bc01590 2014-08-16 00:13:15 -05:00
Peter Simons
70683f4593 Merge pull request #3598 from vesten/update-bar-aint-recursive
bar - Remove unnecessary dependencies and centralize version string.
2014-08-15 18:29:49 +02:00
Moritz Ulrich
94c08cf163 weechat: Bump to 1.0.
A happy day for all weechat-users!
2014-08-15 12:08:42 +02:00
Michel Kuhlmann
043dc2b1b4 qgis: update 1.8.0 -> 2.4.0 and adding sip
Unfortunately adding sip doesn't solve the error-message:

    Couldn't load SIP module.
    Python support will be disabled.
2014-08-15 10:50:10 +02:00
Steve Bigham
df8e7f5614 Remove unnecessary dependencies and centralize version string. 2014-08-14 21:01:20 -04:00
Vladimír Čunát
05b4882255 zotero: add check to detect xul version breakages 2014-08-15 02:03:52 +02:00
Vladimír Čunát
36a9fb094f merge #3462: zotero update and resurrect xulrunner 2014-08-15 01:55:56 +02:00
Vladimír Čunát
6c791d41db merge #3340: bitcoin: minor update 2014-08-15 00:15:22 +02:00
Vladimír Čunát
56d9b2cc8a merge #3428: nano: bump and add system-wide config 2014-08-14 23:51:29 +02:00
John Wiegley
06a324f7dc Merge pull request #3101 from cstrahan/xquartz
Use XQuartz on Darwin
2014-08-14 16:33:46 -05:00
Vladimír Čunát
7050914ed2 eiskaltdcpp: set platforms.all, fix description
Close #3051.
2014-08-14 21:11:20 +02:00
Florian Richter
f5aa55a3f9 Add eiskaltdcpp, a p2p client for the DC protocol 2014-08-14 21:11:20 +02:00
Pascal Wittmann
8e99197c99 dwb: update meta section 2014-08-14 21:05:21 +02:00
Edward O'Callaghan
dc80331638 pidgin-latex-sf: bump reversion, url and hash
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

@vcunat: fix URL.
2014-08-14 20:49:02 +02:00
Thomas Tuegel
d3cdf16079 clementine: version bump 1.2.1 -> 1.2.3 (close #3570)
@vcunat: fix hydraPlatforms type (list nestedness), enableParallelBuilding.
2014-08-14 20:35:40 +02:00
Vladimír Čunát
c659c6ca80 lyx: major update and some fixes 2014-08-14 20:23:21 +02:00
Vladimír Čunát
6af1388fbd kipi_plugins: mark as broken; should come from digikam 2014-08-14 15:43:35 +02:00
Vladimír Čunát
54ae9d8527 blender: fix build by dropping patch integrated upstream
It no longer applied, and the CMakeLists.txt looked completely different.
Such changes without any version bump... (sigh)
2014-08-14 15:13:39 +02:00
Sander van der Burg
29f7d458fd dropbox: bump to version 2.10.27 2014-08-14 13:58:57 +02:00
Peter Simons
ec6e7d0eb3 Merge pull request #3582 from ts468/fityk
Add application for scientific data analysis: fityk
2014-08-14 13:58:06 +02:00
Thomas Strobel
58b4b98377 Add application for scientific data analysis: fityk 2014-08-14 01:57:27 +02:00
Russell O'Connor
a431a96df9 Allow QEMU to fallback to full simulation if /dev/kvm is not available. 2014-08-13 23:26:26 +02:00
Rickard Nilsson
baafb5b8cd vimb: Update from 2.4 to 2.6 2014-08-13 12:03:24 +02:00
Rickard Nilsson
4ddc38f50a mopdiy-moped: Update from 0.3.1 to 0.3.3 2014-08-13 12:03:03 +02:00
Rickard Nilsson
3553798cfb mopdiy: Update from 0.19.0 to 0.19.3 2014-08-13 12:02:34 +02:00
Charles Strahan
5ea8497933 get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
Domen Kožar
8c50807c4d dunst: git -> 1.1.0 2014-08-12 21:23:44 +02:00
Jascha Geerds
bebdea6ac9 pycharm: add icon in desktop file 2014-08-12 21:21:57 +02:00
Vladimír Čunát
df76cbaa21 hugin, enblend-enfuse: enbaleParallelBuilding, default boost
Also unset meta.broken.
2014-08-12 21:17:53 +02:00
Vladimír Čunát
54c18db1ca Merge master into this PR 2014-08-12 21:16:47 +02:00
AndersonTorres
526edcaf15 Aegisub: update to 3.2.0 2014-08-12 19:43:16 +02:00
Vladimír Čunát
665b2c8247 Merge #3408: licenses: prefer spdx.org, improve docs
The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix
2014-08-12 19:08:53 +02:00
Matt Miemiec
8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Michael Raskin
6129a7aea6 Help kadu find phonon 2014-08-12 16:22:25 +04:00
Peter Simons
e823c123a8 Don't build broken Haskell packages on Hydra.
These packages don't compile:

 - cabal-delete
 - cabal-file-th
 - categories
 - cmdtheline
 - codec-image-devil
 - concurrent-extra
 - cryptol 1.8.x
 - data-lens
 - diagrams-postscript
 - djinn
 - download
 - dstring
 - enummapset
 - git-date
 - github-backup
 - gtkglext
 - happyy-meta
 - haskeline-class
 - pakcs

These packages depend on some of the packages listed before:

 - Chart-diagrams
 - data-lens-template
 - hp2any-manager
 - purescript
 - repr

These packages fail with GHC 7.8.3 but still compile with older compilers:

 - happy: 1.18.4, 1.18.5, 1.18.6
2014-08-12 12:37:44 +02:00
Michael Raskin
cee539cc9c Allow optional functionality in SimGrid 2014-08-12 14:09:54 +04:00
Peter Simons
e0a7a3a7c3 haskell-xmobar: restrict meta.platforms to Linux; we cannot build that package on Darwin 2014-08-12 11:16:51 +02:00
Christoph Hrdinka
f44e69a55d luminanceHDR: add version 2.4.0
fixes #3229
2014-08-12 10:19:35 +02:00
Michael Raskin
2e84472d60 Update SimGrid 2014-08-12 05:26:33 +04:00
Michael Raskin
004be1bf51 Fix oiio build; maybe will fix blender build 2014-08-12 04:33:10 +04:00
Michael Raskin
f1f0f0cf19 Update and fix LEO2 prover 2014-08-12 03:57:52 +04:00
Michael Raskin
05a3b156f0 Update Mercurial to version 3.1 2014-08-12 02:47:04 +04:00
Michael Raskin
d06eef88c9 Update libreoffice to the version 4.3.0.4
Also update its dependencies.

Update libcdr to 0.1.0
Update libmwaw to 0.3.2 from 0.3.1
Update libvisio to 0.1.0
Update libwpd to 0.10.0
Update libwpg to 0.3.0

These updates are require by LO update and also require each other.

Note that many of these libraries now require librevenge.

In LibreOffice expression per se:

- Note that liborcus is built separately because it wants Boost to be
  specified in a way that main LO build doesn't ensure.

- libixion from 0.7.0 tarball has libixion-0.8 package version.

- libgltf is in src/libgltf but listed in download.lst without any
  comments.

- Make variable with the name libreoffice-translations-${version}.tar.xz
  and the same value is inserted; the same for -help-. Fetching gives
  a strange error without that. Apparently everyone just builds git
  checkouts.

- There are some conditionals in download.lst that require manual
  handling. I am not sure there is a simple way to process them in
  generate-libreoffice-srcs.sh.
2014-08-12 01:49:54 +04:00
Mateusz Kowalczyk
83f532fdfd haskell-yi: update to 0.8.2
Allows it to work with glib/gtk/pango 0.13.x
2014-08-11 13:56:12 +02:00
John Wiegley
326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Domen Kožar
8092ce6649 teamspeak_client: 3.0.13.1 -> 3.0.16 2014-08-10 19:05:15 +02:00
Vladimír Čunát
16fa6be4b8 ekiga: fix starting bin/ekiga (gschemas) 2014-08-10 18:25:34 +02:00
Luca Bruno
d4e20aa3d2 lastwatch: unsupported on darwin due to inotify 2014-08-10 11:50:43 +02:00
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