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#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
adisbladis
dda7578745
build-support/buildenv: Hoist builder instantiation
2023-12-29 03:04:46 +13:00
adisbladis
3618d1d247
build-support/emacs: refactor
...
- Remove superflous `let` with `defaultMeta`
These can just be assigned to meta directly instead.
- Hoist internal intermediate derivation
- Remove top-level `with lib`
- Inherit `lib`/`builtins` into scopes
2023-12-29 02:38:57 +13:00
github-actions[bot]
1528aeb0b6
Merge staging-next into staging
2023-12-28 06:01:31 +00:00
github-actions[bot]
f4041e23e9
Merge master into staging-next
2023-12-28 06:01:05 +00:00
Orhan "aib" Kavrakoglu
a8c6febd15
ociTools: Fix invalid cgroup mount option
2023-12-27 19:41:07 +01:00
FlafyDev
5a5db92870
buildDartApplication: remove customSourceBuilders from baseDerivation
2023-12-26 21:57:46 +02:00
FlafyDev
65b0c270c2
pub2nix: Add disclaimer why not to use fetchTarball
2023-12-26 21:54:30 +02:00
FlafyDev
b0a2d432da
buildDartApplication: fix note about fixed-output derivation
2023-12-26 21:50:50 +02:00
FlafyDev
e827619c11
buildDartApplication: remove unused pubGetScript and generatePubspecLock
2023-12-26 21:49:22 +02:00
Steve Purcell
4f12789c35
melpa2nix: update to work with Emacs HEAD
...
We now use a newer version of package-build, since
previously-necessary functions have been moved/removed from package.el
Emacs 30. See https://github.com/melpa/package-build/pull/87
Consequently, some changes are necessary to the corresponding patch
and to melpa2nix.el, which this commit also contains.
2023-12-26 16:55:28 +00:00
hacker1024
81a99463d8
buildDartApplication: Pass customSourceBuilders through to pub2nix
2023-12-26 18:48:12 +02:00
hacker1024
23952fb641
buildDartApplication: Remove depsListFile
...
We get a dependency list with pub2nix now. We can no longer easily distinguish between development dependency dependencies and regular dependency dependencies, but we weren't doing this anyway.
2023-12-26 18:48:12 +02:00
hacker1024
2bd3e5d779
buildDartApplication: Use package source builders and setup hooks instead of package overrides
2023-12-26 18:48:08 +02:00
hacker1024
cf55bc7300
buildDartApplication: Generate LD_LIBRARY_PATH at build time
...
This allows setup hooks to add runtime dependencies.
2023-12-26 17:08:51 +02:00
hacker1024
1ae96d0704
buildDartApplication: Move package sources to nativeBuildInputs
...
They are only needed at build time, after all.
2023-12-26 17:08:51 +02:00
hacker1024
8494ee610b
flutter.buildFlutterApplication: Add pkg-config to nativeBuildInputs
2023-12-26 17:08:51 +02:00
hacker1024
f057034d6a
flutter.buildFlutterApplication: Don't assume jq and yq are available in extraPackageConfigSetup
2023-12-26 17:08:51 +02:00
hacker1024
53a3485bfc
flutter.buildFlutterApplication: Remove unneeded nativeBuildInputs
2023-12-26 17:08:51 +02:00
hacker1024
48bf6da955
buildDartApplication: Declare dependency sources as build inputs
2023-12-26 17:08:51 +02:00
hacker1024
18d9cd0c50
pub2nix.readPubspecLock: Add package versions to passthru
2023-12-26 17:08:51 +02:00
hacker1024
4e4c4c2ad0
buildDartApplication: Use overrides for dev dependencies as well
2023-12-26 17:08:51 +02:00
hacker1024
65d2cc04a3
dartHooks.dartConfigHook: Simplify packageRun function
2023-12-26 17:08:51 +02:00
hacker1024
d41348a68a
dartHooks.dartConfigHook: Add packageRun utility
2023-12-26 17:08:51 +02:00
hacker1024
bea71b1fe3
pub2nix.readPubspecLock: Add packagePath convenience attribute
2023-12-26 17:08:50 +02:00
hacker1024
af6e82b47a
flutter.buildFlutterApplication: Use extraPackageConfigSetup
2023-12-26 17:06:18 +02:00
hacker1024
7e043f5f28
buildDartApplication: Accept additional package_config.json setup commands
2023-12-26 17:06:18 +02:00
hacker1024
4eb35ef711
buildDartApplication: Link the package_config.json in a separate derivation
2023-12-26 17:06:18 +02:00
hacker1024
4f623fa0a1
buildDartApplication: Refactor autoDepsList logic
2023-12-26 17:06:18 +02:00
hacker1024
34ce9c64c9
pub2nix.readPubspecLock: Include entire source in package derivations
...
This allows references to paths above the package being built, e.g. bc5d988f32/packages/libtokyo_flutter/pubspec.yaml (L42)
2023-12-26 17:05:28 +02:00
hacker1024
3081228cc4
dart: Use Nix instead of Pub
2023-12-26 17:05:20 +02:00
github-actions[bot]
aa8844a8a9
Merge staging-next into staging
2023-12-25 18:01:25 +00:00
Jan Tojnar
2ac16accc0
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/hahomematic/default.nix
2023-12-25 16:54:44 +01:00
Maciej Krüger
2e3a121acf
Merge pull request #276414 from linsui/dart
...
dart: fix fetchDartDeps
2023-12-25 10:21:21 +01:00
linsui
676ef2b4b2
dart: fix fetchDartDeps
2023-12-25 14:58:02 +08:00
github-actions[bot]
5d5f55c28d
Merge staging-next into staging
2023-12-25 00:02:44 +00:00
github-actions[bot]
88b151ed65
Merge master into staging-next
2023-12-25 00:02:15 +00:00
Lily Foster
8999c9d930
npmHooks.npmInstallHook: ignore rather than error for missing bin/man keys in package.json
2023-12-24 22:58:32 +01:00
github-actions[bot]
03901858de
Merge staging-next into staging
2023-12-24 18:01:44 +00:00
Jan Tojnar
8fcbb0c6ed
Merge branch 'master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/boto3-stubs/default.nix
- pkgs/development/python-modules/openllm-core/default.nix
Between 0.4.22 → 0.4.34 (a82245bd3d72c55ce6a6
2023-12-24 14:33:18 +01:00
Atemu
d7b70652ef
Merge pull request #272125 from yaxitech/reproducible-initrd
...
make-initrd-ng: fix reproducibility problems
2023-12-24 11:53:33 +01:00
github-actions[bot]
3d36e72396
Merge staging-next into staging
2023-12-24 06:01:29 +00:00
Martin Weinelt
a3e53d17b6
Merge remote-tracking branch 'origin/master' into staging-next
2023-12-24 02:39:15 +01:00
David McFarland
a185ed85be
nuget-to-nix: handle packages with mismatched nuspec case
...
e.g. cake.tool 3.0.0 which uses Cake.Tool.nuspec.
2023-12-22 12:06:02 +01:00
Lily Foster
5a8c65e118
rustPlatform.importCargoLock: fix workspace_root detection
...
Prior to this change, the `importCargoLock` git dependency builder
assumed that the workspace root that needed to be passed to
`replace-workspace-values` will always be the root directory of the git
repository.
This is not always the case as independent workspace roots may be used
from subdirectories, and packages be referenced via paths. An example of
this is [1], where the `iced` subdirectory is its own independent
workspace, and workspace values for packages within it should be pulled
from the `iced` subdirectory as the workspace root, not from the
top-level of the fetched repository.
[1]: b8f1a366dd/Cargo.toml
2023-12-21 19:40:43 -05:00
Connor Baker
dd4723bad7
Merge pull request #272752 from ConnorBaker/feat/autoPatchelf-support-structuredAttrs
...
auto-patchelf: add support for __structuredAttrs
2023-12-21 19:09:56 -05:00
github-actions[bot]
63fbe1a992
Merge master into staging-next
2023-12-21 18:00:56 +00:00
K900
d387afbd96
Merge pull request #275857 from tejing1/steam-fix-sddm
...
buildFHSEnv, steam: fix privateTmp for sddm, make privateTmp overrideable
2023-12-21 20:37:24 +03:00
Jeff Huffman
aa070a5d9a
buildFHSEnv: fix privateTmp for sddm
2023-12-21 12:11:35 -05:00
hacker1024
145c291ca6
fetchDartDeps: Use add milliseconds to date in package_config.json
...
This in compliance with the format specification.
https://github.com/dart-lang/language/blob/main/accepted/2.8/language-versioning/package-config-file-v2.md
2023-12-21 11:46:18 +01:00
hacker1024
0d82a3864a
fetchDartDeps: Add a package_config.json derivation
2023-12-21 11:46:13 +01:00
hacker1024
e99f59010c
fetchDartDeps: Pass through the dependency cache
2023-12-21 11:46:12 +01:00
hacker1024
623ac19416
fetchDartDeps: Generalise dependency derivation logic
2023-12-21 11:46:12 +01:00
hacker1024
75b809c7c6
buildDartApplication: Add entire Dart derivation to nativeBuildInputs
2023-12-21 11:46:11 +01:00
hacker1024
d331e2d68c
fetchDartDeps: Use given setup and Pub get script in dependency list derivation
2023-12-21 11:44:15 +01:00
hacker1024
98e4fb2d07
flutter: Pass pubGetScript through to buildDartApplication
2023-12-21 11:44:14 +01:00
Martin Weinelt
8742c0cd2e
maturinBuildHook: use dist dir relative to cargoRoot
...
With `cargoRoot` set to a subdirectory of the source, where the
Cargo.{lock,toml} are found, the final mv would previously fail, since
the build results appear relative to cargoRoot, not to the original
build directory.
2023-12-20 20:46:08 +01:00
github-actions[bot]
782f18b6fe
Merge staging-next into staging
2023-12-19 12:01:35 +00:00
Janne Heß
5eed5416ff
Merge pull request #167670 from messemar/incremental-builds
...
incremental builds: add derivation override functions
2023-12-19 11:37:15 +01:00
Alyssa Ross
ca8a6d8c19
wrapRustcWith: allow --sysroot to be overridden
...
It turns out that unlike a normal Unix program, if the --sysroot
option is given more than once, rustc will error rather than using the
last value given. Therefore, we need to ensure we only add our
default --sysroot argument if one hasn't been given explicitly on the
wrapper's command line.
This fixes cross compilation of rustc.
Closes: https://github.com/NixOS/nixpkgs/issues/271736
Fixes: 8b51cdd3be
2023-12-19 11:34:02 +01:00
github-actions[bot]
1f30be411f
Merge staging-next into staging
2023-12-19 06:01:17 +00:00
Will Fancher
42b9f21c69
Merge pull request #274743 from r-ryantm/auto-update/makeInitrdNGTool
...
makeInitrdNGTool: 0.1.0 -> 0.1.0
2023-12-19 00:46:24 -05:00
github-actions[bot]
01cb3d14eb
Merge staging-next into staging
2023-12-17 06:01:23 +00:00
Peder Bergebakken Sundt
adc2612d49
Merge pull request #268304 from panicgh/fetchgitlab-sparse-forcegit
...
fetchgitlab: add sparseCheckout and forceFetchGit args
2023-12-17 03:34:52 +01:00
github-actions[bot]
cacb3248e1
Merge staging-next into staging
2023-12-17 00:02:54 +00:00
Pol Dellaiera
92960168a5
Merge pull request #274631 from artemist/replace-workspace-lints
...
rustPlatform.importCargoLock: copy lints from workspace
2023-12-16 19:45:00 +01:00
R. Ryantm
d2ffb24948
makeInitrdNGTool: 0.1.0 -> 0.1.0
2023-12-16 14:58:17 +00:00
github-actions[bot]
0deaf44f3d
Merge staging-next into staging
2023-12-16 12:01:49 +00:00
K900
5eb4128d60
buildFHSEnv: propagate host /etc if nested
...
This fixes use cases like launching Lutris/Heroic from Steam.
2023-12-16 10:04:09 +03:00
Artemis Tosini
285216aceb
rustPlatform.importCargoLock: copy lints from workspace
...
Rust 1.74 added support for configuring lints with cargo in a new
"lints" table. This also adds a new possible position to reference the
host workspace.
Fixes #273835
2023-12-16 05:36:59 +00:00
github-actions[bot]
b9dfb3f0ee
Merge staging-next into staging
2023-12-15 06:01:29 +00:00
Sandro Jäckel
bf81cded7d
makeNugetSource: symlink files instead of copying them
...
this reduces the closure size of the resulting derivation drastically
2023-12-15 01:23:21 +00:00
Sandro Jäckel
5ef866783f
makeNugetSource: fix meta.description being overwritten, misc cleanup
2023-12-15 01:23:21 +00:00
Connor Baker
45901c42fc
auto-patchelf: improve deprecation check by searching all elements
2023-12-14 16:53:34 +00:00
Connor Baker
9faad7fb0b
auto-patchelf: add support for __structuredAttrs
2023-12-14 16:32:29 +00:00
github-actions[bot]
5ea376a152
Merge staging-next into staging
2023-12-14 12:01:56 +00:00
Jeff Huffman
195248b6c1
buildFHSEnv, steam: isolate steam's /tmp from host
...
Works around steam's misbehavior: https://github.com/ValveSoftware/steam-for-linux/issues/9121
2023-12-13 23:33:05 -08:00
Jeff Huffman
452b8162ec
buildFHSEnv: use symlinks instead of bind mounts for files from host /etc
...
Closes #247065
2023-12-13 23:33:05 -08:00
github-actions[bot]
bae9ba4ab0
Merge staging-next into staging
2023-12-14 00:02:44 +00:00
Thiago Kenji Okada
ed5b0bccf5
buildGraalvmNativeImage: set NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION
2023-12-13 16:12:04 +00:00
Martin Weinelt
e8dd1cf066
Merge remote-tracking branch 'origin/staging-next' into staging
2023-12-12 14:13:07 +01:00
Martin Messer
a3e0a52de4
checkpointBuilds: add hooks for checkpoint builds
2023-12-12 13:21:01 +01:00
Pol Dellaiera
b9e35d7dc4
Merge pull request #272448 from drupol/php/composer-builder/filter-bat
...
build-support/php: prevent the creation of symlinks of `bin` ending with `.bat`
2023-12-12 08:11:50 +01:00
adisbladis
6b9f45ae37
python3.pkgs.buildsetupcfg: Remove function from python-packages-base.nix
...
This function is not, and never have been, used anywhere inside nixpkgs, outside of bootstrapping setupcfg2nix itself.
It was added in https://github.com/NixOS/nixpkgs/pull/38778 by @shlevy.
It has no out-of-tree users on Github either. External breakage is not expected.
2023-12-12 12:21:38 +13:00
Robert Scott
aac4bc376e
Merge pull request #259070 from risicle/ris-cc-default-hardening-flags
...
mkDerivation, bintools-wrapper: move `defaultHardeningFlags` determination to `bintools-wrapper`
2023-12-10 21:53:41 +00:00
github-actions[bot]
ad1e07c64b
Merge staging-next into staging
2023-12-09 18:01:23 +00:00
github-actions[bot]
7c846b760d
Merge master into staging-next
2023-12-09 18:00:56 +00:00
