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

Merge branch 'staging-next' into staging

Browse Source 
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
This commit is contained in:
Jan Tojnar
2021-04-08 17:14:31 +02:00
parent 97490e6783 bf6abedefb
commit 625ce6c7f6
112 changed files with 2577 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python2-packages.nix
+3 -1
View File
@@ -578,7 +578,9 @@ with self; with super; {
sympy = callPackage ../development/python-modules/sympy/1_5.nix { };
tables = callPackage ../development/python-modules/tables/3.5.nix { };
tables = callPackage ../development/python-modules/tables/3.5.nix {
hdf5 = pkgs.hdf5_1_10;
};
tarman = callPackage ../development/python-modules/tarman { };