From 06395c6bafe5705a36bcb430ac8a7a2eee0989d0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 24 Sep 2016 01:51:26 +0200 Subject: [PATCH] bedup: 0.10 -> 0.10.1, fix eval bedup is not available for Python 2, our current default. --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2ee65deae11..592b52df4dee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11067,7 +11067,7 @@ in bluez = bluez5; - inherit (pythonPackages) bedup; + inherit (python3Packages) bedup; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39affe6bac49..56540965a078 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2037,13 +2037,14 @@ in modules // { }; bedup = buildPythonPackage rec { - version = "0.10"; + version = "0.10.1"; name = "bedup-${version}"; - src = pkgs.fetchgit { - url = "https://github.com/g2p/bedup.git"; - rev = "598fd4b"; - sha256 = "0cwnifv5mk5rgil0rcibqchz7y8nzpdpi3k2s9wbqcynjl7l49ln"; + src = pkgs.fetchFromGitHub { + owner = "g2p"; + repo = "bedup"; + rev = "v${version}"; + sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6"; }; buildInputs = with self; [ pkgs.btrfs-progs ]; @@ -2052,9 +2053,6 @@ in modules // { disabled = pythonOlder "3.3"; - # No proper test suite. Included tests cannot be run because of relative import - doCheck = false; - meta = { description = "Deduplication for Btrfs"; longDescription = ''