Vladimír Čunát
8ba516664b
Merge branch 'staging-next' into staging
2019-02-01 09:42:53 +01:00
Vladimír Čunát
5effa4e0f9
Merge branch 'master' into staging-next
...
Comments on conflicts:
- llvm: d6f401e1469ecc70
2019-02-01 09:22:29 +01:00
Matthew Bauer
830879d4c4
cc-wrapper: set priority to 10
2019-01-31 20:07:55 -05:00
volth
e64a551603
runInLinuxVM: pkgs.linux -> kernel
...
There is a function params `kernel' intended to specify which kernel to use.
It defaults to `pkgs.linux`.
But when we override `kernel', compiling and using two kernels seems not to be the intendend bevavior.
2019-01-29 20:17:44 +00:00
Matthew Bauer
bb3683d778
Merge pull request #54624 from matthewbauer/libcxx
...
cc-wrapper: add libcxx for libcxxClang
2019-01-27 13:55:18 -05:00
Matthew Bauer
d16e0f8dc3
all-packages: move fetch* to pkgs/build-support/
2019-01-26 22:47:54 -05:00
Matthew Bauer
77550df8e6
cc-wrapper: add libcxx for libcxxClang
...
clang needs to find headers + libraries for compiling with libc++. We
need to add a libcxx argument to cc-wrapper. This means you do not
have to pass in c++ headers directly.
This resolves the last case remaining of #30670 . Darwin clang++ now
works properly.
Fixes #30670
2019-01-26 22:45:15 -05:00
Vladimír Čunát
3fe32b675e
Merge branch 'master' into staging
2019-01-22 15:59:42 +01:00
Jörg Thalheim
86ef9a7766
Merge pull request #53934 from Mic92/prefer-fetch-remote
...
prefer-fetch-remote: an overlay to fetch on remote builders
2019-01-21 10:47:59 +00:00
Frederik Rietdijk
ca2edf79f7
Merge master into staging-next
2019-01-20 18:22:17 +01:00
lewo
105ffa445d
Merge pull request #54270 from xtruder/build-support/docker/layered_image_tag_passthru
...
dockerTools: buildLayeredImage passthru imageTag
2019-01-20 12:21:20 +01:00
Frederik Rietdijk
d531da6f8a
Merge pull request #54094 from rnhmjoj/shell
...
treewide: use ${stdenv.shell} instead of /bin/sh where possible
2019-01-19 14:15:51 +01:00
Jörg Thalheim
eac6797380
prefer-fetch-remote: an overlay to fetch on remote builders
...
This is useful when running tools like NixOps or nix-review
on workstations where the upload to the builder is significantly
slower then downloading the source on the builder itself.
2019-01-18 14:41:10 +00:00
Jaka Hudoklin
1787afb861
dockerTools: buildLayeredImage passthru imageTag
2019-01-18 13:52:07 +01:00
Frederik Rietdijk
9cfae76fc5
Merge staging-next into staging
2019-01-17 09:21:29 +01:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible
2019-01-16 20:37:15 +01:00
Pierre-Etienne Meunier
121318a9b4
toml2nix: init at 0.1.1 ( #53883 )
2019-01-15 23:36:36 +02:00
Frederik Rietdijk
bb9581cd88
Merge staging-next into staging
2019-01-13 14:46:43 +01:00
Vladimír Čunát
bde8efe792
Merge branch 'master' into staging-next
...
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
Orivej Desh (NixOS)
9a21967f0a
stdenv: prune libtool files by default ( #51767 )
...
See the motivation in fd97db43bc#41819 ).
2019-01-11 13:20:46 +00:00
lewo
7612a6add4
Merge pull request #52870 from xtruder/pkgs/dockerTools/buildLayeredImage/extraCommands
...
dockerTools: allow to pass extraCommands, uid and gid to buildLayered image
2019-01-10 19:00:19 +01:00
Jaka Hudoklin
954cda5c9d
dockerTools: allow to pass extraCommands, uid and gid to buildLayeredImage
2019-01-10 16:02:23 +01:00
Franz Pletz
237deba4e7
Merge remote-tracking branch 'origin/master' into staging
2019-01-10 16:00:34 +01:00
Vladimír Čunát
287144e342
Merge branch 'master' into staging-next
2019-01-10 13:07:21 +01:00
Dmitry Kalinkin
6b81768297
Merge pull request #30479 from obsidiansystems/singularity-tools
...
singularity-tools: Only copy into /bin what is specified in contents
2019-01-09 19:39:08 -05:00
Daniel Goertzen
1c10efc912
add generic x86_32 support ( #52634 )
...
* add generic x86_32 support
- Add support for i386-i586.
- Add `isx86_32` predicate that can replace most uses of `isi686`.
- `isi686` is reinterpreted to mean "exactly i686 arch, and not say i585 or i386".
- This branch was used to build working i586 kernel running on i586 hardware.
* revert `isi[345]86`, remove dead code
- Remove changes to dead code in `doubles.nix` and `for-meta.nix`.
- Remove `isi[345]86` predicates since other cpu families don't have specific model predicates.
* remove i386-linux since linux not supported on that cpu
2019-01-06 12:57:36 -06:00
Lengyel Balazs
d848495a9f
xorg: update mirrors to https and remove an outdated one
2019-01-04 14:38:57 +01:00
Frederik Rietdijk
070290bda7
Merge master into staging-next
2018-12-31 12:00:36 +01:00
Silvan Mosberger
69ef070296
Merge pull request #50341 from corngood/chicken-5
...
chicken: 4.13.0 -> 5.0.0
2018-12-31 05:09:57 +01:00
lewo
bb86d0ca24
Merge pull request #52959 from nlewo/runAsRootParentImage
...
dockerTools.example.runAsRootParentImage: init
2018-12-29 12:56:47 +01:00
Frederik Rietdijk
10afccf145
Merge staging-next into staging
2018-12-27 18:11:34 +01:00
lewo
23ebff30a3
Merge pull request #52109 from djahandarie/master
...
dockerTools.buildImage: fix two bugs introduced in c88337c9ac
2018-12-27 11:17:51 +01:00
Antoine Eiche
43cbba0274
dockerTools.examples.runAsRootParentImage: init
...
Example of running something as root on top of a parent image.
This is a regression test related to the PR #52109 .
2018-12-27 11:15:35 +01:00
David McFarland
6c063ac076
chicken: 4.13.0 -> 5.0.0
2018-12-26 22:23:01 -04:00
Frederik Rietdijk
e45ca47f14
Merge staging-next into staging
2018-12-26 09:30:32 +01:00
Craig Younkins
8b12b17df3
treewide: Fix broken Gmane URLs
2018-12-25 22:34:55 -05:00
Frederik Rietdijk
9ab61ab8e2
Merge staging-next into staging
2018-12-19 09:00:36 +01:00
Frederik Rietdijk
911d1853ca
Merge master into staging-next
2018-12-19 08:57:41 +01:00
volth
a0d15a0c68
mirrors.nix: remove bad cpan mirrors
2018-12-19 01:19:08 +00:00
volth
fed7914539
Merge branch 'staging' into make-perl-pathd
2018-12-18 17:13:27 +00:00
Frederik Rietdijk
826ab7026e
Merge master into staging-next
2018-12-18 09:22:17 +01:00
Jan Tojnar
aead6e12f9
Merge remote-tracking branch 'upstream/master' into staging
2018-12-16 22:55:06 +01:00
volth
bb9557eb7c
lib.makePerlPath -> perlPackages.makePerlPath
2018-12-15 03:50:31 +00:00
Darius Jahandarie
a3c536fcb3
dockerTools.buildImage: fix two bugs introduced in c88337c9ac
2018-12-14 15:48:58 -05:00
Alexander Krupenkin
451b181586
fetchcargo: fixed config installation path
2018-12-14 16:23:33 +03:00
Darius Jahandarie
da84602f61
buildRustCrate: fix extraRustcOpts so it is not discarded
2018-12-12 01:21:46 -06:00
Piotr Bogdan
93545a8910
pruneLibtoolFiles: check if prefix exists
2018-12-09 22:44:29 +00:00
Piotr Bogdan
9cd155f1e2
pruneLibtoolFiles: more permissive regex for detecting libtool files
2018-12-09 00:13:04 +00:00
Frederik Rietdijk
3e950d584c
Merge staging-next into master
2018-12-08 16:29:21 +01:00
Benjamin Hipple
8dbc8e586c
fetchurl: refresh and add extra KDE mirrors
...
* fetchurl: fix and add extra KDE mirrors (#51480 )
- The gwdg.de mirror has moved the relative path of its KDE tarballs
- Add new mirrors from Berkeley and MIT, which are on the list of officially supported mirrors
https://download.kde.org/extra/download-mirrors.html
* More KDE mirror touchups
- The official one is a redirect to HTTPS anyways, so go directly to HTTPS
- Add China USTC for Asian users
- Swap Finland university from FTP to HTTP
* fetchurl: keep one ftp KDE mirror
2018-12-08 15:39:05 +01:00
