Commit graph

25690 commits

Author SHA1 Message Date
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Shea Levy f8f9f3b1cc binutils_gold: Don't require unneded dependencies.
Based on my scan of the logs they weren't even used when enabled

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 18:05:45 -04:00
Shea Levy 88864e331a Try to fix the tarball.
stdenv.gcc.gcc might be null, e.g. on ppc-linux

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 17:30:04 -04:00
Domen Kozar b5241215b1 cython: set platforms 2013-05-04 22:20:27 +02:00
Shea Levy c4edee4d39 clang: Pass the real gcc install prefix
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 15:18:37 -04:00
Domen Kozar 301d2e5431 ncdu: set platforms 2013-05-04 20:34:15 +02:00
Domen Kozar d74eece6df libevent: set platforms 2013-05-04 20:29:16 +02:00
Lluís Batlle i Rossell a5adbf19a6 filegive: fixing licence, adding maintainer 2013-05-04 10:08:52 +04:00
Lluís Batlle i Rossell 5465a118e1 filegive: update to 0.5.1
nat-pmp, fixed upnp bugs, ...
2013-05-04 01:04:17 +04:00
Phreedom 5603d11da8 Merge pull request #482 from coroa/notmuch-gpg2
notmuch: patch source to use full path of gpg2
2013-05-03 11:34:29 -07:00
Phreedom c3f34e54a1 Merge pull request #381 from ierton/bluez5
bluez5: add experimental expression for bluez5
2013-05-03 10:54:39 -07:00
Peter Simons 304feb380c haskell-authenticate-oauth: jailbreak to support crypto-pubkey-types 0.3.x 2013-05-03 16:36:23 +02:00
Evgeny Egorochkin 7636315648 Phonon GStreamer backend bugfix version bump 2013-05-03 16:59:14 +03:00
Shea Levy 6b0e94a516 overrideDerivation: Re-attatch passthru and meta to all outputs
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-03 09:12:55 -04:00
Shea Levy c2b1ca0296 Revert "Revert "overrideDerivation: Simplify""
Now that `drv.passthru' actually is meaningful, this works.

This reverts commit d21bfddc57.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-03 09:09:58 -04:00
Shea Levy 84fba68006 mkDerivation: Allow direct access to passthru
Before this, the passthru attributes were only merged in with the
derivation attribute set, and there was no way to distinguish after the
fact which attributes were part of the derivation and which came from
passthru. Now passthru can be looked at separately as well.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-03 09:07:42 -04:00
Eelco Dolstra 1073187f78 Add Ubuntu 13.04 2013-05-03 14:01:32 +02:00
Eelco Dolstra 233aca358f checkinstall: Fix build on i686-linux
http://hydra.nixos.org/build/4844549
2013-05-03 13:43:47 +02:00
Eelco Dolstra d21bfddc57 Revert "overrideDerivation: Simplify"
This reverts commit 6640000cb7, which
caused passthru attributes not to be passed correctly after calling
overrideDerivation.  E.g. in the evaluation of the Nix jobset:

at `deb_ubuntu1004i386' [officialRelease = false, nix = ...]:
attribute `fullName' missing
2013-05-03 11:50:39 +02:00
Peter Simons 7b868bbff4 git-annex: update to version 4.20130501 2013-05-03 11:38:58 +02:00
Peter Simons a0ec8bd020 haskell-cgi: downgrade to version 3001.1.7.5 in GHC 7.6.x
The next Haskell Platform will contain this fairly old version, because
3001.1.8.4 depends on monad-catchio, which is not part of HP.
2013-05-03 11:38:57 +02:00
Peter Simons 05f4568340 haskell-snap: update to version 0.11.3.1 2013-05-03 11:38:57 +02:00
Peter Simons 0b946a6374 haddock: update to version 2.13.2 2013-05-03 11:38:57 +02:00
Peter Simons c0eca109ed haskell-text: update to version 0.11.3.1 2013-05-03 11:38:56 +02:00
Peter Simons e39f1607c9 haskell-snap: jailbreak to support current version of hashable 2013-05-03 11:38:56 +02:00
Peter Simons 98dae954cf haskell-vector-binary-instances: add version 0.2.1.0 2013-05-03 11:38:56 +02:00
Peter Simons 14660eb7e5 haskell-hashable: update to version 1.2.0.7 2013-05-03 11:38:55 +02:00
Peter Simons cb842f9717 haskell-snap: update to version 0.11.3 2013-05-03 11:38:55 +02:00
Peter Simons 8f10a42a32 haskell-reflection: update to version 1.3.1 2013-05-03 11:38:55 +02:00
Peter Simons 074955e2bd haskell-hledger: update to version 0.20 2013-05-03 11:38:54 +02:00
Peter Simons 67aa6b1641 haskell-hledger-web: update to version 0.20 2013-05-03 11:38:54 +02:00
Peter Simons 73c2481889 haskell-hledger-lib: update to version 0.20 2013-05-03 11:38:53 +02:00
Peter Simons 5d6b71b2ff haskell-binary: update to version 0.7.1.0 2013-05-03 11:38:53 +02:00
Peter Simons 3ec2ddf685 haskell-asn1-types: update to version 0.1.3 2013-05-03 11:38:53 +02:00
Peter Simons cd0b4ebcac haskell-DAV: update to version 0.4.1 2013-05-03 11:38:52 +02:00
Peter Simons ddbcefd927 haskell-hledger-interest: update to version 1.4.3 2013-05-03 11:38:52 +02:00
Peter Simons 9fd0479f32 haskell-yaml: update to version 0.8.2.4 2013-05-03 11:38:51 +02:00
Peter Simons 73db2859d7 haskell-uuid: update to version 1.2.12 2013-05-03 11:38:51 +02:00
Peter Simons dc52f9b8a1 haskell-skein: update to version 1.0.3 2013-05-03 11:38:50 +02:00
Peter Simons e658070162 haskell-reflection: update to version 1.3 2013-05-03 11:38:50 +02:00
Peter Simons 8b99593f18 haskell-pool-conduit: update to version 0.1.2 2013-05-03 11:38:49 +02:00
Peter Simons 842459b22b haskell-ghc-vis: update to version 0.7.0.1 2013-05-03 11:38:49 +02:00
Peter Simons 9e28ed89d1 haskell-cryptocipher: update to version 0.5.0 2013-05-03 11:38:49 +02:00
Peter Simons ee291973cf haskell-crypto-pubkey: update to version 0.1.3 2013-05-03 11:38:48 +02:00
Peter Simons 6dc8a1158f haskell-crypto-pubkey-types: update to version 0.3.2 2013-05-03 11:38:48 +02:00
Peter Simons 319fc22b7c haskell-conduit: update to version 1.0.5 2013-05-03 11:38:48 +02:00
Peter Simons 6c9c18833f haskell-certificate: update to version 1.3.7 2013-05-03 11:38:47 +02:00
Peter Simons a6deed86c1 haskell-basic-prelude: update to version 0.3.5.0 2013-05-03 11:38:47 +02:00
Peter Simons 1399445d59 haskell-DAV: update to version 0.4 2013-05-03 11:38:47 +02:00
Moritz Ulrich 24466df152 Update isync to 1.0.6 2013-05-03 11:03:49 +02:00