Merge master into staging-next

pkgs/development/libraries/science/math/arpack/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool
+{ stdenv, fetchurl, autoconf, automake, gettext, libtool
 , gfortran, openblas }:
 
 with stdenv.lib;

pkgs/development/libraries/science/math/caffe2/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, config, fetchFromGitHub, fetchpatch
+{ stdenv, lib, config, fetchFromGitHub
 , cmake
 , glog, google-gflags, gtest
 , protobuf, snappy

pkgs/development/libraries/science/math/liblapack/default.nix

@@ -11,8 +11,7 @@ let
   atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
                      else null;
   usedLibExtension = if shared then ".so" else ".a";
-  inherit (stdenv.lib) optional optionals concatStringsSep;
-  inherit (builtins) hasAttr attrNames;
+  inherit (stdenv.lib) optional optionals;
   version = "3.8.0";
 in
 

pkgs/development/libraries/science/networking/ns3/default.nix

@@ -1,5 +1,5 @@
 { stdenv
-, fetchFromGitHub, fetchurl
+, fetchFromGitHub
 , python
 
 # for binding generation