nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45820 from obsidiansystems/dont-use-obsolete-platform-aliases

Browse Source 
treewide: Dont use obsolete platform aliases
This commit is contained in:
John Ericson
2018-08-31 09:56:10 -04:00
committed by GitHub
parent f7606a82ed 0828e2d8c3
commit 2c4a75e9ef
408 changed files with 1139 additions and 1180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/numpy/default.nix
View File

@@ -1,4 +1,4 @@
{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, blas, hostPlatform }:
{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, blas }:
buildPythonPackage rec {
pname = "numpy";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
./numpy-distutils-C++.patch
];
postPatch = lib.optionalString hostPlatform.isMusl ''
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
# Use fenv.h
sed -i \
numpy/core/src/npymath/ieee754.c.src \

4
pkgs/development/python-modules/pyserial/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, hostPlatform }:
{ stdenv, lib, fetchPypi, buildPythonPackage }:
buildPythonPackage rec {
pname = "pyserial";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
};
checkPhase = "python -m unittest discover -s test";
doCheck = !hostPlatform.isDarwin; # broken on darwin
doCheck = !stdenv.hostPlatform.isDarwin; # broken on darwin
meta = with lib; {
homepage = "https://github.com/pyserial/pyserial";