Merge master into staging-next

alyssais · Feb 14, 2023 · 46cc80c · 46cc80c
2 parents 9c94a57 + a7fb18c
commit 46cc80c
Show file tree

Hide file tree

Showing 48 changed files with 777 additions and 641 deletions.
diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md
@@ -171,6 +171,7 @@ let
     inherit src version;
     # nix will complain and tell you the right value to replace this with
     hash = lib.fakeHash;
+    mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test".
     # if you have build time environment variables add them here
     MY_ENV_VAR="my_value";
   };

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -932,6 +932,12 @@
     githubId = 106511;
     name = "Andrew Kelley";
   };
+  andrewsmith = {
+    email = "andrew@velvet.software";
+    github = "andrewsmith";
+    githubId = 29887;
+    name = "Andrew Smith";
+  };
   andsild = {
     email = "andsild@gmail.com";
     github = "andsild";