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
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
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
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
Jan Tojnar
60b382822f
networkmanager: port to Meson ( #59916 )
...
networkmanager: port to Meson
2019-04-23 02:41:26 +02:00
Silvan Mosberger
eb67898a2c
Merge pull request #59904 from Izorkin/php-packages
...
phpPackages: update php packages
2019-04-22 23:50:21 +02:00
Daniel Schaefer
bac4d95aa2
treewide: Change URLs to HTTPS
...
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +02:00
Andreas Rammhold
ee3b96cf9b
Merge pull request #57017 from akru/cargo-vendor-update
...
cargo-vendor: 0.1.13 -> 0.1.23
2019-04-22 00:02:26 +02:00
volth
5d87bc2650
fix bootstrap when platform.gcc.arch=="skylake"
2019-04-21 16:37:49 +00:00
lassulus
ea9161e095
writeC: fix finding of libraries
2019-04-21 13:12:33 +02:00
Andreas Rammhold
1bb989ca70
cargo-vendor: fix build on Darwin
...
This is supposedly fixing the build of the cargo crate on Drawin [1].
[1] https://github.com/NixOS/nixpkgs/pull/57017#pullrequestreview-228868016
2019-04-21 12:11:54 +02:00
Andreas Rammhold
2e2f7cba90
cargo: fix build on Darwin
...
This is supposedly fixing the build of the cargo crate on Drawin [1].
[1] https://github.com/NixOS/nixpkgs/pull/57017#pullrequestreview-228868016
2019-04-21 12:11:54 +02:00
Alexander Krupenkin
a4902a33bf
cargo-vendor: 0.1.13 -> 0.1.23
2019-04-21 12:11:54 +02:00
Matthew Bauer
d180cb9850
cc-wrapper: make machine configuration configurable
...
It is useful to make these dynamic and not bake them into gcc. This
means we don’t have to rebuild gcc to change these values. Instead, we
will pass cflags to gcc based on platform values. This was already
done hackily for android gcc (which is multi-target), but not for our
own gccs which are single target.
To accomplish this, we need to add a few things:
- add ‘arch’ to cpu
- add NIX_CFLAGS_COMPILE_BEFORE flag (goes before args)
- set -march everywhere
- set mcpu, mfpu, mmode, and mtune based on targetPlatform.gcc flags
cc-wrapper: only set -march when it is in the cpu type
Some architectures don’t have a good mapping of -march. For instance
POWER architecture doesn’t support the -march flag at all!
https://gcc.gnu.org/onlinedocs/gcc/RS_002f6000-and-PowerPC-Options.html#RS_002f6000-and-PowerPC-Options
2019-04-20 20:05:51 -04:00
Timo Kaufmann
0e8177ad10
Merge pull request #57169 from timokau/appimage-improvements
...
appimage-run improvements
2019-04-20 18:27:00 +02:00
Izorkin
f40f2323fa
phpPackages: build packages with pname
2019-04-20 17:32:11 +03:00
Timo Kaufmann
4f956e832a
appimage-run: add libtool
...
Needed by Synfigstudio, see
https://github.com/NixOS/nixpkgs/pull/57169/files#issuecomment-477697665 .
2019-04-20 12:32:17 +02:00
Timo Kaufmann
fb6bc78a5c
appimage-run: add missing libs
2019-04-20 12:32:10 +02:00
Jan Tojnar
90f3a237eb
libredirect: add support for openat and dlopen
...
gobject-introspection uses glib’s g_module_open function, which in turn relies
on dlopen. I also implemented openat, since I initially thought this function
was used but turns out dlopen uses the openat signal directly. We might as
well keep it, even thought I do not need it at the moment.
2019-04-20 03:09:17 +02:00
Niklas Hambüchen
a0fa0cd8cf
trivial-builders: Fix runCommand examples
2019-04-19 06:29:42 +02:00
Frederik Rietdijk
bae32a9f5c
Merge staging-next into staging
2019-04-16 18:54:15 +02:00
Linus Heckemann
3b16f345b5
make-initrd: allow specifying name
...
Also moves the argument defaults out of all-packages.nix and into
make-initrd itself.
2019-04-13 23:20:58 +02:00
Matthew Bauer
7edf2db0fd
Merge pull request #59338 from matthewbauer/llvm-libc++
...
llvm8: support c++ in cross case
2019-04-12 14:09:00 -04:00
Joachim F
de9b622eab
Merge pull request #58847 from bachp/fhs-locales
...
nixos/fhsUserenv: make all locales available
2019-04-12 09:35:20 +00:00
rnhmjoj
5ea4160b33
treewide: fixup bcf54ce
...
fix the executable bit for scripts installed with substituteAll
and some remaining shebangs.
2019-04-12 09:09:22 +02:00
Matthew Bauer
d453273fbf
llvm8: support c++ in cross case
...
this adds libc++ to the LLVM cross, giving us access to the full
Nixpkgs set. This requires 4 stages of wrapped compilers:
- Clang with no libraries
- Clang with just compiler-rt
- Clang with Libc, and compiler-rt
- Clang with Libc++, Libc, and compiler-rt
2019-04-11 21:28:51 -04:00
Frederik Rietdijk
c6341c279b
Merge staging-next into staging
2019-04-11 07:52:44 +02:00
Frederik Rietdijk
230c67f43b
Merge master into staging-next
2019-04-11 07:50:23 +02:00
Jörg Thalheim
4d4f110ca5
Merge pull request #59181 from Izorkin/nginx-format
...
nixos/nginx: fix error in writeNginxConfig
2019-04-10 19:23:34 +01:00
Matthew Bauer
4aca600624
Merge pull request #59024 from matthewbauer/hackage-mirrors
...
haskell: add fpcomplete mirror, use hackage mirrors in more places
2019-04-10 01:45:04 -04:00
Frederik Rietdijk
d108b49168
Merge master into staging-next
2019-04-09 16:38:35 +02:00
Andreas Rammhold
1462ef27bb
Merge pull request #58394 from P-E-Meunier/carnix-0.10
...
Carnix: 0.9 -> 0.10
2019-04-08 20:46:14 +00:00
Izorkin
496a73d46d
nixos/nginx: fix error in writeNginxConfig
2019-04-08 16:44:23 +03:00
Niklas Hambüchen
c4c2aa6586
trivial-builders: Fix outdated comment on writeTextFile
2019-04-08 01:12:50 +02:00
Frederik Rietdijk
4a125f6b20
Merge master into staging-next
2019-04-07 08:33:41 +02:00
lewo
a8beff987d
Merge pull request #58350 from xtruder/pkgs/dockerTools/storePathToLayer/runtimeShell
...
dockerTools: storePathToLayer use runtimeShell in script
2019-04-06 19:01:19 +02:00
Jaka Hudoklin
c087b608e8
Merge pull request #58360 from xtruder/pkgs/dockerTools/nix-prefetch-docker
...
dockerTools: add nix-prefetch-docker script
2019-04-06 14:44:19 +02:00