Unverified Commit 4cb7f827 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #225219 from SuperSandro2000/225187-fixup

parents 302de4a2 4fc3e2c4

pkgs/development/python-modules/calysto-scheme/default.nix

+10 −3
Original line number Diff line number Diff line 
{ lib

, python3

, buildPythonPackage

, fetchFromGitHub

, metakernel

, pytestCheckHook

, yasi

}:



python3.pkgs.buildPythonPackage rec {

buildPythonPackage rec {

  pname = "calysto-scheme";

  version = "1.4.7";

  format = "setuptools";
@@ -15,11 +18,15 @@ python3.pkgs.buildPythonPackage rec { 
    hash = "sha256-5InImTbucggjf/tl8K31ZtLrwu5hqvggl7sYb0eqIEg=";

  };



  propagatedBuildInputs = with python3.pkgs; [

  propagatedBuildInputs = [

    yasi

    metakernel

  ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  pythonImportsCheck = [ "calysto_scheme" ];



  meta = with lib; {

pkgs/development/python-modules/calysto/default.nix

+9 −4
Original line number Diff line number Diff line 
{ lib

, python3

, buildPythonPackage

, fetchFromGitHub

, metakernel

, svgwrite

, ipywidgets

, cairosvg

, numpy

}:



python3.pkgs.buildPythonPackage rec {

buildPythonPackage rec {

  pname = "calysto";

  version = "1.0.6";

  format = "setuptools";
@@ -15,7 +20,7 @@ python3.pkgs.buildPythonPackage rec { 
    hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8=";

  };



  propagatedBuildInputs = with python3.pkgs; [

  propagatedBuildInputs = [

    metakernel

    svgwrite

    ipywidgets
@@ -23,7 +28,7 @@ python3.pkgs.buildPythonPackage rec { 
    numpy

  ];



  # Tests are failing not because of Nix.

  # there are no tests

  doCheck = false;



  pythonImportsCheck = [ "calysto" ];

pkgs/development/python-modules/yasi/default.nix

+9 −3
Original line number Diff line number Diff line 
{ lib

, python3

, buildPythonApplication

, colorama

, fetchFromGitHub

, pytestCheckHook

}:



python3.pkgs.buildPythonApplication rec {

buildPythonApplication rec {

  pname = "yasi";

  version = "2.1.2";

  format = "setuptools";
@@ -15,10 +17,14 @@ python3.pkgs.buildPythonApplication rec { 
    hash = "sha256-xKhVTmh/vrtBkatxtk8R4yqbGroH0I+xTKNYUpuikt4=";

  };



  propagatedBuildInputs = with python3.pkgs; [

  propagatedBuildInputs = [

    colorama

  ];



  nativeBuildInputs = [

    pytestCheckHook

  ];



  postPatch = ''

    substituteInPlace setup.py \

      --replace "test.test_yasi" "tests.test_yasi"

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -12856,7 +12856,7 @@ self: super: with self; { 


  yarl = callPackage ../development/python-modules/yarl { };



  yasi = toPythonModule (callPackage ../development/python-modules/yasi { });

  yasi = callPackage ../development/python-modules/yasi { };



  yaspin = callPackage ../development/python-modules/yaspin { };