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

tests: fix unused importPath in unfreeNixpkgs function #1226

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

soopyc
Copy link
Member

@soopyc soopyc commented Nov 2, 2024

Description of changes

The nixpkgs used to test profiles was (likely mistakenly) hardcoded to nixos-unstable-small, and as a result both nixpkgs{Unstable,Stable} used the same nixpkgs version. This causes unexpected assertion failures with (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11")

This PR unhardcodes the value and resolves the potential issue.

Note that this fails 3 tests at the time of writing, namely x86_64-linux.nixos-stable-lenovo-legion-16ach6h{,-hybrid,-nvidia}, all because of a non-existent hardware.display option in stable nixpkgs.

Things done
  • Tested the changes in your own NixOS Configuration
  • Tested the changes end-to-end by using your fork of nixos-hardware and
    importing it via <nixos-hardware> or Flake input

* originally importPath in the unfreeNixpkgs function was not used at all.
  this commit fixes the issue, allowing the function to work as intended.
@Mic92 Mic92 merged commit 1b0b927 into NixOS:master Nov 5, 2024
1 of 2 checks passed
@soopyc soopyc deleted the fix-tests branch November 5, 2024 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants