style: format entire depot with nixpkgs-fmt
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
tazjin
parent
2d10d60fac
commit
aa122cbae7
310 changed files with 7278 additions and 5490 deletions
|
|
@ -1,6 +1,7 @@
|
|||
{ depot ? (import ../../../. {})
|
||||
{ depot ? (import ../../../. { })
|
||||
, pkgs ? depot.third_party.nixpkgs
|
||||
, ... }:
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
ignore = depot.third_party.gitignoreSource.gitignoreFilter ./.;
|
||||
|
|
@ -11,7 +12,7 @@ let
|
|||
!(type == "directory" && builtins.baseNameOf path == "server")
|
||||
&& !(type == "directory" && builtins.baseNameOf path == "docs")
|
||||
&& (ignore path type
|
||||
|| builtins.baseNameOf path == "package.yaml");
|
||||
|| builtins.baseNameOf path == "package.yaml");
|
||||
};
|
||||
# generated by cabal2nix
|
||||
basePkg = pkgs.haskellPackages.callPackage ./pkg.nix { };
|
||||
|
|
@ -22,5 +23,5 @@ pkgs.haskell.lib.overrideCabal basePkg (default: {
|
|||
version = "canon";
|
||||
configureFlags = [
|
||||
"--ghc-option=-Wall --ghc-option=-Werror"
|
||||
] ++ (default.configureFlags or []);
|
||||
] ++ (default.configureFlags or [ ]);
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,17 +1,74 @@
|
|||
{ mkDerivation, aeson, array, async, base, bifunctors, brick
|
||||
, checkers, classy-prelude, comonad, comonad-extras, constraints
|
||||
, containers, criterion, data-default, data-interval, deepseq
|
||||
, directory, fgl, fgl-arbitrary, file-embed, filepath
|
||||
, generic-arbitrary, generic-lens, groups, hgeometry
|
||||
, hgeometry-combinatorial, hpack, JuicyPixels, lens
|
||||
, lens-properties, lib, lifted-async, linear, megaparsec, mmorph
|
||||
, monad-control, MonadRandom, mtl, optparse-applicative, parallel
|
||||
, parser-combinators, pointed, QuickCheck, quickcheck-instances
|
||||
, quickcheck-text, random, random-extras, random-fu, random-source
|
||||
, Rasterific, raw-strings-qq, reflection, semigroupoids, semigroups
|
||||
, splitmix, stache, streams, tasty, tasty-hunit, tasty-quickcheck
|
||||
, tasty-rerun, text, text-zipper, tomland, transformers, vector
|
||||
, vty, witherable, yaml, zlib
|
||||
{ mkDerivation
|
||||
, aeson
|
||||
, array
|
||||
, async
|
||||
, base
|
||||
, bifunctors
|
||||
, brick
|
||||
, checkers
|
||||
, classy-prelude
|
||||
, comonad
|
||||
, comonad-extras
|
||||
, constraints
|
||||
, containers
|
||||
, criterion
|
||||
, data-default
|
||||
, data-interval
|
||||
, deepseq
|
||||
, directory
|
||||
, fgl
|
||||
, fgl-arbitrary
|
||||
, file-embed
|
||||
, filepath
|
||||
, generic-arbitrary
|
||||
, generic-lens
|
||||
, groups
|
||||
, hgeometry
|
||||
, hgeometry-combinatorial
|
||||
, hpack
|
||||
, JuicyPixels
|
||||
, lens
|
||||
, lens-properties
|
||||
, lib
|
||||
, lifted-async
|
||||
, linear
|
||||
, megaparsec
|
||||
, mmorph
|
||||
, monad-control
|
||||
, MonadRandom
|
||||
, mtl
|
||||
, optparse-applicative
|
||||
, parallel
|
||||
, parser-combinators
|
||||
, pointed
|
||||
, QuickCheck
|
||||
, quickcheck-instances
|
||||
, quickcheck-text
|
||||
, random
|
||||
, random-extras
|
||||
, random-fu
|
||||
, random-source
|
||||
, Rasterific
|
||||
, raw-strings-qq
|
||||
, reflection
|
||||
, semigroupoids
|
||||
, semigroups
|
||||
, splitmix
|
||||
, stache
|
||||
, streams
|
||||
, tasty
|
||||
, tasty-hunit
|
||||
, tasty-quickcheck
|
||||
, tasty-rerun
|
||||
, text
|
||||
, text-zipper
|
||||
, tomland
|
||||
, transformers
|
||||
, vector
|
||||
, vty
|
||||
, witherable
|
||||
, yaml
|
||||
, zlib
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "xanthous";
|
||||
|
|
@ -20,58 +77,270 @@ mkDerivation {
|
|||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson array async base bifunctors brick checkers classy-prelude
|
||||
comonad comonad-extras constraints containers criterion
|
||||
data-default data-interval deepseq directory fgl fgl-arbitrary
|
||||
file-embed filepath generic-arbitrary generic-lens groups hgeometry
|
||||
hgeometry-combinatorial JuicyPixels lens lifted-async linear
|
||||
megaparsec mmorph monad-control MonadRandom mtl
|
||||
optparse-applicative parallel parser-combinators pointed QuickCheck
|
||||
quickcheck-instances quickcheck-text random random-extras random-fu
|
||||
random-source Rasterific raw-strings-qq reflection semigroupoids
|
||||
semigroups splitmix stache streams text text-zipper tomland
|
||||
transformers vector vty witherable yaml zlib
|
||||
aeson
|
||||
array
|
||||
async
|
||||
base
|
||||
bifunctors
|
||||
brick
|
||||
checkers
|
||||
classy-prelude
|
||||
comonad
|
||||
comonad-extras
|
||||
constraints
|
||||
containers
|
||||
criterion
|
||||
data-default
|
||||
data-interval
|
||||
deepseq
|
||||
directory
|
||||
fgl
|
||||
fgl-arbitrary
|
||||
file-embed
|
||||
filepath
|
||||
generic-arbitrary
|
||||
generic-lens
|
||||
groups
|
||||
hgeometry
|
||||
hgeometry-combinatorial
|
||||
JuicyPixels
|
||||
lens
|
||||
lifted-async
|
||||
linear
|
||||
megaparsec
|
||||
mmorph
|
||||
monad-control
|
||||
MonadRandom
|
||||
mtl
|
||||
optparse-applicative
|
||||
parallel
|
||||
parser-combinators
|
||||
pointed
|
||||
QuickCheck
|
||||
quickcheck-instances
|
||||
quickcheck-text
|
||||
random
|
||||
random-extras
|
||||
random-fu
|
||||
random-source
|
||||
Rasterific
|
||||
raw-strings-qq
|
||||
reflection
|
||||
semigroupoids
|
||||
semigroups
|
||||
splitmix
|
||||
stache
|
||||
streams
|
||||
text
|
||||
text-zipper
|
||||
tomland
|
||||
transformers
|
||||
vector
|
||||
vty
|
||||
witherable
|
||||
yaml
|
||||
zlib
|
||||
];
|
||||
libraryToolDepends = [ hpack ];
|
||||
executableHaskellDepends = [
|
||||
aeson array async base bifunctors brick checkers classy-prelude
|
||||
comonad comonad-extras constraints containers criterion
|
||||
data-default data-interval deepseq directory fgl fgl-arbitrary
|
||||
file-embed filepath generic-arbitrary generic-lens groups hgeometry
|
||||
hgeometry-combinatorial JuicyPixels lens lifted-async linear
|
||||
megaparsec mmorph monad-control MonadRandom mtl
|
||||
optparse-applicative parallel parser-combinators pointed QuickCheck
|
||||
quickcheck-instances quickcheck-text random random-extras random-fu
|
||||
random-source Rasterific raw-strings-qq reflection semigroupoids
|
||||
semigroups splitmix stache streams text text-zipper tomland
|
||||
transformers vector vty witherable yaml zlib
|
||||
aeson
|
||||
array
|
||||
async
|
||||
base
|
||||
bifunctors
|
||||
brick
|
||||
checkers
|
||||
classy-prelude
|
||||
comonad
|
||||
comonad-extras
|
||||
constraints
|
||||
containers
|
||||
criterion
|
||||
data-default
|
||||
data-interval
|
||||
deepseq
|
||||
directory
|
||||
fgl
|
||||
fgl-arbitrary
|
||||
file-embed
|
||||
filepath
|
||||
generic-arbitrary
|
||||
generic-lens
|
||||
groups
|
||||
hgeometry
|
||||
hgeometry-combinatorial
|
||||
JuicyPixels
|
||||
lens
|
||||
lifted-async
|
||||
linear
|
||||
megaparsec
|
||||
mmorph
|
||||
monad-control
|
||||
MonadRandom
|
||||
mtl
|
||||
optparse-applicative
|
||||
parallel
|
||||
parser-combinators
|
||||
pointed
|
||||
QuickCheck
|
||||
quickcheck-instances
|
||||
quickcheck-text
|
||||
random
|
||||
random-extras
|
||||
random-fu
|
||||
random-source
|
||||
Rasterific
|
||||
raw-strings-qq
|
||||
reflection
|
||||
semigroupoids
|
||||
semigroups
|
||||
splitmix
|
||||
stache
|
||||
streams
|
||||
text
|
||||
text-zipper
|
||||
tomland
|
||||
transformers
|
||||
vector
|
||||
vty
|
||||
witherable
|
||||
yaml
|
||||
zlib
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson array async base bifunctors brick checkers classy-prelude
|
||||
comonad comonad-extras constraints containers criterion
|
||||
data-default data-interval deepseq directory fgl fgl-arbitrary
|
||||
file-embed filepath generic-arbitrary generic-lens groups hgeometry
|
||||
hgeometry-combinatorial JuicyPixels lens lens-properties
|
||||
lifted-async linear megaparsec mmorph monad-control MonadRandom mtl
|
||||
optparse-applicative parallel parser-combinators pointed QuickCheck
|
||||
quickcheck-instances quickcheck-text random random-extras random-fu
|
||||
random-source Rasterific raw-strings-qq reflection semigroupoids
|
||||
semigroups splitmix stache streams tasty tasty-hunit
|
||||
tasty-quickcheck tasty-rerun text text-zipper tomland transformers
|
||||
vector vty witherable yaml zlib
|
||||
aeson
|
||||
array
|
||||
async
|
||||
base
|
||||
bifunctors
|
||||
brick
|
||||
checkers
|
||||
classy-prelude
|
||||
comonad
|
||||
comonad-extras
|
||||
constraints
|
||||
containers
|
||||
criterion
|
||||
data-default
|
||||
data-interval
|
||||
deepseq
|
||||
directory
|
||||
fgl
|
||||
fgl-arbitrary
|
||||
file-embed
|
||||
filepath
|
||||
generic-arbitrary
|
||||
generic-lens
|
||||
groups
|
||||
hgeometry
|
||||
hgeometry-combinatorial
|
||||
JuicyPixels
|
||||
lens
|
||||
lens-properties
|
||||
lifted-async
|
||||
linear
|
||||
megaparsec
|
||||
mmorph
|
||||
monad-control
|
||||
MonadRandom
|
||||
mtl
|
||||
optparse-applicative
|
||||
parallel
|
||||
parser-combinators
|
||||
pointed
|
||||
QuickCheck
|
||||
quickcheck-instances
|
||||
quickcheck-text
|
||||
random
|
||||
random-extras
|
||||
random-fu
|
||||
random-source
|
||||
Rasterific
|
||||
raw-strings-qq
|
||||
reflection
|
||||
semigroupoids
|
||||
semigroups
|
||||
splitmix
|
||||
stache
|
||||
streams
|
||||
tasty
|
||||
tasty-hunit
|
||||
tasty-quickcheck
|
||||
tasty-rerun
|
||||
text
|
||||
text-zipper
|
||||
tomland
|
||||
transformers
|
||||
vector
|
||||
vty
|
||||
witherable
|
||||
yaml
|
||||
zlib
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
aeson array async base bifunctors brick checkers classy-prelude
|
||||
comonad comonad-extras constraints containers criterion
|
||||
data-default data-interval deepseq directory fgl fgl-arbitrary
|
||||
file-embed filepath generic-arbitrary generic-lens groups hgeometry
|
||||
hgeometry-combinatorial JuicyPixels lens lifted-async linear
|
||||
megaparsec mmorph monad-control MonadRandom mtl
|
||||
optparse-applicative parallel parser-combinators pointed QuickCheck
|
||||
quickcheck-instances quickcheck-text random random-extras random-fu
|
||||
random-source Rasterific raw-strings-qq reflection semigroupoids
|
||||
semigroups splitmix stache streams text text-zipper tomland
|
||||
transformers vector vty witherable yaml zlib
|
||||
aeson
|
||||
array
|
||||
async
|
||||
base
|
||||
bifunctors
|
||||
brick
|
||||
checkers
|
||||
classy-prelude
|
||||
comonad
|
||||
comonad-extras
|
||||
constraints
|
||||
containers
|
||||
criterion
|
||||
data-default
|
||||
data-interval
|
||||
deepseq
|
||||
directory
|
||||
fgl
|
||||
fgl-arbitrary
|
||||
file-embed
|
||||
filepath
|
||||
generic-arbitrary
|
||||
generic-lens
|
||||
groups
|
||||
hgeometry
|
||||
hgeometry-combinatorial
|
||||
JuicyPixels
|
||||
lens
|
||||
lifted-async
|
||||
linear
|
||||
megaparsec
|
||||
mmorph
|
||||
monad-control
|
||||
MonadRandom
|
||||
mtl
|
||||
optparse-applicative
|
||||
parallel
|
||||
parser-combinators
|
||||
pointed
|
||||
QuickCheck
|
||||
quickcheck-instances
|
||||
quickcheck-text
|
||||
random
|
||||
random-extras
|
||||
random-fu
|
||||
random-source
|
||||
Rasterific
|
||||
raw-strings-qq
|
||||
reflection
|
||||
semigroupoids
|
||||
semigroups
|
||||
splitmix
|
||||
stache
|
||||
streams
|
||||
text
|
||||
text-zipper
|
||||
tomland
|
||||
transformers
|
||||
vector
|
||||
vty
|
||||
witherable
|
||||
yaml
|
||||
zlib
|
||||
];
|
||||
prePatch = "hpack";
|
||||
homepage = "https://github.com/glittershark/xanthous#readme";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
args@{
|
||||
depot ? import ../../../.. {}
|
||||
args@{ depot ? import ../../../.. { }
|
||||
, pkgs ? depot.third_party.nixpkgs
|
||||
, ...
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ depot ? import ../../../.. {}
|
||||
{ depot ? import ../../../.. { }
|
||||
, pkgs ? depot.third_party.nixpkgs
|
||||
, ...
|
||||
}:
|
||||
|
|
@ -6,14 +6,16 @@
|
|||
let
|
||||
inherit (depot.users.grfn) xanthous;
|
||||
xanthous-server = xanthous.server;
|
||||
in pkgs.dockerTools.buildLayeredImage {
|
||||
in
|
||||
pkgs.dockerTools.buildLayeredImage {
|
||||
name = "xanthous-server";
|
||||
tag = "latest";
|
||||
contents = [ xanthous xanthous-server ];
|
||||
config = {
|
||||
Cmd = [
|
||||
"${xanthous-server}/bin/xanthous-server"
|
||||
"--xanthous-binary-path" "${xanthous}/bin/xanthous"
|
||||
"--xanthous-binary-path"
|
||||
"${xanthous}/bin/xanthous"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
let
|
||||
cfg = config.services.xanthous-server;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options = with lib; {
|
||||
services.xanthous-server = {
|
||||
enable = mkEnableOption "xanthous server";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
depot = import ../../../.. {};
|
||||
depot = import ../../../.. { };
|
||||
pkgs = depot.third_party.nixpkgs;
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
depot = import ../../../. {};
|
||||
depot = import ../../../. { };
|
||||
inherit (depot) third_party;
|
||||
pkgs = third_party.nixpkgs;
|
||||
in
|
||||
|
|
@ -7,7 +7,7 @@ in
|
|||
(pkgs.haskellPackages.extend (pkgs.haskell.lib.packageSourceOverrides {
|
||||
xanthous = third_party.gitignoreSource ./.;
|
||||
})).shellFor {
|
||||
packages = p: [p.xanthous];
|
||||
packages = p: [ p.xanthous ];
|
||||
withHoogle = true;
|
||||
doBenchmark = true;
|
||||
buildInputs = (with pkgs.haskellPackages; [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue