maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: format entire depot with nixpkgs-fmt

Browse source 
This CL can be used to compare the style of nixpkgs-fmt against other
formatters (nixpkgs, alejandra).

Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: cynthia <cynthia@tvl.fyi>
Reviewed-by: edef <edef@edef.eu>
Reviewed-by: eta <tvl@eta.st>
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2022-01-30 19:06:58 +03:00 • committed by tazjin
parent 2d10d60fac
commit aa122cbae7
310 changed files with 7278 additions and 5490 deletions
Download patch file Download diff file Expand all files Collapse all files

3
third_party/lisp/bordeaux-threads.nix vendored
View file

@ -5,7 +5,8 @@
let
src = with pkgs; srcOnly lispPackages.bordeaux-threads;
getSrc = f: "${src}/src/${f}";
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "bordeaux-threads";
deps = [ depot.third_party.lisp.alexandria ];

4
third_party/lisp/cl-fad.nix vendored
View file

@ -1,5 +1,5 @@
# Portable pathname library
{ depot, pkgs, ...}:
{ depot, pkgs, ... }:
with depot.nix;
@ -18,7 +18,7 @@ in buildLisp.library {
srcs = map (f: src + ("/" + f)) [
"packages.lisp"
] ++ [
{ ccl = "${src}/openmcl.lisp"; }
{ ccl = "${src}/openmcl.lisp"; }
] ++ map (f: src + ("/" + f)) [
"fad.lisp"
"path.lisp"

23
third_party/lisp/cl-json.nix vendored
View file

@ -10,19 +10,20 @@ let
rev = "6dfebb9540bfc3cc33582d0c03c9ec27cb913e79";
sha256 = "0fx3m3x3s5ji950yzpazz4s0img3l6b3d6l3jrfjv0lr702496lh";
};
in buildLisp.library {
in
buildLisp.library {
name = "cl-json";
deps = [ (buildLisp.bundled "asdf") ];
srcs = [ "${src}/cl-json.asd" ] ++
(map (f: src + ("/src/" + f)) [
"package.lisp"
"common.lisp"
"objects.lisp"
"camel-case.lisp"
"decoder.lisp"
"encoder.lisp"
"utils.lisp"
"json-rpc.lisp"
]);
(map (f: src + ("/src/" + f)) [
"package.lisp"
"common.lisp"
"objects.lisp"
"camel-case.lisp"
"decoder.lisp"
"encoder.lisp"
"utils.lisp"
"json-rpc.lisp"
]);
}

14
third_party/lisp/cl-plus-ssl.nix vendored
View file

@ -3,12 +3,14 @@
with depot.nix;
let src = pkgs.fetchgit {
url = "https://github.com/cl-plus-ssl/cl-plus-ssl.git";
rev = "29081992f6d7b4e3aa2c5eeece4cd92b745071f4";
hash = "sha256:16lyrixl98b7vy29dbbzkbq0xaz789350dajrr1gdny5i55rkjq0";
};
in buildLisp.library {
let
src = pkgs.fetchgit {
url = "https://github.com/cl-plus-ssl/cl-plus-ssl.git";
rev = "29081992f6d7b4e3aa2c5eeece4cd92b745071f4";
hash = "sha256:16lyrixl98b7vy29dbbzkbq0xaz789350dajrr1gdny5i55rkjq0";
};
in
buildLisp.library {
name = "cl-plus-ssl";
deps = with depot.third_party.lisp; [
alexandria

6
third_party/lisp/cl-unicode.nix vendored
View file

@ -40,7 +40,7 @@ let
"char-info.lisp"
"read.lisp"
]) ++ [
(runCommand "dump.lisp" {} ''
(runCommand "dump.lisp" { } ''
substitute ${src}/build/dump.lisp $out \
--replace ':defaults *this-file*' ":defaults (uiop:getcwd)"
'')
@ -55,7 +55,7 @@ let
};
generated = runCommand "cl-unicode-generated" {} ''
generated = runCommand "cl-unicode-generated" { } ''
mkdir -p $out/build
mkdir -p $out/test
cd $out/build
@ -66,7 +66,7 @@ let
in
depot.nix.buildLisp.library {
name = "cl-unicode";
deps = [cl-unicode-base];
deps = [ cl-unicode-base ];
srcs = [
"${src}/conditions.lisp"
"${generated}/lists.lisp"

6
third_party/lisp/cl-yacc.nix vendored
View file

@ -1,12 +1,14 @@
{ depot, pkgs, ... }:
let src = pkgs.fetchFromGitHub {
let
src = pkgs.fetchFromGitHub {
owner = "jech";
repo = "cl-yacc";
rev = "1334f5469251ffb3f8738a682dc8ee646cb26635";
sha256 = "16946pzf8vvadnyfayvj8rbh4zjzw90h0azz2qk1mxrvhh5wklib";
};
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "cl-yacc";
srcs = map (f: src + ("/" + f)) [

11
third_party/lisp/closure-common.nix vendored
View file

@ -3,7 +3,8 @@
let
src = with pkgs; srcOnly lispPackages.closure-common;
getSrcs = builtins.map (p: "${src}/${p}");
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "closure-common";
# closure-common.asd surpresses some warnings otherwise breaking
@ -18,12 +19,12 @@ in depot.nix.buildLisp.library {
"closure-common.asd"
"package.lisp"
"definline.lisp"
"characters.lisp" #+rune-is-character
"characters.lisp" #+rune-is-character
"syntax.lisp"
"encodings.lisp" #-x&y-streams-are-stream
"encodings.lisp" #-x&y-streams-are-stream
"encodings-data.lisp" #-x&y-streams-are-stream
"xstream.lisp" #-x&y-streams-are-stream
"ystream.lisp" #-x&y-streams-are-stream
"xstream.lisp" #-x&y-streams-are-stream
"ystream.lisp" #-x&y-streams-are-stream
"hax.lisp"
];

3
third_party/lisp/easy-routes.nix vendored
View file

@ -9,7 +9,8 @@ let
sha256 = "06lnipwc6mmg0v5gybcnr7wn5xmn5xfd1gs19vbima777245bfka";
};
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "easy-routes";
deps = with depot.third_party.lisp; [
hunchentoot

2
third_party/lisp/flexi-streams.nix vendored
View file

@ -28,6 +28,6 @@ in depot.nix.buildLisp.library {
"input.lisp"
"io.lisp"
"strings.lisp"
];
];
}

2
third_party/lisp/global-vars.nix vendored
View file

@ -3,5 +3,5 @@
let src = with pkgs; srcOnly lispPackages.global-vars;
in depot.nix.buildLisp.library {
name = "global-vars";
srcs = [ "${src}/global-vars.lisp" ] ;
srcs = [ "${src}/global-vars.lisp" ];
}

5
third_party/lisp/hunchentoot.nix vendored
View file

@ -1,5 +1,5 @@
# Hunchentoot is a web framework for Common Lisp.
{ depot, pkgs, ...}:
{ depot, pkgs, ... }:
let
src = with pkgs; srcOnly lispPackages.hunchentoot;
@ -15,7 +15,8 @@ let
"url-rewrite.lisp"
];
};
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "hunchentoot";
deps = with depot.third_party.lisp; [

5
third_party/lisp/ironclad.nix vendored
View file

@ -1,4 +1,4 @@
{ depot, pkgs, ...}:
{ depot, pkgs, ... }:
let
inherit (pkgs) runCommand;
@ -6,7 +6,8 @@ let
src = with pkgs; srcOnly lispPackages.ironclad;
getSrc = f: "${src}/src/${f}";
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "ironclad";
deps = with depot.third_party.lisp; [

3
third_party/lisp/lass.nix vendored
View file

@ -8,7 +8,8 @@ let
sha256 = "11mxzyx34ynsfsrs8pgrarqi9s442vkpmh7kdpzvarhj7i97g8yx";
};
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "lass";
deps = with depot.third_party.lisp; [

16
third_party/lisp/lisp-binary.nix vendored
View file

@ -1,13 +1,15 @@
# A library to easily read and write complex binary formats.
{ depot, pkgs, ... }:
let src = pkgs.fetchFromGitHub {
owner = "j3pic";
repo = "lisp-binary";
rev = "052df578900dea59bf951e0a6749281fa73432e4";
sha256 = "1i1s5g01aimfq6lndcl1pnw7ly5hdh0wmjp2dj9cjjwbkz9lnwcf";
};
in depot.nix.buildLisp.library {
let
src = pkgs.fetchFromGitHub {
owner = "j3pic";
repo = "lisp-binary";
rev = "052df578900dea59bf951e0a6749281fa73432e4";
sha256 = "1i1s5g01aimfq6lndcl1pnw7ly5hdh0wmjp2dj9cjjwbkz9lnwcf";
};
in
depot.nix.buildLisp.library {
name = "lisp-binary";
deps = with depot.third_party.lisp; [

3
third_party/lisp/local-time.nix vendored
View file

@ -4,7 +4,8 @@
let
inherit (depot.nix) buildLisp;
src = with pkgs; srcOnly lispPackages.local-time;
in buildLisp.library {
in
buildLisp.library {
name = "local-time";
deps = [
depot.third_party.lisp.cl-fad

3
third_party/lisp/nibbles.nix vendored
View file

@ -3,7 +3,8 @@
let
inherit (depot.nix.buildLisp) bundled;
src = with pkgs; srcOnly lispPackages.nibbles;
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "nibbles";
deps = with depot.third_party.lisp; [

3
third_party/lisp/postmodern.nix vendored
View file

@ -88,6 +88,7 @@ let
];
};
in postmodern // {
in
postmodern // {
inherit s-sql cl-postgres;
}

3
third_party/lisp/routes.nix vendored
View file

@ -20,7 +20,8 @@ let
];
};
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "routes";
deps = with depot.third_party.lisp; [

18
third_party/lisp/s-xml/default.nix vendored
View file

@ -1,15 +1,17 @@
# XML serialiser for Common Lisp.
{ depot, pkgs, ... }:
let src = pkgs.applyPatches {
name = "s-xml-source";
src = pkgs.lispPackages.s-xml.src;
let
src = pkgs.applyPatches {
name = "s-xml-source";
src = pkgs.lispPackages.s-xml.src;
patches = [
./0001-fix-definition-order-in-xml.lisp.patch
];
};
in depot.nix.buildLisp.library {
patches = [
./0001-fix-definition-order-in-xml.lisp.patch
];
};
in
depot.nix.buildLisp.library {
name = "s-xml";
srcs = map (f: src + ("/src/" + f)) [

6
third_party/lisp/trivial-ldap.nix vendored
View file

@ -1,12 +1,14 @@
{ depot, pkgs, ... }:
let src = pkgs.fetchFromGitHub {
let
src = pkgs.fetchFromGitHub {
owner = "rwiker";
repo = "trivial-ldap";
rev = "3b8f1ff85f29ea63e6ab2d0d27029d68b046faf8";
sha256 = "1zaa4wnk5y5ff211pkg6dl27j4pjwh56hq0246slxsdxv6kvp1z9";
};
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "trivial-ldap";
deps = with depot.third_party.lisp; [

5
third_party/lisp/trivial-mimes.nix vendored
View file

@ -3,7 +3,7 @@
let
src = with pkgs; srcOnly lispPackages.trivial-mimes;
mime-types = pkgs.runCommand "mime-types.lisp" {} ''
mime-types = pkgs.runCommand "mime-types.lisp" { } ''
substitute ${src}/mime-types.lisp $out \
--replace /etc/mime.types ${src}/mime.types \
--replace "(asdf:system-source-directory :trivial-mimes)" '"/bogus-dir"'
@ -11,7 +11,8 @@ let
# generally fail — we are not using ASDF after all.
'';
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "trivial-mimes";
deps = [

5
third_party/lisp/uax-15.nix vendored
View file

@ -4,7 +4,8 @@ let
inherit (pkgs) runCommand;
inherit (depot.nix.buildLisp) bundled;
src = with pkgs; srcOnly lispPackages.uax-15;
in depot.nix.buildLisp.library {
in
depot.nix.buildLisp.library {
name = "uax-15";
deps = with depot.third_party.lisp; [
@ -23,7 +24,7 @@ in depot.nix.buildLisp.library {
#
# additionally there are some wonky variable usages of variables
# that are never defined, for which we patch in defvar statements.
(runCommand "precomputed-tables.lisp" {} ''
(runCommand "precomputed-tables.lisp" { } ''
substitute ${src}/src/precomputed-tables.lisp precomputed-tables.lisp \
--replace "(asdf:system-source-directory (asdf:find-system 'uax-15 nil))" \
'"${src}/"'

2
third_party/lisp/unix-opts.nix vendored
View file

@ -1,5 +1,5 @@
# unix-opts is a portable command line argument parser
{ depot, pkgs, ...}:
{ depot, pkgs, ... }:
let src = with pkgs; srcOnly lispPackages.unix-opts;

3
third_party/lisp/usocket-server.nix vendored
View file

@ -4,7 +4,8 @@
let
inherit (depot.nix) buildLisp;
src = with pkgs; srcOnly lispPackages.usocket-server;
in buildLisp.library {
in
buildLisp.library {
name = "usocket-server";
deps = with depot.third_party.lisp; [

3
third_party/lisp/usocket.nix vendored
View file

@ -4,7 +4,8 @@
let
inherit (depot.nix) buildLisp;
src = with pkgs; srcOnly lispPackages.usocket;
in buildLisp.library {
in
buildLisp.library {
name = "usocket";
deps = with depot.third_party.lisp; [
(buildLisp.bundled "asdf")