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

Commits on Apr 9, 2020

  1. python27Packages.colorlog: 4.0.2 -> 4.1.0

    @r-ryantm
    r-ryantm authored and Jon committed Apr 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5dc0610 View commit details

  2. esphome: remove version pinning

    Jonathan Ringer committed Apr 9, 2020
    Copy the full SHA
    664d1b2 View commit details

  3. apache-airflow: unpin colorlog

    Jonathan Ringer committed Apr 9, 2020
    Copy the full SHA
    402e921 View commit details
1 change: 1 addition & 0 deletions pkgs/development/python-modules/apache-airflow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -145,6 +145,7 @@ buildPythonPackage rec {
--replace "dill>=0.2.2, <0.3" "dill" \
--replace "configparser>=3.5.0, <3.6.0" "configparser" \
--replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \
--replace "colorlog==4.0.2" "colorlog" \
--replace "funcsigs==1.0.0" "funcsigs" \
--replace "flask-swagger==0.2.13" "flask-swagger" \
--replace "python-daemon>=2.1.1, <2.2" "python-daemon" \
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/colorlog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "colorlog";
version = "4.0.2";
version = "4.1.0";

src = fetchPypi {
inherit pname version;
sha256 = "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42";
sha256 = "1lpk8zmfv8vz090h5d0hzb4n39wgasxdd3x3bpn3v1x1n9dfzaih";
};

checkInputs = [ pytest ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {

meta = with stdenv.lib; {
description = "Log formatting with colors";
homepage = https://github.com/borntyping/python-colorlog;
homepage = "https://github.com/borntyping/python-colorlog";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
13 changes: 7 additions & 6 deletions pkgs/servers/home-assistant/esphome.nix
View file
Original file line number Diff line number Diff line change
@@ -33,11 +33,9 @@ in python.pkgs.buildPythonApplication rec {
protobuf
];

# remove all version pinning (E.g tornado==5.1.1 -> tornado)
postPatch = ''
substituteInPlace setup.py \
--replace "protobuf==3.10.0" "protobuf~=3.10" \
--replace "paho-mqtt==1.4.0" "paho-mqtt~=1.4" \
--replace "tornado==5.1.1" "tornado~=5.1"
sed -i -e "s/==[0-9.]*//" setup.py
'';

makeWrapperArgs = [
@@ -49,11 +47,14 @@ in python.pkgs.buildPythonApplication rec {
];

# Platformio will try to access the network
doCheck = false;
# Instead, run the executable
checkPhase = ''
$out/bin/esphome --help > /dev/null
'';

meta = with lib; {
description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
homepage = https://esphome.io/;
homepage = "https://esphome.io/";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda globin ];
};