Commit Graph
100 Commits
Author SHA1 Message Date
John Ericson ebbd6f3471 Merge pull request #44083 from dingxiangfei2009/cross-compiling-postgresql
Allow postgresql to cross compile
2018-08-03 14:44:55 -04:00
John Ericson defa446bf2 Merge pull request #44242 from xplat/tbxz
stdenv/build-support: support .tbz and .txz tarballs
2018-07-30 15:59:21 -04:00
John Ericson 574871ea7f Merge pull request #44164 from LnL7/llvm-man-output
llvm-packages: fix manpages on darwin
2018-07-27 19:30:38 -04:00
John Ericson bbe31da148 Merge pull request #44124 from grahamc/sparc
systems: Allow detection of powerpc and sparc
2018-07-26 14:21:20 -04:00
John Ericson f5364327e8 Merge pull request #44081 from obsidiansystems/stdenv-cross-allowedRequisites
cross stdenv: Forget `allowedRequisites = nulll;` on inline
2018-07-25 10:22:57 -04:00
John Ericson 5dabbf4273 Merge pull request #44069 from obsidiansystems/gcc-libs
libgcc: Init at 7.3.0
2018-07-25 03:10:05 -04:00
John Ericson a6ede9f46e Merge pull request #44068 from Ericson2314/no-crossAttrs-master
treewide: Get rid off `crossAttrs`, and `makeStdenvCross`
2018-07-24 20:15:18 -04:00
John Ericson 46b03cd5b2 Merge pull request #44066 from Ericson2314/no-crossAttrs-master
treewide: Remove some more crossAttrs
2018-07-24 18:59:50 -04:00
John Ericson d4f5ee8199 Merge pull request #44065 from Ericson2314/no-crossAttrs-master
treewide: Remove some crossAttrs
2018-07-24 18:30:14 -04:00
John Ericson 611eefb067 Merge pull request #44025 from obsidiansystems/stdenv-deps-typo
mkDerivation: depsHostBuild -> depsHostHost
2018-07-23 16:09:21 -04:00
John Ericson ee9eeea63a Merge pull request #43367 from dtzWill/fix/haskell-integer-simple-buildPkgs
haskell: fix package sets based on integer-simple
2018-07-11 17:32:38 -04:00
John Ericson 547ef77aa7 Merge pull request #43264 from obsidiansystems/splice-more
haskell infra: Use splicing like normal `callPackage`
2018-07-09 18:34:29 -04:00
John Ericson cf72af3d99 Merge pull request #33589 from dtzWill/fix/fixed-output-cross-name
make-derivation: Don't add host-suffix to fixed-output derivations names
2018-07-09 12:00:50 -04:00
John Ericson ccfe1b5713 Merge pull request #42874 from obsidiansystems/crossPkgs
Add pkgsCross & pkgsLocal
2018-07-02 13:25:24 -04:00
John Ericson bbef861e0f Merge pull request #42397 from obsidiansystems/more-android-fixes
androidndk: cleanups
2018-06-22 17:17:53 -04:00
John Ericson e050011aa3 Merge pull request #42311 from obsidiansystems/haskell-enable-shared-defaults
haskell: make generic builder follow compiler’s shared config
2018-06-21 18:07:11 -04:00
John Ericson 142a2289ff Merge pull request #42247 from obsidiansystems/yet-more-haskell-cross
haskell generic-builder: Yet more cross fixes
2018-06-19 20:12:20 -04:00
John Ericson b6dfa316b7 Merge pull request #41939 from obsidiansystems/haskell-always-setup-separately
haskell generic-builder: Always use separate pkg db for custom setup
2018-06-18 22:25:17 -04:00
John Ericson 07ff2c27f1 Merge pull request #37598 from dtzWill/feature/ghc-cross-musl
ghc-{8.2.2,8.4.1}: fixups mostly for 2-stage cross, musl
2018-06-18 17:01:31 -04:00
John Ericson 4627f0719d Merge pull request #42175 from obsidiansystems/gcc-darwin-sanitizer-still-fail
tests.cc-wrapper: Fix sanitizer condition
2018-06-18 15:24:37 -04:00
John Ericson e09c6e47f1 Merge pull request #42174 from obsidiansystems/darwin-clang-manpage
darwin stdenv: Put back "man" attribute on clang and llvm
2018-06-18 15:07:48 -04:00
John Ericson 763b0c83de Merge pull request #42048 from obsidiansystems/llvm-5-compiler-rt
llvm 5: split out compiler-rt and remove libcxxabi dep
2018-06-14 19:50:09 -04:00
John Ericson b2cc99ea1b Merge pull request #42056 from obsidiansystems/llvm-6-darwin-sanitize
llvm 6: Fix libcxxabi impurity and darwin sanitizers
2018-06-14 19:39:44 -04:00
John Ericson 2c08c768ed Merge pull request #42037 from obsidiansystems/gmp-fixes
Fixes for GMP + prebuilt mobile
2018-06-14 16:13:47 -04:00
John Ericson 4ad049fba0 Merge pull request #42034 from obsidiansystems/darwin-booting-llvm
darwin bootstrapping: Avoid overriding aliases for LLVM
2018-06-14 15:53:51 -04:00
John Ericson 3e3a9e661d Merge pull request #41952 from obsidiansystems/darwin-booting-llvm
llvm: Remove unneeded libcxxabi dependencies
2018-06-13 21:16:32 -04:00
John Ericson bce38f4887 Merge pull request #41946 from obsidiansystems/darwin-booting-llvm
darwin stdenv: fix llvmPackages overrides
2018-06-13 17:02:18 -04:00
John Ericson 089297ad29 Merge pull request #41896 from obsidiansystems/fix-setup-depends
haskell generic-builder: Fix setup depends
2018-06-13 11:28:54 -04:00
John Ericson a3b3d95681 Merge pull request #41861 from obsidiansystems/ghc-gmp
ghc: Default integer-simple usage based one whether GNU MP is available
2018-06-11 17:04:23 -04:00
John Ericson ba210568a9 Merge pull request #41461 from xplat/fix-opam-master
fix opam tool support
2018-06-08 15:54:45 -04:00
John Ericson 23f2dfd9f5 Merge pull request #41641 from obsidiansystems/haskell-infra-latebind
haskell infra: Use `self.ghc` rather than closing over initial value
2018-06-07 14:58:10 -04:00
John Ericson c69c959cd9 Merge pull request #41429 from lopsided98/fix-env-hook
cc-wrapper, bintools-wrapper: unbreak include/link paths when cross-compiling
2018-06-04 22:42:27 -04:00
John Ericson 7a2dd97569 Merge pull request #41320 from matthewbauer/bsd-switch
Switch Nixpkgs to using more NetBSD stuff for MUSL
2018-06-01 13:27:59 -04:00
John Ericson ecabdfd12f Merge pull request #41330 from obsidiansystems/haskellSrc2nix-overriding
haskell infra: Allow overriding `haskellSrc2nix`
2018-05-31 16:42:16 -04:00
John Ericson ccd3f9804d Merge pull request #41284 from Ralith/sanitizer-fix-redux
tests.cc-wrapper: skip known-broken sanitizer cases
2018-05-31 01:20:37 -04:00
John Ericson c4342e94fa Merge pull request #41216 from obsidiansystems/fix-nix-env-meta
lib: Fix `nix-env -qaP -f . --xml --meta`
2018-05-29 14:40:02 -04:00
John Ericson f303ee29cc Merge pull request #41065 from Ralith/sanitizer-fix
clang_6: fix sanitizers under libstdc++
2018-05-29 13:08:44 -04:00
John Ericson 713d580d12 Merge pull request #41081 from obsidiansystems/compiler-rt-master
llvm 6: Master version of #39743
2018-05-26 14:28:58 -04:00
John Ericson 97e376bf9c Merge pull request #41084 from obsidiansystems/fix-darwin-haskell
haskell generic-builder: Limit usage of --extra-framework-dirs on Darwin for compat
2018-05-25 15:28:41 -04:00
John Ericson ce0180dfd5 Merge pull request #40996 from obsidiansystems/cross-ghc
ghc, haskell-infra: #40929 take 2
2018-05-25 11:09:07 -04:00
John Ericson 11d26c797f Merge pull request #39743 from Ralith/compiler-rt
llvm: factor out compiler-rt, fix libstdcxxStdenv sanitizer headers
2018-05-24 10:18:07 -04:00
John Ericson e351265e85 Merge pull request #40897 from alexfmpe/purify-xcode
Use requireFile for impure XCode dependency
2018-05-23 17:14:48 -04:00
John Ericson 78319bd948 Merge pull request #40999 from obsidiansystems/llvm-sieve
llvm: Separate tools and libraries for clarity
2018-05-23 15:57:36 -04:00
John Ericson ee9dc37e04 Merge pull request #40933 from obsidiansystems/linux-to-darwin
stdenv, binutils: Build cctools targeting macOS on Linux without pointless rebuilds
2018-05-23 11:37:43 -04:00
John Ericson aac8be76f5 Merge pull request #40992 from obsidiansystems/stdenv-darwin-persist
darwin stdenv: Properly compose overrides
2018-05-23 10:56:11 -04:00
John Ericson 4ffa8b6125 binutils: Do not needless redownload sources cascading more rebuilds
Unfortunately this is a crude hack that we use the same binutils source
everywhere in the bootstrap chain.
2018-05-23 10:06:08 -04:00
John Ericson e3f35d1491 Merge pull request #40991 from obsidiansystems/stdenv-darwin-persist
darwin stdenv: Persist `darwin.binutils-unwrapped`
2018-05-23 09:58:47 -04:00
John Ericson bbcaf78350 Merge pull request #40989 from obsidiansystems/cctools-linux
cctools: Remove a bunch of stuff no longer needed for Linux
2018-05-23 09:29:41 -04:00
John Ericson 5f1ec8e6d9 Merge pull request #40961 from obsidiansystems/hash-preserving-llvm-cleanup
llvm, top-level: Baby steps towards cross support
2018-05-23 09:15:00 -04:00
John Ericson acc9843691 llvm: Starting to fix Clang wrapping and stdenv building for cross 2018-05-23 00:42:47 -04:00
John Ericson 25e866a7fe treewide: Less {cc,bintools}-wrapper eta expansion
Also makes the LLVM ones more correct
2018-05-23 00:27:30 -04:00
John Ericson 07d73c4ab0 clangSelf, clangWrapSelf, llvmPackagesSelf: Remove this unused thing
It's old old LLVM built with new LLVM. How useless.
2018-05-23 00:27:30 -04:00
John Ericson 75638e2de9 Merge pull request #40930 from obsidiansystems/binutils-always-patch
binutils: Always apply Aarch64 patch
2018-05-22 13:31:53 -04:00
John Ericson 67682550ed Merge pull request #40898 from obsidiansystems/requireFile-without-cc
requireFile: Use stdenvNoCC
2018-05-21 19:48:02 -04:00
John Ericson ae62436793 Merge pull request #40642 from angerman/feature/clean-ghc
ghc, haskell-infra: Improve cross-compilation
2018-05-21 18:01:17 -04:00
John Ericson d6ecbbe921 Merge branch 'staging' into feature/clean-ghc 2018-05-21 17:43:30 -04:00
John Ericson 2241dedbe6 Merge pull request #40442 from obsidiansystems/cabal-frameworks
haskell-generic-builder: Add extra framework dirs
2018-05-18 18:08:20 -04:00
John Ericson 974fa94fd8 Merge pull request #40641 from angerman/feature/darwin-wine
Enable WINE on macOS
2018-05-18 17:42:12 -04:00
John Ericson 33fa7b3f5a Merge pull request #40640 from angerman/feature/yaml-all
Allow YAML on other platforms as well.
2018-05-17 19:31:40 -04:00
John Ericson c5b13f97ff Merge pull request #40659 from bkchr/androidndk
Androidndk
2018-05-17 12:04:14 -04:00
John Ericson f3fcf1b0a9 Merge pull request #40393 from ElvishJerricco/ios-prebuilt-dependency-fixes
Fix some GHC dependencies on iOS
2018-05-16 15:04:13 -04:00
John Ericson ce018be2d6 Merge pull request #40566 from obsidiansystems/strictDeps-for-18.03
cmake: Fix build and setup hook
2018-05-15 16:31:17 -04:00
John Ericson 71bbe836b9 Merge pull request #40529 from obsidiansystems/strictDeps
treewide: Remove crossConfig and add strictDeps
2018-05-14 23:48:58 -04:00
John Ericson fd5ca417f2 Merge pull request #40537 from obsidiansystems/linux-pam-cross
pam: Remove crossAttrs
2018-05-14 22:52:47 -04:00
John Ericson 232bc24b56 Merge pull request #40530 from obsidiansystems/mingw-cleanup
MinGW, Hurd: Clean ups and crossConfig removal
2018-05-14 21:05:44 -04:00
John Ericson 405f9d10ef Merge pull request #40509 from obsidiansystems/gcc-hurd-condition
gcc: Simplify this old Hurd condition
2018-05-14 13:26:32 -04:00
John Ericson d00cc1242f Merge pull request #40040 from obsidiansystems/gnu-config-arm
gnu-config: Update, allowing hacks to be removed
2018-05-14 11:20:09 -04:00
John Ericson ce5091a7e3 Merge pull request #40446 from obsidiansystems/guile-backport
guile: Do nothing!
2018-05-13 12:14:40 -04:00
John Ericson 3fb09ac1de Merge pull request #40387 from obsidiansystems/android-32
android cross: Support 32-bit too
2018-05-11 19:35:53 -04:00
John Ericson 98a1b89945 Merge pull request #40385 from obsidiansystems/lib-android-platforms
lib: Add 32-bit Android platforms
2018-05-11 19:01:22 -04:00
John Ericson 0a77a72895 Merge pull request #40378 from obsidiansystems/lib-platform-sort
lib/systems: Sort platforms, and space CPUs
2018-05-11 17:10:49 -04:00
John Ericson 31e6caabb9 Merge pull request #40306 from obsidiansystems/lib-float
lib: Simplify float handling
2018-05-11 01:22:55 -04:00
John Ericson 5789cf4791 Merge pull request #40297 from obsidiansystems/arm-abi-disambig
lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARM
2018-05-10 16:33:58 -04:00
John Ericson 4ed70389d0 Merge pull request #40295 from obsidiansystems/fewer-crossAttrs
gnused: Remove crossAttrs
2018-05-10 14:46:27 -04:00
John Ericson 1d90ea9194 Merge pull request #40294 from obsidiansystems/no-crossAttrs
misc packages: Fewer crossAttrs
2018-05-10 14:38:58 -04:00
John Ericson 4ae207aea0 Merge pull request #40291 from obsidiansystems/fewer-crossAttrs
misc pkgs: Fewer cross attrs
2018-05-10 13:28:12 -04:00
John Ericson 5b4b24bfa0 Merge pull request #40290 from obsidiansystems/fewer-crossAttrs
guile: Remove old crossAttrs
2018-05-10 12:34:45 -04:00
John Ericson 28b2f48ba9 Merge pull request #40276 from obsidiansystems/fewer-crossAttrs
Fewer cross attrs
2018-05-10 11:58:00 -04:00
John Ericson 7d8e16d939 Merge pull request #40275 from obsidiansystems/fewer-crossAttrs
fontconfig, misc A/V packages: No crossAttrs
2018-05-10 02:17:34 -04:00
John Ericson e659c32448 Merge pull request #40270 from obsidiansystems/lib-platform-simplify
treewide: Get rid of `*Platform.arch`
2018-05-10 01:54:35 -04:00
John Ericson 0fd655f355 Merge pull request #40268 from obsidiansystems/uclibc
uclibc: Bump and clean
2018-05-10 00:47:30 -04:00
John Ericson a31984ecda uclibc: Bump to uclibc-ng 1.0.30 2018-05-10 00:17:44 -04:00
John Ericson 83fdfb9837 Merge pull request #40210 from ElvishJerricco/fix-android-prebuilt-ghc
Fix android prebuilt ghc [Fixes #40194]
2018-05-10 00:10:11 -04:00
John Ericson e42a7a5c0b lib/systems: Add uClibc just like MUSL 2018-05-09 23:39:23 -04:00
John Ericson 0b45f0ebf9 Merge pull request #40261 from obsidiansystems/more-arm
lib/systems: Parse more arm cpu types
2018-05-09 20:05:10 -04:00
John Ericson 12ee278a0d Merge pull request #40248 from matthewbauer/fix-generic-stack-builder
generic-stack-builder: attempt to add propagation
2018-05-09 17:52:00 -04:00
John Ericson 5bdfe37daf Merge pull request #40154 from obsidiansystems/stdenv-arm-alias
stdenv: Put back isArm, with deprecation notice.
2018-05-08 14:24:58 -04:00
John Ericson f22bfb38c6 Merge pull request #40161 from ElvishJerricco/ghc-build-packages-integer-simple
Use build packages GHC for haskell.packages.integer-simple
2018-05-08 10:33:51 -04:00
John Ericson 4f7cdd35d5 Merge pull request #40139 from obsidiansystems/modular-setup-hooks
treewide: Modular setup hooks
2018-05-07 15:32:10 -04:00
John Ericson 9c86ccb6af Merge pull request #39970 from yorickvP/patch-1
impure.nix: stringify path from NIX_PATH
2018-05-04 14:08:22 -04:00
John Ericson 88d18d2e04 Merge pull request #39947 from obsidiansystems/libcxx-cross
lib{std,}c++: Fix setup hooks for cross
2018-05-03 18:20:13 -04:00
John Ericson 8ac79d2575 Merge pull request #39420 from bgamari/cross-fixes-1
A selection of cross-compiling fixes
2018-05-03 17:18:27 -04:00
John Ericson cbe21ac614 Merge pull request #39924 from Synthetica9/gcc7-nojava-fix
gcc7: Removed java as a target language
2018-05-03 16:02:17 -04:00
John Ericson c377b21f83 Merge pull request #39844 from obsidiansystems/cctools-cleanup
cctools, apple libiconv: Apple clean up for iOS cross
2018-05-02 09:36:18 -04:00
John Ericson 5b8c550a86 Merge pull request #39837 from obsidiansystems/ios-examples
lib/systems: Fix eval for iphone32* examples
2018-05-01 19:01:47 -04:00
John Ericson d350a444b7 Merge pull request #39794 from obsidiansystems/ios-examples
lib, openssl: 2 misc bits towards iOS support
2018-05-01 01:37:03 -04:00
John Ericson af55a0c300 Merge pull request #39788 from obsidiansystems/aarch32-for-master
lib: Improve deprecation message for `isArm`
2018-04-30 23:28:45 -04:00
John Ericson 893bf70a1c Merge pull request #39562 from dtzWill/fix/bootstrap-assert-eval
linux bootstrap: remove assertion failure from dev, fixes 'nix eval'
2018-04-26 11:45:11 -04:00
John Ericson 591d8c7a19 Merge pull request #39458 from oxij/stdenv/beautifications
stdenv: better names for cc and bintools
2018-04-26 11:41:18 -04:00
John Ericson 948c8dc474 Merge pull request #37401 from obsidiansystems/aarch32
treewide: isArm -> isAarch32
2018-04-25 15:42:08 -04:00