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: 2d32f7daa82f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8c43a3e828e8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 16, 2018

  1. python3Packages.git-annex-adapter: fix build

    `git-annex` version 6.20180719 enhances the output of `git-annex info`
    with a description and UUID of the repository which broke the testcase
    `test_process_annex_info_batch` which parses the output of the info
    command.
    
    The testcase has been fixed accordingly and the patch was filed upstream
    here: alpernebbi/git-annex-adapter#6
    
    I rechecked the functionality in a simple python environment with the
    following expression:
    
    ```
    with import ./. {};
    python3.withPackages (ps: with ps; [ git-annex-adapter ])
    ```
    
    Furthermore I tested the main functionality in a Python REPL within the environment.
    
    The Darwin patch fixes tests that rely on `rev`, a binary which is
    distributed in the `utillinux` package and not available on Nix with
    Darwin.
    
    To make the purpose of the patches for future contributors clear I
    documented the purpose for each patch.
    Ma27 committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    1022c3c View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. Merge pull request #45061 from Ma27/fix-python-git-annex-adapter

    python3Packages.git-annex-adapter: fix build
    timokau committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    8c43a3e View commit details
    Browse the repository at this point in the history