Commit Graph

371 Commits

Author SHA1 Message Date
quantenzitrone
4934c0596f xkeyboard-config: improve license list
Previously I just set this to "free", however with
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/527
being resolved and https://github.com/spdx/license-list-XML/pull/2864
being merged this license is now a thing.
2025-11-09 20:22:54 +01:00
Jo
f255d72245 epeg: replace license with mit-enna (#458238) 2025-11-06 19:59:18 +00:00
Sandro Jäckel
4a540db6aa licenses: add mit-enna 2025-11-06 20:46:40 +01:00
Sandro Jäckel
8ea573926b licenses: add gnuplot 2025-11-03 22:52:43 +01:00
Wolfgang Walther
3e505de718 freeimage: drop
Very insecure.
2025-10-23 13:54:39 +02:00
nixpkgs-ci[bot]
fe3676c810 Merge master into staging-next 2025-10-18 06:05:29 +00:00
Connor Baker
4617867f58 intel-oneapi.{base,hpc}: init at 2025.2.1.44 (#448561) 2025-10-18 02:50:21 +00:00
Alexander Bantyev
66e2080e23 intel-oneapi.{base,hpc}: init at 2025.2.1.44
Introduces the two freeware Intel's OneApi toolkits.

The Intel® oneAPI Base Toolkit (Base Kit) is a core set of tools and
libraries for developing high-performance, data-centric applications
across diverse architectures. It features an industry-leading C++
compiler that implements SYCL*, an evolution of C++ for heterogeneous
computing.

Intel® oneAPI HPC Toolkit delivers what developers need to build,
analyze, optimize, and scale HPC (high-performance computing)
applications with the latest techniques in vectorization,
multithreading, multi-node parallelization, and memory optimization.

They are packaged from official "offline" installers, which require
some wrangling to get working due to their reliance on FHS. The
resulting libraries and tools seem to work fine without FHS.
2025-10-04 20:24:10 +04:00
dramforever
736ac3f69f Merge remote-tracking branch 'nixos/staging-next' into HEAD 2025-10-04 22:46:07 +08:00
nixpkgs-ci[bot]
45e7932c78 Merge master into staging-next 2025-10-04 12:05:54 +00:00
jopejoe1
3e8895f981 lib.licenses: add licenses used in nixpkgs 2025-09-28 18:47:20 +02:00
quantenzitrone
4c4fd26ced font-bitstream-type1: refactor, move to pkgs/by-name and rename from xorg.fontbitstreamtype1
the package output doesn't change
2025-09-23 22:50:27 +02:00
nixpkgs-ci[bot]
ca7f2a47c0 Merge staging-next into staging 2025-09-19 18:06:36 +00:00
Ihar Hrachyshka
97226ef7db licenses: add sissl11
This is Sun Industry Standard Source License 1.1:
https://opensource.org/license/sissl

It was voluntarily retired. Still, it's used in some projects.
Specifically, openvswitch ships some files under lib/sflow*[ch] under
this license.

This license will be added to both openvswitch and ovn packages (the
latter embeds openvswitch libraries, including sflow).
2025-09-19 11:54:51 -04:00
nixpkgs-ci[bot]
eea9839c6e Merge staging-next into staging 2025-09-14 00:17:55 +00:00
jopejoe1
4d56433d94 lib.licenses: some more cleanup (#439307) 2025-09-13 21:08:19 +00:00
jopejoe1
81da94fb58 licenses: add CNRI-Python, python313Packages.regex: fix homepage and license, set pyproject = true (#439748) 2025-09-04 14:31:11 +02:00
Sandro Jäckel
e3ffeb20ce licenses: add CNRI-Python 2025-09-03 02:13:08 +02:00
jopejoe1
33f92fb565 lib.licenses: replace qwt with qwtException 2025-09-01 21:40:13 +02:00
jopejoe1
7e3c021be1 lib.licenses: caossl rename to asl11
This is just the Apache-1.1 license so make use of it and not some random name
2025-09-01 19:28:03 +02:00
jopejoe1
e85bfdae29 lib.license: purdueBsd rename to lsof
spdx has marked this as lsof license
2025-09-01 19:12:19 +02:00
jopejoe1
d1d63d0dcf lib.licenses: drop in favor of bsd3Lbnl
This is the same license
2025-09-01 19:04:46 +02:00
nixpkgs-ci[bot]
28a77664bb Merge master into staging-next 2025-08-31 18:04:38 +00:00
jopejoe1
4cdf78c257 lib.licenses: drop gpl2Oss
Is not used anywhere in nixpkgs and is not in spdx
2025-08-31 16:19:22 +02:00
jopejoe1
e19ad622ae lib.licenses: replace gpl2UBDLPlus license with ubdlException 2025-08-31 16:19:22 +02:00
jopejoe1
61d0373a40 lib.licenses: replace classpath license with exception
The GPL-2.0-with-classpath-exception is deprecated in spdx and the exception Classpath-exception-2.0 should be used instead.
Other Classpath license hace also benn replaced with it.
2025-08-31 16:19:22 +02:00
jopejoe1
bb291395ec lib.licenses: replace wxWindows with wxWindowsException31
wxWindows git deprecated by spedx and got replaced with an exeption that needs to be combined with other licenses https://spdx.org/licenses/wxWindows.html
2025-08-31 16:19:22 +02:00
jopejoe1
ec03e1d46a lib.licenses: add missing spdxId's
also remove shortName and url from those
2025-08-31 16:19:22 +02:00
quantenzitrone
fea4046333 xkbutils: refactor and move to pkgs/by-name from xorg namespace 2025-08-29 15:21:30 +02:00
quantenzitrone
e21431a165 font-adobe-utopia-100dpi: refactor, move to pkgs/by-name and rename from xorg.fontadobeutopia100dpi
relevant changes:
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything
- font is now under the license adobeUtopia (recognised by SPDX) instead
  of unfreeRedistributable
2025-08-28 15:21:32 +02:00
Fabián Heredia Montiel
971840c5e0 Merge remote-tracking branch 'origin/master' into staging-next 2025-08-20 23:30:45 -06:00
quantenzitrone
dd9fa15dbf licenses.bsd3ClauseTso: rename and add spdxId
it got accepted and merged to spdx: https://github.com/spdx/license-list-XML/pull/2815
2025-08-21 05:24:42 +02:00
Zitrone
3c1d6186b0 libx11: refactor, move to pkgs/by-name and rename from xorg.libX11
refactorial changes:
- move `CPP` into `env`
- remove `sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure` because
  it didn't change anything other than the store paths in the resulting
  derivation (using `diff --recursive` (and `xxd` to diff binary files
  that changed))
- remove `xorg.buildPackages.libc.static` from `depsBuildBuild` since
  `xorg.buildPackages` doesn't exist (thus
  `xorg.buildPackages.libc.static or null` evaluating to `null`).
  Fixing that to `libc.static` (and moving it to `nativeBuildInputs`
  (where non-compiler deps belong)) actually broke the static build in
  a weird way i don't understand.
2025-07-31 10:33:30 +02:00
Zitrone
2298cf9994 xorgproto: refactor and move to pkgs/by-name from xorg namespace 2025-06-06 21:56:40 +02:00
jopejoe1
0b29af4760 xkeyboard-config, xtrans, xorg-{cf-files,docs,sgml-doctools}: refactor and move to pkgs/by-name from xorg namespace (#398391) 2025-05-28 20:58:05 +02:00
Zitrone
7e7e5721a6 xorg-docs: refactor, move to pkgs/by-name and rename from xorg.xorgdocs 2025-05-25 05:41:43 +02:00
Fernando Rodrigues
8d21ee745e licenses: add gpl2UBDLPlus
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
2025-05-13 16:49:21 +00:00
jopejoe1
13c1207a12 font-{alias,util}, gccmakedep, libp{ciacces,threadstub}s: refactor and migrate to pkgs/by-name from xorg namespace (#369520) 2025-04-24 19:11:58 +02:00
Zitrone
6638639684 font-util: refactored, moved to pkgs/by-name and renamed from xorg.fontutil 2025-04-22 19:46:53 +02:00
Zitrone
5d15a3d718 font-alias: refactored, moved to pkgs/by-name and renamed from xorg.fontalias 2025-04-22 19:46:52 +02:00
samfundev
62f3255cd8 lib/licenses: add sfl 2025-04-03 21:37:32 -04:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Hugo Herter
fa165c6452 lib/licenses: add aml
Add the "Appple MIT License", also known as
"Apple-Sample-Code-License".

Quoting the Fedora wiki:
> This is Apple's variant of MIT. They've added wording around patents,
> which is why it gets it own shortname. Apple did not give this license
> a name, so we've named it "Apple MIT License".
> It is free and GPL compatible.

References:
- https://developer.apple.com/support/downloads/terms/apple-sample-code/Apple-Sample-Code-License.pdf
- https://spdx.org/licenses/AML.html
- https://fedoraproject.org/wiki/Licensing/Apple_MIT_License
2025-03-28 11:02:49 +01:00
nikstur
02843300bb lib.licenses.asl20-llvm: replace with separate llvm-exception
This essentially reverts 7ce8e7c4cf

asl20-llvm does not produce a valid SPDX ID, it produces a valid SPDX
Expression. However, this is not what the spdxId field promises.

This is relevant because we cannot produce valid SBOMs (e.g. CycloneDX)
using this field as the schemas for these SBOMs check that the IDs are
valid.

This change leaves us with consistently valid SPDX IDs at the cost
of slightly less convenience.
2025-03-17 13:05:21 +01:00
sanana
8e1e15cf11 lib/licenses: add bsdAxisNoDisclaimerUnmodified
This is a variant composed of clause 1 and 3 of a BSD-Modified found in the
Linux kernel and this extra variant has the words "without modification" added
at the end of clause 1 either with or without a comma. It also lacks the
warranty disclaimer.

See <https://scancode-licensedb.aboutcode.org/bsd-no-disclaimer-unmodified.html>.
2025-03-16 14:22:00 +03:00
Johannes Kirschbauer
88f912da48 Docs: migrate format of comments to doc-comments 2025-02-12 15:01:43 +07:00
Gutyina Gergő
547acecdf3 teamspeak5_client: 5.0.0-beta77 -> 6.0.0-beta2; teamspeak refactors (#377748)
* teamspeak5_client: 5.0.0-beta77 -> 6.0.0-beta2, rename to teamspeak-6-client

* teamspeak6-client: refactor

* lib.licenses: add teamspeak license

* teamspeak{3,_server,6-client}: use teamspeak license

* teamspeak{6-client,_server}: move to pkgs/by-name

* teamspeak_server: fix meta.platforms

* teamspeak6-client: add update script
2025-02-07 20:33:09 +01:00
Chandler Swift
96a405932d lib/licenses: fix lens license URL 2024-11-30 21:29:17 -06:00
jopejoe1
18d463bbd5 lib/licenses: add missing spdxId and remove urls from licenses that have a spdxId (#340360) 2024-11-15 10:33:31 +01:00
github-actions[bot]
b3a71c7e0d Merge master into staging-next 2024-11-13 18:04:17 +00:00