Commit graph

6951 commits

Author SHA1 Message Date
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
df7bc53606 Merge remote-tracking branch 'origin/master' into staging 2014-08-15 02:15:14 +02: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
Luca Bruno
36bef2b267 gobject-introspection: refer to shlibs with absolute paths in typelibs
After this, LD_LIBRARY_PATH should not be required anymore.
The patch has been applied only for .la files, so there may
be some other cases missing.
2014-08-14 23:16:51 +02: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
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