Skip to content

Comments

mkl: fix self-inclusive test src#323634

Merged
infinisil merged 1 commit intoNixOS:masterfrom
Stunkymonkey:mkl-fix-self-inclusive-src
Jul 16, 2024
Merged

mkl: fix self-inclusive test src#323634
infinisil merged 1 commit intoNixOS:masterfrom
Stunkymonkey:mkl-fix-self-inclusive-src

Conversation

@Stunkymonkey
Copy link
Contributor

@Stunkymonkey Stunkymonkey commented Jun 30, 2024

Description of changes

part of #301014

sadly the test no longer 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.11 Release Notes (or backporting 23.11 and 24.05 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 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 30, 2024
@Stunkymonkey Stunkymonkey requested a review from wegank June 30, 2024 20:27
@Stunkymonkey Stunkymonkey changed the title mkl: fix self-inclusive src mkl: fix self-inclusive test src Jul 8, 2024
@Stunkymonkey Stunkymonkey requested a review from infinisil July 8, 2024 17:56
@Stunkymonkey Stunkymonkey marked this pull request as ready for review July 14, 2024 20:17
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the -seq tests do work:

$ nix-build -A mkl.tests.pkg-config-dynamic-seq -A mkl.tests.pkg-config-static-seq --arg config '{ allowUnfree = true; }'
/nix/store/9jpvkkgrs01sbpywrkrkx5nxmrmkhjg6-mkl-test-2023.1.0.46342
/nix/store/h4z3c20pfh956w1rvdsvq6cspih5fq69-mkl-test-2023.1.0.46342

Thanks, looking good to me!

Note that for a non-test derivation it would be better to do this:

src = lib.fileset.toSource {
  root = ./.;
  fileset = ./test.c;
};

because this allows overriding/getting the source using .src, but that really doesn't matter here :)

@infinisil infinisil merged commit d24eef8 into NixOS:master Jul 16, 2024
@Stunkymonkey Stunkymonkey deleted the mkl-fix-self-inclusive-src branch June 2, 2025 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants