From df2cfcf411f28763444a4f25333fca360d604982 Mon Sep 17 00:00:00 2001 From: nek0 Date: Tue, 27 Dec 2022 19:40:55 +0100 Subject: [PATCH] update flake --- flake.lock | 6 +++--- flake.nix | 29 +++++++++++++++++++---------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 4b9e072..c0a775b 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669919723, - "narHash": "sha256-uPunC0NFkJpflH3WtelwKdJUwLk4gmxE+Rtdop98s8M=", + "lastModified": 1670132710, + "narHash": "sha256-IT4MnLdmgWkkXkVy4qNcA/6J53f36avJtIL0n1M/1M0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89a353ccd2a6b5c78d5ac3789e8c9bc2109a75ec", + "rev": "8bc39a24bcef4d2aefebaa06b3ed75128599a262", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8e55357..4229b74 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; })); packageName = "tracer-game"; - in { + in rec { packages.${packageName} = # (ref:haskell-package-def) haskellPackages.callCabal2nix packageName self rec { affection = affection-src.defaultPackage.${system}; @@ -26,21 +26,30 @@ defaultPackage = self.packages.${system}.${packageName}; - devShell = pkgs.mkShell { + devShell = haskellPackages.shellFor { + packages = p: [ defaultPackage ]; + withHoogle = true; buildInputs = with haskellPackages; [ haskell-language-server ghcid cabal-install ]; - nativeBuildInputs = with pkgs; [ - pkg-config - glib - freetype - glew - SDL2 - ]; - inputsFrom = builtins.attrValues self.packages.${system}; }; + #devShell = pkgs.mkShell { + # buildInputs = with haskellPackages; [ + # haskell-language-server + # ghcid + # cabal-install + # ]; + # nativeBuildInputs = with pkgs; [ + # pkg-config + # glib + # freetype + # glew + # SDL2 + # ]; + # inputsFrom = builtins.attrValues self.packages.${system}; + #}; }); }