Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 05ff5799b289
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 703b378e34d1
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 16, 2021

  1. python3Packages.base36: init at 0.1.1

    @fabaff
    fabaff committed Jan 16, 2021
    Copy the full SHA
    55cc3ce View commit details

  2. home-assistant: update component-packages

    @fabaff
    fabaff committed Jan 16, 2021
    Copy the full SHA
    30018b6 View commit details

  3. Merge pull request #109530 from fabaff/base36 

    python3Packages.base36: init at 0.1.1
    @Mic92
    Mic92 authored Jan 16, 2021
    Copy the full SHA
    703b378 View commit details
Showing with 38 additions and 1 deletion.
  1. +35 −0 pkgs/development/python-modules/base36/default.nix
  2. +1 −1 pkgs/servers/home-assistant/component-packages.nix
  3. +2 −0 pkgs/top-level/python-packages.nix
35 changes: 35 additions & 0 deletions pkgs/development/python-modules/base36/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:

buildPythonPackage rec {
pname = "base36";
version = "0.1.1";

src = fetchFromGitHub {
owner = "tonyseek";
repo = "python-base36";
rev = "v${version}";
sha256 = "076nmk9s0zkmgs2zqzkaqij5cmzhf4mrhivbb9n6cvz52i1mppr5";
};

postPatch = ''
substituteInPlace setup.cfg \
--replace "[pytest]" "[tool:pytest]" \
--replace "--pep8 --cov" ""
'';

checkInputs = [ pytestCheckHook ];

pytestFlagsArray = [ "test_base36.py" ];
pythonImportsCheck = [ "base36" ];

meta = with lib; {
description = "Python implementation for the positional numeral system using 36 as the radix";
homepage = "https://github.com/tonyseek/python-base36";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/home-assistant/component-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -350,7 +350,7 @@
"hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
"home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect
"homeassistant" = ps: with ps; [ ];
"homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash
"homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG fnvhash
"homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit
"homematic" = ps: with ps; [ pyhomematic ];
"homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -832,6 +832,8 @@ in {

baron = callPackage ../development/python-modules/baron { };

base36 = callPackage ../development/python-modules/base36 { };

base58 = callPackage ../development/python-modules/base58 { };

baselines = callPackage ../development/python-modules/baselines { };