mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tvl-depot/users/aspen/xanthous/shell.nix

24 lines
521 B
Nix
Raw Permalink Normal View History

fix(grfn/xanthous): Update shell for new depot structure Since 473604f5675c455a65b91e287b125a9e042ae39f (CL/2910), depot hasn't been directly exposing `pkgs` as an attribute, instead exposing it via third_party.nixpkgs - the xanthous shell.nix isn't checked in CI, so it was missed as part of that refactor - this updates it to be in line with that Change-Id: I12b081c16d53c6798f51ec6660ffa6d345870580 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3176 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
2021-06-05 03:05:01 +02:00
let
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>
2022-01-30 17:06:58 +01:00
depot = import ../../../. { };
fix(grfn/xanthous): Update shell for new depot structure Since 473604f5675c455a65b91e287b125a9e042ae39f (CL/2910), depot hasn't been directly exposing `pkgs` as an attribute, instead exposing it via third_party.nixpkgs - the xanthous shell.nix isn't checked in CI, so it was missed as part of that refactor - this updates it to be in line with that Change-Id: I12b081c16d53c6798f51ec6660ffa6d345870580 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3176 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
2021-06-05 03:05:01 +02:00
inherit (depot) third_party;
pkgs = third_party.nixpkgs;
in
An @-sign in a box, in haskell Initial commit of a Haskell version of Xanthous, written using Brick and built with Nix. This is so much nicer and so much easier
2019-08-25 19:28:10 +02:00
chore(3p/sources): Bump channels & overlays Use nixos-unstable-small which fixes CVE-2018-25032 (out of bounds write while compressing). * //users/grfn/xanthous: - Supporting random-fu 0.3 requires considerable changes and patching random-extras (https://github.com/aristidb/random-extras/pull/5). For now we downgrade random-fu and its dependency rvar to 0.2.*, forcing us to build xanthous with GHC 8.10.7, due to random-fu 0.2.* not supporting that version. Nix expressions for the downgraded packages are checked in to avoid the potential need to compile Haskell at pipeline eval time. - generic-arbitrary exposes a GenericArbitrary newtype now. This means we no longer have to implement it in xanthous downstream and patch generic-arbitrary to expose the GArbitrary type class. - Minor adjustments for lens 5.0: Xanthous.Game.Memo: clear needs to use ASetter' instead of Lens' Xanthous.Data.EntityMap: TraversableWithIndex no longer has an itraversed function. - Xanthous.Orphans: adjust for aeson's KeyMap, use KM.size explicitly instead of relying on MonoTraversable's length * //nix/buildLisp: the CCL issue has resurfaced, disabling the implementation once again. * //3p/arion: remove, as depot uses the nixpkgs package of it anyways. * //users/wpcarro: accomodate GHC 9.0.1's stricter parsing of operators. * //users/tazjin: disable rustfmt as it stopped respecting settings * //3p/overlays: upgrade home-manager until fix for serivce generation has landed upstream * //users/grfn/system: remove rr override, as the pinned commit is part of the 5.5.0 release shipped by nixpkgs. Change-Id: If229e7317ba48498f85170b57ee9053f6997ff8a Reviewed-on: https://cl.tvl.fyi/c/depot/+/5428 Tested-by: BuildkiteCI Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: wpcarro <wpcarro@gmail.com>
2022-03-31 18:40:08 +02:00
(pkgs.haskell.packages.ghc8107.extend (pkgs.haskell.lib.packageSourceOverrides {
fix(grfn/xanthous): Update shell for new depot structure Since 473604f5675c455a65b91e287b125a9e042ae39f (CL/2910), depot hasn't been directly exposing `pkgs` as an attribute, instead exposing it via third_party.nixpkgs - the xanthous shell.nix isn't checked in CI, so it was missed as part of that refactor - this updates it to be in line with that Change-Id: I12b081c16d53c6798f51ec6660ffa6d345870580 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3176 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
2021-06-05 03:05:01 +02:00
xanthous = third_party.gitignoreSource ./.;
refactor(xan): Simplify build infrastructure Simplify the build infrastructure for creating shells etc. for xanthous, including relying more heavily on stuff exposed in Depot anyway, using shellFor in the shell.nix, and using the haskell.nix branch of all-hies for a significantly simpler build. At some point the all-hies stuff will likely want to be promoted up to //third_party, but for now it's experimental enough that I don't want to bother other people with it. Change-Id: I43830de73830fdc07d48af9b87d7930f59599532 Reviewed-on: https://cl.tvl.fyi/c/depot/+/890 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: BuildkiteCI
2020-06-29 15:38:17 +02:00
})).shellFor {
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>
2022-01-30 17:06:58 +01:00
packages = p: [ p.xanthous ];
refactor(xan): Simplify build infrastructure Simplify the build infrastructure for creating shells etc. for xanthous, including relying more heavily on stuff exposed in Depot anyway, using shellFor in the shell.nix, and using the haskell.nix branch of all-hies for a significantly simpler build. At some point the all-hies stuff will likely want to be promoted up to //third_party, but for now it's experimental enough that I don't want to bother other people with it. Change-Id: I43830de73830fdc07d48af9b87d7930f59599532 Reviewed-on: https://cl.tvl.fyi/c/depot/+/890 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: BuildkiteCI
2020-06-29 15:38:17 +02:00
withHoogle = true;
feat(xan): Use haskell-language-server Use haskell-language-server instead of haskell-ide-engine for Xanthous. Change-Id: I7ef1433d5cd561e659fc06b3f373a6f29dfa5690 Reviewed-on: https://cl.tvl.fyi/c/depot/+/904 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: BuildkiteCI
2020-07-03 19:46:29 +02:00
doBenchmark = true;
fix(grfn/xanthous): Use correct ghc version for shell pkgs Not having this causes haskell-language-server to complain about a mismatch between its and the project's GHC versions. Change-Id: Ie7584ad96532ca34a85430aa1a2211c2b91db872 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5465 Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Autosubmit: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI
2022-04-16 19:02:50 +02:00
buildInputs = (with pkgs.haskell.packages.ghc8107; [
refactor(xan): Simplify build infrastructure Simplify the build infrastructure for creating shells etc. for xanthous, including relying more heavily on stuff exposed in Depot anyway, using shellFor in the shell.nix, and using the haskell.nix branch of all-hies for a significantly simpler build. At some point the all-hies stuff will likely want to be promoted up to //third_party, but for now it's experimental enough that I don't want to bother other people with it. Change-Id: I43830de73830fdc07d48af9b87d7930f59599532 Reviewed-on: https://cl.tvl.fyi/c/depot/+/890 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: BuildkiteCI
2020-06-29 15:38:17 +02:00
cabal-install
ghc-prof-flamegraph
hp2pretty
feat(xan): Install hlint in shell Change-Id: I93035bc05ff7f47515efe18703f296129ed9e7f8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/911 Reviewed-by: glittershark <grfn@gws.fyi> Tested-by: BuildkiteCI
2020-07-04 02:35:02 +02:00
hlint
chore(3p): use haskell-language-server from nixpkgs Upstream haskellPackages has a newer haskell-language-server than we had and it is always in sync with the default GHC version of that package set which we incidentally use to build all haskell derivations in depot. I hope this will not cause us more trouble in the future, but I've gotten the impression that maralorn makes an effort to prevent haskell-language-server from being broken in haskellPackages, so ideally we'll never have to worry about hls again. If we do have to, we may need to switch to easy-hls-nix. Note that I haven't had the time yet to verify that the shells actually work since it's kinda late now and the rebuilds are many. Change-Id: I74c192d57355904cfa45bb76d70346792ba05af5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2662 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
2021-03-26 02:49:23 +01:00
haskell-language-server
feat(xanthous): Memoize characterVisiblePositions Memoize the return value of characterVisiblePositions to a new, semi-abstracted "memo" field on the GameState, recalcuclated if the character position ever changes. I'm 90% sure that the perf issues we were encountering were actually caused by characterVisiblePositions getting called once for *every tile* on draw, but this slightly larger change also makes the game perform relatively-usably again. Since this is only recalculated if the character position changes, if we ever get non-transparent entities moving around without the characters influence (maybe something building or knocking down walls?) we'll have an issue there where the vision won't be updated as a result of those changes if they happen while the character is taking a non-moving action - but we can cross that bridge when we come to it. Change-Id: I3fc745ddf0014d6f164f735ad7e5080da779b92a Reviewed-on: https://cl.tvl.fyi/c/depot/+/3185 Reviewed-by: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI
2021-06-12 20:41:24 +02:00
cabal2nix
feat(xanthous): Install qpdf in the shell This gets us the zlib-flate command line utility, which is useful for decompressing our zlib-compressed save files and poking around in the JSON Change-Id: Ia0d8259d261c4313322d68cc8409ba13f9fb570c Reviewed-on: https://cl.tvl.fyi/c/depot/+/3217 Reviewed-by: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI
2021-06-18 17:52:48 +02:00
]) ++ (with pkgs; [
qpdf
]);
refactor(xan): Simplify build infrastructure Simplify the build infrastructure for creating shells etc. for xanthous, including relying more heavily on stuff exposed in Depot anyway, using shellFor in the shell.nix, and using the haskell.nix branch of all-hies for a significantly simpler build. At some point the all-hies stuff will likely want to be promoted up to //third_party, but for now it's experimental enough that I don't want to bother other people with it. Change-Id: I43830de73830fdc07d48af9b87d7930f59599532 Reviewed-on: https://cl.tvl.fyi/c/depot/+/890 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: BuildkiteCI
2020-06-29 15:38:17 +02:00
}
Reference in a new issue Copy permalink