Commit Graph

2718 Commits

Author SHA1 Message Date
Sandro
67f4868a43
Merge pull request #233422 from mdarocha/crossgen-fix
buildDotnetModule: support ReadyToRun and native binaries inside nuget files
2023-06-22 22:26:53 +02:00
Thomas Gerbet
84c0cb1471 php: drop PHP 8.0
Closes #224505
2023-06-21 22:09:16 +02:00
mdarocha
c51141d997 buildDotnetModule: pass runtimeId whenever possible and disable trimming when not allowed.
This fixes up some build errors
2023-06-21 17:06:30 +02:00
github-actions[bot]
260df62919
Merge master into haskell-updates 2023-06-21 00:13:19 +00:00
mdarocha
0d9142d4df buildDotnetGlobalTool: document dotnet global tools and their packaging 2023-06-20 17:20:52 +02:00
mdarocha
abf6081bc2 buildDotnetModule: add useDotnetFromEnv option
This causes an alternative wrapper to be used, that takes the dotnet
runtime from the environment.
2023-06-20 17:20:51 +02:00
github-actions[bot]
efc10371d5
Merge master into haskell-updates 2023-06-16 00:13:24 +00:00
Emery Hemingway
17984299b9 buildNimPackage: doCheck by default 2023-06-14 15:15:21 +01:00
sternenseemann
7d0a1bdb8f Merge remote-tracking branch 'origin/master' into haskell-updates 2023-06-14 14:28:38 +02:00
Emery Hemingway
077d8a3447 buildNimPackage: refactor to use overlay-style overrideAttrs
Make buildNimPackage cleaner and more efficient. Also encourage
the use of a "buildNimPackage (finalAttrs: {…})" pattern.
2023-06-14 12:13:49 +01:00
github-actions[bot]
55843b9385
Merge master into haskell-updates 2023-06-14 00:13:02 +00:00
maralorn
b37b2d4b09
Merge pull request #237028 from maralorn/separate-bin
haskellPackages: Use separate bin output for multiple packages
2023-06-13 16:50:11 +02:00
Valentin Gagarin
b4b928466a
Merge pull request #237068 from pennae/manual-normalization 2023-06-13 07:35:06 +02:00
Valentin Gagarin
dc1a594b3e
Merge pull request #237237 from pennae/epubstub 2023-06-12 22:24:38 +02:00
pennae
c415521d63 doc: stub out epub manual
same reasoning as for the nixos manual.
2023-06-12 17:50:52 +02:00
Lele Gaifax
06375c5962 doc/languages-frameworks/python: add missing back quote 2023-06-12 16:21:11 +02:00
maralorn
fc3668a3ab
haskellPackages: Use separate bin output for multiple packages 2023-06-11 19:40:28 +02:00
Lucas Eduardo
9401a0c780
doc/contributing/review-contributions: fix small typo (#237186)
Signed-off-by: lucasew <lucas59356@gmail.com>
2023-06-11 14:54:35 +02:00
Andrew
1b6f640687
doc: correct typos and spelling (#237098) 2023-06-11 02:15:43 +02:00
pennae
2f76a3df64 doc: don't use docbook program listings/callouts
nixos-render-docs does not support this, and since the examples are
small there isn't that much value in callouts here. change them to
simple MD code blocks and lists instead.
2023-06-10 18:17:05 +02:00
pennae
2ecc93d6fe doc: normalize markdown for nixos-render-docs
pandoc recognizes `::: note` admonitions, nixos-render-docs only
recognizes `::: {.note}`. surprisingly pandoc also emits the correct
docbook tags for `[](#xref)`s, so we can use that too.
2023-06-10 18:17:05 +02:00
pennae
e42a5c78e7 doc: make sure section depths are consecutive
skipping heading levels (eg from # to ###, or starting at ###) is legal
in pandoc, but not in nixos-render-docs. pandoc acts as though section
levels *were* consecutive, nixos-render-docs prefers to tell people not
to do that kind of thing because it can make documents more fragile.
2023-06-10 18:17:04 +02:00
pennae
830f5b33dd doc: add missing section IDs 2023-06-10 18:17:04 +02:00
7c6f434c
e4d2ceab3d
Merge pull request #234201 from 7c6f434c/fix-untagged-version
coding-conventions: include the preceding upstream version
2023-06-08 14:36:01 +00:00
Basile Clément
66f57b6c18
Improve fetchFromGitLab manual (#236111)
* doc/builders: update fetchers documentation

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-06-07 10:51:48 +02:00
Julian Arni
858583a958
doc/language-frameworks/haskell: fix argument order of setBuildTargets (#236252) 2023-06-06 18:28:23 +02:00
figsoda
2bfb2f045a pypi2nix: remove
It has been broken since 2021 and upstream has been archived
2023-06-03 16:44:43 +02:00
Michael Raskin
5b90f7a6a9 coding-conventions: include the preceding upstream version when packaging a commit without a version attached 2023-06-02 13:27:25 +02:00
Alyssa Ross
caa0a24ab0 doc: clarify that meta.timeout is only for Hydra
I read this and expected it to be a timeout that was always applied
when building the derivation, but it's actually a Hydra-specific
thing.
2023-05-30 10:27:44 +00:00
github-actions[bot]
53e76520b9
Merge master into haskell-updates 2023-05-28 00:14:04 +00:00
Yueh-Shun Li
48c5962048 doc/language-frameworks/go.section.md: fix spelling
Change "platform dependant" to "platform-dependent"

The word "dependant" (with suffix -ant) is used as a noun
in British English, while the adjetive is "dependent" (-ent).
Both are "dependent" in American English.

Reference:
https://www.merriam-webster.com/words-at-play/spelling-variants-dependent-vs-dependant
https://dictionary.cambridge.org/dictionary/english/dependant
2023-05-28 07:50:02 +10:00
github-actions[bot]
490b8d0c9a
Merge master into haskell-updates 2023-05-27 00:13:30 +00:00
Rebecca Turner
ec2938bfa5
Document incremental build support for Haskell 2023-05-25 14:36:18 -07:00
Rebecca Turner
33258207fa
maintainers: Gabriel439 -> Gabriella439 2023-05-25 14:35:51 -07:00
Connor Baker
222d966273 cudaPackages.cudnn: remove patch version from name to conform with cudaPackages standard 2023-05-24 12:56:22 -04:00
Atemu
3009b12817 doc:fhs-envs: reword 2023-05-22 11:34:04 -03:00
Atemu
e57efc6cb7 doc:fhs-envs: format example properly
That sort of formatting wouldn't be accepted into Nixpkgs. We shouldn't format
an example like that.
2023-05-22 11:34:04 -03:00
Atemu
8912c50fc7 doc:fhs-envs: mention that runScript must be escaped by the caller 2023-05-22 11:34:04 -03:00
figsoda
999652eb33 doc/python: remove usages of fetchPypi aliases 2023-05-21 11:28:13 -04:00
Nicolas Benes
142c24711e doc: fix typo 2023-05-20 22:09:52 +02:00
Martin Weinelt
b0a993e6ba
Merge pull request #232594 from mweinelt/python-docs
doc/languages-frameworks/python: update formatting and interpreters
2023-05-20 21:02:31 +02:00
Martin Weinelt
35650d8be3
doc/languages-frameworks/python: update formatting and interpreters
Updates all interpreter references with 3.10/3.11, which are the
current version, that we recurse into for their package set.

Update all code examples with an explicit `format` and expand lists
with multiple items as we do in the python package set. Also set
`pythonImportsCheck` where tests are disabled.
2023-05-20 03:31:35 +02:00
Jan Tojnar
8bf1967964 doc/stdenv/Dependencies: fix inference rule var name
t0 is mentioned in the conclusion so we cannot use placeholder in the premise.
2023-05-18 18:10:10 +02:00
Alyssa Ross
5e06b3cb19 treewide: don't use rustPlatform.rust
This will be deprecated in the next commit.
2023-05-12 15:31:21 +00:00
Jacek Galowicz
cc8e4ed375
Merge pull request #225313 from hercules-ci/testers-runNixOSTest
testers.runNixOSTest: init
2023-05-12 16:04:26 +02:00
Kira Bruneau
d4652d33d6
Merge pull request #229770 from Misterio77/init-buildDartPackage
buildDartApplication: init
2023-05-11 14:43:20 -04:00
Robert Hensing
ac1134f321 testers.runNixOSTest: init
An up to date alternative to pkgs.nixosTest
2023-05-11 19:12:07 +02:00
Weijia Wang
ee5b4b9d52
Merge pull request #231112 from farnoy/shortenPerlShebangs-manual-buildInputs
doc: update shortenPerlShebang example to use nativeBuildInputs
2023-05-10 22:38:11 +03:00
Hraban Luyat
7282c4012d docs: typo in cuda docs, forgot a colon (:) 2023-05-10 14:32:27 -04:00
Jakub Okoński
9948a0d6c9
doc: update shortenPerlShebang example to use nativeBuildInputs 2023-05-10 18:34:17 +02:00
Robert Hensing
216315c6c4
Merge pull request #197547 from hercules-ci/module-class-and-flake-import
module system: Improve error messages around faulty imports
2023-05-06 20:16:34 +02:00
figsoda
955f4f6512
Merge pull request #230177 from SuperSandro2000/lib-fromJSON-2
treewide: switch builtins.fromJSON(builtins.readFile ./file.json) to …
2023-05-06 14:12:43 -04:00
Robert Hensing
eab660d91e lib.modules: configurationClass -> class
This simplifies the documentation. `configuration` is implied by `_type`.
2023-05-06 18:32:59 +02:00
Robert Hensing
89491bef8d lib.modules: in evalModules return move _module.class -> configurationClass 2023-05-06 18:32:59 +02:00
Robert Hensing
4c7aa7d831 doc/module-system: _module is not internal 2023-05-06 18:32:59 +02:00
Robert Hensing
fd88c79418 lib.modules: Change class declaration in module to _class 2023-05-06 18:32:59 +02:00
Robert Hensing
8054785157 lib/modules: Move class out of specialArgs 2023-05-06 18:32:58 +02:00
Robert Hensing
8f02e95aff module-system.chapter.md: Elaborate on extendModules performance 2023-05-06 18:32:58 +02:00
Robert Hensing
5fac39307d module-system.chapter.md: Add mental model to type and extendModules 2023-05-06 18:32:58 +02:00
Robert Hensing
03a465f048 fixup! doc: Add Module System chapter start 2023-05-06 18:32:12 +02:00
Robert Hensing
ee1e14be0c doc: Add Module System chapter start 2023-05-06 18:29:05 +02:00
Robert Hensing
79703eef08 nixos,nixpkgs: Add module classes
This allows modules that declare their class to be checked.
While that's not most user modules, frameworks can take advantage
of this by setting declaring the module class for their users.
That way, the mistake of importing a module into the wrong hierarchy
can be reported more clearly in some cases.
2023-05-06 18:29:04 +02:00
Sandro Jäckel
00000001b4
treewide: switch builtins.fromJSON(builtins.readFile ./file.json) to lib.importJSON ./file.json #2 2023-05-06 16:20:13 +02:00
Et7f3
caf436a52b ocamlPackages.buildDunePackage: deprecate useDune2 2023-05-06 08:11:25 +02:00
Gabriel Fontes
d161ef5631
buildFlutterApplication: add docs 2023-05-05 13:32:50 -03:00
Gabriel Fontes
782c8b44dd
buildDartApplication: init
This adds a function for easily packaging non-flutter dart apps.
2023-05-05 13:32:45 -03:00
Adam Joseph
ed312cb4f7
doc/default.nix: make the manual build on more than one core (#225921)
* doc/default.nix: make the manual build on more than one core

Let's build the manual with more than one core.  Maybe people will take better care of it now that it is less painful to build.
2023-04-25 14:37:50 +02:00
Sandro Jäckel
aad577bd30 nodejs*: normalise names to better fit other packages
Versioned package attributes are usually named like $pname_$version
eg: nodejs-14_x -> nodejs_14
2023-04-25 11:28:17 +02:00
Adam Joseph
372e0f8efc
doc/stdenv/meta.chapter.md: document meta.badPlatforms (#225276)
* doc/stdenv/meta.chapter.md: document meta.badPlatforms

We don't have any documentation for the `meta.badPlatforms` attribute.

This commit adds documentation for it.
2023-04-24 10:06:50 +02:00
Adam Joseph
8669061b61
Merge pull request #225272 from amjoseph-nixpkgs/pr/docs/broken-vs-badPlatforms
doc/stdenv/meta.chapter.md: explain difference between broken and badPlatforms
2023-04-24 05:09:01 +00:00
Adam Joseph
75bbbbd39b remove trailing whitespace 2023-04-23 21:32:40 -07:00
Adam Joseph
401430319c
Update doc/stdenv/meta.chapter.md
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-04-24 04:31:38 +00:00
Adam Joseph
467ee31e58
Update doc/stdenv/meta.chapter.md
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-04-24 04:30:37 +00:00
sternenseemann
2fe11e6fee haskell.compiler.ghc94: 9.4.4 -> 9.4.5
https://www.haskell.org/ghc/blog/20230418-ghc-9.4.5-released.html
2023-04-22 17:47:11 +02:00
Doron Behar
a82c8611ce
buildGoModule: don't inherit build hooks when building go-modules (#225349)
* buildGoModule: don't inherit postBuild hook when building go-modules

This is a slight revert of 5ce647b8bf
(#212800).

Inheriting these hooks in the `.go-modules` derivation can be confusing:
One doesn't expect them to run when generating the fixed output modules
derivation, but only on the main derivation. A `postBuild` hook that
adds some files to $out will cause a very hard to debug issue[1].

This commit adds support for a dedicated `modPostBuild` hook that will
be used only by the derivation building `.go-modules`. Additionally,
`go.section.md` now explains these attributes behavior better.

[1]:
https://discourse.nixos.org/t/cant-update-a-go-package-getting-go-inconsistent-vendoring/27063/6

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-04-22 11:08:54 +10:00
Atemu
445ef28548
Merge pull request #225748 from Atemu/buildFHSEnvBubblewrap-by-default
buildFHSEnv: use bubblewrap by default
2023-04-16 13:03:36 +02:00
Atemu
f63a12f296 tree-wide: buildFHSUserEnv -> buildFHSEnv 2023-04-16 10:15:13 +02:00
gilice
5d20d9ff9f doc/stdenv: don't use name in examples, highlight preferring pname 2023-04-15 16:06:29 +02:00
Matthieu Coudron
351cec5db3
use subcommands in plugin updaters (#223164)
* update.py: introduce subparsers for plugin updaters

This is preliminary work to help create more powerful plugin updaters.
Namely I would like to be able to "just add" plugins without refreshing
the older ones (helpful when github temporarily removes a user from
github due to automated bot detection).

Also concerning the lua updater, we pin some of the dependencies, and I
would like to be able to unpin the package without editing the csv
(coming in later PRs).

* doc/updaters: update command to update editor plugins

including vim, kakoune and lua packages

Co-authored-by: figsoda
2023-04-14 22:02:17 +02:00
Andrew Morgan
a95ed9fe76
Fix a small typo in the manual
environements -> environments
2023-04-14 17:11:13 +01:00
Silvan Mosberger
83c76b9237
Merge pull request #226057 from tweag/fix-function-location-revision
doc: Fix the function locations always pointing to master
2023-04-14 17:17:46 +02:00
Valentin Gagarin
18ffde7567
Merge pull request #197247 from kip93/vmTools-docs
Documentation: add vmTools
2023-04-14 00:30:10 +02:00
Adam Joseph
756e220e1e doc/.gitignore: add media
These files are generated when you run `nix-shell --command make`
and are likely to be committed by accident.  Let's help people avoid
that.
2023-04-13 12:24:04 -07:00
Silvan Mosberger
019fd45537 doc: Fix the function locations always pointing to master
Instead of revisions as they should. This is (most-likely) caused by a
simple typo, because Hydra is where the revision should come from, but
it doesn't set `.revision` as the attribute, but rather `.rev`!
2023-04-13 20:33:39 +02:00
Adam Joseph
19d48a9257 doc/stdenv/meta.chapter.md: explain difference between broken and badPlatforms
There has been a longstanding ambiguity between `broken` and
`badPlatforms`, which seem to serve overlapping purposes.

This commit adds to the documentation two examples of constraints
which cannot be expressed by `platforms` and `badPlatforms`.

This commit also mentions `NIXPKGS_ALLOW_BROKEN=1` for overriding
`broken`.
2023-04-11 13:21:51 -07:00
geri1701
8cbf65ece9
Fix typo in coding-conventions.chapter.md 2023-04-11 21:05:56 +02:00
Dmitry Kalinkin
df3bf8ff76
Merge pull request #218331 from xworld21/texlive-new-dependency-resolution
texlive.combine: move dependencies to attribute tlDeps, resolve them …
2023-04-09 23:59:45 -04:00
Leandro Emmanuel Reina Kiperman
a6c19474bd Update vmTools docs after rebase 2023-04-10 00:43:31 +02:00
Leandro Reina
6c4d780599 Remove unused reference 2023-04-09 21:56:55 +02:00
Leandro Reina
0eff947d0b doc: add vmTools 2023-04-09 21:55:50 +02:00
Geraint Ballinger
8b2521bdae
nixos/darwin-builder: add disk space options (#224480) 2023-04-07 05:10:49 +02:00
figsoda
e7e93bd709 docs/rust: prefer ln -s over cp 2023-04-04 21:21:28 -04:00
7c6f434c
8ce248a734
Merge pull request #218870 from Uthar/lisp2
lisp-modules: replace with an implementation based on github:uthar/nix-cl
2023-04-03 06:00:48 +00:00
Vincenzo Mantova
57b2634ac1 texlive.combine: document how to create custom packages with pkgs and tlDeps attributes 2023-04-02 13:00:52 +01:00
ajs124
800426cf64
Merge pull request #222422 from mdarocha/remove-dotnet-3
dotnet-sdk_3: remove
2023-03-29 16:13:25 +02:00
Kasper Gałkowski
9a26e2dea9 merge master 2023-03-28 19:43:40 +02:00
pennae
052bb41410 doc: assign ids to many headings
without stable ids on headings we cannot generate stable links to these
headings. nrd complains about this, but the current docbook workflow
does not.

a few generated ids remain, mostly in examples and footnotes. most of
the examples are generated by nixdoc (which has since gained MD export
functions, and the MD export does generate IDs).
2023-03-27 22:39:11 +02:00
mdarocha
43f7cc0df7 dotnet-sdk_3: remove
Also remove all reference to outdated .NET versions.
2023-03-26 14:24:49 +02:00
Yureka
f3a1640e49 docs/rust: add note about git dependencies 2023-03-26 01:52:04 +01:00
superherointj
441cbfcfd2 erlang: normalize version name 2023-03-21 16:12:05 -04:00
Kasper Gałkowski
fdabf61974 lisp-modules: manual: add self links 2023-03-21 19:38:26 +01:00
Valentin Gagarin
99c5413961
Merge pull request #200951 from jtojnar/docs-update-script-commit-feature
docs/stdenv: Document updateScript features
2023-03-21 12:50:35 +01:00
Jan Tojnar
90074803e6 docs/stdenv: Document updateScript features
This was removed in c1b05442ff
for stabilization but it has worked quite well.
2023-03-21 11:59:08 +01:00
Jan Tojnar
d0e8c7087d docs/stdenv: Document updateScript execution 2023-03-21 11:59:08 +01:00
superherointj
1f24ebb428 elixir-ls: rename elixir_ls to elixir-ls 2023-03-20 17:57:35 -04:00
mdarocha
d093086a2b buildDotnetModule: add support for using combinePackages as dotnet-sdk
This allows packages that require several dotnet versions to build (like
BeatSaberModManager) to properly depend on the dotnet-sdk specific deps.
This in turns avoids having to regenerate the deps of those packages
after each dotnet-sdk update.

This also changes nuget-to-nix to accept a file with a list of
exclusions instead of a folder.
2023-03-19 20:53:39 +01:00
Adam Joseph
812b74cf0b
Merge pull request #187919 from amjoseph-nixpkgs/pr/manual/rust/buildRustX
doc/../rust.section.md: fix incorrect header depths
2023-03-19 09:30:14 +00:00
Adam Joseph
e369d78b70 remove references to crate2nix other than a link to its docs 2023-03-17 12:13:13 -07:00
Adam Joseph
618d8e6a62
Update doc/languages-frameworks/rust.section.md
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2023-03-17 19:10:15 +00:00
Adam Joseph
4716768513
Update doc/languages-frameworks/rust.section.md
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2023-03-17 19:09:50 +00:00
Bernardo Meurer
bae66663b2
Merge pull request #221645 from raboof/doc-stdenv-add-quotes-for-phases-with-newlines 2023-03-17 13:14:43 -03:00
Arnout Engelen
8ad8f9d266
doc/stdenv: add quotes to run phases with newlines
Without quotes newlines in environment variables get converted to spaces,
so any overridden phases would not work.
2023-03-17 13:30:57 +01:00
Adam Joseph
50f57ac692 doc/../rust.section.md: fix incorrect header depths
The headings for the Rust section are structured incorrectly in two ways:

1. The section "Compiling non-Rust packages that include Rust code" is totally specific to `buildRustPackage`.  It should be a child of the "Compiling Rust applications with Cargo" section.
1. The section "Setting up `nix-shell`" is totally specific to `buildRustCrate`.  It should be a child of the "Compiling Rust crates using Nix instead of Cargo" section.

- Rust
  - Compiling Rust applications with Cargo
    - ...
  - Compiling non-Rust packages that include Rust code
    - ...
  - Compiling Rust crates using Nix instead of Cargo
    - ...
  - Setting Up `nix-shell`
    - ...

- Rust
  - Compiling Rust applications with Cargo
    - ...
    - Compiling non-Rust packages that include Rust code
      - ...
  - Compiling Rust crates using Nix instead of Cargo
    - ...
    - Setting Up `nix-shell`
      - ...
2023-03-15 19:42:54 -07:00
Adam Joseph
efbbdc16e6 Revert "carnix,cratesIO: remove" in doc/languages-frameworks/rust.section.md
This reverts the part of commit
82fe76d1cd that affected
doc/languages-frameworks/rust.section.md
2023-03-15 19:41:48 -07:00
Kasper Gałkowski
e5eb0322a2 merge master 2023-03-14 17:07:39 +01:00
Martin Weinelt
bb14c4255b Merge remote-tracking branch 'origin/master' into staging-next 2023-03-13 17:14:19 +00:00
Vladimír Čunát
1dd94ad62f
Merge branch 'master' into staging-next 2023-03-12 09:06:28 +01:00
github-actions[bot]
f2032fa12b
Merge master into haskell-updates 2023-03-12 00:13:51 +00:00
Alyssa Ross
e636a55c15 doc: document fetchpatch's decode argument 2023-03-11 21:39:29 +00:00
Kasper Gałkowski
dae0dca5d1 lisp-modules: second version of wrapLisp
The previous approach of trying to make both the `override` mechanism from
`mkDerivation` and the `overrideScope'` mechanism from `newScope` work together
resulted in hard to understand code, and there was a bug where once overridden
packages would lose the changes on next override with `packageOverrides`.

It's not ideal still, because Lisps created by `mkDerivation` will lose their
`pkgs` after using `override`.
2023-03-11 19:09:25 +01:00
Kasper Gałkowski
84eea85ad9 lisp-modules: use wrapLisp to wrap Lisps
The previous approach of manually repeating a complex pattern inside Common Lisp
implementation package declarations was fragile and hard to change. After
reading python and lua modules code in Nixpkgs, I was able to come up with
something better.

The function `wrapLisp` doesn't need to be inside package declarations so all
the code for wrapping Lisps can be in `all-packages.nix`.

This works by wrapping the `override` function created from `mkDerivation` to
accept a new argument `packageOverrides`.

One problem with this is that `override.__functionArgs` disappears. But one can
look at the source code of a package to discover what can be overridden.
2023-03-11 15:11:38 +01:00
Kasper Gałkowski
a0bdaf345b lisp-modules: replace "_" in package names with "__" for reversibility 2023-03-10 20:10:39 +01:00
github-actions[bot]
4bda2ab514
Merge master into haskell-updates 2023-03-09 00:13:40 +00:00
github-actions[bot]
7072ae38b6
Merge master into staging-next 2023-03-08 18:01:34 +00:00
figsoda
37094157ea
Merge pull request #219447 from figsoda/docs 2023-03-08 12:33:56 -05:00
github-actions[bot]
8749e1376b
Merge master into haskell-updates 2023-03-05 00:16:36 +00:00
github-actions[bot]
8480c21d06
Merge master into staging-next 2023-03-04 12:01:17 +00:00
Ryan Lahfa
0397ee1113
Merge pull request #218043 from addict3d/parameterise-guest-memsize-1
nixos/lib/make-disk-image: expose memSize parameter
2023-03-04 11:25:23 +01:00
figsoda
b373d299ba docs/rust: improve docs for nightly usage 2023-03-03 22:46:28 -05:00
Kasper Gałkowski
092acca8b3 lisp-modules: make ql-import.lisp automatically pull the latest Quicklisp dist 2023-03-02 19:04:47 +01:00
Kasper Gałkowski
7a1ccaa997 lisp-modules: Add manual section 2023-03-02 19:04:41 +01:00
sternenseemann
b7d8c46302 haskellPackages.ghc: 9.2.6 -> 9.2.7
https://www.haskell.org/ghc/blog/20230227-ghc-9.2.7-released.html

Also updates some of the printouts in the manual. We should probably
make it clear in the text that these may be outdated, since we are doing
a terrible job keeping up…
2023-03-01 18:41:14 +01:00
github-actions[bot]
40707bbbb3
Merge staging-next into staging 2023-02-27 18:02:06 +00:00
Artturi
1c6a1e5650
Merge pull request #218500 from alyssais/pythonForBuild 2023-02-27 18:17:27 +02:00
github-actions[bot]
288c9d7892
Merge staging-next into staging 2023-02-27 06:01:44 +00:00
Martin Weinelt
0d09b95ad1 doc/python: Explain opt-out out of bulk updates 2023-02-27 02:21:07 +00:00
Alyssa Ross
2bfa93e01c
treewide: python{ => .pythonForBuild}.interpreter
It won't be enough to fix cross in all cases, but it is in at least
one: pywayland.  I've only made the change in cases I'm confident it's
correct, as it would be wrong to change this when python.interpreter
is used in wrappers, and possibly when it's used for running tests.
2023-02-26 20:26:17 +00:00
Nick Bathum
59462da917
nixos/lib/make-disk-image: expose memSize parameter
Generating large disk images can fail from out-of-memory in vm-run.
2023-02-26 12:08:58 -05:00
github-actions[bot]
55aecca307
Merge staging-next into staging 2023-02-24 00:02:56 +00:00
github-actions[bot]
7fb1a9172f
Merge master into staging-next 2023-02-24 00:02:22 +00:00
Weijia Wang
a395950650
Merge pull request #217870 from Artturin/envfixes1
rPackages,emscriptenPackages: s/overrideDerivation/overrideAttrs
2023-02-23 20:49:53 +02:00
Valentin Gagarin
ac573e5046
Merge pull request #217865 from ncfavier/doc-ignore-result
doc: add `result` to .gitignore
2023-02-23 19:04:17 +01:00
github-actions[bot]
3cdd771820
Merge staging-next into staging 2023-02-23 18:01:49 +00:00
Naïm Favier
07ee3496ca
doc: add result to .gitignore
Ensure the local `result` symlink from an earlier build isn't copied to
the store.
2023-02-23 18:41:42 +01:00
Artturin
06567334be emscriptenPackages: s/overrideDerivation/overrideAttrs
https://nixos.org/manual/nixpkgs/stable/#sec-pkg-overrideDerivation

> Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments
2023-02-23 18:45:38 +02:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
6b2a05e190 treewide: manual fixups for
treewide: use toString on list NIX_CFLAGS_COMPILE
treewide: move NIX_CFLAGS_COMPILE to the env attrset
2023-02-22 21:23:04 +02:00
Artturi
cdcca1cdcd
Merge pull request #215715 from Artturin/removegirworkarounds2 2023-02-18 20:12:57 +02:00
github-actions[bot]
05782cfb75
Merge master into staging-next 2023-02-18 18:01:22 +00:00
maralorn
b5fa92b2e6 doc/haskell: Add clarifications in section about versions 2023-02-18 15:15:11 +01:00
Artturin
cadffcfe50 treewide: remove issue #56943 workarounds
checked with diffoscope+difflog and launching the programs

i have fixed that issue in my other gir PRs
2023-02-17 20:26:13 +02:00
github-actions[bot]
1c50878b7b
Merge master into staging-next 2023-02-17 18:01:15 +00:00
Robert Hensing
b72592ee04
Merge pull request #215973 from pennae/nrd-manual-structure
nixos/manual: specify manual structure in markdown
2023-02-17 18:01:23 +01:00
github-actions[bot]
e6eaa85312
Merge master into staging-next 2023-02-17 00:02:11 +00:00
milahu
121fbb3cf7
docs: Building a stdenv package in nix-shell (#216650)
* docs: Building a stdenv package in nix-shell
2023-02-16 19:21:12 +01:00
github-actions[bot]
bf5abe92d4
Merge master into staging-next 2023-02-15 18:01:14 +00:00
sternenseemann
c5a0a5ac5e curl: add pkg-config metadata for libcurl.pc
I did not add the validatePkgConfig setup hook to curl, as I suspect it
may cause trouble when bootstrapping.
2023-02-15 13:52:15 +01:00
Alyssa Ross
200610b849
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/gtest/default.nix
	pkgs/development/libraries/hidapi/default.nix
2023-02-14 09:53:03 +00:00
superherointj
a7fb18c804 beam/fetchMixDeps: disable --only flag when mixEnv is empty
* mixEnv being empty will include all dependencies.
2023-02-14 00:36:31 -05:00
pennae
bfc6975cbc nixos/manual: remove holdovers from docbook times
these files provided mainly or exclusively xml-related tooling and
support for editing the manual. since docbook is now an implementation
detail (except for still being allowed in option docs, for now) these
tools are no longer necessary, useful, or even functional.

xmlformat.conf is still used by the nixpkgs documentation, so we have to
keep it. there's no reason it can't go live with the nixpkgs docs though.
2023-02-12 14:23:38 +01:00
Artturi
aaa9ea8ec6
Merge pull request #208537 from Artturin/makesetuphooksupportstrictdeps 2023-02-10 20:08:32 +02:00
Guillaume Girol
0a598d6ea5
doc: add a simpler explanation of dependencies (#213403)
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-02-10 18:41:31 +01:00
pennae
d041641b1a nixos/manual: remove md-to-db
with manual chapters no longer needing pandoc for their conversion to
xml we can get rid of this source of confusion, and its huge cache of
xml files.
2023-02-10 06:40:15 +01:00
pennae
1c9f55ec64 nixos/manual: convert <kbd> elements to bracketed spans
since support for kbd elements was added with explicit intent in #175128
it seems like a good idea to support this in nixos-render-docs instead
of just dropping it in favor of `*F12*` etc. since it's a very rare
thing in the manual and purely presentational it makes sense to use
bracketed spans instead of a new myst role.

the html-elements.lua plugin is now somewhat misnamed, but it'll go away
very soon so we don't want to bother renaming it.
2023-02-10 06:40:01 +01:00
pennae
a15d7335a5 nixos/manual: remove .title fenced divs
pandoc drops .title classes when rendering to docbook, so these are
effectively just paragraphs anyway. without support for including them
in a table of contents the complexity of parsing them in
nixos-render-docs won't be warranted.
2023-02-10 06:40:00 +01:00
Tom McLaughlin
700e6e588e Doc tweak: "Build" -> "Substitute" 2023-02-07 16:17:52 -08:00
Tom McLaughlin
d1a2a16a3a Introduce mkBinaryCache function 2023-02-07 16:16:07 -08:00
Valentin Gagarin
a2cef3dfbf
Merge pull request #215181 from SuperSandro2000/contributing-pname 2023-02-07 21:48:25 +01:00
Sandro Jäckel
fcfa4dd73b
doc/contributing: remove last references to name
pname+version should be used everywhere, so lets clean this up
2023-02-07 20:40:26 +01:00
Artturin
680309fc9c add docs for makeSetupHook 2023-02-07 21:02:02 +02:00
Valentin Gagarin
13088e285e
Merge pull request #215121 from ncfavier/doc-gitignore 2023-02-07 16:26:51 +01:00
Valentin Gagarin
abef26ab3f
Merge pull request #215114 from ncfavier/fixup-212642 2023-02-07 16:25:27 +01:00
Naïm Favier
5a5decd2eb
doc: use gitignoreSource
Running `make -C doc` to build the manual locally leaves .xml artifacts
in the tree. These are ignored by git, but they still get included in
the build when not using flakes, which causes the corresponding chapters
not to be built.
2023-02-07 13:58:34 +01:00
Naïm Favier
f98c4eac33
doc/stdenv: fixup #212642 2023-02-07 12:47:28 +01:00
John Ericson
6d0b3086f7
Merge pull request #214304 from obsidiansystems/pkg-config-meta
meta.pkgConfigModules: Init convention
2023-02-06 11:44:29 -05:00
Domen Kožar
3b837710a9
Merge pull request #214612 from stephank/feat/swift-docs
doc: add section on swift
2023-02-06 14:17:41 +01:00
Jason Yundt
b1bb9bb6c8 treewide: fix backwards smart apostrophes
According to the Unicode Standard, you should use U+2019 RIGHT SINGLE
QUOTATION MARK for apostrophes [1]. Before this change, some of the text
in this repo would use U+2018 LEFT SINGLE QUOTATION MARKs instead.

[1]: https://www.unicode.org/versions/Unicode15.0.0/ch06.pdf#G12411
2023-02-06 07:24:42 -05:00
Linus Heckemann
59b752087d
Merge pull request #214763 from lheckemann/doc-requirefile
fetchers: document requireFile
2023-02-05 18:28:01 +01:00
Linus Heckemann
2e88127a0d fetchers: document requireFile 2023-02-05 15:33:51 +01:00
Stéphan Kochen
cbc76260f7 doc: add section on swift 2023-02-04 22:30:10 +01:00
John Ericson
6e4a1b18d9 meta.pkgConfigModules: Init convention
See docs.

Follow-up work:

- Existing packages should be converted

- `defaultPkgConfigPackages` should assert on `meta.pkgConfigModules`
  and let `tests.pkg-config` alone test the build results.

CC @sternenseemann

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-02-03 09:37:31 -05:00
André Schröder
b2c8b539ac nixos/doc: fix typo in python.section.md 2023-02-01 23:00:16 +01:00
github-actions[bot]
dd1ff149da
Merge master into staging-next 2023-01-31 00:02:31 +00:00
pennae
5b6dcece88
Merge pull request #212684 from pennae/nixos-render-docs
nixos-render-docs: init, use for some manual rendering to docbook
2023-01-30 19:26:07 +01:00
github-actions[bot]
1a06f52c21
Merge master into staging-next 2023-01-30 12:01:22 +00:00
Robert Hensing
663c41affd
Merge pull request #212282 from hercules-ci/pkg-config-packages
defaultPkgConfigPackages: init
2023-01-30 09:48:53 +01:00
Robert Hensing
b6bec17eb9 testers.hasPkgConfigModule: Extract and add tests, docs 2023-01-30 00:35:34 +01:00
github-actions[bot]
7b3f0537af
Merge master into staging-next 2023-01-29 18:01:12 +00:00
Artturi
c2e37a404c
Merge pull request #208793 from hadilq/androidenv/cmdline-tools-and-patcher
androidenv: Implement cmdline-tools and patcher
2023-01-29 18:11:41 +02:00
Robert Hensing
a010129bf8 pkg-configPackages -> defaultPkgConfigPackages
This better reflects the purpose of the package set, while leaving
room for a fancier, more complete implementation of the concept,
with a nicer name.
2023-01-29 09:51:55 +01:00
Robert Hensing
159ad20b89 doc: Add pkg-config section 2023-01-29 09:51:54 +01:00
github-actions[bot]
d7f991bb53
Merge master into staging-next 2023-01-29 00:02:27 +00:00
Noah Fontes
3bec41fb5e
doc/python: fix attr name for unittestCheckHook flags
The name should end in Array per the current conventions.

This change also contains some minor formatting fixes, as the heading
levels were inconsistent.
2023-01-28 13:19:41 -08:00
Hadi
9c4e43ab70 androidenv: Implement cmdline-tools and patcher
- Replace cmdline-tools with tools because tools is obsolete now.
- Depend emulator package to systemImages

androidenv: fix issues on the PR

androidenv: reformat

androidenv: support excluding of `tools` package

androidenv: provide `tools`, and `build-tools`, dependencies

androidenv: replace includeTools with toolsVersion

androidenv: fix a typo

androidenv: add tests to check licenses and installed packages

androidenv: check if tests are running! this commit should fail!

androidenv: fix problems in the review https://github.com/NixOS/nixpkgs/pull/208793

androidenv: add test-suite to handle more tests around

androidenv: fix the test after couldn't running them with ofborg

Update pkgs/development/mobile/androidenv/build-tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

androidenv: Resolving https://github.com/NixOS/nixpkgs/pull/208793#discussion_r1065851539

Update pkgs/development/mobile/androidenv/cmdline-tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/development/mobile/androidenv/tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

androidenv: fix a typo
2023-01-27 18:15:47 -05:00
Martin Weinelt
52029b8e00 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-27 23:50:36 +01:00
Guillaume Girol
b55a8d3ad6
Merge pull request #205646 from symphorien/ocamlconflict
ocamlPackages.findlib: detect conflicts of version early
2023-01-27 20:18:39 +00:00
pennae
0a6e6cf7e6 nixos/manual: render module chapters with nixos-render-docs
this converts meta.doc into an md pointer, not an xml pointer. since we
no longer need xml for manual chapters we can also remove support for
manual chapters from md-to-db.sh

since pandoc converts smart quotes to docbook quote elements and our
nixos-render-docs does not we lose this distinction in the rendered
output. that's probably not that bad, our stylesheet didn't make use of
this anyway (and pre-23.05 versions of the chapters didn't use quote
elements either).

also updates the nixpkgs manual to clarify that option docs support all
extensions (although it doesn't support headings at all, so heading
anchors don't work by extension).
2023-01-27 20:07:34 +01:00
Matthew Kenigsberg
2334404fb0 fix: doc typo 2023-01-26 16:45:59 -07:00
github-actions[bot]
578f1ba854
Merge master into staging-next 2023-01-26 18:01:29 +00:00
Naïm Favier
beb3d48b1e
Merge pull request #212642 from ncfavier/doc-check-phase 2023-01-26 14:47:53 +01:00
Naïm Favier
edb26159db
doc/stdenv: clarify default check target 2023-01-25 18:26:18 +01:00
github-actions[bot]
20df8d00cc
Merge master into staging-next 2023-01-25 12:01:34 +00:00
Nick Cao
0ea2d480e4
postgresqlTestHook: run postgresqlTestSetupPost hook after setting up 2023-01-25 18:46:27 +08:00
github-actions[bot]
7a89380b7e
Merge master into staging-next 2023-01-24 18:01:00 +00:00
Naïm Favier
4580a6608d
doc: fix broken links 2023-01-24 13:27:27 +01:00
Vladimír Čunát
411405c9f6
Merge branch 'master' into staging-next
Trivial conflict in release notes, except that the xml/docbook parts
are horrible for (semi-)automatic conflict resolution.
Fortunately that's generated anyway.
2023-01-24 12:22:38 +01:00
mdarocha
5234f4ce93 dotnet-sdk_5: remove package
It's EOL and not used in nixpkgs anymore
2023-01-23 19:16:58 +01:00
github-actions[bot]
44319c878e
Merge master into staging-next 2023-01-23 00:02:15 +00:00
Noah Snelson
a67632bda0 doc/langauge-frameworks/beam: fix broken link to elixir-ls 2023-01-22 17:24:48 -05:00
github-actions[bot]
feb2240b37
Merge master into staging-next 2023-01-22 18:01:03 +00:00
Naïm Favier
2f4e98edef doc/manpage-urls.json: add gnunet.conf 2023-01-21 18:08:38 +01:00
Naïm Favier
712b3371b6 doc/manpage-urls.json: add mpd 2023-01-21 18:08:38 +01:00
Guillaume Girol
d26caea94b doc: adapt to nativeCheckInputs 2023-01-21 16:42:10 +01:00
Guillaume Girol
90c78aee6c Merge branch 'nativeCheckInputs' into staging-nativeCheckInputs 2023-01-21 12:00:00 +00:00
Artturin
27fe8b4a39 cross-compilation.chapter.md: correct doCheck conditional 2023-01-20 22:17:19 +02:00
Robert Hensing
a1cd06f900
Merge pull request #211082 from hercules-ci/fix-issue-16182
Fix issue 16182  `Error: _assignFirst found no valid variant!`
2023-01-19 19:22:04 +01:00
Dominik Schrempf
eda69033eb
doc/haskell: nits
These are some suggested changes to the new documentation of Haskell in
the Nixpkgs manual. They cover sections until, but excluding, the
section "Available package versions". I am not an English native
speaker, so please correct me and savage these changes!

Also, please let me know if the suggestions are welcome, then I will
continue with the next chapter.
2023-01-18 07:17:46 +01:00
Robert Hensing
01d7f19346 multi-outputs.sh: Improve _assignFirst error message
Closes #16182

This improves the error message

    Error: _assignFirst found no valid variant!

which occurred when the set of outputs was not sufficient to set
the various outputDev, outputBin, etc variables. Specifically, this
would mean that "out" is not among the outputs, which is valid for
a derivation.

This changes the message to something like

    error: _assignFirst: could not find a non-empty variable to assign to outputDev. The following variables were all unset or empty: dev out.
          If you did not define an "out" output, make sure to define all the specific required outputs: define an output for one of the unset variables.

While this isn't a full explanation of what stdenv can and can not do,
I think it's vast improvement over the 0 bits of information that it
used to provide. This at least gives a clue as to what's going on, and
even suggests a fix, although probably multiple such fixes are required
in an instance where someone starts with a no-out derivation from scratch
(and decide to persist).
2023-01-16 12:57:01 +01:00
maralorn
fecbf169e2 haskell/docs: Fix a link 2023-01-15 22:15:40 +01:00
maralorn
26ef8978d8 haskell/docs: New sections about available versions and hls + Various small improvements
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2023-01-15 20:07:02 +01:00
sternenseemann
0a66465b22 doc/haskell: (re-)init haskell manual section
This restarts a Haskell section in the nixpkgs manual. The content
presented here has been written from scratch, although some parts of it
take inspiration from the existing haskell4nix documentation.

It is by no means complete, the idea is mostly to get the ball rolling
in some way. Upcoming tasks are hinted at in the comments in the
documentation file.
2023-01-14 22:33:35 +01:00
github-actions[bot]
79cb2f7e61
Merge master into staging-next 2023-01-14 11:12:34 +00:00
K900
3ae365afb8
Merge pull request #208867 from K900/qt-doc-fixes
treewide: remove outdated multiple versions of Qt stuff
2023-01-14 10:30:49 +03:00
github-actions[bot]
49722fd14a
Merge master into staging-next 2023-01-13 18:01:34 +00:00
K900
bf5a65096c pkgs/all-packages: remove unused alias, add comment 2023-01-12 20:51:24 +03:00
Martin Weinelt
c1e6c6af69 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-11 03:51:33 +01:00
pennae
798b7fdc5c doc/filters: fix myst-reader role detection
matching on only `{...}` does not trigger if the role tag is preceded by
something usually considered a semantic separator that isn't a separator
as markdown knows it, e.g. punctuation characters.
2023-01-10 10:31:51 +01:00
Valentin Gagarin
5e07823679
Merge pull request #208252 from helsinki-systems/doc/doDist
doc/stdenv: Add information about the doDist variable
2023-01-10 03:53:48 +01:00
Valentin Gagarin
0a94eb26e4
Merge pull request #209493 from henrik-ch/overview_version
updating stable nixos version in preface.
2023-01-10 03:50:30 +01:00
github-actions[bot]
33aa224777
Merge master into staging-next 2023-01-09 18:01:24 +00:00
figsoda
90239b150c
Merge pull request #209569 from figsoda/maintainers
docs: prefer `maintainers: add` commits to be in the same pull request
2023-01-09 09:20:17 -05:00
github-actions[bot]
e4fc9a910a
Merge master into staging-next 2023-01-09 12:01:24 +00:00
Naïm Favier
bff4bb5540
Merge pull request #208762 from ncfavier/link-manpages-options-doc 2023-01-09 11:57:01 +01:00
Max Hausch
540c14338d
doc/stdenv: Add information about the doDist variable 2023-01-09 08:17:53 +01:00
figsoda
3d1afabefc docs: prefer maintainers: add commits to be in the same pull request 2023-01-07 17:00:32 -05:00
Henrik Karlsson
2d4103ae77 updating stable nixos version in preface. 2023-01-05 22:24:19 +00:00
github-actions[bot]
47507cf77a
Merge staging-next into staging 2023-01-04 06:01:44 +00:00
Valentin Gagarin
895a4d1cd1
Merge pull request #208868 from mweinelt/quick-start-deadlink 2023-01-04 06:49:32 +01:00
Gabriella Gonzalez
6d89aa8f1d
darwin.builder: auto-login as the builder user (#208772)
… as suggested by @NiklasGollenstede in:

https://github.com/NixOS/nixpkgs/pull/206951#issuecomment-1369020601

This simplifies the user experience for logging into and
debugging the machine and also simplifies the instructions for
shutting down the machine gracefully.
2023-01-03 21:12:56 -08:00
Guillaume Girol
6043e3af4e ocamlPackages.findlib: detect conflicts of version early
just like pythonCatchConflictHook
2023-01-03 20:30:34 +01:00
github-actions[bot]
e076f677a1
Merge staging-next into staging 2023-01-03 18:01:45 +00:00
Niklas Hambüchen
83481b8708 doc: python: Run hooks in checkPhase 2023-01-03 18:00:31 +01:00
Martin Weinelt
8b79bf0432
doc/contributing/quick-start: Replace dead thunderbird link
The thunderbird derivation is using `buildMozillaMach` these days,
shared with Firefox and Librefox, so it is probably the correct
, although more complicated, successor.
2023-01-03 14:18:41 +01:00
Robert Hensing
f61d4d346b
Merge pull request #205190 from NixOS/lib.path.relativeNormalise
lib.path.subpath.{isValid,normalise}: init
2023-01-03 13:46:11 +01:00
K900
8f48e1cadb doc/languages-frameworks/qt: remove outdated information 2023-01-03 15:38:02 +03:00
Silvan Mosberger
98fbcf1788 lib.path.subpath.isValid: init
The first path library function
2023-01-03 13:20:36 +01:00
github-actions[bot]
d8b859a780
Merge staging-next into staging 2023-01-02 18:01:43 +00:00
Winter
15013b3054
darwin.builder: prefer shutting down over halting VM (#208450)
This is preferable because it prevents things like disk corruption (requiring the user to delete the disk image when starting up) that I consistently ran into.
2023-01-02 07:36:41 -08:00
Naïm Favier
a8d4cf149c
doc: separate manpage URLs from the Pandoc filter
Move the manpage-to-URL mapping to `doc/manpage-urls.json` so that we can
reuse that file elsewhere, and generate the `link-manpages.lua` filter from
that file.

Also modify the Pandoc filter so that it doesn't wrap manpages that are
already inside a link.

Keeping a Lua filter is essential for speed: a Python filter would
increase the runtime `md-to-db.sh` from ~20s to ~30s (but Python is not
to blame; marshalling Pandoc types to and from JSON is a costly operation).
Parsing in Lua seems tedious, so I went with the Nix way.
2023-01-02 14:11:22 +01:00
Jan Tojnar
5810109b42 Merge branch 'staging-next' into staging
- readline6 attribute removed from all-packages.nix in d879125d61
- readline attribute was bumped to readline82 in 50adabdd60
2023-01-02 03:04:32 +01:00