From e61e947a2f85135d1386213f38ce57e8dc0ae6dd Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 17 Dec 2019 18:22:50 +0100 Subject: [PATCH] mateamt: simplify by 1000% --- mateamt.nix | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/mateamt.nix b/mateamt.nix index 19674a2..b0b9ec8 100644 --- a/mateamt.nix +++ b/mateamt.nix @@ -1,38 +1,7 @@ -{ pkgs ? import {} +{ pkgs ? import (import ) }: -with pkgs; -let - mateamtSrc = stdenv.mkDerivation { - name = "mateamt-src"; - src = ; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = '' - substituteInPlace default.nix \ - --replace \ - "builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz" \ - "" - ''; - installPhase = "cp -ar . $out"; - }; - mateamt = haskellPackages.callPackage "${mateamtSrc}"; - ghcBlacklist = [ - # "ghc822" - # "ghc844" - # "ghc881" - # "ghcHEAD" - ]; - ghcVersions = - builtins.filter (p: - (p == "ghcHEAD" || builtins.match "ghc[[:digit:]]+" p != null) && - (!builtins.elem p ghcBlacklist) - ) (builtins.attrNames haskell.packages); -in - -builtins.listToAttrs - (map (ghcVersion: { - name = "mateamt-${ghcVersion}"; - value = lib.hydraJob (mateamt { - compiler = ghcVersion; - nixpkgs = pkgs; - }); - }) ghcVersions) +{ + mateamt = pkgs.lib.hydraJob (import { + inherit pkgs; + }); +}