Vladimír Čunát
a3d33de16a
Merge #3248 : add glmark2-2014.03
2014-08-12 20:53:11 +02:00
Vladimír Čunát
566058b477
Merge #3152 : add pyqt5
2014-08-12 20:33:34 +02:00
Vladimír Čunát
bcdbbf3ea1
Merge #2129 : add trusted computing components
2014-08-12 19:43:34 +02:00
Vladimír Čunát
87c3c0e885
Merge master into #2129
...
Conflicts (easy, just UID shifted):
nixos/modules/misc/ids.nix
nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
Oliver Charles
4e2adbeb4d
haskellPackages.bound: New expression
2014-08-12 18:11:33 +01:00
Matt Miemiec
8695c58648
Add the bspwm window manager to Nix.
2014-08-12 18:22:15 +02:00
Michael Raskin
4ab466cc56
Update OpaLang; it still doesn't build for a mysterious reason: apparently the missing fields are actually defined…
2014-08-12 16:22:25 +04:00
Rickard Nilsson
bdea35d98b
obnam: Update from 1.6.1 to 1.8
2014-08-12 13:32:24 +02:00
Domen Kožar
cc8e4f6814
provide pulseaudioFull and set it as default to hardware.pulseaudio.package
2014-08-12 12:51:25 +02:00
Peter Simons
46e5a78b81
haskell-Allure: add version 0.4.99.0
2014-08-12 12:37:44 +02:00
Peter Simons
cccb6a67eb
haskell-zip-archive: update to version 0.2.3.4
2014-08-12 12:37:43 +02:00
Domen Kožar
f73291e1ef
virtualenv: 1.11.4 -> 1.11.6
2014-08-12 12:23:07 +02:00
Peter Simons
27c17fb451
Merge pull request #3547 from nilcons/hmatrixfix
...
Use shared atlas in liblapack for hmatrix
2014-08-12 10:55:29 +02:00
Christoph Hrdinka
f44e69a55d
luminanceHDR: add version 2.4.0
...
fixes #3229
2014-08-12 10:19:35 +02:00
Gergely Risko
36c1655aa0
Use shared atlas in liblapack for hmatrix
2014-08-12 02:27:44 +02:00
Peter Simons
59e15fe815
Revert "Many minor fixes to get things building after recent compiler changes".
...
This reverts the Haskell part of commit 326ca0f690
, because these changes
broke the 'scientific' build with GHC 7.4.2.
2014-08-11 14:48:35 +02:00
Mateusz Kowalczyk
6aa17c2ea9
haskell-profunctor-extras: deperecated package
...
Use profunctors instead. We have no dependencies on this anyway.
2014-08-11 13:58:40 +02:00
Mateusz Kowalczyk
e8b13a9586
haskell-vty-ui: explicitly use vty 4.7.5
...
https://github.com/jtdaugherty/vty-ui/issues/55
2014-08-11 13:58:39 +02:00
Mateusz Kowalczyk
06d8dfaf40
haskell-base64-conduit: remove package
...
The package has been deprecated by upstream and we have nothing that
depends on it.
2014-08-11 13:56:12 +02:00
Mateusz Kowalczyk
9cb34308da
haskell-PastePipe: add version 1.5
2014-08-11 07:03:19 +02:00
John Wiegley
ef171fe543
libusb1: build using clangStdenv ... on darwin
2014-08-10 23:25:33 -05:00
John Wiegley
3dea766731
libusb1: build using clangStdenv
2014-08-10 23:25:06 -05:00
John Wiegley
326ca0f690
Many minor fixes to get things building after recent compiler changes
2014-08-10 23:18:57 -05:00
Bjørn Forsman
b9bd655b16
ucspi-tcp: new package
...
ucspi-tcp is command-line tools for building TCP client-server
applications.
http://cr.yp.to/ucspi-tcp.html
2014-08-10 23:00:42 +02:00
Peter Simons
4f17e39137
Merge pull request #3521 from pavelkogan/haskell-xml-conduit-writer
...
haskell-xml-conduit-writer: add version 0.1.1.1
2014-08-10 22:43:15 +02:00
Peter Simons
43fd39de43
Merge pull request #3520 from pavelkogan/SourceGraph
...
new packages: SourceGraph + dependency
2014-08-10 22:42:56 +02:00
Pavel Kogan
e1b139372c
haskell-xml-conduit-writer: add version 0.1.1.1
2014-08-10 16:27:29 +01:00
Pavel Kogan
a00209a38e
Add SourceGraph: Haskell code analysis tool
2014-08-10 16:13:35 +01:00
Pavel Kogan
51a2e36f20
haskell-Graphalyze: add version 0.14.1.0
2014-08-10 16:13:34 +01:00
Daniel Peebles
d18ec20878
Change junit to actually compile from source rather than download binaries
2014-08-09 20:53:36 -04:00
Eelco Dolstra
40602a666c
Merge branch 'staging'
2014-08-09 23:41:58 +02:00
Eelco Dolstra
be399bf245
Hack to fix llvm/clang build on Darwin
...
(Or at least restore it to the same level as brokenness as before the
staging merge. I.e. it depends on gcc-apple, which doesn't build on
standard 10.9 systems.)
2014-08-09 23:31:00 +02:00
lethalman
8f34fda081
Merge pull request #3495 from geerds/virtualenvwrapper
...
Fix virtualenvwrapper shell scripts
2014-08-09 23:06:33 +02:00
Jascha Geerds
efbb5de1c5
Refactoring
2014-08-09 22:56:07 +02:00
Eelco Dolstra
a6d1013e66
redis: Build with default gcc
2014-08-09 21:49:09 +02:00
Eelco Dolstra
9f08904c8d
gnuplot: Use default compiler on Darwin
2014-08-09 19:53:09 +02:00
Peter Simons
8ede29197f
GHC 7.6.x requires older attoparsec to build with aeson 0.7.x.
2014-08-09 19:48:47 +02:00
Eelco Dolstra
6c5186cf9b
gnuplot: Reduce dependency bloat a bit
2014-08-09 19:30:48 +02:00
Peter Simons
0d2463a24b
GHC 7.6.x required scientific 0.2.x to build aeson 0.7.x.
2014-08-09 19:16:45 +02:00
Eelco Dolstra
a7c1541a21
emacs: Fix building on Darwin with recent versions of GCC
...
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
2014-08-09 19:08:37 +02:00
Peter Simons
d0e37eff7b
GHC 7.6 and earlier cannot compile aeson 0.8.x.
2014-08-09 19:02:56 +02:00
lethalman
05eb5bf913
Merge pull request #3503 from lethalman/platforms
...
Make platforms.allBut accept a list rather than a single platform
2014-08-09 14:22:09 +02:00
Peter Simons
01a059ee80
haskell-filepath: drop this package, it's been part of GHC forever
2014-08-09 13:49:24 +02:00
Peter Simons
f44346d077
haskell-fay: build with aeson 0.7.x to fix build errors
2014-08-09 13:49:23 +02:00
Peter Simons
c00e814202
HaRe: remove broken package until it supports GHC 7.8.3
2014-08-09 13:49:23 +02:00
Peter Simons
ad42c60b91
haskell-token-utils: remove broken package until it supports GHC 7.8.3
...
https://github.com/alanz/haskell-token-utils/issues/1#issuecomment-51681623
2014-08-09 13:49:23 +02:00
Peter Simons
3531038008
haskell-aeson: update to version 0.8.x
2014-08-09 13:49:23 +02:00
Luca Bruno
b331ae33d7
Make platforms.allBut accept a list rather than a single platform
2014-08-09 12:31:33 +02:00
Georges Dubus
8de8d5a639
nox: Added expression
2014-08-09 12:30:38 +02:00
Georges Dubus
abf2f3fcc5
Added expressions for dogpile.core and dogpile.cache
2014-08-09 12:04:58 +02:00