From 01bad09eedc97c1437b5bbe4910f6b3b13b23ca0 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Mon, 9 Dec 2019 02:40:48 +0000
Subject: 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.
---
 overrides/buildGo.nix              | 6 ++++--
 overrides/lispPackages/default.nix | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'overrides')

diff --git a/overrides/buildGo.nix b/overrides/buildGo.nix
index cbccfcec97..8d46321b6f 100644
--- a/overrides/buildGo.nix
+++ b/overrides/buildGo.nix
@@ -1,4 +1,6 @@
-import "${builtins.fetchGit {
+{ pkgs, ... }:
+
+(import "${builtins.fetchGit {
   url = "https://github.com/tazjin/buildGo.nix";
   rev = "28e587b348a8aaa7af00a004c05286af9d35ca9a";
-}}/buildGo.nix"
+}}/buildGo.nix") { pkgs = pkgs.third_party.nixpkgs; }
diff --git a/overrides/lispPackages/default.nix b/overrides/lispPackages/default.nix
index da8f3c893a..175c807ec2 100644
--- a/overrides/lispPackages/default.nix
+++ b/overrides/lispPackages/default.nix
@@ -1,8 +1,8 @@
 # One of Gemma's dependencies is missing in nixpkgs' Quicklisp
 # package set, it is overlaid locally here.
-{ pkgs, upstream, ... }:
+{ pkgs, ... }:
 
 import ./quicklisp.nix {
   inherit (pkgs) lib;
-  inherit (upstream) lispPackages;
+  inherit (pkgs.third_party.nixpkgs) lispPackages;
 }
-- 
cgit 1.4.1