Commit Graph

1630 Commits

Author SHA1 Message Date
Jan Tojnar
88c998fb21
Merge branch 'staging-next' into staging 2021-01-10 23:24:57 +01:00
Dominik Xaver Hörl
25bef2d8f9 treewide: simplify pkgs.stdenv.lib -> pkgs.lib
The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
2021-01-10 20:12:06 +01:00
github-actions[bot]
bd9e17e21f
Merge staging-next into staging 2021-01-10 18:41:46 +00:00
Jörg Thalheim
51894963cb
Merge pull request #89775 from numinit/update-androidenv 2021-01-10 15:09:36 +00:00
Frederik Rietdijk
df2b0589ae Qt docs: we now use qt5-packages.nix 2021-01-10 15:59:45 +01:00
Alyssa Ross
c06b2b3d67 doc: add "prefer lib over stdenv.lib" convention
I think we should have something in the manual people can point to
about this, to avoid rehashing it over and over in PRs.  "stdenv.lib"
makes it look like lib is part of stdenv, which it isn't, and makes it
even more confusing as a newcomer to figure out what stdenv is (and
isn't).
2021-01-10 08:24:52 +01:00
Cyril Cohen
9ffd16b385 coqPackages: refactor 2021-01-09 11:56:17 +01:00
Ben Siraphob
6a544b73f9 Convert Elm from Docbook to Commonmark 2021-01-05 12:35:50 +07:00
numinit
5b91d4ab65 Rework androidenv package generation
androidenv did not previously write license files, which caused certain
gradle-based Android tools to fail. Restructure androidenv's list of
Android packages into a single repo.json file to prevent duplication
and enable us to extract the EULA texts, which we then hash with
builtins.hashString to produce the license files that Android gradle
tools look for.

Remove includeDocs and lldbVersions, as these have been removed
from the Android package repositories.

Improve documentation and examples.
2021-01-03 21:27:23 -07:00
Tikhon Jelvis
70cd2cb336 r-modules: update cran and bioc packages
The last snapshot was 4 months ago (2020-08-19). I also found that I needed newer definitions when I was trying to fix the R arrow package.

This update required a couple of manual changes:

  1. Removing a few deleted packages from default.nix
  2. Renaming the "assert" package to "r_assert" in generate-r-packages.R because "assert" is a keyword in Nix
2021-01-02 15:03:06 -08:00
Ryan Mulligan
dd6c0efa62
Merge pull request #108147 from ryantm/doc-cleanup
doc: explicit Markdown anchors for top-level headings; remove metadata
2021-01-01 11:40:09 -08:00
Ryan Mulligan
b8344f9e5c doc: explicit Markdown anchors for top-level headings; remove metadata
I used the existing anchors generated by Docbook, so the anchor part
should be a no-op. This could be useful depending on the
infrastructure we choose to use, and it is better to be explicit than
rely on Docbook's id generating algorithms.

I got rid of the metadata segments of the Markdown files, because they
are outdated, inaccurate, and could make people less willing to change
them without speaking with the author.
2021-01-01 10:02:57 -08:00
Daniël de Kok
b6728fa15c docs/rust: describe cargoHash 2020-12-31 11:18:13 +01:00
Justus K
357f132b94 doc: convert Steam to CommonMark 2020-12-22 20:34:50 -08:00
Jan Tojnar
3dfcc7e3a5
Merge pull request #107044 from jtojnar/overridable-php-packages 2020-12-22 22:39:29 +01:00
sternenseemann
0096eb9274 doc/fetchers: document leaveDotGit, deepClone and fetchSubmodules 2020-12-21 14:22:39 +01:00
Jan Tojnar
5fb6fbcad9
Merge pull request #106845 from AndersonTorres/wip-documentation 2020-12-17 18:19:11 +01:00
AndersonTorres
30bfb2f5d0 Convert fetchers from DocBook to CommonMark 2020-12-17 12:00:49 -03:00
AndersonTorres
59f9db8b09 Convert trivial-builders from DocBook to CommonMark 2020-12-17 12:00:48 -03:00
AndersonTorres
4526fe9804 Convert locales from DocBook to CommonMark 2020-12-16 18:04:34 -03:00
AndersonTorres
7113b40fb3 Convert fhs-environments from DocBook to CommonMark 2020-12-16 14:51:43 -03:00
AndersonTorres
23d5784770 Convert mkShell from DocBook to CommonMark 2020-12-16 14:51:43 -03:00
Jan Tojnar
b2594c71c2
php.packages: Make packages overridable
This will allow patching extensions without having to manually having to patch all occurrences in the dependency tree.
2020-12-16 18:32:27 +01:00
Lassulus
00b8fa792b
Merge pull request #106000 from Luis-Hebendanz/firefoxWrapperAddonSettings
firefox: wrapper updating an addon perserves addon settings
2020-12-15 22:16:48 +01:00
Luis Hebendanz
1c8c134972 firefox: wrapper updating an addon perserves addon settings 2020-12-15 22:02:34 +01:00
Robert Hensing
3393e110a9
doc/stdenv/cross-compilation.chapter.md typo
Co-authored-by: John Ericson <git@JohnEricson.me>
2020-12-15 15:57:27 +01:00
Robert Hensing
c7e5c02374
doc/cross-compilation: Remove confusing re-explanation
See https://github.com/NixOS/nixpkgs/issues/106950

> They way it's worded says buildInputs are for build-time and nativeBuildInputs are for run-time. The other documentation leads me to believe it is the other way around.
2020-12-15 11:45:38 +01:00
Ben Siraphob
71a7249a48 doc/stdenv/cross-compilation: convert to markdown 2020-12-13 19:49:39 +07:00
Jan Tojnar
ba11a96653
doc: Add staging workflow diagram 2020-12-09 05:26:55 +01:00
Ryan Mulligan
c2effbb448
Merge pull request #105962 from jtojnar/db-submitting-changes
doc: convert Submitting changes to Markdown
2020-12-07 20:55:33 -08:00
Jan Tojnar
62248877ad
doc/stdenv: Fix xref to gdk-pixbuf setup hook
DocBook does not support creating labels for unordered list items so we need to add a link label ourselves.
2020-12-07 23:49:56 +01:00
Jan Tojnar
be8a3b8d9d
doc: convert GNOME platform docs to markdown 2020-12-07 23:49:56 +01:00
Jan Tojnar
64b8489d54
doc: clean up makefile
The sectn and ulink hacks are not necessary since pandoc has been defaulting to Docbook 5 for a long time.
With the pandoc patches, we can get rid of id→xml:id replacement and xmlns hacks as well.
2020-12-07 23:49:56 +01:00
Jan Tojnar
e4c3cda197
doc: rename gnome to section 2020-12-07 23:49:36 +01:00
Wil Taylor
2eb20aa8ce
doc: Converted Bower docs from xml to md 2020-12-07 09:38:47 +01:00
Stefan Schroeder
9d7082950b
doc: Port Perl to Markdown 2020-12-07 08:45:20 +01:00
github-actions[bot]
0947539ec1
Merge master into staging-next 2020-12-05 12:18:17 +00:00
Jan Tojnar
cc3228e0bb
doc: Clean up submitting changes 2020-12-05 13:03:22 +01:00
Jan Tojnar
035960e4f6
doc: convert Submitting changes to Markdown 2020-12-05 12:43:25 +01:00
Jan Tojnar
5ad6509278
doc: Rename submitting-changes to chapter 2020-12-05 12:33:00 +01:00
Terin Stock
edfe388d1e doc/firefox: correct manual generation
Corrects the level of the "Troubleshooting" section, and adds an anchor
for Firefox.
2020-12-05 00:31:21 -08:00
github-actions[bot]
55b348fe1b
Merge master into staging-next 2020-12-05 06:16:24 +00:00
Ryan Mulligan
25e00d8c7e
Merge pull request #105648 from AndersonTorres/wip-documentation
Documentation updates from Docbook to CommonMark
2020-12-04 21:37:09 -08:00
AndersonTorres
f5baf84be5 Convert OCaml from DocBook to CommonMark 2020-12-04 23:35:26 -03:00
github-actions[bot]
cb36dd7449
Merge master into staging-next 2020-12-04 18:14:51 +00:00
Jörg Thalheim
29566ca021
Merge pull request #105796 from Luis-Hebendanz/fix_firefox_wrapper
Fix firefox wrapper
2020-12-04 17:01:05 +00:00
Luis Hebendanz
d3a6a124cf firefox: fix wrapper removing existing addons by default 2020-12-04 17:53:14 +01:00
github-actions[bot]
884a0b091b
Merge master into staging-next 2020-12-04 00:37:25 +00:00
Jan Tojnar
4fd3b00f06
doc/emacs: re-add anchor 2020-12-04 01:34:44 +01:00
github-actions[bot]
1aeec1f039
Merge master into staging-next 2020-12-03 18:14:40 +00:00
Stu
177023d3f1
doc: convert urxvt to CommonMark
* convert urxvt documentation to common mark

* format urxvt documentation

* use ShellSession instead of nix
2020-12-03 06:46:29 -08:00
github-actions[bot]
5b73e3087a
Merge master into staging-next 2020-12-03 12:18:45 +00:00
AndersonTorres
bb0399be3d Convert Shell-Helpers from DocBook to CommonMark 2020-12-03 08:12:35 -03:00
Jörg Thalheim
3cd6bc103d
Merge branch 'master' into firefox-nix-addon-support 2020-12-03 07:20:16 +00:00
github-actions[bot]
6f36a7f7c3
Merge master into staging-next 2020-12-03 06:15:27 +00:00
Ryan Mulligan
3a2e9d2ac7
Merge pull request #105752 from ryantm/docbook2commonmark-packages-linux
docs: convert packages/linux docbook -> commonmark
2020-12-02 21:19:35 -08:00
Lucas Eduardo
543f084d62
doc: TeX Live to CommonMark
* converted texlive doc to markdown

Signed-off-by: GitHub <noreply@github.com>

* Remove frontmatter (suggestion)

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>

* Add anchor (suggestion)

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>

* apply suggestions from @ryantm

Signed-off-by: GitHub <noreply@github.com>

* fix nesting of codeblocks into list items as suggested by @jtojnar

Signed-off-by: GitHub <noreply@github.com>

* add anchors for subtopics as said by @jtojnar

Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>
2020-12-02 21:15:18 -08:00
Manuel Mendez
cb912fe2d3 docs: convert packages/linux docbook -> commonmark
Closes #105257
2020-12-02 21:03:26 -08:00
Justus K
58baa3f39c
convert nginx documentation to common mark 2020-12-02 20:14:05 +01:00
github-actions[bot]
89e8bf0f2a
Merge master into staging-next 2020-12-02 12:30:55 +00:00
Jörg Thalheim
7c8994e40e
doc/firefox: initial documentation 2020-12-02 10:02:22 +01:00
Domen Kožar
a0e24a6d40
Merge pull request #101806 from unode/docs
docs: Add 'how to request merging rights'
2020-12-01 17:12:20 +01:00
Frederik Rietdijk
ff90abd5dd Merge staging-next into staging 2020-12-01 14:23:10 +01:00
Corbin Simpson
8c9c0eb38b
doc/builders/packages/opengl: Convert to CommonMark. (#105485)
* doc/builders/packages/opengl: Convert to CommonMark.

* Update doc/builders/packages/opengl.section.md

NVIDIA™

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>

* Update doc/builders/packages/opengl.section.md

NVIDIA™

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>
2020-11-30 22:10:43 -08:00
Ryan Mulligan
1810623a77
Merge pull request #105481 from MostAwesomeDude/docs-commonmark-xorg
doc/builders/packages/xorg: Convert to CommonMark.
2020-11-30 22:08:16 -08:00
Corbin
874e3587ee doc/builders/packages/xorg: Use ShellSession for shell.
I was worried, but the HTML output can still be copy-and-pasted, so it's
not a problem.
2020-11-30 22:03:23 -08:00
Ryan Mulligan
795f75f21d
Merge pull request #105230 from Mic92/java-doc
doc/java: convert to markdown
2020-11-30 21:57:35 -08:00
Corbin
65fe2546b7 doc/builders/packages/xorg: Fix pasto.
I did double-check that the fixed version does what we would want. In
either case, the katamari script is mostly of historical value, and
there's nothing to change in pkgs.
2020-11-30 21:55:39 -08:00
Corbin
fc0f32e0f5 doc/builders/packages/xorg: Acknowledge the retired katamari.
I tested the shell snippets shown here; they work. Note that, because
they're intended for copy-and-paste, I did *not* make them into
ShellSessions with prompts. But that's something I can do if desired.
2020-11-30 21:55:39 -08:00
Corbin
e0fbc4d14c doc/builders/packages/xorg: Convert to CommonMark.
I had to pick 7.4 or 7.5. I picked 7.4 for now.
2020-11-30 21:55:39 -08:00
Ryan Mulligan
6c407c7077
Merge pull request #105322 from fzakaria/ISSUE-105264
doc: convert weechat docs to commonmark
2020-11-30 21:50:31 -08:00
Ryan Mulligan
7812bf4535
Merge pull request #105120 from wayofthepie/coq-to-commonmark
doc: convert coq to commonmark
2020-11-30 21:44:54 -08:00
Jan Tojnar
27b974d84b
Merge branch 'staging-next' into staging 2020-12-01 03:26:36 +01:00
Alex Brandt
195fe01e8b nixos/nixpkgs/docs: fix typo in assertOneOf example
This example was confusing at first because the element the message
indicated wasn't in the list of possible values was but the possible
values didn't match up either.  This ensures the example is consistent
with the logic being presented.
2020-11-30 20:56:33 +00:00
Ryan Mulligan
01e1d5cc9f
Merge pull request #105300 from AndersonTorres/wip-docs
Convert Emacs documentation from XML DocBook to Commonmark
2020-11-30 11:35:51 -08:00
AndersonTorres
19973c1893 Convert Emacs documentation from XML DocBook to CommonMark 2020-11-30 16:16:46 -03:00
zimbatm
bbc9af1f0a
tree-wide: do not use pkgs.extend in nixpkgs
Each invocation of pkgs.extends adds 130MB of allocation to the hydra
evaluator. We are already struggling with the amount of memory nixpkgs
requires.

`pkgs.extend` is a useful escape-hatch, but should be not be used inside
of nixpkgs directly.
2020-11-30 14:24:40 +01:00
Farid Zakaria
aa7493063a doc: convert weechat docs to commonmark
This is essentially an automatic pandoc conversion of the weechat
section in docbook as part of the larger CommonMark Docs project
(https://github.com/NixOS/nixpkgs/projects/37)

fixes #105264

Update doc/builders/packages/weechat.section.md

Co-authored-by: Frederik Rietdijk <freddyrietdijk@fridh.nl>

Update doc/builders/packages/weechat.section.md

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2020-11-29 21:52:17 -08:00
Wil Taylor
b6bca3d806
doc/Qt: migrate to CommonMark (#105004)
* Updated QT section

* Fixed trailing whitespace

* Update doc/languages-frameworks/qt.section.md

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>

* Update doc/languages-frameworks/qt.section.md

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>

* Made changes to docs as per jtojnar's review

* Added docbook tags for callouts back in

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2020-11-29 20:30:29 -08:00
AndersonTorres
25b8aa4a85 Convert Kakoune documentation from XML DocBook to Commonmark 2020-11-29 20:19:28 -03:00
John Ericson
73425f6c3b Merge remote-tracking branch 'upstream/master' into staging 2020-11-28 21:33:03 -05:00
John Ericson
b7650aaa77 rust: Clean up target configs and test some more
See the new docs for details. The difference is vis-a-vis older versions
of this PR, not master.
2020-11-28 19:36:28 +00:00
John Ericson
8ddf5c6907 Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target 2020-11-28 18:10:38 +00:00
John Ericson
c6617d28ef Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target 2020-11-28 17:09:12 +00:00
Ryan Mulligan
3c40c276fa
Merge pull request #105200 from ryantm/update-ruby-doc
doc: Ruby to CommonMark
2020-11-28 07:34:45 -08:00
Jörg Thalheim
762e414d6a
doc/java: convert to markdown 2020-11-28 15:29:04 +01:00
Jörg Thalheim
bc9313d088
Merge pull request #105025 from Mic92/go-doc
doc/go: convert to markdown
2020-11-28 15:03:51 +01:00
Jörg Thalheim
4844ca43d8
Merge pull request #67496 from mb21/patch-1
Docs: clarify Rust overlay on non-NixOS
2020-11-28 14:29:04 +01:00
Graham Bennett
6771aa3093
doc: clarify whitelistedLicenses
see the following for more info:
076860e034/pkgs/stdenv/generic/check-meta.nix (L229)
2020-11-28 10:25:13 +01:00
Jörg Thalheim
80b395015b
doc/go: convert to markdown 2020-11-28 07:32:10 +01:00
applePrincess
698111962e
doc/python: Fix shebang link (#105196) 2020-11-28 04:06:50 +01:00
Ryan Mulligan
6c70fdfd07 doc: ruby improvements
* no hard wrapping
* use ShellSession and nix info strings
* preserve old section anchor link
* update references to present default version
2020-11-27 19:00:41 -08:00
Kamron Mahmoodzadeh
495c2b5112 doc: use newer ruby documentation
With the addition of ruby.withPackages, manveru rewrote the nixpkgs
manual section for the ruby language but did not add it to the manual.
This commit replaces the previous documentation with manveru's updated
version.
2020-11-27 18:59:56 -08:00
Jan Tojnar
136152af80
Merge pull request #101537 from jtojnar/gtk-tracker 2020-11-28 01:37:37 +01:00
Stephen OBrien
a7e9047db3 doc: convert coq to commonmark 2020-11-27 08:13:55 +00:00
Jan Tojnar
95961244d3
doc/gnome: Document gdk-pixbuf setup hook
It was briefly mentioned in stdenv docs but since it interacts with wrapGAppsHook, it should be documented here.
2020-11-26 14:06:08 +01:00
Jan Tojnar
acfc45bacc
wrapGAppsNoGuiHook: init 2020-11-26 14:06:07 +01:00
Stephen OBrien
2bb9e7c18a doc: convert beam docs to commonmark 2020-11-26 11:30:17 +00:00
Pamplemousse
805cedf8d3 doc/builders: Remove out-of-date example
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2020-11-17 09:13:40 -08:00
Jonathan Ringer
0e89c426c7 doc/contributing: remove label instructions
ofborg largely does this now
2020-11-14 16:39:43 -08:00
Mitsuhiro Nakamura
cdfbdb0b2c doc: add usage for cataclysmDDA.attachPkgs 2020-11-13 10:29:50 +09:00
zowoq
3f20417b4c doc/*: fix indentation 2020-11-12 14:24:00 +10:00
Kevin Cox
d3a30145c3
Make maintainer documentation more direct (#103455)
Additionally fixes the "list of names and emails" to be a list of maintainer expressions.

A follow-up from the discussion in https://github.com/NixOS/nixpkgs/pull/96666
2020-11-11 19:55:27 -05:00
Felix Tenley
a94cc8dc92 dotnet: document new net packages 2020-11-11 15:35:23 -08:00
Kevin Cox
be4d08b5b4
Merge pull request #96666 from raboof/nixpkgs-document-new-maintainer-convention
Document conventions around adding new maintainers
2020-11-11 09:01:31 -05:00
Arnout Engelen
292de46c5b
Document conventions around adding new maintainers
Adding them to `maintainers/maintainer-list` in a separate commit.

Co-Authored-By: Pavol Rusnak <pavol@rusnak.io>
Co-Authored-By: Atemu <atemu.main@gmail.com>
Co-Authored-By: Kevin Cox <kevincox@kevincox.ca>
2020-11-11 14:07:20 +01:00
Kevin Cox
de57e3b630
Merge pull request #95165 from turion/patch-4
Doc -> Languages & Frameworks -> Rust: Update
2020-11-05 09:10:58 -05:00
Robert Hensing
d24360033d
Merge pull request #98383 from raboof/document-jre
openjdk: add derivation to generate bespoke minimal JRE's
2020-11-05 10:40:39 +01:00
Arnout Engelen
d4efa08b53
openjdk: add derivation to generate bespoke minimal JRE's
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
2020-11-04 17:47:18 +01:00
Frederik Rietdijk
9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Doron Behar
80b96cf4ad
Merge pull request #100660 from fzakaria/faridzakaria/maven-documentation 2020-11-04 00:24:19 +02:00
Farid Zakaria
b9321adf1e documentation: add documentation for maven
Add nice markdown documentation for how to use mvn2nix plugin and the
buildMaven function within nixpkgs.

Update doc/languages-frameworks/maven.md

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>
2020-11-03 09:23:05 -08:00
Frederik Rietdijk
237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Daniel Gorin
550389392a kakoune: rework plugin support
The previous implementation of plugin-support for the kakoune derivation
was based on generating, at build time, a `plugins.kak` file that would
source all .kak files in the list of plugins, and wrap the `kak` binary
in a script that would add some command-line arguments so that this
file gets loaded on start-up. The main problem with this approach
is that the plugins' code get executed *after* the user's configuration
file is loaded, so effectively one cannot automatically activate/configure
these plugins.

The idiomatic way of loading plugins is ensuring they end up installed
somwhere under `share/kak/autoload`. Because plugins are already being
packaged to have their code in `share/kak/autoload/plugins/<name-of-plugin>`,
we can obtain a derivation that includes the plugins simply by doing a
`symlinkJoin` of `kakoune-unwrapped` and all the requested plugins.

For this to work, we need to fix two issues:

  1. By default, kakoune makes `share/kak/autoload` a symbolic link to
     `share/kak/rc`, which contains all builtin definitions. We need
     to patch this to put the symlink under `share/kak/autoload/rc`, so that
     the join works.

  2. By default kakoune expects the `autoload` directory to be in
     `../share/kak/autoload` relative to the location of the `kak` binary.
     We need to set the `KAKOUNE_RUNTIME` to point the symlinked
     share/kak for this to work.
2020-11-01 14:35:49 +00:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Renato Alves
5c931c7299
docs: Add link to the GitHub issue on how to become a committer 2020-10-29 11:32:41 +01:00
Anderson Torres
066bf7dd5d
Merge pull request #101894 from AndersonTorres/terminal-emulators
Create a directory-category for terminal emulators
2020-10-28 23:27:05 -03:00
Austin Butler
7fd9976af3 vimPlugins: document update proces 2020-10-28 13:51:24 -07:00
AndersonTorres
2bb3a9da24 A directory-category for terminal emulators
This is a mostly cosmetical commit, in the sense it doesn't change the contents
of any package, but reorganizes the overall Nixpkgs expressions.

Terminal emulators are an ubiquitous tool for any Unix user; even the beginners
are routinely familiarized to it. And, manifestly, there are many
implementations of terminal emulators out there, from those traditionally made
in C and C++ to those written in Haskell and Go.

Terminal emulators deserve more highlight. This commit does that by creating a
category for them.
2020-10-28 10:22:39 -03:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Peter Simons
5fe0939d18 The Haskell documentation has moved to <https://haskell4nix.readthedocs.io/>.
That site is generated automatically from the set of text files found at
<https://github.com/NixOS/cabal2nix/tree/master/doc>.
2020-10-23 21:00:26 +02:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Jan Tojnar
7d17b2d6f3
doc: Use mesa.drivers instead of legacy alias
It was moved in 263f5891b6.
2020-10-18 00:58:09 +02:00
Aaron Janse
2bccf2e554 add documentation 2020-10-17 00:48:07 -07:00
Peter Simons
56bc587444 Merge remote-tracking branch 'origin/master' into haskell-updates, 2020-10-15 19:39:16 +02:00
John Ericson
c0df12de5d rust: Add support for managing target JSON in Nix 2020-10-14 04:20:23 +00:00
Frederik Rietdijk
dc0aeee5db Merge staging-next into staging 2020-10-13 19:35:37 +02:00
Frederik Rietdijk
9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Frederik Rietdijk
748bc99520 docs: python39 is available 2020-10-13 18:53:40 +02:00
Kevin Cox
8b33d575e4
Merge pull request #98084 from turion/patch-5
agda.section.md: Fix header and enumeration
2020-10-11 07:29:58 -04:00
maralorn
0756b8a7bf
haskell-language-server: Init wrapper for multiple ghc versions at 0.5.0 (#99519)
* haskell-language-server: Init wrapper for multiple ghc versions at 0.5.0

* Fix closure size

* docs: Add hls section to Haskell part of manual
2020-10-10 16:01:57 +02:00
Lily Ballard
7e1e8543fc installShellFiles: Enhance installShellCompletion
Teach installShellCompletion how to install completions from a named
pipe. Also add a convenience flag `--cmd NAME` that synthesizes the name
for each completion instead of requiring repeated `--name` flags.

Usage looks something like

    installShellCompletion --cmd foobar \
      --bash <($out/bin/foobar --bash-completion) \
      --fish <($out/bin/foobar --fish-completion) \
      --zsh <($out/bin/foobar --zsh-completion)

Fixes #83284
2020-10-08 15:08:40 -07:00
Frederik Rietdijk
692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Jan Tojnar
32b4375f10
Merge branch 'staging-next' into staging 2020-09-29 00:12:29 +02:00
Doron Behar
f1d01c9d58
Merge pull request #93332 from wamserma/docs-remove-replace-link
docs.stdenv: remove reference to replace tool
2020-09-26 19:20:46 +03:00
Manuel Bärenz
cd2dab91d6 Doc -> Languages & Frameworks -> Rust: Update
Add information on declarative overlay usage
2020-09-26 10:58:06 +02:00
Jörg Thalheim
a2960ac430
Merge pull request #97603 from zowoq/rust-test-threads 2020-09-25 06:19:23 +02:00
Jan Tojnar
d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
Jan Tojnar
6d518ddf77
Merge pull request #98503 from jtojnar/doc-prompts 2020-09-24 22:48:38 +02:00
Rok Garbas
882b95802f
Merge pull request #98640 from raboof/rename-guide-to-nixpkgs-manual
doc: rename guide to 'Nixpkgs Manual'
2020-09-24 14:36:09 +02:00
Arnout Engelen
926c7e8b4e
doc: rename guide to 'Nixpkgs Manual'
For consistency with 'NixOS Manual' and 'Nix Manual', to better match what it's
often called in practice, and to match its URL and HTML title.
2020-09-24 14:07:25 +02:00
Doron Behar
5819bca301 docs/go: Add examples for and explain buildFlags
Move common attributes treated by both buildGoModule and buildGoPackage
to a separate section, out of the examples' "callouts".

Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
2020-09-24 11:03:20 +10:00
zowoq
e4c71e6c6c buildRustPackage: support setting test-threads 2020-09-24 07:19:58 +10:00
Jan Tojnar
e1af37634b
doc: Improve code listings
By adding prompts and removing unnecessary indentation.
2020-09-23 01:25:25 +02:00
Frederik Rietdijk
7bff759fac Merge staging-next into staging 2020-09-22 18:31:56 +02:00
zowoq
069757550e doc/python: remove trailing whitespace 2020-09-21 09:35:27 +10:00
Manuel Bärenz
87cab901a3 agda.section.md: Fix header, enumerations, capitalisation 2020-09-18 12:42:06 +02:00
Robert Helgesson
fbc5093649
hooks: add moveSystemdUserUnitsHook
This hook moves systemd user service file from `lib/systemd/user` to
`share/systemd/user`. This is to allow systemd to find the user
services when installed into a user profile. The `lib/systemd/user`
path does not work since `lib` is not in `XDG_DATA_DIRS`.
2020-09-12 18:29:46 +02:00
Alexandre Esteves
0cad09a68a docs/rust: fix typo
Co-authored-by: Drew <drewrisinger@users.noreply.github.com>
2020-09-10 19:10:27 +02:00
Daniël de Kok
466522c919
Merge pull request #97137 from danieldk/blis-0.7.0
blis: init at 0.7.0
2020-09-08 14:55:39 +02:00
zowoq
23c781a810 buildGoPackage: check/delete vendor 2020-09-08 16:32:39 +10:00
Daniël de Kok
aeb5951978 doc/using/overlays.xml: add BLIS 2020-09-07 19:49:51 +02:00
Silvan Mosberger
560bb92473
Merge pull request #76794 from dudebout/document-nix-env-multiple-output-install-bug
document nix-env bug relating to multiple output installation
2020-09-05 15:40:26 +02:00
Nicolas Dudebout
611258f063 document nix-env bug relating to multiple output installation 2020-09-05 05:31:54 -04:00
Michele Guerini Rocco
2b575c5f1f
Merge pull request #96963 from doronbehar/doc/nodejs
doc: nodejs: Update override example to use overlays
2020-09-04 22:58:36 +02:00
Jake Waksbaum
58e585c93b vimPlugins: Document node-based plugins 2020-09-04 08:33:47 -07:00
Doron Behar
c67bcd23d4 doc: nodejs: Update override example to use overlays
Also: Add links so it'll be easier to find the referred files.
2020-09-02 19:00:46 +03:00
John Ericson
31dae7d627
Merge pull request #84047 from aaronjanse/document-android-emulator-variable
emulateApp: document $NIX_ANDROID_EMULATOR_FLAGS
2020-08-20 00:26:53 -04:00
Jonathan Ringer
233dc9c7d1
doc/python: Add pythonImportsCheck mention 2020-08-17 13:41:39 -07:00
Jonathan Ringer
93e7292976
doc/python: add pytestCheckHook section 2020-08-17 13:41:39 -07:00
worldofpeace
0149bdac53
Merge pull request #95511 from jtojnar/var-anchors
doc: Add anchors to stdenv variables
2020-08-16 22:50:13 -04:00
zowoq
473536e3b5 buildRustPackage: remove platform.all from packages 2020-08-16 12:48:18 +10:00
Jan Tojnar
3f2b7beaf3
doc: Add anchors to stdenv variables
Wanted to link them.
2020-08-15 17:55:30 +02:00
Frederik Rietdijk
49f4475307
Merge pull request #95305 from jonringer/remove-py35
python35: remove
2020-08-15 09:08:47 +02:00
zowoq
961aa31455 buildGoModule: update deleteVendor docs 2020-08-14 07:50:37 +10:00
Jonathan Ringer
8c7d49b726
docs: update python interpreter versions 2020-08-12 21:57:40 -07:00
Daniël de Kok
14ac67cbb3 doc/using/overlays.xml: fix some small glitches 2020-08-10 15:47:38 +02:00
Daniël de Kok
8ffc74313e doc/using/overlays.xml: add AMD BLIS/LIBFLAME to the BLAS/LAPACK list 2020-08-10 15:41:33 +02:00
Matthew Mazzanti
2df0fda951 doc: Fix missing callout in go.xml
Pull #89453 introduced a bug in the documentation that is preventing the
hydra build for nixpkgs-unstable from finishing. I have added the
additional option indroduced in that patch (runVend for go modules) and
added the callout tag so that the documenation can build again.
2020-08-02 09:35:04 +10:00
zowoq
e703f3f34b
Merge pull request #89453 from c00w/vend
Add vend support to go-modules
2020-07-31 15:16:47 +10:00
zowoq
b3d71cd63d doc/*: editorconfig fixes 2020-07-31 15:06:53 +10:00
Maciej Krüger
bee2b91b7f
doc/steam: add docs about new steam module 2020-07-30 20:26:33 +02:00
Colin L Rice
95be7b25be go-modules: Add useVend flag to go-modules 2020-07-28 21:11:28 -04:00
Mitsuhiro Nakamura
f2b2347b29 doc: add section for cataclysm-dda 2020-07-18 14:23:25 +09:00
Mitsuhiro Nakamura
c9c6f5f693 doc: fix MD_TARGETS
globstar (**) does not work in Makefile
2020-07-18 14:23:25 +09:00
zowoq
ff3d205314 doc/perl: fix build 2020-07-18 15:12:37 +10:00
Jan Tojnar
fb7507d068
Merge pull request #92348 from jtojnar/explicit-only-gpl
licenses: Make single-version-only GPL explicit
2020-07-18 06:48:41 +02:00
Maximilian Bosch
98d2458e66
Merge pull request #90692 from Ma27/citrix-workspace
citrix_workspace: add more features, refactor derivation
2020-07-17 16:12:55 +02:00
Jörg Thalheim
3829979d8d
Merge pull request #86589 from raboof/document-running-perl-scripts-from-the-shell
doc: add section on running ad-hoc Perl programs to the nixpkgs manual
2020-07-17 10:20:24 +01:00
Arnout Engelen
6093372069
Add section on running ad-hoc Perl programs to the nixpkgs manual
Co-authored-by: Timo Kaufmann <timokau@zoho.com>
2020-07-17 09:08:53 +02:00
Markus S. Wamser
92ad9e9dc4 docs.stdenv: remove reference to replace tool 2020-07-17 08:21:09 +02:00
Maximilian Bosch
af83f9a24e
citrix_workspace: update docs about selfservice 2020-07-15 19:10:58 +02:00
Maximilian Bosch
fa3948a7c5
citrix_workspace: add more features, refactor derivation
In #89806 it has been reported that the final package is missing a lot
of features like support for the self-service GUI and the
config-management.

While working on supporting those components in the Nix-package, I
decided to refactor the package to simplify the entire setup.

This patch changes the following things:

* Binaries and libraries are patched using the `autoPatchelfHook` to
  avoid having unneeded libraries linked (e.g. some programs use gtk2,
  others use gtk3).

* Moved source-declarations into their own file.

* Wrapped `configmgr` and `selfservice` and added those to `$out/bin`.

* Don't mention the old `citrix_receiver`-packages in the manual anymore
  since those packages were removed in 19.09 and are EOLed anyways.

Closes #89806
2020-07-15 19:10:58 +02:00
Jan Tojnar
13b5ae55cd
licenses: Make single-version-only GPL explicit
I commonly see people use the former when they should use the latter.

Would be also in line with the SPDX change https://www.gnu.org/licenses/identify-licenses-clearly.html
2020-07-05 17:51:30 +02:00
Frederik Rietdijk
c33ca7c5ce Merge staging-next into staging 2020-07-02 17:14:53 +02:00
Sami Bouhlel
c179ae6567 Fix typos in documentation (#91934) 2020-07-01 16:54:22 +01:00
DavHau
c8c09b7dda add autoPatchelfIgnoreMissingDeps to auto-patchelf.sh 2020-06-22 10:41:35 +02:00
Steve Purcell
c9e6a02c82
Add docs for dockerTools.streamLayeredImage 2020-06-22 15:19:44 +12:00
Maximilian Bosch
19dfc1b011
Merge pull request #90689 from cole-h/fix-manual
agda: fix manual build -- blocks nixpkgs-unstable
2020-06-17 23:05:58 +02:00
Cole Helbling
5baa7541d7
agda: fix manual build
/build/doc/manual-full.xml:12764:35: error: ID "build-phase" has already been defined
    /build/doc/manual-full.xml:9029:33: error: first occurrence of ID "build-phase"
2020-06-17 13:51:43 -07:00
zowoq
c3a05f90ed doc/stdenv: fix build
https://hydra.nixos.org/build/128037886/nixlog/1/tail
error: element "variable" not allowed anywhere
2020-10-03 18:49:10 +10:00
Jan Tojnar
74c5472090
Merge pull request #98304 from jtojnar/updateScript-commit3
maintainers/scripts/update.nix: Add support for auto-commiting changes
2020-10-02 06:16:09 +02:00
Jan Tojnar
0c5ddf3358
maintainers/scripts/update.nix: run update script with UPDATE_NIX_ATTR_PATH
The environment variable will contain the attribute path the script is supposed to update.
2020-09-20 20:12:33 +02:00
Jan Tojnar
c1b05442ff
doc: Undocument attr-set of passthru.updateScript
We no longer need it for most use cases so I am making it experimental.

I have something in mind where it might be useful in the future (customizing commit messages)
but for now, it would only confuse people.
2020-09-20 20:12:32 +02:00
Jan Tojnar
c21a85c6a0
maintainers/scripts/update.nix: auto-detect attrPath 2020-09-20 20:11:46 +02:00
Jan Tojnar
b828285933
maintainers/scripts/update.nix: support filling in auto-commit attributes
We can determine all of them when attrPath is present so we might jsut as well do it.
2020-09-20 20:11:46 +02:00
Jan Tojnar
4a161ddb3b
maintainers/scripts/update.nix: support auto-committing by passing attrPath
Instead of having the updateScript support returning JSON object,
it should be sufficient to specify attrPath in passthru.updateScript.
It is much easier to use.

The former is now considered experimental.
2020-09-20 20:11:46 +02:00
Jan Tojnar
1efc042d92
maintainers/scripts/update.nix: Add support for auto-commiting changes
Update scripts can now declare features using

	passthru.updateScript = {
	  command = [ ../../update.sh pname ];
	  supportedFeatures = [ "commit" ];
	};

A `commit` feature means that when the update script finishes successfully,
it will print a JSON list like the following:

	[
	  {
	    "attrPath": "volume_key",
	    "oldVersion": "0.3.11",
	    "newVersion": "0.3.12",
	    "files": [
	      "/path/to/nixpkgs/pkgs/development/libraries/volume-key/default.nix"
	    ]
	  }
	]

and data from that will be used when update.nix is run with --argstr commit true
to create commits.

We will create a new git worktree for each thread in the pool and run the update
script there. Then we will commit the change and cherry pick it in the main repo,
releasing the worktree for a next change.
2020-09-20 20:11:22 +02:00
Lassulus
453014b456
Merge pull request #89245 from alexarice/agda-literate
agda: install literate files
2020-06-16 14:11:01 +02:00
Daniël de Kok
58ec4d5c77 doc: pip install flags are specified with pipInstallFlags
The documentation incorrectly stated that `installFlags` are passed to
`pip install`.
2020-06-16 10:03:25 +02:00
Jan Tojnar
acb53e0698
Merge branch 'staging-next' into staging 2020-06-10 04:10:57 +02:00
Aaron Andersen
38de173440
Merge pull request #89840 from berbiche/patch-1
nixos/manual: s/environent/environment/g in configuration.xml
2020-06-09 06:31:21 -04:00
Rok Garbas
29c4fc94cf
Merge pull request #55302 from teto/lua_doc
doc: update lua documentation
2020-06-09 11:02:08 +02:00
Nicolas Berbiche
071c0f935c
nixos/manual: spelling s/environent/environment/g in configuration.xml 2020-06-08 16:34:50 -04:00
Matthieu Coudron
8d05c66dc6 fixup! update 2020-06-07 20:12:56 +02:00
Matthieu Coudron
3042b38ce1 update 2020-06-06 20:20:27 +02:00
Matthieu Coudron
2909dc9f39 builds 2020-06-06 17:33:41 +02:00
Matthieu Coudron
404d057e89 Added an example about overlay 2020-06-06 17:33:39 +02:00
Matthieu Coudron
5cfcfc300b doc: update lua documentation
Reflects the recent changes to the lua infrastructure.
Packaging from luarocks should be encouraged.
2020-06-06 17:33:37 +02:00
Frederik Rietdijk
1c68570ab2 Merge staging-next into staging 2020-06-05 19:42:16 +02:00
Jörg Thalheim
f0396574ab
buildRustPackage: add documentation on how to create cargo.lock patches 2020-06-05 10:41:46 +01:00
Vladimír Čunát
677e3960b5
Merge #82342: rustPlatform: increase build-speed of checkPhase
...for rust-packages (into staging)
2020-06-05 09:12:30 +02:00
Frederik Rietdijk
b7ff746540 python3: now points to python38
Note this also means python3Minimal is now also Python 3.8.

This reverts commit eb1369670b and adds more.
2020-06-04 18:08:29 +02:00
Benjamin Hipple
4af635feff
Merge pull request #87866 from danieldk/validate-pkgconfig-hook
validatePkgConfig: init
2020-06-02 23:27:27 -04:00
Alex Rice
e215c3bcac
agda: install literate files 2020-06-01 13:59:20 +01:00
Jan Tojnar
55e7f95265
doc/stdenv: improve autoPatchelfHook description
* Add id
* Mention rpath
* The control variables do not really have to be env vars (though without structuredAttrs there is not a difference)
2020-06-01 07:21:48 +02:00
Maximilian Bosch
59e8e7a129
rust: improve docs
Co-authored-by: cole-h <cole.e.helbling@outlook.com>
Co-authored-by: asymmetric <lorenzo@mailbox.org>
2020-05-31 21:47:32 +02:00
Daniël de Kok
13083b1a01 validatePkgConfig: init
This adds the `validatePkgConfig` hook, which can be used to validate
pkg-config files in the output(s). Currently, this will just run
`pkg-config --validate` on all `.pc` files, capturing errors such as
the issue that was fixed in #87789.

The hook could be extended in the future with more fine-grained
checks.
2020-05-31 20:45:03 +02:00
Christian Albrecht
2312f5fbc4
Change to nodePackages and nodePackages_latest
currently LTS 12.x and Current 14.x
2020-05-29 18:25:11 +02:00
Jörg Thalheim
6602f87384
nodePackages: switch to 12
Signed-off-by: Christian Albrecht <christian.albrecht@mayflower.de>
2020-05-27 21:45:41 +02:00
Maximilian Bosch
6574ba1946
rust*: add docs for testing packages
See also https://discourse.nixos.org/t/rust-build-speed-improvements/7225
2020-05-24 18:37:34 +02:00
Uma Zalakain
196cc47005 agda: fix typo in library management documentation
Agda expects a "depend" (not "depends") field in the library description.
2020-05-24 14:20:05 +02:00
Jon
15b3d9d277
python3Packages.venvShellHook: add postVenvCreation (#87850)
* python3Packages.venvShellHook: add postVenvCreation

* python: docs: add postVenvCreation explaination
2020-05-16 09:34:11 +02:00
Benjamin Hipple
c88290789c doc: Rewrite python onboarding tutorials in manual
Based on some feedback in #87094 and discussion with @fridh, this re-organizes
the onboarding tutorial in the Nixpkgs manual's python section, so that we start
with the simplest, most ad-hoc examples and work our way up. This progresses
from:

1. How to create an temporary python env at the cmdline, then
2. How to create a specific python env for a single script, then
3. How to create a specific python env for a project in a shell.nix, then
4. How to install a specific python env globally on the system or in a user profile.

Additionally, I've tried to standardize on some of the "best practice" ways of
doing things:

1. Instead of saying that this command style is "supported but strongly not
   discouraged", I've just deleted it to avoid confusion.

   Bad:  nix-shell -p python38Packages.numpy python38Packages.toolz
   Good: nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])'

2. In the portion where we show how to add stuff to the user's
   `XDG_CONFIG_HOME`, use overlays instead of `config.nix`. The former can do
   everything the latter can do, but is also much more generic and powerful,
   because it can compose with other files, compose with other envs, compose
   with overlays that do things like swap whether tensorflow and pytorch are
   built openblas/mkl/cuda stacks, and so on. The user is eventually going to
   see the overlay, so to avoid confusion let's standardize on it.
2020-05-15 22:43:16 +02:00
Dmitry Kalinkin
9943fd1a1d
Merge pull request #76653 from alexarice/agda-rework
Agda rework
2020-05-14 18:02:50 -04:00
Alex Rice
d30e2468e0
agda: rework builder 2020-05-14 20:54:11 +01:00
Colin L Rice
c5f18c44b1
go-modules: Doc updates 2020-05-14 07:21:52 +01:00
Benjamin Hipple
c3e2f98779 doc: use idiomatic overlay names in the python manual example
An overlay by any other name would function just as well, but we generally use
`self: super:` for the regular overlays, and `python-self: python-super`.
2020-05-09 18:02:20 -04:00
Benjamin Hipple
c0f434fcc8 doc: update python manual to reference python 3.8 instead of 3.5
Improvement suggested in #87094
2020-05-09 12:58:00 -04:00
Gabor Greif
dec283b463 ghcHEAD: 20200403 -> 20200505 2020-05-08 21:11:46 +02:00
Eelco Dolstra
2e1e115472 Remove outdated reference to nix-log2xml 2020-05-07 16:01:29 +02:00
José Romildo Malaquias
f528989650
Merge pull request #86198 from romildo/doc.icon-themes
gnome: document packaging icon themes
2020-05-07 10:50:50 -03:00
Frederik Rietdijk
9875bbae75 Merge master into staging-next 2020-05-05 19:51:09 +02:00
Pavol Rusnak
7b0167204d treewide: use https for nixos.org and hydra.nixos.org
tarballs.nixos.org is omitted from the change because urls from there
are always hashed and checked
2020-05-03 22:14:21 -07:00
Elis Hirwing
e31a68ddba
doc/php: Add example for installing composer with extra extensions 2020-05-01 22:30:09 +02:00
Elis Hirwing
d2cb49c248
doc/php: Fix headline conflicts 2020-05-01 22:30:03 +02:00
Frederik Rietdijk
484ee79050 Merge staging-next into staging 2020-05-01 08:57:10 +02:00
Elis Hirwing
c549e9f9d6
doc: Add PHP section 2020-04-30 13:48:05 +02:00
Elis Hirwing
27b9b7b3af
Merge pull request #85026 from talyz/php_buildenv_override
php.buildEnv: Make the exported php package overridable, improve handling of currently enabled extensions, etc
2020-04-29 19:57:37 +02:00
talyz
5cad1b4aff
php: Get rid of the phpXXbase attributes, update docs
Since the introduction of php.unwrapped there's no real need for the
phpXXbase attributes, so let's remove them to lessen potential
confusion and clutter. Also update the docs to make it clear how to
get hold of an unwrapped PHP if needed.
2020-04-29 13:45:48 +02:00
talyz
ef990961bc
php.buildEnv: Provide the unwrapped php package in php.unwrapped
This is useful if you need to access the dev output of the unwrapped
derivation.
2020-04-29 13:44:20 +02:00
José Romildo Malaquias
6449a4e84b
Apply suggestions from code review
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2020-04-28 14:59:06 -03:00
José Romildo Malaquias
9d88d8e23d gnome: document packaging icon themes 2020-04-28 08:56:15 -03:00
zowoq
3f17518490 buildGoPackage: use $out instead of $bin 2020-04-28 20:30:23 +10:00
talyz
2ba7926959
php.buildEnv: Provide a list of currently enabled extensions
Rework withExtensions / buildEnv to handle currently enabled
extensions better and make them compatible with override. They now
accept a function with the named arguments enabled and all, where
enabled is a list of currently enabled extensions and all is the set
of all extensions. This gives us several nice properties:

 - You always get the right version of the list of currently enabled
   extensions

 - Invocations chain

 - It works well with overridden PHP packages - you always get the
   correct versions of extensions

As a contrived example of what's possible, you can add ImageMagick,
then override the version and disable fpm, then disable cgi, and
lastly remove the zip extension like this:

{ pkgs ? (import <nixpkgs>) {} }:
with pkgs;

let
  phpWithImagick = php74.withExtensions ({ all, enabled }: enabled ++ [ all.imagick ]);

  phpWithImagickWithoutFpm743 = phpWithImagick.override {
    version = "7.4.3";
    sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ=";
    fpmSupport = false;
  };

  phpWithImagickWithoutFpmZip743 = phpWithImagickWithoutFpm743.withExtensions (
    { enabled, all }:
      lib.filter (e: e != all.zip) enabled);

  phpWithImagickWithoutFpmZipCgi743 = phpWithImagickWithoutFpmZip743.override {
    cgiSupport = false;
  };
in
  phpWithImagickWithoutFpmZipCgi743
2020-04-26 16:43:05 +02:00
Frederik Rietdijk
ca2fd28d83 Revert "docs/python: document builders using doInstallCheck and not doCheck (#86051)"
For disabling tests when overriding, use `.overridePythonAttrs`.

Discussion about aliasing `.overridePythonAttrs` to `.overrideAttrs`.
https://github.com/NixOS/nixpkgs/pull/82772

This reverts commit 35812875a4.
2020-04-26 16:22:33 +02:00
davidak
579e56fb9e
Update commit policy for stable release branches (#86026)
only very few people followed the strict policy in the last 5 years. the 
maintainers accept backports without reason when it's obvious, so i 
updated the policy to reflect that
2020-04-26 12:12:55 +00:00
Doron Behar
35812875a4
docs/python: document builders using doInstallCheck and not doCheck (#86051) 2020-04-26 11:53:06 +00:00