1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 19:26:02 +00:00
Commit graph

109663 commits

Author SHA1 Message Date
John Ericson f75ad79375 bash: Modernize derivation, hopefully fixing cross compilation 2017-06-22 17:53:53 -04:00
John Ericson ef0b07e94a gnu patch: Fix for cross 2017-06-22 17:53:53 -04:00
John Ericson 7bdacad8b3 ed: Modernize and fix for cross 2017-06-22 17:53:53 -04:00
John Ericson 05b3c87d9d busybox: Modernize and fix cross 2017-06-22 17:53:53 -04:00
John Ericson 8b22e497f2 vim: Modernize derivation, hopefully fixing cross 2017-06-22 17:53:53 -04:00
John Ericson 167b80ba76 coreutils: Modernize and fix for cross
"--host=..." needs to be passed but crossAttrs overrides that.
2017-06-22 17:53:52 -04:00
Ross MacLeod f63f96ae35 zlib: don't really override CC at ay point
but leave the preConfigure script as it was when not cross building in order to avoid hash breakage
2017-06-22 17:53:52 -04:00
John Ericson 38b2bd2f28 dropbear: Remove now-unneeded crossAttrs 2017-06-22 17:53:52 -04:00
John Ericson 12795a7068 misc: Remove almost all uses of stdenv.{ccCross,binutils} 2017-06-22 17:53:52 -04:00
Ross MacLeod d016637629 podofo: unsimplify derivation a bit to avoid hash breakage 2017-06-22 17:53:52 -04:00
John Ericson 29c4d7f505 podofo: Simplify derivation
Bunch of junk for linux and cross compilation that's no longer needed
2017-06-22 17:53:52 -04:00
John Ericson f55ccbb60f xbursttools: Fix eval at least so tests pass 2017-06-22 17:53:52 -04:00
John Ericson fc42ec0a5c mingw-w64: Depend on own headers derivation
Without this, a `#include <float.h>` resolves incorrectly. Either the
headers weren't on the include path at all, or they only were for
local, not system, imports.

What's weird is this used to not be a problem. Not sure what other
change in e.g. cc-wrapper would affect this.
2017-06-22 17:53:51 -04:00
John Ericson bb7067f882 mingw-w64: Clean up, especially clarifying staging 2017-06-22 17:53:51 -04:00
John Ericson c2e2152afc cc-wrapper: Port over finding of dynamic linker from gcc-cross-wrapper
At the next break, we can deduplicate and go for the best of both
worlds.
2017-06-22 17:53:36 -04:00
John Ericson 0aee847858 cc-wrapper: Make the cross compiler use a crossEnvHook
This is a hack until stdenv's setup.hs gets overhauled
2017-06-22 17:52:29 -04:00
Ross MacLeod c1fb71b74a cc-wrapper: when cross building, wedge in setting AR, AS, and LD env vars to their cross building versions
I think it's ok to export things which aren't wrapped. The cc-wrapper
can be thought of as responsible for all of binutils and the c
compiler, only wrapping those binaries which are necessary to
interposition---as opposed to all binaries it thinks are relevaant.

Conversely, adding the setup hook to the unwrapped compilers would be
unforunate as hooks are ugly hacks and the compilers themselves take
a long time to rebuild. Better to wholely separate "pure packages" from
hacks.
2017-06-22 17:52:28 -04:00
John Ericson e0492d58a6 cross stdenv adaptor: Disable checkPhase by default
Before gcc-cross-wrapper did this unconditionally
2017-06-22 17:52:28 -04:00
John Ericson 594d264205 cross stdenv adaptor: Support --host --build --target across the board
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.

rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
2017-06-22 17:52:28 -04:00
John Ericson 9bfd03eff7 cross stdenv adaptor: Remove ccCross binutils attrs and binutils extra buildDepends
It now has the correct wrapped tools and nothing else is needed.
2017-06-22 17:52:28 -04:00
John Ericson 121e7d9335 gcc-cross-wrapper: Remove in favor of newly-cross-supporting cc-wrapper 2017-06-22 17:52:28 -04:00
John Ericson 8a7433fca4 cc-wrapper: Temporarily got to great lengths to avoid mass-rebuild
Eventually we should avoid this "pre-wrapping" and just update those
files in nixpkgs. This mass-rebuild change is best done along with
those needed to reduce the disparity between native and cross (i.e.
making native the "identity cross").
2017-06-22 17:52:28 -04:00
John Ericson 0f0383394d cc-wrapper: Salt environment variables with LLVM triples
We now (on cross) require per-target flag interposition by putting the
triple in the names of the relevant environment variables, e.g:

export NIX_arm_unknown_linux_gnu_CFLAGS_COMPILE=...

The wrapper also has a `infixSalt` attribute (and "_" prefixed and
suffixed variants) to assist downstream packages.

Note how that the dashes are replaced to keep the identifier valid.
Using names like this allows us to keep the settings for different
compilers seperate.

I think it might be even better to use names like `NIX_{BUILD,HOST}...`
using the platform's role rather than the platform itself, but this
would be more work as the previous stages' tools would have to be re-
wrapped to take on their new role. I therefore didn't do this for now,
but that route should be thoroughly explored in the future.
2017-06-22 17:52:28 -04:00
John Ericson 04a3cad968 cc-wrapper: Add support for no libc whatsoever 2017-06-22 17:52:27 -04:00
John Ericson d70e7263f4 cc-wrapper: Simplify and correct logic to chose dynamic linker library 2017-06-22 17:52:27 -04:00
John Ericson 459f1c60f5 cc-wrapper: Learn about target prefixes
This is first step towards getting rid of gcc-wrapper-cross
2017-06-22 17:52:27 -04:00
John Ericson c4ba2e3ef6 cc-wrapper: Remove stdenv.is* for targetPlatform.is*
Modify bootstrapping stdenvs to make sure `targetPlatform` also passed.
2017-06-22 17:52:27 -04:00
John Ericson f571ad4595 Merge pull request #26775 from obsidiansystems/ghc-head-docs
ghcHEAD: Actually split docs into their own output
2017-06-22 17:11:46 -04:00
John Ericson 8f970d09fe ghcHEAD: Actually split docs into their own output
I put `outputs = ...` in the wrong spot in the last PR, oops. Sorry
about that.
2017-06-22 16:56:58 -04:00
André-Patrick Bubel d859769f26 nixos: replaced "userns" with "user namespaces" for clarity
"userns" wasn't introduces as an abbreviation elsewhere as far as I can see, and I wasn't sure what was meant at first.
2017-06-22 22:04:34 +02:00
Daiderd Jordan aba574c4fa Merge pull request #26668 from gleber/fixpoint-erlang-packages
erlang: refactor: build packages per Erlang/OTP version.
2017-06-22 21:49:30 +02:00
Robert Hensing 86dc6469ba arelle: init at 2017-06-01 2017-06-22 21:37:15 +02:00
Robert Hensing 90b2d06268 maintainers: add roberth 2017-06-22 21:37:15 +02:00
Volth a2605322c6 fixed regexp, it did not match the last block 2017-06-22 19:16:19 +00:00
Volth 7fa29f39d1 a little simpification (use File::Slurp) 2017-06-22 19:08:19 +00:00
aszlig 1f65182272
electrum: Unify protobuf dependencies
Since 9c57f3b5c0 bumped the protobuf
version because the new upstream requires it, electrum now gets
protobuf3_0 *and* protobuf3_2 instead of just one version.

This leads to the following build errer:

Found duplicated packages in closure for dependency 'protobuf':
  protobuf 3.0.2 (...-python2.7-protobuf-3.0.2/lib/python2.7/site-packages)
  protobuf 3.2.0 (...-python2.7-protobuf-3.2.0/lib/python2.7/site-packages)

Using protobuf3_2 for keepkey and electrum fixes the build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @np
2017-06-22 21:06:17 +02:00
Volth 00101eb7c9 jetbrains updater: use perlPackages.LWPProtocolhttps 2017-06-22 19:00:28 +00:00
Jörg Thalheim 9cc023a9b4 Merge pull request #26769 from volth/jetbrains-update-script
jetbrains: update script
2017-06-22 17:41:32 +01:00
Jörg Thalheim d1eefba3a4 jetbrains: use nix-shell shebang in update script 2017-06-22 17:34:04 +01:00
Peter Hoeg 32ef253269 tmate: minor cleanup 2017-06-23 00:10:21 +08:00
Volth 1a87975910 update script for jetbrains products 2017-06-22 16:06:23 +00:00
Jörg Thalheim c89efa3cbc Merge pull request #26753 from volth/jetbrains-update-2017.1.4
jetbrains.{ruby-mine,webstorm,datagrip,phpstorm}: 2017.1 -> 2017.1.4
2017-06-22 16:37:32 +01:00
Jörg Thalheim dfeea018b6 Merge pull request #26768 from sifmelcara/fix/slock-cap
slock: Avoid chmod u+s
2017-06-22 16:27:30 +01:00
mingchuan 722d61c2f2 slock: Avoid chmod u+s (#26600) 2017-06-22 22:55:04 +08:00
Domen Kožar 05f94c8c13
hydra: 2017-06-21 -> 2017-06-22 2017-06-22 16:48:43 +02:00
Will Dietz 1e9a9ba149 creduce: 2.6.0 -> 2.7.0, now uses LLVM 4 2017-06-22 07:47:53 -05:00
aszlig 9c57f3b5c0
python-modules/trezor: Fix build
Regression introduced by 76beb08313.

With version 0.7.15 a few additional dependencies are needed by trezor,
mainly a newer version of protobuf bindings and requests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @np
2017-06-22 14:29:25 +02:00
Jörg Thalheim 5041df4411 doc/languages-frameworks/vim: add custom vimrc & packages 2017-06-22 13:25:03 +01:00
rnhmjoj d8027bd9c4
pythonPackages.pygraphviz: fix build 2017-06-22 13:33:30 +02:00
Domen Kožar bb9e23837a
haskellPackages: make configuration-{nix,common}.nix configurable
The motivation is to be able to get rid of common configuration
when initial packages differs since common configuration assumes
a very specific version set.

cc @jmitchell @peti
2017-06-22 13:25:53 +02:00