Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: eacc771f72be
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a95cfefa5514
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 4, 2020

  1. pijul: Fix the build (broke due to a more recent Rust version) 

    This uses an upstream patch [0] to fix a compatibility error with a new
version of Rust. Fix #79150.

Unfortunately patching Rust dependencies in Nixpkgs turned out to be way
more hacky than I expected (maybe there is a nicer way?), but it should
be fine for now.

A new release might follow soonish [1] so that we can drop the patches.

References:
- https://nest.pijul.com/pijul_org/pijul/discussions/401
- https://nest.pijul.com/pijul_org/thrussh/discussions/31

[0]: https://nest.pijul.com/pijul_org/thrussh:master/patches/AsyuWkJg4jAwNaG3H1yv1kbECx5E3GQAtjzXWBDB8yEGMswyfKbxKvYmAGWCohTVaTipdvF8mHh63yU5PTr5F9py
[1]: https://discourse.pijul.org/t/is-this-project-still-active-yes-it-is/451
    @primeos
    primeos committed Feb 4, 2020
    Copy the full SHA
    434ff94 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #79223 from primeos/pijul-fix 

    pijul: Fix the build (broke due to a more recent Rust version)
    @primeos
    primeos committed Feb 4, 2020
    Copy the full SHA
    a95cfef View commit details
    Browse the repository at this point in the history