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/ofborg
base: ea4b7f8aab39
Choose a base ref
...
head repository: NixOS/ofborg
compare: 33258c16c671
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 29, 2020

  1. ofborg: nix: pass rev to nixpkgs 

    Hydra seems to have passed in rev all the time, and nixpkgs will soon
require `rev` to be set.

This initially broke nixpkgs eval in
NixOS/nixpkgs@5e8545e,
so we now update ofborg to always pass `rev` when instantiating nixpkgs
to avoid breaking it.
    @flokli
    flokli committed Mar 29, 2020
    Copy the full SHA
    29ac8fb View commit details
    Browse the repository at this point in the history

  2. tasks/eval/nixpkgs: pass in rev, use proper rev and shortrev 

    Here, we can easily access the real commit ID, so pass it in instead of
a bogus rev and shortRev.

Hydra seems to have passed in rev all the time, and nixpkgs will soon
require `rev` to be set.

This initially broke nixpkgs eval in
NixOS/nixpkgs@5e8545e,
so we now update ofborg to always pass `rev` when instantiating nixpkgs
to avoid breaking it.
    @flokli
    flokli committed Mar 29, 2020
    Copy the full SHA
    5fadddf View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Merge pull request #442 from flokli/ofborg-pass-rev 

    ofborg: pass rev
    @grahamc
    grahamc committed Mar 30, 2020
    Copy the full SHA
    33258c1 View commit details
    Browse the repository at this point in the history