github-actions[bot]
f4041e23e9
Merge master into staging-next
2023-12-28 06:01:05 +00: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
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]
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
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 (a82245bd3d
)
and 0.4.22 -> 0.4.41 (72c55ce6a6
)
Does not build, not pre-merge either.
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
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
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
("rustc: add a compiler wrapper")
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
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