Skip to content

diffoscope: fix the eval#370795

Merged
drupol merged 1 commit intoNixOS:masterfrom
trofi:diffoscope-fix-the-eval
Jan 4, 2025
Merged

diffoscope: fix the eval#370795
drupol merged 1 commit intoNixOS:masterfrom
trofi:diffoscope-fix-the-eval

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jan 4, 2025

Without the change the eval fails as:

$ nix build --no-link -f. diffoscope
error:
   … while evaluating the attribute 'drvPath'
     at lib/customisation.nix:416:7:
      415|     // {
      416|       drvPath =
         |       ^
      417|         assert condition;

   … while calling the 'derivationStrict' builtin
     at <nix/derivation-internal.nix>:34:12:
       33|
       34|   strict = derivationStrict drvAttrs;
         |            ^
       35|

   (stack trace truncated; use '--show-trace' to show the full, detailed trace)

   error: fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both).

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Without the change the eval fails as:

    $ nix build --no-link -f. diffoscope
    error:
       … while evaluating the attribute 'drvPath'
         at lib/customisation.nix:416:7:
          415|     // {
          416|       drvPath =
             |       ^
          417|         assert condition;

       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:34:12:
           33|
           34|   strict = derivationStrict drvAttrs;
             |            ^
           35|

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both).
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 4, 2025
@drupol drupol merged commit 40e061e into NixOS:master Jan 4, 2025
37 checks passed
@trofi trofi deleted the diffoscope-fix-the-eval branch January 4, 2025 08:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants