diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-07 14:04:47 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-07 14:04:47 +0100 |
| commit | ba08e4e99b00a6916c4360de7288a7bfcef85328 (patch) | |
| tree | 347c8b6ad50fcaafc08e50f1307a861378650440 /nixpkgs/lib | |
| parent | 190fd93d11701ad81af757be6260df9635bdb41a (diff) | |
| parent | 2c7f3c0fb7c08a0814627611d9d7d45ab6d75335 (diff) | |
| download | nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.gz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.bz2 nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.lz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.xz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.zst nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/lib')
| -rw-r--r-- | nixpkgs/lib/customisation.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/lib/licenses.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/lib/systems/default.nix | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nixpkgs/lib/customisation.nix b/nixpkgs/lib/customisation.nix index 5e290230ca4e..4de6f58a6aed 100644 --- a/nixpkgs/lib/customisation.nix +++ b/nixpkgs/lib/customisation.nix @@ -4,11 +4,12 @@ let inherit (builtins) intersectAttrs; inherit (lib) - functionArgs isFunction mirrorFunctionArgs isAttrs setFunctionArgs levenshteinAtMost - optionalAttrs attrNames levenshtein filter elemAt concatStringsSep sort take length + functionArgs isFunction mirrorFunctionArgs isAttrs setFunctionArgs + optionalAttrs attrNames filter elemAt concatStringsSep sort take length filterAttrs optionalString flip pathIsDirectory head pipe isDerivation listToAttrs mapAttrs seq flatten deepSeq warnIf isInOldestRelease extends ; + inherit (lib.strings) levenshtein levenshteinAtMost; in rec { @@ -198,7 +199,7 @@ rec { + "${loc'}${prettySuggestions (getSuggestions arg)}"; # Only show the error for the first missing argument - error = errorForArg missingArgs.${head (attrNames missingArgs)}; + error = errorForArg (head (attrNames missingArgs)); in if missingArgs == {} then makeOverridable f allArgs diff --git a/nixpkgs/lib/licenses.nix b/nixpkgs/lib/licenses.nix index 3bce847b03c4..baf92007123d 100644 --- a/nixpkgs/lib/licenses.nix +++ b/nixpkgs/lib/licenses.nix @@ -1068,6 +1068,12 @@ in mkLicense lset) ({ url = "https://github.com/thestk/stk/blob/master/LICENSE"; }; + sudo = { + shortName = "sudo"; + fullName = "Sudo License (ISC-style)"; + url = "https://www.sudo.ws/about/license/"; + }; + sustainableUse = { shortName = "sustainable"; fullName = "Sustainable Use License"; diff --git a/nixpkgs/lib/systems/default.nix b/nixpkgs/lib/systems/default.nix index 0d21175914a3..9eec21cbf21b 100644 --- a/nixpkgs/lib/systems/default.nix +++ b/nixpkgs/lib/systems/default.nix @@ -324,7 +324,8 @@ rec { "riscv64" = "riscv64gc"; }.${cpu.name} or cpu.name; vendor_ = final.rust.platform.vendor; - in rust.config + # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. + in args.rust.rustcTarget or args.rustc.config or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; # The name of the rust target if it is standard, or the json file |