Skip to content

make-derivation.nix: Support inputDerivation on disallowedReferences#215168

Merged
roberth merged 1 commit intoNixOS:masterfrom
hercules-ci:inputDerivation-disallowedReferences
Feb 13, 2023
Merged

make-derivation.nix: Support inputDerivation on disallowedReferences#215168
roberth merged 1 commit intoNixOS:masterfrom
hercules-ci:inputDerivation-disallowedReferences

Conversation

@roberth
Copy link
Member

@roberth roberth commented Feb 7, 2023 •
edited
Loading

Description of changes

Make .inputDerivation work for hopefully all stdenv-based derivations. (spoiler: not quite; #215173)

       # inputDerivation produces the inputs; not the outputs, so any
       # restrictions on what used to be the outputs don't serve a purpose
       # anymore.
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Feb 7, 2023
@roberth roberth mentioned this pull request Feb 7, 2023
Closed
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 7, 2023
@roberth roberth requested a review from infinisil February 8, 2023 10:30
@infinisil
Copy link
Member

infinisil commented Feb 9, 2023

I'm actually not sure what use cases inputDerivation has now that mkShell is buildable. They are using essentially the same approach though, it would be good to keep them in sync somehow

@roberth roberth merged commit c61dd3f into NixOS:master Feb 13, 2023
@roberth
Copy link
Member Author

roberth commented Feb 13, 2023

Me neither. It's undocumented, so we could make it do anything that makes sense for the name. Instead of duplicating mkShell, we might give it its own niche, to reify the dependencies of a derivation, rather than to offer a shell environment.
This is more of a discussion for #215173 though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@infinisil infinisil Awaiting requested review from infinisil

Assignees

No one assigned

Labels

6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@roberth @infinisil