3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1954 commits

Author SHA1 Message Date
github-actions[bot] f303d4de3b
Merge staging-next into staging 2022-04-09 12:02:07 +00:00
Frederik Rietdijk 1d63f89caa cudaPackages: overhaul of how we package cuda packages
There are many different versions of the `cudatoolkit` and related
cuda packages, and it can be tricky to ensure they remain compatible.

- `cudaPackages` is now a package set with `cudatoolkit`, `cudnn`, `cutensor`, `nccl`, as well as `cudatoolkit` split into smaller packages ("redist");
- expressions should now use `cudaPackages` as parameter instead of the individual cuda packages;
- `makeScope` is now used, so it is possible to use `.overrideScope'` to set e.g. a different `cudnn` version;
- `release-cuda.nix` is introduced to easily evaluate cuda packages using hydra.
2022-04-09 08:50:22 +02:00
Martin Weinelt f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
github-actions[bot] c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Adam Joseph 7dbe7487b6
Update doc/stdenv/cross-compilation.chapter.md
Co-authored-by: Ben Siraphob <bensiraphob@gmail.com>
2022-04-03 17:43:52 +00:00
Adam Joseph c9d66a7fff cross-compilation.chapter.md: give examples of all depFooBar cases
This commit describes the "->" notation for dependency types in
greater detail, and uses g++ to provide examples of all six cases
(although the host->target and target->target examples are a bit
artificial).

It also adds three more rows to the table for the "->*" dependency
types for non-compiler-like packages; these dependency types were
already present in the documentation but the "*" was not really
explained.

Lastly, this commit adds a hyperlink to the table from the place where
it is mentioned in the "specifying dependencies" chapter.
2022-04-02 19:41:49 -07:00
Alyssa Ross 22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
2022-03-31 11:42:24 +00:00
Frederik Rietdijk 25c014324b Merge master into staging-next 2022-03-29 13:25:16 +02:00
7c6f434c cd8d955620
Merge pull request #164994 from ncfavier/vim-wrapper
vim wrapper improvements
2022-03-29 09:50:44 +00:00
Jan Tojnar c8a5db3854 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/archivers/rar/default.nix
2022-03-28 17:56:38 +02:00
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
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