From fa6132d8db59979d181362ffa3b307940358f1bb Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Thu, 13 Feb 2020 17:39:52 +0000 Subject: [PATCH] pin dhall-yaml to shell, update xepkgs to use inherit --- nix/sources.json | 2 +- shell.nix | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 2fc6254..937f537 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -50,7 +50,7 @@ "xepkgs": { "ref": "master", "repo": "https://tulpa.dev/Xe/nixpkgs", - "rev": "71488e7dd46c9530d6781ab7845e6f720591a0b0", + "rev": "e0027d79c85aab9411c69acaadaabd2189400cc9", "type": "git" } } diff --git a/shell.nix b/shell.nix index 8d6eacb..6abe8a7 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,11 @@ let sources = import ./nix/sources.nix; - niv = (import sources.niv { }).niv; pkgs = import sources.nixpkgs { }; - xepkgs = import sources.xepkgs { }; - vgo2nix = import sources.vgo2nix { }; -in pkgs.mkShell { buildInputs = [ pkgs.go xepkgs.gopls niv vgo2nix ]; } + niv = (import sources.niv { }).niv; + dhall-yaml = + (import sources.easy-dhall-nix { inherit pkgs; }).dhall-yaml-simple; + xepkgs = import sources.xepkgs { inherit pkgs; }; + vgo2nix = import sources.vgo2nix { inherit pkgs; }; +in pkgs.mkShell { + buildInputs = [ pkgs.go xepkgs.gopls dhall-yaml niv vgo2nix ]; +}