Unverified Commit 928a3ffb authored by nicoo's avatar nicoo Committed by GitHub
Browse files

Merge #310779: fix `ark-pixel-font` build

parents ece972dc b8e3cf06

pkgs/by-name/ar/ark-pixel-font/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 


python312Packages.buildPythonPackage rec {

  pname = "ark-pixel-font";

  version = "2024.04.05";

  version = "2024.05.12";



  src = fetchFromGitHub {

    owner = "TakWolf";

    repo = pname;

    rev = version;

    hash = "sha256-G34cu/mSt/p8UPJt+Q1T2qy6d9LGgT1Jslt9syRz5eo=";

    repo = "ark-pixel-font";

    rev = "refs/tags/${version}";

    hash = "sha256-PGhhKWHDpvOqa3vaI40wuIsAEdWGb62cN7QJeHQqiss=";

  };



  format = "other";

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

+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 


buildPythonPackage rec {

  pname = "bdffont";

  version = "0.0.20";

  version = "0.0.24";



  disabled = pythonOlder "3.11";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-T0gTtudsZmL0VZ3a3+C/v+dWAwbXUgf0PEdNtkxWROw=";

    hash = "sha256-3HJwtBV78zsMUlmwJrPj74Vd5cru1zflvies5mNGcy4=";

  };



  format = "pyproject";

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

0 → 100644
+44 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, hatchling

, bdffont

, pytestCheckHook

, nix-update-script

}:



buildPythonPackage rec {

  pname = "pcffont";

  version = "0.0.11";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "TakWolf";

    repo = "pcffont";

    rev = "refs/tags/${version}";

    hash = "sha256-gu9niWxYTw3rcA++z8B+MdKp5XaqAGjmvd+PdSDosfg=";

  };



  build-system = [

    hatchling

  ];



  dependencies = [

    bdffont

  ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  pythonImportsCheck = [ "pcffont" ];



  passthru.updateScript = nix-update-script { };



  meta = {

    description = "Library for manipulating Portable Compiled Format (PCF) fonts";

    homepage = "https://github.com/TakWolf/pcffont";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ ];

  };

}

pkgs/development/python-modules/pixel-font-builder/default.nix

+14 −4
Original line number Diff line number Diff line
@@ -10,23 +10,32 @@ 
, brotli

, fonttools

, pypng

, pcffont

, pythonRelaxDepsHook

}:



buildPythonPackage rec {

  pname = "pixel-font-builder";

  version = "0.0.19";

  version = "0.0.24";

  pyproject = true;



  disabled = pythonOlder "3.11";



  src = fetchPypi {

    pname = "pixel_font_builder";

    inherit version;

    hash = "sha256-f38DyM5hojHfv8k/W6kcHxbOjz43hHW6i4Scm6NbHiQ=";

    hash = "sha256-hBlTTIPx4TRgeXapVnSaKPUwseR3uYT0gcgKLGmmSZI=";

  };



  format = "pyproject";

  pythonRelaxDeps = [

    "fonttools"

  ];



  nativeBuildInputs = [

    pythonRelaxDepsHook

  ];



  build-system = [

    hatch-vcs

    hatchling

  ];
@@ -36,10 +45,11 @@ buildPythonPackage rec { 
    pypng

  ];



  propagatedBuildInputs = [

  dependencies = [

    bdffont

    brotli

    fonttools

    pcffont

  ];



  passthru.updateScript = nix-update-script { };

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -1338,6 +1338,8 @@ self: super: with self; { 














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



























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



























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





























  pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; };