Xeorg
/
site
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pin dhall-yaml to shell, update xepkgs to use inherit

This commit is contained in:
Cadey Ratio 2020-02-13 17:39:52 +00:00
parent 87cddc0754
commit fa6132d8db
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/sources.json
View File

@ -50,7 +50,7 @@
"xepkgs": { "xepkgs": {
"ref": "master", "ref": "master",
"repo": "https://tulpa.dev/Xe/nixpkgs", "repo": "https://tulpa.dev/Xe/nixpkgs",
"rev": "71488e7dd46c9530d6781ab7845e6f720591a0b0", "rev": "e0027d79c85aab9411c69acaadaabd2189400cc9",
"type": "git" "type": "git"
} }
} }

12
shell.nix
View File

@ -1,7 +1,11 @@
let let
sources = import ./nix/sources.nix; sources = import ./nix/sources.nix;
niv = (import sources.niv { }).niv;
pkgs = import sources.nixpkgs { }; pkgs = import sources.nixpkgs { };
xepkgs = import sources.xepkgs { }; niv = (import sources.niv { }).niv;
vgo2nix = import sources.vgo2nix { }; dhall-yaml =
in pkgs.mkShell { buildInputs = [ pkgs.go xepkgs.gopls niv vgo2nix ]; } (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 ];
}