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: ec7db16647bf
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 053ad4e0db72
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 16, 2020

  1. habitat: 0.30.2 -> 0.90.6 

    The build has been broken on master for a very long time, for want of an
upgrade. This continues the effort put forth here:
#63105

Note that while there are newer versions than this, upgrading to those requires
getting some Cargo protobuf dependencies to compile. Since this fixes the
failing build, it seems like a good start.

Upstream does not appear to have any Darin builds in their CI, and we do not
have a Darwin maintainer available, so this disables it as well.
    @bhipple
    bhipple committed Mar 16, 2020
    Copy the full SHA
    b7ef716 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Merge pull request #82213 from bhipple/fix/habitat 

    habitat: 0.30.2 -> 0.90.6
    @Mic92
    Mic92 committed Mar 18, 2020
    Copy the full SHA
    053ad4e View commit details
    Browse the repository at this point in the history