Skip to content
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.

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

make-squashfs,make-iso9660-image: use __structuredAttrs #214373

Merged
merged 2 commits into from
May 18, 2023

Conversation

ncfavier
Copy link
Member

@ncfavier ncfavier commented Feb 3, 2023

Makes it easier to enable discarding of references, an upcoming feature of Nix which requires structured attrs.

This also makes the builder for make-iso9660-image more robust since we can pass proper arrays instead of space-separated strings.

For reference, __structuredAttrs is supported since Nix 2.0 and nixpkgs #175649.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Feb 3, 2023
@ncfavier ncfavier mentioned this pull request Feb 3, 2023
2 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 3, 2023
@ncfavier ncfavier requested a review from Artturin February 7, 2023 14:11
@ncfavier ncfavier force-pushed the make-image-structured-attrs branch from d684c55 to b0a1c2b Compare May 10, 2023 09:59
@ncfavier ncfavier force-pushed the make-image-structured-attrs branch from b0a1c2b to 5d352b2 Compare May 11, 2023 10:00
ncfavier added 2 commits May 11, 2023 14:25
Makes it easier to enable discarding of references, a feature of Nix
2.14 which requires structured attrs.
Makes it easier to enable discarding of references, a feature of Nix
2.14 which requires structured attrs.
@ncfavier ncfavier force-pushed the make-image-structured-attrs branch from 5d352b2 to ea81a24 Compare May 11, 2023 12:25
@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label May 11, 2023
@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label May 18, 2023
@cole-h
Copy link
Member

cole-h commented May 18, 2023

@ofborg eval

@ncfavier ncfavier merged commit 3ac4b37 into NixOS:master May 18, 2023
@ncfavier ncfavier deleted the make-image-structured-attrs branch May 18, 2023 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants