Commit Graph

6569 Commits

Author SHA1 Message Date
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
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
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
Maciej Krüger
9096817104
Merge pull request #201027 from hacker1024/patch-3 2023-04-25 11:16:53 +02:00
Alyssa Ross
57e73d23bb rustc,rustPlatform.buildRustPackage: broaden platforms
rustc supports way more platforms than Linux and Darwin.  We might not
be able to build it for every platform at the moment, but that's what
meta.broken is for.

There are other platforms that rustc can produce binaries for, but
can't run on itself, so those are listed in the defaults for
buildRustPackage.
2023-04-25 08:27:59 +00:00
github-actions[bot]
26e826e1f8
Merge staging-next into staging 2023-04-25 06:02:14 +00:00
github-actions[bot]
497ac06266
Merge master into staging-next 2023-04-25 06:01:40 +00:00
hacker1024
c4cbf526e9 Merge remote-tracking branch 'NixOS/master' into feature/futter-linux-desktop 2023-04-25 12:51:56 +10:00
Lily Foster
6fd6ce1094
Merge pull request #206476 from winterqt/prefetch-npm-deps-git-dev-deps
prefetch-npm-deps: download dev deps for git deps with install scripts
2023-04-24 20:26:32 -04:00
github-actions[bot]
405bff2673
Merge staging-next into staging 2023-04-25 00:02:39 +00:00
github-actions[bot]
9908dfacfa
Merge master into staging-next 2023-04-25 00:02:08 +00:00
Alyssa Ross
90a8b9e3fe rustPlatform.buildRustPackage: fix cross
.override breaks splicing, so this was using the shell for the host
platform.
2023-04-24 19:43:39 +00:00
Guillaume Girol
56009de17d
Merge pull request #227762 from raboof/separate-debug-info-deterministically
setup-hooks/separate-debug-info.sh: make deterministic
2023-04-23 13:41:09 +00:00
Arnout Engelen
9156daa547
setup-hooks/separate-debug-info.sh: make deterministic
If multiple files with the same build id were found, we silently randomly
overwrote one with the other.

Change the order to make the output deterministic, and emit a
warning when overwriting.
2023-04-23 11:53:47 +02:00
github-actions[bot]
cf8e955712
Merge master into staging-next 2023-04-23 00:02:24 +00:00
Weijia Wang
1d76b4d7f1
Merge pull request #227634 from GenericNerdyUsername/requireFile-hash
`requireFile`: allow using `hash` instead of `sha256`/`sha1`
2023-04-22 23:42:32 +03:00
Weijia Wang
a6cf8594cb
Merge pull request #227510 from wegank/fhs-aarch64
buildFHSEnv: restrict pkgsi686Linux to x86_64-linux
2023-04-22 22:00:35 +03:00
github-actions[bot]
c1093794b3
Merge master into staging-next 2023-04-22 18:00:58 +00:00
GenericNerdyUsername
3687bee81c
requireFile: allow using hash instead of sha256/sha1 2023-04-22 16:02:34 +01:00
hacker1024
89bb0ed91b flutter.buildFlutterApplication: Add an option to generate the dependency list with IFD
This is useful for projects outside of Nixpkgs.
2023-04-23 00:32:24 +10:00
hacker1024
9f05297dc8 flutter.buildFlutterApplication: Manually supply the dependency list
This removes the need for IFD.
2023-04-23 00:12:45 +10:00
Artturi
5fd9ce4fa7
Merge pull request #190610 from amjoseph-nixpkgs/pr/build-rust-crate/gdk3 2023-04-22 15:45:56 +03:00