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: fd8dcdfa9d32
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 69d4bdc55788
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 30, 2018

  1. notary: fix build 

    The package is broken on master for some time now:
https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.notary.x86_64-linux/all

The main reason for the breackage is that the `Makefile` script attempts
to retrieve the latest git commit by using `git rev-parse` which breaks
as `git` is not in the build environment. This could be fixed by using
`?=` rather than `:=` for the `GITCOMMIT` variable in the `make` script
to easily override `GITCOMMIT` in the `buildPhase`.

See the Hydra logs for reference:
https://nix-cache.s3.amazonaws.com/log/ib4qp8h4r8d830ra4fah38l7ybb82gp7-notary-0.6.0.drv

Furthermore some refactoring was applied:

* Activated the test suite for `cmd/notary` to confirm the basic
  functionality when building for NixOS.

* Added {pre,post} hooks for `{build,install}Phase`

* Added myself as maintainer to have more people available in case of
  further breakage.
    @Ma27
    Ma27 committed Apr 30, 2018
    Copy the full SHA
    6a32965 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #39684 from Ma27/fix-notary 

    notary: fix build
    @xeji
    xeji committed Apr 30, 2018
    Copy the full SHA
    69d4bdc View commit details
    Browse the repository at this point in the history