diff options
| author | tv <tv@krebsco.de> | 2017-10-26 18:43:33 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-10-26 18:43:33 +0200 |
| commit | d5fd5107e6cd8e4d1cd0e63420d35a9df5279e7f (patch) | |
| tree | 05731b063ed6243632b6c3a61a329618da6a6951 /makefu/2configs | |
| parent | 1993cbc42114c759a47fed8de1e73980d3df57d9 (diff) | |
| parent | 458bd5f6bda5b5718959613ceb989862a530ed7b (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/binary-cache/lass.nix | 1 | ||||
| -rw-r--r-- | makefu/2configs/tools/dev.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/makefu/2configs/binary-cache/lass.nix b/makefu/2configs/binary-cache/lass.nix index 4813eeb0f..46b386e14 100644 --- a/makefu/2configs/binary-cache/lass.nix +++ b/makefu/2configs/binary-cache/lass.nix @@ -7,6 +7,7 @@ ]; binaryCachePublicKeys = [ "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU=" + "cache.prism-2:YwmCm3/s/D+SxrPKN/ETjlpw/219pNUbpnluatp6FKI=" ]; }; } diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index 6681484fd..d3d50c433 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -16,5 +16,6 @@ whatsupnix brain gen-oath-safe + cdrtools ]; } |