Merge branch 'master' into emiflake/stub-everything

This commit is contained in:
Emily Martins 2022-03-28 15:48:02 +02:00
commit 7a3e62a401
4 changed files with 413 additions and 63 deletions

View file

@ -11,11 +11,19 @@
inputs.plutarch.inputs.nixpkgs.follows =
"plutarch/haskell-nix/nixpkgs-unstable";
# https://github.com/mlabs-haskell/apropos-tx/pull/28
# Follows jhodgdev's forks of apropos and apropos-tx, as these
# are not constrained to `base ^>= 4.14`. Once these are merged
# to their respective master branches, we should change the
# inputs to follow a commit on those master branches. For more
# info, see: https://github.com/mlabs-haskell/apropos-tx/pull/37
inputs.apropos-tx.url =
"github:mlabs-haskell/apropos-tx?rev=5b74ba897a6f02718c163bf588a08c5e3e9de204";
"github:jhodgdev/apropos-tx?rev=582496d0dfb88ce007bb0d2a2dcbc72ea0bb1cd1";
inputs.apropos-tx.inputs.nixpkgs.follows =
"plutarch/haskell-nix/nixpkgs-unstable";
inputs.apropos.url =
"github:jhodgdev/apropos?rev=c6c580aeab8b5c2a6512a49823dd17936e87b70a";
inputs.apropos.inputs.nixpkgs.follows =
"plutarch/haskell-nix/nixpkgs-unstable";
outputs = inputs@{ self, nixpkgs, haskell-nix, plutarch, ... }:
let
@ -55,6 +63,10 @@
src = inputs.apropos-tx;
subdirs = [ "." ];
}
{
src = inputs.apropos;
subdirs = [ "." ];
}
];
modules = [ (plutarch.haskellModule system) ];
shell = {
@ -85,6 +97,7 @@
ps.plutarch-extra
ps.plutarch-numeric
ps.plutarch-test
ps.apropos
];
};
};