Merge master into haskell-updates

.github/labeler.yml

@@ -145,6 +145,12 @@
  - any-glob-to-any-file:
  - lib/**
 
+"6.topic: llvm/clang":
+ - any:
+ - changed-files:
+ - any-glob-to-any-file:
+ - pkgs/development/compilers/llvm/*
+
 "6.topic: lua":
  - any:
  - changed-files:

.github/workflows/check-cherry-picks.yml

@@ -4,6 +4,7 @@ on:
  branches:
  - 'release-**'
  - 'staging-**'
+ - '!staging-next'
 
 permissions: {}
 

doc/languages-frameworks/rust.section.md

@@ -254,15 +254,15 @@ By default, it takes the `stdenv.hostPlatform.config` and replaces components
 where they are known to differ. But there are ways to customize the argument:
 
  - To choose a different target by name, define
- `stdenv.hostPlatform.rustc.config` as that name (a string), and that
+ `stdenv.hostPlatform.rust.rustcTarget` as that name (a string), and that
  name will be used instead.
 
  For example:
 
  ```nix
  import <nixpkgs> {
  crossSystem = (import <nixpkgs/lib>).systems.examples.armhf-embedded // {
- rustc.config = "thumbv7em-none-eabi";
+ rust.rustcTarget = "thumbv7em-none-eabi";
  };
  }
  ```
@@ -274,19 +274,19 @@ where they are known to differ. But there are ways to customize the argument:
  ```
 
  - To pass a completely custom target, define
- `stdenv.hostPlatform.rustc.config` with its name, and
- `stdenv.hostPlatform.rustc.platform` with the value. The value will be
+ `stdenv.hostPlatform.rust.rustcTarget` with its name, and
+ `stdenv.hostPlatform.rust.platform` with the value. The value will be
  serialized to JSON in a file called
- `${stdenv.hostPlatform.rustc.config}.json`, and the path of that file
+ `${stdenv.hostPlatform.rust.rustcTarget}.json`, and the path of that file
  will be used instead.
 
  For example:
 
  ```nix
  import <nixpkgs> {
  crossSystem = (import <nixpkgs/lib>).systems.examples.armhf-embedded // {
- rustc.config = "thumb-crazy";
- rustc.platform = { foo = ""; bar = ""; };
+ rust.rustcTarget = "thumb-crazy";
+ rust.platform = { foo = ""; bar = ""; };
  };
  }
  ```

lib/systems/examples.nix

@@ -59,15 +59,15 @@ rec {
 
  armv7a-android-prebuilt = {
  config = "armv7a-unknown-linux-androideabi";
- rustc.config = "armv7-linux-androideabi";
+ rust.rustcTarget = "armv7-linux-androideabi";
  sdkVer = "28";
  ndkVer = "24";
  useAndroidPrebuilt = true;
  } // platforms.armv7a-android;
 
  aarch64-android-prebuilt = {
  config = "aarch64-unknown-linux-android";
- rustc.config = "aarch64-linux-android";
+ rust.rustcTarget = "aarch64-linux-android";
  sdkVer = "28";
  ndkVer = "24";
  useAndroidPrebuilt = true;
@@ -207,7 +207,7 @@ rec {
  aarch64-embedded = {
  config = "aarch64-none-elf";
  libc = "newlib";
- rustc.config = "aarch64-unknown-none";
+ rust.rustcTarget = "aarch64-unknown-none";
  };
 
  aarch64be-embedded = {

lib/trivial.nix

@@ -403,7 +403,7 @@ in {
  On each release the first letter is bumped and a new animal is chosen
  starting with that new letter.
  */
- codeName = "Vicuña";
+ codeName = "Vicuna";
 
  /**
  Returns the current nixpkgs version suffix as string.
@@ -623,6 +623,37 @@ in {
  /**
  Reads a JSON file.
 
+ # Examples
+ :::{.example}
+ ## `lib.trivial.importJSON` usage example
+
+ example.json
+ ```json
+ {
+ "title": "Example JSON",
+ "hello": {
+ "world": "foo",
+ "bar": {
+ "foobar": true
+ }
+ }
+ }
+ ```
+
+ ```nix
+ importJSON ./example.json
+ => {
+ title = "Example JSON";
+ hello = {
+ world = "foo";
+ bar = {
+ foobar = true;
+ };
+ };
+ }
+ ```
+
+ :::
 
  # Inputs
 
@@ -642,6 +673,35 @@ in {
  /**
  Reads a TOML file.
 
+ # Examples
+ :::{.example}
+ ## `lib.trivial.importTOML` usage example
+
+ example.toml
+ ```toml
+ title = "TOML Example"
+
+ [hello]
+ world = "foo"
+
+ [hello.bar]
+ foobar = true
+ ```
+
+ ```nix
+ importTOML ./example.toml
+ => {
+ title = "TOML Example";
+ hello = {
+ world = "foo";
+ bar = {
+ foobar = true;
+ };
+ };
+ }
+ ```
+
+ :::
 
  # Inputs
 

maintainers/maintainer-list.nix

@@ -1038,6 +1038,16 @@
  githubId = 60479013;
  name = "Alma Cemerlic";
  };
+ alois31 = {
+ name = "Alois Wohlschlager";
+ email = "[email protected]";
+ matrix = "@aloisw:kde.org";
+ github = "alois31";
+ githubId = 36605164;
+ keys = [{
+ fingerprint = "CA97 A822 FF24 25D4 74AF 3E4B E0F5 9EA5 E521 6914";
+ }];
+ };
  Alper-Celik = {
  email = "[email protected]";
  name = "Alper Çelik";
@@ -12580,6 +12590,15 @@
  githubId = 2321672;
  name = "Makise Kurisu";
  };
+ Makuru = {
+ email = "[email protected]";
+ github = "makuru-dd";
+ githubId = 58048293;
+ name = "Makuru";
+ keys = [{
+ fingerprint = "5B22 7123 362F DEF1 8F79 BF2B 4792 3A0F EEB5 51C7";
+ }];
+ };
  malbarbo = {
  email = "[email protected]";
  github = "malbarbo";
@@ -16343,6 +16362,12 @@
  githubId = 4622652;
  name = "Pedro Magalhães";
  };
+ pjungkamp = {
+ email = "[email protected]";
+ github = "PJungkamp";
+ githubId = 56401138;
+ name = "Philipp Jungkamp";
+ };
  pkharvey = {
  email = "[email protected]";
  github = "pkharvey";
@@ -19269,6 +19294,11 @@
  githubId = 106779009;
  name = "Slambert";
  };
+ slashformotion = {
+ github = "slashformotion";
+ githubId = 45801817;
+ name = "slashformotion";
+ };
  slbtty = {
  email = "[email protected]";
  github = "shenlebantongying";
@@ -21118,6 +21148,12 @@
  github = "tpwrules";
  githubId = 208010;
  };
+ traverseda = {
+ email = "[email protected]";
+ github = "traverseda";
+ githubId = 2125828;
+ name = "Alex Davies";
+ };
  travisbhartwell = {
  email = "[email protected]";
  github = "travisbhartwell";