3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5159 commits

Author SHA1 Message Date
github-actions[bot] b74b591fbe
Merge master into staging-next 2022-01-20 00:01:46 +00:00
Andreas Rammhold 31e5b8dc21
Remove myself from maintainers
I don't have time and energy to deal with all of this anymore.
2022-01-20 00:24:52 +01:00
github-actions[bot] 0fdca24272
Merge master into staging-next 2022-01-19 00:01:38 +00:00
Linus Heckemann f76bef6136
Merge pull request #145258 from Ma27/steam-resolv-conf-override
steam: fix `/etc/resolv.conf` reference in FHS env
2022-01-18 22:59:08 +01:00
github-actions[bot] d1d6f982a8
Merge master into staging-next 2022-01-16 18:00:59 +00:00
Pavol Rusnak 5c32667d6e
Merge pull request #154677 from IvarWithoutBones/dotnetModule-installphase
buildDotnetModule: wrap executables in preFixup
2022-01-16 15:22:54 +01:00
github-actions[bot] 0173b359a6
Merge master into staging-next 2022-01-16 12:01:11 +00:00
Christian Kampka b648a4742e
skawarePackages.buildPackage: reformat with nixpkgs-fmt 2022-01-15 22:06:56 +01:00
Christian Kampka bb88853516
skawarePackages: fix llvm build 2022-01-15 21:56:26 +01:00
Jörg Thalheim 37ed2951d2
libredirect: improve musl support (#154039)
__nss_files_open is glibc only. Also mark some linux specific system
calls as such for better portability with other unixes.
2022-01-12 01:35:23 -05:00
IvarWithoutBones fcbd429742 buildDotnetModule: wrap executables in preFixup
Not doing this used to break wrapGAppsHook as gappsWrapperArgs is set in preFixup, but it was used in installPhase
2022-01-12 00:23:53 +01:00
Jan Tojnar f7aa55946b 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
;	pkgs/build-support/libredirect/default.nix
2022-01-10 01:26:05 +01:00
Graham Christensen de94824ee4
Merge pull request #153457 from heyarne/bugfix/build-graalvm-native-image-utf8
buildGraalVmNativeImage: enable utf-8 by default
2022-01-09 09:14:29 -05:00
github-actions[bot] 3ce63131a1
Merge master into staging-next 2022-01-09 00:01:57 +00:00
Robert Hensing 91917122d3
Merge pull request #126718 from roberth/testEqualDerivation
testEqualDerivation: init
2022-01-08 21:44:21 +01:00
Robert Hensing d75b85c5dc
Merge pull request #147690 from pasqui23/hosts
concatTextFile: init
2022-01-08 20:40:31 +01:00
github-actions[bot] b40a01817b
Merge master into staging-next 2022-01-08 18:01:00 +00:00
Robert Hensing c555a4e329 testEqualDerivation: init 2022-01-08 15:18:57 +01:00
Dmitry Bogatov 17577f6b54
pkgsStatic.libredirect: print error message why it won't work
The whole point of libredirect is manipulation with LD_PRELOAD, which is not
supposed to work on static builds.
2022-01-08 14:14:35 +00:00
github-actions[bot] cf7efe1192
Merge staging-next into staging 2022-01-08 12:01:36 +00:00
Dmitry Kalinkin 477540469e
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/gradient-utils/default.nix
	pkgs/development/python-modules/gradient/default.nix
2022-01-08 02:39:35 -05:00
Jonas Chevalier 1e910209ae
mkShell: make it buildable (#153194)
When I designed `mkShell`, I didn't have a good idea of what the output
should look like and so decided to make the build fail. In practice,
this causes quite a bit of confusion and complications because now the
shell cannot be part of a normal package set without failing the CI as
well.

This commit changes that build phase to record all the build inputs in a
file. That way it becomes possible to build it, makes sure that all the
build inputs get built as well, and also can be used as a GC root.
(by applying the same trick as #95536).

The documentation has also been improved to better describe what mkShell
does and how to use it.
2022-01-08 01:54:04 +01:00
Moritz Angermann 38377ab026
libredirect: build fat library for x86_64, arm64, arm64e on darwin (#153441)
macOS's dyld can be rather picky as to what dylib it accepts. This
even changes across macOS versions. Therefore we now build a fat
dylib with all three architectures (x86_64, arm64, arm64e). This
should then be compatible with pretty much any macOS's dyld.
2022-01-07 18:32:21 -05:00
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
Pasquale 86e2880d11
tests.concat: added empty case 2022-01-04 23:14:50 +01:00
heyarne ce9b3a3723 buildGraalVmNativeImage: enable utf-8 by default
The tools built with buildGraalVmNativeImage have broken UTF-8 support
when not properly setting the locale, e.g.

$ bb -e '(prn "bépo àê")'
"b??po ????"

This commit sets the locale to en_US.UTF-8 by default, which fixes that.
2022-01-04 09:56:34 +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
Pasquale 5187d2cd8f
concatText: test now works 2021-12-30 13:12:34 +01:00