Skip to content

[Backport release-25.11] nix: Fix splicing #467599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mic92 merged 1 commit into from
Feb 15, 2026
+7 −24
Merged

[Backport release-25.11] nix: Fix splicing #467599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions pkgs/tools/package-management/nix/modular/doc/manual/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ mkMesonDerivation (finalAttrs: {
"man"
];

# Hack for sake of the dev shell
passthru.externalNativeBuildInputs = [
nativeBuildInputs = [
meson
ninja
(lib.getBin lowdown-unsandboxed)
Expand All @@ -43,9 +42,8 @@ mkMesonDerivation (finalAttrs: {
]
++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [
json-schema-for-humans
];

nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
]
++ [
nix-cli
];

Expand Down
5 changes: 0 additions & 5 deletions pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ mkMesonLibrary (finalAttrs: {
nix-util
nix-store
nix-fetchers
]
++ finalAttrs.passthru.externalPropagatedBuildInputs;

# Hack for sake of the dev shell
passthru.externalPropagatedBuildInputs = [
boost
nlohmann_json
]
Expand Down
5 changes: 1 addition & 4 deletions pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,11 @@ mkMesonExecutable (finalAttrs: {

workDir = ./.;

# Hack for sake of the dev shell
passthru.externalBuildInputs = [
buildInputs = [
sqlite
rapidcheck
gtest
];

buildInputs = finalAttrs.passthru.externalBuildInputs ++ [
nix-store
nix-store-c
nix-store-test-support
Expand Down
5 changes: 0 additions & 5 deletions pkgs/tools/package-management/nix/modular/src/perl/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ perl.pkgs.toPerlModule (

buildInputs = [
nix-store
]
++ finalAttrs.passthru.externalBuildInputs;

# Hack for sake of the dev shell
passthru.externalBuildInputs = [
bzip2
libsodium
];
Expand Down
8 changes: 3 additions & 5 deletions pkgs/tools/package-management/nix/modular/tests/functional/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ mkMesonDerivation (

workDir = ./.;

# Hack for sake of the dev shell
passthru.externalNativeBuildInputs = [
nativeBuildInputs = [
meson
ninja
pkg-config
Expand All @@ -53,9 +52,8 @@ mkMesonDerivation (
# For `script` command (ensuring a TTY)
# TODO use `unixtools` to be precise over which executables instead?
util-linux
];

nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
]
++ [
nix-cli
];

Expand Down
Loading