nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99558 from erictapen/20.03-python2-fontforge

Browse Source 
[20.03] python.pkgs.fontforge: disable with Python 2
This commit is contained in:
Justin Humm
2020-10-04 21:36:32 +02:00
committed by GitHub
parent adc7650bf2 d6f46d2a91
commit 0d0660fde3
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/data/fonts/monoid/default.nix
View File

@@ -1,19 +1,25 @@
{ stdenv, fetchFromGitHub, python2 }:
# Python 3 support requires https://github.com/larsenwork/monoid/pull/233 to be merged
{ stdenv, fetchFromGitHub, fetchpatch, python3 }:
stdenv.mkDerivation {
pname = "monoid";
version = "2016-07-21";
version = "2018-06-03";
src = fetchFromGitHub {
owner = "larsenwork";
repo = "monoid";
rev = "e9d77ec18c337dc78ceae787a673328615f0b120";
sha256 = "07h5q6cn6jjpmxp9vyag1bxx481waz344sr2kfs7d37bba8yjydj";
rev = "a331c7c5f402c449f623e0d0895bd2fd8dc30ccf";
sha256 = "sha256-RV6lxv5CjywTMcuPMj6rdjLKrap7zLJ7niaNeF//U1Y=";
};
patches = [
(fetchpatch {
url = "https://github.com/larsenwork/monoid/pull/233/commits/f84f2ed61301ee84dadd16351314394f22ebed2f.patch";
sha256 = "sha256-CxfFHlR7TB64pvrfzVfUDkPwuRO2UdGOhXwW98c+oQU=";
})
];
nativeBuildInputs = [
(python2.withPackages (pp: with pp; [
(python3.withPackages (pp: with pp; [
fontforge
]))
];

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

@@ -3605,14 +3605,10 @@ in {
folium = callPackage ../development/python-modules/folium { };
fontforge = (toPythonModule (pkgs.fontforge.override {
fontforge = disabledIf (!isPy3k) (toPythonModule (pkgs.fontforge.override {
withPython = true;
inherit python;
})).overrideAttrs (old: {
meta = old.meta // {
broken = isPy38;
};
});
}));
fonttools = callPackage ../development/python-modules/fonttools { };