Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Showing only changes of commit 41820b9b7e - Show all commits

View file

@ -6,6 +6,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "infra-env"; name = "infra-env";
buildInputs = [ buildInputs = [
(with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ])
(pkgs.callPackage ./nix/pkgs/just.nix {}) (pkgs.callPackage ./nix/pkgs/just.nix {})
git-crypt git-crypt
vcsh vcsh