From e2588e9f3aeddc7e3f296043d9e893259fa547f4 Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 29 Sep 2022 04:25:54 +0200 Subject: [PATCH] fix it --- cabal.project | 3 --- flake.nix | 29 +++++++++++++---------------- src/Types/Auth.hs | 2 ++ 3 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 cabal.project diff --git a/cabal.project b/cabal.project deleted file mode 100644 index 364c6a9..0000000 --- a/cabal.project +++ /dev/null @@ -1,3 +0,0 @@ --- index-state: 2021-02-05T00:00:00Z -packages: - ./ diff --git a/flake.nix b/flake.nix index 367ffb3..0d71179 100644 --- a/flake.nix +++ b/flake.nix @@ -11,14 +11,7 @@ let pkgs = nixpkgs.legacyPackages.${system}; - haskellPackages = pkgs.haskellPackages.override { - overrides = hself: hsuper: { - pg-transact = with pkgs.haskell.lib; - unmarkBroken (dontCheck (doJailbreak hsuper.pg-transact)); - hspec-wai-json = with pkgs.haskell.lib; - unmarkBroken (dontCheck (doJailbreak hsuper.hspec-wai-json)); - }; - }; + haskellPackages = pkgs.haskellPackages; jailbreakUnbreak = pkg: pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; })); @@ -32,14 +25,18 @@ defaultPackage = self.packages.${system}.${packageName}; - devShell = pkgs.mkShell { - buildInputs = with haskellPackages; [ - haskell-language-server - ghcid - cabal-install - ]; - inputsFrom = builtins.attrValues self.packages.${system}; - }; + devShell = self.packages.${system}.${packageName}.env; + + #devShell = pkgs.mkShell { + # buildInputs = with haskellPackages; [ + # haskell-language-server + # ghcid + # cabal-install + # ] ++ [ + # zlib + # ]; + # inputsFrom = builtins.attrValues self.packages.${system}; + #}; }); } diff --git a/src/Types/Auth.hs b/src/Types/Auth.hs index a4db97c..b756345 100644 --- a/src/Types/Auth.hs +++ b/src/Types/Auth.hs @@ -3,6 +3,8 @@ {-# LANGUAGE TypeFamilies #-} module Types.Auth where +import Crypto.JWT + import GHC.Generics import Data.Aeson