diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2016-06-30 23:39:15 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-06-30 23:39:15 +0200 |
| commit | d75c7d0dcd12ae032ae7e55bbf74850b327647d5 (patch) | |
| tree | 723b67b0f1ef2425302c016f611bfef8abefee66 /pkgs | |
| parent | af2d6022577beb8290909b705254d05ea3ab07e5 (diff) | |
| download | nixpkgs-d75c7d0dcd12ae032ae7e55bbf74850b327647d5.tar nixpkgs-d75c7d0dcd12ae032ae7e55bbf74850b327647d5.tar.gz nixpkgs-d75c7d0dcd12ae032ae7e55bbf74850b327647d5.tar.bz2 nixpkgs-d75c7d0dcd12ae032ae7e55bbf74850b327647d5.tar.lz nixpkgs-d75c7d0dcd12ae032ae7e55bbf74850b327647d5.tar.xz nixpkgs-d75c7d0dcd12ae032ae7e55bbf74850b327647d5.tar.zst nixpkgs-d75c7d0dcd12ae032ae7e55bbf74850b327647d5.zip | |
btfs: 2.9 -> 2.10 (#16603)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libtorrent-rasterbar/1.09.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/btfs/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix new file mode 100644 index 00000000000..e2809e9d483 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.0.9"; + sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl"; +}) diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index a0197c58095..f0d1b3d7357 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "btfs-${version}"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; - rev = "3ee6671eca2c0e326ac38d07cab4989ebad3495c"; - sha256 = "0f7yc7hkfwdj9hixsyswf17yrpcpwxxb0svj5lfqcir8a45kf100"; + rev = "2eac5e70a1ed22fa0761b6357c54fd90eea02de6"; + sha256 = "146vgwn79dnbkkn35safga55lkwhvarkmilparmr26hjb56cs1dk"; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90188ff100e..15e8a41426f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -636,7 +636,9 @@ in sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; }; - btfs = callPackage ../os-specific/linux/btfs { }; + btfs = callPackage ../os-specific/linux/btfs { + libtorrentRasterbar = libtorrentRasterbar_1_09; + }; cabal2nix = self.haskellPackages.cabal2nix; @@ -8287,6 +8289,8 @@ in 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 { # fix "unrecognized option -arch" error stdenv = if stdenv.isDarwin |