Valentin Gagarin
fd78de6eeb
Merge pull request #267285 from fricklerhandwerk/code-comment
2024-01-13 20:51:37 +01:00
Ryan Lahfa
41aa423726
Merge pull request #236370 from amarshall/applypatches-nopatches
...
applyPatches: skip creating additional drv when no patches
2024-01-13 16:50:34 +01:00
Someone
bc5ed95a04
Merge pull request #275947 from SomeoneSerge/fix/cuda-cc-wrapper
...
cudaPackages.backendStdenv.cc: gccForLibs
2024-01-13 09:36:02 +00:00
Mario Rodas
19ce690703
Merge pull request #277899 from trofi/build-support-fetchgithub-fix-metadata-eval
...
build-support/fetchgithub: fix metadata eval for arguments without lo…
2024-01-12 17:56:46 -05:00
Andrew Marshall
52c27352ce
applyPatches: skip creating additional drv when no patches
...
If there are no `patches` or `postPatch`, then this will just do work to
make something equivalent to `src`. Instead, just return `src` in that
case.
2024-01-12 15:49:24 -05:00
Ryan Lahfa
d74aefe80e
Merge pull request #251267 from lilyinstarlight/fix/dotnet-installPath
...
buildDotnetModule: actually use installPath
2024-01-12 19:30:12 +01:00
Someone Serge
8eda4c36a5
cc-wrapper: cxxStdlib: expose solib and package separately
2024-01-12 17:38:00 +00:00
Rahul Butani
290ea23649
cc-wrapper: expose the c++ std library being used
...
(cherry picked from commit dc6a8f9f7912363577e11520bafa040c0db14359)
2024-01-12 17:38:00 +00:00
github-actions[bot]
5ee7600250
Merge master into staging-next
2024-01-11 12:01:18 +00:00
Maciej Krüger
f3f4f93651
Merge pull request #280003 from hacker1024/feature/dart-auto-pubspec-lock
...
buildDartApplication: Allow reading pubspec.lock with IFD
2024-01-11 09:21:59 +01:00
github-actions[bot]
28d4a2210a
Merge master into staging-next
2024-01-11 06:01:20 +00:00
John Ericson
3eb8277236
Merge pull request #278679 from kolloch/feature/build-rust-crate-without-sharedLibrary-extension
...
build-rust-crate: Allow missing `hostPlatform.extensions.sharedLibrary`
2024-01-10 21:50:54 -05:00
Weijia Wang
2f9e98ccf3
Merge branch 'master' into staging-next
2024-01-10 23:12:44 +01:00
Pascal Bach
f709ab9d6a
Merge pull request #277154 from aib/ocitools-fix-invalid-cgroup-mount-option
...
ociTools: Fix invalid cgroup mount option
2024-01-10 23:06:54 +01:00
hacker1024
778cefd464
buildDartApplication: Allow reading pubspec.lock with IFD
2024-01-10 20:29:53 +11:00
github-actions[bot]
122355be99
Merge master into staging-next
2024-01-10 00:02:18 +00:00
Robert Hensing
098ffee102
Merge pull request #279487 from bryango/checkpoint-build-polish
...
checkpointBuildTools: mkCheckpointedBuild -> mkCheckpointBuild
2024-01-09 22:30:22 +01:00
K900
838aefefc3
Merge remote-tracking branch 'origin/master' into staging-next
2024-01-09 22:42:37 +03:00
Jeff Huffman
a6671578ff
buildFHSEnv: bind dbus session bus into place when privateTmp enabled ( #278917 )
2024-01-09 18:29:53 +01:00
K900
bff9ee8862
Merge remote-tracking branch 'origin/master' into staging-next
2024-01-09 13:03:34 +03:00
Jörg Thalheim
99d3b3d7bf
Merge pull request #279486 from r-burns/exec-format-cleanup
...
treewide: simplify exec format conditionals
2024-01-09 09:44:34 +01:00
Bryan Lai
d7253bea6d
doc: polish the docs of checkpointBuildTools
...
... following suggestions from @phip1611 and @infinisil.
2024-01-09 01:34:21 +08:00
Bryan Lai
5f3aad00ff
checkpointBuildTools: minor refactor
...
Add some minor improvements of the package, and use temp files for the
source difference patch, such that it is more reliable. This follows
from the suggestions of @infinisil.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2024-01-09 01:14:48 +08:00
Martin Weinelt
ef1898454c
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/aiohappyeyeballs/default.nix
2024-01-08 16:34:52 +01:00
Bryan Lai
df62c3c87f
checkpointBuildTools: mkCheckpointedBuild -> mkCheckpointBuild
...
All other functions are in the form of `*{c,C}heckpointBuild*`, so we
deprecate the `mkCheckpointedBuild` function in favor of `mkCheckpointBuild`.
Also address some inconsistencies in the docs: some `buildOutput` should
actually be `incrementalBuildArtifacts`.
2024-01-08 19:42:16 +08:00
Valentin Gagarin
25c0077a31
doc: add note on which variables are effective
...
The build log of the following won't output `foo` as one might expect, but the
`$PATH` set by stdenv.
```nix
with import <nixpkgs> {};
runCommand "foo" { PATH = "foo"; } "echo $PATH; touch $out"
```
2024-01-08 12:16:19 +01:00
Valentin Gagarin
7ae1fdc9a7
doc: reformat
2024-01-08 12:16:03 +01:00
Ryan Burns
c324705cc3
treewide: simplify exec format conditionals
2024-01-07 17:43:33 -08:00
github-actions[bot]
2984c5a0a5
Merge master into staging-next
2024-01-08 00:02:22 +00:00
K900
790cc209ea
bintools-wrapper: fix static check platform
...
This was moved in 1a5bd697ad
,
the preceding check was updated from hostPlatform to targetPlatform, but these got missed.
2024-01-06 10:32:08 +03:00
Adam Stephens
b4c0220a22
nuke-references: add meta.mainProgram
2024-01-05 15:04:14 -05:00
github-actions[bot]
76201c62e0
Merge master into staging-next
2024-01-05 18:00:58 +00:00
Maciej Krüger
349e0c2870
Merge pull request #263345 from hacker1024/feature/pub2nix
...
dart: Use Nix instead of Pub
2024-01-05 16:34:07 +01:00
github-actions[bot]
1e290d634f
Merge master into staging-next
2024-01-05 00:02:27 +00:00
Peder Bergebakken Sundt
73148fa5a8
Merge pull request #272520 from nrabulinski/fix-fetchpijul
...
build-support/fetchpijul: Add cacert dependency, set impureEnvVars, and enable strictDeps
2024-01-05 00:51:05 +01:00
Vladimír Čunát
8a839514de
Merge branch 'master' into staging-next
2024-01-04 15:07:44 +01:00
Peter Kolloch
597f3d31d8
build-rust-crate: Allow missing hostPlatform.extensions.sharedLibrary
...
If you cross-build, sharedLibrary might not be set. E.g. for this
nixpkgs instance:
```nix
pkgs = import <nixpkgs> {
config = { };
crossSystem = {
config = "riscv32-unknown-none-elf";
rustc = {
config = "riscv32i-unknown-none-elf";
};
};
}
```
2024-01-04 12:15:32 +01:00
adisbladis
dbc85690de
Merge pull request #277335 from adisbladis/buildenv-hoist-instantiation
...
build-support/buildenv: Hoist builder instantiation
2024-01-04 12:32:40 +13:00
K900
887e96e875
Merge remote-tracking branch 'origin/master' into staging-next
2024-01-02 10:55:23 +03:00
Will Fancher
1570f54b75
Merge pull request #278128 from r-ryantm/auto-update/makeInitrdNGTool
...
makeInitrdNGTool: 0.1.0 -> 0.1.0
2024-01-01 18:14:05 -05:00
R. Ryantm
5ff7811393
makeInitrdNGTool: 0.1.0 -> 0.1.0
2024-01-01 20:10:05 +00:00
K900
6cbe5542b8
Merge pull request #276072 from lilyinstarlight/fix/cargo-workspace-root-fixup-pls
...
rustPlatform.importCargoLock: fix workspace_root detection
2024-01-01 18:42:49 +03:00
Sergei Trofimovich
6104083817
build-support/fetchgithub: fix metadata eval for arguments without locations
...
Without the change metadata evaluation fails on package like
`zammad.src` where no fields are defined in `.nix `files:
src = fetchFromGitHub (lib.importJSON ./source.json);
There evaluation fails as:
$ nix-instantiate --strict --eval --expr 'with import ./. {}; zammad.src.meta'
error:
23| # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
24| position = "${position.file}:${toString position.line}";
| ^
25| };
error: value is null while a set was expected
After the change evaluation succeeds as:
$ nix-instantiate --strict --eval --expr 'with import ./. {}; zammad.src.meta'
{ homepage = "https://github.com/zammad/zammad "; }
2023-12-31 11:44:22 +00:00
github-actions[bot]
a9cb88c7ae
Merge staging-next into staging
2023-12-31 06:01:28 +00:00
Jan Tojnar
80020c7db4
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/development/lua-modules/generated-packages.nix
; pkgs/development/lua-modules/overrides.nix
2023-12-31 02:31:32 +01:00
Sergei Trofimovich
a1422a7f8f
build-support/go: fix eval of vendorSha256
accesses
...
Before the change there was no way to poll for presence of
`vendorSha256` attribute:
$ nix-instantiate --strict --eval --expr 'with import ./. {}; _3mux.vendorSha256 or "no hash"'
error: attribute 'vendorSha256' missing
292| passthru = passthru // { inherit go goModules vendorHash; } // { inherit (args') vendorSha256; };
| ^
After the change the poll happens as expected:
$ nix-instantiate --strict --eval --expr 'with import ./. {}; _3mux.vendorSha256 or "no hash"'
"no hash"
2023-12-30 12:03:28 +10:00
adisbladis
21d3b6284c
Merge pull request #277327 from adisbladis/emacs-build-support
...
build-support/emacs: refactor
2023-12-30 13:46:03 +13:00
Vladimír Čunát
895cd4b126
ReApply PR #276943 : "melpa2nix: update to work with Emacs HEAD"
...
This reverts commit 7b623c3388
(PR #277535 ),
reversing changes made to 0aa7301173
.
2023-12-29 14:00:46 +01:00
Vladimír Čunát
de84adb292
Merge branch 'master' into staging-next
2023-12-29 14:00:30 +01:00
Vladimír Čunát
915c004e36
Revert "melpa2nix: update to work with Emacs HEAD"
2023-12-29 13:58:55 +01:00