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

Merge remote-tracking branch 'origin/master' into haskell-updates.

Browse Source
This commit is contained in:
Peter Simons
2020-08-14 09:46:18 +02:00
parent c06d2c2a7c 33ea7ef8fd
commit 144b1ddb1c
66 changed files with 603 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+2 -2
View File
@@ -2431,8 +2431,6 @@ in
assh = callPackage ../tools/networking/assh { };
asynk = callPackage ../tools/networking/asynk { };
b2sum = callPackage ../tools/security/b2sum {
inherit (llvmPackages) openmp;
};
@@ -16534,6 +16532,8 @@ in
asciidoc = asciidoc-full;
};
timescale-prometheus = callPackage ../servers/monitoring/timescale-prometheus { };
timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
pkgs/top-level/python-packages.nix
-4
View File
@@ -2062,8 +2062,6 @@ in {
caldav = callPackage ../development/python-modules/caldav { };
caldavclientlibrary-asynk = callPackage ../development/python-modules/caldavclientlibrary-asynk { };
biopython = callPackage ../development/python-modules/biopython { };
bedup = callPackage ../development/python-modules/bedup { };
@@ -5483,8 +5481,6 @@ in {
batchspawner = callPackage ../development/python-modules/batchspawner { };
pybfd = callPackage ../development/python-modules/pybfd { };
pybigwig = callPackage ../development/python-modules/pybigwig { };
py2bit = callPackage ../development/python-modules/py2bit { };