Merge pull request #197294 from ChrisPattison/asymptote

Asymptote: 2.67 -> 2.83
This commit is contained in:
7c6f434c 2022-10-23 09:47:02 +00:00 committed by GitHub
commit 127c1662b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 12 deletions

View File

@ -9,24 +9,16 @@
}:
stdenv.mkDerivation rec {
version = "2.67";
version = "2.83";
pname = "asymptote";
src = fetchFromGitHub {
owner = "vectorgraphics";
repo = pname;
rev = version;
hash = "sha256-dMgsKBg6YQ3mdx3jFqjX4vZeizaier8+ZQUl4J6QXNE=";
hash = "sha256-Kz1uh3fMbADd39seunfL5O2Q31VLGKhu/ZuKi9/kuEc=";
};
patches =
(lib.optional (lib.versionOlder version "2.68")
(fetchpatch {
url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch";
hash = "sha256-1RYMZcwbjBAM7aAXFBbwst0eozWYFtJ8HcicjXogS/w=";
}))
;
nativeBuildInputs = [
autoreconfHook
bison
@ -80,7 +72,6 @@ stdenv.mkDerivation rec {
description = "A tool for programming graphics intended to replace Metapost";
license = licenses.gpl3Plus;
maintainers = [ maintainers.raskin ];
broken = stdenv.isDarwin; # https://github.com/vectorgraphics/asymptote/issues/69
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@ -2154,7 +2154,7 @@ with pkgs;
astc-encoder = callPackage ../tools/graphics/astc-encoder { };
asymptote = callPackage ../tools/graphics/asymptote {
texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo; };
texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2; };
gsl = gsl_1;
};