Commit Graph

29319 Commits

Author SHA1 Message Date
joachifm
ff44872c77 Merge pull request #14713 from ericsagnes/fix/libpinyin
libpinyin: move to libraries
2016-04-15 05:50:06 +02:00
aszlig
f5ec09842d
pygame: Fix build with multiple outputs
The config.py script doesn't seem to cope very well with symlinks, so
let's pass it the right derivation outputs wherever possible and fall
back to drv.out.

I've disabled the tests because they somehow now seem to cause the build
to fail even though the tests failed *before* the merge of the
closure-size branch, but the whole build didn't fail regardless.

Here is a build from before the closure-size branch merge:

http://hydra.nixos.org/build/34367296

If you have a look at the build log, you already see a bunch of failing
tests (to be exact: the same set of tests that are failing now with the
fix of the preConfigure phase).

Other than that, the build now succeeds on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:35:11 +02:00
aszlig
f1c2572479
pyqt5: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of pyqt5 override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of pyqt5 and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
96bed5b7aa
signon: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of signon override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of signon and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
f43d8b2336
libkeyfinder: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of libkeyfinder
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of libkeyfinder and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
25382a37e3
accounts-qt: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of accounts-qt
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of accounts-qt and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
ee1af147f3
libcommuni: Fix finding qmake
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path.

As the configurePhase is replaced by a qmake path directly from qtbase,
it won't work because the setup-hook from qtbase needs to do some setup
in order for qmake to find its own data files.

So instead of hardcoding that path, we just go for setting the
configureFlags attribute and replacing which with "type -P" so that the
configure script can figure out the right path to qmake on its own.

This fixes the build of libcommuni and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
2d6ea2cc30
qmltermwidget: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qmltermwidget
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of qmltermwidget and it now successfully compiles
on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Eric Sagnes
c6ec758fe3 libpinyin: move to libraries 2016-04-15 10:22:35 +09:00
aszlig
8779e0f274
qt5.qwt: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qwt override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of qwt and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:29:56 +02:00
aszlig
d663b3df24
qt5.quazip: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of quazip override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of quazip and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:27:21 +02:00
Tobias Geerinckx-Rice
358900674b
webgitgtk 2.12: fix evaluation
Remove reference to unknown maintainer @iyzsong.
2016-04-14 19:57:14 +02:00
Michael Raskin
73fba62fb1 Merge pull request #13545 from bendlas/init-webkitgtk-212
webkitgtk: init at 2.12
2016-04-14 16:37:56 +00:00
Nikolay Amiantov
cd4b76c821 protobuf: split to multiple outputs 2016-04-14 17:30:40 +03:00
Frederik Rietdijk
aedf601bba Merge pull request #14687 from makefu/devpi-client-fix
devpi-client: add missing python libraries
2016-04-14 14:25:21 +02:00
joachifm
19e425fa0c Merge pull request #14447 from mucaho/vscode_unfree
vscode: switch to unfree, binary package
2016-04-14 14:16:43 +02:00
makefu
776ff2e735 devpi-client: add missing python libraries 2016-04-14 14:06:32 +02:00
zimbatm
12e919bb34 Merge pull request #14653 from manveru/bundler-env-frozen
bundler-env: Gemfile.lock is frozen
2016-04-14 10:20:04 +01:00
Peter Simons
232d843c8a haskell-src-exts: test suite fails when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
70f396fa48 haskell-generic-deriving: build fails Haddock phase with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
2be16386b5 haskell-lens: use latest version when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
d98a8f88d0 haskell-kan-extensions: use version 5.x when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
3babe992f9 haskell-semigroupoids: doctest suite won't build with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
15d7b7da10 haskell-bifunctors: use latest version 5.3 when compiling with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Anthony Cowley
3f845da22a haskell-modules: darwin configuration-common
- Reconfigure OpenGL/CL related packages to propagate the necessary
  framework dependencies.

- Disable tests on all versions of c2hs so package sets such as LTS
  releases work.

Closes https://github.com/NixOS/nixpkgs/pull/14609.
2016-04-14 09:17:55 +02:00
Peter Simons
2422ae0838 ghc: update 8.0.x pre-release from rc2 to rc3 2016-04-14 09:17:55 +02:00
Peter Simons
8a12018821 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-1-ge7059e3 using the following inputs:

  - Hackage: 4d5f229e9e
  - LTS Haskell: 924977cc28
  - Stackage Nightly: 0002f21766
2016-04-14 09:17:55 +02:00
Peter Simons
c7a4de7717 configuration-hackage2nix.yaml: update list of broken builds 2016-04-14 09:17:55 +02:00
Tuomas Tynkkynen
66de416b7a treewide: Mass replace 'hunspell}/bin' to refer to the correct outputs 2016-04-14 08:32:20 +03:00
Tuomas Tynkkynen
794f07d4e4 treewide: Mass replace 'binutils}/bin' to refer to the correct outputs 2016-04-14 08:32:20 +03:00
Tuomas Tynkkynen
f34655e28c openssl-chacha: Split into multiple outputs
Mainly done because of this in all-packages.nix:
````
  cipherscan = callPackage ../tools/security/cipherscan {
    openssl = if stdenv.system == "x86_64-linux"
      then openssl-chacha
      else openssl;
  };
````
... and inside cipherscan we want to refer to `openssl.bin`
2016-04-14 08:32:20 +03:00
Tobias Geerinckx-Rice
994c9b7487
flexcpp: 2.04.00 -> 2.05.00 2016-04-14 02:37:53 +02:00
Nikolay Amiantov
6f3e72eef6 Merge pull request #14658 from abbradar/search-path-fixes
Search path fixes
2016-04-14 03:08:41 +04:00
Arseniy Seroka
0420a532e9 Merge pull request #14649 from vbgl/coq_8.5.1
Coq 8.5pl1
2016-04-13 22:16:48 +03:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Herwig Hochleitner
6bb9ca5057 webkitgtk: init at 2.12.0
this has the b3 jit activated
2016-04-13 20:44:59 +02:00
Michael Raskin
be90eb047c glfw3: apparently fix the build 2016-04-13 18:52:37 +02:00
Michael Raskin
cd5b677576 gcc49 (gcj): do not create separate lib output (cyclical dependency), fix ecj1 linking. Does not affect the hash of normal gcc49 2016-04-13 18:46:14 +02:00
Michael Raskin
14b8bdc01f julia: fix library path management after multiple-outputs/closure-size merge 2016-04-13 18:46:14 +02:00
Michael Raskin
238cb743bc scons: 2.4.1 -> 2.5.0 2016-04-13 14:47:04 +02:00
Michael Raskin
a9b9c8c23b libgphoto2: 2.5.9 -> 2.5.10 2016-04-13 14:47:04 +02:00
Michael Raskin
7c0f4882f3 angelscript: 2.30.2 -> 2.31.0 2016-04-13 14:47:04 +02:00
Michael Fellinger
fe87240e68 bundler-env: Gemfile.lock is frozen 2016-04-13 11:25:41 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Tuomas Tynkkynen
9bc67ca5c9 Merge pull request #14620 from nico202/ispike
iSpike: init at 2.1
2016-04-13 07:21:16 +03:00
Nikolay Amiantov
53ae67fddd openscenegraph: add withApps flag 2016-04-13 04:35:33 +03:00
Tuomas Tynkkynen
a9ce4b0884 libdvdcss: Don't build on Darwin
http://hydra.nixos.org/build/34377524/nixlog/1/raw

While at it, add a license.
2016-04-13 04:17:34 +03:00
Tuomas Tynkkynen
ba59be833b sunxi-tools: Don't build on darwin
http://hydra.nixos.org/build/34390183/nixlog/1/raw

While at it, use fetchFromGitHub.
2016-04-13 04:06:15 +03:00
Alexey Shmalko
e870ac3044 gcc-arm-embedded: 4.9 -> 5.2
Seems that GCC ARM Embedded have changed convention for file location,
and version 5.2 isn't accessible from the predicted url. That's why
nix-expression is updated to allow overloading url parts.
2016-04-13 03:07:05 +03:00
Shea Levy
2274d7e96e Merge branch 'chromedriver221' of git://github.com/NeQuissimus/nixpkgs 2016-04-12 16:47:49 -04:00