Commit Graph

3176 Commits

Author SHA1 Message Date
Jan Tojnar
b2f2cee158 Revert "doc/gnome: make wrapGAppsHook4 more discoverable"
We will bring the GTK 3 version to a more equal standing compared
to the GTK 4 one in the next commit.

This reverts commit 9f90c73360.
2024-04-27 00:02:36 +02:00
Atemu
2432c6b829
Merge pull request #271071 from pbsds/wrapAppImage-pname-redux
appimageTools.wrapAppImage: remove version from `pname`
2024-04-24 21:48:19 +02:00
Peder Bergebakken Sundt
bbb1f25bfb buildFHSEnvBubblewrap: do not infer pname from name 2024-04-24 15:26:52 +02:00
Jonathan Ringer
e660db3233 docs/cuda: remove last references to cudaPackages.autoAddDriverRunpath 2024-04-23 08:12:34 -07:00
terru
cc5b30542b
doc: remove links to docbook documentation (#305328)
There appears to be no clear reason why docbook should be referenced here,
except perhaps for historical reasons from when the manual still used
docbook.
2024-04-19 17:27:58 +02:00
Vladimír Čunát
739cfd4a6f
Merge #303527: staging-next 2024-04-12 2024-04-19 16:30:52 +02:00
Valentin Gagarin
9b76c3bff5
doc: move note on configuring Nixpkgs in NixOS to the NixOS manual (#304307)
that NixOS manual section talks a lot about Nixpkgs package
configuration, which really should not be there but rather in the
Nixpkgs manual itself. but this is a rabbit hole for another time.

Co-authored-by: Dominic Mills <dominic.millz27@gmail.com>
2024-04-19 16:06:32 +02:00
github-actions[bot]
b7dcef0598
Merge master into staging-next 2024-04-14 20:49:29 +00:00
Sandro
ec2cb66cbe
Merge pull request #301928 from nevivurn/feat/gomod-workvendor
buildGoModule: vendorHash fixes for proxyVendor and Go 1.22
2024-04-14 21:57:17 +02:00
Yongun Seong
3e28bdc678
buildGoModule: inherit env from main package to goModule derivation 2024-04-14 14:27:44 +09:00
github-actions[bot]
598389768a
Merge master into staging-next 2024-04-14 00:05:19 +00:00
Daniel Sidhion
460990ef54
Merge pull request #302599 from Aleksanaa/doc-wrapGAppsHook4
doc/gnome: make wrapGAppsHook4 more discoverable
2024-04-13 16:24:14 -07:00
Vladimír Čunát
24d4f2cd52
Merge branch 'staging' into staging-next
Conflicts (tried to quickly resolve somehow, checked eval):
	pkgs/development/python-modules/apsw/default.nix
	pkgs/development/python-modules/mido/default.nix
	pkgs/development/python-modules/pytest-bdd/default.nix
	pkgs/development/python-modules/sparse/default.nix
2024-04-12 07:06:54 +02:00
Basti
8978af6b99
Merge pull request #303213 from SuperSandro2000/fzf-followup
nixos/fzf: bring back keybindings and completion option removed in #298692
2024-04-11 20:15:14 +00:00
DS
e67c738314 doc: update fetchzip docs, add examples and follow conventions
With updates in a doc team meeting with Valentin, Silvan and Johannes :)
2024-04-11 17:09:41 +02:00
Sandro Jäckel
104f24e0b9
Revert "doc: replace fzf-share mention with sk-share from Skim package"
This reverts commit de5b2ef096.
2024-04-11 15:08:51 +02:00
Weijia Wang
3f59355d84 Merge branch 'staging-next' into staging 2024-04-09 08:26:23 +02:00
aleksana
9f90c73360 doc/gnome: make wrapGAppsHook4 more discoverable 2024-04-08 23:02:46 +08:00
Aleksana
fe0c92572f
doc/stdenv: document prefixKey more precisely (#302535)
* doc/stdenv: document prefixKey more precisely

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2024-04-08 14:07:40 +02:00
Mario Rodas
5d58ded833
Merge pull request #298692 from SebTM/auto-update/fzf
fzf: 0.47.0 -> 0.48.1
2024-04-07 14:42:45 -05:00
Peder Bergebakken Sundt
0e4bf5608f
Merge pull request #285177 from lelgenio/krita-plugin-gmic-package
krita: wrap with plugins, krita-plugin-gmic init at 3.2.4.1
2024-04-07 21:42:25 +02:00
lelgenio
1816172445 doc: add krita plugins section 2024-04-07 02:12:36 -03:00
Mario Rodas
de5b2ef096 doc: replace fzf-share mention with sk-share from Skim package
`fzf-share` was removed
2024-04-07 04:20:00 +00:00
github-actions[bot]
f6827a0d19
Merge staging-next into staging 2024-04-04 18:01:53 +00:00
Silvan Mosberger
62c8b542c3
Merge pull request #301439 from DanielSidhion/unselectable-prompt
doc: make prompts unselectable on the manuals
2024-04-04 16:52:32 +02:00
Silvan Mosberger
60e005352d
Merge pull request #301152 from DanielSidhion/examples-collapsible
nixos-render-docs: make examples collapsible by default
2024-04-04 16:48:21 +02:00
Daniel Sidhion
c9c7d2f237
doc: document fetchurl more completely, follow doc conventions (#300429)
* doc: document fetchurl more completely, follow doc conventions

Co-authored-by: Johannes Kirschbauer <hsjobeki+github@gmail.com>
2024-04-04 14:12:42 +02:00
github-actions[bot]
71f1268051
Merge staging-next into staging 2024-04-04 12:01:39 +00:00
Atemu
b136700c7d
Merge pull request #299618 from TomaSajt/dub-support
Add buildDubPackage and dub-to-nix for building dub based packages
2024-04-04 11:52:57 +02:00
DS
14d67caaa4 doc: make prompts unselectable on the manuals 2024-04-03 22:41:13 -07:00
github-actions[bot]
bcc77e0272
Merge staging-next into staging 2024-04-03 12:01:49 +00:00
TomaSajt
87b3dc5b46
doc: add dlang language section 2024-04-03 12:32:09 +02:00
Daniel Sidhion
0decb324b3
doc: improve fetchers overview, deduplicate readme content, follow doc conventions (#297654)
* doc: improve fetchers overview, deduplicate readme content

* Improve caveat explanation and some fetchurl content

* move out consumer docs on source fetching

* move note on mirror URLs to the relevant section

this may be better suited for the `fetchurl` reference, but it's probably better to
just render that information into the manual. for now, because
- contributor documentation encourages mirrors
- we can expect contributors to dig into the source
- linking source files is trivial in in-code documentation
we leave it there.

* move instructions for updating hashes to the manual

* Add more clarity on text, reorganise source hash methods

---------

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Dominic Mills-Howell <dominic.millz27@gmail.com>
Co-authored-by: lolbinarycat <dogedoge61+github@gmail.com>
2024-04-03 08:18:11 +02:00
DS
2ce2079e4d nixos-render-docs: make examples collapsible by default 2024-04-02 21:48:03 -07:00
github-actions[bot]
c8275d7800
Merge staging-next into staging 2024-03-31 18:01:31 +00:00
github-actions[bot]
07f01fb40f
Merge master into staging-next 2024-03-31 18:01:04 +00:00
Daniel Sidhion
c3cb77dfe5
Merge pull request #300019 from eflanagan0/doc-lowercase-npm
doc: lowercase npm name
2024-03-31 10:38:33 -07:00
Vincent Laporte
f6371cad74
doc: clean-up Coq derivation example (#299927) 2024-03-31 10:35:35 -07:00
github-actions[bot]
d7ece48399
Merge staging-next into staging 2024-03-30 18:01:46 +00:00
github-actions[bot]
50812f5204
Merge master into staging-next 2024-03-30 18:01:17 +00:00
K900
59bccda153 Revert "stdenv: add meta.repository field"
This reverts commit 7e1443abbb.
2024-03-30 17:19:21 +03:00
github-actions[bot]
14d4fad30c
Merge staging-next into staging 2024-03-30 00:02:47 +00:00
github-actions[bot]
04a895835e
Merge master into staging-next 2024-03-30 00:02:16 +00:00
a-n-n-a-l-e-e
2809c84cfb
Merge pull request #294347 from lolbinarycat/meta.repository
stdenv: add meta.repository field
2024-03-29 13:03:04 -07:00
binarycat
7e1443abbb stdenv: add meta.repository field 2024-03-29 14:34:09 -04:00
Eli Flanagan
693c7d91c9
doc: lowercase npm name
npm, Inc documentation asks to use lowercase. Their documentation also has consistent lowercase usage. e.g. <https://docs.npmjs.com/about-npm>
2024-03-29 11:10:49 -04:00
annalee
675fb1648e
Merge remote-tracking branch 'upstream/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/apsw/default.nix
	pkgs/development/python-modules/deal/default.nix
	pkgs/development/python-modules/kubernetes/default.nix
2024-03-28 13:02:34 +00:00
github-actions[bot]
69de1e1beb
Merge master into staging-next 2024-03-28 12:01:21 +00:00
Janne Heß
bc5ee2b8f8 treewide: Switch markdown placeholder from "..." to <...>
We use angle brackets since they look a lot like a placeholder while
also being valid nix code, as suggested by roberth here: https://github.com/NixOS/nixpkgs/pull/299554#discussion_r1541797970
2024-03-28 09:28:12 +01:00
Janne Heß
fcc95ff817 treewide: Fix all Nix ASTs in all markdown files
This allows for correct highlighting and maybe future automatic
formatting. The AST was verified to work with nixfmt only.
2024-03-28 09:28:12 +01:00
Janne Heß
bc77c7a973 treewide: Mark Nix blocks in markdown as Nix
This should help us with highlighting and future formatting.
2024-03-28 09:28:12 +01:00
github-actions[bot]
7f09da0f22
Merge staging-next into staging 2024-03-26 00:02:40 +00:00
github-actions[bot]
c904e6bf24
Merge master into staging-next 2024-03-26 00:02:03 +00:00
Aleksana
5616042a51
doc: add build rust package with meson example (#298881) 2024-03-25 21:45:19 +01:00
github-actions[bot]
f904a6b3b5
Merge staging-next into staging 2024-03-25 12:01:47 +00:00
github-actions[bot]
90e2c2cda5
Merge master into staging-next 2024-03-25 12:01:17 +00:00
sekc
b1b78f4369
doc/build-helpers: add missing semicolons (#298632)
Co-authored-by: seksea <williamireland0@gmail.com>
2024-03-25 12:59:19 +01:00
Thomas Watson
26ccdea3d7 python3Packages.setuptoolsBuildHook: delete broken setuptoolsShellHook
Broken since the switch to PyPA's build/installer in
6c85fff302.

The hook was always janky and maintainers appear to not want its current
implementation in-tree. No replacement is currently planned.

However, this leaves the path open for future replacements as a broken
hook will no longer be installed by default.
2024-03-24 19:21:55 -05:00
github-actions[bot]
5e808ed203
Merge staging-next into staging 2024-03-23 00:02:29 +00:00
Eli Flanagan
f6b397eed0
doc: improve javascript conventions (#298127)
I created newlines per the <https://github.com/NixOS/nixpkgs/blob/master/doc/README.md#documentation-conventions> guide.

This paves the way for future contributions to not be distracted by expected conventions.
2024-03-22 14:36:09 -07:00
github-actions[bot]
d28bcc2044
Merge staging-next into staging 2024-03-21 18:01:42 +00:00
Silvan Mosberger
1b54a5cb78
Merge pull request #297687 from DanielSidhion/fix-manual-headings
doc: fix code to generate links for headings in the manual
2024-03-21 16:11:12 +01:00
DS
cf94a85e99 doc: fix code to generate links for headings in the manual 2024-03-21 07:59:55 -07:00
github-actions[bot]
4fd286e707
Merge staging-next into staging 2024-03-21 12:01:49 +00:00
Martin Weinelt
07717e430d
Merge pull request #297347 from tzx/docs-right-location-buildPytonPackage
doc: document name binding for buildPythonPackage
2024-03-21 05:53:08 +01:00
Timmy Xiao
a6b670edaa doc: document name binding for buildPythonPackage 2024-03-21 00:27:35 -04:00
github-actions[bot]
7f8db6f00d
Merge staging-next into staging 2024-03-20 18:01:38 +00:00
Sarah Clark
2f7f71ea58
doc: Add troubleshooting for Cythonized code and pytest (#293069)
Cython is a Python compiler that emits native .so modules. By default, python derivations run tests in the wrong directory to see these modules and tests fail.

Issue #255262 documents the root cause and solution for this problem.

This PR adds a description of the problem and the most common solution to the test troubleshooting list.
2024-03-20 14:21:09 +01:00
github-actions[bot]
ffc1886a16
Merge staging-next into staging 2024-03-20 00:02:37 +00:00
Someone
e7797267a2
Merge pull request #281576 from yannham/refactor/cuda-setup-hooks-refactor
cudaPackages: generalize and refactor setup hooks
2024-03-19 20:06:18 +00:00
github-actions[bot]
c293380058
Merge staging-next into staging 2024-03-19 12:01:49 +00:00
Someone
63709965b7
Merge pull request #178717 from ShamrockLee/write-multiple-references
trivial-builders: replace writeReferencesToFile with writeClosure
2024-03-19 08:57:20 +00:00
github-actions[bot]
66eeab8faf
Merge staging-next into staging 2024-03-19 06:01:43 +00:00
Pol Dellaiera
186c3e34a7
Merge pull request #296549 from TomaSajt/strip-java-archives-hook
add stripJavaArchivesHook and use treewide
2024-03-19 05:41:08 +01:00
github-actions[bot]
b727e4cb21
Merge staging-next into staging 2024-03-19 00:02:39 +00:00
Daniel Sidhion
83f77a1b38
Merge pull request #294019 from Lurkki14/doc-makedesktopitem
doc: document makeDesktopItem
2024-03-18 16:08:29 -07:00
Yueh-Shun Li
e9fd4389d2 writeClosure: init, replacing writeReferencesToFile
Replace writeReferencesToFile with writeClosure.

Make writeClosure accept a list of paths instead of a path.

Re-implement with JSON-based exportReferencesGraph interface provided by
__structuredAttrs = true.

Reword the documentation.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Someone Serge <sergei.kozlukov@aalto.fi>
2024-03-19 02:45:50 +08:00
Jussi Kuokkanen
7d61bb198f doc: document makeDesktopItem 2024-03-18 18:24:51 +02:00
Doron Behar
290c16532c doc/mkYarnPackage: document better distPhase and doDist 2024-03-18 11:29:47 +02:00
TomaSajt
e08f26cdb1
doc: include stripJavaArchivesHook in the java section 2024-03-17 18:52:03 +01:00
github-actions[bot]
b74fe245b8
Merge staging-next into staging 2024-03-17 00:02:45 +00:00
maralorn
06f993f7e7 Merge branch 'master' into haskell-updates 2024-03-16 23:33:06 +01:00
Daniel Sidhion
a1581a3647
doc: fix and simplify stylesheets for the manuals, fix nrd bug (#295847)
* doc: fix and simplify stylesheets for the manuals, fix nrd bug

* Add anchorjs script to add links on section headers

* Fix another nrd bug, address style changes

* Use span instead of a for inline span syntax
2024-03-16 20:16:59 +01:00
Matthieu Coudron
545c14d5e4 doc/lua: mention the patching of interpreters
explain why they are patched in nixpkgs.
2024-03-16 14:37:10 +01:00
Yann Hamdaoui
63746cac08
cudaPackages: generalize and refactor setup hook
This PR refactor CUDA setup hooks, and in particular
autoAddOpenGLRunpath and autoAddCudaCompatRunpathHook, that were using a
lot of code in common (in fact, I introduced the latter by copy pasting
most of the bash script of the former). This is not satisfying for
maintenance, as a recent patch showed, because we need to duplicate
changes to both hooks.

This commit abstract the common part in a single shell script that
applies a generic patch action to every elf file in the output. For
autoAddOpenGLRunpath the action is just addOpenGLRunpath (now
addDriverRunpath), and is few line function for
autoAddCudaCompatRunpathHook.

Doing so, we also takes the occasion to use the newer addDriverRunpath
instead of the previous addOpenGLRunpath, and rename the CUDA hook to
reflect that as well.

Co-Authored-By: Connor Baker <connor.baker@tweag.io>
2024-03-15 15:54:21 +01:00
github-actions[bot]
cb97fed572
Merge master into haskell-updates 2024-03-15 00:12:36 +00:00
Silvan Mosberger
f60515ddea
Merge pull request #293416 from DanielSidhion/remove-makesnap
snapTools: remove
2024-03-14 16:46:22 +01:00
github-actions[bot]
9e0e89d13c
Merge master into haskell-updates 2024-03-13 00:12:20 +00:00
Robert Hensing
e99021ff75 trivial-builders: Deduplicate docs
I didn't have the opportunity to do all work at once, so I've added
TODOs to bring attention to the situation.
2024-03-11 11:33:14 +01:00
github-actions[bot]
54e3ad5442
Merge master into haskell-updates 2024-03-09 00:11:53 +00:00
adisbladis
434df3c94b
Merge pull request #289231 from adisbladis/fetchnpmlock
importNpmLock: init
2024-03-08 15:14:37 +13:00
github-actions[bot]
8534fb2f53
Merge master into haskell-updates 2024-03-07 00:10:05 +00:00
Matthieu Coudron
0bdfbc9e6a doc/lua.section.md: update lua documentation 2024-03-06 22:54:01 +01:00
Philip Taron
86ae7a6243
Remove top level with lib; in docs (#293829) 2024-03-06 22:35:43 +01:00
Anderson Torres
e671d3bbbd Nix docs: remove with lib; from example code
Following [Best Practices](https://nix.dev/guides/best-practices#with-scopes),
`with` is a problematic language construction and should be avoided.

Usually it is employed like a "factorization": `[ X.A X.B X.C X.D ]` is written
`with X; [ A B C D ]`.

However, as shown in the link above, the syntatical rules of `with` are not so
intuitive, and this "distributive rule" is very selective, in the sense that
`with X; [ A B C D ]` is not equivalent to `[ X.A X.B X.C X.D ]`.

However, this factorization is still useful to "squeeze" some code, especially
in lists like `meta.maintainers`.

On the other hand, it becomes less justifiable in bigger scopes. This is
especially true in cases like `with lib;` in the top of expression and in sets
like `meta = with lib; { . . . }`.

That being said, this patch removes most of example code in the current
documentation.

The exceptions are, for now
- doc/functions/generators.section.md
- doc/languages-frameworks/coq.section.md

because, well, they are way more complicated, and I couldn't parse them
mentally - yet another reason why `with` should be avoided!
2024-03-06 11:40:09 -03:00
Martin Weinelt
14a12caecf
python38: remove
The end of life for Python 3.8 is scheduled for 2024/10. As such it
cannot be a part of NixOS 24.05, because its support cycle goes past
that.
2024-03-05 11:56:21 +01:00
DS
1d85557b50 snapTools: remove
`snapTools.makeSnap` has produced broken snaps since at least Oct 2020,
as indicated by the following issue: https://github.com/NixOS/nixpkgs/issues/100618

No person has shown interest in maintaining it, and given that there is
no fix available, it's assumed that all attempts made to fix that
function have not succeeded.

Given that `snapTools` only contained `makeSnap`, it was removed
completely.
2024-03-04 22:22:14 -08:00
github-actions[bot]
1ad8409e69
Merge master into haskell-updates 2024-03-05 00:12:06 +00:00
Leon
0bb74f147b
doc: small fix for nightly in derivation snippet (#292688) 2024-03-04 15:44:39 -08:00
adisbladis
b6e4b86809 importNpmLock: init
This is an alternative to `fetchNpmDeps` that is notably different in that it uses metadata from `package.json` & `package-lock.json` instead of specifying a fixed-output hash.

Notable features:
- IFD free.
- Only fetches a node dependency once. No massive FODs.
- Support for URL, Git and path dependencies.
- Uses most of the existing `npmHooks`

`importNpmLock` can be used _only_ in the cases where we need to check in a `package-lock.json` in the tree.
Currently this means that we have 13 packages that would be candidates to use this function, though I expect most usage to be in private repositories.

This is upstreaming the builder portion of https://github.com/adisbladis/buildNodeModules into nixpkgs (different naming but the code is the same).
I will archive this repository and consider nixpkgs the new upstream once it's been merged.

For more explanations and rationale see https://discourse.nixos.org/t/buildnodemodules-the-dumbest-node-to-nix-packaging-tool-yet/35733

Example usage:
``` nix
stdenv.mkDerivation {
  pname = "my-nodejs-app";
  version = "0.1.0";

  src = ./.;

  nativeBuildInputs = [
    importNpmLock.hooks.npmConfigHook
    nodejs
    nodejs.passthru.python # for node-gyp
    npmHooks.npmBuildHook
    npmHooks.npmInstallHook
  ];

  npmDeps = buildNodeModules.fetchNodeModules {
    npmRoot = ./.;
  };
}
```
2024-03-05 12:23:28 +13:00