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: 20bc7ace641a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7ce5ab6e21b0
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 23, 2018

  1. pythonPackages.nanoleaf: init at 0.4.1

    @elseym
    elseym committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    elseym Simon Waibl
    GPG key ID: 8696D1F9E5C020D2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c598aab View commit details

  2. home-assistant: add nanoleaf dependency

    @elseym
    elseym committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    elseym Simon Waibl
    GPG key ID: 8696D1F9E5C020D2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1fd55e5 View commit details

  3. Merge pull request #50931 from elseym/python-nanoleaf 

    pythonPackages.nanoleaf: init at 0.4.1
    @fpletz
    fpletz authored Nov 23, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7ce5ab6 View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -1319,6 +1319,11 @@
github = "ellis";
name = "Ellis Whitehead";
};
elseym = {
email = "elseym@me.com";
github = "elseym";
name = "Simon Waibl";
};
elvishjerricco = {
email = "elvishjerricco@gmail.com";
github = "ElvishJerricco";
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/nanoleaf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv, buildPythonPackage, fetchPypi, requests }:

buildPythonPackage rec {
pname = "nanoleaf";
version = "0.4.1";

src = fetchPypi {
inherit pname version;
sha256 = "17dmxibfjmwnrs6ng5cmvfis3cv6iw267xb8n1pijy15y9dz0s8s";
};

prePatch = ''
sed -i '/^gitVersion =/d' setup.py
substituteInPlace setup.py --replace 'gitVersion' '"${version}"'
'';

propagatedBuildInputs = [ requests ];

meta = with stdenv.lib; {
description = "A python interface for Nanoleaf Aurora lighting";
homepage = https://github.com/software-2/nanoleaf;
license = licenses.mit;
maintainers = with maintainers; [ elseym ];
};
}
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
@@ -562,7 +562,7 @@
"light.mqtt_template" = ps: with ps; [ paho-mqtt ];
"light.mysensors" = ps: with ps; [ ];
"light.mystrom" = ps: with ps; [ ];
"light.nanoleaf_aurora" = ps: with ps; [ ];
"light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ];
"light.opple" = ps: with ps; [ ];
"light.osramlightify" = ps: with ps; [ ];
"light.piglow" = ps: with ps; [ ];
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4996,6 +4996,8 @@ in {

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

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

});

in fix' (extends overrides packages)