3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1687 commits

Author SHA1 Message Date
Stefan Frijters 585f63b364
doc/coding-conventions: Add documentation for fetchpatch optional arguments 2021-05-28 14:22:46 +02:00
Daniël de Kok 1da0b1dbc9
Merge pull request #122158 from danieldk/import-cargo-lock
rustPlatform.buildRustPackage: support direct use of Cargo.lock
2021-05-28 12:07:25 +02:00
Daniël de Kok b3969f3ad7 rustPlatform.buildRustPackage: support direct use of Cargo.lock
This change introduces the cargoLock argument to buildRustPackage,
which can be used in place of cargo{Sha256,Hash} or cargoVendorDir. It
uses the importCargoLock function to build the vendor
directory. Differences compared to cargo{Sha256,Hash}:

- Requires a Cargo.lock file.
- Does not require a Cargo hash.
- Retrieves all dependencies as fixed-output derivations.

This makes buildRustPackage much easier to use as part of a Rust
project, since it does not require updating cargo{Sha256,Hash} for
every change to the lock file.
2021-05-28 08:01:28 +02:00
Daniël de Kok 2f46d77e28 rustPlatform.importCargoLock: init
This function can be used to create an output path that is a cargo
vendor directory. In contrast to e.g. fetchCargoTarball all the
dependent crates are fetched using fixed-output derivations. The
hashes for the fixed-output derivations are gathered from the
Cargo.lock file.

Usage is very simple, e.g.:

importCargoLock {
  lockFile = ./Cargo.lock;
}

would use the lockfile from the current directory.

The implementation of this function is based on Eelco Dolstra's
import-cargo:

https://github.com/edolstra/import-cargo/blob/master/flake.nix

Compared to upstream:

- We use fetchgit in place of builtins.fetchGit.
- Sync to current cargo vendoring.
2021-05-28 08:01:25 +02:00
Ryan Mulligan c8e32eddf8
Merge pull request #120319 from fricklerhandwerk/docs-to-markdown
doc/using: convert to markdown
2021-05-27 06:44:16 -07:00
Domen Kožar d71078f4f4
Merge pull request #124273 from NixOS/backporting-action
Add backporting action
2021-05-25 11:38:29 +02:00
Domen Kožar 51c7afa95e
backport action: document the workflow 2021-05-25 09:47:33 +02:00
Thomas Depierre f55c3e2f21 beam-packages: drop erlang R18 R19 R20 and cuter 2021-05-25 07:38:41 +09:00
happysalada 6d1621c324 beam: fix documentation 2021-05-25 07:36:38 +09:00
happysalada a6cfe32089 elixir: add deprecation schedule docs 2021-05-24 10:14:17 +09:00
Alyssa Ross dc3dea22be doc/submitting-changes: should -> must
To me, as a native English speaker, this doesn't change the meaning of
the sentence at all.  But to a non-native speaker, this can read like
the staging-next rules are only recommendations.  Let's make this
clearer.
2021-05-23 20:26:32 +00:00
Robert Hensing ea0c94f50d
Merge pull request #123111 from hercules-ci/writeDirectReferencesToFile
writeDirectReferencesToFile and maintenance
2021-05-17 15:44:10 +02:00
Jan Tojnar b5f84d830b doc: Add anchors to dhall sections
This will ensure the sections have stable links as well as prevent conflicts (pandoc uses heading text for ids and DocBook requires unique ids across the book).
2021-05-17 09:37:49 +02:00
Sandro f66a5695b4
Merge pull request #121252 from NixOS/SuperSandro2000-patch-1
doc/contributing: add unnecessary string conversions
2021-05-17 02:40:29 +02:00
ydlr a2f3a63953
restore buildMix and its bootstrapper (#122374)
* restore mixBuild

remove bootstrapper by going through ERL_LIBS
mix will use ERL_LIBS to find compiled dependencies

Co-authored-by: Zach <zach@hipcreativeinc.com>
2021-05-17 08:05:40 +09:00
Gabriel Gonzalez b23797e2c5
dhall: Document language support in the Nixpkgs manual (#123051) 2021-05-15 08:51:08 -07:00
Robert Hensing ed4523186e writeReferencesToFile: docs and tests 2021-05-15 17:04:25 +02:00
Robert Hensing cc60f81e69 writeDirectReferencesToFile: init 2021-05-15 17:04:25 +02:00
Jonas Chevalier c6b62f2381
mkShell: introduce packages argument (#122180)
The distinction between the inputs doesn't really make sense in the
mkShell context.  Technically speaking, we should be using the
nativeBuildInputs most of the time.

So in order to make this function more beginner-friendly, add "packages"
as an attribute, that maps to nativeBuildInputs.

This commit also updates all the uses in nixpkgs.
2021-05-13 19:17:29 +02:00
David aaa16732ce rebar3: add rebar3WithPlugins 2021-05-11 08:59:57 +09:00
Erlend Pedersen 3452a739d1
nixpkgs-manual: lib.attrsets.mapAttrsToList returns a list (#122179) 2021-05-08 13:55:11 +02:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Jan Tojnar 48a0757b75
wrapGAppsHook4: init 2021-05-05 22:42:13 +02:00
Luke Granger-Brown 147c701583
Merge pull request #120534 from davidak/package-tests
doc: add instructions for creating package tests
2021-05-01 22:31:02 +01:00
Sandro 08ab1d9572
doc/contributing: add unnecessary string conversions 2021-04-30 11:31:48 +02:00
Sandro 226b043cef
doc/contributing: clarify stdenv.lib deprecation 2021-04-30 11:05:39 +02:00
Domen Kožar ba6f0e8f03
Merge pull request #110491 from neosimsim/agda-doc-fix-install-command
agda: fix code snippet for installing Agda
2021-04-27 17:40:36 +02:00
Patrick Hilhorst 04f82b9ebd doc/submitting-changes: remove incorrect remark
Tests don't only apply to NixOS modules, see for example tests/vscodium
2021-04-26 11:47:42 -04:00
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
fricklerhandwerk c30fe24120 docs/using: shellSession -> ShellSession
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2021-04-25 10:31:02 +02: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
davidak c357fbeb51 doc: add instructions for creating package tests 2021-04-24 18:39:45 +02: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
Alexander Ben Nasrallah 4e8641a415 agda: extend agda language frameworks manual section
- add code snippets
- be more detailed on some aspects
2021-04-23 18:31:04 +02: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
fricklerhandwerk d8b5ed331d doc/using: convert to markdown 2021-04-23 12:02:07 +02: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
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