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 <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2021-12-15 00:00:26 +03:00 committed by clbot
parent 46a2c75a59
commit b0614b5c83
8 changed files with 25 additions and 72 deletions

View file

@ -1,9 +1,10 @@
{ depot, ... }:
{ depot, pkgs, ... }:
let
src = builtins.fetchGit {
src = pkgs.fetchgit {
url = "https://github.com/nightfly19/cl-arrows.git";
rev = "cbb46b69a7de40f1161c9caaf6cef93b3af9994f";
hash = "sha256:0la2vr10510vmx29w9p3sj1qi1sych0crcpy4kdgxzn8m7kqlli0";
};
in depot.nix.buildLisp.library {
name = "cl-arrows";

View file

@ -1,15 +1,16 @@
{ depot, briefcase, ... }:
{ depot, pkgs, ... }:
let
src = builtins.fetchGit {
src = pkgs.fetchgit {
url = "https://github.com/tpapp/cl-colors.git";
rev = "827410584553f5c717eec6182343b7605f707f75";
hash = "sha256:0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a";
};
in depot.nix.buildLisp.library {
name = "cl-colors";
deps = [
depot.third_party.lisp.alexandria
briefcase.third_party.lisp.let-plus
depot.third_party.lisp.let-plus
];
srcs = [
"${src}/package.lisp"

View file

@ -1,15 +1,16 @@
{ depot, briefcase, ... }:
{ depot, pkgs, ... }:
let
src = builtins.fetchGit {
src = pkgs.fetchgit {
url = "https://github.com/tpapp/let-plus.git";
rev = "7cf18b29ed0fe9c667a9a6a101b08ab9661a59e9";
hash = "sha256:1xy3b05dwjddk33mah2jaigm4jzsmrxjcc1d0dhsw0krwgr4450f";
};
in depot.nix.buildLisp.library {
name = "let-plus";
deps = [
depot.third_party.lisp.alexandria
briefcase.third_party.lisp.anaphora
depot.third_party.lisp.anaphora
];
srcs = [
"${src}/package.lisp"

View file

@ -1,31 +1,34 @@
{ depot, briefcase, ... }:
{ depot, pkgs, ... }:
let
src = builtins.fetchGit {
src = pkgs.fetchgit {
url = "https://github.com/fukamachi/prove.git";
rev = "5d71f02795b89e36f34e8c7d50e69b67ec6ca2de";
hash = "sha256:0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc";
};
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
depot.third_party.lisp.cl-ansi-text
depot.third_party.lisp.cl-colors
depot.third_party.lisp.cl-ppcre
(depot.nix.buildLisp.bundled "asdf")
];
srcs = [
"${src}/src/asdf.lisp"
"${src}/src/suite.lisp"
"${src}/src/color.lisp"
"${src}/src/output.lisp"
"${src}/src/prove.lisp"
"${src}/src/asdf.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/dot.lisp"
"${src}/src/reporter/tap.lisp"
"${src}/src/suite.lisp"
"${src}/src/test.lisp"
"${src}/src/prove.lisp"
];
}

View file

@ -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`.

View file

@ -1,5 +0,0 @@
{ pkgs, briefcase, depot, ... }:
# Exposing these to be available as briefcase.third_party.pkgs for example.
{ inherit pkgs briefcase depot; }

View file

@ -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"
];
}

View file

@ -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"
];
}