Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát
cb639302df
Merge glibc-2.18 branch into stdenv-updates
...
It's to separate from other changes coming from master.
Conflicts:
pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Vladimír Čunát
2265bab69d
llvm: fix heavily parallel builds
2013-12-28 17:32:01 +01:00
Vladimír Čunát
9f735bdf57
gnumeric: add platforms, maintainer
2013-12-28 15:49:19 +01:00
Vladimír Čunát
a126ce011a
gnumeric: add schemas and icons, refactor
...
Also move goffice under gnome3,
as it's released in the same way.
2013-12-28 15:45:20 +01:00
Vladimír Čunát
9bcacfb142
hicolor_icon_theme: minor update 0.12 -> 0.13
2013-12-28 15:08:47 +01:00
Vladimír Čunát
d978c35ff9
stdenv/setup.sh: fix previous change...
...
for the case that there is no makefile. CC #1354
2013-12-28 10:43:34 +01:00
Moritz Ulrich
5890215501
windowManager.xmonad: Make it configurable and extensible.
...
PR #1366
The previous windowManager.xmonad option only starts xmonad and
doesn't make ghc available. This assumes that the user has GHC with
access to the xmonad package in his PATH when using xmonad.
Xmonad in Nix is now patched to accept the XMONAD_{GHC,XMESSAGE}
environment variables which define the path to either ghc or xmessage.
These are set automatically when using xmonad through
windowManager.xmonad.
My (or specific: @aristidb and my) changes make it possible to use
Xmonad without adding GHC to any profile. This is useful if you want
to add a different GHC to your profile.
This commit introduces some options:
- xmonad.haskellPackages: Controls which Haskell package set & GHC set
is used to (re)build Xmonad
- xmonad.extraPackages: Function returning a list of additional
packages to make available to GHC when rebuilding Xmonad
- xmonad.enableContribExtras: Boolean option to build xmonadContrib
and xmonadExtras.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-28 09:29:53 +01:00
Moritz Ulrich
5331088ba1
ledger3: Update to latest git (8d38060968)
2013-12-28 00:57:17 +00:00
Vladimír Čunát
3f4b14d793
stdenv/setup.sh: add SHELL to makeFlags ( close #1354 )
2013-12-27 21:03:16 +01:00
Vladimír Čunát
34a7256820
coreutils: fix build (race condition)
2013-12-27 20:53:53 +01:00
Vladimír Čunát
9020582fea
xfce4-terminal: bugfix update 0.6.2 -> .3
2013-12-27 08:48:39 +01:00
Rob Vermaas
8cb70b0b93
Upgrade cppunit to 1.13.2
2013-12-27 08:25:39 +01:00
Shea Levy
44c97e02f6
Move GEM_PATH part of rubygems' setup hook to ruby
...
Fixes #1413
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-26 18:38:10 -05:00
Peter Simons
7d648e3b7f
Merge pull request #1408 from bjornfor/ncurses-enable-pc-files
...
ncurses: install *.pc files (pkg-config)
2013-12-26 11:29:07 -08:00
Song Wenwu
88b9e1f191
retroarch: update to 0.9.9.7
2013-12-26 18:55:17 +01:00
Bjørn Forsman
2b2c55e34a
ncurses: add ncurses5-config -> ncursesw5-config symlink
...
We already have backward compatibility symlinks for ncurses libraries
and pkg-config files (when built in unicode/wide mode). The last bit is
to add a symlink from ncurses5-config to ncursesw5-config, which is what
this commit does.
2013-12-26 18:51:48 +01:00
Bjørn Forsman
50253a3e84
ncurses: install *.pc files (for pkg-config)
...
To make e.g. "pkg-config --cflags ncursesw" work.
The ncurses expression, when built in unicode/wide char mode, provides
backward compatibility symlinks from lib<name>.so to lib<name>w.so.
Provide similar symlinks for the *.pc files: <name>.pc -> <name>w.pc.
2013-12-26 18:31:24 +01:00
Song Wenwu
9b273eb971
midori: build with webkit2 to support GTK+2 plugins ( close #1412 )
2013-12-26 18:14:45 +01:00
Song Wenwu
55a49a3f93
midori: fix file chooser dialog (Ctrl+o)
...
vcunat: change to double-prefix of the variable, instead of clearing it.
2013-12-26 18:14:45 +01:00
Domen Kožar
f6a8fe34b2
speedtest-cli: dev -> 0.2.4
2013-12-26 16:51:08 +01:00
Eelco Dolstra
9f75797d0b
Merge remote-tracking branch 'origin/glibc-2.18'
2013-12-26 14:49:19 +01:00
Shea Levy
73e78c24fb
Update node packages to npm2nix-5.4.2 to fix tarball
...
Thanks @vcunat for pointing it out
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-26 06:43:21 -05:00
William A. Kennington III
f5374c123c
Add targetcli-fb as well as necessary dependencies
2013-12-26 10:58:15 +01:00
Vladimir Still
b345bdf5d2
tmpwatch: Add platforms to meta (unix).
...
According to web pages of tmpwatch it seems that it can be build on
unixes (Mac OS X, solaris). Not much information is here though.
2013-12-26 10:56:00 +01:00
Song Wenwu
0889c86b86
midori: update from 0.4.4 to 0.5.6 ( close #1411 )
2013-12-26 09:19:19 +01:00
Evgeny Egorochkin
46c1216fd0
kde411: expose it to nix-env with a lower priority.
2013-12-26 04:23:53 +02:00
Evgeny Egorochkin
bdfcda81e7
add lowPrioSet and hiPrioSet functions to enable changing of priorities of attrsets with packages such as kde.
2013-12-26 04:22:29 +02:00
Florian Friesdorf
7a988c62af
git-repo-1.20, update and pin python
2013-12-26 01:01:01 +01:00
Florian Friesdorf
46f627e8f7
git-repo-1.19
2013-12-26 00:45:21 +01:00
Edward Tjörnhammar
01c39bdefc
Adding IntelliJ IDEA13 Community and Ultimate
2013-12-26 00:12:19 +01:00
Vladimír Čunát
b80d1c5923
Merge x-updates
2013-12-25 23:56:41 +01:00
AndersonTorres
378f962c0e
Aegisub: New Package
...
Adding Aegisub: an advanced movie subtitle editor
2013-12-25 22:24:19 +01:00
Vladimír Čunát
28cb01ee89
libtiff on darwin: attempt to fix build
2013-12-25 18:51:35 +01:00
Moritz Ulrich
e87515e519
Opam 1.1: Constrain supported ocaml versions.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:43:23 +01:00
Malcolm Matalka
545216ee02
Opam: Update to 1.1.0
...
Also keeps 1.0 for backwards compatibility.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:18:28 +01:00
Vladimír Čunát
15a5894ab3
netpbm: fix CVE-2005-2471
2013-12-25 11:11:59 +01:00
Vladimír Čunát
c744a7e106
netpbm: fix build
2013-12-25 11:11:59 +01:00
Vladimír Čunát
2abbce201a
gdal: add libtiff to buildInputs as well (fix build)
...
so that its private deps propagate.
2013-12-25 11:11:59 +01:00
Shea Levy
7129ba057b
Update nodePackages
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-24 19:00:26 -05:00
Moritz Ulrich
109070d78a
perlPackages.ExtUtilsTypemapsDefault: Update to 1.05 (fixes tests).
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-24 22:38:59 +01:00
Evgeny Egorochkin
91decd3a35
libtorrentRasterbar: add missing dependencies
2013-12-24 23:19:55 +02:00
Nixpkgs Monitor
dad3202472
libtorrentRasterbar: update from 0.16.12 to 0.16.13
2013-12-24 22:20:50 +02:00
Sander van der Burg
2f624cd1fa
Make xcode detection a bit more robust and configurable
2013-12-24 14:34:56 +01:00
Ricardo M. Correia
94536ea09f
nss: Fix patch download URL
2013-12-24 11:16:58 +01:00
Mathijs Kwik
0bf0610d14
libpng: upgrade apng patch .7 -> .8
2013-12-24 10:52:42 +01:00
Mathijs Kwik
3db725c467
mpv: ffmpeg defaults to latest now
2013-12-24 10:52:14 +01:00
Tomasz Kontusz
18115fbbea
Change pmount download address and add platforms
...
The URL change is needed as alioth.debian.org is forcing HTTPS with CA we don't recognize.
2013-12-24 10:50:40 +01:00
Rob Vermaas
cd27fa7450
Build x11vnc on linux
2013-12-24 10:48:42 +01:00
Peter Simons
a4462d9a03
git-annex: fix build some more
2013-12-23 22:30:43 +01:00