Commit graph

19519 commits

Author SHA1 Message Date
Marco Maggesi
b734682fb4 Fix openafs hash
svn path=/nixpkgs/trunk/; revision=34118
2012-05-15 19:36:39 +00:00
Cillian de Roiste
e9548cc845 Upgrading default erlang to R15 and keeping R14 as an older option, removing extra random older versions. I assume they are not of interest.
svn path=/nixpkgs/trunk/; revision=34117
2012-05-15 17:57:50 +00:00
Cillian de Roiste
a5d77fcf2b Updating erlange to R14B04
svn path=/nixpkgs/trunk/; revision=34116
2012-05-15 17:54:05 +00:00
Marco Maggesi
68d2c3d70f Blind attempt to update OpenAFS to version 1.6.1
svn path=/nixpkgs/trunk/; revision=34115
2012-05-15 17:31:53 +00:00
Eelco Dolstra
fb23d3a515 * Mark sqlite and sqliteFull as low priority (as opposed to
sqliteInteractive).

svn path=/nixpkgs/trunk/; revision=34112
2012-05-15 16:08:10 +00:00
Eelco Dolstra
a3fe6bd059 * Samba 3.6.5 (fixes CVE-2012-2111).
svn path=/nixpkgs/trunk/; revision=34111
2012-05-15 15:40:20 +00:00
Eelco Dolstra
13bcdc5f33 * Fix building the tarball in a chroot.
svn path=/nixpkgs/trunk/; revision=34110
2012-05-15 14:37:24 +00:00
Rickard Nilsson
c12005ef56 spotify 0.8.3.278.
svn path=/nixpkgs/trunk/; revision=34109
2012-05-15 14:31:43 +00:00
Rickard Nilsson
ec996106ec tftp-hpa 5.2.
svn path=/nixpkgs/trunk/; revision=34108
2012-05-15 14:25:14 +00:00
Rickard Nilsson
ea74e1ea6d lighttpd 1.4.30.
svn path=/nixpkgs/trunk/; revision=34107
2012-05-15 14:14:33 +00:00
Rickard Nilsson
c7ab74bacc lsof 4.86.
svn path=/nixpkgs/trunk/; revision=34106
2012-05-15 14:09:15 +00:00
Rickard Nilsson
00b9523bbb Added IP_PNP_DHCP to the SheevaPlug kernel configuration.
This allows the SheevaPlug to set up the network automatically with
DHCP, if the "ip=dhcp" kernel option is set.

svn path=/nixpkgs/trunk/; revision=34105
2012-05-15 14:00:21 +00:00
Rickard Nilsson
3e2a3f5d09 Added ZRAM module support to the SheevaPlug kernel.
svn path=/nixpkgs/trunk/; revision=34104
2012-05-15 13:51:03 +00:00
Peter Simons
201bdca962 Updated Haskell packages.
- cryptocipher: updated to version 0.3.2
 - Crypto: updated to version 4.2.5
 - darcs: updated to version 2.8.1
 - hamlet: updated to version 1.0.1.3
 - monad-par-extras: updated to version 0.3.2
 - persistent-template: updated to version 0.9.0.2
 - pool-conduit: updated to version 0.1.0.2
 - shakespeare-css: updated to version 1.0.1.2
 - shakespeare-i18n: updated to version 1.0.0.2
 - shakespeare-js: updated to version 1.0.0.2
 - shakespeare-text: updated to version 1.0.0.2
 - shakespeare: updated to version 1.0.0.2
 - warp: updated to version 1.2.1
 - wxcore: updated to version 0.90.0.1
 - wxc: updated to version 0.90.0.3
 - wx: updated to version 0.90.0.1
 - xml-conduit: updated to version 0.7.0.3
 - xss-sanitize: updated to version 0.3.2
 - yesod-auth: updated to version 1.0.2.1
 - yesod-core: updated to version 1.0.1.2
 - yesod-default: updated to version 1.0.1.1
 - yesod-form: updated to version 1.0.0.4
 - yesod-json: updated to version 1.0.0.1
 - yesod-persistent: updated to version 1.0.0.1
 - yesod-routes: updated to version 1.0.1.2
 - yesod-static: updated to version 1.0.0.2
 - yesod: updated to version 1.0.1.6

svn path=/nixpkgs/trunk/; revision=34102
2012-05-15 11:50:48 +00:00
Marco Maggesi
ebb486baf8 Typo
svn path=/nixpkgs/trunk/; revision=34100
2012-05-15 06:52:38 +00:00
Marco Maggesi
003d844aaf Removed dead code
svn path=/nixpkgs/trunk/; revision=34099
2012-05-15 06:30:58 +00:00
Marco Maggesi
4d90c6b835 Add assertion: BLCR do not build on recent kernels
svn path=/nixpkgs/trunk/; revision=34098
2012-05-15 06:28:14 +00:00
Eelco Dolstra
7a6887fc8a * Cryptsetup updated to 1.4.2.
svn path=/nixpkgs/trunk/; revision=34090
2012-05-14 20:27:55 +00:00
Andres Löh
c601a302c7 Restructured Haskell packages a bit.
* There's a new file called haskell-defaults.nix.
   * The new file contains:

         - Default package version settings for each compiler version.
         - All the stuff that previously still was in all-packages.nix.

   * A relatively small part is left in all-packages.nix.

svn path=/nixpkgs/trunk/; revision=34088
2012-05-14 13:09:05 +00:00
Peter Simons
13a10c3e54 Updated Haskell packages.
- authenticate: updated to version 1.2.1.1
 - blaze-html: added version 0.5.0.0 (unused right now because happstack can't deal with it)
 - BNFC-meta: updated to version 0.3.0.2
 - graphviz: patched build to succeed with transformers 0.3.x
 - haskeline: updated to version 0.6.4.7
 - http-conduit: updated to version 1.4.1.3
 - numeric-prelude: updated to version 0.3.0.2
 - pandoc: updated to version 1.9.3

svn path=/nixpkgs/trunk/; revision=34087
2012-05-14 09:56:52 +00:00
Eelco Dolstra
069604730b * Work around some problems in tarball checks. Nix wants to open the
DB even in read-only mode.  Should probably fix that.  Also, "or" no
  longer works like this because it's a keyword now.

svn path=/nixpkgs/trunk/; revision=34079
2012-05-13 19:10:57 +00:00
Eelco Dolstra
500c46b56b * Update AEFS.
svn path=/nixpkgs/trunk/; revision=34078
2012-05-13 00:47:58 +00:00
Eelco Dolstra
5749281c0c * nzbget updated to 0.8.0.
svn path=/nixpkgs/trunk/; revision=34077
2012-05-12 23:11:18 +00:00
Eelco Dolstra
627f3574a6 * sshfs updated to 2.4.
svn path=/nixpkgs/trunk/; revision=34076
2012-05-12 23:11:00 +00:00
Russell O'Connor
bc43657f1e Updating calibre to 0.8.51
svn path=/nixpkgs/trunk/; revision=34075
2012-05-12 20:56:47 +00:00
Russell O'Connor
ff1fa88e3d Adding pdftohtml to the PATH for calibre.
svn path=/nixpkgs/trunk/; revision=34074
2012-05-12 20:34:01 +00:00
Eelco Dolstra
da01b6db17 * Linux 3.2.17.
svn path=/nixpkgs/trunk/; revision=34073
2012-05-12 19:55:39 +00:00
Eelco Dolstra
42ac6a45aa * FUSE updated to 2.8.7.
svn path=/nixpkgs/trunk/; revision=34072
2012-05-12 19:46:07 +00:00
Eelco Dolstra
7c1612d6f2 * svn2git -> svn2git-kde to distinguish it from the other svn2git.
svn path=/nixpkgs/trunk/; revision=34071
2012-05-12 19:45:55 +00:00
Shea Levy
b64a1dac46 Linux 3.3.6
svn path=/nixpkgs/trunk/; revision=34070
2012-05-12 17:50:19 +00:00
Eelco Dolstra
8a5d68220a * Nix 1.0.
svn path=/nixpkgs/trunk/; revision=34068
2012-05-12 04:20:26 +00:00
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