Nick Cao
d1ff959a99
Merge pull request #240613 from SuperSandro2000/binary-cache
...
binary-cache: use lib.makeBinPath
2023-06-30 09:14:07 +08:00
github-actions[bot]
f6242f9557
Merge staging-next into staging
2023-06-30 00:03:00 +00:00
Sandro Jäckel
88888899e5
binary-cache: use lib.makeBinPath
2023-06-30 00:42:14 +02:00
Arthur Gautier
562f879cd1
runNixOSTest: adds support for lib.extend
...
When lib overrides were used, before this commit, they would not be made
available in the configuration evaluation of nixosTest's nodes.
Sample code:
``` nix
let
pkgs = import ./. {
overlays = [
(new: old: {
lib = old.lib.extend (self: super: {
sorry_dave = builtins.trace "There are no pod bay doors" "sorry dave";
});
})
];
};
in
pkgs.testers.runNixOSTest {
name = "demo lib overlay";
nodes = {
machine = { lib, ... }: {
environment.etc."got-lib-overlay".text = lib.sorry_dave;
};
};
testScript = { nodes }:
''
start_all()
machine.succeed('grep dave /etc/got-lib-overlay')
'';
}
```
2023-06-29 09:13:44 -07:00
Lily Foster
86f94c3e45
prefetch-yarn-deps: add tests passthru
2023-06-29 11:11:41 -04:00
Lily Foster
ba7a869a9a
prefetch-npm-deps: add env_logger
2023-06-29 09:51:37 -04:00
linsui
e05bacf4e8
importCargoLock: fix git dep config file
2023-06-29 21:47:27 +08:00
Lily Foster
d2897e463d
prefetch-npm-deps: use isahc instead of ureq
2023-06-29 09:46:35 -04:00
Lily Foster
aa2f51f0d2
prefetch-npm-deps: update deps and base64 usage
2023-06-29 09:46:35 -04:00
Lily Foster
9af0383296
prefetch-npm-deps: support NIX_BUILD_CORES
2023-06-29 09:46:33 -04:00
Lily Foster
19e48f0da9
buildNpmPackage: add npmWorkspace and npmPruneFlags args
2023-06-29 07:42:25 -04:00
Sandro
198bd0a4a7
Merge pull request #239622 from corngood/dotnet-misc
...
dotnet: misc fixes
2023-06-28 23:41:18 +02:00
Artturin
9999bf7a21
treewide: gobject-introspection from buildInputs to nativeBuildInputs
...
gobject-introspection should be in nativeBuildInputs for cross to work
properly (so propagations and hook work properly)
2023-06-28 22:33:40 +03:00
Lily Foster
33898b9ad7
Merge pull request #238452 from XYenon/master
...
prefetch-npm-deps: add retry
2023-06-28 14:01:57 -04:00
XYenon
4915de2600
prefetch-npm-deps: add retry
2023-06-29 00:20:25 +08:00
Winter
c9abff9027
buildNpmPackage: add lilyinstarlight as maintainer/code owner
...
This is long overdue, Lily has done more than me for Node.js in Nixpkgs
by this point.
2023-06-27 14:59:40 -04:00
Lily Foster
5c32e0ba7c
prefetch-yarn-deps: add --fixup-lockfile flag to fixup a yarn.lock ( #214062 )
...
The flag iterates through the lockfile entries, rewrites `resolved` URLs
to those that will be in the cache (like `fixup_yarn_lock` from
yarn2nix), removes `integrity` for git deps whose hash won't match the
reproducible repacking that the fetcher does, writes the amended
lockfile, and exits.
2023-06-27 20:27:33 +02:00
Janik
974b43038e
Merge pull request #236976 from amarshall/zip-reproducible
2023-06-27 00:24:36 +02:00
github-actions[bot]
4e9dcbbbc6
Merge master into staging-next
2023-06-26 18:01:29 +00:00
Michele Guerini Rocco
9e4e0807d2
Merge pull request #239658 from rnhmjoj/pr-compress-fw
...
compressFirmwareXz: preserve meta attributes
2023-06-26 17:25:16 +02:00
github-actions[bot]
2c439c14b6
Merge master into staging-next
2023-06-25 18:01:21 +00:00
Felix Buehler
6672dde558
treewide: use optionalAttrs instead of 'else {}'
2023-06-25 11:01:34 -03:00
github-actions[bot]
aa5d107299
Merge master into staging-next
2023-06-25 12:01:14 +00:00
Robert Scott
db3e94c3b2
hardening flags: enable fortify3 by default
2023-06-25 11:50:46 +01:00
rnhmjoj
4124eb7bd5
compressFirmwareXz: preserve meta attributes
...
Among other things, this preserves the package priority, which is
important when building the `hardware.firmware` environment in NixOS.
2023-06-25 11:08:32 +02:00
David McFarland
f2027f4960
nuget-to-nix: set nullglob
...
This stops nuget-to-nix from failing when there are no packages in the
output.
2023-06-24 19:13:16 -03:00
David McFarland
bca3a9edfc
buildDotnetModule: fix indentation
2023-06-24 19:13:16 -03:00
David McFarland
afe26f5f1d
buildDotnetModule: remove fetch-deps from tool packages
...
This helps if we want to run nixpkgs.*.fetch-deps. Previously
e.g. fable.fetch-deps existed, but was broken.
2023-06-24 19:13:16 -03:00
David McFarland
d6fa0f0a26
buildDotnetModule: use tmp file for fetch-deps output
2023-06-24 19:13:16 -03:00
David McFarland
cf9976de74
buildDotnetModule: unset TMPDIR instead of setting it empty
...
This was breaking nix-prefetch-url when running fetch-deps in nix-shell.
e.g.
$ TMPDIR= nix-prefetch-url foo
nix-prefetch-url: src/libutil/util.cc:119: nix::Path
nix::canonPath(PathView, bool): Assertion `path != ""' failed. [2]
881198 abort (core dumped)
2023-06-24 19:13:16 -03:00
David McFarland
9c16cea2bb
buildDotnetModule: allow lockFile path to be set in nugetDeps
...
This allows fetch-deps to find the lock-file for roslyn.
2023-06-24 17:17:41 -03:00
Felix Buehler
f3719756b5
treewide: use optionalString instead of 'then ""'
2023-06-24 20:19:19 +02:00
Fabián Heredia Montiel
79dfc50bb8
lib.systems.architectures: add microarchitecture levels
...
Variation on:
- https://github.com/NixOS/nixpkgs/pull/208398
- https://github.com/NixOS/nixpkgs/pull/224978
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
Co-authored-by: Shawn8901 <shawn8901@googlemail.com>
Co-authored-by: AveryanAlex <alex@averyan.ru>
2023-06-24 00:50:40 -06:00
Mario Rodas
922d55bf2d
fetchgit: add a default NIX_BUILD_CORES variable
...
NIX_BUILD_CORES might not be defined at runtime, so the command would
fail.
2023-06-24 04:20:00 +00:00
Peter Waller
e0d2053b87
build-support: Use response-expanded params in pie test
...
When a response file is in use, "$*" contains the response file and not
the parameters; both the linker and compiler wrappers are updated to use
the response-expanded params.
The compiler driver likes to pass parameters to the linker via a
response file, including -shared.
LLD rejects the combination of (-shared -pie), whereas other linkers
silently ignore the contradiction:
```
ld.lld: error: -shared and -pie may not be used together
```
This breaks certain configurations using LLD as a linker.
Changing `add-hardening.sh` results in a full rebuild. To avoid the
rebuild, here is a quick test case which shows the new hardening script
allows the link to succeed:
```
{ pkgs ? import <nixpkgs> {} }:
let
# gcc silently accepts -shared -pie together, lld does not.
linker = pkgs.wrapBintoolsWith { bintools = pkgs.llvmPackages.lld; };
patchWrapper = prev: prev.overrideAttrs (final: prev: let
prevScript = builtins.match (".*(/nix/store/[a-z0-9]+-add-hardening.sh).*") prev.postFixup;
in {
postFixup = (builtins.replaceStrings prevScript ["${./new-add-hardening.sh}"] prev.postFixup);
});
in
pkgs.stdenv.mkDerivation {
name = "nixpkgs-hardening-bug";
src = pkgs.writeText "src.c" "int main(int argc, char* argv[]) { return 0; }";
NIX_HARDENING_ENABLE = "pie";
unpackPhase = ":";
buildPhase = ''
$CC -c -o src.o $src
bash -x ${patchWrapper linker}/bin/ld.lld -o $out @${pkgs.writeText "responsefile" "-shared"} src.o
'';
}
```
Fixes : #178162
Signed-off-by: Peter Waller <p@pwaller.net>
2023-06-23 11:09:49 +01:00
github-actions[bot]
22e89a1418
Merge staging-next into staging
2023-06-23 00:03:31 +00:00
Sandro
67f4868a43
Merge pull request #233422 from mdarocha/crossgen-fix
...
buildDotnetModule: support ReadyToRun and native binaries inside nuget files
2023-06-22 22:26:53 +02:00
Guillaume Girol
a3a23358fc
Merge pull request #237235 from alyssais/vmTools-deb
...
nixosTests.os-prober: fix
2023-06-22 19:14:11 +00:00
github-actions[bot]
15a20aee5e
Merge staging-next into staging
2023-06-22 18:01:45 +00:00
figsoda
ca96e292cf
Merge pull request #238593 from figsoda/maturin
2023-06-22 11:36:58 -04:00
mdarocha
29e770e0eb
buildDotnetModule: support native binaries in nuget packages
...
This helps with ie. crossgen2 building, and packages that use protoc
2023-06-21 17:06:30 +02:00
mdarocha
c51141d997
buildDotnetModule: pass runtimeId whenever possible and disable trimming when not allowed.
...
This fixes up some build errors
2023-06-21 17:06:30 +02:00
github-actions[bot]
c562a088e4
Merge staging-next into staging
2023-06-21 12:02:27 +00:00
Domen Kožar
b51a53644c
Merge pull request #238733 from domenkozar/fetchgit-submodules-parallel
...
fetchgit: fetch submodules in parallel
2023-06-21 08:55:21 +01:00
figsoda
82ee5cb909
Merge pull request #236490 from alyssais/cargo-strip
2023-06-20 20:03:11 -04:00
github-actions[bot]
74d0f1c452
Merge staging-next into staging
2023-06-21 00:03:02 +00:00
mdarocha
3408b40fb5
buildDotnetGlobalTool: init
2023-06-20 17:20:52 +02:00
mdarocha
abf6081bc2
buildDotnetModule: add useDotnetFromEnv option
...
This causes an alternative wrapper to be used, that takes the dotnet
runtime from the environment.
2023-06-20 17:20:51 +02:00
mdarocha
6c639e869c
buildDotnetModule: tweaks to support paket
...
Projects that use paket, and have it setup so that it's executed
transparently during "dotnet restore" as a dotnet tool should now work.
2023-06-20 17:20:51 +02:00
Alyssa Ross
f5d8384094
rustPlatform.cargoBuildHook: don't let cargo strip
...
This fixes debug info of cloud-hypervisor, which recently added
strip = true to its release profile in Cargo.toml.
2023-06-20 09:51:42 +00:00
Domen Kožar
4f72b6af8b
fetchgit: fetch submodules in parallel
2023-06-20 10:36:10 +01:00
github-actions[bot]
d74400e7e7
Merge staging-next into staging
2023-06-20 06:02:16 +00:00
github-actions[bot]
535ef0a591
Merge staging-next into staging
2023-06-19 18:02:35 +00:00
figsoda
67a038cacf
tests.importCargoLock.maturin: reexport maturin.tests.pyo3
...
This allows the Cargo.lock to be removed, since the 2 packages are mostly identical
2023-06-19 10:42:24 -04:00
adisbladis
5f253d2521
emacs: add back support in wrapper for using passthru.treeSitter
...
The API was changed in https://github.com/NixOS/nixpkgs/pull/235859 .
2023-06-20 02:30:04 +12:00
adisbladis
3ef5accbff
emacs: add back support in wrapper for using passthru.nativeComp
...
The API was changed in https://github.com/NixOS/nixpkgs/pull/235859 .
2023-06-20 02:29:20 +12:00
Sandro
9a670fec3b
Merge pull request #237167 from CHN-beta/master
2023-06-19 14:14:03 +02:00
Ivan Trubach
ebd4619053
patch-shebangs: add a flag to update shebangs with store paths
...
This change adds a flag to update shebang paths that point to the Nix
store. This is particularly useful when a cross-compiled package uses
same script at compile-time and run-time, but the interpreter must be
changed since hostPlatform != buildPlatform.
2023-06-19 09:01:21 +03:00
github-actions[bot]
733c1988b7
Merge staging-next into staging
2023-06-19 00:02:55 +00:00
Naïm Favier
2f91f7d1c9
Merge pull request #237594 from ncfavier/runCommand-position
...
runCommand: set meta.position from the arguments
2023-06-18 21:15:27 +02:00
Sergei Trofimovich
92a4703048
Merge pull request #238133 from LibreCybernetics/add-znver4-arch
...
lib.systems: add znver4 architecture
2023-06-18 20:03:50 +01:00
github-actions[bot]
a7324a2bde
Merge staging-next into staging
2023-06-18 18:01:48 +00:00
Guillaume Girol
f8602fa508
Revert "build-rust-{crate,package}: cleanups"
2023-06-18 09:27:44 +00:00
github-actions[bot]
2f662870ac
Merge staging-next into staging
2023-06-18 06:01:52 +00:00
Artturin
3ea5e83373
writers.makePythonWriter: fix interpreter executable
2023-06-17 22:58:14 +03:00
Fabián Heredia Montiel
1b7776a3fb
lib.systems: add znver4 architecture
2023-06-16 13:47:10 -06:00
github-actions[bot]
c30d35ea7c
Merge staging-next into staging
2023-06-16 06:01:42 +00:00
github-actions[bot]
af7beed7be
Merge master into staging-next
2023-06-16 06:01:09 +00:00
figsoda
1cabbd4eec
Merge pull request #237984 from lopsided98/rustc-armv6l
2023-06-15 21:54:03 -04:00
figsoda
d2e9211860
Merge pull request #237848 from SuperSandro2000/build-rust
2023-06-15 21:50:47 -04:00
Sandro Jäckel
9a6ee48a3d
build-rust-package: remove unused input
2023-06-15 23:55:35 +02:00
Sandro Jäckel
ddad581c0d
build-rust-crate: cleanup with statix
2023-06-15 23:55:35 +02:00
Ben Wolsieffer
87ebad10d6
rustc: add armv6l-linux to platforms
...
armv6l-linux was incorrectly added to the list of platforms without host
tools in #227987 . arm-unknown-linux-gnueabihf is present in the list of
Tier 2 targets with host tools, and this target corresponds to our
armv6l-linux platform.
2023-06-15 16:56:55 -04:00
github-actions[bot]
7a92a0899d
Merge staging-next into staging
2023-06-15 00:03:01 +00:00
github-actions[bot]
c2fa140937
Merge master into staging-next
2023-06-15 00:02:27 +00:00
Naïm Favier
2e6013cf1b
runCommand: set meta.position from the arguments
...
Currently all packages defined by a call to runCommand have their
meta.position pointing to trivial-builders.nix.
This change makes uses of runCommand that supply at least one attribute
in the second argument point to the right file.
2023-06-14 23:27:45 +02:00
Weijia Wang
bbbf5574c0
buildDartApplication: add sigtool on darwin
2023-06-14 22:29:01 +03:00
Sandro
6b942b501e
Merge pull request #234235 from raphaelr/mknugetsource-support-subdirs
...
buildDotnetModule: fix `projectReferences = [ ... ]`
2023-06-14 20:12:03 +02:00
github-actions[bot]
d206bcd142
Merge staging-next into staging
2023-06-14 18:02:02 +00:00
github-actions[bot]
0f19fc4c44
Merge master into staging-next
2023-06-14 18:01:25 +00:00
Sandro
60d31a2a46
Merge pull request #207646 from Enzime/vsce/test-remote-ssh
2023-06-14 17:05:32 +02:00
Jack Kelly
6c0f4e3b10
mirrors: Remove roy
...
Roy Marples now releases his code via GitHub.
2023-06-14 17:10:36 +10:00
Artturi
84d847e91c
Merge pull request #148279 from Twey/patch-1
2023-06-14 02:02:39 +03:00
github-actions[bot]
a69b4c6b89
Merge master into staging-next
2023-06-12 18:01:15 +00:00
Atemu
328bcf4d57
Merge pull request #235859 from atorres1985-contrib/emacs-refactor
...
Emacs refactor - Round II
2023-06-12 15:31:54 +02:00
James Kay
40fbc97988
makeWrapper: fix flag handling
...
When `--add-flags` is not used, `flagsBefore` is unset. This causes an error when invoking `makeWrapper` from a context that sets `-o nounset`, as is done in `buildDotnetModule`.
This change makes `makeWrapper` safe for use in these conditions.
2023-06-11 23:14:54 +03:00
Alyssa Ross
64bfa05b36
vmTools: download debs from snapshot URLs
...
The deb files we want are no longer available in the Debian mirrors,
so we need to download them from the snapshots we download the package
lists from.
This makes it possible to build the os-prober NixOS test again.
2023-06-11 19:13:31 +00:00
chn
a41e973062
stdenv: add alderlake support
...
Signed-off-by: Haonan Chen <chn@chn.moe>
2023-06-11 21:11:03 +08:00
github-actions[bot]
b5b56fecff
Merge staging-next into staging
2023-06-11 12:02:12 +00:00
Colin
954d3794ae
fetchFromSourcehut: expose gitRepoUrl to consumers
...
notable consumers include `unstableGitUpdater`.
other git-like fetchers (`fetchFromGitHub`) already do this.
2023-06-11 09:02:34 +01:00
Vladimír Čunát
944c7fa720
Merge #235610 : cc-wrapper: try to better guess meta.mainProgram
2023-06-11 09:11:13 +02:00
github-actions[bot]
9f2767ce37
Merge staging-next into staging
2023-06-10 18:01:41 +00:00
Daniel Nagy
ca2cb9f644
treewide: "libary" -> "library"
2023-06-10 14:54:08 +01:00
Andrew Marshall
2e02abd798
fetchfirefoxaddon: make reproducible
2023-06-10 01:05:20 -04:00
Andrew Marshall
3ed22708d0
fetchfirefoxaddon: formatting
...
Had some inconsistent spacing, so ran against nixpkgs-fmt and also split
fn args into multiple lines for simpler diffs.
2023-06-10 01:05:20 -04:00
Michael Hoang
b2ff7ceff2
nixos/tests: Test that Remote SSH can patch Node
2023-06-09 18:21:41 +10:00
Anderson Torres
5d68e9014c
build-support/emacs: synchronize with emacs' modified attributes
2023-06-07 23:26:31 -03:00
github-actions[bot]
83e7490bd0
Merge staging-next into staging
2023-06-08 00:03:05 +00:00
Jack Leightcap
4c2970da7e
gcj: fix compiler
...
Signed-off-by: Jack Leightcap <jack@leightcap.com>
2023-06-07 01:42:02 -04:00
github-actions[bot]
9634f361e8
Merge staging-next into staging
2023-06-06 00:02:59 +00:00
Rick van Schijndel
6cdf7259d0
Merge pull request #235898 from panicgh/fetchgit-sparse-checkout-failhard
...
fetchgit: require sparseCheckout be a list of strings
2023-06-05 22:53:19 +02:00
figsoda
cfb9c8858e
Merge pull request #235438 from figsoda/rustc
2023-06-04 15:06:24 -04:00
github-actions[bot]
22e7031b28
Merge master into staging-next
2023-06-04 18:00:59 +00:00
figsoda
df34ed4185
Merge pull request #235204 from figsoda/text2
2023-06-04 13:02:55 -04:00
Nicolas Benes
52f3a1c42c
fetchgit: require sparseCheckout be a list of strings
...
Passing a (multi-line) string was deprecated in #200082 in favour of
list of strings, but still supported (with warning). Now, enforce use of
list of strings.
2023-06-04 10:04:31 +02:00
figsoda
f4a6750079
rustPlatform.fetchCargoTarball: remove explicit sparse protocol
...
sparse protocol is now the default since rust 1.70
2023-06-02 21:28:57 -04:00
Vladimír Čunát
295ff35f24
cc-wrapper: try to better guess meta.mainProgram
...
Otherwise nix will guess it from (p)name which contains "-wrapper".
Fixes #235585
2023-06-02 17:32:06 +02:00
github-actions[bot]
8b93c4f667
Merge staging-next into staging
2023-06-02 00:03:07 +00:00
Andrew Brooks
04147e058d
fetchurl: remove mirror kent.dl.sourceforge.net
...
The kent.dl.sourceforge.net domain doesn't seem to exist anymore. Because it's
not usable, this commit removes it from the list of sourceforge mirrors.
2023-06-01 15:30:14 -05:00
figsoda
137dd249c5
writeTextFile: revert workaround for executable = null
2023-05-31 09:25:18 -04:00
fetsorn
29f3903f62
nix-prefetch-git: fix typo
2023-05-31 04:00:32 +04:00
fetsorn
3565fdf30c
pkgs/build-support: fix typos
2023-05-31 04:00:14 +04:00
Yueh-Shun Li
aea73adfdd
buildGo{Module,Package}: remove input argument "tags"
...
Unify how ldflags and tags are passed
2023-05-31 07:14:18 +10:00
zowoq
a91f6eba1e
buildGoPackage: remove ldflags and with builtins
...
as done for buildGoModule in abd5dfa0133be02ada9e
2023-05-31 07:14:18 +10:00
Guillaume Maudoux
9c289b427e
Merge pull request #234994 from layus/autopatchelf-single-files
...
autoPatchelfHook: Add support for single files
2023-05-30 14:31:47 +02:00
github-actions[bot]
7443b1efc5
Merge staging-next into staging
2023-05-30 12:01:46 +00:00
github-actions[bot]
8ca315db3e
Merge master into staging-next
2023-05-30 12:01:07 +00:00
Guillaume Maudoux
dd0dee4c97
autoPatchelfHook: Add support for single files
2023-05-30 13:48:30 +02:00
zowoq
304940d98e
buildGoModule: format
...
Co-authored-by: Yueh-Shun Li <shamrocklee@posteo.net>
2023-05-30 19:30:06 +10:00
github-actions[bot]
1df97aede2
Merge staging-next into staging
2023-05-30 00:02:56 +00:00
github-actions[bot]
ceb7ed5e38
Merge master into staging-next
2023-05-30 00:02:21 +00:00
figsoda
4431bab003
writeTextFile: fix when executable is not a bool
2023-05-29 15:48:49 -04:00
github-actions[bot]
5611fa71ab
Merge staging-next into staging
2023-05-29 18:01:43 +00:00
github-actions[bot]
698b4f4f63
Merge master into staging-next
2023-05-29 18:01:07 +00:00
figsoda
c82114ce5d
Merge pull request #234454 from figsoda/bin
2023-05-29 11:47:11 -04:00
github-actions[bot]
a0de937efb
Merge staging-next into staging
2023-05-29 12:02:05 +00:00
Sergei Trofimovich
e1356f9958
Merge pull request #232075 from trofi/gcc12-update
...
gcc12: 12.2.0 -> 12.3.0
2023-05-29 10:05:32 +01:00
Vladimír Čunát
2f9191eb88
Merge branch 'master' into staging-next
2023-05-29 08:14:18 +02:00
github-actions[bot]
3854041668
Merge master into staging-next
2023-05-28 18:01:12 +00:00
figsoda
d456b861b8
fetchCrate: fix registryDl
...
follow up to #234066 , since I made a mistake
2023-05-28 13:20:03 -04:00
figsoda
44f8292544
Merge pull request #234066 from figsoda/crate
2023-05-28 13:13:42 -04:00
github-actions[bot]
98bba575c0
Merge master into staging-next
2023-05-28 06:01:07 +00:00
Winter
f9138c5ad6
npmHooks.npmInstallHook: allow disabling npm prune invocation
...
In some odd scenarios, `npm prune` either fails, or hangs. I have no idea
what could possibly be wrong at the moment, but let's provide an escape
hatch for packages that can still use the rest of the install hook's
functionality.
2023-05-28 00:47:54 -04:00
github-actions[bot]
7dd6245c3c
Merge master into staging-next
2023-05-28 00:02:31 +00:00
Yueh-Shun Li
1a89cfae1f
buildGoModule: simplify go-module attribute structure without rebuild
2023-05-28 07:50:02 +10:00
figsoda
4b94ae4bc6
writeTextFile: set meta.mainProgram based on destination
2023-05-27 12:39:53 -04:00
Sergei Trofimovich
5d119a26aa
mirrors/gcc: push 'bigsearch' lower
...
For some reason 'bigsearch' only partially mirrored 'gcc-12.3.0' and
still lacks the tarballs after a few weeks. Let's use next available
mirror.
2023-05-27 12:32:13 +01:00
github-actions[bot]
8f73f12f12
Merge master into staging-next
2023-05-27 00:02:24 +00:00
zowoq
0ba51a51f8
buildGoModule: alias vendorSha256 to vendorHash
2023-05-27 09:19:47 +10:00
github-actions[bot]
73ddcacb58
Merge master into staging-next
2023-05-26 18:01:05 +00:00
Raphael Robatsch
0d29814880
mkNugetSource: Also copy .nupkg files from subdirectories
...
Previously only .nupkg files directly in the deps directory were copied.
This is a regression because it breaks `projectReferences = [ ... ];` in
buildDotnetModule.
2023-05-26 16:18:07 +02:00
Ilan Joselevich
2b54d69007
Merge pull request #234072 from ShamrockLee/write-script-bin-mainprogram
...
writeScriptBin, writeShellScriptBin: add meta.mainProgram automatically
2023-05-26 17:07:42 +03:00
github-actions[bot]
fced6fe69b
Merge master into staging-next
2023-05-26 00:02:17 +00:00
Yueh-Shun Li
b29d5f60b8
writeScriptBin, writeShellScriptBin: add meta.mainProgram automatically
2023-05-26 04:54:03 +08:00
figsoda
545206f936
fetchCrate: allow overriding registryDl
...
This will allow `rustPlatform.importCargoLock` to use `fetchCrate`
directly instead of including its own implementation.
2023-05-25 16:29:01 -04:00
Cole Helbling
3e63608c7b
makeInitrdNGTool: better errors
...
It's extremely frustrating seeing "Error: Os { code: 13, kind:
PermissionDenied, message: "Permission denied" }" without any hint as to
where exactly that occurred.
This commit fixes that by adding context to most errors.
2023-05-25 13:26:05 -07:00
github-actions[bot]
a048bbb694
Merge staging-next into staging
2023-05-25 00:02:48 +00:00
figsoda
3be02ada9e
buildGoModule: remove unused lambda parameters
2023-05-24 11:58:12 -04:00
figsoda
abd5dfa013
buildGoModule: remove unused with builtins;
2023-05-24 11:56:21 -04:00
github-actions[bot]
8b49a663b0
Merge staging-next into staging
2023-05-22 18:02:03 +00:00
Atemu
d5f0da152a
Revert "Merge pull request #230693 from Atemu/fix/fhsenv-escape-runScript-path"
...
This reverts commit 840f2e0ac5d3ed0402e5
2023-05-22 11:34:04 -03:00
github-actions[bot]
0a501274a4
Merge staging-next into staging
2023-05-22 06:01:38 +00:00
Winter
9117f01272
npmHooks.npmConfigHook: add npmRoot option
2023-05-21 17:26:22 -04:00
github-actions[bot]
fe05fe6f64
Merge staging-next into staging
2023-05-21 18:02:06 +00:00
Lily Foster
9f6f397165
Merge pull request #206477 from winterqt/build-npm-package-patch-npm
...
buildNpmPackage: patch npm to work around various roadblocks
2023-05-21 11:16:56 -04:00
github-actions[bot]
185bd73d28
Merge staging-next into staging
2023-05-21 12:01:53 +00:00
Ryan Hendrickson
0f6712d45a
nix-prefetch-git: redirect git lfs to stderr
2023-05-21 09:05:49 +02:00
Winter
9f264f69f8
buildNpmPackage: use nodejs patch flag to work around roadblocks
2023-05-20 18:29:43 -04:00
github-actions[bot]
2881fdf82f
Merge staging-next into staging
2023-05-20 12:01:51 +00:00
figsoda
98b9e41f61
pkgs: fix typos
2023-05-19 22:31:04 -04:00
github-actions[bot]
4c15bc4505
Merge staging-next into staging
2023-05-19 00:02:49 +00:00
figsoda
9a7fd959fa
Merge pull request #228928 from DeeUnderscore/fix/replace-workspace-values-bool
2023-05-18 14:54:12 -04:00
github-actions[bot]
3ff58508a4
Merge staging-next into staging
2023-05-18 18:01:50 +00:00
Atemu
840f2e0ac5
Merge pull request #230693 from Atemu/fix/fhsenv-escape-runScript-path
...
buildFHSEnvBubblewrap: escape runScript path
2023-05-18 18:02:04 +02:00
github-actions[bot]
7c054a987b
Merge staging-next into staging
2023-05-17 12:02:19 +00:00
Weijia Wang
6b456c252b
Merge pull request #162447 from thefloweringash/remove-references-to-region
...
removeReferencesTo: correct region reference in fixupHook
2023-05-17 12:34:28 +03:00
Guillaume Maudoux
33399c9de8
Merge pull request #229008 from whonore/dafny-4
...
dafny: 2.3.0 -> 4.0.0
2023-05-17 09:53:06 +02:00
gilice
8991fac305
flutter: build-support: allow customizing wrapProgram args
2023-05-14 17:10:49 +02:00
github-actions[bot]
0b21b8d8a6
Merge master into staging-next
2023-05-13 06:01:08 +00:00
Maciej Krüger
0294e83aaa
Merge pull request #231319 from hacker1024/package/flutter-3.10
...
flutter: 3.7.12 -> 3.10.0
2023-05-13 03:14:42 +02:00
github-actions[bot]
2f665c348c
Merge master into staging-next
2023-05-13 00:02:05 +00:00
Lin Jian
133075787b
emacs.pkgs.trivialBuild: generate autoload file
2023-05-12 20:42:09 -03:00
github-actions[bot]
206417b7a2
Merge master into staging-next
2023-05-12 18:01:18 +00:00
Jacek Galowicz
cc8e4ed375
Merge pull request #225313 from hercules-ci/testers-runNixOSTest
...
testers.runNixOSTest: init
2023-05-12 16:04:26 +02:00
Sandro
1f4ba79877
Merge pull request #229851 from raphaelr/mknugetsource-without-nuget
2023-05-12 16:04:20 +02:00
hacker1024
fdbb342402
dart: Properly set the dependency list derivation name
2023-05-12 23:09:41 +10:00
hacker1024
b511926a89
dart: Use doPubGet when generating the dependency list
2023-05-12 23:09:41 +10:00
hacker1024
49ce83d5b4
dart: Spoof Git dependency version checks
2023-05-12 23:04:33 +10:00
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
Robert Hensing
ac1134f321
testers.runNixOSTest: init
...
An up to date alternative to pkgs.nixosTest
2023-05-11 19:12:07 +02:00
github-actions[bot]
387f5d9a5f
Merge master into staging-next
2023-05-11 12:01:42 +00:00
Atemu
cd96817b29
buildFHSEnvBubblewrap: escape runScript path
...
Fixes https://github.com/NixOS/nixpkgs/issues/230651
Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
2023-05-11 08:28:05 +02: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
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
Raphael Robatsch
d347b0400c
mkNugetSource: remove mono from build closure
...
A directory full of *.nupkg files is a valid nuget source. We do not need mono
and the Nuget command line tool to create this structure. This has two
advantages:
- Nuget is currently broken due to a kernel bug affecting mono (#229476 ).
Replacing the mkNugetSource implementation allows affected users on 6.1+
kernels compile .NET core packages again.
- It removes mono from the build closure of .NET core packages. .NET core
builds should not depend on .NET framework tools like mono.
There is no equivalent of the `nuget init` command in .NET core. The closest
command is `dotnet nuget push`, which just copies the *.nupkg files around
anyway, just like this PR does with `cp`.
`nuget init` used to extract the *.nuspec files from the nupkgs, this new
implementation doesn't. .NET core doesn't care, but it makes the license
extraction more difficult. What was previously done with find/grep/xml2 is now
a python script (extract-licenses-from-nupkgs.py).
2023-05-05 18:38:06 +00: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
Guillaume Maudoux
6efefdc8c1
buildDotnetModule: add support for dotnet tools
2023-04-29 18:54:04 -04:00
D Anzorge
38fb742663
rustPlatform.importCargoLock: fix [package] section handling
...
Members of the [package] table in Cargo.toml can be either subtables, or
values like strings and bools. Python is happy to check for membership
of "workspace" in a string, since Python strings are iterables, but if
the value is a bool, Python will throw an exception.
2023-04-29 21:05:05 +02: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
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
piegames
a205795c8a
treewide: Make some fetchers overridable
2023-04-22 22:29:23 +02: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
