Commit graph

19488 commits

Author SHA1 Message Date
Eelco Dolstra
09ab016c6c * Sync CSS with the Nix manual.
svn path=/nixpkgs/trunk/; revision=34062
2012-05-11 21:42:00 +00:00
Eelco Dolstra
a78d2f55fb * Perl: set passthru.libPrefix to communicate the relative location of
Perl packages for $PERL5LIB.

svn path=/nixpkgs/trunk/; revision=34061
2012-05-11 13:41:24 +00:00
Peter Simons
5dd0d85528 Updated Haskell packages.
- haskell-src-exts: updated to version 1.13.3
 - MemoTrie: updated to version 0.5
 - semigroups: updated to version 0.8.3.2
 - tagged: updated to version 0.4.2.1
 - vector-space: updated to version 0.8.1
 - WebBits: updated to version 2.2

svn path=/nixpkgs/trunk/; revision=34060
2012-05-11 13:04:35 +00:00
Peter Simons
767db7397c haskell-packages: downgrade 'mtl' and 'transformers' in GHC 7.4.1 environment to fix build errors
The new versions of mtl and transformers break many important packages, such as
monad-par, graphviz, pandoc, and all other packages that depend on any of those.
This situation causes serious problems for me, because I depend on some of those
packages for my daily work. IMHO, it is an overreaction to have all those builds
fail, because some day in the future a new version of Haskell Platform *may* be
released that *may* recommend the latest versions of 'transformers' and 'mtl'. As
long as those changes have such profound negative effects on our packages, those
upgrades should be deferred. This approach seems consistent with the way we've
handled these matters things in the past, too. For example, we happily break
conformance with older versions of HP, when those changes are beneficial for
users. In other words, we have usually valued usability over strict conformance
before, and IMHO that is a sensible policy.

I agree that it's nice to test what kind of trouble these upgrades cause, but I
don't believe that 'trunk' is the right place to perform those tests. The breakage
these changes cause affect users who rely on Nixpkgs to provide a stable working
environment.

svn path=/nixpkgs/trunk/; revision=34059
2012-05-11 13:04:28 +00:00
Peter Simons
7a4f8c97c5 pigz: updated to version 2.2.4
svn path=/nixpkgs/trunk/; revision=34058
2012-05-11 12:16:09 +00:00
Ludovic Courtès
63a9c0e5a1 LCOV: Fix FreeBSD patch.
svn path=/nixpkgs/trunk/; revision=34057
2012-05-11 09:31:37 +00:00
Michel Alexandre Salim
2c64c7fe9d - update leiningen to 1.7.1
- apply patch (applied upstream) to assume rlwrap is present
- update expression to depend on rlwrap
- rebase the nix-specific patch to apply cleanly

svn path=/nixpkgs/trunk/; revision=34056
2012-05-11 03:36:13 +00:00
Eelco Dolstra
b6917d3b73 * Added Ubuntu 12.04.
svn path=/nixpkgs/trunk/; revision=34055
2012-05-11 02:04:14 +00:00
Eelco Dolstra
bcefaeea13 * Don't use the prerelease of GnuPG by default.
svn path=/nixpkgs/trunk/; revision=34054
2012-05-10 23:51:40 +00:00
Ludovic Courtès
e3ccebccec GNU libc 2.13: Skip `dont_use_system_ld_so_cache.patch' on GNU.
svn path=/nixpkgs/trunk/; revision=34053
2012-05-10 20:23:45 +00:00
Joachim Schiele
2a6579bdb6 virtinst installs now. still most tools don't work and virt-manager still has problems with finding libvirt.
svn path=/nixpkgs/trunk/; revision=34052
2012-05-10 19:29:54 +00:00
Eelco Dolstra
203b85334a * Merge the stdenv branch.
svn path=/nixpkgs/trunk/; revision=34051
2012-05-10 15:16:27 +00:00
Eelco Dolstra
587b2e7d3e * Bravely delete the mergeinfo.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34050
2012-05-10 15:14:08 +00:00
Eelco Dolstra
c60af6bbd1 * Third attempt.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34048
2012-05-10 15:00:17 +00:00
Eelco Dolstra
928a24da69 * Second attempt.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34047
2012-05-10 14:58:45 +00:00
Eelco Dolstra
f1a63ee0a7 * Hack svn:mergeinfo to hopefully allow "svn merge --reintegrate"
to succeed.  The error is:

$ svn merge --reintegrate ^/nixpkgs/branches/stdenv-updates
svn: E195016: Reintegrate can only be used if revisions 33530 through 34045 were previously merged from https://nixos.org/repos/nix/nixpkgs/trunk to the reintegrate source, but this is not the case:
  nixpkgs/branches/stdenv-updates/pkgs/misc/screensavers/xscreensaver/default.nix
    Missing ranges: /nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix:33655-33656

svn path=/nixpkgs/branches/stdenv-updates/; revision=34046
2012-05-10 14:56:19 +00:00
Eelco Dolstra
3bb2f92106 * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34045
2012-05-10 14:41:16 +00:00
Andres Löh
50a51c7654 Reverting some more Haskell changes, to make things complete again.
svn path=/nixpkgs/trunk/; revision=34044
2012-05-10 14:23:48 +00:00
Andres Löh
2720636b7b Reverted changes to the Haskell package defaults.
The current versions are the ones being proposed for the
new Haskell Platform. If they cause problems with other
packages, those packages should be fixed, not the defaults.

svn path=/nixpkgs/trunk/; revision=34043
2012-05-10 10:38:52 +00:00
Peter Simons
c07854ace4 Updated Haskell packages.
- DSH: updated to version 0.7.8.1
 - alex: updated to versino 3.0.2
 - certificate: updated to version 1.2.2
 - language-c: updated to version 0.4.2
 - xhtml: updated to version 3000.2.1

Also, downgraded GHC 7.4.1 environment to use mtl 2.0 and transformers 2.0 to
avoid lots of build errors, i.e. with monad-par.

svn path=/nixpkgs/trunk/; revision=34042
2012-05-10 10:28:49 +00:00
Eelco Dolstra
196c30de9b * Linux 3.0.31.
svn path=/nixpkgs/trunk/; revision=34036
2012-05-09 21:49:39 +00:00
Eelco Dolstra
bf2d945a02 * Disable some failing builds on specific platforms.
svn path=/nixpkgs/trunk/; revision=34033
2012-05-09 21:10:12 +00:00
Andres Löh
40274ca75c Adapted the ghc-7.4.1 package version defaults to upcoming Platform release.
svn path=/nixpkgs/trunk/; revision=34032
2012-05-09 17:21:37 +00:00
Andres Löh
262c2a45b0 Changing the way haskellPackagesFun is invoked.
This is supposed to make it easier to create locally modified
version preferences in Haskell package sets, by using override
on the extraPrefs attribute.

svn path=/nixpkgs/trunk/; revision=34031
2012-05-09 16:20:01 +00:00
Andres Löh
aa6e1f4586 Added haskell-mpi and dependencies.
svn path=/nixpkgs/trunk/; revision=34030
2012-05-09 16:19:52 +00:00
Ludovic Courtès
c1dd4327dc GNU Guile 2.0: Fix cross-GNU builds.
svn path=/nixpkgs/trunk/; revision=34029
2012-05-09 13:42:46 +00:00
Eelco Dolstra
24594b0fb3 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34028
2012-05-09 11:49:52 +00:00
Peter Simons
5930e47068 Updated Haskell packages.
- attoparsec-conduit: updated to version 0.4.0.1
 - conduit: updated to version 0.4.2
 - network-conduit: updated to version 0.4.0.1
 - persistent-sqlite: updated to version 0.9.0.2
 - persistent: updated to version 0.9.0.4
 - semigroups: updated to version 0.8.3.1
 - wai-app-static: updated to version 1.2.0.3
 - wai-extra: updated to version 1.2.0.4
 - wai: updated to version 1.2.0.2
 - warp: updated to version 1.2.0.2
 - xml-conduit: updated to version 0.7.0.2

svn path=/nixpkgs/trunk/; revision=34027
2012-05-09 11:25:59 +00:00
Mathijs Kwik
206c6b1bbb upgraded uhc
svn path=/nixpkgs/trunk/; revision=34026
2012-05-09 10:01:41 +00:00
Mathijs Kwik
5ff5c38cb6 bbswitch: upgraded to 0.4.2
svn path=/nixpkgs/trunk/; revision=34025
2012-05-09 10:01:38 +00:00
Mathijs Kwik
aac9492dde mplayer: enabled speex support
I enabled it by default, as ffmpeg/libav/vlc/xine all have speex enabled by
default too, so it's probably on most systems already

svn path=/nixpkgs/trunk/; revision=34024
2012-05-09 10:01:35 +00:00
Peter Simons
1cdbd5add0 numpy: reverted build fix that committed earlier on behalf of Konrad Hinsen
The patch broke the build of matplotlib.

svn path=/nixpkgs/trunk/; revision=34023
2012-05-09 07:22:18 +00:00
Lluís Batlle i Rossell
b713e291a4 The jujuutils are meant for a recent kernel, more recent than our linuxHeaders.
Therefore I add recent linuxHeaders for it.

It's quite a hack to build it mixed with 2.6.35 headers and 3.3.5, but it builds at least.


svn path=/nixpkgs/trunk/; revision=34021
2012-05-08 16:38:21 +00:00
Lluís Batlle i Rossell
671857995d Adding jujuutils.
svn path=/nixpkgs/trunk/; revision=34020
2012-05-08 15:31:21 +00:00
Russell O'Connor
812ced356f Updating cssutils.
svn path=/nixpkgs/trunk/; revision=34017
2012-05-08 11:36:04 +00:00
Peter Simons
58c83ceae2 haskell-file-embed: updated to version 0.0.4.3
svn path=/nixpkgs/trunk/; revision=34016
2012-05-08 10:08:16 +00:00
Peter Simons
10e9b46ffb haskell-abstract-par: updated to version 0.3.1
svn path=/nixpkgs/trunk/; revision=34015
2012-05-08 10:08:13 +00:00
Lluís Batlle i Rossell
57397d3331 Updating libraw1394 to 2.0.8.
svn path=/nixpkgs/trunk/; revision=34014
2012-05-08 09:52:16 +00:00
Lluís Batlle i Rossell
97abdd38a5 Adding the Allied Technologies libdc1394 variant and the cc1394 viewer.
svn path=/nixpkgs/trunk/; revision=34013
2012-05-08 09:50:58 +00:00
Lluís Batlle i Rossell
9b2efc0a33 Adding support in VLC for 1394 cameras.
svn path=/nixpkgs/trunk/; revision=34012
2012-05-08 09:49:38 +00:00
Shea Levy
829e78f78f Linux 3.3.5
svn path=/nixpkgs/trunk/; revision=34011
2012-05-07 22:24:35 +00:00
Eelco Dolstra
32649ce94c * libpng 1.5.10, which includes a fix for CVE-2011-3048.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34010
2012-05-07 20:12:53 +00:00
Eelco Dolstra
b5fa2175db * Zlib updated to 1.2.7.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34009
2012-05-07 20:10:50 +00:00
Eelco Dolstra
356ce12cd0 * Python 2.7.3 (including various security fixes).
svn path=/nixpkgs/branches/stdenv-updates/; revision=34008
2012-05-07 20:08:10 +00:00
Eelco Dolstra
ab55de20c1 * GMP 5.0.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34007
2012-05-07 20:03:12 +00:00
Eelco Dolstra
6c36eece34 * Remove the FreeBSD patch. It no longer applies and no longer seems needed.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34006
2012-05-07 19:56:14 +00:00
Michael Raskin
36b543a26e Fixing webserver path..
svn path=/nixpkgs/trunk/; revision=34005
2012-05-07 16:34:58 +00:00
Peter Simons
3a61a44035 Added missing meta.maintainers tags.
svn path=/nixpkgs/trunk/; revision=34004
2012-05-07 09:38:04 +00:00
Peter Simons
acc5a88cdd Updated Haskell packages.
- abstract-deque: added version 0.1.5
 - abstract-par: added version 0.3
 - bits-atomic: added version 0.1.3
 - blaze-builder-conduit: updated to version 0.4.0.2
 - IORefCAS: added version 0.2
 - MemoTrie: updated to version 0.4.12
 - monad-par: added version 0.3
 - monad-par-extras: added version 0.3
 - repa: updated to version 3.1.4.2
 - texmath: updated to version 0.6.0.6

svn path=/nixpkgs/trunk/; revision=34003
2012-05-07 09:36:49 +00:00
Eelco Dolstra
08b6b9fa3a * Cygwin: provide a Perl setup hook so that Perl dependencies work
properly.

svn path=/nixpkgs/trunk/; revision=34002
2012-05-07 02:06:29 +00:00