Commit Graph
53152 Commits
Author SHA1 Message Date
Peter Simons 741bb544dc haskell-stripe: jailbreak to fix build with aeson 0.8.x 2014-08-09 13:49:24 +02:00
Peter Simons eb3df0b687 haskell-digestive-functors-aeson: jailbreak to fix build with aeson 0.8.x 2014-08-09 13:49:23 +02:00
Peter Simons 6892591e4c haskell-ekg: jailbreak to fix build with aeson 0.8.x 2014-08-09 13:49:23 +02:00
Peter Simons 62a3cc460d haskell-engine-io: jailbreak to fix build with aeson 0.8.x 2014-08-09 13:49:23 +02:00
Peter Simons d23bd78244 haskell-haxl: jailbreak to fix build with aeson 0.8.x 2014-08-09 13:49:23 +02:00
Peter Simons 5a48a2bc90 haskell-hoauth2: jailbreak to fix build with aeson 0.8.x 2014-08-09 13:49:23 +02:00
Peter Simons f44346d077 haskell-fay: build with aeson 0.7.x to fix build errors 2014-08-09 13:49:23 +02:00
Peter Simons c00e814202 HaRe: remove broken package until it supports GHC 7.8.3 2014-08-09 13:49:23 +02:00
Peter Simons ad42c60b91 haskell-token-utils: remove broken package until it supports GHC 7.8.3
https://github.com/alanz/haskell-token-utils/issues/1#issuecomment-51681623
2014-08-09 13:49:23 +02:00
Peter Simons 13d7c9b76b haskell-aeson-utils: jailbreak to fix build with aeson 0.8.x
https://github.com/silkapp/aeson-utils/issues/1
2014-08-09 13:49:23 +02:00
Peter Simons 3531038008 haskell-aeson: update to version 0.8.x 2014-08-09 13:49:23 +02:00
Peter Simons 664af8b4dc haskell-twitter-types: update to version 0.4.20140809 2014-08-09 13:49:23 +02:00
Peter Simons b969d7d8b6 haskell-twitter-conduit: update to version 0.0.5.4 2014-08-09 13:49:23 +02:00
Peter Simons 3d141c8b84 haskell-tagsoup: update to version 0.13.2 2014-08-09 13:49:23 +02:00
Peter Simons a1a3eb835e haskell-stringbuilder: update to version 0.5.0 2014-08-09 13:49:23 +02:00
Peter Simons 592302f436 haskell-persistent-template: update to version 1.3.2.2 2014-08-09 13:49:23 +02:00
Peter Simons 3c150866f4 haskell-hspec: update to version 1.11.1 2014-08-09 13:49:23 +02:00
Peter Simons b3fd136c18 haskell-hspec-meta: update to version 1.11.1 2014-08-09 13:49:23 +02:00
Peter Simons c2b620342c haskell-dns: update to version 1.4.2 2014-08-09 13:49:22 +02:00
Peter Simons 3251575925 haskell-criterion: update to version 1.0.0.2 2014-08-09 13:49:22 +02:00
Peter Simons 0288d83a71 haskell-HFuse: update to version 0.2.4.3 2014-08-09 13:49:22 +02:00
Peter Simons 26291a1f85 haskell-CouchDB: re-generate with cabal2nix 2014-08-09 13:49:22 +02:00
Eelco Dolstra a8fc68a5c0 Move share/{man,info,doc} to the corresponding output 2014-08-09 12:47:05 +02:00
Eelco Dolstra 9e31c66d1b stdenv: Put moving docs to $out/share in a separate setup hook 2014-08-09 12:47:05 +02:00
Eelco Dolstra e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Eelco Dolstra 2db867eec9 fixupPhase: Fix making the outputs writable 2014-08-09 12:47:05 +02:00
Eelco Dolstra 11dc9036d0 Allow passing arguments to hooks
This allows envHooks and crossEnvHooks to be handled using the regular
hook mechanism.
2014-08-09 12:47:05 +02:00
Eelco Dolstra 2def8e7499 Remove addHook
Just use bash arrays directly. I.e.

  addHook preConfigure myPreConfigure

is now

  preConfigureHooks+=(myPreConfigure)
2014-08-09 12:45:53 +02:00
Eelco Dolstra e3875297fa stdenv: Don't use sed to build the setup script 2014-08-09 12:45:52 +02:00
Eelco Dolstra be3fc3ae2f Prevent an unnecessary evaluation of lib 2014-08-09 12:45:18 +02:00
Eelco Dolstra cd948c093f stdenv: Reindent 2014-08-09 12:44:50 +02:00
Eelco Dolstra 15103e5e5f stdenv: Remove the special handling of gcc
Now gcc is just another build input, making it possible in the future
to have a stdenv that doesn't depend on a C compiler. This is very
useful on NixOS, since it would allow trivial builders like
writeTextFile to work without pulling in the C compiler.
2014-08-09 12:44:50 +02:00
Eelco Dolstra 9f822e5477 stdenv: Move paxmark function to paxctl's setup hook 2014-08-09 12:44:50 +02:00
Eelco Dolstra d7b356f73b stdenv: Move unzip support to unzip's setup hook 2014-08-09 12:44:50 +02:00
Eelco Dolstra f97ee61255 unzip: Clean up expression 2014-08-09 12:44:49 +02:00
Eelco Dolstra 3e33c975fb stdenv: Make unpackFile extensible via the hook mechanism
unpackCmd is now a regular hook, so there can be multiple functions
hooking into it.
2014-08-09 12:44:49 +02:00
Eelco Dolstra 1a44dbbbb9 unpackFile: Always copy directories
If $src refers to a directory, then always copy it. Previously, we
checked the extension first, so if the directory had an extension like
.tar, unpackPhase would fail.
2014-08-09 12:44:49 +02:00
Eelco Dolstra 5e82aab5d4 Drop redundant space 2014-08-09 12:44:49 +02:00
Eelco Dolstra daa66b8b1c Factor out fixup phase stuff into separate setup hooks 2014-08-09 12:44:49 +02:00
Eelco Dolstra d7a4fa26b0 Fix dontPatchELF being set after the setup script has been sourced 2014-08-09 12:44:49 +02:00
Eelco Dolstra 83a41771ab Move RPATH shrinking from stdenv to a setup hook provided by patchelf 2014-08-09 12:44:49 +02:00
Eelco Dolstra b23dbb1a5d Allow buildInputs to be regular files
If a build input is a regular file, use it as a setup hook. This makes
setup hooks more efficient to create: you don't need a derivation that
copies them to $out/nix-support/setup-hook, instead you can use the
file as is.
2014-08-09 12:44:49 +02:00
Eelco Dolstra 0a8605ded1 Formatting 2014-08-09 12:44:48 +02:00
Eelco Dolstra 37889e2b5e Provide a hook for per-output fixup 2014-08-09 12:44:48 +02:00
Eelco Dolstra b0f2d3419c Allow multiple hooks with the same name
You can now register multiple values per named hook, e.g.

  addHook preConfigure "echo foo"
  addHook preConfigure "echo bar"

will cause ‘runHook preConfigure’ to run both ‘echo foo’ and ‘echo
bar’ (in that order). It will also call the shell function
preConfigure() or eval the shell variable $preConfigure, if
defined. Thus, if you don't call addHook, it works like the old hook
mechanism.

Allowing multiple hooks makes stdenv more modular and extensible. For
instance, multiple setup hooks can define a preFixup hook, and all of
these will be executed.
2014-08-09 12:44:48 +02:00
Eelco Dolstra 18e422d047 blender: Optionally build with CUDA support
This is required for GPU acceleration of the Cycles renderer.
2014-08-09 12:37:46 +02:00
lethalman 7d246d569a Merge pull request #3497 from madjar/nox
Nox: added expression
2014-08-09 12:33:17 +02:00
Luca Bruno b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
Georges Dubus 8de8d5a639 nox: Added expression 2014-08-09 12:30:38 +02:00
Luca Bruno 9300470b5e chicken: broken on darwin 2014-08-09 12:29:27 +02:00