mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(xan): Build without nixpkgs in NIX_PATH

Browse source 
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
This commit is contained in:
Griffin Smith 2020-06-28 20:33:25 -04:00 • committed by glittershark
parent 93d1ab7a54
commit 48cc610fa4
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
users/glittershark/xanthous/default.nix
View file

@ -1,11 +1,11 @@
{ nixpkgs ? import ./nixpkgs.nix {} { nixpkgs ? import ./nixpkgs.nix {}
, pkgs ? nixpkgs.pkgs , pkgs ? nixpkgs.pkgs
, lib ? nixpkgs.lib
, compiler ? "ghc865" , compiler ? "ghc865"
, failOnWarnings ? false , failOnWarnings ? false
, ... , ...
}: }:
let let
inherit (nixpkgs) pkgs lib;
inherit (lib) id; inherit (lib) id;
inherit (pkgs) fetchurl; inherit (pkgs) fetchurl;
all-hies = import (fetchTarball { all-hies = import (fetchTarball {
@ -16,6 +16,6 @@ let
xanthous = xanthous =
(if failOnWarnings then pkgs.haskell.lib.failOnAllWarnings else id) (if failOnWarnings then pkgs.haskell.lib.failOnAllWarnings else id)
((pkgs.haskellPackages ((pkgs.haskellPackages
.extend (import ./haskell-overlay.nix { inherit nixpkgs; }) .extend (import ./haskell-overlay.nix { inherit pkgs; })
).callPackage (import ./pkg.nix { inherit nixpkgs; }) {}); in ).callPackage (import ./pkg.nix { inherit pkgs; }) {}); in
xanthous // { inherit hie; } xanthous // { inherit hie; }

9
users/glittershark/xanthous/haskell-overlay.nix
View file

@ -1,6 +1,5 @@
{ nixpkgs ? import ./nixpkgs.nix {} }: { pkgs ? import ./nixpkgs.nix {} }:
let inherit (nixpkgs) pkgs; self: super: with pkgs.haskell.lib; rec {
in self: super: with pkgs.haskell.lib; rec {
generic-arbitrary = appendPatch generic-arbitrary = appendPatch
super.generic-arbitrary super.generic-arbitrary
[ ./build/generic-arbitrary-export-garbitrary.patch ]; [ ./build/generic-arbitrary-export-garbitrary.patch ];
@ -22,7 +21,7 @@ in self: super: with pkgs.haskell.lib; rec {
vinyl = overrideSrc (markUnbroken super.vinyl) vinyl = overrideSrc (markUnbroken super.vinyl)
rec { rec {
src = nixpkgs.fetchzip { src = pkgs.fetchzip {
url = "mirror://hackage/vinyl-${version}/vinyl-${version}.tar.gz"; url = "mirror://hackage/vinyl-${version}/vinyl-${version}.tar.gz";
sha256 = "190ffrmm76fh8fi9afkcda2vldf89y7dxj10434h28mbpq55kgsx"; sha256 = "190ffrmm76fh8fi9afkcda2vldf89y7dxj10434h28mbpq55kgsx";
}; };
@ -35,7 +34,7 @@ in self: super: with pkgs.haskell.lib; rec {
ghc-prof-flamegraph = overrideCabal super.ghc-prof-flamegraph (oldAttrs: rec { ghc-prof-flamegraph = overrideCabal super.ghc-prof-flamegraph (oldAttrs: rec {
version = "0.2.0.0"; version = "0.2.0.0";
src = nixpkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "fpco"; owner = "fpco";
repo = "ghc-prof-flamegraph"; repo = "ghc-prof-flamegraph";
rev = "8edd3b4806adeb25a4d55bed51c3afcc8e7a8e14"; rev = "8edd3b4806adeb25a4d55bed51c3afcc8e7a8e14";

5
users/glittershark/xanthous/pkg.nix
View file

@ -1,9 +1,6 @@
{ nixpkgs ? import ./nixpkgs.nix {} { pkgs ? import ./nixpkgs.nix {} }:
,
}:
let let
inherit (builtins) filterSource elem not; inherit (builtins) filterSource elem not;
inherit (nixpkgs) pkgs;
gitignoreSource = (import (pkgs.fetchFromGitHub { gitignoreSource = (import (pkgs.fetchFromGitHub {
owner = "hercules-ci"; owner = "hercules-ci";
repo = "gitignore"; repo = "gitignore";