From 435b144ca8409c66e966f07697c59dd38d611417 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 24 Oct 2020 13:27:56 +0200 Subject: [PATCH] lispPackages.cl-paths-ttf: readd, previously was a dependency of clx-truetype --- .../quicklisp-to-nix-output/cl-paths-ttf.nix | 27 +++++++++++++++++++ .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 26 ++++++++++++------ 3 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix new file mode 100644 index 000000000000..cfca59e3b503 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -0,0 +1,27 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-paths-ttf''; + version = ''cl-vectors-20180228-git''; + + description = ''cl-paths-ttf: vectorial paths manipulation''; + + deps = [ args."cl-paths" args."zpb-ttf" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; + sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + }; + + packageName = "cl-paths-ttf"; + + asdFilesToKeep = ["cl-paths-ttf.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation + SHA256 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL + http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz + MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-paths-ttf FILENAME + cl-paths-ttf DEPS + ((NAME cl-paths FILENAME cl-paths) (NAME zpb-ttf FILENAME zpb-ttf)) + DEPENDENCIES (cl-paths zpb-ttf) VERSION cl-vectors-20180228-git SIBLINGS + (cl-aa-misc cl-aa cl-paths cl-vectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 73b82f8ab140..be2274b0fcfb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -35,6 +35,7 @@ cl-json cl-l10n cl-libuv cl-mysql +cl-paths-ttf cl-pdf cl-ppcre cl-ppcre-template diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index ff58de943965..f11f8d88c4d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -667,14 +667,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-paths" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-paths" or (x: {})) - (import ./quicklisp-to-nix-output/cl-paths.nix { - inherit fetchurl; - })); - - "cl-aa" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-aa" or (x: {})) @@ -710,6 +702,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-paths" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-paths" or (x: {})) + (import ./quicklisp-to-nix-output/cl-paths.nix { + inherit fetchurl; + })); + + "puri" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."puri" or (x: {})) @@ -2768,6 +2768,16 @@ let quicklisp-to-nix-packages = rec { })); + "cl-paths-ttf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-paths-ttf" or (x: {})) + (import ./quicklisp-to-nix-output/cl-paths-ttf.nix { + inherit fetchurl; + "cl-paths" = quicklisp-to-nix-packages."cl-paths"; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + })); + + "cl-mysql" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-mysql" or (x: {}))