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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7dd624a45037
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 97259d0e38d5
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 14, 2021

  1. ydiff,gitAndTools.ydiff: unify 

    We were packaging ydiff twice!

In this patch, I've merged the two expressions into one, trying to
take the best of each.  ydiff (top-level) didn't support being used as
a Python library, which is required by one other package (patroni), so
I chose gitAndTools.ydiff as the starting point, then moved in the
longDescription from the top-level one, as well as the code used to
run the tests.

While I was there, I fixed the tests, which were intended to be run by
the top-level ydiff but actually were not, because unlike mkDerivation
buildPythonApplication will not run `make test' by default.

Also, top-level ydiff previously propagated less and patchutils,
meaning they'd have been installed globally instead of just referenced
by ydiff.  gitAndTools.ydiff just did nothing.  Both also expected to
find git, hg, and svn in the environment, which was impure.  So now
all these programs are referenced by store path from ydiff, for
purity.
    @alyssais
    alyssais committed Jan 14, 2021
    Copy the full SHA
    98c3490 View commit details

  2. Merge pull request #109353 from alyssais/ydiff 

    ydiff,gitAndTools.ydiff: unify
    @SuperSandro2000
    SuperSandro2000 authored Jan 14, 2021
    Copy the full SHA
    97259d0 View commit details
Loading