3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1656 commits

Author SHA1 Message Date
Frederik Rietdijk c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
WORLDofPEACE 4b10920ed1
stdenv/check-meta: change to allowlist and blocklist (#114127)
* stdenv/check-meta: change to allowlist and blocklist

* Update pkgs/stdenv/generic/check-meta.nix

Co-authored-by: Graham Christensen <graham@grahamc.com>
2021-02-23 10:25:18 -05:00
Graham Christensen 3ef281c3a2
Merge pull request #113176 from danieldk/cargoDepsName
buildRustPackage: add cargoDepsName attribute
2021-02-23 10:02:45 -05:00
github-actions[bot] 227aa2c9b0
Merge master into staging-next 2021-02-22 06:17:05 +00:00
Ben Siraphob 251897b40d stdenv/cross-compilation: add section on avoiding cross-compiling GCC 2021-02-22 10:57:30 +07:00
github-actions[bot] 93b17c1b4d
Merge master into staging-next 2021-02-21 18:17:22 +00:00
Ben Siraphob 4550d6596b docs/stdenv/cross-compilation: add binutils command section to cookbook 2021-02-21 21:56:48 +07:00
Léo Gaspard 037936b7a3
Merge pull request #107322 from sternenseemann/fetch-github-leavedotgit
fetchFromGitHub: also use git if deepClone or leaveDotGit is used
2021-02-21 13:28:00 +01:00
github-actions[bot] 2c8fa86436
Merge master into staging-next 2021-02-21 06:16:32 +00:00
Ben Siraphob 92d319d5d5
doc/stdenv/platform-notes: convert to markdown 2021-02-21 06:45:21 +01:00
Jan Tojnar 8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
Thomas Bereknyei 9c4839fe86 docs: clarify staging
Specify that the merges from master to staging-next to staging are
performed by GitHub actions. This helps the reader understand the
relationship between the branches.
2021-02-19 07:56:09 +01:00
Sandro 36ef53d337
Merge pull request #113167 from mweinelt/pytestcheckhook-paths
pytestCheckHook: add support for disabling arbitrary paths
2021-02-18 16:59:22 +01:00
Jörg Thalheim 236b56c94d
Merge pull request #113193 from danieldk/cargo-install-hook 2021-02-18 00:02:03 +00:00
github-actions[bot] c0f4dcb71d
Merge staging-next into staging 2021-02-16 18:17:00 +00:00
github-actions[bot] 287495a7aa
Merge master into staging-next 2021-02-16 18:16:57 +00:00
Niklaus Giger 76561002c2
doc: Convert Eclipse from Docbook to CommonMark
Fixes: https://github.com/NixOS/nixpkgs/issues/105251
2021-02-16 18:58:14 +01:00
Daniël de Kok 05e40e79a8 buildRustPackage: factor out check phase to cargoCheckHook
API change:

`cargoParallelTestThreads` suggests that this attribute sets the
number of threads used during tests, while it is actually a boolean
option (use 1 thread or NIX_BUILD_CORES threads). In the hook, this
is replaced by a more canonical name `dontUseCargoParallelTests`.
2021-02-16 08:09:15 +01:00
Daniël de Kok 9757c7101a buildRustPackage: factor out install phase to cargoInstallHook 2021-02-15 12:17:18 +01:00
Daniël de Kok d92396039d buildRustPackage: add cargoDepsName attribute
The directory in the tarball of vendored dependencies contains `name`,
which is by default set to `${pname}-${version}`. This adds an
additional attribute to permit setting the name to something of the
user's choosing.

Since `cargoSha256`/`cargoHash` depend on the name of the directory of
vendored dependencies, `cargoDepsName` can be used to e.g. make the
hash invariant to the package version by setting `cargoDepsName =
pname`.
2021-02-15 07:06:31 +01:00
Martin Weinelt d6d63aef7d
pytestCheckHook: add support for disabling arbitrary paths
Renames `disabledTestFiles` to the more genereric `disabledTestPaths` to
reflect that change.
2021-02-15 00:34:35 +01:00
Jörg Thalheim b5b47d6445
Merge pull request #112804 from danieldk/cargo-build-hook 2021-02-14 18:08:26 +00:00
Bryan A. S 8bb00cfb6b doc/builders/packages/ibus.xml: Convert to markdown
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
2021-02-14 01:26:32 -03:00
Sandro Jäckel 061f514462
doc: update multiple output section with more example paths 2021-02-14 00:46:43 +01:00
github-actions[bot] 37c77840b8
Merge staging-next into staging 2021-02-13 12:19:41 +00:00
github-actions[bot] 257f90a43f
Merge master into staging-next 2021-02-13 12:19:38 +00:00
taku0 3bcfa06742
Merge pull request #108456 from siraben/elm-docs-md
Convert Elm from Docbook to Commonmark
2021-02-13 18:11:24 +09:00
github-actions[bot] 0667f269fc
Merge staging-next into staging 2021-02-12 18:16:50 +00:00
github-actions[bot] b23b455f9a
Merge master into staging-next 2021-02-12 18:16:46 +00:00
Alyssa Ross 503a772e02 doc: use lib.cleanSource
Otherwise, running "nix-build" in the doc directory would create a
result symlink, so running "nix-build" again would produce a different
derivation, and so on forever, because the result symlink would keep
changing and wasn't ignored.
2021-02-12 08:59:27 -08:00
Daniël de Kok 933c2425d9 doc: fix syntax error in BLAS/LAPACK overlay example
Attribute-values pairs were not properly terminated by a semicolon.
2021-02-12 10:37:16 +01:00
Daniël de Kok dbc8633daf doc: describe cargoBuildHook and maturinBuildHook in the Rust section 2021-02-12 08:40:46 +01:00
github-actions[bot] a480c1ebb1
Merge staging-next into staging 2021-02-11 18:16:52 +00:00
Alyssa Ross 1af73c223c
doc: fix XML syntax in Qt section 2021-02-11 13:58:32 +00:00
Daniël de Kok 198dd77635 doc: describe cargoSetupHook in the Rust section 2021-02-10 07:03:48 +01:00
github-actions[bot] 30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Martin Weinelt e95bf38429 qt.section.md: fix xml syntax 2021-02-09 02:06:19 +01:00
Bernardo Meurer 6eb8979452
doc: remove mentions of flashplayer 2021-02-08 09:38:42 -08:00
github-actions[bot] 1c86cb40e9
Merge master into staging-next 2021-02-08 00:36:16 +00:00
Jan Tojnar f53e0e28c3 doc: Add anchors to meta attributes 2021-02-07 23:11:41 +01:00
github-actions[bot] 2226996f6c
Merge master into staging-next 2021-02-07 18:16:08 +00:00
Doron Behar c858d0f63a
Merge pull request #105492 from alunduil/assertOneOf-typo 2021-02-07 18:44:50 +02:00
github-actions[bot] a93a3ec715
Merge staging-next into staging 2021-02-04 00:35:42 +00:00
Anderson Torres a27a2c4b15
Merge pull request #110501 from neosimsim/agda-ghc-ieee754
agda.withPackages: use GHC with ieee754 as default
2021-02-03 15:55:37 -03:00
github-actions[bot] e788d512e8
Merge staging-next into staging 2021-01-30 00:44:04 +00:00
Silvan Mosberger aa48e205a2
Merge pull request #110787 from tfc/cartesian-product
lib/attrsets: add cartesianProductOfSets function
2021-01-29 20:22:12 +01:00
Jacek Galowicz 123045a570 lib/attrsets: add cartesianProductOfSets function 2021-01-28 23:08:59 +01:00
Thomas Tuegel 0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
github-actions[bot] c994c9d31e
Merge master into staging-next 2021-01-26 18:27:09 +00:00
Robert Hensing 1d0d9d26c6
Merge pull request #109663 from Pamplemousse/documentation
documention corrections
2021-01-26 15:37:45 +01:00
Thomas Tuegel 5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
Thomas Tuegel e605824a92
qt.section.md: use new syntax for admonitions 2021-01-25 15:56:14 -06:00
Thomas Tuegel 02924cf951
nixpkgs/manual: update Qt documentation 2021-01-25 15:56:14 -06:00
Jan Tojnar 01ee4ea574
Merge branch 'master' into staging-next 2021-01-24 00:09:45 +01:00
Markus Kowalewski 72f96278f7
nixpkgs/manual: add a paragraph about MPI switching mechanism 2021-01-23 12:15:18 +01:00
Alexander Ben Nasrallah b4b4e36921
agda.withPackages: use GHC with ieee754 as default
As mentioned in the package description of ieee on Hackage,
ieee is deprecated in favor of ieee754.
2021-01-22 16:13:46 +01:00
github-actions[bot] e5fef074d6
Merge staging-next into staging 2021-01-21 01:19:31 +00:00
V 7616206b77
doc: add function argument order convention (#110060)
* doc: add function argument order convention

Ordering by usage is the de facto ordering given to arguments. It's
logical, and makes finding argument usage easier. Putting lib first is
common in NixOS modules, so it's reasonable to mirror this in nixpkgs
proper. Additionally, it's not a package as such, has zero dependencies,
and can be found used anywhere in a derivation.

* doc: clean up usage of lib
2021-01-20 19:07:16 -05:00
Pamplemousse c803b2333b documentation: correct documentation help
`PANDOC_LUA_FILTERS_DIR` is set in `makeFlags` in `doc/default.nix`,
and needs to be explicitely passed to `make` when called manually.

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-01-19 18:22:18 -07:00
github-actions[bot] e064950cb7
Merge staging-next into staging 2021-01-19 18:52:27 +00:00
greizgh 94f850c3d1
doc: fix shell.nix (#109816) 2021-01-19 12:46:51 -05:00
Jan Tojnar fc7bd322df
Merge branch 'staging-next' into staging 2021-01-19 13:50:04 +01:00
Jonathan Ringer 7c64854b23 docs: pkgconfig -> pkg-config 2021-01-19 01:16:25 -08:00
Jörg Thalheim 57d863b1f0
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-01-17 18:09:56 +01:00
Jörg Thalheim 1279bf812c
Merge remote-tracking branch 'upstream/master' into HEAD 2021-01-17 18:08:59 +01:00
Alexei Colin 72bebd8c0c doc: rust: fix syntax error in declarative overlay
Otherwise pasting the snippet into shell.nix results in:

	error: syntax error, unexpected '=', expecting $end, at /.../shell.nix:2:9

Signed-off-by: Alexei Colin <ac@alexeicolin.com>
2021-01-17 01:29:15 -05:00
Sandro Jäckel 6f7f01a244 pytestCheckHook: Add disabledTestFiles option 2021-01-16 09:09:26 -08:00
Jan Tojnar b813710c04
Merge branch 'master' into staging-next 2021-01-14 02:24:17 +01:00
adisbladis 4003f8cbc7
treewide: emacsPackages -> emacs.pkgs & emacsWithPackages -> emacs.pkgs.withPackages
The previous names are now aliases and shouldn't be used anywhere inside nixpkgs.
2021-01-13 17:13:10 +01:00
Jan Tojnar 2b9372b2ca
Merge branch 'master' into staging-next 2021-01-11 13:36:42 +01:00
Peter Simons c3c06134e2
Merge pull request #108268 from TikhonJelvis/bump-r-packages
r-modules: Updated definitions of CRAN and Bioc packages.
2021-01-11 10:45:42 +01:00
Cyril Cohen e87aef06e0
coqPackages: doc (#108937)
changing bullet style
2021-01-11 10:23:05 +01:00
Profpatsch b0c1583a0b doc: stdenv.lib -> lib
Part of: https://github.com/NixOS/nixpkgs/issues/108938

Changing the documentation to not refer to stdenv.lib is the first
step to make people use it directly.
2021-01-11 09:52:27 +01:00
Michele Guerini Rocco a306b088f6
Merge pull request #108491 from pacien/fishPlugins-wrapFish
wrapFish: add fish shell wrapper package
2021-01-11 09:10:52 +01:00
pacien 108fd69a8c fishPlugins.buildFishPlugin: rename checkFunctionPath parameter 2021-01-11 03:39:57 +01:00
pacien 165937d01e doc/fish: document fish plugins packaging 2021-01-11 02:37:36 +01:00
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