diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-29 00:14:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-29 00:14:11 +0000 |
| commit | 9fd1366f68ac00809f2b7dce3dfba075e40e696f (patch) | |
| tree | a13fd0063c69c98abeefe96d7cbdf6cd024412a2 /pkgs/data | |
| parent | 67e47c115061f90237d3d328fb2a6328c19333fb (diff) | |
| parent | 413383e9ad8819c5e7a463813f40294ae8ff7ecc (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/openmoji/default.nix | 33 | ||||
| -rw-r--r-- | pkgs/data/misc/elliptic_curves/default.nix | 4 |
2 files changed, 34 insertions, 3 deletions
diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index d511a78f72503..baf49c80e1c7d 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -1,7 +1,10 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , scfbuild +, fontforge +, libuninameslist , nodejs , nodePackages , python3Packages @@ -14,6 +17,34 @@ let [ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ] variant; + # With newer fontforge the build hangs, see + # https://github.com/NixOS/nixpkgs/issues/167869 + # Patches etc taken from + # https://github.com/NixOS/nixpkgs/commit/69da642a5a9bb433138ba1b13c8d56fb5bb6ec05 + fontforge-20201107 = fontforge.overrideAttrs (old: rec { + version = "20201107"; + src = fetchFromGitHub { + owner = "fontforge"; + repo = "fontforge"; + rev = version; + sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; + }; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; + sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; + }) + (fetchpatch { + url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch"; + sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29"; + }) + ]; + buildInputs = old.buildInputs ++ [ libuninameslist ]; + }); + scfbuild-with-fontforge-20201107 = scfbuild.override (old: { + fontforge = fontforge-20201107; + }); + in stdenv.mkDerivation rec { pname = "openmoji"; version = "13.1.0"; @@ -26,7 +57,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - scfbuild + scfbuild-with-fontforge-20201107 nodejs nodePackages.glob nodePackages.lodash diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix index daa017a681128..610977b882f77 100644 --- a/pkgs/data/misc/elliptic_curves/default.nix +++ b/pkgs/data/misc/elliptic_curves/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "elliptic_curves"; - version = "0.8"; + version = "0.8.1"; src = fetchurl { url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0pzaym44x88dn8rydiwqgm73yghzlgf7gqvd7qqsrsdl2vyp091w"; + sha256 = "0l7xh4abw5sb4d37r0ylr3vwb88fpx2zrvfm5ql0c7yrv5q59fjz"; }; |