Frederik Rietdijk
2e4b4e3300
Merge staging-next into staging
2020-06-13 11:03:26 +02:00
Frederik Rietdijk
1523382160
Merge master into staging-next
2020-06-13 11:02:21 +02:00
volth
54c4223e55
treewide: central.maven.org -> repo1.maven.org
2020-06-12 14:26:08 +00:00
Frederik Rietdijk
febc27b59a
Merge master into staging-next
2020-06-12 08:57:26 +02:00
Matthew Bauer
f5c1ab06af
Merge pull request #89351 from dwarfmaster/fix-emacs-build
...
Fix building of emacsWithPackages not findind subdirs.el
2020-06-11 10:52:25 -05:00
José Romildo Malaquias
87eb2f4342
Merge pull request #90004 from romildo/buildenv
...
buildenv: paths to link resolving to the same absolute path is not a conflict
2020-06-11 12:50:31 -03:00
José Romildo Malaquias
4a1ef63c55
buildenv: paths to link resolving to the same absolute path is not a conflict
...
When building an environment if two paths conflict but one or both are
symbolic links and they resolve to the same real path, the conflict is
discarded because the contents of both paths are the same. One of them
is chosen and there is no need to recur into them in order to build
deeper symbolic links.
2020-06-10 06:42:48 -03:00
Frederik Rietdijk
8576d24b2a
Merge staging-next into staging
2020-06-08 12:08:51 +02:00
Frederik Rietdijk
dc33419285
Merge master into staging-next
2020-06-08 12:06:12 +02:00
hyperfekt
0a8fb89fca
rustPlatform: fix cross-compiling by using native diff
2020-06-08 10:05:00 +05:30
Frederik Rietdijk
1c68570ab2
Merge staging-next into staging
2020-06-05 19:42:16 +02:00
Frederik Rietdijk
43f71029cc
Merge master into staging-next
2020-06-05 19:40:53 +02:00
Jörg Thalheim
f0396574ab
buildRustPackage: add documentation on how to create cargo.lock patches
2020-06-05 10:41:46 +01:00
Vladimír Čunát
677e3960b5
Merge #82342 : rustPlatform: increase build-speed of checkPhase
...
...for rust-packages (into staging)
2020-06-05 09:12:30 +02:00
Frederik Rietdijk
08900c0554
Merge master into staging-next
2020-06-04 15:25:54 +02:00
Benjamin Hipple
4af635feff
Merge pull request #87866 from danieldk/validate-pkgconfig-hook
...
validatePkgConfig: init
2020-06-02 23:27:27 -04:00
DwarfMaster
a9eab6d2b9
Fix building of emacsWithPackages not findind subdirs.el
2020-06-02 11:52:39 +02:00
Florian Klink
8a388c8296
Merge pull request #82258 from erikarvstedt/fix-xchg-caching
...
fix inconsistent caching of VM xchg dirs
2020-06-01 22:34:48 +02:00
Erik Arvstedt
d85dc4f690
qemu-vm: fix inconsistent caching of xchg dirs
...
xchg is advertised as a bidirectional exchange dir, but file content
transfer from host to VM fails due to caching:
If a file is read in the VM and then modified on the host, subsequent
re-reads in the VM can yield old, cached data.
This is caused by the use of 9p's cache=loose mode that is explicitly
meant for read-only mounts.
9p doesn't provide any suitable cache modes, so fix this by disabling
caching.
Also, remove a now unnecessary sync in the test driver.
2020-06-01 21:55:33 +02:00
Daniël de Kok
13083b1a01
validatePkgConfig: init
...
This adds the `validatePkgConfig` hook, which can be used to validate
pkg-config files in the output(s). Currently, this will just run
`pkg-config --validate` on all `.pc` files, capturing errors such as
the issue that was fixed in #87789 .
The hook could be extended in the future with more fine-grained
checks.
2020-05-31 20:45:03 +02:00
Pavol Rusnak
9444756222
appimage: replace radare2+jq with readelf+awk+sha256sum
...
radare2 does not play nicely with filenames containing spaces
https://github.com/radareorg/radare2/issues/16958
2020-05-29 11:14:16 +02:00
Frederik Rietdijk
362d88c2b1
Merge staging-next into staging
2020-05-27 15:27:28 +02:00
Michael Howell
c21cbf22d0
buildRustCrate: Replace hyphen with underscore in env variables ( #88054 )
...
* Add test case for include dir
* buildRustCrate: replace hyphen with underscore in env
This fixes a bug that prevents encoding_c from building.
2020-05-26 20:52:18 +02:00
adisbladis
d8b6e82126
Merge pull request #88856 from zowoq/prefetch-docker
...
dockerTools: fix skopeo commands
2020-05-25 09:52:09 +02:00
rnhmjoj
aee614c996
treewide: replace bazaar with breezy
2020-05-25 09:22:54 +02:00
zowoq
365d07cea0
dockerTools: fix skopeo commands
2020-05-25 14:29:54 +10:00
Florian Klink
9b7a4694a0
fetchgitlab: escape rev to support "+" in it
2020-05-24 22:24:50 +02:00
Shea Levy
fffa6e8c18
Merge pull request #88762 from alexbiehl/alex/docker-tools
...
dockerTools: Properly add /nix/ and /nix/store/ first to layer.tar
2020-05-24 08:34:42 -04:00
Alex Biehl
886c92332c
dockerTools: Properly add /nix/ and /nix/store/ first to layer.tar
...
In https://github.com/NixOS/nixpkgs/pull/58431 the authors ensured that
the resulting layer.tar would always list
/nix/
/nix/store/
first to fully comply to the tar spec. Various refactorings later it is only
ensured to create /nix/ but NOT /nix/store anymore. Instead tar transformed
them to /nix/nix and /nix/nix/store.
2020-05-24 14:28:35 +02:00
Frederik Rietdijk
d578248611
Merge staging-next into staging
2020-05-24 10:10:06 +02:00
Matthew Bauer
c74a9cd3e2
Merge pull request #69144 from SFrijters/gdc
...
gdc: init at 9.3.0
2020-05-23 16:30:47 -05:00
Orivej Desh
16d7f7edae
Merge branch 'master' into staging
2020-05-22 09:13:23 +00:00
John Ericson
eae4f22176
Merge pull request #88518 from Ericson2314/fix-pkg-config
...
pkg-config, pkgconf: Misc fixes
2020-05-21 16:05:42 -04:00
Profpatsch
8b270a96fa
skawarePackages.cleanPackaging: copy docFiles before rm noise
2020-05-21 19:46:38 +02:00
John Ericson
7e9d807f2c
pkg-config-wrapper: Move comments outside of strings
...
This is much better because then we can freely keep the comments up to
date without causing mass rebuilds.
Someday, somebody should make the same change with `cc-wrapper` and
`bintools-wrapper`.
2020-05-21 11:35:46 -04:00
John Ericson
95080ea90b
pkgconf: Wrap with pkg-config-wrapper
2020-05-21 11:35:46 -04:00
John Ericson
4b2ab665fb
pkg-config-wrapper: Provide autoconf macros
...
This fixes libarchive, and probably numerous other builds.
2020-05-21 09:16:34 -04:00
John Ericson
f29919da61
pkg-config: Multiple outputs
...
This is good practice, and will help with tests. Wrapper adjust to match
bintools-wrapper re these new outputs.
2020-05-21 08:58:34 -04:00
Stefan Frijters
fc9b93d2fc
gdc: init at 9.3.0
2020-05-19 23:06:52 +02:00
lewo
a498da343a
Merge pull request #87154 from utdemir/buildimage-optimizations
...
Some performance optimizations to dockerTools.build{,Layered}Image
2020-05-19 15:39:25 +02:00
Jan Tojnar
f8a9c6efac
Merge branch 'staging-next' into staging
2020-05-18 21:09:48 +02:00
John Ericson
c71ab32a67
pkg-config-wrapper: Init
...
This fixes longstanding build issues
2020-05-16 00:21:21 +00:00
John Ericson
ee8cfe4bf3
treewide: pkg-config has targetPrefix
2020-05-16 00:21:21 +00:00
zowoq
42232493a3
dockerTools: pass insecure-policy and tmpdir to skopeo
2020-05-16 08:46:13 +10:00
lewo
df928fafd4
Merge pull request #87725 from nlewo/fix-dockertools
...
dockerTools.examples: fix the nginx image
2020-05-15 16:54:09 +02:00
lewo
98a723e6b3
Merge pull request #87253 from utdemir/dockertools-preserve-env
...
Preserve environment variables from the parent image on dockerTools.buildImage
2020-05-15 09:59:00 +02:00
Dmitry Kalinkin
9943fd1a1d
Merge pull request #76653 from alexarice/agda-rework
...
Agda rework
2020-05-14 18:02:50 -04:00
Alex Rice
d30e2468e0
agda: rework builder
2020-05-14 20:54:11 +01:00
Frederik Rietdijk
404fe35d65
Merge staging-next into staging
2020-05-14 09:37:03 +02:00
Matthew Bauer
d38bad590e
Merge pull request #83180 from matthewbauer/only-add-ldflags-for-macos
...
bintools: only add macos flags when targeting macOS
2020-05-13 10:34:40 -05:00