1
1
mirror of https://github.com/srid/ema.git synced 2024-11-28 23:42:59 +03:00

nix: use relude from nixpkgs

This commit is contained in:
Sridhar Ratnakumar 2022-08-08 11:52:52 -04:00
parent b052ad1b2f
commit dc2585d6fb
2 changed files with 3 additions and 26 deletions

20
flake.lock generated
View File

@ -51,29 +51,11 @@
"type": "github"
}
},
"relude": {
"flake": false,
"locked": {
"lastModified": 1654789035,
"narHash": "sha256-57pQicQBHQ7T9NCuR7YnRt7E6m+tVNLE8LyJV4MtpMU=",
"owner": "kowainik",
"repo": "relude",
"rev": "b2fccefa4b81ead3aeec567e2f536498dec5eee5",
"type": "github"
},
"original": {
"owner": "kowainik",
"ref": "v1.1.0.0",
"repo": "relude",
"type": "github"
}
},
"root": {
"inputs": {
"flake-parts": "flake-parts",
"haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs",
"relude": "relude"
"nixpkgs": "nixpkgs"
}
}
},

View File

@ -5,9 +5,6 @@
flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs.follows = "nixpkgs";
haskell-flake.url = "github:srid/haskell-flake";
# 1.1 not in nixpkgs or cabal hashes yet
relude.url = "github:kowainik/relude/v1.1.0.0";
relude.flake = false;
};
outputs = inputs@{ self, nixpkgs, flake-parts, haskell-flake, ... }:
flake-parts.lib.mkFlake { inherit self; } {
@ -51,12 +48,10 @@
fourmolu;
ghcid = workaround140774 hp.ghcid;
};
source-overrides = {
inherit (inputs) relude;
};
source-overrides = { };
overrides = self: super: with pkgs.haskell.lib; {
# All these below are for GHC 9.2 compat.
relude = dontCheck super.relude;
relude = dontCheck super.relude_1_1_0_0; # Not the default in nixpkgs yet.
retry = dontCheck super.retry;
http2 = dontCheck super.http2; # Fails on darwin
type-errors-pretty = dontCheck (doJailbreak super.type-errors-pretty);