nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
304,241 Commits 230 Branches 124 Tags 7.6 GiB
f386172715
Commit Graph

1690 Commits

Author SHA1 Message Date
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
Frederik Rietdijk
a9faf404c8 python docs: fix note regarding default interpreter 2021-03-13 14:11:31 +01:00
Frederik Rietdijk
9d03ff5222 python: reproducible builds 
Achieve reproducible builds of the interpreter. Note this meant
disabling optimizations again.
 2021-03-13 13:11:50 +01:00
Julien Moutinho
a9ce4c4a0e zerobin: 20160108 -> 1.0.5 2021-03-13 13:06:06 +01:00
github-actions[bot]
b4d5951d9e
Merge master into staging-next 2021-03-11 12:21:28 +00:00
Michael Weiss
938453eacd
Merge pull request #102225 from luc65r/fetchsrht 
Add fetcher: fetchFromSourcehut
 2021-03-11 12:51:13 +01:00
github-actions[bot]
6a3a358b0d
Merge master into staging-next 2021-03-10 18:23:15 +00:00
Benjamin Hipple
7ff22cb08c
Merge pull request #115651 from bhipple/doc/dockertools-cleanup 
doc: remove unnecessary \ escapes in dockertools.section.md
 2021-03-10 13:09:53 -05:00
Cyril Cohen
1550a4fe6b
coqPackages.multinomials: 1.5.2 -> 1.5.4 (#115427) 
- This is the first packages which uses Dune in order to build and install
  so I had to refactor build-support/coq/default.nix in order to support it.
- I added a new feature: one can now release.v.sha256 empty to try to download
  with a fake sha256, hence failures are reported and one can copy paste the
  sha256 given by the error message.
- I updated the documentation of languages-frameworks/coq.section.md accordingly.
 2021-03-10 16:25:32 +01:00
Benjamin Hipple
9c4353833f doc: remove unnecessary \ escapes in dockertools.section.md 
These pollute the plain text and, after re-running `nix-build` and looking at
the result, do not appear to have any impact on the rendered version.
 2021-03-09 19:02:56 -05:00
github-actions[bot]
5c2a7abde7
Merge master into staging-next 2021-03-08 18:22:56 +00:00
luc65r
83a0627f33
fetchFromSourcehut: init 2021-03-08 15:51:24 +01:00
Robert Schütz
11f4fa4a22 doc: mention up-to-date tools for generating Python expressions 2021-03-08 11:06:24 +01:00
github-actions[bot]
dcea8212b5
Merge staging-next into staging 2021-03-07 12:20:40 +00:00
Jörg Thalheim
247c6f4ce3
Merge pull request #115322 from dotlambda/doc-lt 
doc: replace &lt; with < in Markdown
 2021-03-07 11:47:39 +00:00
Robert Schütz
52de3976b8 doc: replace &lt; with < in Markdown 2021-03-07 11:40:18 +01:00
Robert Hensing
b53965f1d2 doc/README.md: Add more links 2021-03-06 12:35:33 +01:00
Jan Tojnar
6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
Robert Hensing
7d551ead60 doc: Format 2021-03-04 18:10:57 +01:00
Robert Hensing
0a4a486096 doc/README.md: init 2021-03-04 18:10:39 +01:00
Robert Hensing
16b327c0b4
Merge pull request #108914 from bryanasdev000/doc-dockertools 
dockertools: Update doc to use CommonMark
 2021-03-04 18:01:39 +01:00
Robert Hensing
a1cf35fbfd doc/builders/images/dockertools.section.md: Fix link labels 2021-03-04 17:44:33 +01:00
Bryan A. S
5a1a08c0a7 doc/builders/images/dockertools.section.md: Fix anchor errors 
Also change note notation

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
 2021-03-04 17:18:18 +01:00
Bryan A. S
06e40b3caf doc/builders/images/dockertools.section.md: Indent nix code 
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
 2021-03-04 17:18:17 +01:00
Bryan A. S
4b99dbbbcc doc/builders/images/dockertools.xml: Convert to markdown and start improvements 
Need to verify things like `error: IDREF "" without matching ID` and `::: {.note}`

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
 2021-03-04 17:18:17 +01:00
github-actions[bot]
eef2c4e401
Merge staging-next into staging 2021-03-03 00:38:15 +00:00
Sandro
d83c76ef5b
Merge pull request #113062 from SuperSandro2000/outputs-update 
doc: update multiple output section with more example paths
 2021-03-03 01:27:20 +01:00
Max Hausch
ebe3ae4d4d
buildRustPackage: Add cargoTestFlags 
This makes it possible to pass flags to `cargo test`, which is needed if
a crate is compiled with custom feature flags.
 2021-03-02 09:45:26 +01:00
Max Hausch
fa62f37160
doc: rust: Fix code blocks in markdown 
And add a word
 2021-03-02 09:40:58 +01:00
Jan Tojnar
913394a1d9
Merge branch 'staging-next' into staging 2021-03-01 19:30:56 +01:00
Jonathan Ringer
6ed55034ee doc/python: reword sorting gaurentee to be stronger 2021-02-28 16:18:58 -08:00
Daniël de Kok
c50a347cb5 buildRustPackage: use checkType argument 
The `checkType` argument of buildRustPackage was not used anymore
since the refactoring of `buildRustPackage` into hooks. This was
an oversight that is fixed by this change.

The check type can also be passed directly to cargoCheckHook using the
`cargoCheckType` environment variable.
 2021-02-26 11:57:27 +01:00
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