Unverified Commit 33c65031 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #278394 from SuperSandro2000/python-modules-buildPythonPackage 

 python311Packages.yasi: use buildPythonPackage,  fypp: move python application out of python-modules
parents 9e30176c ce11a6fb

pkgs/development/python-modules/fypp/default.nix→pkgs/by-name/fy/fypp/package.nix

+5 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, buildPythonApplication }:

{ lib, fetchFromGitHub, python3 }:



buildPythonApplication rec {

python3.pkgs.buildPythonApplication rec {

  pname = "fypp";

  version = "3.2";

  format = "setuptools";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "aradi";
@@ -12,6 +12,8 @@ buildPythonApplication rec { 
    hash = "sha256-MgGVlOqOIrIVoDfBMVpFLT26mhYndxans2hfo/+jdoA=";

  };



  nativeBuildInputs = [ python3.pkgs.setuptools ];



  meta = with lib; {

    description = "Python powered Fortran preprocessor";

    homepage = "https://github.com/aradi/fypp";

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

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

, buildPythonApplication

, buildPythonPackage

, colorama

, fetchFromGitHub

, pytestCheckHook

, setuptools

}:



buildPythonApplication rec {

buildPythonPackage rec {

  pname = "yasi";

  version = "2.1.2";

  format = "setuptools";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "nkmathew";
@@ -17,11 +18,15 @@ buildPythonApplication rec { 
    hash = "sha256-xKhVTmh/vrtBkatxtk8R4yqbGroH0I+xTKNYUpuikt4=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    colorama

  ];



  nativeBuildInputs = [

  nativeCheckInputs = [

    pytestCheckHook

  ];

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -23832,8 +23832,6 @@ with pkgs; 














  toml-f = callPackage ../development/libraries/toml-f { };



























  fypp = python3Packages.callPackage ../development/python-modules/fypp { };



























  dbcsr = callPackage ../development/libraries/science/math/dbcsr { };





























  taco = callPackage ../development/libraries/taco { };