Merge remote-tracking branch 'remotes/upstream/master' into sockeye
[barrelfish] / shell.nix
2016-12-20 Kosyrev Sergebuild: Nix environment