public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-01-19 09:24:01 +01:00
parent e7f86448c5 bd538d6bb0
commit f8b45e2d84
107 changed files with 2541 additions and 1803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/top-level/python-packages.nix
View File

@@ -1287,14 +1287,6 @@ in {
CommonMark = callPackage ../development/python-modules/commonmark { };
CommonMark_54 = self.CommonMark.overridePythonAttrs (oldAttrs: rec {
version = "0.5.4";
src = oldAttrs.src.override {
inherit version;
sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5";
};
});
coilmq = callPackage ../development/python-modules/coilmq { };
colander = callPackage ../development/python-modules/colander { };
@@ -2808,6 +2800,10 @@ in {
inherit (self) systemd pytest;
};
jq = callPackage ../development/python-modules/jq {
inherit (pkgs) jq;
};
jsondate = callPackage ../development/python-modules/jsondate { };
jsondiff = callPackage ../development/python-modules/jsondiff { };