toonn
80ffac4097
Merge pull request #176661 from reckenrode/apple-sdk-11-x86_64
...
apple_sdk_11_0: make available for use on x86_64-darwin
2022-07-08 12:28:51 +02:00
Artturin
2cbce6b012
mesonEmulatorHook: check if the target binaries can be executed
...
this prevents having to bring in the emulator when compiling e.g. pkgsStatic
2022-07-07 21:29:53 +03:00
sohalt
c9d8e34fc4
dockerTools: document environment helpers
2022-07-07 14:50:23 +02:00
github-actions[bot]
312ad6d25c
Merge master into staging-next
2022-07-07 12:01:23 +00:00
Randy Eckenrode
25ccd71ff8
doc: update Darwin platform doc regarding the 11.0 SDK
2022-07-07 07:52:36 -04:00
Robert Hensing
e007eb480c
dockerTools.buildImage: Add copyToRoot to replace contents, explain usage
2022-07-06 07:30:24 +02:00
Cody Hiar
6a9987a095
Updated wording from code review
2022-07-04 14:39:11 -06:00
Johannes Maier
f0100c6fa7
doc/contributing: replace outdated 'nix run' commands
...
Use `nix-shell` instead, but also give an example of the correct
flakes version of the commands.
2022-07-03 21:30:01 +02:00
Artturin
ba1efa71ae
stdenv: substituteInPlace: accept multiple filenames
...
I don't know if getopt is available everywhere, so I did not use it.
in any case, it can be changed to use getopt in the future if
needed.
2022-06-29 22:03:19 +03:00
Cody Hiar
24e95a4461
Remove possessive apostrophes
2022-06-29 12:50:16 -06:00
Cody Hiar
48d5f38c6a
doc/builders/fetchers: Add examples, reduce sentence complexity
2022-06-28 17:18:48 -06:00
github-actions[bot]
54ae4bde46
Merge staging-next into staging
2022-06-28 06:02:06 +00:00
Anderson Torres
f2bcc211d7
Merge pull request #179279 from AndersonTorres/file-managers
...
A new section for file managers
2022-06-27 22:40:06 -03:00
AndersonTorres
ba92e37183
doc/contributing/coding-conventions: add a section about file managers
2022-06-26 23:58:09 -03:00
Sandro
fe72f925f5
Merge pull request #176792 from malob/fix-buildPerlPackages-pname
2022-06-23 13:26:03 +02:00
github-actions[bot]
9a2405d657
Merge staging-next into staging
2022-06-22 18:02:10 +00:00
Robert Hensing
fa9c83ca7f
Merge pull request #174460 from hercules-ci/module-docs-Nix-driven-location-links
...
make-options-doc: Support Nix-provided declaration links
2022-06-22 15:48:46 +02:00
github-actions[bot]
cea2503d73
Merge staging-next into staging
2022-06-21 18:01:45 +00:00
Ivv
8168651288
Merge pull request #178446 from zimbatm/dotnet-nugetdeps
...
buildDotnetModule: allow passing derivations to nugetDeps
2022-06-21 16:00:48 +02:00
zimbatm
ba2f31b6db
buildDotnetModule: allow passing derivations to nugetDeps
...
Sometimes I want to pass a different implementation of `mkNugetDeps`.
For example in private repos, it can be handy to use `__noChroot = true`
and bypass the deps.nix generation altogether. Or some Nuget packages
ship with ELF binaries that need to be patched, and that's best done as
soon as possible.
2022-06-21 15:45:52 +02:00
adisbladis
02c180b646
Merge pull request #176324 from meebey/meebey/meebey-patch-1
...
doc/builders/images/dockertools: improve shadowSetup example
2022-06-21 20:24:20 +08:00
github-actions[bot]
56813953d0
Merge staging-next into staging
2022-06-21 12:06:48 +00:00
Robert Hensing
e2c261f2c0
Merge pull request #176146 from pennae/module-docs-markdown
...
treewide: markdown option docs
2022-06-21 13:16:02 +02:00
tljuniper
ddb0914a7d
doc/languages-frameworks: typos
2022-06-21 09:03:18 +02:00
github-actions[bot]
3746a49dcc
Merge staging-next into staging
2022-06-21 00:02:48 +00:00
Graham Christensen
9284df58c1
maintainers: document new maintainers and team changes
2022-06-20 22:20:26 +02:00
github-actions[bot]
9f3b3514f1
Merge staging-next into staging
2022-06-19 00:03:16 +00:00
github-actions[bot]
b7aba4fb0f
Merge master into staging-next
2022-06-19 00:02:36 +00:00
Vincent Laporte
af888339b6
mkCoqDerivation: do not set DESTDIR
...
Fixes #178109
2022-06-18 11:54:21 +02:00
github-actions[bot]
8c938c76c8
Merge staging-next into staging
2022-06-16 18:01:58 +00:00
github-actions[bot]
1b3f8ec8e4
Merge master into staging-next
2022-06-16 18:01:17 +00:00
Sandro
a963f1b829
Merge pull request #177291 from SuperSandro2000/release-notes.xml
...
Delete unused release-notes.xml
2022-06-16 17:42:52 +02:00
Robert Hensing
11b33fcdcc
doc: Fix config options reference file links
2022-06-15 00:45:05 +02:00
github-actions[bot]
659ec6f582
Merge staging-next into staging
2022-06-14 18:02:03 +00:00
github-actions[bot]
34bc19a1dc
Merge master into staging-next
2022-06-14 18:01:25 +00:00
Vladimír Čunát
7a99205619
Merge #162960 : staging docs: explain that purple arrows are manual
2022-06-14 19:31:34 +02:00
github-actions[bot]
179051c702
Merge staging-next into staging
2022-06-14 12:02:11 +00:00
github-actions[bot]
452a7d6c43
Merge master into staging-next
2022-06-14 12:01:32 +00:00
Robert Hensing
0137df896e
Merge pull request #177370 from hercules-ci/nixpkgs-manual-promote-config-options-reference
...
doc: Promote config Options Reference to sub-chapter section
2022-06-14 11:18:56 +02:00
github-actions[bot]
15c142e5c0
Merge staging-next into staging
2022-06-13 18:02:13 +00:00
github-actions[bot]
6ccd35f78f
Merge master into staging-next
2022-06-13 18:01:35 +00:00
Matthieu Coudron
a1ad235743
vimUtils: deprecate configure.pathogen ( #154814 )
...
pathogen does not bring any value compared to vim native packages so
remove it to ease maintainance burden.
2022-06-13 15:25:46 +02:00
Artturi
ce62ff7bdf
Merge pull request #176464 from Artturin/gobjecfix
2022-06-12 17:32:49 +03:00
pennae
320aa2a791
treewide: attempt at markdown option docs
2022-06-12 12:44:38 +02:00
Robert Hensing
fa01afcf7f
doc: Promote config Options Reference to sub-chapter section
...
It was hidden in the insecure packages section.
- Lift it out.
- Add an id
2022-06-12 08:27:15 +02:00
Sandro
6449d45e25
Delete unused release-notes.xml
2022-06-11 15:48:52 +02:00
Artturin
6e6292279e
meson: add mesonEmulatorHook
...
fixes building documentation while cross-compiling and other issues
Exec format error: './gdk3-scan'
added some simple documentation
2022-06-11 04:51:04 +03:00
github-actions[bot]
ef1a40da01
Merge staging-next into staging
2022-06-10 12:02:21 +00:00
Valentin Gagarin
c3ea8c4dd9
do not mention trivial builders
2022-06-10 11:43:57 +02:00
Valentin Gagarin
e132e6be3c
fix heading level
2022-06-09 13:43:21 +02:00
Elis Hirwing
e91811bbe1
php74: Drop PHP 7.4 and add aliases throwing an error
2022-06-08 18:11:55 +02:00
Valentin Gagarin
f70073d72d
remove specifics on where build inputs come from in PATH
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2022-06-08 11:43:32 +02:00
Malo Bourgon
399732b449
buildPerlPackage: don't mess with pname
and phase out use of name
...
Currently `buildPerlPackage` prefixes the Perl version to the package's
`pname`, which results in `nix run` not being able to work for any
packages build with it out of the box. This commit corrects that and
phases out the ability to set `name` directly, as well as refactors the
code to not require `cleanedAttrs`.
2022-06-07 12:49:23 -07:00
Martin Weinelt
4566beb390
doc/python: update python version references
2022-06-06 11:46:06 -07:00
Mirco Bauer
ac66ff97ed
doc/builders/images/dockertools: improve shadowSetup example
...
The example snippet will fail with this error as it is not self contained and
assumes `shadowSetup` was given:
$ nix-build docker-image.nix
error: undefined variable 'shadowSetup' at docker-image.nix:20:7
Instead use the full reference to `shadowSetup` in the example so it will work
as stated.
2022-06-05 09:45:58 +08:00
Florian Klink
1cefcfab2d
nixos/doc: move fetchpatch documentation to fetcher documentation
...
… and link from the coding-conventions chapter to it.
Closes #48569 .
2022-06-03 14:37:31 +02:00
Martin Weinelt
79119a149b
Merge pull request #175662 from klemensn/firefox-smartcardSupport
2022-06-01 23:00:51 +02:00
Thiago Kenji Okada
9dfef0f30b
Merge pull request #175288 from thiagokokada/doc-pythonRelaxDepsHook
...
doc: document pythonRelaxDepsHook
2022-06-01 19:50:10 +01:00
Thiago Kenji Okada
2abfe3f700
doc: fix typos in pythonRelaxDepsHook
...
Co-authored-by: Guillaume Girol <symphorien@users.noreply.github.com>
2022-06-01 18:56:33 +01:00
Klemens Nanni
787a444596
doc: firefox: Show how to use PKCS#11 Proxy Module
...
`p11-kit-proxy.so` makes it able to use multiple PKCS#11 modules and
manage them through p11-kit(8).
Fix indentation while here.
2022-06-01 01:22:46 +02:00
Adam Joseph
81bc106e08
meta.sourceProvenance documentation: clarify it is unaffected by changes to meta.license
...
This commit clarifies that the meaning of the `meta.sourceProvenance`
field is independent of and unaffected by the value of the
`meta.license` field. This is based on the intent of the RFC author
as expressed here:
https://github.com/NixOS/nixpkgs/pull/161098#issuecomment-1081270201
This clarification is added for two reasons:
1. If in the future there should be some disagreement about what
`sourceProvenance` to assign to a package, this may help resolve
the disagreement. Any interpretation of `sourceProvenance` which
is influenced by the `meta.license` is clearly an incorrect
interpretation.
2. If it should turn out that it is impossible to disentangle
`sourceProvenance` from `meta.license`, this would indicate the
need for changes to the `sourceProvenance` scheme. That change
might be as simple as replacing the sentence added by this commit
with some other sentence explaining how the two fields influence
each other.
This commit implements the recommendation made in the paragraph of
this comments which begins with "Please say this explicitly...":
https://github.com/NixOS/nixpkgs/pull/161098#issuecomment-1081309089
2022-05-30 16:27:34 +08:00
Robert Scott
9d0784829a
add initial meta.sourceProvenance documentation
2022-05-30 16:27:34 +08:00
Thiago Kenji Okada
74a0e97cd4
doc: document pythonRelaxDepsHook
2022-05-29 14:01:30 +01:00
Artturi
60a0871486
Merge pull request #172391 from Artturin/deprecate-stdenv-glibc
2022-05-27 17:56:19 +03:00
Artturin
c1fffdfffb
treewide: change some glibc to stdenv.cc.libc
2022-05-27 05:57:43 +03:00
Cyril Cohen
d113661156
coqPackages: etc
...
- put `findlib` in `buildInputs` of `mkCoqDerivation` to make sure `coq` packages find their ocaml plugin dependencies,
- use `propagatedBuildInputs` to make sure ocaml plugin dependencies are in path,
- updated `coqPackage.heq` (broken url),
- fixed use of `DESTDIR` and `COQMF_COQLIB` in mkCoqDerivation,
- adding `COQCORELIB` environement variable to put ocaml plugin files in the right place,
- make `metaFetch` available from `coqPackages`
2022-05-25 20:00:25 +02:00
Artturin
0c4d65b21e
treewide: stdenv.glibc -> glibc
2022-05-25 15:51:20 +03:00
github-actions[bot]
ba5122823c
Merge master into staging-next
2022-05-23 00:02:36 +00:00
Martin Weinelt
809ffd6cd3
doc/python: use optional-dependencies instead of extras-require
...
This is the term that PEP 621 uses and it is less likely to be
misspelled.
https://peps.python.org/pep-0621/#dependencies-optional-dependencies
I was never sure if it was `extra` or `extras`, or `require` or
`requires` and finally committed a mistake in #167405 .
2022-05-22 16:31:45 +02:00
github-actions[bot]
75906ed245
Merge master into staging-next
2022-05-20 00:02:29 +00:00
Robert Hensing
90344e9f40
Merge pull request #171163 from hercules-ci/nixpkgs-config-doc
...
Add generated `nixpkgs.config` doc to Nixpkgs manual
2022-05-19 20:51:38 +02:00
github-actions[bot]
925219f62b
Merge master into staging-next
2022-05-18 18:01:13 +00:00
Janne Heß
dabac4bf0c
doc: Document that the staging branches may be restricted
2022-05-18 17:37:48 +02:00
Arnout Engelen
b3f85a2702
Merge pull request #172164 from raboof/docs-clarify-mass-rebuild
...
docs: clarify what a 'mass rebuild' is
2022-05-18 14:42:23 +01:00
github-actions[bot]
e2602ad62e
Merge staging-next into staging
2022-05-16 00:04:11 +00:00
Malo Bourgon
ef3ed931d2
nodePackages: update/cleanup documentation
2022-05-14 11:30:21 -07:00
github-actions[bot]
814126147f
Merge staging-next into staging
2022-05-13 12:02:03 +00:00
Vincent Laporte
1f11888116
Revert "coqPackages: etc"
...
This reverts commit 7e589a45ef
.
2022-05-13 06:47:14 +02:00
Thiago Kenji Okada
5c5187646d
Merge pull request #172366 from ncfavier/wrappers-cleanup
...
make{,Binary}Wrapper: some cleanups
2022-05-12 22:17:34 +01:00
Cyril Cohen
7e589a45ef
coqPackages: etc
...
- use propagatedBuildInputs to make sure ocaml plugin stuff is in path
- updated coqPackage.heq (broken url)
- fixed use of `DESTDIR` and `COQMF_COQLIB` in mkCoqDerivation
- adding `COQCORELIB` environement variable to put ocaml plugin files in the right place
- make metaFetch available from `coqPackages`
2022-05-12 06:11:43 +02:00
Naïm Favier
0d6bcb513b
makeBinaryWrapper: move into its own folder
...
The derivation is complex enough to warrant moving out of
all-packages.nix
2022-05-10 22:07:56 +02:00
Robert Hensing
ebf0465d09
Merge remote-tracking branch 'upstream/master' into testers
2022-05-09 14:27:13 +02:00
Arnout Engelen
1c73a0773c
doc: clarify what a 'mass rebuild' is
2022-05-09 12:31:21 +02:00
Drew Risinger
0d7b5a7e64
doc: remove python-language-server from manual
...
python3Packages.python-language-server is no longer maintained (broken), so it shouldn't be an example.
2022-05-05 15:07:47 -07:00
Robert Hensing
e8ffb6a727
doc/testers: Mention nixosTests in nixosTest doc
2022-05-05 13:08:05 +02:00
Robert Hensing
7edb414660
testers.nixosTest: Move from top-level and improve docs
2022-05-05 12:48:47 +02:00
Artturi
f0e48dd98b
Merge pull request #119942 from hercules-ci/mkDerivation-overridable-recursive-attributes
2022-05-04 14:31:50 +03:00
Matthias Beyer
bdcb818804
Replace "rm" call with "git rm"
...
`git rm` should always be preferred over "normal" `rm`.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2022-05-03 13:38:50 +02:00
Sandro
beec499a8a
Merge pull request #163598 from SuperSamus/doc-builder-typos
...
doc/builders: fix typos
2022-05-03 09:41:34 +02:00
Robert Hensing
e40d2099d2
doc: Add Nixpkgs config options reference
2022-05-02 10:21:05 +02:00
Robert Hensing
0e00acafe9
stdenv.mkDerivation: public -> finalPackage
2022-05-02 08:49:33 +02:00
Robert Hensing
ca83dd1ae7
stdenv.md: Clarify overrideAttrs sentence
...
I weirded my English.
2022-05-02 08:49:32 +02:00
Robert Hensing
1bbb5a14c8
doc/using/overrides: Update for overlay style mkDerivation overrideAttrs
2022-05-02 08:49:31 +02:00
Robert Hensing
d629ba27d9
Use finalAttrs instead of self for mkDerivation "overlay"
2022-05-02 08:49:31 +02:00
Robert Hensing
6d7efb3a16
stdenv.mkDerivation: Make self more overlay-like; use self.public
...
`self` is now arguments, like `super`. The final package is in
`self.public`.
2022-05-02 08:49:31 +02:00
Robert Hensing
2f21bc2fdb
doc/stdenv/meta: tests -> passthru.tests
...
Make the text understandable without knowing that these are identical.
Co-authored-by: Daniël de Kok <me@github.danieldk.eu>
2022-05-02 08:49:30 +02:00
Robert Hensing
a4e7085227
stdenv.mkDerivation: Allow overriding of recursive definitions
...
See updated manual for further explanation.
2022-05-02 08:49:26 +02:00
Artturin
41808d42d2
doc: move testers to their own chapter
2022-04-22 16:24:29 +03:00
sternenseemann
e9d8ace0ae
Merge pull request #134514 from MostAwesomeDude/chicken
...
CHICKEN docs and updates
2022-04-22 14:02:23 +02:00
Corbin
5bbb538e72
doc: Explain how to use and maintain CHICKEN.
...
Also add information about egg2nix.
Includes suggestions from code review.
Co-authored-by: sterni <sternenseemann@systemli.org>
2022-04-21 15:18:26 -07:00
Valentin Gagarin
311d322feb
docs: sync patchShebangs
comments with manual
...
this is not an actual sync, but rather the manual taking the leading role.
right now it does not make sense to actually change `patch-shebangs.sh`
as that would cause a rebuild of the entire universe.
we should figure out how to keep them aligned with minimal effort both
in terms of maintenance as well as navigation for readers.
2022-04-21 12:21:49 +02:00
Valentin Gagarin
9a2ed65370
fix wording, remove too much specificity
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2022-04-21 09:27:11 +02:00
fricklerhandwerk
b4d9d682c8
docs: clean up and update links to source code
2022-04-21 09:27:11 +02:00
fricklerhandwerk
e3883d2ce0
docs: clarify note on existing store paths
2022-04-21 09:27:10 +02:00
fricklerhandwerk
b0fce27ce2
docs: expand explanation of patchShebangs hook
...
- clarify motivation and mechanism
- explain usage
- add interlinks
- add links to sources to enable research
based on https://discourse.nixos.org/t/what-is-the-patchshebangs-command-in-nix-build-expressions/12656
2022-04-21 09:27:09 +02:00
Adam Joseph
50217b01dd
submitting-changes.chapter.md: avoid being specific
...
There is some doubt as to exactly how to enumerate all the merges from
one branch to another reliably. In the meantime, let's be a little
more vague.
2022-04-20 03:22:17 -07:00
Robert Hensing
33cf95ef36
Merge pull request #168932 from hercules-ci/init-postgresqlTestHook
...
`postgresqlTestHook`: init
2022-04-18 11:58:34 +02:00
Robert Hensing
99fed858bb
doc/hooks/index.xml: Fix typo and terminology
2022-04-18 11:57:35 +02:00
Robert Hensing
e77e09c5d2
postgresqlTestHook: init
2022-04-16 17:17:46 +02:00
github-actions[bot]
999a16ca63
Merge staging-next into staging
2022-04-14 12:02:14 +00:00
Doron Behar
94eb0d16a3
Merge pull request #149667 from doronbehar/doc/pname-version-conventions
...
docs: Make coding conventions use pname/version
2022-04-14 12:00:59 +03:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
...
Minor conflicts; I hope I didn't mess up:
pkgs/development/tools/misc/binutils/default.nix
pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Samuel Ainsworth
263292cb5e
Merge pull request #167397 from samuela/samuela/autopatchelf
...
autoPatchelfHook: more precise dependency ignorance
2022-04-12 08:58:00 -07:00
Samuel Ainsworth
a7fc2f6392
autoPatchelfHook: more precise dependency ignorance
2022-04-11 01:28:55 +00:00
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