Commit Graph
37780 Commits
Author SHA1 Message Date
Vladimír Čunát 2af19df364 Merge branch 'master' into staging 2016-01-25 10:02:25 +01:00
Jude Taylor c473bea69a Merge pull request #12603 from zimbatm/ruby-fixes
Ruby fixes
2016-01-24 22:48:14 -08:00
Tobias Geerinckx-Rice c5bb4f503b libconfuse: init at 2.8 2016-01-25 02:48:27 +01:00
zimbatm e9eda43928 buildRubyGem: fix missing libobjc in darwin
This was preventing any ruby gem with a c extension to build.

mkmf would fail with a misleading error:

    /nix/store/dmkcai8fnv21qxiasx628nim3mq4r4wg-ruby-2.2.3-p0/lib/ruby/2.2.0/mkmf.rb:456:in `try_do': The compiler failed to generate an executable file. (RuntimeError)
    You have to install development tools first.
2016-01-24 23:15:40 +00:00
zimbatm 9a55295c49 buildRubyGem: fix NoMethodError
generate_stub doesn't exist and the output is not used in the code so I just
removed the line.

This was preventing the binstubs from generating properly.
2016-01-24 23:14:00 +00:00
Charles Strahan 95d892ec26 ghcjs: update and fix ghcjs/reflex libs
Set dontStrip when building ghcjs libs, which fixes the ghcjs-dom lib
and also makes the logs cleaner.
2016-01-24 17:13:45 -05:00
Tobias Geerinckx-Rice 7a853f828d fontconfig-ultimate: 20141123 -> 2015-12-06 2016-01-24 21:14:52 +01:00
Arseniy Seroka d6d22151fa Merge pull request #12588 from dezgeg/pr-binutils-platforms
binutils: Add platforms
2016-01-24 23:12:14 +03:00
Peter Simons afba955d21 Merge pull request #12598 from cstrahan/haskell-post-patch
haskell-packages: properly set postPatch
2016-01-24 21:06:52 +01:00
Tobias Geerinckx-Rice 76b2ffbb08 Merge pull request #12587 from timbertson/gup
gup: 0.5.1 -> 0.5.3
2016-01-24 20:48:38 +01:00
Tobias Geerinckx-Rice 3e0e641743 freetype: 2.5.4 -> 2.6.2 2016-01-24 20:39:42 +01:00
Eric Seidel dd6d4ca8cc racket: change meta.platorms to unix 2016-01-24 11:33:34 -08:00
Tobias Geerinckx-Rice d39f16fee6 pythonPackages.pelican: fix tests with Pygments 2.1
Broken in 38c83e2916.
I'll open an upstream PR with this patch as well.
2016-01-24 19:43:54 +01:00
Charles Strahan 4fd985b9ae haskell-packages: properly set postPatch
The existing code overrode the postPatch, instead of combining the
jailbreak commands with the user supplied postPatch.
2016-01-24 13:32:56 -05:00
Charles Strahan 700e4aebdc ghcjs: fix the build 2016-01-24 13:28:24 -05:00
Frederik Rietdijk 9441311e93 pythonPackages.pylint: 1.4.1 -> 1.5.4 2016-01-24 14:34:06 +01:00
Frederik Rietdijk e0d0f8dbd2 pythonPackages.setuptools and bootstrapped-pip: 18.2 -> 19.4
Update to latest setuptools. Latest setuptools will always try to run tests.
This can cause some very vague errors. We now need to fix all packages where we do not
invoke the correct test runner.
2016-01-24 14:34:01 +01:00
Nikolay Amiantov 9b980baa9d bundlerEnv.wrapper: rename to wrappedRuby 2016-01-24 15:59:31 +03:00
Edward Tjörnhammar e8cc9204a8 Merge pull request #12568 from gebner/idea-openjdk8
idea: fix problems with openjdk8
2016-01-24 10:29:54 +01:00
Tuomas Tynkkynen ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen d91c7347d1 treewide: Mass replace 'openssl}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 2258aecaa5 treewide: Mass replace 'nss}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 8eb5d7d037 treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 555292017e treewide: Mass replace 'xorg.libXft}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Tuomas Tynkkynen 5d52f55426 treewide: Mass replace 'xorg.libX11}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Tuomas Tynkkynen 91b40bd9d2 treewide: Mass replace 'libusb}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Tuomas Tynkkynen 69498299dd treewide: Mass replace 'libusb1}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Tuomas Tynkkynen df8495fb18 treewide: Mass replace 'gmp}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tuomas Tynkkynen a1909d7380 treewide: Mass replace 'glibc}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tuomas Tynkkynen 51bf60b33e treewide: Mass replace 'bzip2}/lib' to refer the 'out' output 2016-01-24 10:03:33 +02:00
Tuomas Tynkkynen d005808127 treewide: Mass replace 'boehmgc}/lib' to refer the 'out' output 2016-01-24 10:03:33 +02:00
Tuomas Tynkkynen f62dbc0121 binutils: Add platforms
There are some variants of binutils in all-packages.nix that aren't
getting built by Hydra currently.
2016-01-24 08:47:46 +02:00
Tim Cuthbertson b82d5ef857 gup: 0.5.1 -> 0.5.3 2016-01-24 16:34:07 +11:00
Patrick Mahoney 9790094f23 libgdiplus: build on darwin 2016-01-23 21:49:50 -06:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
aszlig 740b30b937 gobject-introspection: Deal with $outputLib
Once #7701 gets merged, we have another environment variable called
$outputLib, which then points to another environment variable which is
the final library output.

This was brought up in discussion with @lethalman and @vcunat in:

https://github.com/NixOS/nixpkgs/pull/12558#discussion_r50599813

The closure-size branch is not yet merged into master, so this is only
a preparation and we're still falling back to $out and $lib whenever
$outputLib isn't available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-23 16:36:14 +01:00
Thomas Tuegel 21bebe1592 qt55.qtbase: fix syntax error 2016-01-23 07:52:29 -06:00
Thomas Tuegel 2b76df28b0 qt54.qtbase: fix evaluation error 2016-01-23 07:03:11 -06:00
Gabriel Ebner b47d2f8029 openjdk8: do not symlink icc profiles 2016-01-23 13:22:48 +01:00
Nikolay Amiantov dc162f648c Merge pull request #12284 from abbradar/bundlerenv-wrapper
bundlerEnv: add wrapper
2016-01-23 12:02:09 +03:00
Eric Seidel 2e62f785d4 racket: fix on darwin 2016-01-22 17:38:11 -08:00
aszlig b3b444a79e gobject-introspection: Improve comment in patch
As the comment needed explanation, that it's about temporary build
files, this should do better.

Thanks again to @lethalman for pointing that out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-23 00:14:53 +01:00
aszlig 723f7f8f4f gobject-introspection: Don't hardcode /nix/store
If no config.nix.storeDir has been set, don't fall back to "/nix/store"
but use builtins.storeDir instead so we always should end up with the
correct store path no matter whether config.nix.storeDir has been set.

Thanks to @lethalman for pointing this out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-22 23:55:31 +01:00
aszlig c83e697aa0 gobject-introspection: Add fallback for libraries
After patching up the shared libraries in c420de6 to use absolute paths,
there are still some libraries left which do not get an absolute paths
assigned.

Those libraries are the ones which have an absolute path outside of the
Nix store, so we assume that they're build products of the current build
and make them absolute by prepending "$out/lib" or "$lib/lib" (depending
on whether it's a multiple output derivation or not) to its basename.

So for my test case, the resulting library paths now look like this:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  /nix/store/...-libblockdev-1.3/lib/libbd_utils.so.0

Which is perfectly fine and everything gets resolved correctly after
importing the library using GI.

However, I didn't test it against other libraries and programs, so this
still needs testing, especially for Darwin.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-22 22:46:14 +01:00
aszlig c420de6b05 gobject-introspection: Fix patching shared objects
The gi-r-scanner is generating a list of shared libraries that are
referenced in the shared-library attribute of the <namespace/> element
of the GIR file. However, this attribute only contains the names of the
libraries and not the full store paths, like for example while preparing
to package libblockdev, the following items were included in the
shared-library attribute:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  libm.so.6
  libdmraid.so.1.0.0.rc16
  libbd_utils.so.0

Unfortunately, loading such a library without setting LD_LIBRARY_PATH is
going to fail finding libm.so.6 and libdmraid.so.1.0.0.rc16.

Now the first attempt at solving this was to put absolute paths of all
the libraries referenced in the shared-library attribute, but this also
led up to including paths of build-time shared objects into that
attribute:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  /tmp/nix-build-libblockdev-1.3.drv-0/.../utils/.libs/libbd_utils.so.0

This of course is not what we want, so the final solution is to only
use the absolute path whenever it is a Nix path and leave the library
name as-is if the path doesn't reside within the store, like this:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  libbd_utils.so.0

The downside of this approach is that if not even the output path of the
library is in LD_LIBRARY_PATH, even loading of libbd_utils.so.0 could
fail, so we need to patch the loader as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-22 22:46:02 +01:00
Peter Simons ecc48af0ce hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/a28e076b479ce0ef15fa8d2249718b9154f1ff6a
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/c63083af590a6a4f6bcce8b20cdb371a0548bbef
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/cf055c2754aa9858a857c28595024da1fde9eb14
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/8f10b44c120432146160af46c2e0a5456e3b5a10
2016-01-22 22:23:00 +01:00
Nikolay Amiantov c3abcd8415 Merge pull request #12368 from abbradar/ghostscript-update
Ghostscript and CUPS updates
2016-01-22 21:46:52 +03:00
Franz Pletz 0d13b93047 Merge pull request #12496 from exi/id3lib-patch
add id3lib easytag patch for proper unicode handling.
2016-01-22 17:34:48 +01:00
Vladimír Čunát 0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
Domen Kožar 542bf5bf41 elm: recurseIntroAtrs and use GHC 7.10.3 2016-01-22 13:39:18 +01:00