1605 commits

Author	SHA1	Message	Date
John Ericson	14b427a7e4	Merge pull request #119092 from numinit/update-androidenv ... androidenv: Allow multiple ndkVersions to be specified	2021-04-25 10:08:05 -04:00
Jan Tojnar	0f1c4558d3	Merge branch 'master' into staging-next ... Choose binwalk 2.3.1, 27 is legacy version for Python 2.	2021-04-25 02:50:48 +02:00
Morgan Jones	a7e5b070be	androidenv: Allow multiple ndkVersions to be specified ... Android is deprecating ndk.dir in favor of specifying exact NDK version in Gradle configuration. Ensure that we can support multiple NDKs, and link them into the location the Android Gradle Plugin expects.	2021-04-24 15:56:08 -06:00
Jan Tojnar	ac0319febf	Merge pull request #120231 from bobby285271/master ... doc: Convert builders/images/* to markdown	2021-04-24 16:36:26 +02:00
Bobby Rong	228276fbd0	doc/builders/images/*.xml: Convert to markdown	2021-04-24 09:06:33 +08:00
Alyssa Ross	4f4d95bbc2	Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: pkgs/development/python-modules/pyvex/default.nix pkgs/top-level/python-packages.nix	2021-04-23 13:49:12 +00:00
Bobby Rong	0fd55565d3	doc/contributing/*.xml: Convert to markdown	2021-04-23 12:53:58 +08:00
github-actions[bot]	8248f4db36	Merge master into staging-next	2021-04-22 06:05:51 +00:00
Sandro	9419ed621f	Merge pull request #108919 from bryanasdev000/doc-dlib ... dlib: Update doc to use CommonMark	2021-04-22 03:35:39 +02:00
Sandro	2df2e5f330	Merge pull request #118269 from midchildan/feat/fuse/add-darwin	2021-04-22 03:27:36 +02:00
github-actions[bot]	77694c34c6	Merge master into staging-next	2021-04-22 00:16:15 +00:00
Samuel Dionne-Riel	5ce39b7ee1	Merge pull request #116475 from davidak/doc-remove-packages ... doc: add instructions to remove a package	2021-04-21 20:14:24 -04:00
github-actions[bot]	99c7bab106	Merge master into staging-next	2021-04-21 00:15:20 +00:00
davidak	c0b5d5bb9e	doc: add instructions to remove a package ... Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Co-authored-by: Ben Siraphob <bensiraphob@gmail.com>	2021-04-20 22:29:52 +02:00
Adrian Hesketh	f86b57d708	Include custom package in vim docs (#92811) ... Describe how to package a plugin that doesn't exist in nixpkgs (and also how to include an external file). Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>	2021-04-20 21:28:06 +01:00
github-actions[bot]	960439e003	Merge master into staging-next	2021-04-20 12:06:46 +00:00
Evils	7b5850ee1b	docs: correct some english	2021-04-20 02:52:09 +02:00
midchildan	80651c123e	docs: add FUSE packaging tip for Darwin	2021-04-20 00:52:07 +09:00
Bryan A. S	a1e28d3740	doc/builders/packages/dlib.xml: Convert to markdown ... Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>	2021-04-13 03:40:27 -03:00
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