diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-23 06:01:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-23 06:01:22 +0000 |
commit | 705ac3185ee768105b4ac67a83307dd90b73fc7e (patch) | |
tree | 5a5f9109cb7ab4857d91720f37fff46ad6834d30 /pkgs/development/interpreters | |
parent | 6a3714135d5e64b27cb69ee1540930f92167e70f (diff) | |
parent | 3abfa15068e2a745cbdb1e4a8ec7c78874e904ea (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/octave/build-octave-package.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix index 065992f91271a..30f9bc3b5e1ce 100644 --- a/pkgs/development/interpreters/octave/build-octave-package.nix +++ b/pkgs/development/interpreters/octave/build-octave-package.nix @@ -62,13 +62,21 @@ let ] ++ nativeBuildInputs; + passthru' = { + updateScript = [ + ../../../../maintainers/scripts/update-octave-packages + (builtins.unsafeGetAttrPos "pname" octave.pkgs.${attrs.pname}).file + ]; + } + // passthru; + # This step is required because when # a = { test = [ "a" "b" ]; }; b = { test = [ "c" "d" ]; }; # (a // b).test = [ "c" "d" ]; # This used to mean that if a package defined extra nativeBuildInputs, it # would override the ones for building an Octave package (the hook and Octave # itself, causing everything to fail. - attrs' = builtins.removeAttrs attrs [ "nativeBuildInputs" ]; + attrs' = builtins.removeAttrs attrs [ "nativeBuildInputs" "passthru" ]; in stdenv.mkDerivation ({ packageName = "${fullLibName}"; @@ -121,5 +129,7 @@ in stdenv.mkDerivation ({ # together with Octave. dontInstall = true; + passthru = passthru'; + inherit meta; } // attrs') |