diff options
| -rw-r--r-- | default.nix | 19 | ||||
| -rw-r--r-- | pkgs/default.nix | 9 |
2 files changed, 21 insertions, 7 deletions
diff --git a/default.nix b/default.nix index 3de5581..e49bc1a 100644 --- a/default.nix +++ b/default.nix @@ -1,12 +1,17 @@ -{ pkgs ? import (import ./nix/sources.nix).nixpkgs { } }: rec { - haskellPackages = pkgs.haskellPackages.override { - overrides = self: super: { - sensors = self.callCabal2nix "sensors" ./. { }; - }; - }; +{ pkgs ? import sources.nixpkgs { + overlays = [ + (import ./pkgs) + ]; + } +, sources ? import ./nix/sources.nix +}: +let + inherit (pkgs) haskellPackages; +in +{ inherit (haskellPackages) sensors; shell = haskellPackages.shellFor { - packages = _: [ sensors ]; + packages = _: haskellPackages: with haskellPackages; [ sensors ]; buildInputs = [ haskellPackages.cabal-install haskellPackages.ormolu diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..6f2b4c4 --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,9 @@ +self: super: { + haskell = super.haskell // { + packageOverrides = self.lib.composeExtensions super.haskell.packageOverrides (let + pkgs = self; + in self: super: { + sensors = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sensors" ./.. { }); + }); + }; +} |