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

Commits on Nov 11, 2019

  1. maintainers: add isgy 

    maintainers: fixed typo
    isgy authored and Jon committed Nov 11, 2019
    Copy the full SHA
    053168d View commit details

  2. python3Packages.pyjson5: init at 0.8.5

    isgy authored and Jon committed Nov 11, 2019
    Copy the full SHA
    3be1039 View commit details

  3. python3Packages.jupyterlab_server: added pyjson5 dependency

    isgy authored and Jon committed Nov 11, 2019
    Copy the full SHA
    da006ed View commit details
9 changes: 9 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -2884,6 +2884,15 @@
githubId = 137306;
name = "Michele Catalano";
};
isgy = {
email = "isgy@teiyg.com";
github = "isgy";
githubId = 13622947;
keys = [{
longkeyid = "rsa4096/0xD3E1B013B4631293";
fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293";
}];
};
ivan = {
email = "ivan@ludios.org";
github = "ivan";
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/jupyterlab_server/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, pythonOlder
, requests
, pytest
, pyjson5
}:

buildPythonPackage rec {
@@ -19,7 +20,7 @@ buildPythonPackage rec {
};

checkInputs = [ requests pytest ];
propagatedBuildInputs = [ notebook jsonschema ];
propagatedBuildInputs = [ notebook jsonschema pyjson5 ];

# test_listing test fails
# this is a new package and not all tests pass
26 changes: 26 additions & 0 deletions pkgs/development/python-modules/pyjson5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ buildPythonPackage, lib, nose, fetchFromGitHub }:

buildPythonPackage rec {
pname = "pyjson5";
version = "0.8.5";

src = fetchFromGitHub {
owner = "dpranke";
repo = pname;
rev = "v${version}";
sha256 = "0nyngj18jlkgvm1177lc3cj47wm4yh3dqigygvcvw7xkyryafsqn";
};

doCheck = true;
checkInputs = [ nose ];
checkPhase = ''
nosetests
'';

meta = with lib; {
description = "Python implementation of the JSON5 data format";
license = licenses.asl20;
homepage = "https://github.com/dpranke/pyjson5";
maintainers = with maintainers; [ isgy ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4690,6 +4690,8 @@ in {

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

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

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

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