1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00
Commit graph

2376 commits

Author SHA1 Message Date
github-actions[bot] 7fb1a9172f
Merge master into staging-next 2023-02-24 00:02:22 +00:00
Weijia Wang a395950650
Merge pull request #217870 from Artturin/envfixes1
rPackages,emscriptenPackages: s/overrideDerivation/overrideAttrs
2023-02-23 20:49:53 +02:00
Valentin Gagarin ac573e5046
Merge pull request #217865 from ncfavier/doc-ignore-result
doc: add `result` to .gitignore
2023-02-23 19:04:17 +01:00
Naïm Favier 07ee3496ca
doc: add result to .gitignore
Ensure the local `result` symlink from an earlier build isn't copied to
the store.
2023-02-23 18:41:42 +01:00
Artturin 06567334be emscriptenPackages: s/overrideDerivation/overrideAttrs
https://nixos.org/manual/nixpkgs/stable/#sec-pkg-overrideDerivation

> Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments
2023-02-23 18:45:38 +02:00
Alyssa Ross 52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin 6b2a05e190 treewide: manual fixups for
treewide: use toString on list NIX_CFLAGS_COMPILE
treewide: move NIX_CFLAGS_COMPILE to the env attrset
2023-02-22 21:23:04 +02:00
github-actions[bot] 05782cfb75
Merge master into staging-next 2023-02-18 18:01:22 +00:00
maralorn b5fa92b2e6 doc/haskell: Add clarifications in section about versions 2023-02-18 15:15:11 +01:00
github-actions[bot] 1c50878b7b
Merge master into staging-next 2023-02-17 18:01:15 +00:00
Robert Hensing b72592ee04
Merge pull request #215973 from pennae/nrd-manual-structure
nixos/manual: specify manual structure in markdown
2023-02-17 18:01:23 +01:00
github-actions[bot] e6eaa85312
Merge master into staging-next 2023-02-17 00:02:11 +00:00
milahu 121fbb3cf7
docs: Building a stdenv package in nix-shell (#216650)
* docs: Building a stdenv package in nix-shell
2023-02-16 19:21:12 +01:00
github-actions[bot] bf5abe92d4
Merge master into staging-next 2023-02-15 18:01:14 +00:00
sternenseemann c5a0a5ac5e curl: add pkg-config metadata for libcurl.pc
I did not add the validatePkgConfig setup hook to curl, as I suspect it
may cause trouble when bootstrapping.
2023-02-15 13:52:15 +01:00
Alyssa Ross 200610b849
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/gtest/default.nix
	pkgs/development/libraries/hidapi/default.nix
2023-02-14 09:53:03 +00:00
superherointj a7fb18c804 beam/fetchMixDeps: disable --only flag when mixEnv is empty
* mixEnv being empty will include all dependencies.
2023-02-14 00:36:31 -05:00
pennae bfc6975cbc nixos/manual: remove holdovers from docbook times
these files provided mainly or exclusively xml-related tooling and
support for editing the manual. since docbook is now an implementation
detail (except for still being allowed in option docs, for now) these
tools are no longer necessary, useful, or even functional.

xmlformat.conf is still used by the nixpkgs documentation, so we have to
keep it. there's no reason it can't go live with the nixpkgs docs though.
2023-02-12 14:23:38 +01:00
Artturi aaa9ea8ec6
Merge pull request #208537 from Artturin/makesetuphooksupportstrictdeps 2023-02-10 20:08:32 +02:00
Guillaume Girol 0a598d6ea5
doc: add a simpler explanation of dependencies (#213403)
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-02-10 18:41:31 +01:00
pennae d041641b1a nixos/manual: remove md-to-db
with manual chapters no longer needing pandoc for their conversion to
xml we can get rid of this source of confusion, and its huge cache of
xml files.
2023-02-10 06:40:15 +01:00
pennae 1c9f55ec64 nixos/manual: convert <kbd> elements to bracketed spans
since support for kbd elements was added with explicit intent in #175128
it seems like a good idea to support this in nixos-render-docs instead
of just dropping it in favor of `*F12*` etc. since it's a very rare
thing in the manual and purely presentational it makes sense to use
bracketed spans instead of a new myst role.

the html-elements.lua plugin is now somewhat misnamed, but it'll go away
very soon so we don't want to bother renaming it.
2023-02-10 06:40:01 +01:00
pennae a15d7335a5 nixos/manual: remove .title fenced divs
pandoc drops .title classes when rendering to docbook, so these are
effectively just paragraphs anyway. without support for including them
in a table of contents the complexity of parsing them in
nixos-render-docs won't be warranted.
2023-02-10 06:40:00 +01:00
Tom McLaughlin 700e6e588e Doc tweak: "Build" -> "Substitute" 2023-02-07 16:17:52 -08:00
Tom McLaughlin d1a2a16a3a Introduce mkBinaryCache function 2023-02-07 16:16:07 -08:00
Valentin Gagarin a2cef3dfbf
Merge pull request #215181 from SuperSandro2000/contributing-pname 2023-02-07 21:48:25 +01:00
Sandro Jäckel fcfa4dd73b
doc/contributing: remove last references to name
pname+version should be used everywhere, so lets clean this up
2023-02-07 20:40:26 +01:00
Artturin 680309fc9c add docs for makeSetupHook 2023-02-07 21:02:02 +02:00
Valentin Gagarin 13088e285e
Merge pull request #215121 from ncfavier/doc-gitignore 2023-02-07 16:26:51 +01:00
Valentin Gagarin abef26ab3f
Merge pull request #215114 from ncfavier/fixup-212642 2023-02-07 16:25:27 +01:00
Naïm Favier 5a5decd2eb
doc: use gitignoreSource
Running `make -C doc` to build the manual locally leaves .xml artifacts
in the tree. These are ignored by git, but they still get included in
the build when not using flakes, which causes the corresponding chapters
not to be built.
2023-02-07 13:58:34 +01:00
Naïm Favier f98c4eac33
doc/stdenv: fixup #212642 2023-02-07 12:47:28 +01:00
John Ericson 6d0b3086f7
Merge pull request #214304 from obsidiansystems/pkg-config-meta
meta.pkgConfigModules: Init convention
2023-02-06 11:44:29 -05:00
Domen Kožar 3b837710a9
Merge pull request #214612 from stephank/feat/swift-docs
doc: add section on swift
2023-02-06 14:17:41 +01:00
Jason Yundt b1bb9bb6c8 treewide: fix backwards smart apostrophes
According to the Unicode Standard, you should use U+2019 RIGHT SINGLE
QUOTATION MARK for apostrophes [1]. Before this change, some of the text
in this repo would use U+2018 LEFT SINGLE QUOTATION MARKs instead.

[1]: https://www.unicode.org/versions/Unicode15.0.0/ch06.pdf#G12411
2023-02-06 07:24:42 -05:00
Linus Heckemann 59b752087d
Merge pull request #214763 from lheckemann/doc-requirefile
fetchers: document requireFile
2023-02-05 18:28:01 +01:00
Linus Heckemann 2e88127a0d fetchers: document requireFile 2023-02-05 15:33:51 +01:00
Stéphan Kochen cbc76260f7 doc: add section on swift 2023-02-04 22:30:10 +01:00
John Ericson 6e4a1b18d9 meta.pkgConfigModules: Init convention
See docs.

Follow-up work:

- Existing packages should be converted

- `defaultPkgConfigPackages` should assert on `meta.pkgConfigModules`
  and let `tests.pkg-config` alone test the build results.

CC @sternenseemann

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-02-03 09:37:31 -05:00
André Schröder b2c8b539ac nixos/doc: fix typo in python.section.md 2023-02-01 23:00:16 +01:00
github-actions[bot] dd1ff149da
Merge master into staging-next 2023-01-31 00:02:31 +00:00
pennae 5b6dcece88
Merge pull request #212684 from pennae/nixos-render-docs
nixos-render-docs: init, use for some manual rendering to docbook
2023-01-30 19:26:07 +01:00
github-actions[bot] 1a06f52c21
Merge master into staging-next 2023-01-30 12:01:22 +00:00
Robert Hensing 663c41affd
Merge pull request #212282 from hercules-ci/pkg-config-packages
defaultPkgConfigPackages: init
2023-01-30 09:48:53 +01:00
Robert Hensing b6bec17eb9 testers.hasPkgConfigModule: Extract and add tests, docs 2023-01-30 00:35:34 +01:00
github-actions[bot] 7b3f0537af
Merge master into staging-next 2023-01-29 18:01:12 +00:00
Artturi c2e37a404c
Merge pull request #208793 from hadilq/androidenv/cmdline-tools-and-patcher
androidenv: Implement cmdline-tools and patcher
2023-01-29 18:11:41 +02:00
Robert Hensing a010129bf8 pkg-configPackages -> defaultPkgConfigPackages
This better reflects the purpose of the package set, while leaving
room for a fancier, more complete implementation of the concept,
with a nicer name.
2023-01-29 09:51:55 +01:00
Robert Hensing 159ad20b89 doc: Add pkg-config section 2023-01-29 09:51:54 +01:00
github-actions[bot] d7f991bb53
Merge master into staging-next 2023-01-29 00:02:27 +00:00