From 48cc610fa4681e4a423f47c5a9a19bf8ebe05821 Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Sun, 28 Jun 2020 20:33:25 -0400
Subject: fix(xan): Build without nixpkgs in NIX_PATH

CI doesn't have a nixpkgs channel (obvs), and we want to be able to
build from the depot tree, so reorder some stuff so we never depend on
nixpkgs

Change-Id: I99b513a3d7bcd64b6d167335856651e0ca66e33b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/734
---
 users/glittershark/xanthous/default.nix         | 6 +++---
 users/glittershark/xanthous/haskell-overlay.nix | 9 ++++-----
 users/glittershark/xanthous/pkg.nix             | 5 +----
 3 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'users/glittershark/xanthous')

diff --git a/users/glittershark/xanthous/default.nix b/users/glittershark/xanthous/default.nix
index be8957f9f641..4af535a34def 100644
--- a/users/glittershark/xanthous/default.nix
+++ b/users/glittershark/xanthous/default.nix
@@ -1,11 +1,11 @@
 { nixpkgs ? import ./nixpkgs.nix {}
 , pkgs ? nixpkgs.pkgs
+, lib ? nixpkgs.lib
 , compiler ? "ghc865"
 , failOnWarnings ? false
 , ...
 }:
 let
-  inherit (nixpkgs) pkgs lib;
   inherit (lib) id;
   inherit (pkgs) fetchurl;
   all-hies = import (fetchTarball {
@@ -16,6 +16,6 @@ let
   xanthous =
     (if failOnWarnings then pkgs.haskell.lib.failOnAllWarnings else id)
       ((pkgs.haskellPackages
-      .extend (import ./haskell-overlay.nix { inherit nixpkgs; })
-    ).callPackage (import ./pkg.nix { inherit nixpkgs; }) {}); in
+      .extend (import ./haskell-overlay.nix { inherit pkgs; })
+    ).callPackage (import ./pkg.nix { inherit pkgs; }) {}); in
 xanthous // { inherit hie; }
diff --git a/users/glittershark/xanthous/haskell-overlay.nix b/users/glittershark/xanthous/haskell-overlay.nix
index ad1200ef77f7..86a35149820d 100644
--- a/users/glittershark/xanthous/haskell-overlay.nix
+++ b/users/glittershark/xanthous/haskell-overlay.nix
@@ -1,6 +1,5 @@
-{ nixpkgs ? import ./nixpkgs.nix {} }:
-let inherit (nixpkgs) pkgs;
-in self: super: with pkgs.haskell.lib; rec {
+{ pkgs ? import ./nixpkgs.nix {} }:
+self: super: with pkgs.haskell.lib; rec {
   generic-arbitrary = appendPatch
     super.generic-arbitrary
     [ ./build/generic-arbitrary-export-garbitrary.patch ];
@@ -22,7 +21,7 @@ in self: super: with pkgs.haskell.lib; rec {
 
   vinyl = overrideSrc (markUnbroken super.vinyl)
     rec {
-      src = nixpkgs.fetchzip {
+      src = pkgs.fetchzip {
         url = "mirror://hackage/vinyl-${version}/vinyl-${version}.tar.gz";
         sha256 = "190ffrmm76fh8fi9afkcda2vldf89y7dxj10434h28mbpq55kgsx";
       };
@@ -35,7 +34,7 @@ in self: super: with pkgs.haskell.lib; rec {
   ghc-prof-flamegraph = overrideCabal super.ghc-prof-flamegraph (oldAttrs: rec {
     version = "0.2.0.0";
 
-    src = nixpkgs.fetchFromGitHub {
+    src = pkgs.fetchFromGitHub {
       owner = "fpco";
       repo = "ghc-prof-flamegraph";
       rev = "8edd3b4806adeb25a4d55bed51c3afcc8e7a8e14";
diff --git a/users/glittershark/xanthous/pkg.nix b/users/glittershark/xanthous/pkg.nix
index dcf508fa5485..91de68ea3216 100644
--- a/users/glittershark/xanthous/pkg.nix
+++ b/users/glittershark/xanthous/pkg.nix
@@ -1,9 +1,6 @@
-{ nixpkgs ? import ./nixpkgs.nix {}
-,
-}:
+{ pkgs ? import ./nixpkgs.nix {} }:
 let
   inherit (builtins) filterSource elem not;
-  inherit (nixpkgs) pkgs;
   gitignoreSource = (import (pkgs.fetchFromGitHub {
     owner = "hercules-ci";
     repo = "gitignore";
-- 
cgit 1.4.1