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
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
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
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
Jaka Hudoklin
c1f0d19785
dockerTools: add nix-prefetch-docker script
2019-04-06 14:16:40 +02:00
Vladimír Čunát
526c4292ae
Merge branch 'staging-next'
...
This iteration was long, about five weeks (2fcb11a2
), I think.
Darwin: it's missing a few thousand binaries and there's a make-netbsd
regression, but I suppose these aren't merge blockers.
2019-04-06 13:20:53 +02:00
Matthew Bauer
eaa5e85b35
haskell: add more hackage mirrors, use mirrors in more places
...
Fixes #58971
2019-04-05 13:51:56 -04:00
Jan Tojnar
cb1a20499a
Merge branch 'master' into staging
2019-04-05 11:37:15 +02:00
Jörg Thalheim
6dd7483ce1
Merge pull request #57979 from 4z3/writeNginxConfig
...
nixos/nginx: use nginxfmt and gixy
2019-04-04 20:23:58 +01:00
Michael Eden
53b0027fb4
writeShellScriptBin: use build-time shell in check phase
2019-04-04 13:31:51 -04:00
Pascal Bach
977d1d8413
nixos/fhsUserenv: make all locales available
2019-04-02 22:45:50 +02:00
Vladimír Čunát
2771375d6e
Merge branch 'master' into staging-next
...
Hydra nixpkgs: ?compare=1512490
2019-04-02 20:56:53 +02:00
John Ericson
716503d063
Merge branch 'staging' into rust-cross
2019-04-01 00:47:46 -04:00
John Ericson
4ccb74011f
Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
...
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
2019-04-01 00:40:03 -04:00
John Ericson
842b14ba98
Merge pull request #58330 from AerialX/msp430
...
TI MSP430 cross compiling
2019-03-29 16:11:22 -04:00
Michael Eden
f93470d7a3
rust: set PKG_CONFIG_ALLOW_CROSS conditionally in buildRustPackage
2019-03-29 11:11:00 -04:00
Michael Eden
bdd3c3fdcb
rust: allow building in debug or release modes
2019-03-29 11:11:00 -04:00
Michael Eden
60761e65ba
rust: move releaseDir to target/release in the buildPhase
2019-03-29 11:11:00 -04:00
Jörg Thalheim
912dca193a
rust: fix cross-compilation
2019-03-29 11:11:00 -04:00
Andreas Rammhold
e0b4356c0d
Merge pull request #57936 from andir/build-rust-crate-nix-build-cores
...
buildRustCrate: use $NIX_BUILD_CORES for each of the crates
2019-03-29 12:29:43 +01:00
lewo
dc3ed336df
Merge pull request #58345 from xtruder/pkgs/dockerTools/pullImage/finalImageName
...
dockerTools: add finalImageName parameter for pullImage
2019-03-28 16:25:01 +01:00
Alex Biehl
1b1e23024b
Strip leading ./ in customization layer
2019-03-27 12:08:50 +01:00
Alex Biehl
096e3cbdec
Add /nix/store to each layer.tar
...
To be totally consistent with the way Docker builds images we need to
include the /nix/store in the layer tarballs first.
2019-03-27 11:35:27 +01:00
Pierre-Étienne Meunier
81d9ddab1a
Carnix: 0.9 -> 0.10
2019-03-26 18:54:28 +00:00
Jaka Hudoklin
468df177c4
dockerTools: add finalImageName parameter for pullImage
2019-03-26 19:35:14 +01:00