From 8091da8f0f6efd365dddf4a09555ed49c093ea50 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sun, 28 Jun 2020 21:27:02 -0400 Subject: feat(3p/haskellPackages): port in patches from xanthous Add a few relatively uncontroversial patches to fix some broken packages that I had developed for xanthous to the top-level third_party tree, so they can be reused by other people in the monorepo Change-Id: I68740477bda278c5dcc123080029ee4bd2cae37a Reviewed-on: https://cl.tvl.fyi/c/depot/+/740 Reviewed-by: Profpatsch Reviewed-by: tazjin --- users/glittershark/xanthous/nixpkgs.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'users/glittershark/xanthous/nixpkgs.nix') diff --git a/users/glittershark/xanthous/nixpkgs.nix b/users/glittershark/xanthous/nixpkgs.nix index 19bf2c59cedd..7d7c16440545 100644 --- a/users/glittershark/xanthous/nixpkgs.nix +++ b/users/glittershark/xanthous/nixpkgs.nix @@ -1,9 +1,3 @@ -let - inherit (import {}) fetchFromGitHub; - nixpkgs = fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs-channels"; - rev = "54f385241e6649128ba963c10314942d73245479"; - sha256 = "0bd4v8v4xcdbaiaa59yqprnc6dkb9jv12mb0h5xz7b51687ygh9l"; - }; -in import nixpkgs +args: +let pkgs = (import ../../../. args).third_party; +in pkgs // { inherit pkgs; } -- cgit 1.4.1