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/hydra
base: 7889aef7927f
Choose a base ref
...
head repository: NixOS/hydra
compare: 4009d4295e1e
Choose a head ref
  • 5 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 31, 2020

  1. flake.lock: Update 

    Flake input changes:

* Updated 'nix': 'github:NixOS/nix/4ad5826a182f8eeb4cbc61e27d2128b08050b0d4' -> 'github:NixOS/nix/3e7aab81ce6787e01ea4ced5af1fc6a84e523762'
* Updated 'nix/nixpkgs': 'github:edolstra/nixpkgs/43e283790fbe330b723ac44b584824cf6d85c1ee' -> 'github:NixOS/nixpkgs/b88ff468e9850410070d4e0ccd68c7011f15b2be'
* Updated 'nixpkgs': 'github:edolstra/nixpkgs/d959778e0934c4c93896d509a65de798909c7cdd' -> 'github:NixOS/nixpkgs/b0c285807d6a9f1b7562ec417c24fa1a30ecc31a'
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    05bf278 View commit details
    Browse the repository at this point in the history

  2. Update to 20.03

    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    810075c View commit details
    Browse the repository at this point in the history

  3. Remove outdated email address

    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    22a65d0 View commit details
    Browse the repository at this point in the history

  4. perlDeps: Use lib.closePropagation 

    Apparentely, buildEnv in 20.03 no longer respects
propagated-build-inputs.

Note that the use of a library function (closePropagation) seems
fundamentally wrong to me - propagated-build-inputs should be used at
runtime, not at evaluation time.
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    f6119f2 View commit details
    Browse the repository at this point in the history

  5. Fix Mercurial tests 

    In Nixpkgs 20.03, Mercurial fails if PYTHONPATH is set:

  $ hg
  Traceback (most recent call last):
    File "/nix/store/q7s856v6nw4dffdrm9k3w38qs35i8kr3-mercurial-5.2.2/bin/..hg-wrapped-wrapped", line 37, in <module>
      dispatch.run()
    File "/nix/store/bffdy7q3wi3qinflnvbdkigqj39zzynd-python3-3.7.6/lib/python3.7/importlib/util.py", line 245, in __getattribute__
      self.__spec__.loader.exec_module(self)
    File "<frozen importlib._bootstrap_external>", line 728, in exec_module
    File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
    File "/nix/store/q7s856v6nw4dffdrm9k3w38qs35i8kr3-mercurial-5.2.2/lib/python3.7/site-packages/mercurial/dispatch.py", line 10, in <module>
      import difflib
    File "/nix/store/bffdy7q3wi3qinflnvbdkigqj39zzynd-python3-3.7.6/lib/python3.7/difflib.py", line 1084, in <module>
      import re
    File "/nix/store/bffdy7q3wi3qinflnvbdkigqj39zzynd-python3-3.7.6/lib/python3.7/re.py", line 143, in <module>
      class RegexFlag(enum.IntFlag):
  AttributeError: module 'enum' has no attribute 'IntFlag'
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    4009d42 View commit details
    Browse the repository at this point in the history