Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Shea Levy
aacca1902c
Merge branch 'upstream-master' into stdenv-updates
2013-02-19 10:09:39 -05:00
Eelco Dolstra
2b5aff10b9
psimedia: Fix building against current kernel headers
...
http://hydra.nixos.org/build/4127993
2013-02-19 12:46:52 +01:00
Rok Garbas
13fcbc7baf
notmuch: update from 0.14 to 0.15
2013-02-19 04:46:47 +01:00
Song Wenwu
679150157b
emacs: add "auto-complete-clang-async" mode (aka emacs-clang-complete-async)
2013-02-18 21:06:29 +08:00
Lluís Batlle i Rossell
bcbf9472ea
Merge remote-tracking branch 'central/master' into x-updates
2013-02-18 13:49:11 +01:00
Peter Simons
9e68734d61
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-18 11:54:56 +01:00
Peter Simons
b076ab94d6
git-annex: update to version 3.20130216
2013-02-18 11:20:46 +01:00
Peter Simons
33b130ee69
ikiwiki: update to version 3.20130212
2013-02-18 11:11:34 +01:00
Rok Garbas
614e9b65a0
Merge pull request #318 from iElectric/xbmc-nasm
...
add nasm to xbmc dependencies
2013-02-17 15:46:17 -08:00
Shea Levy
c42d77aa35
Merge remote-tracking branch 'upstream/master' into stdenv-updates
2013-02-17 08:19:40 -05:00
Vladimír Čunát
9885d04033
Revert "WIP", sorry, I got confused, somehow
...
This reverts commit 524d9b656e
.
2013-02-17 11:02:25 +01:00
Vladimír Čunát
524d9b656e
WIP
2013-02-17 11:01:20 +01:00
Domen Kozar
6506f9b070
add nasm to xbmc dependencies
2013-02-16 23:23:15 +01:00
Vladimír Čunát
aaf607c5dc
linphone: minor update and fix
2013-02-16 21:48:47 +01:00
Cillian de Róiste
48d8ab884c
Fix Hydrogen to build with JACK 1.9.9.5
...
This patches the Hydrogen scons build script to work a failure to
parse the JACK version correctly. If I understand correctly upstream
Hydrogen now uses cmake instead of Scons, so this shouldn't be a
problem with the next Hydrogen release.
2013-02-16 21:08:15 +01:00
Vladimír Čunát
26e4a5561c
blender: add the forgotten patch
2013-02-16 18:38:52 +01:00
Vladimír Čunát
08abf5a84a
blender: minor update to work with libpng-1.6
...
also other fixes needed in order to build
2013-02-16 18:13:05 +01:00
Vladimír Čunát
c55f5ae19d
tulip: update to fix compilation with libpng-1.6
2013-02-16 16:16:32 +01:00
Vladimír Čunát
60e52fd8db
gnucash: fix for new intltool
2013-02-16 15:35:14 +01:00
Eelco Dolstra
a25b27a7f8
buildNativeInputs -> nativeBuildInputs
2013-02-15 13:38:07 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Vladimír Čunát
34e86bccff
Merge pull request #306 from maggesi/hol_light_updates
...
HOL light updates
2013-02-14 12:43:35 -08:00
Lluís Batlle i Rossell
6ee6cd5ec9
Updates: kdenlive-0.9.4 mlt-0.8.8
...
Upstream kdenlive suggests mlt-0.8.8.
2013-02-14 20:06:54 +01:00
Vladimír Čunát
0d6bb2b51a
meshlab: fix forgotten qt47
2013-02-14 14:38:23 +01:00
Vladimír Čunát
e976bcffca
inkscape: bugfix update
2013-02-14 14:34:20 +01:00
Vladimír Čunát
4c4e3f0ada
meshlab: fix forgotten qt47
2013-02-13 17:45:27 +01:00
Vladimír Čunát
ee9a5d864c
calibre: make build by minor upgrade + new dependencies
...
0.9.* won't build: https://bugs.launchpad.net/calibre/+bug/1094719
2013-02-13 09:18:27 +01:00
Vladimír Čunát
9adcb15b9d
inkscape: bugfix update
2013-02-12 23:28:32 +01:00
aszlig
ec9c096e25
flashplayer-11: Update to version 11.2.202.262.
...
This update contains security fixes for two vulnerabilities, for details please
have a look at:
http://www.adobe.com/support/security/bulletins/apsb13-04.html
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-12 10:42:19 +01:00
Peter Simons
801237ceb2
xmonad: install man page into the proper location
2013-02-11 23:26:06 +01:00
Vladimír Čunát
684f215b4f
fix the problem of missing expat in a few packages
2013-02-11 18:34:40 +01:00
Peter Simons
2191cbb0a1
haskell-darcs: update to version 2.8.4
2013-02-09 18:24:50 +01:00
Marco Maggesi
42a4178c2b
Update HOL Light to revision 155
2013-02-08 15:26:35 +01:00
Marco Maggesi
34411286a6
Update HOL Light to revision 154
2013-02-08 15:20:06 +01:00
aszlig
265fea5788
google-talkplugin: Note how to get latest version.
...
This is just in order to make it easier to determine the latest upstream version
from the Packages file of Google's APT repository.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 08:45:15 +01:00
aszlig
59d79e97e8
virtualbox: Fix unpacking of extension pack.
...
This fixes a typo introduced by 5a3f9c08b0
.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig
dd832a3e8f
chromium: Update beta channel to v25.0.1364.68.
...
This update is a bit more problematic, as the bundled version of libpng is
version 1.2.45 and the version in nixpkgs is 1.5.13. Even if trying to run with
libpng12 from nixpkgs, it seems to collide with parts of the bundled version.
So, until this is either fixed upstream or we have a good solution, we're using
bundled libpng for chromium version 25 and higher.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig
9b726e94a8
chromium: Update stable channel to v24.0.1312.69.
...
Let's begin with the most trivial one: The stable version.
This version just contains a few bug fixes and builds fine so far.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig
01cbb17c12
chromium: Fix updater to handle versions > 26.
...
Starting with version 26, there is a chromium-$version-lite package and it is an
LZMA archive as well, so download size is reduced by about 44%.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
Shea Levy
8f51038a13
qemu-1.3.1
...
Also, old qemu is unreferenced in nixos and nixpkgs tree, so remove it absent explicit need.
2013-02-07 20:44:02 -05:00
Shea Levy
5e11e727ca
Merge branch 'virt' of https://github.com/aristidb/nixpkgs
2013-02-07 18:09:40 -05:00
Rob Vermaas
2656f1df25
Fix Firefox 13.0 URL. 13.0 is still used by selenium.
2013-02-07 22:19:09 +01:00
Eelco Dolstra
41b4931100
firefox: Update to 18.0.2
2013-02-07 13:47:41 +01:00
Rickard Nilsson
b3cfae1acf
darktable: Update to 1.1.2
2013-02-06 01:26:24 +01:00
Rickard Nilsson
cb4c42e9c3
gnumeric: Update to 1.12.0
...
Also update dependencies (goffice, libgsf) to required versions.
2013-02-06 01:26:24 +01:00
Aristid Breitkreuz
07c64a7a6c
virtinst: could not find python modules, add python wrapper
2013-02-05 18:16:50 +01:00
Vladimír Čunát
19721fe792
vim: fix a typo from commit ab3eea
2013-02-05 17:51:30 +01:00
Александр Цамутали
52d265fd12
applications/audio/guitarix: New nixpkg.
2013-02-03 20:36:32 +04:00
Александр Цамутали
5784dbb095
qjackctl: Update to 0.3.9, --enable-jack-version
2013-02-03 19:58:11 +04:00