Eelco Dolstra
f33fa1b66b
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann
ea49ac0496
flashrom: fix 4936
2014-11-11 21:53:37 +01:00
Peter Simons
9db2e64f6f
Merge pull request #4948 from dysinger/purescript-0.6.0.2
...
purescript-0.6.0.2
2014-11-11 21:27:35 +01:00
Peter Simons
56d325550b
Revert "Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"".
...
This reverts commit dddea7f0d1
. @jwiegley, Hakyll builds just fine with
pandoc-citeproc 0.6. See http://hydra.cryp.to/build/239248 , for example. If you
have trouble compiling that package, then please share a build log that shows
the error message instead of reverting my commits, please.
2014-11-11 21:17:14 +01:00
Vincent Laporte
9bfa208621
ocaml-sqlite3: update from 2.0.4 to 2.0.7
2014-11-11 20:08:37 +00:00
cillianderoiste
d12d84bf78
Merge pull request #4946 from puffnfresh/package/lightum
...
Add Lightum package: MacBook light sensor daemon
2014-11-11 20:54:59 +01:00
Shea Levy
f207fee725
bird: bump
2014-11-11 14:27:21 -05:00
John Wiegley
68f3d56880
Drop reference to old shelly from haskell-defaults.nix
2014-11-11 12:50:22 -06:00
John Wiegley
dddea7f0d1
Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"
...
This reverts commit d3b2c3f46c
.
@peti I'm reverting this commit until a resolution is found that allows
Hakyll to build. I've confirmed that reverting it here fixes the build
error.
2014-11-11 12:49:33 -06:00
Tim Dysinger
9d7c65f840
purescript-0.6.0.2
2014-11-11 19:47:00 +01:00
Eelco Dolstra
5cf4905f3b
Merge remote-tracking branch 'origin/systemd-217' into staging
2014-11-11 19:32:48 +01:00
Brian McKenna
e9b6ad43a6
Add Lightum package: MacBook light sensor daemon
...
Also a NixOS service could make sense but the daemon puts
configuration under the Xdg user path.
2014-11-11 10:22:08 -07:00
Eelco Dolstra
19ea871862
boost: Fix building on Darwin
2014-11-11 10:17:08 -05:00
wmertens
ded8797d0f
Merge pull request #4944 from aflatter/enable-leiningen-on-darwin
...
Allow leiningen to build on darwin
2014-11-11 16:08:43 +01:00
Alexander Flatter
064f10ba3c
Allow leiningen to build on darwin
2014-11-11 15:44:45 +01:00
Eelco Dolstra
19e5c3c306
firefox-13.0: Remove
...
It's outdated, insecure and not used anywhere in Nixpkgs.
2014-11-11 15:37:58 +01:00
Pascal Wittmann
8df0e0b151
Fixed many descriptions
2014-11-11 14:36:34 +01:00
vbgl
0e309af732
Merge pull request #4933 from sjmackenzie/ndn
...
new package: ndn-cxx
2014-11-11 12:46:50 +00:00
Peter Simons
2650bdf417
Merge pull request #4894 from peti/haskell-updates
...
Drop obsolete versions of Haskell Platform ...
2014-11-11 13:42:03 +01:00
Michael Raskin
6c39bbde6d
Set correct current platform support for Mozart binary
2014-11-11 13:57:00 +03:00
Stewart Mackenzie
23d0af8f34
new package: ndn-cxx
2014-11-11 18:22:18 +08:00
Eelco Dolstra
db4053fb59
httpd-2.2: Enable building of mod_cache and friends
2014-11-11 10:39:24 +01:00
Eelco Dolstra
aa17cbf0a8
Remove unnecessary override
2014-11-11 10:38:48 +01:00
Domen Kožar
43be15a89c
fix quake3game build
2014-11-11 09:34:40 +01:00
Domen Kožar
7ff9cd2c41
more kernel fixes
2014-11-11 09:22:18 +01:00
Vladimír Čunát
fb3e83d091
firefox: update to 33.1
2014-11-11 07:46:26 +01:00
Vladimír Čunát
adb831e8bc
strongswan: -lgcc_s, fixes #4925
...
CC maint. @shlevy.
2014-11-11 07:42:00 +01:00
William A. Kennington III
189e73de98
kernel-testing: 3.18-rc3 -> 3.18-rc4
2014-11-10 22:30:43 -08:00
Domen Kožar
eba10b008f
fix tarball eval
2014-11-11 07:21:43 +01:00
Domen Kožar
b9388e9711
fix kernel builds on 32bit linux
2014-11-11 07:06:09 +01:00
Mateusz Kowalczyk
44bac05779
Merge pull request #4930 from taku0/firefox-bin-33.1
...
Update firefox-bin to 33.1
2014-11-11 05:37:38 +00:00
taku0
b5a925a972
Update firefox-bin to 33.1
2014-11-11 10:05:33 +09:00
Luca Bruno
b77d166b17
nixos: move bcache udev rule in a new bcache.nix module
2014-11-10 22:19:43 +01:00
Luca Bruno
31df4f70af
nixos: Add boot.initrd.extraUdevRulesCommands
2014-11-10 22:19:43 +01:00
William A. Kennington III
83cecbdcbc
boost: Fix runtime dependencies in fixup instead of using a hook to fix binaries
2014-11-10 13:15:37 -08:00
Vladimír Čunát
6985461c80
gtk3: maintenance update
2014-11-10 21:34:03 +01:00
Vladimír Čunát
7d05dff782
glib: maintenance update
2014-11-10 21:34:03 +01:00
Vladimír Čunát
4849e32abe
curl: update to fix CVE-2014-3707
2014-11-10 21:34:03 +01:00
Vladimír Čunát
827ec7b3d6
dbus: security update, CVE-2014-3636
2014-11-10 21:34:02 +01:00
Eelco Dolstra
e78a1603fc
linux: Enable BPF_JIT only on 64-bit
...
It's not supported on i686.
http://hydra.nixos.org/build/16834647
2014-11-10 20:21:28 +01:00
Vladimír Čunát
28abe40149
pciutils: update, extend meta, maintain
2014-11-10 20:17:35 +01:00
Eelco Dolstra
0a9ec07b93
findTarball: Fix the case where src is a directory
2014-11-10 20:06:50 +01:00
Ricardo M. Correia
c108ab47be
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.23-201411062033 -> 3.0-3.14.23-201411091053
test: 3.0-3.17.2-201411062034 -> 3.0-3.17.2-201411091054
2014-11-10 19:34:00 +01:00
vbgl
4f247fa10a
Merge pull request #4921 from michelk/netcdf-4.3.2
...
netcdf: update to 4.3.2
2014-11-10 17:34:26 +00:00
Vladimír Čunát
a767210542
mesa: fix LLVM runtime dependency ( close #4853 )
2014-11-10 18:22:46 +01:00
Vladimír Čunát
2e98616e02
qt4: apply a patch from (K)Ubuntu
...
Suggested by @ruediger on IRC.
2014-11-10 18:22:32 +01:00
Michel Kuhlmann
3bff1c8fd3
netcdf: update to 4.3.2
2014-11-10 15:54:37 +01:00
Peter Simons
96c66aea67
Merge pull request #4919 from InternetSolutions/wreq-lens45
...
Use "fetchpatch" instead of a patch file.
2014-11-10 13:42:05 +01:00
Pascal Wittmann
015368fbfe
xlockmore: remove unused patch
2014-11-10 12:52:22 +01:00
Pascal Wittmann
accb8d2c55
xlockmore: update from 5.43 to 5.44, fix appdefaultdir and meta information
2014-11-10 12:46:53 +01:00