Peter Simons
cd89c69798
Switch default version of GNU Make to 4.1.
2015-03-16 12:56:58 +01:00
Peter Simons
6694ef42a9
Merge branch 'master' into staging.
...
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/tools/security/gnupg/21.nix
pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
Peter Simons
8196130a1d
Merge pull request #6711 from phile314/dev
...
haskell: Add uhc compiler
2015-03-10 11:22:15 +01:00
Domen Kožar
3eb0dd5a4c
Merge pull request #6738 from rzetterberg/master
...
django: Adds pypyPackages.django_1_7 (1.7.6)
2015-03-10 11:01:58 +01:00
Richard Zetterberg
8ca89f9383
django: Adds pypyPackages.django_1_7 (1.7.6)
2015-03-10 10:50:55 +01:00
William A. Kennington III
23194559f3
lightdm: 1.8.6 -> 1.13.1
2015-03-09 17:44:38 -07:00
Philipp Hausmann
2eacaa856b
haskell-uhc: Remove explicit dependency on binary
2015-03-10 00:19:10 +01:00
Shea Levy
de892761cf
dragonegg: Pull from llvm 3.5
...
If someone uses it, we can add the 3.6 version of course
2015-03-09 23:01:59 +00:00
Pascal Wittmann
7b2ceb5cf1
Merge pull request #6426 from grwlf/utf8-proc
...
utf8proc: add the library
2015-03-09 17:34:06 +00:00
Eric Seidel
19a6e3a2e6
emacs24PackagesNg: fix typos in "license"
2015-03-09 09:19:36 -07:00
Eric Seidel
8a970b0b28
emacs24PackagesNg: add recurseIntoAttrs to trigger hydra
2015-03-09 08:52:02 -07:00
Peter Simons
3f7de179f5
R: update to version 3.1.3
2015-03-09 16:37:05 +01:00
Vladimír Čunát
947d78c9e8
trustedGrub: fix build by using older automake (again)
2015-03-09 15:55:28 +01:00
Eduard Bachmakov
aa564bbac5
mesa: big update, and related improvements ( close #6367 )
...
* Remove upstreamed patch
* EGL driver dirs are no longer a thing, see mesa commit
407450eb84f5a1b466a2eff19b85cdee7ac15dfb
Patching runtime search dir in sources instead (by vcunat).
* static-gallium patch dropped as it causes visibility issues with
nouveau
* rtti patch dropped as it the relevant configuration has been removed
upstream; properly fixed by an LLVM flag now
* Checks disabled. This is known and solved upstream. Checks will be
re-enabled in a future commit when updating to a version containing
the fixes
* Use llvm-3.5 now (by vcunat).
2015-03-09 15:55:24 +01:00
Eduard Bachmakov
4731485ca2
llvm-3.5: enable RTTI to support mesa
...
Extracted from #6367 .
2015-03-09 15:55:23 +01:00
Vladimír Čunát
0619c852cb
automake: use 1.14.* as the default
...
I see 1.15 has been released recently,
but that's probably too new to be the default.
2015-03-09 15:55:21 +01:00
Lluís Batlle i Rossell
a2f4b94dbe
Add pcsc-tools, to test ccid cards.
2015-03-09 15:37:50 +01:00
Philipp Hausmann
1ce75368f1
Add uhc haskell compiler
2015-03-09 13:38:28 +01:00
desiderius
6ee8c746c2
python-modules: enables support for pypy in sphinxcontrib-httpdomain
...
As the issue #6548 is closed thanks to iElectric we can now use
sphinxcontrib-httpdomain with pypy.
2015-03-09 12:22:50 +01:00
desiderius
cee5ce177b
python-modules: enables support for pypy in sphinxcontrib-plantuml
...
As the issue #6548 is closed thanks to iElectric we can now use
sphinxcontrib-plantuml with pypy.
2015-03-09 12:14:17 +01:00
William A. Kennington III
b452bd40e1
Merge pull request #6602 from codyopel/ffmpegbr
...
ffmpeg: refactor to generic
2015-03-08 15:23:55 -07:00
Pascal Wittmann
228183f4f1
Merge pull request #6313 from matthiasbeyer/add-khal
...
Add package: khal
2015-03-08 21:22:12 +00:00
Domen Kožar
17a44e5013
Merge pull request #6717 from sjagoe/package-python-grin
...
Add grin package
2015-03-08 21:58:23 +01:00
Simon Jagoe
f4965177b5
Move grin definition to tools/text and call it from all-packages.nix
2015-03-08 20:10:40 +00:00
Simon Jagoe
ab6a03e706
Place grin in Python 2.7 section; it is not Python 3.x compatible
2015-03-08 17:09:11 +00:00
Simon Jagoe
02fdd38400
Add grin package
2015-03-08 16:38:31 +00:00
Vladimír Čunát
3d0a6819da
wmutils-core: add to tools/X11 ( close #6585 )
...
@vcunat fixed and cleaned this a little.
2015-03-08 15:46:02 +01:00
Andraz Brodnik
2d8f7883a9
Add scrolls game (unfree). Close #6456 .
...
@vcunat added today's date as version.
2015-03-08 15:37:33 +01:00
lethalman
0a83c2a2a9
Merge pull request #6697 from ardumont/add-tuxguitar
...
[new] tuxguitar derivation
2015-03-08 11:54:57 +01:00
Antoine R. Dumont
00fb3c0b7e
Add tuxguitar derivation
2015-03-08 10:22:56 +01:00
Arseniy Seroka
1a25b83c6b
Merge pull request #6695 from matthiasbeyer/add-hstr
...
Add package: hstr (hh)
2015-03-07 18:45:42 +03:00
Matthias Beyer
425110dea6
Add package: hstr (hh)
2015-03-07 14:50:14 +01:00
Carles Pagès
2bc4f5c149
SDL2_ttf: add version 2.0.12
2015-03-07 14:35:19 +01:00
Shea Levy
e57e44f867
llvm-3.6 packages: Build everything (except clang and llvm) with clang
2015-03-07 13:08:34 +00:00
William A. Kennington III
a00e19ceb9
samba4: Remove explicit libiconv specification
2015-03-06 11:59:05 -08:00
Vincent Laporte
116ddda218
Adds ocaml-enumerate
...
Quotation expanders for enumerating finite types in OCaml.
2015-03-06 20:29:07 +01:00
Shea Levy
c62b5456f5
Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge
...
LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6
Conflicts:
pkgs/top-level/all-packages.nix
2015-03-06 19:10:10 +00:00
Shea Levy
6b53021205
Merge branch 'master' into staging
2015-03-06 19:02:36 +00:00
Lluís Batlle i Rossell
d1e302121a
Merging changes to make more things build on rpi2
2015-03-06 15:43:32 +00:00
Eelco Dolstra
bf0aa66c17
Only test evaluation on supported platforms
2015-03-06 14:07:45 +01:00
Ambroz Bizjak
5f76d08865
polkit: Use spidermonkey-17.
...
The old version doesn't build for ARMv7.
(cherry picked from commit 5fe72cafffb22749520dd03a18bb862a37cca8b3)
2015-03-06 09:11:11 +00:00
Tobias Geerinckx-Rice
40e4ebbb57
python-packages: pgcli 0.16.0 -> 0.16.1
2015-03-06 03:48:40 +01:00
Tobias Geerinckx-Rice
22080d1951
Add x2goclient 4.0.3.2
...
Thanks to Christoph-Simon Senjak <c s s at u x u l dot d e>
2015-03-06 03:48:40 +01:00
Tobias Geerinckx-Rice
2a93bee7f3
Add nxproxy 3.5.0-2015-02-18
...
Thanks to Christoph-Simon Senjak <c s s at u x u l dot d e>
2015-03-06 03:48:40 +01:00
Tobias Geerinckx-Rice
47712a21bd
Add libxcomp 3.5.0-2015-02-18
...
Thanks to Christoph-Simon Senjak <c s s at u x u l dot d e>
2015-03-06 03:48:39 +01:00
Eric Seidel
6b60f3dcad
Merge pull request #6641 from oxij/emacs-ng
...
Somewhat more generic emacs packages' builder and a bunch of new emacs packages and metas
2015-03-05 13:22:45 -08:00
Arseniy Seroka
268a355988
Merge pull request #6633 from ts468/enlightenment
...
Update: Enlightenment + EFL
2015-03-05 23:58:37 +03:00
Nikolay Amiantov
c532beeb0d
sddm: add package
2015-03-05 20:49:26 +03:00
Matthias Beyer
c6ab53e9db
Add package: scim
2015-03-05 18:04:11 +01:00
Peter Simons
1d953779b0
Merge remote-tracking branch 'origin/master' into staging.
2015-03-05 12:24:57 +01:00