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
Jörg Thalheim
542f4e4ad0
Merge pull request #95622 from marsam/buildrustpackage-parallel-build
...
buildRustPackage: add support for parallel build
2020-08-19 17:33:46 +01:00
Jörg Thalheim
bd0e645f02
Merge pull request #94442 from Atemu/buildFHSUserEnvBw
2020-08-19 17:28:02 +01:00
Frederik Rietdijk
0ac85bc455
Merge master into staging-next
2020-08-17 14:54:39 +02:00
Jörg Thalheim
b1d86d0e51
build-fhs-user-env-bubblewrap: consistent camelCase
2020-08-17 10:05:25 +02:00
Michael Eden
8c91b3c5b7
fhs-userenv-bubblewrap: bind mount host's devfs
...
Allows us to talk to devices
2020-08-17 08:49:34 +02:00
Michael Eden
2da4f24e22
fhs-userenv-bubblewrap: bind mount parts of host etc directly
2020-08-17 08:49:29 +02:00
Michael Eden
2ddb43ec24
fhs-userenv-bubblewrap: change to using bubblewrap over chrootenv
2020-08-17 08:49:24 +02:00
Atemu
fafbfd2305
fhs-userenv-bubblewrap: start with build-fhs-userenv
...
Just here to track @illegalprime's actual changes to build-fhs-userenv in the
next commits
2020-08-17 08:48:31 +02:00
Mario Rodas
b52808f1ad
buildRustPackage: add support for parallel build
2020-08-16 10:00:00 -05:00
Vladimír Čunát
3937923f81
nixos/systemd.tmpfiles.packages: fix an edge case
...
symlinkJoin can break (silently) when the passed paths contain symlinks
to directories. This should work now.
Down-side: when lib/tmpfiles.d doesn't exist for some passed package,
the error message is a little less explicit, because we never get
to the postBuild phase (and symlinkJoin doesn't provide a better way):
/nix/store/HASH-NAME/lib/tmpfiles.d: No such file or directory
Also, it seemed pointless to create symlinks for whole package trees
and using only a part of the result (usually very small part).
2020-08-16 10:23:53 +02:00
Frederik Rietdijk
cfe6081cee
Merge staging-next into staging
2020-08-15 09:12:42 +02:00
Frederik Rietdijk
d59c57f8a6
Merge pull request #92412 from matthewbauer/blas-cross
...
Blas/Lapack cross fixes
2020-08-15 08:55:57 +02:00
Jörg Thalheim
1f2c19f158
Merge pull request #68524 from nspin/pr/repo-manifest-name
...
fetchRepoProject: add manifestName parameter
2020-08-14 20:08:25 +01:00
Linus Heckemann
efc739f1d2
Merge pull request #92081 from CrystalGamma/modules-closure
...
makeModulesClosure: handle builtin modules better
2020-08-13 22:37:36 +02:00
Frederik Rietdijk
f707715136
Merge master into staging-next
2020-08-11 10:26:35 +02:00
zowoq
1439eaf07b
buildRustCrate: editorconfig fixes
2020-08-09 17:47:12 +10:00
volth
cf7b63df5b
gcc.arch: refactor, move tables under lib/
2020-08-05 11:18:26 +00:00
volth
463db72e63
platform.gcc.arch: support for AMD CPUs
2020-08-05 02:32:48 +00:00
John Ericson
b5f7ed6846
Merge pull request #91293 from Ericson2314/cxx-wrapper-debt-part-2
...
treewide: Get rid of `cc.gcc`
2020-08-02 20:42:20 -04:00