Commit Graph

4927 Commits

Author SHA1 Message Date
libjared
badb5a1af2 fhs-userenv-bubblewrap: add ca-certificates to fhs
In Arch Linux, many of the certs in /etc/ssl/certs/ are symlinks to
/etc/ca-certificates/extracted/. These symlinks are broken in the FHS
env.

This commit adds ca-certificates to the list of bind mounts, which fixes
connection issues with Steam, wget, etc on Arch Linux hosts.
2021-11-15 15:29:33 -08:00
github-actions[bot]
4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
Sandro
594fa6aea6
Merge pull request #143994 from Stunkymonkey/ocaml-pname 2021-11-13 13:30:16 +01:00
sternenseemann
1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
Uri Baghin
7111193ee6 writers: fix writeRust on darwin 2021-11-13 11:04:36 +11:00
github-actions[bot]
c0c7fbda14
Merge master into staging-next 2021-11-13 00:01:45 +00:00
Artturi
69bdaa04d8
Merge pull request #145533 from Artturin/builddotnetpkgconfig 2021-11-13 01:27:33 +02:00
github-actions[bot]
026e6c328a
Merge master into staging-next 2021-11-12 00:01:22 +00:00
Artturin
ffb9a309b6 buildDotnetPackage: move buildInputs to nativeBuildInputs
they're run during the build so they belong there
2021-11-11 22:26:23 +02:00
Artturin
f77006c308 buildDotnetPackage: fix nativeBuildInputs
the nativeBuildInputs of the derivation that uses buildDotnetPackage overshadowed the nativeBuildInputs of buildDotnetPackage
so pkg-config wasn't getting added to the path

dotnet-packages: remove unused arg
2021-11-11 21:47:50 +02:00
markuskowa
26f5e6dd5f
Merge pull request #143237 from ck3d/fix-runInLinuxImage
vmTools: Fix missing backing format in runInLinuxImage
2021-11-11 20:39:17 +01:00
github-actions[bot]
b199af176d
Merge master into staging-next 2021-11-11 00:01:45 +00:00
Dmitry Kalinkin
4af5e02055
Merge pull request #143079 from veprbl/pr/singularity_nonstd_store
singularity-tools.buildImage: fix building from non-standard store paths
2021-11-10 16:04:30 -05:00
github-actions[bot]
6e4d2d1f10
Merge master into staging-next 2021-11-10 00:01:31 +00:00
Sandro
9975de2d4e
Merge pull request #144693 from mkg20001/fetchgit-hash 2021-11-09 22:22:19 +01:00
Maciej Krüger
5c2b1b6a29
fetchgit: support hash parameter alongside sha256
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-09 07:40:20 +01:00
Bernardo Meurer
174995d14f
writeShellApplication: set meta.mainProgram 2021-11-08 09:33:42 -08:00
Bernardo Meurer
ba7b7357ac
writeTextFile: allow passing extra derivationArgs 2021-11-08 09:33:40 -08:00
Bernardo Meurer
d8ec0eeab7
writeShellApplication: run pre/postCheck hooks 2021-11-08 09:33:38 -08:00
Bernardo Meurer
949182a4a2
writeShellApplication: document runtimeShell == stdenv.shell assumption 2021-11-08 09:33:37 -08:00
Bernardo Meurer
014b23232f
writeShellApplication: fix typo in inline docs 2021-11-08 09:33:36 -08:00
Bernardo Meurer
97de845b60
writeShellApplication: fix setting pipefail 2021-11-08 09:33:35 -08:00
Bernardo Meurer
21c299f077
writeShellApplication: get shellcheck from pkgsBuildHost 2021-11-08 09:33:34 -08:00
Bernardo Meurer
0e4f04b74c
writeShellApplication: buildInputs -> runtimeInputs 2021-11-08 09:33:33 -08:00
Bernardo Meurer
89979c9c5b
writeShellApplication: init 2021-11-08 09:33:32 -08:00
John Ericson
4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
John Ericson
18ed048c7b build-support/rust: Organize
- `toRustTarget` and friends pulled out from rust tools into rust
   library. Since they don't depend on any packages they can be more
   widely useable.

 - `build-rust-package` gets its own directory

 - `fetch-cargo-tarball` gets its own directory
2021-11-07 14:16:49 -05:00
github-actions[bot]
eeb7e66e97
Merge master into staging-next 2021-11-06 18:01:01 +00:00
Domen Kožar
e57174c9d2
Merge pull request #144653 from stephank/fix/libredirect
libredirect: fix on darwin
2021-11-06 07:05:59 -06:00
github-actions[bot]
a41ea4ced3
Merge master into staging-next 2021-11-06 06:01:07 +00:00
Alyssa Ross
4419e8ee8e
mirrors: prioritize HTTPS 2021-11-06 01:07:38 +00:00
Alyssa Ross
1b78d3720c
mirrors: use HTTPS where available 2021-11-06 01:07:36 +00:00
Alyssa Ross
246d34d57a
mirrors: remove inactive mirrors 2021-11-06 01:07:34 +00:00
Alyssa Ross
9c70596689
mirrors: update sunet base URLs 2021-11-06 00:45:08 +00:00
Stéphan Kochen
7acc0e054c libredirect: workaround dyld env not inherited 2021-11-05 20:47:11 +01:00
Stéphan Kochen
d1a3b5c4cc libredirect: use __interpose on darwin
DYLD_FORCE_FLAT_NAMESPACE was removed in recent versions of macOS.
2021-11-05 08:24:22 +01:00
github-actions[bot]
3567177949
Merge staging-next into staging 2021-11-03 18:10:58 +00:00
Robert Hensing
455e7f19d0
Merge pull request #144052 from hercules-ci/improve-trivial-builders-test
test.trivial-builders: Add test cases, fix test runner, rename
2021-11-03 18:10:42 +01:00
Alyssa Ross
703ffa2f5d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-03 07:34:33 +00:00
Lassulus
33f0c518f7
Merge pull request #143629 from sternenseemann/writers-fixes
writers: fix writeHaskell* for darwin, bintools-related cleanup
2021-11-02 20:21:00 +01:00
Felix Buehler
e601787f7e buildOcaml: rename name to pname 2021-11-01 16:19:30 +01:00
github-actions[bot]
9e9ee310f8
Merge staging-next into staging 2021-11-01 12:01:37 +00:00
github-actions[bot]
cc41bb5851
Merge master into staging-next 2021-11-01 12:01:00 +00:00
IvarWithoutBones
af339c5cf8 buildDotnetModule: add support for running unit tests 2021-11-01 02:06:54 +01:00
Robert Hensing
51f7c15df9 test.trivial-builders: Add test cases, fix test runner, rename
The writeStringReferencesToFile didn't handle non-unique references
to the same path correctly.
2021-11-01 00:06:03 +01:00
github-actions[bot]
9a002bac35
Merge staging-next into staging 2021-10-29 18:01:38 +00:00
github-actions[bot]
6317a19147
Merge master into staging-next 2021-10-29 18:01:00 +00:00
IvarWithoutBones
bc193f80c4 buildDotnetModule: create nuget source seperately && use stdenvNoCC 2021-10-29 08:27:51 -07:00
Sandro
31b495592f
Merge pull request #143347 from SuperSandro2000/appimage-wrapType2-pname-version 2021-10-29 16:42:01 +02:00
sternenseemann
b1197ac729 writers: run fixupPhase for darwin bin writers
mach-o executables we produce in writers are not always fully valid for
some reason. In normal derivation this is fixed in fixupPhase and we can
replicate this behavior here easily.

Resolves #132660.
2021-10-29 12:34:48 +02:00