From c8b7680bb605d84ae3aea8de5012898ed62b6045 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 14:30:29 +0200 Subject: [PATCH 1/2] python3Packages.bt-proximity: 0.2.0 -> 0.2.1 --- .../python-modules/bt-proximity/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 584b7b126055..9de6dfbdefff 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,19 +1,22 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pybluez }: +{ lib +, buildPythonPackage +, fetchPypi +, pybluez +}: -buildPythonPackage { +buildPythonPackage rec { pname = "bt-proximity"; - version = "0.2"; + version = "0.2.1"; - # pypi only has a pre-compiled wheel and no sources - src = fetchFromGitHub { - owner = "FrederikBolding"; - repo = "bluetooth-proximity"; - rev = "463bade8a9080b47f09bf4a47830b31c69c5dffd"; - sha256 = "0anfh90cj3c2g7zqrjvq0d6dzpb4hjl6gk8zw0r349j2zw9i4h7y"; + src = fetchPypi { + pname = "bt_proximity"; + inherit version; + sha256 = "0xlif91vblbz065531yjf8nmlcahrl4q5pz52bc1jmzz7iv9hpgq"; }; - propagatedBuildInputs = [ pybluez ]; + propagatedBuildInputs = [ + pybluez + ]; # there are no tests doCheck = false; From a7e1fe1139bc8503ce0837fd01e521a2dd4619dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 14:33:03 +0200 Subject: [PATCH 2/2] python-aliases: add alias for bt-proximity --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b796d9ac4427..aa73e2fdc06b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -56,4 +56,5 @@ mapAliases ({ smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 websocket_client = websocket-client; + bt_proximity = bt-proximity; # added 2021-07-02 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79b17a44d90e..1899e75a4051 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1220,7 +1220,7 @@ in { btchip = callPackage ../development/python-modules/btchip { }; - bt_proximity = callPackage ../development/python-modules/bt-proximity { }; + bt-proximity = callPackage ../development/python-modules/bt-proximity { }; BTrees = callPackage ../development/python-modules/btrees { };