JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,623 Commits 1 Branch 0 Tags 12 GiB
77da5efc78
Commit Graph

6988 Commits

Author SHA1 Message Date
Vladimír Čunát
77da5efc78 merge the rest of multiple-outputs 
Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
 2014-08-25 10:41:49 +02:00
Vladimír Čunát
694fa543af Merge 'staging' 
Conflicts:
	pkgs/servers/x11/xorg/default.nix
 2014-08-24 10:50:22 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +02:00
Eelco Dolstra
2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-08-22 00:07:05 +02:00
Vladimír Čunát
3775fa9ea2 subversion+serf: security update to fix CVE-2014-3504 
Thanks to nixpkgs monitor again.
 2014-08-21 15:13:19 +02:00
Vladimír Čunát
d4e9fd2a90 Merge recent master into staging 
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
 2014-08-21 15:09:31 +02:00
Vladimír Čunát
2d03fbf752 twinkle eval: fix the typo 2014-08-20 23:38:43 +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
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
Steve Bigham
df8e7f5614 Remove unnecessary dependencies and centralize version string. 2014-08-14 21:01:20 -04: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