From 93a09e84023ce00fccfaf124315f3b341f2d6504 Mon Sep 17 00:00:00 2001 From: nerf van nerfingen Date: Fri, 10 Mar 2023 00:01:01 +0100 Subject: [PATCH] let nixpkgs choose library and compiler versions, hopefully nothing will brake lol --- choirMail.cabal | 2 +- default.nix | 4 ++-- flake.nix | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/choirMail.cabal b/choirMail.cabal index a2b5e09..1faf38c 100644 --- a/choirMail.cabal +++ b/choirMail.cabal @@ -76,7 +76,7 @@ executable choirMail -- Other library packages from which modules are imported. -- ^>=4.15.1.0 - build-depends: base ^>=4.15.1.0 + build-depends: base >=4.15.1.0 && < 4.18 ,transformers ,tomland >= 1.3.3.0 ,smtp-mail diff --git a/default.nix b/default.nix index 5a7b90a..c1f84eb 100644 --- a/default.nix +++ b/default.nix @@ -1,2 +1,2 @@ -{ pkgs , compiler ? "ghc902"}: - pkgs.haskell.packages.${compiler}.callPackage ./choirMail.nix { } +{ pkgs }: + pkgs.haskellPackages.callPackage ./choirMail.nix { } diff --git a/flake.nix b/flake.nix index 3c351e7..0d3fe28 100644 --- a/flake.nix +++ b/flake.nix @@ -10,15 +10,16 @@ let # name to be used as identifier for editor environments and such name = "Application"; - compiler = "ghc902"; + # compiler = "ghc902"; in flake-utils.lib.eachDefaultSystem ( system: let pkgs = import nixpkgs {inherit system;}; - hpkgs = pkgs.haskell.packages.${compiler}; + # hpkgs = pkgs.haskell.packages.${compiler}; + hpkgs = pkgs.haskellPackages; in { - packages = { default = (import ./default.nix) {inherit pkgs compiler;};}; + packages = { default = (import ./default.nix) {inherit pkgs;};}; devShells =