Aaron Janse
e745f9333e
fix whitespace
2020-10-15 19:03:10 -07:00
Aaron Janse
d906fda8d2
parameterize rustcSrc
2020-10-15 17:27:51 -07:00
Aaron Janse
a153be896f
use rustcSrc
2020-10-14 22:54:04 -07:00
John Ericson
c0df12de5d
rust: Add support for managing target JSON in Nix
2020-10-14 04:20:23 +00:00
John Ericson
6866f26c89
Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target
2020-10-14 02:54:31 +00:00
Aaron Janse
3f3491d64d
fix some whitespace
2020-10-12 18:41:13 -07:00
Aaron Janse
0fca6ba580
fix compile error
2020-10-12 14:48:07 -07:00
John Ericson
d3d55bcc81
Merge pull request #99066 from lopsided98/buildrustcrate-target-vars
...
buildRustCrate: fix target config environment variables on 32-bit ARM
2020-10-11 16:46:29 -04:00
Aaron Janse
f8ea4e0c3d
makeRustPlatform: support custom targets
2020-10-08 14:32:49 -07:00
Ben Wolsieffer
91bc6128b9
buildRustCrateTests: support cross-compilation
2020-09-29 14:33:49 -04:00
Ben Wolsieffer
f0fdecfbb4
buildRustCrate: fix target config environment variables on 32-bit ARM
2020-09-29 01:40:06 -04:00
John Ericson
cffc0eaa98
Merge pull request #99050 from lopsided98/buildrustcrate-cross
...
buildRustCrate: support cross compilation
2020-09-29 00:13:26 -04:00
Ben Wolsieffer
a0e7613509
defaultCrateOverrides: move pkgconfig to nativeBuildInputs
...
This fixes cross-compiling.
2020-09-28 19:47:52 -04:00
Ben Wolsieffer
295a6690f9
buildRustCrate: support cross compilation
2020-09-28 19:46:04 -04:00
zowoq
e4c71e6c6c
buildRustPackage: support setting test-threads
2020-09-24 07:19:58 +10:00
Shea Levy
b694eb6e6a
firmware-manager: Init at 0.1.1
2020-09-23 06:01:05 -04:00
zowoq
4482e5ec2c
dotnetenv: editorconfig fixes
2020-09-21 08:30:58 +10:00
Lars Jellema
7ea5b08cfc
gnat: fix build
2020-09-19 20:54:27 -07:00
Anderson Torres
6740a5998b
Merge pull request #93082 from cfhammill/cfh/fix-singularity-shell-copy
...
singularity-tools: Check for /bin/sh existence before symlink
2020-09-19 00:42:29 -03:00
Vladimír Čunát
372f89cc44
Merge branch 'master' into staging-next
2020-09-16 17:58:45 +02:00
Anderson Torres
a5931fa6e3
Merge pull request #95409 from utdemir/stream_layered_image_fix
...
dockerTools.streamLayeredImage: Store the customisation layer as a tarball
2020-09-14 11:05:48 -03:00
WORLDofPEACE
f5fdc6b240
Merge pull request #97894 from TethysSvensson/fixBusybox
...
busybox: Fix 404 error by using git instead
2020-09-13 14:25:22 -04:00
Tethys Svensson
43cd431b44
fetchgitlab: Escape a few more characters in the revision
2020-09-13 12:34:08 +02:00
Vladimír Čunát
e88e14ec8d
Merge branch 'master' into staging-next
...
A few thousand rebuilds per platform have arrived in the meantime.
2020-09-11 14:24:13 +02:00
John Ericson
5fd27509cf
Merge pull request #97387 from Ericson2314/fix-android-prebuilt
...
cc-wrapper: Fix for prebuilt android
2020-09-08 20:24:50 -04:00
John Ericson
204dc3a88b
cc-wrapper: Fix for prebuilt android
...
We don't want to use Nix-built GCC's libs with prebuilt clang in this
case.
2020-09-07 15:08:11 -04:00
Dominik Xaver Hörl
b20ec4f719
pkgs/build-support/writers: allow passing ghc arguments in writeHaskell
2020-09-07 19:36:58 +02:00
Frederik Rietdijk
5ceea5705a
Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper"
...
Follow up to the revert in e560459c5b
.
This reverts commit 1936b11f63
.
2020-09-07 16:31:59 +02:00
Frederik Rietdijk
be61518b91
Merge staging-next into staging
2020-09-07 16:31:37 +02:00
Frederik Rietdijk
1936b11f63
utils.bash: also "fix" cc-wrapper and pkg-config-wrapper
2020-09-07 07:19:26 +02:00
Frederik Rietdijk
e560459c5b
Revert "utils.bash: revert #93560 for darwin, unblocks channels"
...
Revert the hack and the original faulty commit.
This reverts commit 48264ee506
.
Revert "Purity checking should accept $TMP and not just /tmp"
This reverts commit fb777be7d2
.
2020-09-06 18:16:14 +02:00
Frederik Rietdijk
1d881848f8
Merge staging-next into staging
2020-09-06 18:15:07 +02:00
Frederik Rietdijk
d362c0e54e
Merge master into staging-next
2020-09-06 18:14:23 +02:00
Frederik Rietdijk
08eb704bc3
utils.bash: revert #93560 for darwin, unblocks channels
...
Temporary fix. We definitely do not want to have two separate
implementations.
2020-09-06 18:14:08 +02:00
Evan Stoll
19cb34b04b
buildSupport.rust: fix typo in verifyCargoDeps message ( #97058 )
2020-09-05 17:04:32 -04:00
Florian Klink
98d6b55fdc
nixos/testing: remove remaining coverage-data logic
...
This isn't used anymore as per
https://github.com/NixOS/nixpkgs/pull/72354#discussion_r451031449 .
2020-09-05 16:07:59 +02:00
Frederik Rietdijk
af81d39b87
Merge staging-next into staging
2020-09-04 20:03:30 +02:00
Tyson Whitehead
fb777be7d2
Purity checking should accept $TMP and not just /tmp
2020-09-04 19:58:46 +02:00
Jan Tojnar
5079e1cd3b
Merge pull request #96939 from jtojnar/drop-gst-010
2020-09-04 17:13:43 +02:00
Utku Demir
ae82f81bfa
dockerTools.streamLayeredImage: Store the customisation layer as a tarball
...
This fixes as issue described here[1], where permissions set by 'extraCommands'
were ignored by Nix.
[1] https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-669834938
2020-09-04 16:53:23 +12:00
Matthew Bauer
3a9b91b486
Merge pull request #96562 from obsidiansystems/bazel-add-dont-add-bazel-opts
...
build-bazel-package: add dontAddBazelOpts arg
2020-09-02 16:29:53 -05:00
John Ericson
1965a241fc
Merge pull request #61019 from volth/gcc.arch-amd
...
platform.gcc.arch: support for AMD CPUs
2020-09-01 22:31:16 -04:00
Jan Tojnar
d2d24c9a2b
appimage: remove ancient gst dep
...
it is insecure and broken
2020-09-02 02:24:07 +02:00
Matthew Bauer
27fb209194
build-bazel-package: add dontAddBazelOpts arg
...
This adds an option to skip adding --copt and --linkopt to Bazel
flags. In some cases, Bazel doesn’t like these flags, like when a
custom toolchain is being used (as opposed to the builtin one. The
compiler can still get the dependencies since it is invoked through
gcc wrapper and picks up the NIX_CFLAGS_COMPILE / NIX_LDFLAGS.
2020-08-28 15:10:59 -05:00
Linus Heckemann
86fa61033a
Merge pull request #96008 from baloo/baloo/bugfixes/make-modules-closure_firmware
...
makeModulesClosure: fixup firmware extraction
2020-08-28 14:04:10 +02:00
Daniël de Kok
923c9f62c4
fetchCrate: accept pname besides crateName
...
This enables short argument attrsets similar to fetchPypi:
src = fetchCrate {
inherit pname version;
sha256 = "02h8pikmk19ziqw9jgxxf7kjhnb3792vz9is446p1xfvlh4mzmyx";
};
2020-08-28 08:34:22 +02:00
Arthur Gautier
70bc1a3f49
makeModulesClosuse: read modules from corrent kernel version
...
Before this commit, the firmware information would be loaded from the
currently running kernel, not from the kernel to be loaded.
This commit ensures the correct kernel version and modules are read.
2020-08-27 10:48:18 -07:00
Arthur Gautier
ee8572d6b3
makeModulesClosure: fixup firmware extraction
...
After a recent upgrade of modinfo, its output is now incorrect for
builtin modules. This commit filters out the output until a fix is made
available upstream
2020-08-27 10:45:23 -07:00
Jan Tojnar
58377555ed
Merge branch 'staging-next' into staging
2020-08-23 02:18:27 +02:00
Jan Tojnar
91104b5417
Merge branch 'master' into staging-next
2020-08-23 02:00:50 +02:00