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

Commits on Jun 29, 2017

  1. mergerfs: 2.16.1 -> 2.22.1

    @jfrankenau
    jfrankenau committed Jun 29, 2017
    Copy the full SHA
    8461e31 View commit details

  2. Merge pull request #26929 from jfrankenau/mergerfs-2.22.1 

    mergerfs: 2.16.1 -> 2.22.1
    @Mic92
    Mic92 authored Jun 29, 2017
    Copy the full SHA
    d0a6e05 View commit details
Showing with 8 additions and 5 deletions.
  1. +1 −0 lib/maintainers.nix
  2. +7 −5 pkgs/tools/filesystems/mergerfs/default.nix
1 change: 1 addition & 0 deletions lib/maintainers.nix
View file
Original file line number Diff line number Diff line change
@@ -248,6 +248,7 @@
jensbin = "Jens Binkert <jensbin@protonmail.com>";
jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
jfb = "James Felix Black <james@yamtime.com>";
jfrankenau = "Johannes Frankenau <johannes@frankenau.net>";
jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
jgertm = "Tim Jaeger <jger.tm@gmail.com>";
jgillich = "Jakob Gillich <jakob@gillich.me>";
12 changes: 7 additions & 5 deletions pkgs/tools/filesystems/mergerfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{ stdenv, fetchgit, fuse, pkgconfig, which, attr, pandoc, git }:
{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }:

stdenv.mkDerivation rec {
name = "mergerfs-${version}";
version = "2.16.1";
version = "2.22.1";

# not using fetchFromGitHub because of changelog being built with git log
src = fetchgit {
url = "https://github.com/trapexit/mergerfs";
rev = "refs/tags/${version}";
sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf";
sha256 = "12dm64l74wyagbwxsz57p8j3dwl9hgi0j3b6i0pn9m5ar7qrnv00";
deepClone = true;
leaveDotGit = true;
};

buildInputs = [ fuse pkgconfig which attr pandoc git ];
nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ];
buildInputs = [ attr libiconv ];

makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];

@@ -21,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/trapexit/mergerfs;
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ makefu ];
maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];
};
}