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 0db3324e89 - Show all commits

View file

@ -1,10 +1,10 @@
{ ... }:
let
let
channels-nixos-stable-path = (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/7e88992a8c7b2de0bcb89182d8686b27bd93e46a.tar.gz);
channels-nixos-stable = import channels-nixos-stable-path {};
in
in
with channels-nixos-stable;
stdenv.mkDerivation {
name = "infra-env";