refactor: Introduce new layout with nixpkgs in third_party

This is not the final layout yet, but makes it so that my top-level
attribute set is no longer overlaid into nixpkgs itself.

This is useful for other people who are importing my monorepo.
This commit is contained in:
Vincent Ambo 2019-12-09 02:40:48 +00:00
parent 688233acac
commit 01bad09eed
10 changed files with 61 additions and 49 deletions

View file

@ -1,7 +1,8 @@
{ pkgs, ... }:
let
inherit (pkgs) stdenv sbcl lispPackages elmPackages makeWrapper openssl;
inherit (pkgs) lispPackages;
inherit (pkgs.third_party.nixpkgs) stdenv sbcl elmPackages makeWrapper openssl;
frontend = stdenv.mkDerivation {
name = "gemma-frontend";

View file

@ -5,7 +5,7 @@
{ pkgs, ... }:
let
inherit (pkgs) writeShellScriptBin haskell;
inherit (pkgs.third_party.nixpkgs) writeShellScriptBin haskell;
tazblog = haskell.packages.ghc865.callPackage ./tazblog.nix {};
wrapper = writeShellScriptBin "tazblog" ''
export PORT=8000

View file

@ -1,4 +1,4 @@
{ pkgs ? import ../../default.nix {} }:
{ pkgs ? (import ../../default.nix {}).third_party.nixpkgs }:
let tazblog = import ./tazblog.nix;
depNames = with builtins; filter (