Peter Simons
f67d5a9a39
Merge branch 'master' into stdenv-updates.
...
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons
473ba2212d
apache: merge updates from master branch
...
These updates fix the issues earlier versions of Apache had with the recent
release of PCRE.
2012-11-21 16:09:08 +01:00
Peter Simons
592e4abe2b
pcre: update library to version 8.31
2012-11-21 16:08:01 +01:00
Peter Simons
9ada368ef8
git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod
2012-11-21 12:30:54 +01:00
Peter Simons
5407af5c14
haskell-DAV: add version 0.2
2012-11-21 12:30:54 +01:00
Peter Simons
4ea0f76ffc
haskell-xml-hamlet: add version 0.4.0.3
2012-11-21 12:30:53 +01:00
Peter Simons
afc41f2278
haskell-lens: add version 3.3
2012-11-21 12:30:53 +01:00
Peter Simons
53d69fd13d
haskell-comonads-fd: add version 3.0
2012-11-21 12:30:53 +01:00
Peter Simons
26f32d8df6
Merge pull request #191 from qknight/gobby_update
...
updates to libinfinity 0.5.3 and gobby 0.4.94
2012-11-21 03:07:38 -08:00
Peter Simons
32931c2837
haskell-monad-peel: update to version 0.1.1
2012-11-21 12:04:48 +01:00
Peter Simons
c9fabedfac
haskell-http-date: update to version 0.0.3
2012-11-21 12:04:48 +01:00
Peter Simons
775dd5b7d5
haskell-graphviz: update to version 2999.14.1.0
2012-11-21 12:04:48 +01:00
Lluís Batlle i Rossell
40aa82192d
st: update to 0.3
2012-11-21 10:12:01 +01:00
Mathijs Kwik
b155a188e3
neoload: link used jre to a location which is hard-coded into some binaries
2012-11-21 09:49:35 +01:00
Joachim Schiele
1ed9e35be6
fixed compile errors for libinfinity and gobby
2012-11-20 21:21:47 +00:00
Peter Simons
b62393bbb0
Merge pull request #158 from bbenoist/qvtk
...
vtk: latest version + useQt4 option
2012-11-20 12:44:15 -08:00
Peter Simons
2f55f31f49
Merge pull request #155 from bbenoist/newpkgs
...
New pkgs: qtcreator fox xfe gmrun geany
2012-11-20 12:43:06 -08:00
Peter Simons
aa7d0c4cc5
Merge pull request #178 from mpashton/abcde-new
...
Updated version of abcde to 2.5.4
2012-11-20 12:41:40 -08:00
Rickard Nilsson
1f505d3871
opera: Upgrade to 12.11
2012-11-20 17:07:04 +01:00
Peter Simons
43c84c6ec8
haskell-zlib-bindings: update to version 0.1.1.2
2012-11-20 14:47:51 +01:00
Peter Simons
306cb4d9b5
haskell-cabal2nix: update to version 1.42
2012-11-20 14:42:19 +01:00
Peter Simons
0c20f29893
haskell-highlighting-kate: compile with regex-pcre instead of regex-pcre-builtin
2012-11-20 14:40:17 +01:00
Peter Simons
9fa9e0520f
haskell-regex-pcre-builtin: removed from Nixpkgs -- use the superior regex-pcre library instead
2012-11-20 14:39:37 +01:00
Peter Simons
84591241db
haskell-hlint: update to version 1.8.35
2012-11-20 14:02:04 +01:00
Peter Simons
f1733b361f
haskell-cabal2nix: update to version 1.41
2012-11-20 14:02:04 +01:00
Peter Simons
154861e8d5
haskell-yaml: update to version 0.8.1.1
2012-11-20 14:02:04 +01:00
Peter Simons
830536a989
haskell-tls: update to version 1.0.2
2012-11-20 14:02:03 +01:00
Peter Simons
09349c6388
haskell-test-framework-th: update to version 0.2.3
2012-11-20 14:02:03 +01:00
Peter Simons
4dc5051353
haskell-shelly: update to version 0.14.3
2012-11-20 14:02:03 +01:00
Peter Simons
463fca2766
haskell-repa-examples: update to version 3.2.2.3
2012-11-20 14:02:03 +01:00
Peter Simons
fd7da95852
haskell-language-haskell-extract: update to version 0.2.3
2012-11-20 14:02:03 +01:00
Peter Simons
0d02e373cf
haskell-instant-generics: update to version 0.3.7
2012-11-20 14:02:03 +01:00
Peter Simons
85addc3077
haskell-http-conduit: update to version 1.8.4
2012-11-20 14:02:02 +01:00
Peter Simons
57169b672a
haskell-hackage-db: update to version 1.4
2012-11-20 14:02:02 +01:00
Peter Simons
e65c750b5a
haskell-digest: update to version 0.0.1.2
2012-11-20 14:02:01 +01:00
Peter Simons
8bb2134069
haskell-cmdargs: update to version 0.10.1
2012-11-20 14:02:01 +01:00
Peter Simons
a87c823d19
haskell-Boolean: update to version 0.1.1
2012-11-20 14:02:00 +01:00
Eelco Dolstra
144b06f107
nix: Update to 1.2pre2980
2012-11-20 12:12:24 +01:00
Eelco Dolstra
a034c4b935
androidenv: Remove examples directory
...
As discussed on nix-dev, it's better to use fetchurl to obtain the
source of the examples.
2012-11-20 11:29:04 +01:00
Peter Simons
f0bd33556f
smartmontools: update drivedb file to trunk revision 3605
2012-11-20 11:16:32 +01:00
aszlig
ba23852393
Merge branch 'chromium-update'.
...
Was about to open a new pull request about how to proceed with the BPF seccomp
sandbox, but turns out that the Chromium security team not even has finished
reviewing the legacy sandbox (http://crbug.com/26528 , next time look at the date
of the issue, shall we?), so it shouldn't make a big difference whether we
enable the old seccomp sandbox or the new BPF one.
Which of course won't make either of these options more secure and leaves us at
the same state we had before, just with chrome://sandbox stating "NOT adequately
sandboxed" which resembles the truth more closely.
2012-11-20 05:01:11 +01:00
aszlig
a76e28b54c
chromium: Add dependency on pciutils for v25.
...
This fixes the build for latest development version 25.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-20 04:55:45 +01:00
aszlig
af8f08d638
chromium: Drop obsolete pre-v23 seccomp patch.
...
The patch is no longer needed, as we are now using the BPF seccomp sandbox.
Unfortunately this is not marked "adequately sandboxed" in chrome://sandbox, as
it awaits security review on http://crbug.com/26528 .
Unfortunately this gets us into a position where we can't be sure if the sandbox
is working correctly, especially because the non-BPF seccomp sandbox has a bunch
of stability issues and is marked legacy. And we definitely don't want to add
support for the setuid sandbox, do we?
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-20 04:55:45 +01:00
aszlig
d5c639cb55
chromium: Update channels to stable v23.0.1271.64.
...
This updates all release channels to the latest versions:
stable: 22.0.1229.94 -> 23.0.1271.64 (builds fine, tested)
beta: 23.0.1271.60 -> 24.0.1312.14 (builds fine, tested)
dev: 24.0.1312.2 -> 25.0.1323.1 (build failed, requires pciutils)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-20 04:55:45 +01:00
aszlig
bc4318dca3
chromium: Fix omahaproxy URL in updater.
...
Omahaproxy got an overhaul and thus doesn't give CSV output on the main URL
anymoare. We're switching to /all for now and may want to refine this to only
what we're exactly looking for, but for now it fixes the updater.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-20 04:55:28 +01:00
Lluís Batlle i Rossell
38153d9105
xf86 video openchrome: fixing the build, changing overrides.
2012-11-18 22:19:00 +01:00
viric
6b5c3ad453
Merge pull request #189 from aforemny/xf86-video-sis
...
Fix xf86-video-sis
2012-11-18 11:24:27 -08:00
Alexander Foremny
58d68427c6
Fix xf86-video-sis
2012-11-18 20:16:54 +01:00
Mathijs Kwik
3ab0cd1d41
neoload: fix evaluation of tarball job
2012-11-18 18:35:01 +01:00
Mathijs Kwik
125953f1bc
add package: neoload-4.0.4
2012-11-18 15:33:52 +01:00