x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.
I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
I missed this while checking the commit diffs before my last push. And it really
doesn't make sense to propagate ruby all the way up to whatever in the universe
may depend on this package.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.
During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
- 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
- alternative-io: updated to version 0.0.1
- blaze-markup: added version 0.5.1.0
- crypto-conduit: updated to version 0.3.2
- cryptohash: updated to version 0.7.5
- darcs: updated to version 2.8.0
- filestore: updated to version 0.4.2
- Graphalyze: cosmetic change
- hamlet: updated to version 1.0.1.1
- happstack-hamlet: updated to version 7.0.1
- happstack-server: updated to version 7.0.1
- HFuse: updated to version 0.2.4.1
- Hipmunk: updated to version 5.2.0.8
- language-javascript: updated to version 0.5.2
- libmpd: updated to version 0.8.0
- lifted-base: updated to version 0.1.0.4
- monad-control: updated to version 0.3.1.2
- persistent: updated to version 0.9.0.3
- regex-compat: use latest version when building with GHC 7.4.1
- skein: updated to version 0.1.0.7
- snap-core: updated to version 0.8.1
- snap-server: updated to version 0.8.1.1
- tls: updated to version 0.9.5
- vty: updated to version 4.7.0.12
- wai-app-static: updated to version 1.2.0.2
- yesod-core: updated to version 1.0.1.1
svn path=/nixpkgs/trunk/; revision=33889
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.
svn path=/nixpkgs/trunk/; revision=33392
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.
svn path=/nixpkgs/trunk/; revision=32819
