diffoscope: 267 -> 269

[trofi]

Changes:

• https://diffoscope.org/news/diffoscope-268-released/
• https://diffoscope.org/news/diffoscope-269-released/

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:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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.

[trofi]

Needs a 7z test tweak: diffoscope> FAILED tests/comparators/test_sevenz.py::test_metadata_diff - AssertionError

[trofi]

diffoscope assumes that running 7z returns version in a second word:

def sevenz_version():
    try:
        out = subprocess.check_output(["7z"])
    except subprocess.CalledProcessError as e:
        out = e.output
    return out.decode("UTF-8").split()[1].strip()

But in nixpkgs we have an old 7z that does it in third word:

7z | head -n2

7-Zip [64] 17.05 : Copyright (c) 1999-2021 Igor Pavlov : 2017-08-28

[trofi]

Proposed the fix upstream as https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/142

[trofi]

Ready for review.

[trofi]

Result of nixpkgs-review pr 314683 run on x86_64-linux 1

6 packages built:

• diffoscope
• diffoscope.dist
• diffoscope.man
• diffoscopeMinimal
• diffoscopeMinimal.dist
• diffoscopeMinimal.man

[trofi]

Switched to commit hash merged to upstream master branch. No patch hash change.

[trofi]

Result of nixpkgs-review pr 314683 run on x86_64-linux 1

6 packages built:

• diffoscope
• diffoscope.dist
• diffoscope.man
• diffoscopeMinimal
• diffoscopeMinimal.dist
• diffoscopeMinimal.man

[trofi]

Result of nixpkgs-review pr 314683 run on x86_64-linux 1

6 packages built:

• diffoscope
• diffoscope.dist
• diffoscope.man
• diffoscopeMinimal
• diffoscopeMinimal.dist
• diffoscopeMinimal.man

[trofi]

Proposed the fix upstream as https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/142

269 release merged it. Updated to 269. Had to add a sourceRoot=./-269 workaround for a new https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378 issue.

[SuperSandro2000]

good enough for now. That probably gets fixed in the next release

[trofi]

Had to add a sourceRoot=./-269 workaround for a new https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378 issue.

To make nixpkgs more resilient to directories with fancy root directory names proposed a few fixes as:

• stdenv: handle $sourceRoot that starts with dash #317106