btfs: 2.9 -> 2.10 (#16603)

This commit is contained in:
Michele Guerini Rocco 2016-06-30 23:39:15 +02:00 committed by Franz Pletz
parent af2d602257
commit d75c7d0dcd
3 changed files with 14 additions and 4 deletions

View File

@ -0,0 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "1.0.9";
sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl";
})

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "btfs-${version}"; name = "btfs-${version}";
version = "2.9"; version = "2.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johang"; owner = "johang";
repo = "btfs"; repo = "btfs";
rev = "3ee6671eca2c0e326ac38d07cab4989ebad3495c"; rev = "2eac5e70a1ed22fa0761b6357c54fd90eea02de6";
sha256 = "0f7yc7hkfwdj9hixsyswf17yrpcpwxxb0svj5lfqcir8a45kf100"; sha256 = "146vgwn79dnbkkn35safga55lkwhvarkmilparmr26hjb56cs1dk";
}; };
buildInputs = [ buildInputs = [

View File

@ -636,7 +636,9 @@ in
sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";
}; };
btfs = callPackage ../os-specific/linux/btfs { }; btfs = callPackage ../os-specific/linux/btfs {
libtorrentRasterbar = libtorrentRasterbar_1_09;
};
cabal2nix = self.haskellPackages.cabal2nix; cabal2nix = self.haskellPackages.cabal2nix;
@ -8287,6 +8289,8 @@ in
libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { };
libtorrentRasterbar_1_09 = callPackage ../development/libraries/libtorrent-rasterbar/1.09.nix { };
libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix {
# fix "unrecognized option -arch" error # fix "unrecognized option -arch" error
stdenv = if stdenv.isDarwin stdenv = if stdenv.isDarwin