diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index 51ee824b6ff1..7621c2dfdff7 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { name = "readstat"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ libiconv ]; + meta = { homepage = "https://github.com/WizardMac/ReadStat"; description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files"; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index b6c539150ccd..3f8883b47989 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.23.1"; + version = "0.24.0"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-4RdER6ecvHGXTLZ1GnBNI1hIETI8O/t+kuOXiQhMigs="; + hash = "sha256-0bXJoEq8FHRNaFMjncIwDbJROtFz/IJ4gD+LfvmtFUg="; }; propagatedBuildInputs = [ @@ -72,7 +72,9 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires a real API key "openai/tests/test_endpoints.py" + # openai: command not found "openai/tests/test_file_cli.py" + "openai/tests/test_long_examples_validator.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index a719f98e9d1d..9719b918b6eb 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , jinja2 @@ -101,6 +102,8 @@ buildPythonPackage rec { "test_dummies" "test_from_dummies_args" "test_rolling_step_method" + ] ++ lib.optionals stdenv.isDarwin [ + "test_plotting" # Fatal Python error: Illegal instruction ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 4992d260471c..c6197fcd7448 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , buildPythonPackage , cython , fetchFromGitHub +, libiconv , pandas , python , pythonOlder @@ -29,6 +31,8 @@ buildPythonPackage rec { buildInputs = [ zlib + ] ++ lib.optionals stdenv.isDarwin [ + libiconv ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6de514afb5b..e5dab7cbcef9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10754,7 +10754,9 @@ with pkgs; read-edid = callPackage ../os-specific/linux/read-edid { }; - readstat = callPackage ../applications/science/math/readstat { }; + readstat = callPackage ../applications/science/math/readstat { + inherit (pkgs.darwin) libiconv; + }; redir = callPackage ../tools/networking/redir { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 566303b24f69..8a1e4c59b00d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8495,7 +8495,9 @@ in { pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; - pyreadstat = callPackage ../development/python-modules/pyreadstat { }; + pyreadstat = callPackage ../development/python-modules/pyreadstat { + inherit (pkgs.darwin) libiconv; + }; pyrealsense2 = toPythonModule (pkgs.librealsense.override { enablePython = true;