jujutsu: 0.14.0 -> 0.15.1

[adamcstephens]

Description of changes

Diff: jj-vcs/jj@v0.14.0...v0.15.1

Changelog: https://github.com/martinvonz/jj/blob/v0.15.1/CHANGELOG.md

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.05 Release Notes (or backporting 23.05 and 23.11 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.

[thoughtpolice]

Please note that there will (unless something changes) be an 0.15.1 release very very shortly to fix a minor issue with the https://crates.io release. So let's hold off until then. Thanks for the quick update, though!

[adamcstephens]

Bumped, but this is still blocked in requiring rust 1.76 which doesn't exist in nixpkgs yet.

error: package `jj-cli v0.15.1 (/build/source/cli)` cannot be built because it requires rustc 1.76 or newer, while the currently active rustc version is 1.75.0

[shanesveller]

Is it accurate to say that this PR could come out of draft once https://nixpk.gs/pr-tracker.html?pr=289940 reflects that the change in #289940 has reached master?

[adamcstephens]

Is it accurate to say that this PR could come out of draft once https://nixpk.gs/pr-tracker.html?pr=289940 reflects that the change in #289940 has reached master?

Indeed! I'll rebase once that hits master.

[thoughtpolice]

I believe that the rustc 1.76.0 bump has hit master, so you're free to rebase.

Also, please just go ahead and squash the two commits into one; no need for the intermediate 0.15.0 build. Thanks.

[adamcstephens]

Yeah, I rebased this already to get rust 1.76, but the new signing tests are failing. Even when providing the necessary dependencies, e.g. openssh, these still fail.

--- STDERR:              jj-lib::runner test_ssh_signing::ssh_signing_bad_allowed_signers ---
thread 'test_ssh_signing::ssh_signing_bad_allowed_signers' panicked at lib/tests/test_ssh_signing.rs:145:10:
called `Result::unwrap()` on an `Err` value: Backend(Io(Os { code: 2, kind: NotFound, message: "No such file or directory" }))

I can fix the test failures by turning off nextest and setting checkFlags = [ "--skip=test_ssh_signing" ]

I'm giving up trying to get this working with nextest. Through a combination of bash arrays, splitting and extra escaping, I can't seem to get the arguments to pass correctly through the nextest setup hook. Using cargoTestArgs (since these need to be before the -- in the nextest run ) we need to set -E 'not test(/test_ssh_signing/)'

@thoughtpolice If you're fine with disabling nextest, I can finish this PR. If not, then you're welcome to commit to this PR (if a committer) or I can close this and let you replace it yourself.

[thoughtpolice]

Disabling nextest is fine.