Eelco Dolstra
63e2ec2bb8
oraclejdk: Make version consistent with openjdk
2014-07-16 18:34:14 +02:00
Eelco Dolstra
0681742627
oraclejdk: Include "oracle" in name
2014-07-16 18:34:14 +02:00
Peter Simons
75bbad8abe
Merge pull request #3285 from ehmry/polipo
...
Polipo
2014-07-16 18:29:11 +02:00
Eelco Dolstra
396a55ac18
oraclejdk: Update to 7u65
2014-07-16 17:52:46 +02:00
Emery Hemingway
e5988bf4dd
polipo: new service expression
2014-07-16 11:29:40 -04:00
Peter Simons
29c8fdc941
Re-generate Haskell expressions with cabal2nix.
2014-07-16 12:54:59 +02:00
Peter Simons
58d52c5f76
Re-generate Haskell expressions with cabal2nix.
2014-07-16 12:51:43 +02:00
Peter Simons
ea4767221f
haskell-cabal2nix: update to version 1.66
2014-07-16 12:51:43 +02:00
Bjørn Forsman
28cb0f58c4
linux: only enable CONFIG_NFS_SWAP for v3.6+ kernels
...
Linux v3.6 is the earliest version with CONFIG_NFS_SWAP support. This
change unbreaks NixOS tests for older kernels.
2014-07-16 12:13:06 +02:00
Peter Simons
9d457ec228
Merge pull request #3282 from aycanirican/jmacro
...
Added haskelPackages.jmacro-*
2014-07-16 12:10:51 +02:00
Peter Simons
f0de2bd4a1
Re-generate Haskell expressions with cabal2nix.
2014-07-16 12:10:10 +02:00
Ian-Woo Kim
02d6445409
update hoodle-types 0.2.2 -> 0.3, hoodle-builder 0.2.2.0 -> 0.3, hoodle-parser 0.2.2 -> 0.3, hoodle-render 0.3.2 -> 0.4, hoodle-core 0.13.0.0 -> 0.14, and hoodle 0.2.2.1 -> 0.3
2014-07-16 12:10:10 +02:00
Ian-Woo Kim
e8effb9c26
update coroutine-object 0.2 -> 0.3, xournal-parser 0.5.0.2 -> 0.5.0.3
2014-07-16 12:10:10 +02:00
Peter Simons
93464d88b0
Merge pull request #3293 from codygman/blaze-from-html
...
blaze-from-html: add version 0.3.2.1
2014-07-16 12:07:42 +02:00
Peter Simons
5ae5d00d18
Merge pull request #3294 from nilcons/haskellfixes
...
Fix various Haskell packages for 7.8
2014-07-16 12:07:14 +02:00
Peter Simons
dde46a1445
Merge pull request #3297 from soenkehahn/master
...
update haskell-taggy-lens to version 0.1.2
2014-07-16 12:04:12 +02:00
Peter Simons
06e38776d4
Merge pull request #3298 from MP2E/hi_import
...
Import the cabal new project template creator, "hi"
2014-07-16 12:03:07 +02:00
Peter Simons
09af8c8afd
Re-generate Haskell expressions with cabal2nix.
2014-07-16 11:58:51 +02:00
Rok Garbas
dd6f29f88c
Revert "Update titanium node package and others"
...
This reverts commit 7dce55d0fd
.
2014-07-16 10:46:04 +01:00
Vladimír Čunát
18de3952b8
wpa_supplicant: update 2.1 -> 2.2, drop a patch
...
Fixes #3238 .
2014-07-16 10:30:38 +02:00
Cray Elliott
90392f6233
Import the haskell cabal template creator, "hi" from Hackage
...
note: depends on template
2014-07-16 01:13:09 -07:00
Cray Elliott
0e3f66d051
import Haskell template library from Hackage
2014-07-16 01:12:58 -07:00
Oliver Charles
952f3f6e8b
haskellPackages.ekgCarbon: New expression
2014-07-16 08:20:27 +01:00
Sönke Hahn
5d28cd9b18
update haskell-taggy-lens to version 0.1.2
2014-07-16 14:39:12 +08:00
John Wiegley
57e3fc341f
haskell-djinn: corrections for darwin
2014-07-16 01:27:39 -05:00
John Wiegley
d24df6e334
haskell-git-annex: corrections for darwin
2014-07-16 01:27:29 -05:00
Gergely Risko
51ef9caae5
Fix various Haskell packages for 7.8
2014-07-16 03:43:13 +02:00
Shea Levy
e33525a139
Update haskell-simple-conduit
2014-07-15 21:36:36 -04:00
Cody Goodman
5ba2e544d2
blaze-from-html: add version 0.3.2.1
2014-07-15 20:16:31 -05:00
Shea Levy
9087d03190
Add haskell-simple-conduit
2014-07-15 20:41:58 -04:00
Shea Levy
654c88cc6b
Fix virtualbox image building with new nix
2014-07-15 19:17:06 -04:00
Eelco Dolstra
327c2061d1
blender: Don't use system openjpeg
...
It was ignored anyway (instead using the internal openjpeg copy).
2014-07-15 23:34:34 +02:00
Eelco Dolstra
12fb52b08a
blender: Enable ocean modifier
2014-07-15 23:34:24 +02:00
Eelco Dolstra
457e539048
blender: Fix jackaudio dependency
2014-07-15 23:33:09 +02:00
Eelco Dolstra
ae129f0ff5
fftw: Update to 3.3.4
2014-07-15 23:32:00 +02:00
Eelco Dolstra
2d8e880c82
blender: Update to 2.71
2014-07-15 23:31:55 +02:00
Pascal Wittmann
889b3f5f83
Merge pull request #3286 from wjlroe/elasticsearch-1.2.2
...
elasticsearch: update to 1.2.2
2014-07-15 20:13:50 +02:00
Pascal Wittmann
0aa6a9876f
Merge pull request #3244 from ehmry/xscreensaver
...
xscreensaver: update from 5.26 to 5.29
2014-07-15 20:00:41 +02:00
Eelco Dolstra
6c0002ec8d
nvidia-x11: Update to 340.24
2014-07-15 19:53:39 +02:00
Pascal Wittmann
96f5affca9
bgs: update from 0.5 to 0.6
2014-07-15 19:50:29 +02:00
William Roe
3af919fb08
elasticsearch: update to 1.2.2
2014-07-15 16:57:16 +01:00
Bjørn Forsman
a4cf5e903b
nixos/redis: fix evaluation
...
Commit 89fee1006c
("nixos/redis: clean up
option types") broke nixos evaluation:
error: attempt to call something which is not a function but a set, at .../nixpkgs/nixos/modules/services/databases/redis.nix:111:28
Fix it.
Reported by Oliver Charles (thanks!).
2014-07-15 17:05:54 +02:00
Sander van der Burg
a8e4abaf6f
titaniumsdk: add version 3.3 SDK and update kitchensink example
2014-07-15 16:46:59 +02:00
Eelco Dolstra
1dc5e5fb8c
dhcpcd: Update to 6.4.2
2014-07-15 16:23:47 +02:00
Emery Hemingway
0d781369c0
polipo: update to 1.1.1
2014-07-15 10:10:28 -04:00
Sander van der Burg
bce5f2cf56
titaniumsdk: Bump to version 3.2.3
2014-07-15 16:05:25 +02:00
Sander van der Burg
7dce55d0fd
Update titanium node package and others
2014-07-15 15:59:57 +02:00
Oliver Charles
0ee223e786
haskellPackages.engineIO: Update to 1.0.1
2014-07-15 14:58:31 +01:00
Bjørn Forsman
89fee1006c
nixos/redis: clean up option types
...
Some options lack a type and some use the deprecated "string" type. Fix
it.
2014-07-15 15:45:52 +02:00
Ricardo M. Correia
85e444f4f8
linux: Enable NFSv4.1, v4.2 clients and swap on NFS
...
I'm only enabling for kernels >= 3.11 to be conservative, because clients and
servers automatically negotiate and use the highest mutually supported version
by default, but only in kernel 3.11 server NFSv4.1 support actually became RFC
compliant.
I'm also adding support for swap on NFS, which is enabled by default on
Ubuntu kernels.
2014-07-15 15:07:25 +02:00