about summary refs log tree commit diff
path: root/users/glittershark/xanthous/nixpkgs.nix
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-06-29T01·27-0400
committerglittershark <grfn@gws.fyi>2020-06-29T01·56+0000
commit8091da8f0f6efd365dddf4a09555ed49c093ea50 (patch)
tree0c79b385807ba80de21a9fd2f09ec5cbb57067bc /users/glittershark/xanthous/nixpkgs.nix
parent0ecc9b4ed3e53698dc44332abd06c67a6f8ffdbb (diff)
feat(3p/haskellPackages): port in patches from xanthous r/1124
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 <mail@profpatsch.de>
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'users/glittershark/xanthous/nixpkgs.nix')
-rw-r--r--users/glittershark/xanthous/nixpkgs.nix12
1 files changed, 3 insertions, 9 deletions
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 <nixpkgs> {}) 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; }