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

Commits on Jul 21, 2020

  1. pythonPackages.colorful: init at 0.5.4

    Co-Authored-By: Chris <grkcharge@gmail.com>
    kalbasit and Charg committed Jul 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    7c4a19b View commit details
  2. pythonPackages.pysingleton: init at 0.2.1

    Co-Authored-By: Chris <grkcharge@gmail.com>
    kalbasit and Charg committed Jul 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    86f9646 View commit details
  3. pythonPackages.tag-expressions: init at 1.1.0

    Co-Authored-By: Chris <grkcharge@gmail.com>
    kalbasit and Charg committed Jul 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    d4dae82 View commit details
  4. pythonPackages.radish-bdd: init at 0.13.2

    Co-Authored-By: Chris <grkcharge@gmail.com>
    kalbasit and Charg committed Jul 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    a155661 View commit details
  5. terraform-compliance: init at 1.2.11

    Co-Authored-By: Chris <grkcharge@gmail.com>
    kalbasit and Charg committed Jul 21, 2020
    Copy the full SHA
    817a835 View commit details

Commits on Jul 23, 2020

  1. Copy the full SHA
    b30286c View commit details
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{ lib
, GitPython
, buildPythonApplication
, emoji
, fetchFromGitHub
, filetype
, ipython
, junit-xml
, lxml
, mock
, netaddr
, pytestCheckHook
, python3Packages
, radish-bdd
, semver
}:

buildPythonApplication rec {
pname = "terraform-compliance";
version = "1.2.11";

# No tests in Pypi package
src = fetchFromGitHub {
owner = "eerkunt";
repo = pname;
rev = version;
sha256 = "161mszmxqp3wypnda48ama2mmq8yjilkxahwc1mxjwzy1n19sn7v";
};

checkInputs = [ pytestCheckHook ];

disabledTests = [
"test_which_success"
"test_readable_plan_file_is_not_json"
];

propagatedBuildInputs = [
GitPython
emoji
filetype
ipython
junit-xml
lxml
mock
netaddr
radish-bdd
semver
];

meta = with lib; {
description = "BDD test framework for terraform";
homepage = https://github.com/eerkunt/terraform-compliance;
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
};
}
27 changes: 27 additions & 0 deletions pkgs/development/python-modules/colorful/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:

buildPythonPackage rec {
pname = "colorful";
version = "0.5.4";

# No tests in the Pypi package.
src = fetchFromGitHub {
owner = "timofurrer";
repo = pname;
rev = "v${version}";
sha256 = "1fcz5v8b318a3dsdha4c874jsf3wmcw3f25bv2csixclyzacli98";
};

checkInputs = [ pytestCheckHook ];

meta = with lib; {
description = "Terminal string styling done right, in Python.";
homepage = "http://github.com/timofurrer/colorful";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
};
}
26 changes: 26 additions & 0 deletions pkgs/development/python-modules/pysingleton/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
}:

buildPythonPackage rec {
pname = "pysingleton";
version = "0.2.1";

src = fetchPypi {
inherit pname version;
sha256 = "5776e7a4ba0bab26709da604f4e648c5814385fef34010723db3da0d41b0dbcc";
};

pythonImportsCheck = [ "singleton" ];

# No tests in the Pypi package.
doCheck = false;

meta = with lib; {
description = "Provides a decorator to create thread-safe singleton classes";
homepage = "https://github.com/timofurrer/pysingleton";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
};
}
52 changes: 52 additions & 0 deletions pkgs/development/python-modules/radish-bdd/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, click
, colorful
, docopt
, fetchFromGitHub
, freezegun
, humanize
, lark-parser
, parse-type
, pysingleton
, pytestCheckHook
, pyyaml
, tag-expressions
, lxml
, pytest-mock
}:

buildPythonPackage rec {
pname = "radish-bdd";
version = "0.13.2";

# Pypi package does not have necessary test fixtures.
src = fetchFromGitHub {
owner = pname;
repo = "radish";
rev = "v${version}";
sha256 = "1k7l0j8w221pa6k990x4rfm7km4asx5zy4zpzvh029lb9nw2pp8b";
};

propagatedBuildInputs = [
lark-parser
click
colorful
tag-expressions
parse-type
humanize
pyyaml
docopt
pysingleton
];

checkInputs = [ freezegun lxml pytestCheckHook pytest-mock ];
disabledTests = [ "test_main_cli_calls" ];

meta = with lib; {
description = "Behaviour-Driven-Development tool for python";
homepage = "http://radish-bdd.io";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/tag-expressions/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:

buildPythonPackage rec {
pname = "tag-expressions";
version = "1.1.0";

src = fetchPypi {
inherit pname version;
sha256 = "1c0a49c3c0357976822b03c43db8d4a1c5548e16fb07ac939c10bbd5183f529d";
};

checkInputs = [ pytestCheckHook ];

meta = with lib; {
description = "Package to parse logical tag expressions";
homepage = "http://github.com/timofurrer/tag-expressions";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kalbasit ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -26642,6 +26642,8 @@ in
callPackage ../applications/networking/cluster/terraform-providers {}
);

terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance {};

terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {};

terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
8 changes: 8 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -1504,6 +1504,8 @@ in {

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

radish-bdd = callPackage ../development/python-modules/radish-bdd { };

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

reproject = callPackage ../development/python-modules/reproject { };
@@ -1643,6 +1645,8 @@ in {
hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
};

tag-expressions = callPackage ../development/python-modules/tag-expressions { };

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

tesserocr = callPackage ../development/python-modules/tesserocr { };
@@ -2092,6 +2096,8 @@ in {

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

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

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

colorspacious = callPackage ../development/python-modules/colorspacious { };
@@ -2542,6 +2548,8 @@ in {

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

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

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

python-json-logger = callPackage ../development/python-modules/python-json-logger { };