3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4954 commits

Author SHA1 Message Date
github-actions[bot] cd8fe24249
Merge master into staging-next 2021-11-19 06:01:08 +00:00
Artturi d9e8a587e1
Merge pull request #128126 from wentasah/chrootenv-opt 2021-11-19 04:40:34 +02:00
github-actions[bot] c83cfc58e5
Merge master into staging-next 2021-11-19 00:01:26 +00:00
Janne Heß ecf388e90b
vmTools: Make msize larger to silence warning
See https://issues.guix.gnu.org/47225
2021-11-18 21:21:49 +01:00
github-actions[bot] c77daf4da1
Merge master into staging-next 2021-11-17 18:00:59 +00:00
Andreas Rammhold 48de1b8ed8
Merge pull request #142699 from steveeJ-forks/fix-import-cargo-lock
rust: find nested packages in git repositories
2021-11-17 13:31:57 +01:00
github-actions[bot] f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
Sandro e0d488f1a3
Merge pull request #140911 from sersorrel/copy-desktop-items 2021-11-17 02:40:57 +01:00
github-actions[bot] 90829d83e5
Merge master into staging-next 2021-11-17 00:01:49 +00:00
Robert Hensing 1023e5ea4c
Merge pull request #145511 from SuperSandro2000/fetchformgithub
fetchgithub: fix eval when passing forceFetchGit
2021-11-17 00:16:29 +01:00
github-actions[bot] 69a9c90876
Merge staging-next into staging 2021-11-16 00:02:03 +00:00
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
John Ericson 5a7f6e1f18
Merge pull request #144839 from l0b0/fix-redirect
pkgs/build-support: Redirect to standard error rather than file "2"
2021-11-13 21:56:43 -05:00
github-actions[bot] 914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot] 4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
Alyssa Ross 26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +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] e972a20a60
Merge staging-next into staging 2021-11-13 00:02:24 +00: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] 40a54af057
Merge staging-next into staging 2021-11-12 00:01:59 +00: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
Sandro Jäckel 597e2ce523
fetchgithub: fix eval when passing forceFetchGit 2021-11-11 17:28:35 +01:00
Victor Engmark 8ed1104a4a pkgs/build-support: Redirect to standard error rather than file "2" 2021-11-11 18:14:21 +13:00
github-actions[bot] 62b9b0d9e8
Merge staging-next into staging 2021-11-11 00:02:20 +00: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] d5964b8c81
Merge staging-next into staging 2021-11-10 00:02:09 +00: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
Victor Engmark 3ce3e50053
Quote variable references (#144838)
* pkgs/build-support: Quote variable name

* pkgs/build-support: Quote variable reference

* pkgs/build-support: Quote variable references

Leads to a minor behavior change: there's no trailing space in the
output when `[[ "$linkType" == "static-pie" ]]` is true.
2021-11-09 19:55:40 +09: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
Victor Engmark 0383d1c760 pkgs/build-support: Remove unused local variable 2021-11-09 01:25:34 +09: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