Jan Tojnar
997bb5e42c
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/development/python-modules/dnspython/default.nix
; pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Sandro
2f1e03cb2b
Merge pull request #165691 from lucc/github-removed-unencrypted-git
2022-03-28 12:47:42 +02:00
Vincent Laporte
87c74b8120
User manual: document duneVersion
2022-03-28 07:08:14 +02:00
github-actions[bot]
84962daf66
Merge staging-next into staging
2022-03-25 18:01:48 +00:00
github-actions[bot]
c6dd9fd65d
Merge master into staging-next
2022-03-25 18:01:14 +00:00
Silvan Mosberger
99d9d45630
Merge pull request #164651 from Infinisil/remove-optionSet
...
lib/modules: Finally remove deprecated types.optionSet
2022-03-25 17:41:57 +01:00
maralorn
0e0bb200ff
Merge pull request #165327 from ncfavier/fetchpatch-relative
...
fetchpatch: add `preIncludes` and `relative`
2022-03-25 16:32:14 +01:00
github-actions[bot]
8357b101a5
Merge staging-next into staging
2022-03-25 12:02:05 +00:00
Lucas Hoffmann
f3bda2f2c0
docs: replace defunct git://github.com urls with https://
2022-03-25 11:21:42 +01:00
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next
2022-03-25 10:16:56 +01:00
José Romildo Malaquias
eff8a32c29
Merge pull request #163623 from ilya-fedin/fix-mate-utils-inkscape
...
nixos/wrap-gapps-hook: don't add data directories of icon dependencies into XDG_DATA_DIRS
2022-03-24 21:34:23 -03:00
Naïm Favier
bf7d13dc4f
fetchpatch: add relative
...
Allows restricting patches to a specific subdirectory, à la
`git diff --relative=subdir`.
This cannot be done (cleanly) currently because the `includes` logic
happens *after* `stripLen` is applied, so we can't match on `subdir/*`.
This change adds a `relative` argument that makes this possible by
filtering files before doing any processing, and setting `stripLen` and
`extraPrefix` accordingly.
2022-03-25 01:00:36 +01:00
Naïm Favier
7ab1fd262f
vimUtils.makeCustomizable: rewrite to include more things
...
The current wrapper only includes vim, gvim and the man pages
(optionally). This rewrite distinguishes two scenarios, which I expect
cover the majority of use cases:
- standalone mode, when `name != "vim"`, means the user already has a
vim in scope and only wants to add a customized version with a
different name. In this case we only include wrappers for `/bin/*vim`.
- non-standalone mode, when `name == "vim"`, means the user expects a
normal vim package that uses the specified configuration. In this case
we include everything in the original derivation, with wrappers for
all the executables that accept a vimrc.
2022-03-25 00:12:02 +01:00
Robert Hensing
ceb58590b7
Merge pull request #165133 from jahway603/master
...
Added fetchFromGitea to docs
2022-03-24 17:36:00 +01:00
Léo Gaspard
174c3e1741
nixpkgs/manual: add an explicit mention of CTAN so google can index
2022-03-24 14:14:05 +01:00
github-actions[bot]
03c279d7ea
Merge staging-next into staging
2022-03-22 00:02:58 +00:00
Austin Butler
5c105f9208
docs: document Javascript package updates in nixpkgs
2022-03-21 15:32:53 -04:00
github-actions[bot]
6ae26bb3c8
Merge staging-next into staging
2022-03-21 18:07:51 +00:00
jahway603
021d10cde0
added fetchFromGitea to docs
2022-03-21 12:39:17 -04:00
Kevin Cox
8ce16fcf62
Merge pull request #163451 from hercules-ci/stop-premature-warnings
...
Stop premature warnings, including `nix.settings` migration
2022-03-21 10:10:40 -04:00
Silvan Mosberger
96698efe0c
lib/modules: Finally remove deprecated types.optionSet
...
types.optionSet has been deprecated for almost 10 years now
(0e333688ce
)! A removal
was already attempted in 2019
(27982b408e
), but it was promptly
reinstantiated since some third-party uses were discovered
(f531ce75e4
).
It's finally time to remove it for good :)
2022-03-18 04:51:27 +01:00
Ilya Fedin
802c818d3f
doc/gnome: update accordingly to wrapGAppsHook change
2022-03-17 13:25:57 +04:00
zowoq
6431086967
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Vladimír Čunát
f48c1fda6b
Merge branch 'master' into staging-next
...
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments. The fetched patch is already in src.
I checked that libvirt builds.
2022-03-15 09:52:04 +01:00
Artturi
b54e7571e2
Merge pull request #161739 from Artturin/gsettingsfhsenv
2022-03-15 00:03:56 +02:00
Alyssa Ross
d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/compilers/ocaml/4.12.nix
pkgs/development/python-modules/oci/default.nix
pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
github-actions[bot]
ea64a128d1
Merge master into staging-next
2022-03-14 00:02:12 +00:00
Jan Tojnar
def8a25f74
Merge pull request #163995 from TWal/doc-functions-attrsets-zipattrs
...
nixos/nixpkgs/doc: fix typo in the signature of attrsets.zipAttrs
2022-03-13 22:32:56 +01:00
Vincent Laporte
b5359c444e
buildDunePackage: use dune_2 by default
2022-03-13 21:19:09 +01:00
Théophile Wallez
3f25903151
nixos/nixpkgs/doc: fix typo in the signature of attrsets.zipAttrs
2022-03-13 13:59:51 +01:00
Martino Fontana
93d624a49a
doc/builders: fix typos
2022-03-10 20:43:29 +01:00
Robert Hensing
3e39e243db
doc/reviewing-contributions: Recommend mkRenamedOptionModuleWith
2022-03-09 14:53:53 +01:00
Manuel Mendez
8b5a7940b0
go: Bunch of fixes when using excludedPackages and other bits
...
Few things going on in this commit:
Do not print "Building subPakage $pkg" message if actually going to skip the
package. This was confusing to me when I was trying to figure out how to set
excludedPackages and seeing the "Building subpackage $pkg" messages for
packages I wanted to skip. Turns out this messages was being printed before
checking if we actually wanted to build the package and not necessarily that my
excludedPackages was wrong.
Make go-packages look a little bit more like go-modules, by adding testdata to
the default list of excluded packages.
This commit also does some setup outside the buildGoDir function so that we
avoid checking `excludedPackages` for every package and cut down the number
of grep calls by half since we always want at least one grep for the default
excludedPackages, might as well just add to the patterns being checked.
Finally, adds documentation for usage of excludedPackages and subPackages. I
had to read the implementation to figure out how to correctly use these
function arguments since there was no documentation and different uses in the
code base. So this commit documents usage of the arguments.
2022-03-04 13:32:44 +10:00
github-actions[bot]
2a58d6a788
Merge master into staging-next
2022-03-03 00:06:54 +00:00
Artturin
3e7e6ab84a
buildFHSUserEnv{Chroot,Bubblewrap}: link gsettings-schemas to the FHS location
...
We shouldn't need to use wrapGAppsHook in expressions
that use this builder.
2022-03-03 01:22:09 +02:00
Jonathan Ringer
5f91781b55
treewide: remove steam-run-native
2022-03-02 12:25:45 -08:00
AndersonTorres
ed2b1b4b90
Merge branch 'master' into staging-next
2022-02-26 21:04:25 -03:00
Vincent Laporte
68e4b639a3
Merge pull request #161111 from ulrikstrid/ulrikstrid/coq-move-dune-to-native
...
coq: Move dune, ocaml and findlib to nativeBuildInputs
2022-02-26 08:54:53 +01:00
Frederik Rietdijk
1986bedcff
python3Packages: document how to handle extras-require
2022-02-25 14:09:41 +01:00
Ulrik Strid
7e20e9039e
coqPackages: tree-wide move packages to nativeBuildInputs and add strictDeps = true
...
Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
2022-02-25 07:54:17 +01:00
AndersonTorres
3f19fc37a3
Move misc/vim-plugins to applications/editors/vim/plugins
2022-02-24 20:26:07 -03:00
github-actions[bot]
4175f9cdcb
Merge master into staging-next
2022-02-23 00:01:51 +00:00
Guillaume Girol
bedabfbcef
rustPlatform.bindgenHook: init
2022-02-22 19:37:07 +01:00
github-actions[bot]
4f8c8f9497
Merge staging-next into staging
2022-02-19 18:02:01 +00:00
Jan Tojnar
e61eec13a5
Merge pull request #159344 from symphorien/doc-remove-references-to
...
doc: document remove-references-to
2022-02-19 15:17:05 +01:00
Guillaume Girol
f16a62bd63
doc: document remove-references-to
2022-02-19 12:00:00 +00:00
github-actions[bot]
7f28a5962a
Merge staging-next into staging
2022-02-19 00:02:38 +00:00
Guillaume Girol
02a8d5984c
doc: discourage setting phases
, document/encourage runHook instead.
...
Source:
https://matrix.to/#/!kjdutkOsheZdjqYmqp:nixos.org/$mff3KCoPY5sfgsUhKn0e4va7hnz7KMXARaO2_UaLNM4?via=nixos.org&via=matrix.org&via=nixos.dev
2022-02-12 12:00:00 +00:00
Markus Kowalewski
f415aae965
nixpkgs/doc: update overlay/lapack section
2022-02-11 17:51:39 +01:00
Robert Hensing
c9b3d27be0
stdenv.md: Call out that genericBuild has correct order
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2022-02-02 23:45:51 +01:00
Robert Hensing
0838f79f0b
stdenv.md: Document genericBuild
2022-02-01 16:58:52 +01:00
Robert Hensing
b08ee51cc7
stdenv.md: Remove off topic phase propaganda
...
Phases are cool, I get it, but the reader will enjoy it when they
see it. And they'll see it sooner if they don't have to read about
it.
2022-02-01 16:46:18 +01:00
Robert Hensing
da702fe9d9
Merge pull request #156857 from hercules-ci/fix-version-suffix-convention
...
doc/coding-conventions: Fix version attribute suffix to match reality
2022-01-27 22:16:15 +01:00
Sandro
27cccd4e49
Merge pull request #151363 from Stunkymonkey/doc-updateWalker
2022-01-27 14:06:36 +01:00
Felix Buehler
7801f72b4c
meta.updateWalker: remove, because it is not used
2022-01-26 21:46:07 +01:00
Robert Hensing
daca830722
doc/coding-conventions: Fix version attribute suffix to match reality
...
The current doc is wildly out of touch with reality. A regex search shows
the following stats.
```
Style example Frequency Regex used
nix-2-5: 8 [a-zA-Z]-[0-9]+(-[0-9]+)+ =
nix-2_5: 17 [a-zA-Z]-[0-9]+(_[0-9]+)+ =
nix_2_5: 689 [a-zA-Z]_[0-9]+(_[0-9]+)+ =
nix_2-5: 1 [a-zA-Z]_[0-9]+(-[0-9]+)+ =
```
2022-01-26 14:40:20 +01:00
Vincent Laporte
cea532f629
manual: document deprecated minimumOCamlVersion
2022-01-26 07:35:19 +01:00
Zhong Jianxin
8c26b2d60f
fetchgit: Add document for sparseCheckout
2022-01-24 11:23:56 +08:00
Pavol Rusnak
5c32667d6e
Merge pull request #154677 from IvarWithoutBones/dotnetModule-installphase
...
buildDotnetModule: wrap executables in preFixup
2022-01-16 15:22:54 +01:00
Nicolas Benes
5c8d6d6cee
doc: fix broken link
...
The file was renamed/modified in 3f40ca4
but the documentation was not
updated. Closes #155049 .
2022-01-15 16:07:55 +01:00
IvarWithoutBones
fcbd429742
buildDotnetModule: wrap executables in preFixup
...
Not doing this used to break wrapGAppsHook as gappsWrapperArgs is set in preFixup, but it was used in installPhase
2022-01-12 00:23:53 +01:00
Robert Hensing
d75b85c5dc
Merge pull request #147690 from pasqui23/hosts
...
concatTextFile: init
2022-01-08 20:40:31 +01:00
Jonas Chevalier
1e910209ae
mkShell: make it buildable ( #153194 )
...
When I designed `mkShell`, I didn't have a good idea of what the output
should look like and so decided to make the build fail. In practice,
this causes quite a bit of confusion and complications because now the
shell cannot be part of a normal package set without failing the CI as
well.
This commit changes that build phase to record all the build inputs in a
file. That way it becomes possible to build it, makes sure that all the
build inputs get built as well, and also can be used as a GC root.
(by applying the same trick as #95536 ).
The documentation has also been improved to better describe what mkShell
does and how to use it.
2022-01-08 01:54:04 +01:00
Renaud
952aa6f820
Merge pull request #148606 from McSinyx/fetch-srht-recurse
...
fetchFromSourcehut: allow recursive fetching
2022-01-06 22:55:23 +01:00
zowoq
8a8c88de70
buildGoModule: use proxyVendor
instead of runVend
2022-01-06 14:00:58 +10:00
zowoq
e67813b0c6
doc/go: remove platform from example
...
this should only be set if the package doesn't work with the default platforms
2022-01-06 09:25:43 +10:00
Erlend Hamberg
865219a09d
doc/beam: minor formatting/copy fixes ( #153396 )
2022-01-04 18:20:42 +08:00
Erlend Hamberg
3083dde52b
Beam/Elixir: Add section on using an overlay ( #153348 )
...
* Beam/Elixir: Add section on using an overlay
2022-01-04 07:10:25 +09:00
Renaud
3d6fc382d6
Merge pull request #152451 from ncfavier/unix-man-urls
...
doc: remove reference to unix-man-urls.lua
2022-01-03 16:05:37 +01:00
Nguyễn Gia Phong
b97ccaa18d
fetchFromSourcehut: allow recursive fetching
2022-01-03 16:37:16 +07:00
zowoq
9f0aab9827
doc/go: remove runVend
from example
2022-01-02 13:35:15 +10:00
Jan Tojnar
f24037746d
Merge pull request #149867 from erikarvstedt/docs-stable-release
...
docs: improve section `Stable release branches`
2021-12-30 16:29:39 +01:00
Naïm Favier
8583c5f48b
doc: remove reference to unix-man-urls.lua
2021-12-28 13:26:35 +01:00
Erik Arvstedt
af46a4d635
docs: improve section Stable release branches
...
- Explain branch naming scheme for stable release branches
- Split into subsections `Automatically backporting ...` and
`Manually backporting...`.
2021-12-28 12:09:28 +01:00
Yevhen Shymotiuk
08d3a002db
doc/python: remove 3.6 from the list of cpython versions
2021-12-28 00:35:07 +02:00
github-actions[bot]
5e2c1acfa3
Merge master into staging-next
2021-12-22 18:01:00 +00:00
IvarWithoutBones
e0b652c3cb
buildDotnetModule: restore and build testProjectFile
2021-12-20 22:31:18 +01:00
Dmitry Kalinkin
ac40a963c9
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/applications/editors/vim/common.nix
pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
pkgs/development/python-modules/pymavlink/default.nix
2021-12-20 12:09:28 -05:00
Domen Kožar
4b1c74a735
Merge pull request #145103 from symphorien/nix-env-i
...
doc: minimize mentions of nix-env -i without -A in nixpkgs manual
2021-12-20 10:01:20 +00:00
github-actions[bot]
2add1758ab
Merge master into staging-next
2021-12-18 18:01:03 +00:00
Jonathan Ringer
0b97e89049
doc/python: update buildPythonApplication example
...
It's recommended to consume the interpreter, not the package
set when being called from `all-packages.nix`
2021-12-18 16:21:37 +01:00
Dmitry Kalinkin
da8f155b2a
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/sphinxext-opengraph/default.nix
2021-12-18 10:18:14 -05:00
Bobby Rong
471246420d
Merge pull request #151193 from Trundle/rust-markdown-fix
...
docs: Fix markdown in Rust language section
2021-12-18 22:50:22 +08:00
Andreas Stührk
192fcbd32a
docs: Fix markdown in Rust language section
2021-12-18 14:05:46 +01:00
Guillaume Girol
a15fbab8e9
doc: minimize mentions of nix-env -i without -A in nixpkgs manual
2021-12-18 12:00:00 +00:00
IvarWithoutBones
8e11dcca48
buildDotnetModule: add passthru.fetch-deps
2021-12-14 20:24:18 +01:00
github-actions[bot]
dfda17d6ba
Merge master into staging-next
2021-12-14 18:01:09 +00:00
Bobby Rong
24786c2c75
Merge pull request #149905 from am-on/fix-404-links
...
doc: fix broken links
2021-12-14 23:19:23 +08:00
github-actions[bot]
0242879f3f
Merge master into staging-next
2021-12-14 12:01:17 +00:00
Luke Granger-Brown
5abdc76f23
Merge pull request #150066 from ezemtsov/buildDotnetModule
...
buildDotnetModule: add support for local project references
2021-12-14 08:39:24 +00:00
Evgeny Zemtsov
06477cccf7
buildDotnetModule: support local project references
2021-12-13 19:14:44 +01:00
Evgeny Zemtsov
a6d02a5214
buildDotnetModule: support optional nupkg packing
2021-12-13 19:13:40 +01:00
Pasquale
6f0eae6d37
docs: added examples to trivial builders section
2021-12-11 19:50:03 +01:00
github-actions[bot]
92aabc6576
Merge master into staging-next
2021-12-10 00:01:53 +00:00
Robert Hensing
9fb7d91888
Merge pull request #124556 from bergkvist/bergkvist/make-c-wrapper
...
Generate tiny compiled binary for wrapping executables
2021-12-10 00:45:30 +01:00
Doron Behar
ceffea674d
Small rephrase of wrapProgram documentation
...
Co-authored-by: Julian Stecklina <js@alien8.de>
2021-12-09 23:24:13 +02:00
Jonathan Ringer
3709e8aaf2
docs/python: Add CPython update schedule
2021-12-09 12:47:53 -08:00
Amon Stopinšek
5f2db22eae
doc: fix broken links
...
Links in documentation shouldn't point to dead ends.
2021-12-09 18:57:38 +00:00
Doron Behar
c42e6741b2
Rephrase documentation for both makeWrapper implementations
2021-12-09 16:02:02 +02:00
Alyssa Ross
c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master. Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00