Silvan Mosberger
b4e16b6c30
Merge pull request #62112 from Lassulus/writers-check
...
build-support/writers: actually run checks
2019-05-28 12:07:22 +02:00
lassulus
9746fae577
build-support/writers: actually run checks
2019-05-28 07:51:46 +02:00
Silvan Mosberger
b6a959b59e
Merge pull request #62040 from abbradar/chrootenv-extend
...
buildFHSUserEnv: extend PATH and LD_LIBRARY_PATH
2019-05-27 17:56:04 +02:00
Las
50c215df4a
Fix chrootenv segfaulting on exit
...
glibc 2.27 (and possibly other versions) can't handle an `nopenfd` value larger than 2^19 in `ntfw`, which is problematic if you've set the maximum number of fds per process to a value higher than that.
2019-05-26 17:19:06 +02:00
Nikolay Amiantov
668f8a12f7
buildFHSUserEnv: extend PATH and LD_LIBRARY_PATH
...
This allows one to run applications from PATH and override libraries for
applications inside chrootenv. Useful for development environments.
2019-05-25 11:37:01 +03:00
Dmitry Kalinkin
44b551c0c0
addOpenGLRunpath: only apply to ELF files
...
Fixes libglvnd build
2019-05-23 16:52:45 -04:00
Florian Klink
2ed6903da5
libglvnd, ocl-icd, vulkan-loader: Add /run/opengl-driver(-32) to RUNPATH. ( #60985 )
...
libglvnd, ocl-icd, vulkan-loader: Add /run/opengl-driver(-32) to RUNPATH.
2019-05-22 23:36:01 +02:00
Nikolay Amiantov
2874e849d9
addOpenGLRunpath: Add new hook for setting RUNPATH.
...
This hook allows to add NixOS driver libraries path to given ELF
objects' RUNPATH. We use it instead of settings RUNPATH manually
everywhere. It must be invoked in postFixup so that RUNPATH stripping
does not remove the path.
It puts the path first instead of last so that system-wide drivers
are always preferred.
2019-05-22 18:19:55 +02:00
Robin Gloster
6cf583cf2f
Merge pull request #60406 from JohnAZoidberg/remove-isnull
...
treewide: Remove usage of isNull
2019-05-18 09:36:24 +00:00
Frederik Rietdijk
d4464ff8fe
Merge master into staging-next
2019-05-16 08:17:55 +02:00
Alexandre Peyroux
9760c3e7ec
vmTools: update debian-9.4 repositories to debian-9.8 Release.xz urls
2019-05-14 21:06:12 +02:00
Frederik Rietdijk
8abe5ee07e
Merge master into staging-next
2019-05-14 10:23:13 +02:00
lewo
42ee7cdf9d
Merge pull request #61089 from nlewo/pr-fix-layer-order
...
dockerTools: Fix Docker layers order
2019-05-13 15:27:43 +02:00
Frederik Rietdijk
ef0dbef7f1
Merge master into staging-next
2019-05-12 19:59:09 +02:00
Alyssa Ross
5c36a8d556
Merge pull request #61052 from deliciouslytyped/patch-2
...
trivial-builders: add writeShellScript and minor cleaning
2019-05-12 17:43:35 +00:00
deliciouslytyped
103ab24e94
trivial-builders: add writeShellScript and minor cleaning
...
Add writeShellScript
Small whitespace additions
Fix "Example:" docstring sections for some of the writeScript functions to use the correct function
2019-05-12 19:40:01 +02:00
Vladimír Čunát
0fb181b8ce
Merge #59422 : patchutils: 0.3.3 -> 0.3.4, keep 0.3.3 for fetchpatch
2019-05-12 15:17:10 +02:00
Vladimír Čunát
e07c5ec107
fetchpatch: explain why we use 0.3.3
2019-05-12 15:16:45 +02:00
Antoine Eiche
a5a5820048
dockerTools: Fix the layer order
...
The layer order was not correct when a parent image was used: parent
image layers were above the new created layer.
This commits simplifies the code related to layer ordering. In
particular, layers in `layer-list` are ordered from bottom-most to
top-most. This is also the order of layers in the `rootfs.diff_ids`
attribute of the image configuration.
2019-05-07 16:52:25 +02:00
Antoine Eiche
5ef1223f30
nixos/tests/docker-tools: verify order of layers in stacked images
2019-05-07 16:52:13 +02:00
Jan Tojnar
e99ff9b98d
networkmanager: Stop using libredirect for building introspection ( #60909 )
...
networkmanager: Stop using libredirect for building introspection
2019-05-05 16:10:38 +02:00
Frederik Rietdijk
193b899af2
Merge master into staging-next
2019-05-04 17:34:04 +02:00
Jan Tojnar
a0c6efb9fd
libredirect: remove dlopen support
...
While it might be useful in some cases, there are too many caveats to be worth it.
When libredirect intercepts dlopen call and calls the original function, the dynamic
loader will use libredirect.so's DT_RUNPATH entry instead of the one from the ELF file
the dlopen call originated from. That means that when program tries to dlopen a library
that it expects to find on its RPATH, the call will fail.
This broke Sublime Text for just that reason.
2019-05-04 05:53:18 +02:00
Andreas Rammhold
46f84adc0c
nix-prefetch-git: add -h as shortcut for --help to improve quality of life
...
Especially as a new user it is a much better experience to receive a
proper help response to `-h`. Currently passing `-h` will cause some
runtime error with the `git remote` error help being shown. Not very
helpful.
It doesn't hurt to be a bit more user friendly in this case.
2019-05-03 23:56:40 +02:00
Frederik Rietdijk
3462fe27d9
Merge staging-next into staging
2019-04-30 15:52:19 +02:00
Daniel Schaefer
786f02f7a4
treewide: Remove usage of isNull
...
isNull "is deprecated; just write e == null instead" says the Nix manual
2019-04-29 14:05:50 +02:00
Frederik Rietdijk
2f936f85d8
Merge master into staging-next
2019-04-29 13:46:20 +02:00
Will Dietz
7bd31a322f
Revert "appimageTools: small simplification"
...
This reverts commit 1c06590fa9
.
2019-04-28 09:41:31 -05:00
Frederik Rietdijk
042a01efbf
Merge staging-next into staging
2019-04-27 07:02:02 +02:00
Frederik Rietdijk
883232c00d
Merge master into staging-next
2019-04-27 07:01:38 +02:00
Matthew Bauer
23c520d95e
cc-wrapper: only set -march when platform.gcc.arch is specified
...
We want to make sure this value is explicitly set. Infering it for
every arch leads to annoying failures like:
https://hydra.nixos.org/build/92583832/
Perhaps we can enable it in the future with some smarter handling of
cc-wrapper.sh.
2019-04-26 22:30:45 -04:00
Matthew Bauer
87944c3125
Merge pull request #56744 from matthewbauer/macos-10-12
...
Update macOS to 10.12
2019-04-26 22:20:03 -04:00
Matthew Bauer
a1533dfc41
patch-shebangs: fix dev detection
...
$output = $outputDev is the right condition. ${!outputDev} is only
useful if you want a path.
2019-04-26 21:54:48 -04:00
Matthew Bauer
61bc03c017
Revert "Revert "patch-shebangs: respect cross compilation""
...
This reverts commit 9c4b11e9a0
.
2019-04-26 21:54:48 -04:00
Jan Tojnar
89a150355b
Merge branch 'master' into staging
2019-04-26 16:35:54 +02:00
Will Dietz
6e4fa85446
Merge pull request #56259 from dtzWill/feature/minetime
...
minetime: init at 1.4.12
2019-04-25 23:22:30 -05:00
volth
dba65df034
kernel: fix cross-build
...
Fix for #59225 regression proposed by @matthewbauer
https://github.com/NixOS/nixpkgs/pull/59225#issuecomment-486398003
(cherry picked from commit a6ea72a77d1f8e794244b063a7e9780c1b47486d)
2019-04-25 14:14:48 -04:00
Graham Christensen
a682d720c7
Merge pull request #60215 from nmattia/nm-tmp-timestamp
...
patchShebangs: create timestamp in tmp dir
2019-04-25 12:50:16 -04:00
Nicolas Mattia
cc9b4029bc
patchShebangs: create timestamp in tmp dir
...
Creating the timestamp in the patched script's directory has a few
drawbacks:
* if "foo.timestamp" already exists, it will be overwritten
* it requires the directory to be writable
2019-04-25 17:07:58 +02:00
Frederik Rietdijk
0a7bcb3b03
Merge staging into staging-next
2019-04-24 18:38:11 +02:00
Graham Christensen
b26153450c
Merge pull request #48325 from transumption/201810/warn-on-fetchurl-rev-archives
...
fetchurl: warn on rev archives, resolves #32999
2019-04-24 12:09:35 -04:00
Matthew Bauer
7488a367af
Merge pull request #56555 from matthewbauer/wasm
...
Initial WebAssembly/WASI cross-compilation support
2019-04-23 22:44:33 -04:00
Matthew Bauer
84d00355e8
Merge remote-tracking branch 'NixOS/master' into staging
2019-04-23 22:00:42 -04:00
Matthew Bauer
6948ffd398
wasilibc: use .imports file for lld
...
instead of passing in the --allow-undefined-file, we can just let lld
find the file.
2019-04-23 21:48:58 -04:00
Matthew Bauer
9abff4af4f
wasm: init cross target
...
Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs
with a WebAssembly toolchain.
stdenv/cross: use static overlay on isWasm
isWasm doesn’t make sense dynamically linked.
2019-04-23 21:48:57 -04:00
Will Dietz
1c06590fa9
appimageTools: small simplification
2019-04-23 20:40:54 -05:00
Will Dietz
843d5b05ef
appimageTools: use functionArgs as suggested, use dynamicLinker attr
2019-04-23 20:40:54 -05:00
Will Dietz
fb771b072a
appimage: plumb support for extra attributes to be specified
2019-04-23 20:40:53 -05:00
Peter Kolloch
61ac550082
Fix #60125 - buildRustCrate: Always set CARGO_PKG_VERSION_PRE and CARGO_PKG_HOMEPAGE
...
(as cargo does)
2019-04-23 23:41:57 +02:00
Matthew Bauer
0b1851d084
Merge pull request #59969 from volth/gcc-arch-v4
...
fix bootstrap when platform.gcc.arch=="skylake"
2019-04-23 09:44:50 -04:00