mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

pythonPackages.networkx: 2.1 -> 2.2

Browse source
This commit is contained in:
Timo Kaufmann 2018-10-24 15:34:13 +02:00 committed by Frederik Rietdijk
parent 72e6e792f6
commit efe6322ce4
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/science/math/sage/sage-src.nix
View file

@ -77,6 +77,21 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31";
sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30";
})
# https://trac.sagemath.org/ticket/26326
# needs to be split because there is a merge commit in between
(fetchSageDiff {
name = "networkx-2.2-1.patch";
base = "8.4";
rev = "68f5ad068184745b38ba6716bf967c8c956c52c5";
sha256 = "112b5ywdqgyzgvql2jj5ss8la9i8rgnrzs8vigsfzg4shrcgh9p6";
})
(fetchSageDiff {
name = "networkx-2.2-2.patch";
base = "626485bbe5f33bf143d6dfba4de9c242f757f59b~1";
rev = "db10d327ade93711da735a599a67580524e6f7b4";
sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f";
})
];
patches = nixPatches ++ packageUpgradePatches ++ [

5
pkgs/development/python-modules/networkx/default.nix
View file

@ -7,12 +7,13 @@
buildPythonPackage rec {
pname = "networkx";
version = "2.1";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
version = "2.2";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1";
sha256 = "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5";
};
checkInputs = [ nose ];