Luke Granger-Brown
08b22e605b
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
2021-04-12 18:49:01 +00:00
Sandro
e355946df1
Merge pull request #103546 from mnacamura/cdda-small-fix
2021-04-12 16:31:01 +02:00
Emery Hemingway
29bc87e961
Fix "platfrom" typos
2021-04-10 17:10:50 +02:00
Alexander Bantyev
544664d484
Merge pull request #112477 from happysalada/fix_build_mix
...
buildMix: fix: initial try
2021-04-09 12:09:22 +03:00
happysalada
481832b32d
beam-modules: buildMix -> mixRelease
2021-04-08 20:54:48 +09:00
Robert Hensing
58b21dea78
Merge pull request #116749 from vroad/docker-layered-image-fakeroot
...
dockerTools.streamLayeredImage: add fakeRootCommands option
2021-04-07 15:02:24 +02:00
Sandro
3a6116c550
Merge pull request #116257 from SuperSandro2000/code-fences
...
doc/languages-frameworks/*: add missing languages to code fences
2021-04-05 05:38:38 +02:00
Sandro Jäckel
2c143a4614
doc/languages-frameworks/*: add missing languages to code fences
...
convert shell -> ShellSession
2021-04-05 05:23:19 +02:00
sternenseemann
cf8da7eabd
doc/stdenv/cross: fix typo
2021-04-02 10:03:00 +02:00
Sandro
899cfc82b9
Delete citrix.xml
2021-04-01 09:38:47 +02:00
Ryan Mulligan
86eedf1785
Merge pull request #108918 from bryanasdev000/doc-citrix
...
citrix: Update doc to use CommonMark
2021-03-31 22:02:52 -07:00
Ryan Mulligan
d9b57bfc2c
Merge pull request #108917 from bryanasdev000/doc-ocitools
...
ocitools: Update doc to use CommonMark
2021-03-31 21:51:38 -07:00
github-actions[bot]
f7049b343c
Merge master into staging-next
2021-03-29 18:13:15 +00:00
Doron Behar
c2b66f2702
Merge pull request #98734 from ju1m/zerobin
2021-03-29 17:18:29 +00:00
github-actions[bot]
eb499aa20e
Merge master into staging-next
2021-03-25 00:17:22 +00:00
Bernardo Meurer
fa9cd72c09
Merge pull request #117360 from midchildan/feat/fuse/darwin
...
fuse: use macfuse-stubs instead on Darwin
2021-03-24 21:18:40 +00:00
github-actions[bot]
380cb1e995
Merge master into staging-next
2021-03-24 12:11:57 +00:00
Robert Schütz
7dfc2d269b
doc: improve Python section ( #116344 )
...
Avoid confusion as in https://github.com/NixOS/nixpkgs/pull/116325#discussion_r593946638 .
2021-03-24 13:03:31 +01:00
github-actions[bot]
2417360191
Merge master into staging-next
2021-03-24 00:41:10 +00:00
vroad
c420e650c9
dockerTools.streamLayeredImage: Update documentation
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2021-03-24 08:24:21 +09:00
Benjamin Hipple
561cc81ee6
Merge pull request #115857 from lbpdt/feature/docker-tools-layered-base-image
...
dockerTools.buildLayeredImage: support fromImage
2021-03-23 18:15:34 -04:00
midchildan
b67362d7f7
doc: add section for FUSE
2021-03-24 02:22:15 +09:00
Louis Blin
aae8588182
dockerTools.buildLayeredImage: support fromImage
...
It is now possible to pass a `fromImage` to `buildLayeredImage` and
`streamLayeredImage`, similar to what `buildImage` currently supports.
This will prepend the layers of the given base image to the resulting
image, while ensuring that at most `maxLayers` are used. It will also
ensure that environment variables from the base image are propagated
to the final image.
2021-03-23 14:50:42 +00:00
Bryan A. S
fdc7280a87
doc/builders/images/ocitools.xml: Convert to markdown
...
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
2021-03-22 20:13:51 -03:00
Bryan A. S
dd50188f4b
doc/builders/packages/citrix.xml: Convert to markdown
...
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
2021-03-22 20:10:21 -03:00
github-actions[bot]
b0455cafa7
Merge master into staging-next
2021-03-21 06:17:15 +00:00
Sandro
faa9541165
Merge pull request #108921 from bryanasdev000/doc-ibus
...
ibus: Update doc to use CommonMark
2021-03-21 05:35:04 +01:00
github-actions[bot]
6e3a55e059
Merge staging-next into staging
2021-03-19 18:19:40 +00:00
Frederik Rietdijk
1ecb97eae9
Merge master into staging-next
2021-03-19 18:17:01 +01:00
Katharina Fey
29df3bc24c
doc: fix code formatting
2021-03-19 13:37:27 +01:00
github-actions[bot]
29278dcf45
Merge staging-next into staging
2021-03-19 12:26:59 +00:00
github-actions[bot]
c804f22a81
Merge master into staging-next
2021-03-19 12:26:52 +00:00
Christian Kauhaus
260f5970d0
Merge pull request #116459 from Pamplemousse/document_vulnerability_roundup
...
documentation: Add content about Vulnerability roundups
2021-03-19 09:12:04 +01:00
vroad
2dce2253bc
dockerTools.streamLayeredImage: document fakeRootCommands
2021-03-19 11:54:13 +09:00
Pamplemousse
1adef4a878
documentation: Add content about Vulnerability roundups
...
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-03-17 13:39:24 -07:00
github-actions[bot]
1398d44bac
Merge staging-next into staging
2021-03-16 00:39:16 +00:00
github-actions[bot]
d18aaddde4
Merge master into staging-next
2021-03-16 00:39:08 +00:00
Sarah Brofeldt
2183d976f4
Merge pull request #116294 from StillerHarpo/doc
...
Fix type description for attrByPath
2021-03-15 19:35:26 +01:00
github-actions[bot]
cc6e2d60db
Merge staging-next into staging
2021-03-14 18:17:15 +00:00
Martin Weinelt
0241873f7f
Merge branch 'master' into staging-next
2021-03-14 17:35:32 +01:00
Jan Tojnar
99fe978702
Merge pull request #113881 from jtojnar/stdenv.md
...
doc: Port stdenv to Markdown
2021-03-14 15:45:49 +01:00
github-actions[bot]
977005c64f
Merge staging-next into staging
2021-03-14 12:21:14 +00:00
github-actions[bot]
8c04f70ddd
Merge master into staging-next
2021-03-14 12:21:07 +00:00
Florian Engel
3329093c6a
Remove repeating words from doc
2021-03-14 12:15:34 +01:00
Florian Engel
22cb630a66
Fix type description for attrByPath
...
The output type was missing
2021-03-14 10:27:26 +01:00
Jan Tojnar
f854ee87f0
doc: Port stdenv to Markdown
...
Added the following ids to avoid possible id conflicts from ids auto-generated from titles:
- setup-hook-perl
- setup-hook-python
- setup-hook-pkg-config
- setup-hook-automake
- setup-hook-autoconf
- setup-hook-libxml2
- setup-hook-gdk-pixbuf
2021-03-14 02:18:52 +01:00
Jan Tojnar
53830ca04c
doc: Port stdenv/multiple-output to Markdown
2021-03-14 02:18:40 +01:00
Jan Tojnar
921d0269cc
doc: Port stdenv/meta to Markdown
2021-03-14 02:15:14 +01:00
Frederik Rietdijk
a6a9548a32
python docs: update another incorrect claim regarding default interpreter
2021-03-13 14:14:06 +01:00
Frederik Rietdijk
a9faf404c8
python docs: fix note regarding default interpreter
2021-03-13 14:11:31 +01:00
