From 38bff390bc8be578c2d258e9b4c34d9a8a3533dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 01:00:08 -0700 Subject: [PATCH 1/2] btfs: 2.19 -> 2.20 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/btfs/versions --- pkgs/os-specific/linux/btfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 27fa40887ed..f21c9dcad35 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "btfs"; - version = "2.19"; + version = "2.20"; src = fetchFromGitHub { owner = "johang"; repo = pname; rev = "v${version}"; - sha256 = "1b58zqha2hpnk4ysp9870wd9pkyy6l106ghp0z0x655q70npj0wn"; + sha256 = "1xil18nmivakdv6rz4sd3203gzfisdvj79spni59kv7dby64rxdz"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 2e3df3f1a9d7195a433af2e5ddf86b3d3a7604df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Sep 2019 09:09:41 +0100 Subject: [PATCH 2/2] btfs: simplify shebang fixup --- pkgs/os-specific/linux/btfs/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index f21c9dcad35..d2e5d91e365 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -14,14 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - boost fuse libtorrentRasterbar curl + boost fuse libtorrentRasterbar curl python3 ]; - preInstall = '' - substituteInPlace scripts/btplay \ - --replace "/usr/bin/env python" "${python3.interpreter}" - ''; - meta = with stdenv.lib; { description = "A bittorrent filesystem based on FUSE"; homepage = https://github.com/johang/btfs;