Merge remote-tracking branch 'origin/released' into next

This commit is contained in:
Graham Christensen 2018-05-03 21:50:31 -04:00
commit 2318765308
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
3 changed files with 8 additions and 4 deletions

View file

@ -1,11 +1,13 @@
[ [
"brainrape", "akru",
"bhipple", "bhipple",
"brainrape",
"dywedir", "dywedir",
"edef1c", "edef1c",
"etu",
"Ekleog", "Ekleog",
"etu",
"infinisil", "infinisil",
"jlesquembre",
"Ma27", "Ma27",
"oxij", "oxij",
"pbogdan", "pbogdan",
@ -14,7 +16,7 @@
"ThomasMader", "ThomasMader",
"unode", "unode",
"va1entin", "va1entin",
"xeji",
"volth", "volth",
"akru" "woffs",
"xeji"
] ]

View file

@ -57,6 +57,7 @@
"r-ryantm", "r-ryantm",
"shlevy", "shlevy",
"srhb", "srhb",
"timokau",
"veprbl", "veprbl",
"vcunat", "vcunat",
"willibutz", "willibutz",

View file

@ -10,3 +10,4 @@
"!tofu" = "To get a sha256 hash of a new source, you can use the Trust On First Use model: use probably-wrong hash (for example: 0000000000000000000000000000000000000000000000000000) then replace it with the correct hash Nix expected." "!tofu" = "To get a sha256 hash of a new source, you can use the Trust On First Use model: use probably-wrong hash (for example: 0000000000000000000000000000000000000000000000000000) then replace it with the correct hash Nix expected."
"!unfree" = "You cannot install your unfree software? See https://nixos.wiki/wiki/FAQ/unfree" "!unfree" = "You cannot install your unfree software? See https://nixos.wiki/wiki/FAQ/unfree"
"!notfound" = "nix-env -qaP does not show the package you are looking for but you are sure it should be there? Check out https://nixos.wiki/wiki/FAQ/notfound" "!notfound" = "nix-env -qaP does not show the package you are looking for but you are sure it should be there? Check out https://nixos.wiki/wiki/FAQ/notfound"
"!stateVersion" = "Do not update `system.stateVersion`. See https://nixos.wiki/wiki/FAQ/stateVersion for details."