- 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
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
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
- 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
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
- 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
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
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
- 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
