Commit Graph

6094 Commits

Author SHA1 Message Date
pennae
70cbd8c6c0 doc: pull option docs out of doc-support
this leaves doc-support as a simple wrapper around function docs. this
wrapper will go away very soon as well.
2023-07-01 20:59:30 +02:00
pennae
f397309f4e doc: remove remnants of docbook times
all xml-related tooling can go away. shell.nix is no longer useful since
the makefile is gone and the build runs entirely via a derivation, and
gitignore is thus also no longer that useful. it may filter out some
swap files, but its main reason to exist (keeping generated files out of
a concurrent build of the derivation) has gone away.
2023-07-01 20:59:30 +02:00
pennae
be4d19ff1a doc: render nixpkgs manual with nrd
also updates nixdoc to 2.3.0. the nixdoc update is not a separate commit
because that would leave the manual build broken for one commit,
potentially breaking bisects and rebases.
2023-07-01 20:59:29 +02:00
pennae
b521f451a3 doc-support: don't expose locationsXml
nothing except function docs uses this, so we need not expose it. we'll
be reworking this entire section of the build anyway, with the target of
breaking up doc-support as it is now.
2023-07-01 20:27:29 +02:00
pennae
a5414c29a0 doc: build placeholder epub in its own derivation
mostly to clean up the main manual build makefile and derivation a bit.
not technically necessary, but will make life easier later.
2023-07-01 20:27:29 +02:00
Robert Hensing
1f5a0b0135 Merge pull request #239005 from Artturin/setorfunoverr
stdenv: let overrideAttrs accept attrset OR function
2023-07-01 15:27:23 +02:00
Robert Hensing
0c9fb905cb doc/using/overrides: Relate addition to preceding text 2023-07-01 15:25:17 +02:00
Atemu
62b2adc753 buildFHSEnv: add multiArch flag
The intention is to allow the user control over whether 32bit deps are supposed
to be included in the fhsenv
2023-07-01 13:41:14 +02:00
Artturin
fb643f3260 doc/using/overrides: it is possible to use previous arguments in .override 2023-06-30 23:28:00 +03:00
Artturin
0fdae31531 stdenv: let overrideAttrs accept attrset OR function
Makes overrideAttrs usable in the same way that `override` can be used.
It allows the first argument of `overrideAttrs` to be either a function
or an attrset, instead of only a function:

hello.overrideAttrs (old: { postBuild = "echo hello"; })
hello.overrideAttrs { postBuild = "echo hello"; }

Previously only the first example was possible.

Co-authored-by: adisbladis <adisbladis@gmail.com>
Co-authored-by: matthewcroughan <matt@croughan.sh>
2023-06-30 23:28:00 +03:00
Tillerino
9def595d00 doc: add a note about automatic maven upgrades (#238774) 2023-06-30 16:59:23 +03:00
sternenseemann
8088e14e12 doc/haskell: FAQ entry on changing profiling settings globally
This is actually relatively complicated to achieve, since it involves
overriding GHC on e.g. aarch64-darwin, so the FAQ entry seems warranted.

It's also a good exercise to me, since it demonstrates some problems
with the overriding infrastructure, i.e. that it has a tendency to
inherit the pkgs fixpoint from prev. An example of this problem is
https://github.com/NixOS/nixpkgs/issues/235960, but it has different
manifestations as well. Awareness of this will also help writing the
other sections on overriding.

How complicated it is, seems to be further incentive to go ahead with
https://github.com/NixOS/nixpkgs/pull/239548 as well.
2023-06-30 01:52:42 +02:00
sternenseemann
1db464d40a doc/haskell: document {enable,disable}*Profiling functions 2023-06-30 01:52:42 +02:00
amesgen
906102c911 doc/languages-frameworks/python: don't use full pkgs in attrs 2023-06-29 21:38:37 +02:00
Lily Foster
3990bb5b5e doc/languages-frameworks/javascript: add npmWorkspace and npmPruneFlags args 2023-06-29 07:43:12 -04:00
Adam Joseph
910d4f761a Revert "Revert "submitting-changes.chapter.md: explain *why* we have three branches""
This reverts commit 7e6c518ce4.

I misinterpreted Github's CI failure in the notification tab and
thought that I had broken CI on origin/master, so I panic-reverted
before I merged it (I thought they had).

On closer inspection, it appears that the CI failure was not from
the tip that I merged.  This PR resubmits the reverted change.  I'll
wait for OfBorg to finish this time.
2023-06-29 03:08:41 -07:00
Adam Joseph
7e6c518ce4 Revert "submitting-changes.chapter.md: explain *why* we have three branches" 2023-07-12 19:59:46 +00:00
Adam Joseph
b3fa79bb89 submitting-changes.chapter.md: explain *why* we have three branches
The manual does an okay job of explaining the rules for each of the
three development branches, but really doesn't give any intuition as
to why there are three (why not four? or two?) or how we got where
we are today.

This commit attempts to fix that, by explaining that there is one
branch that allows mass-rebuild commits, and it has a fast-building
branch both upstream and downstream of it (from the perspective of
automated merges).

I have also removed the term "stabilization" from the arc labels.
This vague term is not defined anywhere, and does communicate any
useful information without a longer explanation.  Therefore it is
not appropriate for use in a diagram.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-06-29 02:38:06 -07:00
Lily Foster
59713b5555 Merge pull request #230157 from teutat3s/buildnpmpackage-docs
buildNpmPackage: document dontNpmBuild option
2023-06-28 18:33:02 -04:00
teutat3s
3a2cf5b3f5 buildNpmPackage: document dontNpmBuild option
document dontNpmInstall option
2023-06-28 23:49:29 +02:00
Sandro
198bd0a4a7 Merge pull request #239622 from corngood/dotnet-misc
dotnet: misc fixes
2023-06-28 23:41:18 +02:00
Robert Hensing
a0a4354a13 doc/reviewing-contributions: Remove wrong fetchpatch detail
It may have to be fetchpatch, fetchpatch2, or fetchurl. We should link somewhere, but we don't have a link target yet, so until then, remove the inaccurate info.

Co-authored-by: Alyssa Ross <hi@alyssa.is>
2023-06-27 18:35:15 +02:00
Robert Hensing
4920af40fc doc/reviewing-contributions: Add points about patches
A weaker version of https://github.com/NixOS/nixpkgs/pull/186484#issuecomment-1608960696
2023-06-27 15:56:54 +02:00
David McFarland
ee8ba995a7 buildDotnetModule: make fetch-deps find output path automatically 2023-06-24 19:13:16 -03:00
github-actions[bot]
3b00d0c96f Merge master into haskell-updates 2023-06-23 00:16:37 +00:00
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