Skip to content

[23.05] Backport simple package paths: part 1b#253442

Merged
infinisil merged 4 commits intoNixOS:release-23.05from
tweag:backport-spp-1
Sep 21, 2023
Merged

[23.05] Backport simple package paths: part 1b#253442
infinisil merged 4 commits intoNixOS:release-23.05from
tweag:backport-spp-1

Conversation

@infinisil
Copy link
Copy Markdown
Member

@infinisil infinisil commented Sep 5, 2023

Description of changes

This is the backport of #237439, as written in RFC 140.

Notably we only need to backport the first commit of that PR, since it introduces the machinery and documentation for the new pkgs/by-name directory. The other two commits aren't strictly necessary:

  • The updates to the quick-start documentation would have to change the stable NixOS manual, which shouldn't be done, relates to Clean up contributing documentation #245243.
  • The move of hello to pkgs/by-name isn't necessary

Let's only merge this in a couple days once we're sure that #237439 works without problems.

Things done

This introduces the `pkgs/by-name` directory as proposed by RFC 140.
Included are:
- The implementation to add packages defined in that directory to the
  top-level package scope
- Contributer documentation on how to add packages to it
- A GitHub Actions workflow to check the structure of it on all PRs

(cherry picked from commit f6467c3)
@github-actions github-actions bot added the 6.topic: policy discussion Discuss policies to work in and around Nixpkgs label Sep 5, 2023
@infinisil infinisil changed the title pkgs/by-name: Introduce [23.05] Backport simple package paths: part 1b Sep 5, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Sep 5, 2023
@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Sep 6, 2023
@wegank wegank added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Sep 7, 2023
@infinisil
Copy link
Copy Markdown
Member Author

infinisil commented Sep 11, 2023

Some small issues have been discovered, let's wait for these to be resolved, I'll include them here, and then wait a bit longer to see if something else comes up:

@Ericson2314 Ericson2314 marked this pull request as draft September 11, 2023 18:53
@infinisil infinisil added this to the RFC 140 milestone Sep 11, 2023
infinisil and others added 3 commits September 15, 2023 00:21
Co-Authored-By: zowoq <59103226+zowoq@users.noreply.github.com>
(cherry picked from commit 437d00d)
On Darwin, /tmp is sometimes a symlink to /private/tmp, which couldn't
be handled before:

    error: access to canonical path '/private/var/folders/xp/9_ry6h9x6l9gh_g32qspz0_40000gp/T/.tmpFbcNO0' is forbidden in restricted mode

This both fixes that and adds a test to make sure it can't happen again

(cherry picked from commit d518eb9)
We seem to have enough tests to run into this now:

    error: creating symlink from '/private/tmp/nix-build-nixpkgs-check-by-name.drv-0/source/test-tmp/var/nix/gcroots/profiles' to '/private/tmp/nix-build-nixpkgs-check-by-name.drv-0/source/test-tmp/var/nix/profiles': File exists

(cherry picked from commit 9c9a7e0)
@infinisil infinisil marked this pull request as ready for review September 14, 2023 22:23
@infinisil
Copy link
Copy Markdown
Member Author

I now included the above two fixes, nothing else has come up since, I think this is good to be backported now.

@ofborg build tests.nixpkgs-check-by-name

@delroth delroth removed the 12.approvals: 3+ This PR was reviewed and approved by three or more persons. label Sep 15, 2023
@infinisil infinisil merged commit 31ed632 into NixOS:release-23.05 Sep 21, 2023
@infinisil infinisil deleted the backport-spp-1 branch December 15, 2023 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: policy discussion Discuss policies to work in and around Nixpkgs 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants