Commit graph

5128 commits

Author SHA1 Message Date
github-actions[bot] 1342506d40
Merge staging-next into staging 2022-01-07 00:04:19 +00:00
github-actions[bot] 4da57fcb62
Merge master into staging-next 2022-01-07 00:01:42 +00:00
Renaud 952aa6f820
Merge pull request #148606 from McSinyx/fetch-srht-recurse
fetchFromSourcehut: allow recursive fetching
2022-01-06 22:55:23 +01:00
github-actions[bot] d6a3b9cec5
Merge staging-next into staging 2022-01-04 06:01:41 +00:00
github-actions[bot] 872c4bf219
Merge master into staging-next 2022-01-04 06:01:03 +00:00
github-actions[bot] 25662d01ae
Merge staging-next into staging 2022-01-04 00:02:40 +00:00
Dmitry Kalinkin 7a95bc1b14
garble: mark as broken on darwin 2022-01-03 18:53:54 -05:00
Martin Weinelt 11a0b61783 Merge remote-tracking branch 'origin/master' into staging-next 2022-01-03 23:21:08 +01:00
Nguyễn Gia Phong b97ccaa18d
fetchFromSourcehut: allow recursive fetching 2022-01-03 16:37:16 +07:00
Sandro 5f58402c94
fetchurl: also check certificate when using all zero hash (#152608) 2022-01-02 13:01:17 +01:00
Ben Pye 29b40b07db fhs-userenv-bubblewrap: allow additional arguments to bwrap 2022-01-01 16:53:27 -08:00
Ryan Burns 85cc2c3e8a
Merge pull request #152829 from r-burns/libredirect-musl
[staging] libredirect: fix musl build
2022-01-01 14:51:56 -08:00
Moritz Angermann 14996789a1
Check link type based on expanded parameters
So far we've ignored response files in arguments, and did not
check linkType against expanded parameters.  This means if
we have `-static` in a @reponse-file, linkType will not be
set to `-static` as we never check against the expanded arguments
from response files.
2022-01-01 20:30:56 +08:00
github-actions[bot] 38dc27dab2
Merge staging-next into staging 2022-01-01 00:02:16 +00:00
github-actions[bot] c30032af77
Merge master into staging-next 2022-01-01 00:01:38 +00:00
Yana Timoshenko 719567e91f maintainers: update personal details 2021-12-31 21:48:55 +03:00
github-actions[bot] f2adf20b71
Merge staging-next into staging 2021-12-31 18:01:40 +00:00
github-actions[bot] df24694c45
Merge master into staging-next 2021-12-31 18:01:05 +00:00
Jörg Thalheim 2b91ac56ad
Merge pull request #152458 from alyssais/vmTools-test
vmTools/test: fix
2021-12-31 15:48:41 +00:00
Jörg Thalheim d6fee2a44a vmTools/test: fix pcmanfm instead of pan
This goes much quicker. Also disable parallel build for machines with
many cores to avoid running out of memory.
2021-12-31 16:47:22 +01:00
Jan Tojnar d995596052 Merge branch 'staging-next' into staging
; Conflicts:
;	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
;	nixos/doc/manual/release-notes/rl-2205.section.md
2021-12-31 15:32:37 +01:00
Jan Tojnar 380c030740 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/python-modules/aiohttp-socks/default.nix
;	pkgs/development/python-modules/emv/default.nix
;	pkgs/development/python-modules/mocket/default.nix
;	pkgs/development/python-modules/types-protobuf/default.nix
2021-12-31 07:26:03 +01:00
Ryan Burns 830900ff6a libredirect: fix musl build 2021-12-30 15:29:30 -08:00
IvarWithoutBones 612f808fcc buildDotnetModule: stop passthru attributes from being overwritten 2021-12-30 18:55:03 +01:00
Yureka c420487e0b fetchYarnDeps: support more url types 2021-12-30 11:13:25 +01:00
Alyssa Ross 37c5db5a29
vmTools/test: add missing backing format 2021-12-28 13:10:16 +00:00
Alyssa Ross 80b5b4917c
vmTools/test: give pan build more memory 2021-12-28 13:10:15 +00:00
Alyssa Ross 55b883448e
vmTools.buildRPM: properly derive source name
This fixes e.g. building the rpm of patchelf as in
pkgs/build-support/vm/test.nix.  The glob won't work if there are
multiple spec files but I don't think rpmbuild would work in that case
either.
2021-12-28 13:10:13 +00:00
Alyssa Ross e0455e1e29
vmTools: fix phases
These gave missing attribute errors.  They should have been written as
strings in ae9337179b.

Fixes: ae9337179b ("vm: deprecate phases")
Fixes: 52b10ee872 ("vmTools refactor: don't use huge `with pkgs;`")
2021-12-28 13:10:11 +00:00
Alyssa Ross 812fe6a2b3
vmTools/test: update for new releases 2021-12-28 12:40:57 +00:00
github-actions[bot] 6c181e1244
Merge staging-next into staging 2021-12-28 12:01:59 +00:00
github-actions[bot] 2e759d4fd0
Merge master into staging-next 2021-12-28 12:01:23 +00:00
Jörg Thalheim 61d501ee3f
Merge pull request #152197 from K900/patch-3
rust/hooks: ensure the build output ends up in the right place
2021-12-28 11:33:07 +00:00
Gabriella Gonzalez 07f1f2ca9c
makeWrapper: Add --prefix-each flag (#145104)
This is for symmetry with `--suffix-each`, and also because
(in my limited experience), `--prefix-each` is more useful since it
ensures that the new entries superseded the existing `PATH` entries
2021-12-27 22:15:06 -08:00
Naïm Favier 10ec5da56e tests.trivial-builders.overriding: update after shellDryRun 2021-12-27 20:30:01 -05:00
Naïm Favier f2065d81ad stdenv/generic: introduce shellDryRun
Add `shellDryRun` to the generic stdenv and substitute it for uses of
`${stdenv.shell} -n`. The point of this layer of abstraction is to add
the flag `-O extglob`, which resolves #126344 in a more direct way.
2021-12-27 20:30:01 -05:00
Thiago Kenji Okada 24f9dcd06b buildGraalvmNativeImage: fix meta 2021-12-27 19:49:52 -03:00
K900 deb7e771aa rust/hooks: ensure the build output ends up in the right place
Otherwise cargoInstallHook can fail to find and actually install it.
2021-12-26 11:04:07 +03:00
Dmitry Kalinkin 2ddda43924
Merge branch 'staging' into staging-next
Conflicts:
	pkgs/os-specific/linux/kernel/common-config.nix
2021-12-25 17:16:26 -05:00
Dmitry Kalinkin 2ab60f6132
Merge pull request #146205 from expipiplus1/ellie-libsurvive2
lapack: include lapacke_utils.h in alternatives/lapack
2021-12-25 17:07:33 -05:00
github-actions[bot] b7f2d2da61
Merge master into staging-next 2021-12-24 00:01:44 +00:00
Felix Buehler 81eb599e8d nuget-to-nix: update to use pname instead of name 2021-12-23 22:47:34 +01:00
Felix Buehler 989e950f48 buildDotnetPackage: rename baseName to pname 2021-12-23 22:46:35 +01:00
github-actions[bot] 5e2c1acfa3
Merge master into staging-next 2021-12-22 18:01:00 +00:00
Tomas Bravo 80ab168c4a nix-prefetch-git: fix incorrect mktemp usage 2021-12-22 16:45:18 +01:00
Pavol Rusnak 4c252f40af
Merge pull request #151468 from IvarWithoutBones/dotnetmodule-tests
buildDotnetModule: restore and build testProjectFile
2021-12-22 15:12:09 +01:00
github-actions[bot] 39d035c4cf
Merge master into staging-next 2021-12-22 00:01:35 +00:00
Doron Behar 203bc068e0
Merge pull request #151573 from ncfavier/make-binary-wrapper/mkdir 2021-12-21 20:37:06 +02:00
Naïm Favier ffdf9681ab
makeBinaryWrapper: create destination directory 2021-12-21 18:22:49 +01:00
IvarWithoutBones e0b652c3cb buildDotnetModule: restore and build testProjectFile 2021-12-20 22:31:18 +01:00