Skip to content

Comments

sbcl: 2.4.0 -> 2.4.1#284591

Merged
7c6f434c merged 2 commits intoNixOS:masterfrom
hraban:sbcl-2.4.1
Jan 30, 2024
Merged

sbcl: 2.4.0 -> 2.4.1#284591
7c6f434c merged 2 commits intoNixOS:masterfrom
hraban:sbcl-2.4.1

Conversation

@hraban
Copy link
Member

@hraban hraban commented Jan 28, 2024 •
edited
Loading

Description of changes

Also rename to package.nix to make CI pass. Haven't stayed up to date with the developments around this but I guess this works.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Jan 28, 2024
@ofborg ofborg bot requested review from 7c6f434c, Uthar, lukego and nagy January 28, 2024 19:20
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jan 28, 2024
@7c6f434c
Copy link
Member

7c6f434c commented Jan 29, 2024

Ah apparently the check by @infinisil checks for new top-level call and not for new files being called from the top-level, so the directory has to be moved to pkgs/by-name/sb/sbcl and all the calls to it retargeted. But hopefully this shouldn't break anything in the process…

@hraban
Copy link
Member Author

hraban commented Jan 29, 2024

Hmm it wants pkgs/by-name/sb/sbcl_2_4_1, i.e. including the version. That's not ideal.

@hraban
Copy link
Member Author

hraban commented Jan 29, 2024 •
edited
Loading

The RFC lists this under "future work":

What to do with different versions, e.g. wlroots = wlroots_0_14? This goes into version resolution, a different problem to fix

https://github.com/NixOS/rfcs/blob/dfb6bdf32e48e7d7e2d7c08dde4ec134c723efc9/rfcs/0140-simple-package-paths.md#future-work

But it's blocking this PR now

@infinisil
Copy link
Member

infinisil commented Jan 29, 2024 •
edited
Loading

Sorry this is a false positive, feel free to ignore! I'm currently working on a fix

@7c6f434c
Copy link
Member

7c6f434c commented Jan 29, 2024

@ofborg build sbcl.pkgs.iolib sbcl.pkgs.stumpwm

@hraban hraban marked this pull request as ready for review January 29, 2024 23:43
@7c6f434c 7c6f434c merged commit 7e913c4 into NixOS:master Jan 30, 2024
@hraban hraban deleted the sbcl-2.4.1 branch January 30, 2024 00:46
@infinisil infinisil mentioned this pull request Jan 30, 2024
Merged
@infinisil
Copy link
Member

infinisil commented Jan 30, 2024

Sorry this is a false positive, feel free to ignore! I'm currently working on a fix

#285089

@infinisil infinisil mentioned this pull request Feb 7, 2024
Merged
1 task
@infinisil
Copy link
Member

infinisil commented Feb 7, 2024

Turns out this shouldn't have been allowed by CI after all, but for different reasons! Check out #287083 for more details, we have to move sbcl out of pkgs/by-name after all 😅

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

Reviewers

@nagy nagy Awaiting requested review from nagy

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@lukego lukego Awaiting requested review from lukego

@Uthar Uthar Awaiting requested review from Uthar

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hraban @7c6f434c @infinisil