Alyssa Ross
926765c5e3
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/servers/http/apache-httpd/2.4.nix
2021-06-11 02:05:00 +00:00
github-actions[bot]
dcfc502458
Merge master into staging-next
2021-06-11 00:09:47 +00:00
Théo Zimmermann
489959099f
mkCoqDerivation: fix useDune2
2021-06-10 21:52:03 +02:00
Jan Tojnar
ba733d435b
Merge branch 'staging-next' into staging
2021-06-10 14:07:45 +02:00
github-actions[bot]
51dce04dde
Merge master into staging-next
2021-06-10 12:05:05 +00:00
Robert Hensing
76f53eef48
Merge pull request #125223 from hercules-ci/fix-dockerTools-example-fetch-sha
...
nixosTests.docker-tools: Fix nixFromDockerHub example sha
2021-06-10 10:10:18 +02:00
github-actions[bot]
da8d931c82
Merge master into staging-next
2021-06-10 06:07:24 +00:00
AndersonTorres
e9e5f5f84d
Change all alsaLib references to alsa-lib
2021-06-10 01:12:49 -03:00
github-actions[bot]
e40e33d9d8
Merge staging-next into staging
2021-06-08 18:16:30 +00:00
github-actions[bot]
e8f8906d68
Merge master into staging-next
2021-06-08 18:16:27 +00:00
sternenseemann
3bc8e5cd23
tests.writers: use dashes instead of underscores in drv names
...
This is more in line with standard derivation name policy in nixpkgs.
2021-06-08 14:06:41 +02:00
sternenseemann
f46a1e353a
tests.writers: give all test derivations unique names
...
This makes it easier to debug test failures since the derivation name
will give an indication which writer it belongs to.
2021-06-08 14:06:41 +02:00
github-actions[bot]
59ab4de3e0
Merge staging-next into staging
2021-06-08 00:19:01 +00:00
github-actions[bot]
45dbaf4c3d
Merge master into staging-next
2021-06-08 00:18:58 +00:00
Luke Granger-Brown
840f6883fc
Merge pull request #126034 from lukegb/bazel-build-configured
...
Switch buildBazelPackage fetchConfigured on by default
2021-06-07 23:59:33 +01:00
github-actions[bot]
5b7fbb07b8
Merge staging-next into staging
2021-06-07 18:48:37 +00:00
github-actions[bot]
1593cddce5
Merge master into staging-next
2021-06-07 18:48:34 +00:00
Alyssa Ross
1dcba17714
wrapBintoolsWith: fix final stage NetBSD
...
Fixes "bintools" on NetBSD -- without this only the version in stdenv
would work, not the one from the final stage.
Andi tried to warn me about this[1]. Andi, I'm sorry for doubting you.
[1]: https://github.com/NixOS/nixpkgs/pull/124499#discussion_r641949801
2021-06-07 11:49:31 +00:00
Luke Granger-Brown
cfd38a4006
buildBazelPackage: set fetchConfigured default to true
2021-06-07 02:04:01 +00:00
Luke Granger-Brown
bc260c31f1
buildBazelPackage: don't fail if the marker file doesn't exist
...
This was the intent of my previous change, but it didn't quite work
because the pipeline still exits false even if the file doesn't exist.
Oops.
2021-06-06 21:18:56 +00:00
github-actions[bot]
0397e518b7
Merge staging-next into staging
2021-06-05 18:30:31 +00:00
github-actions[bot]
d9d6f71e43
Merge master into staging-next
2021-06-05 18:30:28 +00:00
Jörg Thalheim
8b5175012b
Merge pull request #125804 from Mic92/build-fhs-userenv
...
buildFhsUserenv: don't leak mounts to other processes
2021-06-05 18:03:11 +02:00
Jörg Thalheim
43908f4c1d
buildFhsUserenv: don't leak mounts to other processes
...
If run as root we were leaking mounts to the parent namespace,
which lead to an error when removing the temporary mountroot.
To fix this we remount the whole tree as private as soon as we created
the new mountenamespace.
2021-06-05 16:47:44 +02:00
Antoine Fontaine
c4b3aa6260
build-support/make-desktopitem: add some missing fields
2021-06-04 17:48:46 +02:00
github-actions[bot]
cf75c491be
Merge staging-next into staging
2021-06-02 20:25:08 +00:00
github-actions[bot]
825cffa5ae
Merge master into staging-next
2021-06-02 20:25:05 +00:00
Robert Hensing
1834bc8711
Merge pull request #125216 from hercules-ci/follow-up-115491
...
dockerTools: Fix passthru image tag
2021-06-02 16:58:49 +02:00
github-actions[bot]
ffe6577d05
Merge staging-next into staging
2021-06-01 20:30:47 +00:00
github-actions[bot]
42b70ad7f1
Merge master into staging-next
2021-06-01 20:30:45 +00:00
Sandro
bc64755cfa
Merge pull request #124603 from mjsir911/msirabella/peclCheck
...
php.buildPecl: Add checkPhase
2021-06-01 16:34:42 +02:00
Robert Hensing
d155b8c438
nixosTests.docker-tools: Fix nixFromDockerHub example sha
...
For https://github.com/NixOS/nixpkgs/pull/125211 I tried to test
the fetcher with
nix-build -A dockerTools.examples.nixFromDockerHub --option substitute false
But it failed. I haven't figured out the cause, but the outputs
match, so it's probably the hashing method (flat/recursive) that
changed at some point. (The names did match.)
2021-06-01 15:13:03 +02:00
Robert Hensing
7f6a395070
Merge pull request #125211 from edwtjo/docker-fetch-wotls
...
build-support/docker: pass tlsVerify to support http registries
2021-06-01 15:07:48 +02:00
Robert Hensing
ff55c41fac
dockerTools: Fix passthru image tag
...
It should match the actual image tag.
This fixes the problem introduced in 00996b5e03https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901
2021-06-01 14:42:21 +02:00
Edward Tjörnhammar
ab4649e9d1
build-support/docker: pass tlsVerify to support http registries
2021-06-01 14:34:24 +02:00
github-actions[bot]
abef57f931
Merge staging-next into staging
2021-05-31 19:44:15 +00:00
github-actions[bot]
7f14676873
Merge master into staging-next
2021-05-31 19:44:13 +00:00
Maciej Krüger
ef555f6a0b
Merge pull request #123426 from mattchrist/brscan5
2021-05-31 17:52:16 +02:00
Alyssa Ross
35a0e15ff6
bintools: fix dynamic linker for NetBSD cross
...
This will fail with an assertion error on native NetBSD, but it
wouldn't have worked anyway. We can fix that later.
2021-05-31 14:59:14 +00:00
John Ericson
603f80066e
bintools-wrapper: Add sharedLibraryLoader parameter
...
This is used instead of `libc_lib` in case the shared library loader /
"interpreter" is not provided by the libc derivation.
2021-05-31 14:59:14 +00:00
github-actions[bot]
6a8c64f062
Merge staging-next into staging
2021-05-31 12:54:46 +00:00
github-actions[bot]
5bf27cf89e
Merge master into staging-next
2021-05-31 12:54:42 +00:00
Sandro
03fa8708ec
Merge pull request #124544 from Mic92/vmtools
2021-05-31 11:54:16 +02:00
github-actions[bot]
5c859b2875
Merge staging-next into staging
2021-05-28 12:48:43 +00:00
github-actions[bot]
f2a2e8f5e9
Merge master into staging-next
2021-05-28 12:48:40 +00:00
lsix
7731f618b7
Merge pull request #124299 from dotlambda/qmapshack-1.16.0
...
GIS: random bumps
2021-05-28 13:46:44 +01:00
Daniël de Kok
1da0b1dbc9
Merge pull request #122158 from danieldk/import-cargo-lock
...
rustPlatform.buildRustPackage: support direct use of Cargo.lock
2021-05-28 12:07:25 +02:00
github-actions[bot]
2a3a7f2e86
Merge staging-next into staging
2021-05-28 07:06:01 +00:00
github-actions[bot]
da374ab551
Merge master into staging-next
2021-05-28 07:05:58 +00:00
Daniël de Kok
d3769e43c3
rustPlatform.importCargoLock: add test cases for importCargoLock
2021-05-28 08:01:28 +02:00
