Commit graph

37851 commits

Author SHA1 Message Date
Peter Simons
7d577eb822 build-support/cabal: recognize the "this package indirectly depends on
multiple versions of the same package" warning from Cabal and abort the
build if it occurs.
2013-12-29 12:26:05 +01:00
Peter Simons
074fee59c5 haskell-yesod-static: update to version 1.2.2.1 2013-12-29 12:26:05 +01:00
Peter Simons
8d18c2cfbc haskell-wai-logger: update to version 2.0.2 2013-12-29 12:26:04 +01:00
Peter Simons
0e2c35b89c haskell-wai-extra: update to version 2.0.1.1 2013-12-29 12:26:04 +01:00
Peter Simons
0e87adf3f2 haskell-lens: update to version 3.10.1 2013-12-29 12:26:04 +01:00
Peter Simons
87d05fcea5 haskell-fclabels: update to version 2.0.1 2013-12-29 12:26:04 +01:00
Peter Simons
6ee7b328d1 haskell-fast-logger: update to version 2.0.3 2013-12-29 12:26:04 +01:00
Peter Simons
053120f28f haskell-digestive-functors-heist: update to version 0.8.4.0 2013-12-29 12:26:04 +01:00
Peter Simons
1f71eab618 haskell-crypto-pubkey: update to version 0.2.4 2013-12-29 12:26:04 +01:00
Peter Simons
fa7e494b25 haskell-RSA: update to version 2.0 2013-12-29 12:26:04 +01:00
Georges Dubus
2ffab7ba6a Fixed a code typo in the documentation 2013-12-29 11:43:59 +01:00
Domen Kožar
5ac2d969f2 salut-a-toi: remove distribute dependency (not needed) 2013-12-29 10:24:37 +01:00
Domen Kožar
8993655f4c pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests 2013-12-29 10:09:30 +01:00
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
Mathijs Kwik
5f9d99926a Merge pull request #1419 from wkennington/btrfs
Updated btrfsprogs from 0.20-git -> 3.12
2013-12-28 17:27:07 -08:00
William A. Kennington III
0276de4d1b Updated btrfsprogs from 0.20-git -> 3.12
Additionally, removed an unmaintained utility for setting the uuid of
sent volumes.
2013-12-28 19:23:10 -06:00
Shea Levy
1cc5942845 Update node packages
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-28 17:54:52 -05:00
Shea Levy
d59d4dd9a5 Add haskellPackages.robotsTxt
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-28 17:34:47 -05:00
Shea Levy
e5898a4f95 Add haskellPackages.heredoc
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-28 17:33:52 -05:00
Domen Kožar
86ecd31111 Python: get rid of distribute
Distribute is deprecated in favor of setuptools (again), please
see http://pythonhosted.org/setuptools/merge-faq.html
2013-12-28 21:15:49 +01:00
Domen Kožar
dcbf69915d matplotlib: get rid of distribute 2013-12-28 21:04:51 +01:00
William A. Kennington III
c00b1ba8f3 Update matplotlib from 1.2.1 -> 1.3.1
Additionally, fix the build and install phases so that they build under
python3
2013-12-28 21:04:50 +01:00
William A. Kennington III
7f4f6bdbfb Update tornado from 2.4 -> 3.1.1 2013-12-28 21:04:50 +01:00
William A. Kennington III
e5c6fb8fa1 Update pyparsing from 1.5.6 -> 2.0.1 2013-12-28 21:04:50 +01:00
William A. Kennington III
e4b4df6f43 Update python3 from 3.3.2 -> 3.3.3 2013-12-28 21:04:50 +01:00
William A. Kennington III
587d03ec4e Update python-dateutil from 2.1 -> 2.2 2013-12-28 21:04:50 +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