Commit Graph

2718 Commits

Author SHA1 Message Date
Alyssa Ross
10f35ff05d meson.setupHook: prefer meson commands over ninja
Meson now comes with its own set of commands for building, testing,
installing etc., that by default wrap around Ninja.  The reason to
prefer using the Meson commands is that they take additional
options (e.g. setting custom timeouts for tests — my motivation for
this change).

Here, I've modified the Meson setup hook so that Meson's test and
install commands will be used instead of Ninja's when Meson's
configurePhase is used.  This restriction is to avoid starting to run
Meson directly when dealing with custom build systems that wrap around
Meson, like QEMU's.  We don't use meson's compile command, as it just
runs ninja, and that's handled fine by the existing Ninja setup hook.

Naturally the Meson commands don't support entirely the same set of
options that the Ninja ones did, but I checked through Nixpkgs to find
any packages using Meson that used any options that wouldn't be picked
up by this new system.  I only found one, and it was just setting
checkTarget = "test", which is the default value for Ninja and has no
Meson equivalent (because we directly tell Meson to run the tests
rather than going through a generic job system like Ninja).

Link: https://github.com/NixOS/nixpkgs/issues/113829
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2023-10-09 10:21:36 +00:00
Doron Behar
d090cd9af4
Merge pull request #258384 from doronbehar/buildNpmPackage-makeWrapperArgs
buildNpmPackage: support makeWrapperArgs
2023-10-08 12:38:33 +03:00
Doron Behar
fc96f6d0fd buildNpmPackage: support makeWrapperArgs 2023-10-07 14:09:05 +03:00
Doron Behar
d6521ce186 docs/javascript/buildNpmPackage: Document fetchNpmDeps
Co-authored-by: Lily Foster <lily@lily.flowers>
2023-10-07 14:09:05 +03:00
Doron Behar
384b1e5b91 docs/javascript/buildNpmPackage: Document bin, man and npm pack behavior 2023-10-07 14:09:05 +03:00
github-actions[bot]
2d9bfd243a
Merge master into haskell-updates 2023-10-04 00:12:08 +00:00
Matthieu Coudron
47d0a0c440
Merge pull request #253714 from teto/vim-updater-package 2023-10-03 15:55:44 +02:00
github-actions[bot]
ea0284a3da
Merge master into haskell-updates 2023-10-03 00:12:01 +00:00
Lorenzo Manacorda
b19e9bebdc doc: minimal documentation of supported platforms
This commit adds minimal documentation of the supported platforms.
More exhaustive documentation would require producing a list of
platforms for each of the 7 tiers. This was attempted in #245368, but it
quickly became clear that that would be a long-term effort.

In the meantime, this commit adds the most important information to the
manual.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-02 21:21:56 +02:00
Matthieu Coudron
901b21c555 vimPluginsUpdater: init
The nixpkgs documentation mentions how to update out of tree plugins but
one problem is that it requires a nixpkgs clone.
This makes it more convenient.
I've had the need to generate vim plugins and lua overlays for other
projects unrelated to nix and this will make updates easier (aka just
run `nix run nixpkgs#vimPluginsUpdater -- --proc=1` or with the legacy commands:
`nix-shell -p vimPluginsUpdater  --run vim-plugins-updater`.

I added an optional "nixpkgs" argument to command line parser, which is the path
towards a nixpkgs checkout. By default the current folder.

update-luarocks-packages: format with black
2023-10-01 17:30:55 +02:00
github-actions[bot]
c0831fce32
Merge master into haskell-updates 2023-09-30 00:11:44 +00:00
Alejandro Sánchez Medina
cbd1748558
nixpkgs manual: add an alternative example in stdenv-separateDebugInfo (#257861)
* nixpkgs manual: add an alternative example in stdenv-separateDebugInfo

This change gets rid of the indirect reference to `nix-env -i` usage
and shows how to achieve the same goal with a shell expression.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-09-29 10:23:22 +02:00
github-actions[bot]
23bb2be564
Merge master into haskell-updates 2023-09-29 00:11:52 +00:00
Peder Bergebakken Sundt
470614b671 treewide: Fix typos 2023-09-28 19:06:13 +02:00
github-actions[bot]
6982839dbf
Merge master into haskell-updates 2023-09-28 00:12:12 +00:00
Matthieu Coudron
0ab2c96429 vimUtils: buildVimPluginFrom2Nix renamed to buildVimPlugin
the `from2Nix` suffix is a legacy from vim2nix but we dont use that anymore. It makes the name of the function unusual and long.
2023-09-27 19:08:38 +02:00
Felix Yan
8ac0795c1f doc: fix wrong flag in description of bindnow
`-z bindnow` doesn't exist. The actual flag added is `-z now`.
2023-09-27 09:59:56 -03:00
github-actions[bot]
a1486d7898
Merge master into haskell-updates 2023-09-26 00:11:53 +00:00
Valentin Gagarin
fba19509b1 use nix-shell -p for dhall-to-nixpkgs example 2023-09-25 17:00:55 +02:00
Valentin Gagarin
370097ce86
remove the misleading warning on using nix-env for split outputs (#255947)
The text was originally added [0] following an apparently incomplete
research on how everything plays together. In fact, Nix propagates
`outputs` to the corresponding nested derivations, and there is some
messy behavior in Nixpkgs that only seems to propagate
`meta.outputsToInstall` in `buildEnv`[1].

This change moves the hints on how to use NixOS specifics to NixOS
module documentation (which is hopefully easier to find through
search.nixos.org), describes the default behavior in Nixpkgs (updating
a the link to the source), and removes the confusing mention of
`nix-env`.

the last of them should not be there to begin with. we don't want
beginners to use `nix-env`, as this is known to run them into trouble
eventually.

[0]: https://github.com/NixOS/nixpkgs/pull/76794
[1]: 1774d07242/pkgs/build-support/buildenv/default.nix (L66)
2023-09-25 16:23:01 +02:00
Frederik Rietdijk
f4822bb295
Merge pull request #254309 from pbsds/flit-prune
python3Packages.flitBuildHook: remove
2023-09-25 11:34:15 +02:00
github-actions[bot]
979ae655ed
Merge master into haskell-updates 2023-09-25 00:12:21 +00:00
Alejandro Sánchez Medina
ade134ecd1
nixpkgs manual: doc python: add hyperlinks to Python section (#252156)
* nixpkgs manual: doc python: add hyperlinks to Python section

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-09-24 19:13:18 +02:00
github-actions[bot]
c7e7b8497d
Merge master into haskell-updates 2023-09-23 00:11:31 +00:00
Peder Bergebakken Sundt
bdda7b0a53 python3Packages.flitBuildHook: remove 2023-09-22 21:11:24 +02:00
Anderson Torres
c1b3bfba4f doc: include short docs about bmake 2023-09-22 01:38:23 -03:00
github-actions[bot]
8d865daa72
Merge master into haskell-updates 2023-09-22 00:11:39 +00:00
Robert Hensing
5c97f01a9d
Merge pull request #255025 from tweag/fileset.union
`lib.fileset.union`, `lib.fileset.unions`: init
2023-09-21 11:49:57 +02:00
github-actions[bot]
5c87b0f672
Merge master into haskell-updates 2023-09-21 00:11:46 +00:00
Silvan Mosberger
c5ae093f13 lib.fileset: Various updates relating to union/unions
Also some minor formatting improvements
2023-09-21 00:21:01 +02:00
maralorn
a4f9ea332a
haskell-docs: Fix typo in function name 2023-09-20 19:44:16 +02:00
Wout Mertens
00de2104fc corepack: PR review updates
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
Co-authored-by: Sandro Jaeckel <sandro.jaeckel@gmail.com>
2023-09-20 17:27:05 +02:00
Wout Mertens
724f6bcb77 nodejs: corepack wrappers package 2023-09-20 10:10:51 +02:00
Robert Hensing
2999014a5f
Merge pull request #255916 from fricklerhandwerk/doc-runcommand
rewrite `runCommand` interface docs
2023-09-18 19:42:17 +02:00
Valentin Gagarin
35d066de5f rewrite runCommand interface docs
specifically this corrects the misleading statement that `env` takes
environment variables for the derivation.
2023-09-18 17:47:47 +02:00
Valentin Gagarin
e2c2528075
BEAM docs: recommend nix-shell -p and shell.nix instead of nix-env (#255131)
* BEAM docs: recommend `nix-shell -p` and `shell.nix` instead of `nix-env`

Co-authored-by: asymmetric <lorenzo@mailbox.org>
2023-09-18 16:34:30 +02:00
Mario Rodas
3b1f3712a4
Merge pull request #255128 from PuercoPop/ruby-document-extraConfigPaths
ruby: document extraConfigPaths option from bundlerEnv
2023-09-15 08:13:32 -05:00
Maciej Krüger
7b737acb4a
Merge pull request #254967 from nbraud/sha256-to-hash/top-level 2023-09-15 14:36:49 +02:00
Weijia Wang
0cfc319f83 fetchDebianPatch: Require patch names with extensions
Otherwise the fetcher is unuseable with patches
whose filename (in Debian) doesn't end in `.patch`.
2023-09-14 18:55:30 +00:00
Frederik Rietdijk
53dd1a6edb
Merge pull request #254136 from figsoda/python
python310Packages.buildPythonPackage: introduce pyproject option
2023-09-14 18:33:49 +02:00
asymmetric
52351762b7
doc: remove mention of X11 license variant (#255081)
The Nixpkgs license is pure MIT.
2023-09-14 18:08:25 +02:00
asymmetric
b414f942e0
doc: link, instead of just mentioning, Nix manual (#255126)
Instead of just telling the reader to go find the relevant section of the Nix
manual, let's just link to it. Yay hypertext!
2023-09-14 17:09:39 +02:00
Maximilian Ehlers
a29cf4aece
Link to usage of pkg description instead of referring to nix-env (#255127)
* Updates meta.chapter.md with a reference link to the usage of the package description field instead of referring to nix-env

---------

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-09-14 16:59:20 +02:00
Javier Olaechea
fbe107fd5c ruby: document extraConfigPaths option from bundlerEnv 2023-09-14 09:46:07 -05:00
Elis Hirwing
350cac13cf
Merge pull request #248184 from NixOS/php/add-new-builder-only
php: add new Composer builder
2023-09-14 07:50:27 +02:00
nicoo
fe138d36c9 doc: Replace sha256 with hash where appropriate 2023-09-13 17:24:49 +00:00
Pol Dellaiera
c0c01910ce
php: update documentation 2023-09-13 15:00:03 +02:00
github-actions[bot]
f90dd167f5
Merge master into staging-next 2023-09-13 12:01:05 +00:00
ajs124
f85cec7548 erlang23: remove 2023-09-13 11:33:11 +00:00
figsoda
39c64e2323 doc/python: document pyproject and remove usages of format 2023-09-12 19:54:43 -04:00