diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-04-13 10:37:54 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-04-13 10:44:01 +0100 |
| commit | ca6a4bf05d3e382772cd0cf0b442f71ea517cc74 (patch) | |
| tree | a200ab05ec8d3832b371744afcbf79689915a2ab /pkgs/tools/filesystems | |
| parent | 94d68a9e59c10ac0465b82b7a018465e462df449 (diff) | |
| download | nixlib-ca6a4bf05d3e382772cd0cf0b442f71ea517cc74.tar nixlib-ca6a4bf05d3e382772cd0cf0b442f71ea517cc74.tar.gz nixlib-ca6a4bf05d3e382772cd0cf0b442f71ea517cc74.tar.bz2 nixlib-ca6a4bf05d3e382772cd0cf0b442f71ea517cc74.tar.lz nixlib-ca6a4bf05d3e382772cd0cf0b442f71ea517cc74.tar.xz nixlib-ca6a4bf05d3e382772cd0cf0b442f71ea517cc74.tar.zst nixlib-ca6a4bf05d3e382772cd0cf0b442f71ea517cc74.zip | |
mergerfs: 2.24.0 -> 2.24.2
Remove .git because it tend to break hashes.
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/mergerfs/default.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 6f239bfa1279..16e6db8e4f75 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }: +{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { name = "mergerfs-${version}"; - version = "2.24.0"; + version = "2.24.2"; - # not using fetchFromGitHub because of changelog being built with git log - src = fetchgit { - url = "https://github.com/trapexit/mergerfs"; - rev = "refs/tags/${version}"; - sha256 = "12ci1i5zkarl1rz0pq1ldw0fpp4yfj8vz36jij63am7w7gp7qly2"; - deepClone = true; - leaveDotGit = true; + src = fetchFromGitHub { + owner = "trapexit"; + repo = "mergerfs"; + rev = version; + sha256 = "0i65v7900s7c9jkj3a4v44vf3r5mvjkbcic3df940nmk0clahhcs"; }; - nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ]; + nativeBuildInputs = [ + automake autoconf pkgconfig gettext libtool pandoc which + ]; buildInputs = [ attr libiconv ]; + preConfigure = '' + cat > src/version.hpp <<EOF + #pragma once + static const char MERGERFS_VERSION[] = "${version}"; + EOF + ''; + makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; meta = { |