2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-17 07:38:31 +00:00
Commit Graph

53519 Commits

Author SHA1 Message Date
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
William A. Kennington III
d3f3317632 Revert "Revert "libvorbis: propagate libogg dependency""
This reverts commit 5728c06f83.
2015-05-07 01:38:14 -07:00
William A. Kennington III
3f9817fd51 Revert "libvorbis: Fix ogg dependency"
This reverts commit ca5c9e6cf2.
2015-05-07 01:38:03 -07:00
Tobias Geerinckx-Rice
10bb715c07 geolite-legacy -> 2015-05-07 2015-05-07 10:10:51 +02:00
aszlig
c7e7f12ef6
uqm: Bring back package and fix 3do extractor.
It was dropped in 324719a5a6.

The UQM package itself doesn't require Haskell, but in order to extract
contents from the 3do version of the game, we need to have a small
helper utility which I wrote in Haskell a while ago. In order to switch
it to Haskell NG, only very minor modifications were necessary, which
are now done with this commit instead of dropping the whole game.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-07 08:03:06 +02:00
Dan Peebles
5454be28aa I suppose this is the 'better' way to fix bundler for now. Ugh 2015-05-07 01:14:14 -04:00
Dan Peebles
35ddd2543a Revert "Fix bundler HEAD"
This reverts commit 00c4c52277.
2015-05-07 01:10:46 -04:00
Dan Peebles
00c4c52277 Fix bundler HEAD 2015-05-07 00:11:00 -04:00
Arseniy Seroka
ac90fa0a3a Merge pull request from joachifm/msmtp-1_6_2
msmtp: 1.6.1 -> 1.6.2
2015-05-07 01:24:54 +03:00
Joachim Fasting
02f97e2288 msmtp: 1.6.1 -> 1.6.2
Fixes removal of consecutive Bcc headers.
2015-05-06 23:40:52 +02:00
Arseniy Seroka
75ee41fdb9 lua_patch: fix url 2015-05-06 22:05:44 +03:00
Arseniy Seroka
f24d8777dd Revert "lua_patch: fix sha"
This reverts commit c5a0dae668.
2015-05-06 22:05:20 +03:00
Arseniy Seroka
c5a0dae668 lua_patch: fix sha 2015-05-06 22:01:16 +03:00
cillianderoiste
9cb6ebe15e Merge pull request from magnetophon/ingen-master
update ingen
2015-05-06 19:26:35 +02:00
Arseniy Seroka
901849eca4 less: fix sha 2015-05-06 20:19:54 +03:00
cillianderoiste
cb9a681131 Merge pull request from magnetophon/ir.lv2-master
add ir.lv2, a convolution plugin.
2015-05-06 19:01:29 +02:00
William A. Kennington III
4559bc015d hiredis: 0.13.0 -> 0.13.1 2015-05-06 09:42:50 -07:00
Thomas Tuegel
84ff78dd8b kdeApps_15_04: fix kaccounts-integration 2015-05-06 10:53:26 -05:00
Thomas Tuegel
68350c5b9f add signon 2015-05-06 10:53:01 -05:00
Thomas Tuegel
10d1a9cf8e add accounts-qt 2015-05-06 10:32:40 -05:00
Rob Vermaas
290132bf89 Disable hiredis in rsyslog as it is currently broken. 2015-05-06 15:32:07 +00:00
Charles Strahan
ae8c6092e7 pwmt: update packages (zathura, jumanji, girara)
This updates (and fixes) the mupdf backend for zathura, and bumps the
versions for other related packages.
2015-05-06 10:36:30 -04:00
Arseniy Seroka
e0bec9ece5 teamviewer: update sha 2015-05-06 16:16:34 +03:00
Bart Brouns
c99af2710d add ir.lv2, a convolution plugin. 2015-05-06 15:16:08 +02:00
Thomas Tuegel
1a32f5e4e8 kdeApps_15_04: fix kate 2015-05-06 07:34:19 -05:00
Thomas Tuegel
c2ff0a293e kdeApps_15_04: fix kaccounts-providers 2015-05-06 07:34:18 -05:00
Thomas Tuegel
abb76bcdad add libaccounts-glib-1.16 2015-05-06 07:34:18 -05:00
Shea Levy
3aff74a7a2 Resurrect old cloog and isl for gcc-4.9
Fixes 

Refs 8af39c1cf7
Refs 5cd11989c5
2015-05-06 08:32:12 -04:00
Thomas Tuegel
09af6d4572 add telepathy-qt5 2015-05-06 07:08:20 -05:00
Thomas Tuegel
6dfbbc8e24 plasma53: fix kcm_keyboard 2015-05-06 07:08:20 -05:00
Bart Brouns
3ca38da728 add Sorcer, an LV2 synth. 2015-05-06 13:14:14 +02:00
Charles Strahan
90e09e3eee Merge pull request from Lassulus/my-15.05pre61665.4c01e6d
pulseaudio: system user and group changed to pulse.
2015-05-06 06:46:15 -04:00
Peter Simons
1eee813f9b Merge pull request from cstrahan/ghc-7101-ghcjs-user-pkg-db
ghc-7.10.1: fix user pkg db location for GHCJS
2015-05-06 12:08:00 +02:00
lassulus
b421fc0686 pulseaudio: system user and group changed to pulse. 2015-05-06 11:41:50 +02:00
Domen Kožar
b5eca243de Merge pull request from codyopel/vaapi-intel
libva-intel-driver: refactor
2015-05-06 11:30:17 +02:00
Domen Kožar
bc453c868e Merge pull request from Ralith/libuv
libuv: version 1.4.2
2015-05-06 11:29:52 +02:00
Domen Kožar
ce688330fb Merge pull request from willtim/master
xss-lock: upstream fix: exit when X connection dies
2015-05-06 11:29:35 +02:00
Damien Cassou
46952b1b4e Merge pull request from DamienCassou/new-package-open-pdf-presenter
Add package for open-pdf-presenter
2015-05-06 10:47:41 +02:00
Damien Cassou
a043b3ba9f Add package for open-pdf-presenter 2015-05-06 10:02:32 +02:00
Tim Williams
d0462cdf25 xss-lock: upstream fix: exit when X connection dies 2015-05-06 08:52:40 +01:00
Lluís Batlle i Rossell
0c5be7164c sheevaplug: fix kernel build.
I added platform.kernelMakeFlags. This allows setting the required
parameter to make the required kernel uImage for the sheevaplug,
since it became a platform with devicetree (3.10).

I have tried it with linux 3.18 and it built fine.
2015-05-06 09:50:51 +02:00
William A. Kennington III
874fa4d8a3 busybox: 1.22.1 -> 1.23.2
Also use musl as libc since it is just as small as uclibc, usually more
performant, and regularly makes releases.
2015-05-06 00:15:16 -07:00
Benjamin Saunders
7f00ab7f67 libuv: version 1.4.2 2015-05-06 01:44:24 +00:00
Arseniy Seroka
dfaf86119e Merge pull request from Chaddai/texmaker
Texmaker and TeXStudio update
2015-05-06 04:39:49 +03:00
Arseniy Seroka
c4103181ce Merge pull request from joachifm/newsbeuter-2_9
newsbeuter: 2.8 -> 2.9
2015-05-06 04:39:20 +03:00
John Wiegley
e70f8b391e openjpeg: Correctly set the install name on darwin
This fixes libpoppler, and thus texLiveFull
2015-05-05 20:30:02 -05:00
Charles Strahan
9a658d340f ghc-7.10.1: fix user pkg db location for GHCJS
This cherry picks the commit referenced on the associated trac ticket:
https://ghc.haskell.org/trac/ghc/ticket/10232
2015-05-05 20:48:27 -04:00
Charles Strahan
007dfb8438 ghcjs: bump git revision
This resolves an issue in ghcjs where lazy IO can result in opening too
many files during linking due to lazy IO.
2015-05-05 20:35:39 -04:00
Charles Strahan
398a23d94f Merge pull request from cstrahan/broadcom-sta-patches
broadcom-sta: fixes for kernel version >= 3.18
2015-05-05 17:21:29 -04:00
William A. Kennington III
0f2de4c64e heimdal: Disable DCE as it was breaking the build 2015-05-05 13:56:44 -07:00