mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tvl-depot/third_party/haskell_overlay/default.nix

109 lines
3.3 KiB
Nix
Raw Normal View History

fix(xan): Build without nixpkgs in NIX_PATH 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 02:33:25 +02:00
{ pkgs ? import ./nixpkgs.nix {} }:
feat(3p/haskellPackages): port in patches from xanthous 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 03:27:02 +02:00
fix(xan): Build without nixpkgs in NIX_PATH 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 02:33:25 +02:00
self: super: with pkgs.haskell.lib; rec {
chore(3p): Bump nixpkgs channels 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-08-04 19:43:41 +02:00
aeson = doJailbreak super.aeson;
attoparsec = doJailbreak super.attoparsec;
cassava = doJailbreak super.cassava;
fgl = overrideSrc (doJailbreak super.fgl) rec {
src = pkgs.fetchzip {
url = "mirror://hackage/fgl-${version}/fgl-${version}.tar.gz";
sha256 = "0spyd56b2rmwp8n6h167rfjwy8lpcvar1p2rqhw9q580h2l9v61l";
};
version = "5.7.0.3";
};
fgl-arbitrary = overrideSrc super.fgl-arbitrary rec {
src = pkgs.fetchzip {
url = "mirror://hackage/fgl-arbitrary-${version}/fgl-arbitrary-${version}.tar.gz";
sha256 = "0bacdv51am13x5k64xvmxcs5gkdkh0gpmnh05wgd2vqg1n8r7fwb";
};
version = "0.2.0.6";
};
Add dungeon level generation Add a dungeon level generator, which: 1. generates an infinite sequence of rectangular rooms within the dimensions of the level 2. removes any duplicates from that sequence 3. Generates a graph from the delaunay triangulation of the centerpoints of those rooms 4. Generates the minimum-spanning-tree of that delaunay triangulation, with weights given by line length in points 5. Adds back a subset (default 10-15%) of edges from the delaunay triangulation to the graph 6. Uses the resulting graph to draw corridors between the rooms, using a random point on the near edge of each room to pick the points of the corridors
2019-12-30 17:31:56 +01:00
generic-arbitrary = appendPatch
Add DerivingVia newtype for generic arbitrary Add a newtype, GenericArbitrary, which can be used with -XDerivingVia to derive Arbitrary instances for types with Generic, via patching generic-arbitrary to expose the underlying typeclass it uses for surfacing the type information.
2019-11-30 04:57:58 +01:00
super.generic-arbitrary
feat(3p/haskellPackages): port in patches from xanthous 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 03:27:02 +02:00
[ ./patches/generic-arbitrary-export-garbitrary.patch ];
Add dungeon level generation Add a dungeon level generator, which: 1. generates an infinite sequence of rectangular rooms within the dimensions of the level 2. removes any duplicates from that sequence 3. Generates a graph from the delaunay triangulation of the centerpoints of those rooms 4. Generates the minimum-spanning-tree of that delaunay triangulation, with weights given by line length in points 5. Adds back a subset (default 10-15%) of edges from the delaunay triangulation to the graph 6. Uses the resulting graph to draw corridors between the rooms, using a random point on the near edge of each room to pick the points of the corridors
2019-12-30 17:31:56 +01:00
hgeometry =
appendPatch
(self.callHackageDirect {
pkg = "hgeometry";
ver = "0.9.0.0";
sha256 = "02hyvbqm57lr47w90vdgl71cfbd6lvwpqdid9fcnmxkdjbq4kv6b";
feat(3p/haskellPackages): port in patches from xanthous 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 03:27:02 +02:00
} {}) [ ./patches/hgeometry-fix-haddock.patch ];
Add dungeon level generation Add a dungeon level generator, which: 1. generates an infinite sequence of rectangular rooms within the dimensions of the level 2. removes any duplicates from that sequence 3. Generates a graph from the delaunay triangulation of the centerpoints of those rooms 4. Generates the minimum-spanning-tree of that delaunay triangulation, with weights given by line length in points 5. Adds back a subset (default 10-15%) of edges from the delaunay triangulation to the graph 6. Uses the resulting graph to draw corridors between the rooms, using a random point on the near edge of each room to pick the points of the corridors
2019-12-30 17:31:56 +01:00
hgeometry-combinatorial =
self.callHackageDirect {
pkg = "hgeometry-combinatorial";
ver = "0.9.0.0";
sha256 = "12k41wd9fd1y3jd5djwcpwg2s1cva87wh14i0m1yn49zax9wl740";
} {};
chore(3p): Bump nixpkgs channels 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-08-04 19:43:41 +02:00
psqueues = doJailbreak super.psqueues;
random = dontCheck (self.callHackageDirect {
pkg = "random";
ver = "1.2.0";
sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
} {});
random-source = overrideSrc super.random-source rec {
src = pkgs.fetchzip {
url = "mirror://hackage/random-source-${version}/random-source-${version}.tar.gz";
sha256 = "0yx0i4fv1xg535zd2isczfngsq5740wzl6w44168lxdmpw9fmsyz";
};
# downgraded as the latest version was causing a ghc crash:
# https://gitlab.haskell.org/ghc/ghc/-/issues/18537
version = "0.3.0.8";
};
semialign = self.callHackageDirect {
pkg = "semialign";
ver = "1.1.0.1";
sha256 = "1xs5dvz87gx6xnannw6bc70nzr8ffhk0j6n7n0p5dqair9sz77x4";
} {};
splitmix = dontCheck (self.callHackageDirect {
pkg = "splitmix";
ver = "0.1";
sha256 = "1k7l07h2w4fhjdqiqvw48if0irx0ngv6niach265j7lbfxsm8qql";
} {});
hedgehog = doJailbreak super.hedgehog;
hspec-core = dontCheck super.hspec-core;
QuickCheck = overrideSrc super.QuickCheck rec {
src = pkgs.fetchzip {
url = "mirror://hackage/QuickCheck-${version}/QuickCheck-${version}.tar.gz";
sha256 = "0x9pnr9m81jlywj38w3530zw1g0xmfszmj9303m2fp58zpad96h0";
};
version = "2.14.1";
};
test-framework-quickcheck2 = doJailbreak super.test-framework-quickcheck2;
vector = overrideSrc (doJailbreak super.vector) rec {
src = pkgs.fetchzip {
url = "mirror://hackage/vector-${version}/vector-${version}.tar.gz";
sha256 = "1312lpb1f4jzbmcjp7mdf9l9ykp1hscxdr66cl8zlcs8kbr13bm7";
};
version = "0.12.1.2";
};
chore(xan): Install ghc-prof-flamegraph 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-22 00:01:29 +02:00
vinyl = overrideSrc (markUnbroken super.vinyl)
Add dungeon level generation Add a dungeon level generator, which: 1. generates an infinite sequence of rectangular rooms within the dimensions of the level 2. removes any duplicates from that sequence 3. Generates a graph from the delaunay triangulation of the centerpoints of those rooms 4. Generates the minimum-spanning-tree of that delaunay triangulation, with weights given by line length in points 5. Adds back a subset (default 10-15%) of edges from the delaunay triangulation to the graph 6. Uses the resulting graph to draw corridors between the rooms, using a random point on the near edge of each room to pick the points of the corridors
2019-12-30 17:31:56 +01:00
rec {
fix(xan): Build without nixpkgs in NIX_PATH 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 02:33:25 +02:00
src = pkgs.fetchzip {
Add dungeon level generation Add a dungeon level generator, which: 1. generates an infinite sequence of rectangular rooms within the dimensions of the level 2. removes any duplicates from that sequence 3. Generates a graph from the delaunay triangulation of the centerpoints of those rooms 4. Generates the minimum-spanning-tree of that delaunay triangulation, with weights given by line length in points 5. Adds back a subset (default 10-15%) of edges from the delaunay triangulation to the graph 6. Uses the resulting graph to draw corridors between the rooms, using a random point on the near edge of each room to pick the points of the corridors
2019-12-30 17:31:56 +01:00
url = "mirror://hackage/vinyl-${version}/vinyl-${version}.tar.gz";
sha256 = "190ffrmm76fh8fi9afkcda2vldf89y7dxj10434h28mbpq55kgsx";
};
version = "0.12.0";
};
Add support for multiple levels Add a data structure, based on the zipper comonad, which provides support for multiple levels, each of which is its own entity map. The current level is provided by coreturn, which the `entities` lens has been updated to use. Nothing currently supports going up or down levels yet - that's coming next.
2020-01-05 05:48:51 +01:00
comonad-extras = appendPatch (markUnbroken super.comonad-extras)
feat(3p/haskellPackages): port in patches from xanthous 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 03:27:02 +02:00
[ ./patches/update-comonad-extras.patch ];
Add DerivingVia newtype for generic arbitrary Add a newtype, GenericArbitrary, which can be used with -XDerivingVia to derive Arbitrary instances for types with Generic, via patching generic-arbitrary to expose the underlying typeclass it uses for surfacing the type information.
2019-11-30 04:57:58 +01:00
}
Reference in a new issue Copy permalink