3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

25787 commits

Author SHA1 Message Date
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
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
Peter Simons ff032a34e6 haskell-tagged: update to version 0.6 2013-04-18 17:10:32 +02:00
Peter Simons 870e8b29f4 haskell-hamlet: update to version 1.1.7.1 2013-04-18 17:10:32 +02:00
Peter Simons b4bb955a1a haskell-digestive-functors-heist: update to version 0.6.2.0 2013-04-18 17:10:32 +02:00
Rickard Nilsson 40ac613f85 obnam: Update to 1.4 2013-04-18 16:09:35 +02:00
Peter Simons 4a8492884c pkgs/top-level/release-haskell.nix: re-structure Hydra job set
The new job set has the following structure:

  pkg.ghc762.x86_64-linux  = pkgs_x86_64_linux.haskellPackages_ghc762.pkg;
  pkg.ghc762.i686-linux    = pkgs_i686_linux.haskellPackages_ghc762.pkg;
  pkg.ghc6123.x86_64-linux = pkgs_x86_64_linux.haskellPackages_ghc6123.pkg;
  pkg.ghc6123.i686-linux   = pkgs_i686_linux.haskellPackages_ghc6123.pkg;

This gives us (in theory) the ability to generate a Hydra page that displays
the build status of a package across all versions of GHC and all systems. Right
now, Hydra is not up to it, but Eelco says the feature is "on the todo list".

This file doesn't specify the supported build systems explicitly. Instead, that
information is taken from the respective pkg.meta.platforms attribute.
2013-04-18 12:53:06 +02:00
Vladimír Čunát a40e825474 xorg-server: fix CVE-1940
http://lists.x.org/archives/xorg-devel/2013-April/036014.html
It's a low-priority issue, but it should cause almost no rebuilds.
2013-04-18 12:50:26 +02:00
Peter Simons fd76a89bcb pkgs/build-support/release/nix-build.nix: unconfuse syntax highlighting 2013-04-18 12:18:39 +02:00
Vladimír Čunát 368f1a25fd swiProlog: major update to 6.2.6
However, from news this does *not* seem to be a big change.
2013-04-18 10:29:29 +02:00
Evgeny Egorochkin 70ba1888a2 Make kde 4.8 default. Shouldn't cause too many problems. 2013-04-18 03:12:12 +03:00
Vladimír Čunát c122eb61fb kopete: fix build by using libotr_3_2 again 2013-04-17 19:32:44 +02:00
Sander van der Burg 3f0ee819e2 titaniumsdk: Updated KitchenSink example + fix native libraries 2013-04-17 13:52:42 +02:00
Vladimír Čunát 6ee2cce9ef glxinfo: update the mesa-demos source 2013-04-17 13:36:05 +02:00
Rok Garbas 8ea9b3fbac plone: adding version 4.2.5 and 4.1.6 2013-04-17 02:28:45 +02:00
Rok Garbas 0416e77d82 plone: some versions got pinned wrong 2013-04-17 01:57:40 +02:00
Rok Garbas a690941f21 plone: update to 4.3 2013-04-17 01:27:59 +02:00
Rok Garbas f39f369ff1 pythonPackages.buildout: update to 1.7.1 and also:
- rename to zc_builout* while keeping alias back to buildout (opening ticket
  later to remove it)
- meta: adding zpl licenses
- meta: adding me maintainer
2013-04-17 01:25:45 +02:00
Shea Levy 4a2e18b6ec perlPackages.DBIxClass: Disable tests for now
Tests are broken with latest sqlite, see http://lists.scsys.co.uk/pipermail/dbix-class/2013-April/011271.html

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-16 13:39:41 -04:00
Rok Garbas df76d7f6a9 nodejs: update to 0.8.23 2013-04-16 18:19:16 +02:00
Sander van der Burg 92e089187d titaniumsdk: Removed obsolete src parameter 2013-04-16 16:23:20 +02:00
Lluís Batlle i Rossell cce9e298b8 Changing the source of skype4pidgin
This github fork works fine, while the previous (original) only segfaults.
2013-04-16 14:53:59 +02:00
Lluís Batlle i Rossell 9216b0598c Adding skype4pidgin. It crashes. 2013-04-16 14:53:59 +02:00
Sander van der Burg 1d255f9ab3 titaniumsdk: Added version 3.1 next to version 2.1, and make it configurable 2013-04-16 14:08:37 +02:00
Sander van der Burg c2389fcb9d Bumped DBIxClass to version 0.08210 2013-04-16 12:15:02 +02:00
viric d2d69902e8 Merge pull request #456 from bjornfor/premake
premake: bump to version 4.3
2013-04-15 14:35:46 -07:00