diff options
-rw-r--r-- | nix/default.nix | 4 | ||||
-rw-r--r-- | shell.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nix/default.nix b/nix/default.nix index 74917f8..04f9ee4 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,12 +1,12 @@ let sources = import ./sources.nix; nixpkgs = import sources.nixpkgs { - system = "x86_64-linux"; + system = __currentSystem; overlays = [ (_: _: { inherit sources; }) - (_: _: { niv = import sources.niv {}; }) (import ./sources-overlay.nix) (_: pkgs: pkgs.overridePinnedDeps pkgs.overrideSource) + (_: _: { niv = import sources.niv {}; }) (import ./haskell-overlay.nix) (_: pkgs: { wemux = pkgs.callPackage ./wemux.nix {}; }) ]; @@ -3,20 +3,20 @@ }: let - nixpkgs = import ./nix/nixpkgs.nix; + nixpkgs = import ./nix/default.nix; basepkgs = import ./Biz/packages.nix { inherit (nixpkgs) pkgs; }; devpkgs = with nixpkgs; [ hlint - niv + #niv ormolu python37Packages.black python37Packages.pylint wemux - ] -in nixpkgs.mkShell ({ + ]; +in nixpkgs.mkShell { name = "bizdev"; - buildInputs = devpkgs ++ basepkgs.environment.systemPackages; + buildInputs = devpkgs; shellHook = '' echo "biz" | ${nixpkgs.figlet}/bin/figlet | ${nixpkgs.lolcat}/bin/lolcat ''; -}) +} |