1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
Commit graph

25466 commits

Author SHA1 Message Date
Peter Simons 431b774cc0 ghc: greatly simplify the GHC compiler wrapper
The wrapper script accumulated some cruft over the last couple of months
because we did changes in freaky ways to avoid triggering re-builds of all
Haskell packages. Most of these kludges have been thrown out now.

This patch doesn't change the behavior of the wrapper except for one thing: the
internal helper scripts "ghc-get-packages.sh" and "ghc-packages.sh" are no
longer installed in the bin directory of the generated derivation.
2013-04-20 23:28:53 +02:00
Peter Simons 4dd05a51ed ghc-binary: don't refer to /bin/sh 2013-04-20 23:28:11 +02:00
Peter Simons 2ffd0b6dac Merge changes from branch 'origin/master' into stdenv-updates. 2013-04-20 22:19:39 +02:00
Patrick John Wheeler 3bf0d2b960 ghc-wrapper: install the GHC documentation into the user's profile
The freaky implementation was done that way in order to avoid unnecessary
re-builds of all Haskell packages by changing the wrapper script used
internally in those builds.

See <https://github.com/NixOS/nixpkgs/pull/466> for further details.
2013-04-20 22:14:44 +02:00
Peter Simons 65b95b159e haskell-checkers: add version 0.3.1 2013-04-20 20:36:57 +02:00
Peter Simons 7dd399abc1 haskell-wai-handler-launch: add version 1.3.1.4 2013-04-20 20:21:38 +02:00
Peter Simons 916aa90491 haskell-pretty-show: add old version 1.2, which still builds fine with GHC 7.0.4 2013-04-20 20:16:27 +02:00
Peter Simons 0345b1df70 haskell-shakespeare: patch to fix build with GHC 7.0.4 2013-04-20 20:16:27 +02:00
Peter Simons b6e3a8dd08 haskell-zeromq3-haskell: update to version 0.3.1 2013-04-20 20:16:27 +02:00
Peter Simons 12b94d549f haskell-fclabels: update to version 1.1.6 2013-04-20 20:16:26 +02:00
Peter Simons f61dcf8777 Merge pull request #472 from bjornfor/git
git: fix gitweb.cgi runtime dependency on gzip
2013-04-20 10:00:27 -07:00
Peter Simons 2b56b020c7 alex, happy: fix build for gcc 4.8.0
Alex and happy use CPP to generate some internal template files, but the code
is unprepared for the output from CPP 4.8.0, which generates LINE pragmas that
contain more information than they thought it would.
2013-04-20 18:15:57 +02:00
cillianderoiste 96e8703be0 Merge pull request #460 from cillianderoiste/plymouth
It works enough to display bootsplash animations in an xorg session and a VT.

I haven't figured out how to run it successfully from the initrd yet and I'm also not happy with the postInstall mess, but I'd rather merge it now than let it get lost. It seems like it should be possible for a user to activate it by using boot.initrd.extraUtilsCommands and boot.initrd.postMountCommands
2013-04-20 08:07:30 -07:00
David Guibert 81b78fe31a Merge pull request #451 from jcumming/zfs.130328
zfs-0.6.1. spl-0.6.1
2013-04-20 06:27:19 -07:00
Vladimír Čunát 7a25aa94cd gphoto*: update for changed libgphoto version 2013-04-20 12:44:05 +02:00
Vladimír Čunát 3da96b38cd Merge pull request #465 from bjornfor/eclipse
eclipse: add Eclipse IDE for C/C++ Developers 4.2
2013-04-20 01:38:39 -07:00
Vladimír Čunát e8823c9e5e Merge pull request #441 from ierton/udisks2-xfce
udisks2 for xfce
2013-04-20 01:37:14 -07:00
Vladimír Čunát 1c22316af6 Merge pull request #429 from ierton/wicd-fixes
wicd: some fixes
2013-04-20 01:32:29 -07:00
Vladimír Čunát 1b349b06d8 itstool: update 2013-04-20 10:25:24 +02:00
Bjørn Forsman 88f1e643e3 git: fix gitweb.cgi runtime dependency on gzip
gitweb.cgi uses gzip for creating "snapshots". Without this patch it
doesn't work.
2013-04-19 22:32:51 +02:00
Peter Simons be6457fd2c haskell-socks: update to version 0.5.1 2013-04-19 18:53:20 +02:00
Peter Simons ee45b50eb2 haskell-data-inttrie: update to version 0.1.0 2013-04-19 18:53:20 +02:00
Shea Levy da84bc4a89 rabbitmq-server: Put files in $HOME by default
Before, files were put in /var, requiring the server to be run as a
privileged user even when just testing locally. This can be overridden
by setting the SYS_PREFIX env variable, or on a more coarse-grained
basis in /etc/rabbitmq/rabbitmq-env.conf

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-19 10:46:31 -04:00
Mathijs Kwik 61b65080d9 linux-3.0: upgrade to 3.0.74 2013-04-19 14:53:00 +02:00
Mathijs Kwik 384de84023 linux-3.4: upgrade to 3.4.41 2013-04-19 14:53:00 +02:00
Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
Peter Simons b6c7c4a142 haskell-acid-state, haskell-safecopy: cosmetic updates by hackage4nix 2013-04-19 10:47:36 +02:00
Peter Simons 00ed85ec25 release-haskell.nix: optparse-applicative won't build with ghc 6.10.4 because it needs a newer version of Cabal 2013-04-19 10:46:18 +02:00
Peter Simons 98130c0b35 release-haskell.nix: build jailbreakCabal with all available compilers 2013-04-19 10:46:18 +02:00
Peter Simons 6f1cec9acb haskell-packages.nix: fix the implementation of 'cabalNoTest'
The previous implementation used the following tying-the-knot trickery to
override 'doCheck' to false for the given build:

  cabalNoTest = {
    mkDerivation = x: rec {
      final = self.cabal.mkDerivation (self: (x final) // { doCheck = false; });
    }.final;
  };

That seemed to work, but for some reason it caused trouble with some builds --
not all -- that use jailbreakCabal. The problem was the 'stdenv' attribute
couldn't be evaluated properly anymore:

  $ nix-build ~/pkgs/top-level/release-haskell.nix -A optparseApplicative.ghc6104.x86_64-linux --show-trace
  error: while evaluating the attribute `drvPath' at `/nix/store/qkj5cxknwspz8ak0ganm97zfr2bhksgn-nix-1.5.2pre3082_2398417/share/nix/corepkgs/derivation.nix:19:9':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `haskell-optparse-applicative-ghc6.10.4-0.5.2.1' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:40:13':
  while evaluating the derivation attribute `configurePhase' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:107:13':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/strings.nix:55:26':
  while evaluating the attribute `outPath' at `/nix/store/qkj5cxknwspz8ak0ganm97zfr2bhksgn-nix-1.5.2pre3082_2398417/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `jailbreak-cabal-1.1' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:40:13':
  while evaluating the derivation attribute `nativeBuildInputs' at `/home/simons/.nix-defexpr/pkgs/stdenv/generic/default.nix:76:17':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/lists.nix:135:21':
  while evaluating the attribute `buildInputs' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:22:17':
  while evaluating the builtin function `filter':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:22:60':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:119:17':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/customisation.nix:61:22':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/customisation.nix:56:24':
  while evaluating the builtin function `isAttrs':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/development/libraries/haskell/Cabal/1.14.0.nix:1:1':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:113:20':
  while evaluating the attribute `final' at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:114:7':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:9:5':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/stdenv/generic/default.nix:51:24':
  while evaluating the attribute `meta.license' at `/home/simons/.nix-defexpr/pkgs/development/libraries/haskell/Cabal/1.14.0.nix:17:5':
  infinite recursion encountered

I tried to figure out why this happens, but eventually gave up. The new
implementation passes an argument called 'enableCheckPhase' to the Cabal
builder, which determines whether the user-specified doCheck value has any
effect or not. Now, a normal override can be used to disable unit testing.
2013-04-19 10:46:18 +02:00
Peter Simons 67acbf8f37 release-haskell.nix: generate properly nested attribute sets to fix evaluation with nix-build 2013-04-19 10:46:18 +02:00
Peter Simons 49cbf42556 release-haskell.nix: build optparse-applicative with all available GHC versions 2013-04-19 10:46:18 +02:00
Peter Simons a012f18820 haskell-optparse-applicative: jailbreak to fix the build with GHC 7.0.4 2013-04-19 10:46:18 +02:00
Rickard Nilsson 6e8404a7cb New Haskell library: haskell-acid-state 2013-04-19 07:09:12 +02:00
Rickard Nilsson 8a3f6e8e76 New Haskell library: haskell-safecopy 2013-04-19 07:07:44 +02:00
Rob Vermaas a24458c219 Update oracle jdk to 1.6.0_45b06 2013-04-18 20:18:09 +02:00
Michael Raskin 181fb52b14 Update Linux 3.8 2013-04-18 19:22:54 +04:00
Michael Raskin 873fa411b0 Update Linux 3.9rc 2013-04-18 19:22:54 +04:00
Peter Simons d17f66b39b haskell-snap: jailbreak to fix build with 'hashable' and 'tagged' 2013-04-18 17:10:33 +02:00
Peter Simons 5374c7ca31 haskell-haskeline: fix build with GHC 7.0.x 2013-04-18 17:10:33 +02:00
Peter Simons ca70807262 haskell-skein: jailbreak to support current version of 'tagged' 2013-04-18 17:10:33 +02:00
Peter Simons 907afc0938 haskell-wai-test: update to version 1.3.1 2013-04-18 17:10:33 +02:00
Peter Simons 3c3b5b6199 haskell-statistics: update to version 0.10.3.1 2013-04-18 17:10:33 +02:00
Peter Simons c1147811f9 haskell-fsnotify: update to version 0.0.8 2013-04-18 17:10:32 +02:00
Peter Simons 2b37a87a57 haskell-snap: update to version 0.11.2.2 2013-04-18 17:10:32 +02:00
Peter Simons 9ab1e2c0ac haskell-skein: update to version 1.0.1 2013-04-18 17:10:32 +02:00
Peter Simons 6f393fe124 haskell-semigroups: update to version 0.9.1 2013-04-18 17:10:32 +02:00
Peter Simons 2973f64e09 haskell-ghc-vis: update to version 0.6.1.1 2013-04-18 17:10:32 +02:00
Peter Simons 2c69610190 haskell-certificate: jailbreak to support current version of crypto-pubkey-types 2013-04-18 17:10:32 +02:00
Peter Simons ad878ab15f haskell-crypto-api: jailbreak to support current version of tagged 2013-04-18 17:10:32 +02:00