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: f6047c8b6fa2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8b565657919e
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 16, 2020

  1. ipfs: remove executable bit from systemd units 

    IPFS would complain with warnings like
Configuration file /nix/store/...-ipfs-0.6.0/etc/systemd/system/ipfs.service is marked executable. Please remove executable permission bits. Proceeding anyway.

(cherry picked from commit 1a382e9)
    @Luflosi @Ericson2314
    Luflosi authored and Ericson2314 committed Oct 16, 2020
    Copy the full SHA
    05d9031 View commit details
    Browse the repository at this point in the history

  2. ipfs: avoid warning during build when moving directory 

    Trying to move a directory into itself will result in a warning:
mv: cannot move 'ipfs-src' to a subdirectory of itself, 'ipfs-src/ipfs-src'

This can be prevented by excluding that directory.

(cherry picked from commit d385065)
    @Luflosi @Ericson2314
    Luflosi authored and Ericson2314 committed Oct 16, 2020
    Copy the full SHA
    da221d8 View commit details
    Browse the repository at this point in the history

  3. ipfs: prepare to add 0.7 in addition

    @Ericson2314
    Ericson2314 committed Oct 16, 2020
    Copy the full SHA
    27949d6 View commit details
    Browse the repository at this point in the history

  4. ipfs: Add 0.7.0 in addition 

    IPFS has been evolving quite fast lately, so I think tracking new
release in stable NixOS is prudent.

(cherry picked from commit b75e431)
    @Luflosi @Ericson2314
    Luflosi authored and Ericson2314 committed Oct 16, 2020
    1
    Copy the full SHA
    aee9c60 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #100676 from obsidiansystems/ipfs_latest-for-stable 

    [20.09] ipfs: Add 0.7.0 in addition
    @Ericson2314
    Ericson2314 committed Oct 16, 2020
    Copy the full SHA
    8b56565 View commit details
    Browse the repository at this point in the history