From b0614b5c83ae62672cb036bebb6ce12675aa3074 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 15 Dec 2021 00:00:26 +0300 Subject: refactor(3p/lisp): Move things from //users/wpcarro/third_party/lisp * move packages and adapt them for the depot structure instead of briefcase * drop linear-programming package, it didn't build anyways Note that at least some of these packages (e.g. prove) are deprecated upstream, but lets sort that out later. Change-Id: I7f5a5faa29d57f060b21ac8e1706090866a82000 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4330 Autosubmit: tazjin Reviewed-by: grfn Reviewed-by: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/third_party/README.md | 5 ---- users/wpcarro/third_party/default.nix | 5 ---- users/wpcarro/third_party/lisp/anaphora.nix | 17 ------------ users/wpcarro/third_party/lisp/cl-arrows.nix | 15 ----------- users/wpcarro/third_party/lisp/cl-colors.nix | 20 -------------- users/wpcarro/third_party/lisp/let-plus.nix | 19 ------------- .../third_party/lisp/linear-programming.nix | 26 ------------------ users/wpcarro/third_party/lisp/prove.nix | 31 ---------------------- 8 files changed, 138 deletions(-) delete mode 100644 users/wpcarro/third_party/README.md delete mode 100644 users/wpcarro/third_party/default.nix delete mode 100644 users/wpcarro/third_party/lisp/anaphora.nix delete mode 100644 users/wpcarro/third_party/lisp/cl-arrows.nix delete mode 100644 users/wpcarro/third_party/lisp/cl-colors.nix delete mode 100644 users/wpcarro/third_party/lisp/let-plus.nix delete mode 100644 users/wpcarro/third_party/lisp/linear-programming.nix delete mode 100644 users/wpcarro/third_party/lisp/prove.nix (limited to 'users/wpcarro') diff --git a/users/wpcarro/third_party/README.md b/users/wpcarro/third_party/README.md deleted file mode 100644 index 29e498a37726..000000000000 --- a/users/wpcarro/third_party/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# third_party - -The `third_party` directory hosts Nix expressions that package software that I -cannot or have not found in other Nix package repositorys like `nixpkgs` or -`depot`. diff --git a/users/wpcarro/third_party/default.nix b/users/wpcarro/third_party/default.nix deleted file mode 100644 index 949110373fb2..000000000000 --- a/users/wpcarro/third_party/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, briefcase, depot, ... }: - -# Exposing these to be available as briefcase.third_party.pkgs for example. - -{ inherit pkgs briefcase depot; } diff --git a/users/wpcarro/third_party/lisp/anaphora.nix b/users/wpcarro/third_party/lisp/anaphora.nix deleted file mode 100644 index bf4bf663f4d4..000000000000 --- a/users/wpcarro/third_party/lisp/anaphora.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ depot, ... }: - -let - src = builtins.fetchGit { - url = "https://github.com/tokenrove/anaphora.git"; - rev = "aeace4c68cf55098a67112750b28f8f2dc6d0e30"; - }; -in depot.nix.buildLisp.library { - name = "anaphora"; - deps = []; - srcs = [ - "${src}/packages.lisp" - "${src}/early.lisp" - "${src}/symbolic.lisp" - "${src}/anaphora.lisp" - ]; -} diff --git a/users/wpcarro/third_party/lisp/cl-arrows.nix b/users/wpcarro/third_party/lisp/cl-arrows.nix deleted file mode 100644 index 4c09d688fae7..000000000000 --- a/users/wpcarro/third_party/lisp/cl-arrows.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ depot, ... }: - -let - src = builtins.fetchGit { - url = "https://github.com/nightfly19/cl-arrows.git"; - rev = "cbb46b69a7de40f1161c9caaf6cef93b3af9994f"; - }; -in depot.nix.buildLisp.library { - name = "cl-arrows"; - deps = []; - srcs = [ - "${src}/packages.lisp" - "${src}/arrows.lisp" - ]; -} diff --git a/users/wpcarro/third_party/lisp/cl-colors.nix b/users/wpcarro/third_party/lisp/cl-colors.nix deleted file mode 100644 index fa35b755dbbc..000000000000 --- a/users/wpcarro/third_party/lisp/cl-colors.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ depot, briefcase, ... }: - -let - src = builtins.fetchGit { - url = "https://github.com/tpapp/cl-colors.git"; - rev = "827410584553f5c717eec6182343b7605f707f75"; - }; -in depot.nix.buildLisp.library { - name = "cl-colors"; - deps = [ - depot.third_party.lisp.alexandria - briefcase.third_party.lisp.let-plus - ]; - srcs = [ - "${src}/package.lisp" - "${src}/colors.lisp" - "${src}/colornames.lisp" - "${src}/hexcolors.lisp" - ]; -} diff --git a/users/wpcarro/third_party/lisp/let-plus.nix b/users/wpcarro/third_party/lisp/let-plus.nix deleted file mode 100644 index a750443fd1c8..000000000000 --- a/users/wpcarro/third_party/lisp/let-plus.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ depot, briefcase, ... }: - -let - src = builtins.fetchGit { - url = "https://github.com/tpapp/let-plus.git"; - rev = "7cf18b29ed0fe9c667a9a6a101b08ab9661a59e9"; - }; -in depot.nix.buildLisp.library { - name = "let-plus"; - deps = [ - depot.third_party.lisp.alexandria - briefcase.third_party.lisp.anaphora - ]; - srcs = [ - "${src}/package.lisp" - "${src}/let-plus.lisp" - "${src}/extensions.lisp" - ]; -} diff --git a/users/wpcarro/third_party/lisp/linear-programming.nix b/users/wpcarro/third_party/lisp/linear-programming.nix deleted file mode 100644 index fc95787a1d85..000000000000 --- a/users/wpcarro/third_party/lisp/linear-programming.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ depot, ... }: - -let - src = builtins.fetchGit { - url = "https://github.com/neil-lindquist/linear-programming.git"; - rev = "8c8d55e7584773b90c4ba4b225c5f2008f4c474a"; - }; -in depot.nix.buildLisp.library { - name = "linear-programming"; - deps = [ - (depot.nix.buildLisp.bundled "uiop") - depot.third_party.lisp.iterate - depot.third_party.lisp.alexandria - ]; - srcs = [ - "${src}/src/conditions.lisp" - "${src}/src/expressions.lisp" - "${src}/src/simplex.lisp" - "${src}/src/system-info.lisp" - "${src}/src/utils.lisp" - "${src}/src/problem.lisp" - "${src}/src/solver.lisp" - "${src}/src/external-formats.lisp" - "${src}/src/all.lisp" - ]; -} diff --git a/users/wpcarro/third_party/lisp/prove.nix b/users/wpcarro/third_party/lisp/prove.nix deleted file mode 100644 index 7c5879b1fded..000000000000 --- a/users/wpcarro/third_party/lisp/prove.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ depot, briefcase, ... }: - -let - src = builtins.fetchGit { - url = "https://github.com/fukamachi/prove.git"; - rev = "5d71f02795b89e36f34e8c7d50e69b67ec6ca2de"; - }; -in depot.nix.buildLisp.library { - name = "prove"; - deps = [ - depot.third_party.lisp.cl-ppcre - depot.third_party.lisp.cl-ansi-text - depot.third_party.lisp.alexandria - depot.third_party.lisp.uiop - briefcase.third_party.lisp.cl-colors - ]; - srcs = [ - "${src}/src/asdf.lisp" - "${src}/src/suite.lisp" - "${src}/src/color.lisp" - "${src}/src/output.lisp" - "${src}/src/prove.lisp" - "${src}/src/report.lisp" - "${src}/src/reporter.lisp" - "${src}/src/test.lisp" - "${src}/src/reporter/dot.lisp" - "${src}/src/reporter/fiveam.lisp" - "${src}/src/reporter/list.lisp" - "${src}/src/reporter/tap.lisp" - ]; -} -- cgit 1.4.1