From 0b4c20d91bcc170a796682c3ec3ddb694d00b364 Mon Sep 17 00:00:00 2001 From: voidlizard Date: Thu, 10 Oct 2024 12:38:16 +0300 Subject: [PATCH] fixed(?) nix develop wtf on Debian --- flake.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 821ba1e1..c765eb3e 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ outputs = { self, nixpkgs, flake-utils, ... }@inputs: "fixme-new" ]; - miscellaneous = + miscellaneous = [ "bytestring-mmap" "db-pipe" @@ -59,7 +59,7 @@ outputs = { self, nixpkgs, flake-utils, ... }@inputs: defaultOverlay = final: prev: (prev.lib.composeManyExtensions # no-op - [ overlay + [ overlay ]) final prev; packagePostOverrides = pkg: with pkgs.haskell.lib.compose; pkgs.lib.pipe pkg [ @@ -87,8 +87,8 @@ outputs = { self, nixpkgs, flake-utils, ... }@inputs: jailbreakUnbreak = pkg: pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; })); - makePkgsFromDir = hp: pkgNames: mkPath: - pkgs.lib.genAttrs pkgNames (name: + makePkgsFromDir = hp: pkgNames: mkPath: + pkgs.lib.genAttrs pkgNames (name: hp.callCabal2nix name "${self}/${mkPath name}" {}); overlay = final: prev: let pkgs = prev; in @@ -132,13 +132,12 @@ outputs = { self, nixpkgs, flake-utils, ... }@inputs: }; }; + devShells.default = pkgs.haskellPackages.shellFor { - packages = _: - pkgs.lib.attrVals packageNames pkgs.haskellPackages ++ - pkgs.lib.attrVals miscellaneous pkgs.haskellPackages; - # withHoogle = true; + packages = _: []; buildInputs = ( with pkgs.haskellPackages; [ + ghc ghcid cabal-install haskell-language-server @@ -153,6 +152,8 @@ outputs = { self, nixpkgs, flake-utils, ... }@inputs: ++ [ pkgs.pkg-config pkgs.libsodium + pkgs.file + pkgs.zlib inputs.hspup.packages.${pkgs.system}.default ] );