Skip to content

nix-cl: provide the original pname as an attribute#280384

Merged
7c6f434c merged 1 commit intoNixOS:masterfrom
7c6f434c:nix-cl-provide-original-pname
Jan 15, 2024
Merged

nix-cl: provide the original pname as an attribute#280384
7c6f434c merged 1 commit intoNixOS:masterfrom
7c6f434c:nix-cl-provide-original-pname

Conversation

@7c6f434c
Copy link
Member

Overrides often inherit pname from the overriden package, and if they get the already-prefixed version, defaulting the systems list to [pname] produces wrong (and unintuitive) results. So we keep the prefix in the store paths for clarity, and nix-env sees disambiguated names with -i/-u (which should not be used anyway); but overrides won't be broken.

Without this, #279937 seems to have broken some stuff.

@Uthar do you think this is a reasonable way to go?

Description of changes

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.

@7c6f434c 7c6f434c force-pushed the nix-cl-provide-original-pname branch from 71ca0fb to 6815a00 Compare January 12, 2024 00:13
Overrides often inherit pname from the overriden package, and if they
get the already-prefixed version, defaulting the systems list to [pname]
produces wrong (and unintuitive) results. So we keep the prefix in the
store paths for clarity, and nix-env sees disambiguated names with -i/-u
(which should not be used anyway); but overrides won't be broken.
@ofborg ofborg bot requested review from Uthar, hraban, lukego and nagy January 12, 2024 03:04
@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-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 12, 2024
@7c6f434c
Copy link
Member Author

@ofborg build sbcl.pkgs.swank

@7c6f434c
Copy link
Member Author

@ofborg build sbcl.pkgs.cl-fuse

@7c6f434c 7c6f434c merged commit 8573909 into NixOS:master Jan 15, 2024
@Uthar
Copy link
Contributor

Uthar commented Jan 17, 2024

do you think this is a reasonable way to go?

I think it's a good idea

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

Labels

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: 11-100 This PR causes between 11 and 100 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

Development

Successfully merging this pull request may close these issues.

2 participants