diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-09 14:08:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-09 14:08:27 -0500 |
commit | cc5c927aeafbfd61305a7df95f74510cd59c4fda (patch) | |
tree | 59f7851220fa733d9fbb7e7a90768873f02bcf40 /pkgs/tools | |
parent | 6a74718e00672c8c8377a97e0052cc635b65dfab (diff) | |
parent | 5b1cd5d27b1e3e3271a09836e06d9d79d6886978 (diff) | |
download | nixlib-cc5c927aeafbfd61305a7df95f74510cd59c4fda.tar nixlib-cc5c927aeafbfd61305a7df95f74510cd59c4fda.tar.gz nixlib-cc5c927aeafbfd61305a7df95f74510cd59c4fda.tar.bz2 nixlib-cc5c927aeafbfd61305a7df95f74510cd59c4fda.tar.lz nixlib-cc5c927aeafbfd61305a7df95f74510cd59c4fda.tar.xz nixlib-cc5c927aeafbfd61305a7df95f74510cd59c4fda.tar.zst nixlib-cc5c927aeafbfd61305a7df95f74510cd59c4fda.zip |
Merge pull request #36821 from jfrankenau/update-f3
f3: 6.0-2016.11.16-unstable -> 7.0
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/f3/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index 4af076e8f2cd..61c6ab253cce 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,27 +1,26 @@ { stdenv, fetchFromGitHub , parted, udev }: -let - version = "6.0-2016.11.16-unstable"; -in + stdenv.mkDerivation rec { - name = "f3-${version}"; + name = "${pname}-${version}"; + pname = "f3"; + version = "7.0"; enableParallelBuilding = true; src = fetchFromGitHub { owner = "AltraMayor"; - repo = "f3"; - rev = "eabf001f69a788e64912bc9e812c118a324077d5"; - sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm"; + repo = pname; + rev = "v${version}"; + sha256 = "195j2zd747ffbsl8p5rf7dyn1j5n05zfqy1s9fm4y6lz8yc1nr17"; }; buildInputs = [ parted udev ]; patchPhase = "sed -i 's/-oroot -groot//' Makefile"; - buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2 - "all" # f3read, f3write + buildFlags = [ "all" # f3read, f3write "extra" # f3brew, f3fix, f3probe ]; |