1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Commit graph

46483 commits

Author SHA1 Message Date
Sander van der Burg 8eb8d69544 Merge pull request #3290 from MP2E/SDL_Mixer_FSynth
SDL_mixer : add option to enable FluidSynth for playing MIDIs with SF2s
2014-08-03 14:57:38 +02:00
Sander van der Burg 2e44bb9ead Merge pull request #3425 from luke-clifton/lc-tomcat-jdk
Allows the JDK to be chosen in services.tomcat
2014-08-03 14:55:46 +02: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
Michael Raskin 77389a5bcb Update LiquidWar6 to 0.4 2014-08-03 15:59:21 +04: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
Rok Garbas 335575a51e geoclue: update to 2.1.9 2014-08-03 13:22:06 +02:00
Rok Garbas 92f7908d5b yajl: name of downloaded tarbal should be the same as derivation name 2014-08-03 13:21:08 +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
Luca Bruno 7a4a132085 Revert "gnome-shell: enable parallel building"
This reverts commit 9ec0a105d3.

Conflicts:
	pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
2014-08-03 09:56:16 +02:00
Vladimír Čunát 7bdce42010 Merge #3439: maintenance kernel updates 2014-08-03 09:54:47 +02:00
William A. Kennington III 317d4253ea kernel: 3.15.7 -> 3.15.8 2014-08-02 18:04:08 -05:00
William A. Kennington III 63cc1fd8ad kernel: 3.14.14 -> 3.14.15 2014-08-02 18:02:15 -05:00
William A. Kennington III eb9ee180d9 kernel: 3.12.25 -> 3.12.26 2014-08-02 18:00:46 -05:00
William A. Kennington III 89d5655670 kernel: 3.10.50 -> 3.10.51 2014-08-02 17:58:31 -05:00
William A. Kennington III ae11e59949 kernel: 3.4.100 -> 3.4.101 2014-08-02 17:56:53 -05:00
John Wiegley 141b69415c Merge pull request #3422 from jbedo/master
Updated texlive to latest release
2014-08-02 18:55:05 -04:00
Bjørn Forsman b4df21469b qtcreator: install desktop file 2014-08-02 21:11:36 +02:00
Bjørn Forsman 6f98561c1a qtcreator: install documentation
qtcreator displays an error when accessing help, unless we have
installed documentation. That seems like a packaging bug to me and is
definitely unfriendly (default) behaviour.

This change increases the closure size from 56 MiB to 68 MiB.
2014-08-02 21:10:50 +02:00
aszlig 7e3815c336
Merge pull request #3437 from Fuuzetsu/youtube-dl
youtube-dl: update to 2014.08.02.1
2014-08-02 19:07:48 +02:00
Mateusz Kowalczyk a54b012fe9 youtube-dl: update to 2014.08.02.1 2014-08-02 18:57:54 +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 c5788e6fd4 xf86_input_wacom: update from 0.23.0 to 0.25.0 2014-08-02 11:32:00 +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
cillianderoiste 23c5e6b559 Merge pull request #3432 from robberer/pkgs/lightning
fix download url
2014-08-02 11:08:26 +02:00
System administrator a1e392267d fix download url 2014-08-02 09:20:49 +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
Vladimír Čunát 91b53aaebc xorg.libXext: minor update 2014-08-02 04:43:19 +02:00
Vladimír Čunát 9fcd3c2825 libdrm: update 2014-08-02 04:43:11 +02:00
Vladimír Čunát 3a6135a907 harfbuzz: small update 2014-08-02 04:31:51 +02:00
Vladimír Čunát f681a7683c poppler: maintenance update 2014-08-02 04:31:26 +02:00
Shea Levy fb565f1a4e amazon-image.nix: Overwrite busybox swapon 2014-08-01 17:55:37 -04:00
Shea Levy 7fec575976 Fix lib functions taken from pkgs.lib instead of lib in nixos 2014-08-01 16:23:56 -04:00
Shea Levy b0c8769c84 Add tornadokick python package 2014-08-01 15:14:38 -04:00
Sander van der Burg b0769d8db1 Use hyperlink and click action instead of meta refresh 2014-08-01 19:26:34 +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
Sander van der Burg 5a918f5f5c Add experimental link to proxy to page that does wireless distributions of IPA files 2014-08-01 18:34:18 +02:00
Rob Vermaas 64561b437d Remove broken flag for xen, build with gcc45. 2014-08-01 17:18:27 +02:00