about summary refs log tree commit diff
path: root/users/glittershark/xanthous
AgeCommit message (Collapse)AuthorFilesLines
2021-04-11 r/2479 fix(3p/haskellPackages): re-add random 1.2.0 to fix xanthoussterni1-3/+1
The random_1_2_0 attribute of haskellPackages currently holds random 1.2.0 which is what we want to have. We need to disable tests because they cause an infinite recursion as basically all testing libraries depend on random. This has the nice side effect that we no longer need import from derivation for random 1.2.0 (but owothia and xanthous still use it). Re-enable CI for xanthous. Additinonally we need to deal with the fallout of the haskellPackages overlay now also being pulled in for some machines since cl/2910 and let pandoc compile with random 1.2.0. Change-Id: I78d220e5bd35f3469d80d69e77e712a529f21d33 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2924 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi>
2021-04-10 r/2470 refactor: Move nixpkgs attribute to `third_party.nixpkgs`Vincent Ambo2-6/+8
Please read b/108 to make sense of this. This gets rid of the explicit list of exposed packages from nixpkgs, and instead makes the entire package set available at `third_party.nixpkgs`. To accommodate this, a LOT of things have to be very slightly shuffled around. Some of this was done in already submitted CLs, but this change is unfortunately still quite noisy. Pay extra attention to: * overlay-like functionality that was partially moved to actual overlays (partially as in, the minimum required to get a green build) * modified uses of the package set path, esp. in NixOS systems Special notes: * xanthous has been disabled in CI because of issues with the Haskell overlay * //third_party/nix has been disabled because of other unclear dependency issues Both of these will be tackled in a followup CL. Change-Id: I2f9c60a4d275fdb5209264be0addfd7e06c53118 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2910 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
2021-03-26 r/2333 chore(3p): use haskell-language-server from nixpkgssterni1-1/+1
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 r/2330 chore(3p): bump NixOS channels to 2021-03-25sterni1-1/+1
OpenSSL released an update which fixes two severity high security issues: * https://mta.openssl.org/pipermail/openssl-announce/2021-March/000197.html * https://mta.openssl.org/pipermail/openssl-announce/2021-March/000198.html Update to the nixpkgs (currently still master) commits updating OpenSSL. Other changes: * Use GHC 8.8.4 for haskell-language-server as GHC 8.8.3 got removed from nixpkgs last friday. Change-Id: Ic1b2f49284e78193a4330da4bb4b718a797f5ab1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2653 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: glittershark <grfn@gws.fyi>
2021-03-19 r/2289 fix(gs/xanthous): update xanthous.cabal, make CI catch such errorssterni2-7/+124
Since xanthous has a checked-in package.yaml and cabal file, the haskellPackages build infrastructure will use the package.yaml file for all builds. The resulting problem is that our CI won't actually catch build failures that would be observable with cabal or when building from the sdist. We fix that by filtering out the package.yaml file in pkg.nix additionally to the filters specified in .gitignore. For this we need gitignoreFilter from gitignore.nix which we expose as part of a functor set from third_party.gitignoreSource to maintain interface compatibility. Change-Id: I337185f484d2027341f38031dcd78898706904eb Reviewed-on: https://cl.tvl.fyi/c/depot/+/2609 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in>
2021-03-19 r/2288 chore(gs/xanthous): fix for hgeometry 0.12.0.1sterni1-1/+1
The breaking removal of triangulationEdges was not that big of a deal after all: It was just renamed to edgesAsPoints apparently, so the fix is easy enough and we can save one override. hgeometry-combinatorial's doctests seem to trigger some kind of GHC dynamic linking bug (https://github.com/noinia/hgeometry/issues/132) so we disable the tests. Change-Id: Iba2a64cade4d1a55fa4b81846e1116f282d4590a Reviewed-on: https://cl.tvl.fyi/c/depot/+/2608 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
2021-03-19 r/2286 fix(gs/xanthous): fix build failures caused by dependency updatessterni6-11/+24
The following changes in dependencies of xanthous broke the build and have been fixed in this CL. Thus we can reenable CI for xanthous. * random 1.2.0 removed the Read instance for StdGen, so we need use System.Random.Internal to un-newtype StdGen into an SMGen in the appropriate places as that type still has a Show and Read instance. Requires a new direct dependency on splitmix as well. * witherable 4.0 renamed Data.Witherable into Witherable and no longer exports Filter. * random 1.2.0 probably also broke the Function instance for GameState which contains a StdGen. I'm not exactly sure which change exactly triggered this, but the fix is easy enough: We implement a Function instance for SMGen using functionShow allowing us to write a Function instance for StdGen using functionMap. I've put these instances into Xanthous.Orphans. * hgeometry 0.12.0.0 removes the triangulationEdges function (which is also not mentioned in the changelog, so I'm not sure if there's a replacement yet). Fix by pinning to 0.11.0.0 for now. * hedgehog-classes: relax bounds on semirings Change-Id: I3617d8916d753b386c9fa80062be6bcbdfee0131 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2607 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
2020-08-28 r/1728 revert(glittershark): "Temporarily skip grfn's subtree"Griffin Smith1-2/+5
This reverts commit 475d41f698415919093ca98f676ffcda218093ac. I'd like my derivations back, please. Changes necessary to get this working: - Don't depend on `nixpkgs` being in the NIX_PATH for my website - it's not necessary anyway since emacs 27 is mainline now - .skip-subtrees on things that shouldn't be evaluated anyway - Get rid of system/pkgs, and move the one thing in there that *wasn't* already in third_party (alsi) to third_party - Drop notifymuch for now - it's not working, and I'll probably get it landed in nixpkgs before I manage to get it working - Add __readTree = true to my systems so they get built. - explicitly disable ci for xanthous, which is failing to build and had been omitted previously Change-Id: I20f5e81d6eb7ffe040091a08d75d0cb15304f707 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1864 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
2020-08-06 r/1604 chore(3p): Bump nixpkgs channelsVincent Ambo1-7/+0
Bumps both nixos-unstable and nixos-20.03 to today's versions, as per status.nixos.org Contains minor fixes to things that broke because of the update: * tazjin/frog: hardware.u2f is a deprecated setting * glittershark/system: modSha256 in Go modules is now vendorSha256 * glittershark/owothia: removed version constraint on relude Change-Id: Ib3e9612b1b06ed547b90e4f8b0ffe5ed7fe0a5c4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1642 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
2020-07-04 r/1208 feat(xan): Install hlint in shellGriffin Smith1-0/+1
Change-Id: I93035bc05ff7f47515efe18703f296129ed9e7f8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/911 Reviewed-by: glittershark <grfn@gws.fyi> Tested-by: BuildkiteCI
2020-07-04 r/1207 refactor(xan): Switch to V2 over tuples most placesGriffin Smith12-143/+172
These are generally rather nicer to work due to some typeclass instances, and integrate better with other ecosystems for things like linear algebra etc. Change-Id: I546c8da7b17234648f3d612b28741c1fded25447 Reviewed-on: https://cl.tvl.fyi/c/depot/+/910 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
2020-07-03 r/1204 feat(xan): Use haskell-language-serverGriffin Smith5-26/+13
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 r/1198 fix(xan): Don't allow looking at invisible thingsGriffin Smith4-22/+27
Extract the conditional we're using to decide whether or not to render a given entity at a position, and use that when getting the list of entities to describe as a result of the "Look" command. Change-Id: I1ec86211c2fcbd984dd52338fb5631667c22c723 Reviewed-on: https://cl.tvl.fyi/c/depot/+/903 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: BuildkiteCI Tested-by: BuildkiteCI
2020-07-03 r/1189 refactor(xan): Simplify build infrastructureGriffin Smith5-71/+42
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-07-03 r/1188 fix(xan): Remove unused importsGriffin Smith4-12/+2
GHC 8.8 is better at detecting unused imports, it seems - all of these are new warnings that fail under -Werror Change-Id: I1357094d715483612deb0db4a75b3e4f8f27d2e3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/889 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: BuildkiteCI Tested-by: BuildkiteCI
2020-07-03 r/1187 fix(xan): fix compat with new base+ghcGriffin Smith6-4/+6
A couple of changes necessary to get things working with both ghc 8.8.3 and the new base: - Explicitly import fail from Control.Monad.Fail in the prelude, since it's there instead of the base prelude now - GHC no longer allows type family equality constraints in quantified constraints - which is a bummer - but is avoidable in the one case where it was happening - Explicitly import a constructor from Data.List.NonEmpty Change-Id: Ia06fc724ddc2d6a3f9024c047ed55eea40bcf408 Reviewed-on: https://cl.tvl.fyi/c/depot/+/744 Tested-by: BuildkiteCI Reviewed-by: BuildkiteCI Reviewed-by: Profpatsch <mail@profpatsch.de>
2020-07-03 r/1186 fix(xanthous): re-add comonad-extras depGriffin Smith1-0/+1
Change-Id: Ie148acf179e3aae304410a588c87ee83e04aafa7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/741 Reviewed-by: BuildkiteCI Reviewed-by: Kane York <rikingcoding@gmail.com> Tested-by: BuildkiteCI
2020-07-03 r/1184 chore(xan): Gitignore data directoryGriffin Smith1-0/+1
I'm using this dir to store save files that are particularly interesting, eg bug reproductions etc. Change-Id: Id6a805d85b3ea2e1171ea3af96303f05c2468070 Reviewed-on: https://cl.tvl.fyi/c/depot/+/893 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-29 r/1124 feat(3p/haskellPackages): port in patches from xanthousGriffin Smith4-67/+13
Add a few relatively uncontroversial patches to fix some broken packages that I had developed for xanthous to the top-level third_party tree, so they can be reused by other people in the monorepo Change-Id: I68740477bda278c5dcc123080029ee4bd2cae37a Reviewed-on: https://cl.tvl.fyi/c/depot/+/740 Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: tazjin <mail@tazj.in>
2020-06-29 r/1121 fix(xan): Disable comonad-extrasGriffin Smith1-1/+0
Turns out we don't actually need this, and the patch for it doesn't cleanly apply anymore Change-Id: Ifc95496211c7c1c779fd2544f4ff5a51aa3857ab Reviewed-on: https://cl.tvl.fyi/c/depot/+/736 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-29 r/1118 fix(xan): Build without nixpkgs in NIX_PATHGriffin Smith3-12/+8
CI doesn't have a nixpkgs channel (obvs), and we want to be able to build from the depot tree, so reorder some stuff so we never depend on nixpkgs Change-Id: I99b513a3d7bcd64b6d167335856651e0ca66e33b Reviewed-on: https://cl.tvl.fyi/c/depot/+/734
2020-06-29 r/1116 feat(xan): Any user input cancels autocommandsGriffin Smith1-0/+1
This is quite straightforward - any time the user presses a key that resolves to a command, cancel any active autocommands. Change-Id: Ibb48b0281b0dc6536d75c8957f8c8e5533ff6630 Reviewed-on: https://cl.tvl.fyi/c/depot/+/731 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-29 r/1115 chore(xan): explicit export list, remove unused pragmaGriffin Smith1-4/+2
Change-Id: I7089850f23b2b9612b6585a2760536fd1178cbc6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/730 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-28 r/1112 feat(xan): Add a benchmark suiteGriffin Smith6-1/+103
Change-Id: Id31960e7bc2243dfa53dc5e45b09d8253bdef852 Reviewed-on: https://cl.tvl.fyi/c/depot/+/727 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-28 r/1111 feat(xan): Generate random villagesGriffin Smith12-20/+300
This algorithm is a little rough around the edges right now, but generally the idea is we find a relatively closed-off region of the map, and place rooms randomly on it, expanding them until they run into each other, then we put doors in the walls of the rooms and a single door opening into the region. Later on, we'll generate friendly (or unfriendly!) NPCs to put in those rooms. Change-Id: Ic989b9905f55ad92a01fdf6db11aa57afb4ce383 Reviewed-on: https://cl.tvl.fyi/c/depot/+/726 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-28 r/1110 feat(xan): Use Witherable in the preludeGriffin Smith7-6/+30
Install the witherable library, expose it in the prelude, and update all call sites that are broken by that change. This is a really nice library, and basically the ideal abstraction layer for what it does. Change-Id: I640e099318c1ecce0ad483bc336c379698bdab88 Reviewed-on: https://cl.tvl.fyi/c/depot/+/725 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-28 r/1109 feat(xan): Add a Marker entity typeGriffin Smith2-0/+45
It's useful, when developing new level gen techniques, to be able to specially mark certain areas of the map during devlopment. This adds a Marker entity type, which renders as a red X on the map and provides a programmable description when examined. In the future it'll probably be nice to toggle markers on/off just like we do with revealAll, but for now it'll be fine to just remove the code to render them like we do with debug traces. Change-Id: Ief5d090809a0a4cbcc28f90e4902a5e38d42eeb5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/724 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-22 r/1059 fix(xanthous): Make floodFill fasterGriffin Smith1-1/+4
Speed up the floodFill algorithm by sprinkling in some strictness and specializing it to the only type it's currently called at anyway. Change-Id: I4557fc51b1c1036c127bfd5bee50748d8692ae74 Reviewed-on: https://cl.tvl.fyi/c/depot/+/555 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-22 r/1058 feat(xanthous): install hp2prettyGriffin Smith1-0/+1
heap profiling woo Change-Id: Ie14bc81e9278e3c0d65bd22efc24cfaae43369ca Reviewed-on: https://cl.tvl.fyi/c/depot/+/554 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-22 r/1057 chore(xan): Install ghc-prof-flamegraphGriffin Smith2-3/+21
Some things are slow, and it's time to profile them Change-Id: I6a915db8bcc85adc7c3902a407cebb5a6f52d514 Reviewed-on: https://cl.tvl.fyi/c/depot/+/553 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-16 r/980 fix(g/xanthous): Make xanthous readTree-compatibleGriffin Smith1-0/+2
readTree passes in some extra args that we can generally just ignore Change-Id: I2607421da086cfef0502695bcf5658f6d4dbb44d Reviewed-on: https://cl.tvl.fyi/c/depot/+/394 Reviewed-by: glittershark <grfn@gws.fyi>
2020-06-16 r/978 Add 'users/glittershark/xanthous/' from commit ↵Vincent Ambo96-0/+10030
'53b56744f4335c038724a1bcffc27a7eb8cf6a6d' git-subtree-dir: users/glittershark/xanthous git-subtree-mainline: 91f53f02d8479303910abfd3f3690d3ef27e6c4b git-subtree-split: 53b56744f4335c038724a1bcffc27a7eb8cf6a6d
generated by cgit-pink 1.4.1 (git 2.44.2) at 2024-11-28T11·19+0000