diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
commit | 4c6c919a3141b14c3e90607f171e534a82eceeb0 (patch) | |
tree | 9ea646e0f14fa84fa38a545a4edc33926208db96 /pkgs/top-level/python-packages.nix | |
parent | 335ae386741f74c63cf3bf4b7022a1e5e5f26066 (diff) | |
parent | fc1224d55dfdde0a3e43635fc9465cdff0bb80a3 (diff) | |
download | nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.gz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.bz2 nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.lz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.xz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.zst nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts: pkgs/os-specific/linux/kernel/generic.nix
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc81116cf3e6..2c40d1299345 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3786,9 +3786,6 @@ in { }; }); - nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead." - (callPackage ../development/python-modules/nose-parameterized {}); - neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; version = "0.3.1"; |