From edb27838cc1e5cf95c54fec98b53377458a95628 Mon Sep 17 00:00:00 2001 From: nek0 Date: Sun, 5 Mar 2023 05:35:53 +0100 Subject: [PATCH] update dependencies --- flake.lock | 12 ++++++------ flake.nix | 24 +++++++++++------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index bdaf394..a8ceb4f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1664408601, - "narHash": "sha256-arQ2Xr1SHphkszK6OJLWGdFGkIwWo190rROBhXWRMI8=", + "lastModified": 1677990182, + "narHash": "sha256-+gawrl8LSHsFYCb2vaJS7j9u4wphKEemyT9KFbcHPaI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "357bad603f72216b3f17c9b576586edd9ad51e96", + "rev": "f5d2643d6b38e8d30b94ada083dab200e1243b02", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0d71179..599cd59 100644 --- a/flake.nix +++ b/flake.nix @@ -17,26 +17,24 @@ pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; })); packageName = "mateamt"; - in { + in rec { packages.${packageName} = # (ref:haskell-package-def) haskellPackages.callCabal2nix packageName self rec { # Dependency overrides go here + openapi3 = jailbreakUnbreak haskellPackages.openapi3; }; defaultPackage = self.packages.${system}.${packageName}; - 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}; - #}; + devShell = haskellPackages.shellFor { + packages = p: [ defaultPackage ]; + withHoogle = true; + buildInputs = with haskellPackages; [ + haskell-language-server + ghcid + cabal-install + ]; + }; }); }