Commit Graph

2568 Commits

Author SHA1 Message Date
Connor Baker
495875182e
Merge pull request #224068 from SomeoneSerge/respect-config-cudaSupport
Respect global config.cudaSupport
2023-07-25 14:18:14 -04:00
asymmetric
46df012d2a
Merge pull request #244332 from SuperSandro2000/fonts-fonts
nixos/fonts: rename fonts.fonts option to fonts.packages, other cleanups
2023-07-25 09:49:25 +02:00
Martin Weinelt
f00b8343d2
Merge pull request #243848 from SuperSandro2000/clarify-python-tools
docs/python: clarify allowance of using toosl to autogenerate packages
2023-07-24 20:16:07 +02:00
Sandro Jäckel
b0c67b4b6e
treewide: rename fonts.fonts to fonts.packages 2023-07-24 17:34:39 +02:00
Sandro Jäckel
0a47d54801
docs/python: clarify allowance of using toosl to autogenerate packages 2023-07-24 16:41:08 +02:00
github-actions[bot]
41e6556ad3
Merge master into staging-next 2023-07-22 18:01:06 +00:00
Paul Colomiets
366404a9d3 Remove tailhook from maintainers 2023-07-22 14:11:29 +03:00
Someone Serge
133993211b
config.cudaSupport: init option 2023-07-20 17:57:31 +03:00
Someone Serge
a17baa5db4
doc: update #cuda to reflect the recommended config.cudaSupport style 2023-07-20 17:27:07 +03:00
github-actions[bot]
2c5b83e75c
Merge master into staging-next 2023-07-19 18:01:04 +00:00
Theodore Ni
9d55df7a37
docs/contributing: fix "ha256" -> "sha256" typo 2023-07-18 16:55:32 -07:00
github-actions[bot]
034c3854f0
Merge staging-next into staging 2023-07-16 18:01:40 +00:00
Robert Hensing
12d2f0da28
Merge pull request #240136 from NixOS/doc-review-patches
doc/reviewing-contributions: Add points about patches
2023-07-16 14:21:17 +02:00
Jan Tojnar
cea188cbbb Merge branch 'staging-next' into staging
Conflicts:
 - pkgs/tools/networking/shadowfox/default.nix between e989daa65f and 1c29673fcc
 - pkgs/tools/networking/wuzz/default.nix between 7d80417710 and 1c29673fcc
2023-07-16 02:20:49 +02:00
maralorn
85331ccd98
doc/../haskell.section.md: Make a bit clearer and more beginner friendly 2023-07-15 02:18:29 +02:00
Artturin
1c29673fcc treewide: go-modules -> goModules
In 787af0f79f
I had to change ${go-modules} to $goModules to allow overrideAttrs to work;
However, env vars cannot contain -, so  i had to change go-modules too.
This in turn broke nix-update because it uses the go-modules attr.

Instead of making nix-update more complicated, make go-modules naming match cargoDeps.

`fd --type f | xargs sd '\bgo-modules\b' 'goModules'`
and revert change to pkgs/applications/misc/dstask/default.nix
and pkgs/servers/http/dave/default.nix
and pkgs/os-specific/darwin/plistwatch/default.nix

release note added
2023-07-14 00:18:06 +03:00
Matthieu Coudron
34b3a809ef buildLuarocksPackage: rename file to match its role 2023-07-10 10:34:34 +02:00
Robert Hensing
e809af74eb
Merge pull request #242312 from NixOS/doc-lib-render-fixedPoints
doc: Render lib.fixedPoints
2023-07-08 19:57:44 +02:00
Robert Hensing
aa1beb0ab5 doc: Render lib.fixedPoints 2023-07-08 18:46:08 +02:00
Atemu
67eec418ab
Merge pull request #240860 from Atemu/fhsenv-no-multiarch
buildFHSEnv: disable multiArch by default
2023-07-08 13:53:41 +02:00
Mario Rodas
43b091f45c
Merge pull request #233804 from lilyinstarlight/feature/npm-workspaces
buildNpmPackage: add npmWorkspace and npmPruneFlags args
2023-07-08 06:45:46 -05:00
Michael Hoang
edef486898 darwin.linux-builder: rename from darwin.builder 2023-07-06 21:33:09 +10:00
Michael Hoang
285f5e858e darwin.builder: use port 31022 by default 2023-07-06 21:32:08 +10:00
pennae
06140b7ecf
Merge pull request #239636 from pennae/nixpkgs-manual-nrd
doc: dedocbookify nixpkgs manual
2023-07-03 20:48:23 +02:00
pennae
fc1b58b593 doc: inline doc-support to main drv
separating function docs out like this makes it less clear how library
documentation is generated and integrated into the build. if in the
future more parts of nixpkgs use nixdoc it will make sense to have all
information about library doc generation in the same place.
2023-07-01 20:59:30 +02:00
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