Commit graph

2045 commits

Author SHA1 Message Date
github-actions[bot]
9a2405d657
Merge staging-next into staging 2022-06-22 18:02:10 +00:00
Robert Hensing
fa9c83ca7f
Merge pull request #174460 from hercules-ci/module-docs-Nix-driven-location-links
make-options-doc: Support Nix-provided declaration links
2022-06-22 15:48:46 +02:00
github-actions[bot]
cea2503d73
Merge staging-next into staging 2022-06-21 18:01:45 +00:00
Ivv
8168651288
Merge pull request #178446 from zimbatm/dotnet-nugetdeps
buildDotnetModule: allow passing derivations to nugetDeps
2022-06-21 16:00:48 +02:00
zimbatm
ba2f31b6db
buildDotnetModule: allow passing derivations to nugetDeps
Sometimes I want to pass a different implementation of `mkNugetDeps`.
For example in private repos, it can be handy to use `__noChroot = true`
and bypass the deps.nix generation altogether. Or some Nuget packages
ship with ELF binaries that need to be patched, and that's best done as
soon as possible.
2022-06-21 15:45:52 +02:00
adisbladis
02c180b646
Merge pull request #176324 from meebey/meebey/meebey-patch-1
doc/builders/images/dockertools: improve shadowSetup example
2022-06-21 20:24:20 +08:00
github-actions[bot]
56813953d0
Merge staging-next into staging 2022-06-21 12:06:48 +00:00
Robert Hensing
e2c261f2c0
Merge pull request #176146 from pennae/module-docs-markdown
treewide: markdown option docs
2022-06-21 13:16:02 +02:00
github-actions[bot]
3746a49dcc
Merge staging-next into staging 2022-06-21 00:02:48 +00:00
Graham Christensen
9284df58c1 maintainers: document new maintainers and team changes 2022-06-20 22:20:26 +02:00
github-actions[bot]
9f3b3514f1
Merge staging-next into staging 2022-06-19 00:03:16 +00:00
github-actions[bot]
b7aba4fb0f
Merge master into staging-next 2022-06-19 00:02:36 +00:00
Vincent Laporte
af888339b6
mkCoqDerivation: do not set DESTDIR
Fixes #178109
2022-06-18 11:54:21 +02:00
github-actions[bot]
8c938c76c8
Merge staging-next into staging 2022-06-16 18:01:58 +00:00
github-actions[bot]
1b3f8ec8e4
Merge master into staging-next 2022-06-16 18:01:17 +00:00
Sandro
a963f1b829
Merge pull request #177291 from SuperSandro2000/release-notes.xml
Delete unused release-notes.xml
2022-06-16 17:42:52 +02:00
Robert Hensing
11b33fcdcc doc: Fix config options reference file links 2022-06-15 00:45:05 +02:00
github-actions[bot]
659ec6f582
Merge staging-next into staging 2022-06-14 18:02:03 +00:00
github-actions[bot]
34bc19a1dc
Merge master into staging-next 2022-06-14 18:01:25 +00:00
Vladimír Čunát
7a99205619
Merge #162960: staging docs: explain that purple arrows are manual 2022-06-14 19:31:34 +02:00
github-actions[bot]
179051c702
Merge staging-next into staging 2022-06-14 12:02:11 +00:00
github-actions[bot]
452a7d6c43
Merge master into staging-next 2022-06-14 12:01:32 +00:00
Robert Hensing
0137df896e
Merge pull request #177370 from hercules-ci/nixpkgs-manual-promote-config-options-reference
doc: Promote config Options Reference to sub-chapter section
2022-06-14 11:18:56 +02:00
github-actions[bot]
15c142e5c0
Merge staging-next into staging 2022-06-13 18:02:13 +00:00
github-actions[bot]
6ccd35f78f
Merge master into staging-next 2022-06-13 18:01:35 +00:00
Matthieu Coudron
a1ad235743
vimUtils: deprecate configure.pathogen (#154814)
pathogen does not bring any value compared to vim native packages so
remove it to ease maintainance burden.
2022-06-13 15:25:46 +02:00
Artturi
ce62ff7bdf
Merge pull request #176464 from Artturin/gobjecfix 2022-06-12 17:32:49 +03:00
pennae
320aa2a791 treewide: attempt at markdown option docs 2022-06-12 12:44:38 +02:00
Robert Hensing
fa01afcf7f doc: Promote config Options Reference to sub-chapter section
It was hidden in the insecure packages section.
 - Lift it out.
 - Add an id
2022-06-12 08:27:15 +02:00
Sandro
6449d45e25
Delete unused release-notes.xml 2022-06-11 15:48:52 +02:00
Artturin
6e6292279e meson: add mesonEmulatorHook
fixes building documentation while cross-compiling and other issues
Exec format error: './gdk3-scan'

added some simple documentation
2022-06-11 04:51:04 +03:00
github-actions[bot]
ef1a40da01
Merge staging-next into staging 2022-06-10 12:02:21 +00:00
Elis Hirwing
e91811bbe1
php74: Drop PHP 7.4 and add aliases throwing an error 2022-06-08 18:11:55 +02:00
Martin Weinelt
4566beb390
doc/python: update python version references 2022-06-06 11:46:06 -07:00
Mirco Bauer
ac66ff97ed doc/builders/images/dockertools: improve shadowSetup example
The example snippet will fail with this error as it is not self contained and
assumes `shadowSetup` was given:

    $ nix-build docker-image.nix
    error: undefined variable 'shadowSetup' at docker-image.nix:20:7

Instead use the full reference to `shadowSetup` in the example so it will work
as stated.
2022-06-05 09:45:58 +08:00
Florian Klink
1cefcfab2d nixos/doc: move fetchpatch documentation to fetcher documentation
… and link from the coding-conventions chapter to it.

Closes #48569.
2022-06-03 14:37:31 +02:00
Martin Weinelt
79119a149b
Merge pull request #175662 from klemensn/firefox-smartcardSupport 2022-06-01 23:00:51 +02:00
Thiago Kenji Okada
9dfef0f30b
Merge pull request #175288 from thiagokokada/doc-pythonRelaxDepsHook
doc: document pythonRelaxDepsHook
2022-06-01 19:50:10 +01:00
Thiago Kenji Okada
2abfe3f700
doc: fix typos in pythonRelaxDepsHook
Co-authored-by: Guillaume Girol <symphorien@users.noreply.github.com>
2022-06-01 18:56:33 +01:00
Klemens Nanni
787a444596 doc: firefox: Show how to use PKCS#11 Proxy Module
`p11-kit-proxy.so` makes it able to use multiple PKCS#11 modules and
manage them through p11-kit(8).

Fix indentation while here.
2022-06-01 01:22:46 +02:00
Adam Joseph
81bc106e08 meta.sourceProvenance documentation: clarify it is unaffected by changes to meta.license
This commit clarifies that the meaning of the `meta.sourceProvenance`
field is independent of and unaffected by the value of the
`meta.license` field.  This is based on the intent of the RFC author
as expressed here:

  https://github.com/NixOS/nixpkgs/pull/161098#issuecomment-1081270201

This clarification is added for two reasons:

1. If in the future there should be some disagreement about what
   `sourceProvenance` to assign to a package, this may help resolve
   the disagreement.  Any interpretation of `sourceProvenance` which
   is influenced by the `meta.license` is clearly an incorrect
   interpretation.

2. If it should turn out that it is impossible to disentangle
   `sourceProvenance` from `meta.license`, this would indicate the
   need for changes to the `sourceProvenance` scheme.  That change
   might be as simple as replacing the sentence added by this commit
   with some other sentence explaining how the two fields influence
   each other.

This commit implements the recommendation made in the paragraph of
this comments which begins with "Please say this explicitly...":

  https://github.com/NixOS/nixpkgs/pull/161098#issuecomment-1081309089
2022-05-30 16:27:34 +08:00
Robert Scott
9d0784829a add initial meta.sourceProvenance documentation 2022-05-30 16:27:34 +08:00
Thiago Kenji Okada
74a0e97cd4 doc: document pythonRelaxDepsHook 2022-05-29 14:01:30 +01:00
Artturi
60a0871486
Merge pull request #172391 from Artturin/deprecate-stdenv-glibc 2022-05-27 17:56:19 +03:00
Artturin
c1fffdfffb treewide: change some glibc to stdenv.cc.libc 2022-05-27 05:57:43 +03:00
Cyril Cohen
d113661156 coqPackages: etc
- put `findlib` in `buildInputs` of `mkCoqDerivation` to make sure `coq` packages find their ocaml plugin dependencies,
- use `propagatedBuildInputs` to make sure ocaml plugin dependencies are in path,
- updated `coqPackage.heq` (broken url),
- fixed use of `DESTDIR` and `COQMF_COQLIB` in mkCoqDerivation,
- adding `COQCORELIB` environement variable to put ocaml plugin files in the right place,
- make `metaFetch` available from `coqPackages`
2022-05-25 20:00:25 +02:00
Artturin
0c4d65b21e treewide: stdenv.glibc -> glibc 2022-05-25 15:51:20 +03:00
github-actions[bot]
ba5122823c
Merge master into staging-next 2022-05-23 00:02:36 +00:00
Martin Weinelt
809ffd6cd3
doc/python: use optional-dependencies instead of extras-require
This is the term that PEP 621 uses and it is less likely to be
misspelled.

https://peps.python.org/pep-0621/#dependencies-optional-dependencies

I was never sure if it was `extra` or `extras`, or `require` or
`requires` and finally committed a mistake in #167405.
2022-05-22 16:31:45 +02:00
github-actions[bot]
75906ed245
Merge master into staging-next 2022-05-20 00:02:29 +00:00