Commit Graph

4108 Commits

Author SHA1 Message Date
Silvan Mosberger
7954f9dfc0
Merge pull request #333953 from mibmo/spdx-license-mapping
lib.meta.licensesSpdx: mapping from SPDX ID to compatible licenses
2024-08-25 15:44:18 +02:00
Silvan Mosberger
f55a4b99ef lib.meta: Minor SPDX license function improvements
- Expose `lib.licensesSpdx`
- Create bindings for the needed internal functions
- Mention that some SPDX licenses might be missing (in the future I hope
  we can autogenerate the Nixpkgs license list from some SPDX endpoint
2024-08-25 00:57:44 +02:00
Sandro
771c5644e8
Merge pull request #333915 from jopejoe1/license
lib/licenses: some corrections
2024-08-24 12:39:30 +02:00
Silvan Mosberger
0606893752
Merge pull request #335139 from MattSturgeon/types_docref
lib/types: update reference to docs
2024-08-19 16:20:50 +02:00
Artturin
c9270f6274
Merge pull request #329964 from Artturin/androidrenamesdk
treewide: Rename android `sdkVer` and `ndkVer`
2024-08-17 19:22:42 +03:00
Jörg Thalheim
0f11a0a752
Merge pull request #335311 from kakkun61/fix-markup
lib/customisation.nix: fix markup
2024-08-17 12:20:31 +02:00
Kazuki Okamoto
55eedcc6dc
just fix markup 2024-08-17 16:47:58 +09:00
Salar Rahmanian
07e989a55c vscode-extensions.databricks.databricks: init at 2.3.1 2024-08-16 23:32:01 -07:00
Matt Sturgeon
f1cd097be2
lib/types: update reference to docs
The XML docs have been migrated to markdown since bfd21cd2c1
2024-08-16 16:09:15 +01:00
mib
d04697aee8 lib.meta.licensesSpdx: mapping from SPDX ID to licenses 2024-08-15 00:47:57 +02:00
Silvan Mosberger
ef23c7da7a
Merge pull request #334117 from hercules-ci/test-modules-report-location 2024-08-12 15:10:42 +02:00
Robert Hensing
7f838d4c54 lib/tests/modules.sh: Improve failure log format
- Clear separation between failures
- Move error regex close to error message, which is at the bottom
  of a fairly long trace
- Move most relevant and consistent info to bottom of terminal:
  the location of the failure.
  Some editors including vscode heuristically resolve file paths
  on Ctrl+click.
- Less wordy - easy to glance
- Capitalized prefixes to distinguish from Nix's own logging
2024-08-12 13:48:25 +02:00
Robert Hensing
6fa24da815 lib/tests/modules.sh: Add loc <depth> optional parameter 2024-08-12 13:47:41 +02:00
Robert Hensing
c516c03bf4 lib/tests/modules.sh: Do not redirect diagnostics to stdout
It still prints its own diagnostics to stdout, but it's always done that.
2024-08-12 13:47:36 +02:00
Robert Hensing
8a6c85d886 lib/tests/modules.sh: Report failure source location 2024-08-12 13:46:38 +02:00
jopejoe1
fddb874f91 lib/licenses: remove incorrect comment about mit and x11
Spdx has a diffrent id for both and so do we!
2024-08-11 17:44:59 +02:00
jopejoe1
67327ada9b lib/licenses: remove libssh2 equivalent to bsd3 2024-08-11 17:44:59 +02:00
jopejoe1
0984590b4e lib/licenses: correct zsh to mit-modern 2024-08-11 17:44:58 +02:00
jopejoe1
c178b444fa lib/licenses: busl add spdxid 2024-08-11 14:52:44 +02:00
Tristan Ross
527de075a3 lib.systems: mark windows as having shared libs 2024-08-10 08:34:57 +02:00
Sandro
57d330a1b1
Merge pull request #307683 from RobWalt/radiance 2024-07-31 13:22:24 +02:00
Johannes Kirschbauer
aba0f17b5a
Doc: migrate lib.strings to commonmark 2024-07-27 14:39:31 +02:00
Sigmanificient
6dd44107ac treewide: remove unused lib (and other) arguments 2024-07-26 11:18:09 +02:00
Silvan Mosberger
60027e7836 lib.trimWith: Minor doc improvements 2024-07-26 01:16:49 +02:00
Silvan Mosberger
91a3ba9064
Merge pull request #315411 from MattSturgeon/trim
lib.strings: add `trim` and `trimWith`
2024-07-26 01:13:31 +02:00
Peder Bergebakken Sundt
99dec1f6b0 treewide: fix doc typos
Done with `fd \\\.md$ . --type f -x typos --write-changes`
2024-07-26 00:55:13 +02:00
Matt Sturgeon
aad87c2aa8
lib.strings: add trim and trimWith
`strings.trim` returns a copy of the string with all leading and trailing
whitespace removed.

`strings.trimWith` does the same thing, but calling code can decide
whether to trim the start and/or end of the string.
2024-07-25 23:43:33 +01:00
Artturin
35e5943d69 lib.systems: throw if sdkVer or ndkVer are used for android.
Those attrs have been renamed and throwing is the best way to show it,
if we only warned then the user would only get an error like this `error: Unsupported sdk: 33`
from `pkgs/top-level/darwin-packages.nix`.

If someone wants to support multiple NixOS versions then they can simply
set both attrs. (`!args ? androidSdkVersion` is for that)
2024-07-25 23:49:18 +03:00
Silvan Mosberger
7c6692836e
Merge pull request #149990 from ShamrockLee/lib-spdx-license 2024-07-25 22:27:10 +02:00
Artturin
1144d46f95 treewide: Rename android sdkVer and ndkVer
`sdkVer` conflicts with the old `sdkVer`(now `darwinSdkVersion` but that still uses `sdkVer` if set) used by darwin

This shouldn't be an issue but due to `pkgs/development/interpreters/python/cpython/default.nix`
running `lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun")` on it's inputs (2 of them are darwin only)
the `throw "Unsupported sdk...` in `pkgs/top-level/darwin-packages.nix` will be triggered.

After this change `pkgsCross.armv7a-android-prebuilt.python3.pythonOnBuildForHost` won't fail with
`error: Unsupported sdk: 33`

Issue was bisected to 3cb23cec23
2024-07-25 22:08:49 +03:00
Silvan Mosberger
473e469d5a
Merge pull request #328381 from tie/map-attrs-flatten 2024-07-24 13:32:34 +02:00
Ivan Trubach
b9c51260d0 lib/deprecated: print deprecation warning for mapAttrsFlatten 2024-07-24 13:23:16 +03:00
Jörg Thalheim
afe8fbf038
Merge pull request #328582 from rhelmot/freebsd-stdenv
FreeBSD stdenv: re-init
2024-07-24 06:43:35 +02:00
Someone
03b1a46b7d
Merge pull request #325384 from adisbladis/lib-licenses-factory-func
lib.licenses: refactor internal mkLicense to avoid future typo bugs
2024-07-24 04:26:37 +03:00
Robert Hensing
db77328e33
Merge pull request #306481 from hercules-ci/lib-builtins-warn
lib.warn: Use or behave like builtins.warn
2024-07-23 13:41:03 +02:00
Robert Hensing
bc556c5686 lib.warn: Update docs
- Bring up to date
- Give meaning to the metavariables
- Use italics for metavariables (just like the Nix manual)
- Don't abbreviate
  - No hard feelings, Val.
2024-07-23 12:48:01 +02:00
Someone Serge
98384afab5 lib: add getStatic 2024-07-21 11:38:04 +00:00
Someone Serge
76db6ba81a lib: reflect effective signatures of getOutput functions 2024-07-21 11:37:38 +00:00
Someone Serge
744305bce4 lib: add getOutput', a nix-lang counterpart of _overrideFirst 2024-07-21 11:29:23 +00:00
Audrey Dutcher
1e2071847d stdenv/freebsd: reinit
The old stdenv didn't work, and was also impure. The new one works, and
is pure. Presently, the bootstrap tools are cross compiled into one small
nar and one large tar, which is then unpacked, patched, and split into
smaller derivations. Efforts were made to make the boot process as short
as possible - there are only two clangs built, and as many packages are
propagated between stages as possible while leaving the bootstrap tools
out of the final stdenv's closure.
2024-07-19 21:32:05 -07:00
Ivan Trubach
a13e0a12b7 lib/deprecated: alias mapAttrsFlatten to mapAttrsToList
These functions have identical implementation except for argument names.
2024-07-19 11:39:27 +03:00
Nikolay Korotkiy
c35032a3c9
Merge pull request #323143 from tsandrini/init-mqtt-explorer
mqtt-explorer: init at 0.4.0-beta.6
2024-07-18 22:32:02 +04:00
tsandrini
dd09495f64
lib/licenses: add cc-by-nd-40 2024-07-18 09:34:48 +02:00
Robert Hensing
7d4a9a5772 lib.warn: Remove color from the message itself
This aligns with Nix and makes it more readable.
The prefix still stands out.
2024-07-16 15:56:01 +02:00
Robert Hensing
f621ab9204 lib.warn: Fix color
Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
2024-07-16 15:54:12 +02:00
Janik
c20399ea2e
Merge pull request #318712 from woojiq/lib-network-ipv6-parser
lib.network: add ipv6 parser
2024-07-11 20:57:53 +02:00
aviac
e9bbad7386
lib/licenses: add radiance 2024-07-08 16:13:03 +02:00
Florian Klink
5d7f58fdd6
Merge pull request #324861 from Kranzes/crate2nix
lib.systems: Fix setting rust.platform.os for wasm32-unknown-unknown
2024-07-08 15:27:29 +03:00
adisbladis
b85639c589 lib.licenses: refactor internal mkLicense to avoid future typo bugs
This is a follow-up to https://github.com/NixOS/nixpkgs/pull/325380 where @emilazy discovered that we have some typos in field names.

This refactoring wraps the implicit lib.licenses schema up in a factory function to ensure consistency.

While a more proper type checker like the one we use for meta checks would be better I didn't want to depend on that in more places.
In fact, we might want to make meta type checks more strict on the license field.
2024-07-08 17:37:52 +12:00
Emily
3cd5ecc1a9 lib/licenses: fix field names 2024-07-08 00:46:05 +01:00