diff options
| -rw-r--r-- | nixos/modules/tasks/network-interfaces.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libeatmydata/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/numpy.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/scipy.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 0528012adfd8..c52bd904caec 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -523,7 +523,7 @@ in networking.bonds = mkOption { default = { }; - example = { + example = literalExample { bond0 = { interfaces = [ "eth0" "wlan0" ]; miimon = 100; @@ -598,7 +598,7 @@ in networking.macvlans = mkOption { type = types.attrsOf types.optionSet; default = { }; - example = { + example = literalExample { wan = { interface = "enp2s0"; mode = "vepa"; @@ -629,7 +629,7 @@ in networking.sits = mkOption { type = types.attrsOf types.optionSet; default = { }; - example = { + example = literalExample { hurricane = { remote = "10.0.0.1"; local = "10.0.0.22"; @@ -688,7 +688,7 @@ in networking.vlans = mkOption { default = { }; - example = { + example = literalExample { vlan0 = { id = 3; interface = "enp3s0"; @@ -727,7 +727,7 @@ in networking.wlanInterfaces = mkOption { default = { }; - example = { + example = literalExample { "wlan-station0" = { device = "wlp6s0"; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 2fdd1658f19f..ac75e6c8baa2 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - name = "libeatmydata-82"; + name = "libeatmydata-105"; src = fetchurl { url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; - sha256 = "0aavq71bf0yxdgyf8gvyzq086shszzwpbsz5rqkjg4cz0rc5yrqb"; + sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix index 0276d9ede3dd..141c8b14fa6d 100644 --- a/pkgs/development/python-modules/numpy.nix +++ b/pkgs/development/python-modules/numpy.nix @@ -9,8 +9,8 @@ in buildPythonPackage (args // rec { name = "numpy-${version}"; disabled = isPyPy; - buildInputs = args.buildInputs or [ gfortran nose passthru.blas ]; - propagatedBuildInputs = args.propagatedBuildInputs or [ ]; + buildInputs = args.buildInputs or [ gfortran nose ]; + propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ]; preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix index b31f539ebdd4..ae312cd32d59 100644 --- a/pkgs/development/python-modules/scipy.nix +++ b/pkgs/development/python-modules/scipy.nix @@ -9,8 +9,8 @@ in buildPythonPackage (args // rec { name = "scipy-${version}"; - buildInputs = (args.buildInputs or [ gfortran nose passthru.blas ]); - propagatedBuildInputs = (args.propagatedBuildInputs or [ numpy]); + buildInputs = (args.buildInputs or [ gfortran nose ]); + propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]); preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23aa0c8d3ce1..846e07c9ac46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18718,7 +18718,7 @@ in modules // { propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4 cython ]; - buildInputs = [ pkgs.gcc pkgs.qt4 self.numpy.blas self.nose ]; + buildInputs = [ pkgs.gcc pkgs.qt4 pkgs.blas self.nose ]; meta = { description = "QuTiP - Quantum Toolbox in Python"; @@ -19630,8 +19630,8 @@ in modules // { sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0"; }; - buildInputs = with self; [ numpy.blas nose pillow pkgs.gfortran pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ numpy scipy ]; + buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; + propagatedBuildInputs = with self; [ numpy scipy numpy.blas ]; LC_ALL="en_US.UTF-8"; |