3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6589 commits

Author SHA1 Message Date
github-actions[bot] 30ae8398a9
Merge master into staging-next 2023-05-12 12:01:26 +00:00
Ulrik Strid f05b051a58
Merge pull request #231405 from vbgl/ocaml-default-to-dune-version-3
ocamlPackages: default to version 3 of Dune
2023-05-12 12:42:40 +02:00
Vincent Laporte e7b211e3d2
ocamlPackages: default to version 3 of Dune 2023-05-12 05:50:40 +02:00
github-actions[bot] 84352fc449
Merge master into staging-next 2023-05-12 00:01:57 +00:00
Kira Bruneau d4652d33d6
Merge pull request #229770 from Misterio77/init-buildDartPackage
buildDartApplication: init
2023-05-11 14:43:20 -04:00
github-actions[bot] 387f5d9a5f
Merge master into staging-next 2023-05-11 12:01:42 +00:00
Dmitry Ivankov e0d1e77c23 bazel_5: 5.4.0->5.4.1
Also update the updater script.

https://github.com/bazelbuild/bazel/releases/tag/5.4.1

- [X] recalculate fetchAttrs digest for packages built with bazel_5
2023-05-10 16:09:19 +02:00
github-actions[bot] c3e196104d
Merge staging-next into staging 2023-05-10 06:02:13 +00:00
Alyssa Ross 376ba26812 buildRustPackage: disable auditing if it's broken
See also: ad3a532658 ("rust/cargo.nix: disable audit if audit.meta.broken")

Fixes cross eval of clippy.
2023-05-09 23:46:55 -04:00
github-actions[bot] 2d07e76d1a
Merge staging-next into staging 2023-05-10 00:03:33 +00:00
K900 f589521841
Merge pull request #230375 from lelgenio/fix-steam-beta-gsettings-schemas
steam: fix missing gsettings-schemas dependency
2023-05-09 21:35:52 +03:00
github-actions[bot] b5b52a946a
Merge staging-next into staging 2023-05-09 18:02:32 +00:00
Adam Joseph 0e9ef0a07d cc-wrapper: when merging gcc32 and gcc64, merge libgcc as well
Our gcc_multi and glibc_multi expressions merge together a
32-bit-targeted and 64-bit-targeted gcc.  However they do not thread
through the passthru.libgcc from these merged gccs.

This commit corrects that.

It also extends passthru.libgcc to allow a *list* rather than just a
single outpath.

Resolves part of #221891 (at least getting it back to the error
message it gave before).
2023-05-09 00:16:24 -07:00
lelgenio 8aafc553ae buildFHSEnv: use default values as fallback for XDG_DATA_DIRS 2023-05-08 18:56:51 -03:00
John Ericson f4868c6c7d
Merge pull request #229754 from rrbutani/fix/cc-wrapper-extra-positional-args
Support `--` in `cc-wrapper`
2023-05-08 06:55:52 -04:00
piegames 794b05a09d
Merge pull request #158968: Make fetchFromGitHub & friends overridable 2023-05-07 21:59:36 +02:00
github-actions[bot] 3510094ebe
Merge master into staging-next 2023-05-07 00:02:36 +00:00
figsoda 955f4f6512
Merge pull request #230177 from SuperSandro2000/lib-fromJSON-2
treewide: switch builtins.fromJSON(builtins.readFile ./file.json) to …
2023-05-06 14:12:43 -04:00
Sandro Jäckel 00000001b4
treewide: switch builtins.fromJSON(builtins.readFile ./file.json) to lib.importJSON ./file.json #2 2023-05-06 16:20:13 +02:00
github-actions[bot] 805ffdeca7
Merge master into staging-next 2023-05-06 12:01:05 +00:00
Et7f3 caf436a52b ocamlPackages.buildDunePackage: deprecate useDune2 2023-05-06 08:11:25 +02:00
github-actions[bot] f62c3cbbdc
Merge master into staging-next 2023-05-06 00:02:06 +00:00
Sandro cac19e0266
trivial-builders: move into the directory named alike (#223429)
While searching for something different I wondered why there is a
trivial-builders.nix file next to the trivial-builders directory where
only tests live. Lets fix that.
2023-05-06 00:16:26 +02:00
Gabriel Fontes 70d3f5c0b4
buildFlutterApplication: default vendorHash to ""
This makes it more ergonomical to use, and is consistent with
buildDartApplication.
2023-05-05 13:32:51 -03:00
Gabriel Fontes 782c8b44dd
buildDartApplication: init
This adds a function for easily packaging non-flutter dart apps.
2023-05-05 13:32:45 -03:00
github-actions[bot] 33859d6094
Merge master into staging-next 2023-05-05 00:02:09 +00:00
Lily Foster 6a6f328ef5
Merge pull request #214454 from winterqt/prefetch-npm-deps-reproducibility
prefetch-npm-deps: fix reproducibility
2023-05-04 19:15:59 -04:00
Rahul Butani 53b268ad4a
cc-wrapper: support --
Fixes #228136.
2023-05-03 16:42:15 -05:00
Ryan Lahfa 00997c5dd6
Merge pull request #228820 from alyssais/link.exe-purity
wrapBintoolsWith: support LINK.EXE-style args in purity checks
2023-05-01 16:28:49 +02:00
Vladimír Čunát 50983f16a3
Merge #229154: staging: make wrapProgram<Type> use the right wrapper
...into staging
2023-05-01 10:17:18 +02:00
github-actions[bot] 0fe0497793
Merge staging-next into staging 2023-05-01 00:03:33 +00:00
github-actions[bot] fa2258cd02
Merge master into staging-next 2023-05-01 00:02:46 +00:00
Artturi e6090800bd
Merge pull request #224178 from Yarny0/patch-ppd-files-meta 2023-04-30 21:15:46 +03:00
K900 a3cad4378e pkgs/build-support: call the right makeWrapper function from wrapProgram<Type> 2023-04-30 20:35:27 +03:00
Winter ac35d7ea86
prefetch-npm-deps: look up hashes from cache when fixing up lockfiles 2023-04-30 10:29:46 -04:00
Alyssa Ross 194ddeefd5
wrapBintoolsWith: support LINK.EXE-style args in purity checks
LLD supports Windows-style linker arguments, but these previously
triggered purity check false positives, because it saw that they
started with a '/' and assumed they were paths.

This tweaks the path detection to allow through certain values that
could be paths, but are much more likely to be LINK.EXE-style flags.
The risk of false negatives here is low — the only things we'd now
fail to catch would be attempts to link with libraries in the root
directory, which doesn't happen in practice.

We also teach the wrapper how to apply its purity checks to library
paths specified with the /LIBPATH: option.

Tested that paths we expect to be rejected (like /lib/libfoo.so) still
are.
2023-04-29 01:37:00 +00:00
Winter 7efebca89c
prefetch-npm-deps: fix reproducibility
v1 lockfiles can contain multiple references to the same version of a
package, and these references can contain different `integrity` values,
such as one having SHA-1 and SHA-512, while another just has SHA-512.

Given that HashMap iteration order isn't defined, this causes
reproducibility issues, as a different integrity value could be chosen
each time.

Thanks to @lilyinstarlight for discovering this issue originally, as well
as the idea for the sorting-based implementation.
2023-04-28 18:09:39 -04:00
github-actions[bot] e1fd5ee13e
Merge staging-next into staging 2023-04-28 12:01:49 +00:00
github-actions[bot] 85a45c2a04
Merge master into staging-next 2023-04-28 12:01:08 +00:00
Weijia Wang b2ef7956b6
Merge pull request #227560 from jackyliu16/loongnix-commit
lib.platforms.loongarch64: init
2023-04-28 13:21:42 +03:00
Alyssa Ross bfc7aaa8af wrapCCWith: disable pic when building for Windows
According to <https://gcc.gnu.org/legacy-ml/gcc-patches/2015-08/msg00836.html>,
all code is position-independent on Windows.  Some compilers
apparently warn for -fPIC on Windows, and clang errors:

> clang-15: error: unsupported option '-fPIC' for target 'x86_64-pc-windows-msvc'

I'm guessing the check was hostPlatform instead of targetPlatform by mistake.
2023-04-28 10:01:22 +00:00
jackyliu16 b522b5a887 bintools: set dynamic linker 2023-04-28 12:09:43 +03:00
github-actions[bot] 63a3bd8731
Merge staging-next into staging 2023-04-26 18:01:39 +00:00
Vladimír Čunát d6b863fd9b
Merge #226795: staging-next 2023-04-18 2023-04-26 18:35:28 +02:00
sternenseemann 1d71d2e883 buildBazelPackage: never append to fFetchAttrs.installPhase
In f8ee061247, the fallback installPhase
if fFetchAttrs.installPhase is not provided, became dynamically computed.
Due to operator precedence this had the side effect of appending to
fFetchAttrs.installPhase if it is provided, breaking custom
installPhases altogether.
2023-04-26 17:34:39 +02:00
github-actions[bot] 3f176be544
Merge staging-next into staging 2023-04-25 18:01:56 +00:00
github-actions[bot] 2e27a36b4b
Merge master into staging-next 2023-04-25 18:01:17 +00:00
toonn acc386e521
Merge pull request #223759 from 2xsaiko/outgoing/darwin-bundle
desktopToDarwinBundle: Parsing & icon conversion fixes
2023-04-25 15:38:05 +02:00
github-actions[bot] c9a253ff7f
Merge staging-next into staging 2023-04-25 12:02:03 +00:00
github-actions[bot] a39805cda2
Merge master into staging-next 2023-04-25 12:01:31 +00:00