public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61334 from r-ryantm/auto-update/mergerfs

Browse Source 
mergerfs: 2.25.1 -> 2.26.1
This commit is contained in:
Renaud 2019-05-16 20:23:33 +02:00 committed by GitHub
commit ffe83327b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/filesystems/mergerfs/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: { stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mergerfs-${version}"; pname = "mergerfs";
version = "2.25.1"; version = "2.26.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trapexit"; owner = "trapexit";
repo = "mergerfs"; repo = pname;
rev = version; rev = version;
sha256 = "1xrd18spp3wj25dd8513bah856w44gw8hilk190v13g6yafx64n6"; sha256 = "16dgm2n36n6k7s1nzprzsv5bdckk0x2s08qpcvc42ny6jbivpjn3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -17,21 +17,20 @@ stdenv.mkDerivation rec {
buildInputs = [ attr libiconv ]; buildInputs = [ attr libiconv ];
preConfigure = '' preConfigure = ''
cat > src/version.hpp <<EOF echo "${version}" > VERSION
#pragma once
static const char MERGERFS_VERSION[] = "${version}";
EOF
''; '';
makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ];
enableParallelBuilding = true;
postFixup = '' postFixup = ''
ln -s $out/bin/mergerfs $out/bin/mount.fuse.mergerfs ln -srf $out/bin/mergerfs $out/bin/mount.fuse.mergerfs
ln -srf $out/bin/mergerfs $out/bin/mount.mergerfs
''; '';
meta = { meta = {
description = "A FUSE based union filesystem"; description = "A FUSE based union filesystem";
homepage = https://github.com/trapexit/mergerfs; homepage = "https://github.com/trapexit/mergerfs";
license = stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ]; maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];

14
pkgs/tools/filesystems/mergerfs/tools.nix
View File

@ -2,14 +2,14 @@
, rsync, python3, pythonPackages }: , rsync, python3, pythonPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mergerfs-tools-${version}"; pname = "mergerfs-tools";
version = "20171221"; version = "20190411";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trapexit"; owner = "trapexit";
repo = "mergerfs-tools"; repo = pname;
rev = "9b4fe0097b5b51e1a7411a26eb344a24cc8ce1b4"; rev = "6e41fc5848c7cc4408caea86f3991c8cc2ac85a1";
sha256 = "0qrixh3j58gzkmc8r2sgzgy56gm8bmhakwlc2gjb0yrpa1213na1"; sha256 = "0izswg6bya13scvb37l3gkl7mvi8q7l11p4hp4phdlcwh9jvdzcj";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"INSTALL=${coreutils}/bin/install" "INSTALL=${coreutils}/bin/install"
"PREFIX=$(out)" "PREFIX=${placeholder "out"}"
]; ];
postInstall = with stdenv.lib; '' postInstall = with stdenv.lib; ''
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Optional tools to help manage data in a mergerfs pool"; description = "Optional tools to help manage data in a mergerfs pool";
homepage = https://github.com/trapexit/mergerfs-tools; homepage = "https://github.com/trapexit/mergerfs-tools";
license = licenses.isc; license = licenses.isc;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau ]; maintainers = with maintainers; [ jfrankenau ];