Skip to content

Comments

nixpkgs-check-by-name: Remove case-sensitive duplicate path from tree#252210

Merged
infinisil merged 1 commit intoNixOS:masterfrom
tweag:fix-check-by-name
Aug 29, 2023
Merged

nixpkgs-check-by-name: Remove case-sensitive duplicate path from tree#252210
infinisil merged 1 commit intoNixOS:masterfrom
tweag:fix-check-by-name

Conversation

@infinisil
Copy link
Member

@infinisil infinisil commented Aug 29, 2023

Description of changes

The channel updates are blocked because #250885 added a case-sensitive duplicate path to the tree:

Files in nixpkgs must not vary only by case
The offending paths:
[...]/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foO
[...]/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foo

This removes the duplicate and generates the file dynamically for the tests instead.

Things done

  • nix-build -A tests.nixpkgs-check-by-name on x86_64-linux
  • nix-build pkgs/top-level/release.nix -A tarball (up the point where it failed before, doesn't fail anymore there)

@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 Aug 29, 2023
- Better filesystem case-sensitivity heuristic
  We shouldn't assume that Linux is always case-sensitive.
- Don't include case-sensitive filename in tree
  Was used for tests, but this broke channel updates because there's a
  check to make sure there's no case-sensitive files!

  https://hydra.nixos.org/build/233371356/nixlog/1
@infinisil
Copy link
Member Author

The failure on Darwin is super weird, it complains about a file that's not even there anymore..

I'll just go ahead and merge this in order to unblock the channel, we can verify that darwin builds later

@infinisil infinisil merged commit 147999c into NixOS:master Aug 29, 2023
@infinisil infinisil deleted the fix-check-by-name branch August 29, 2023 22:37
@infinisil
Copy link
Member Author

Can confirm that all platforms in Hydra still build it successfully: https://hydra.nixos.org/eval/1798896?filter=nixpkgs-check-by-name&compare=1798890&full=#tabs-still-succeed

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: 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.

1 participant