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

Commits on Sep 30, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ab5a5c1 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8d00c48 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dfb5755 View commit details

Commits on Oct 1, 2019

  1. Copy the full SHA
    212973a View commit details
  2. Merge pull request #68957 from simonchatts/entrance

    pythonPackages.entrance: init at 1.1.10 (and janus init at 0.4.0)
    zimbatm authored Oct 1, 2019
    Copy the full SHA
    0df4dad View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -5903,6 +5903,12 @@
fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5";
}];
};
simonchatts = {
email = "code@chatts.net";
github = "simonchatts";
githubId = 11135311;
name = "Simon Chatterjee";
};
simonvandel = {
email = "simon.vandel@gmail.com";
github = "simonvandel";
45 changes: 45 additions & 0 deletions pkgs/development/python-modules/entrance/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{ lib, fetchPypi, buildPythonPackage, pythonOlder, routerFeatures
, janus, ncclient, paramiko, pyyaml, sanic }:

let
# The `routerFeatures` flag optionally brings in some somewhat heavy
# dependencies, in order to enable interacting with routers
opts = if routerFeatures then {
prePatch = ''
substituteInPlace ./setup.py --replace "extra_deps = []" "extra_deps = router_feature_deps"
'';
extraBuildInputs = [ janus ncclient paramiko ];
} else {
prePatch = "";
extraBuildInputs = [];
};

in

buildPythonPackage rec {
pname = "entrance";
version = "1.1.10";

src = fetchPypi {
inherit pname version;
sha256 = "080qkvkmfw4004cl721l5bvpg001xz8vs6q59dg797kqxfrwk5kw";
};

# The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later
disabled = pythonOlder "3.6";

# No useful tests
doCheck = false;

propagatedBuildInputs = [ pyyaml sanic ] ++ opts.extraBuildInputs;

prePatch = opts.prePatch;

meta = with lib; {
description = "A server framework for web apps with an Elm frontend";
homepage = https://github.com/ensoft/entrance;
license = licenses.mit;
maintainers = with maintainers; [ simonchatts ];
};
}

22 changes: 22 additions & 0 deletions pkgs/development/python-modules/janus/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, pytest, pythonOlder }:

buildPythonPackage rec {
pname = "janus";
version = "0.4.0";

src = fetchPypi {
inherit pname version;
sha256 = "cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef";
};

disabled = pythonOlder "3.6";

checkInputs = [ pytest ];

meta = with lib; {
description = "Mixed sync-async queue";
homepage = "https://github.com/aio-libs/janus";
license = licenses.asl20;
maintainers = [ maintainers.simonchatts ];
};
}
6 changes: 6 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -563,6 +563,10 @@ in {

diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };

entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; };

entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; };

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

face = callPackage ../development/python-modules/face { };
@@ -689,6 +693,8 @@ in {

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

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

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

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