nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #225219 from SuperSandro2000/225187-fixup

Browse Source
This commit is contained in:
Sandro 2023-04-08 18:16:01 +02:00 committed by GitHub
commit 4cb7f8278b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/calysto-scheme/default.nix
View File

@ -1,9 +1,12 @@
{ lib { lib
, python3 , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, metakernel
, pytestCheckHook
, yasi
}: }:
python3.pkgs.buildPythonPackage rec { buildPythonPackage rec {
pname = "calysto-scheme"; pname = "calysto-scheme";
version = "1.4.7"; version = "1.4.7";
format = "setuptools"; format = "setuptools";
@ -15,11 +18,15 @@ python3.pkgs.buildPythonPackage rec {
hash = "sha256-5InImTbucggjf/tl8K31ZtLrwu5hqvggl7sYb0eqIEg="; hash = "sha256-5InImTbucggjf/tl8K31ZtLrwu5hqvggl7sYb0eqIEg=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = [
yasi yasi
metakernel metakernel
]; ];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "calysto_scheme" ]; pythonImportsCheck = [ "calysto_scheme" ];
meta = with lib; { meta = with lib; {

13
pkgs/development/python-modules/calysto/default.nix
View File

@ -1,9 +1,14 @@
{ lib { lib
, python3 , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, metakernel
, svgwrite
, ipywidgets
, cairosvg
, numpy
}: }:
python3.pkgs.buildPythonPackage rec { buildPythonPackage rec {
pname = "calysto"; pname = "calysto";
version = "1.0.6"; version = "1.0.6";
format = "setuptools"; format = "setuptools";
@ -15,7 +20,7 @@ python3.pkgs.buildPythonPackage rec {
hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8="; hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = [
metakernel metakernel
svgwrite svgwrite
ipywidgets ipywidgets
@ -23,7 +28,7 @@ python3.pkgs.buildPythonPackage rec {
numpy numpy
]; ];
# Tests are failing not because of Nix. # there are no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "calysto" ]; pythonImportsCheck = [ "calysto" ];

12
pkgs/development/python-modules/yasi/default.nix
View File

@ -1,9 +1,11 @@
{ lib { lib
, python3 , buildPythonApplication
, colorama
, fetchFromGitHub , fetchFromGitHub
, pytestCheckHook
}: }:
python3.pkgs.buildPythonApplication rec { buildPythonApplication rec {
pname = "yasi"; pname = "yasi";
version = "2.1.2"; version = "2.1.2";
format = "setuptools"; format = "setuptools";
@ -15,10 +17,14 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-xKhVTmh/vrtBkatxtk8R4yqbGroH0I+xTKNYUpuikt4="; hash = "sha256-xKhVTmh/vrtBkatxtk8R4yqbGroH0I+xTKNYUpuikt4=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = [
colorama colorama
]; ];
nativeBuildInputs = [
pytestCheckHook
];
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "test.test_yasi" "tests.test_yasi" --replace "test.test_yasi" "tests.test_yasi"

2
pkgs/top-level/python-packages.nix
View File

@ -12856,7 +12856,7 @@ self: super: with self; {
yarl = callPackage ../development/python-modules/yarl { }; 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 { }; yaspin = callPackage ../development/python-modules/yaspin { };