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: 44f18a5a4f01
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f2cab31ae997
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Aug 9, 2018

  1. nix1: don't deliver perl-bindings of nixStable (a.k.a nix2)

    This causes collisions between the build outputs of `nix` when building
    in an environment with `nix1.perl-bindings` and `nix`:
    
    ```
    collision between `/nix/store/aa4rrcj7dg2xj4rfkiclcmp745ibqng0-nix-2.0.4/lib/libnixstore.so' and `/nix/store/sp0sdi4bll80h58big1iy8kkh3qqxpw2-nix-1.11.16/lib/libnixstore.so'
    builder for '/nix/store/wgbccin107lhm8cv9imnnvkx1j2pgibc-hydra-perl-deps.drv' failed with exit code 25
    ```
    Ma27 committed Aug 9, 2018
    Copy the full SHA
    a7685f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2018

  1. hydra: 2017-11-21 -> 2018-08-07

    This bumps Hydra to the latest revision available. As Hydra doesn't have
    a release model (and therefore no tags) ATM, the derivation will pin
    against the actual git revision and the date of the commit in the
    derivation name.
    
    Additionally the following changes have been made:
    
    * Dropped `postUnpack` phase. It is useful when working with the Hydra
      source (and no dirty changes shall be used in `release.nix`, but is has
      no use in `nixpkgs`).
    
    * Added myself as maintainer to have more folks available in case of
      future breakage.
    
    * Implemented support for Nix 2.0 and `unstable` (currently 2.1):
    
      Since 1672bcd in NixOS/nix the
      evaluator differentiates between `settings` and `evalSettings`.
      Previously `restrictEval` in `hydra-eval-jobs.cc` has been set in
      `settings`, this doesn't work anymore in Nix 2.1 and is therefore
      incompatible to Nix 2.0 on an API level.
    
      To resolve this, the flag `isGreaterNix20` parses the version string
      of `pkgs.nix` and applies a patch if nix.version<=2.0.
    
      Furthermore the Hydra build with Nix 2.1 requires `boost` as build input
      which is not needed for Nix 2.0. To avoid unnecessary increase in the
      closure size this library will only used as build input for
      nix.version>2.0.
    
    * Fixed the NixOS test for `hydra`:
      disabled binary cache to allow sandbox builds (otherwise it would
      query `cache.nixos.org` during the Hydra build inside the test).
    
      Additionally the trivial.nix jobset required simplification (as done
      in NixOS/hydra, e.g. tests/api-test.nix) as bash is not available in
      the build sandbox as builder (even when adding pkgs.bash to
      systemPackages).
    
      The easiest workaround to confirm a the functionality of a jobset
      without importing nixpkgs is to use the default shell /bin/sh which
      is mounted from `pkgs.busybox` into the build env
      (#44841 (comment)) in the
      VM and a named pipe to create $out.
    
    Closes #44044
    Ma27 committed Aug 13, 2018
    Copy the full SHA
    7682c2f View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. Merge pull request #44841 from Ma27/bump-hydra

    hydra: 2017-11-21 -> 2018-08-07
    nlewo committed Aug 14, 2018
    Copy the full SHA
    f2cab31 View commit details
    Browse the repository at this point in the history