Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
...
I made a mistake merge. Reverting it in c778945806
undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2
)
- merging the last unaffected staging-next commit (803ca85c20
)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508 : libraw: 0.20.0 -> 0.20.2"
...
I'm sorry; I didn't notice it contained staging commits.
This reverts commit 17f5305b6c
, reversing
changes made to a8a018ddc0
.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508 : libraw: 0.20.0 -> 0.20.2
2020-10-25 09:28:53 +01:00
Peter Simons
5fe0939d18
The Haskell documentation has moved to < https://haskell4nix.readthedocs.io/ >.
...
That site is generated automatically from the set of text files found at
<https://github.com/NixOS/cabal2nix/tree/master/doc >.
2020-10-23 21:00:26 +02:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging
2020-10-18 21:21:03 +02:00
Jan Tojnar
7d17b2d6f3
doc: Use mesa.drivers instead of legacy alias
...
It was moved in 263f5891b6
.
2020-10-18 00:58:09 +02:00
Aaron Janse
2bccf2e554
add documentation
2020-10-17 00:48:07 -07:00
Peter Simons
56bc587444
Merge remote-tracking branch 'origin/master' into haskell-updates,
2020-10-15 19:39:16 +02:00
John Ericson
c0df12de5d
rust: Add support for managing target JSON in Nix
2020-10-14 04:20:23 +00:00
Frederik Rietdijk
dc0aeee5db
Merge staging-next into staging
2020-10-13 19:35:37 +02:00
Frederik Rietdijk
9e1943edc0
Merge master into staging-next
2020-10-13 19:34:34 +02:00
Frederik Rietdijk
748bc99520
docs: python39 is available
2020-10-13 18:53:40 +02:00
Kevin Cox
8b33d575e4
Merge pull request #98084 from turion/patch-5
...
agda.section.md: Fix header and enumeration
2020-10-11 07:29:58 -04:00
maralorn
0756b8a7bf
haskell-language-server: Init wrapper for multiple ghc versions at 0.5.0 ( #99519 )
...
* haskell-language-server: Init wrapper for multiple ghc versions at 0.5.0
* Fix closure size
* docs: Add hls section to Haskell part of manual
2020-10-10 16:01:57 +02:00
Lily Ballard
7e1e8543fc
installShellFiles: Enhance installShellCompletion
...
Teach installShellCompletion how to install completions from a named
pipe. Also add a convenience flag `--cmd NAME` that synthesizes the name
for each completion instead of requiring repeated `--name` flags.
Usage looks something like
installShellCompletion --cmd foobar \
--bash <($out/bin/foobar --bash-completion) \
--fish <($out/bin/foobar --fish-completion) \
--zsh <($out/bin/foobar --zsh-completion)
Fixes #83284
2020-10-08 15:08:40 -07:00
Frederik Rietdijk
692d219a93
Merge staging-next into staging
2020-10-06 10:25:58 +02:00
Jan Tojnar
32b4375f10
Merge branch 'staging-next' into staging
2020-09-29 00:12:29 +02:00
Doron Behar
f1d01c9d58
Merge pull request #93332 from wamserma/docs-remove-replace-link
...
docs.stdenv: remove reference to replace tool
2020-09-26 19:20:46 +03:00
Manuel Bärenz
cd2dab91d6
Doc -> Languages & Frameworks -> Rust: Update
...
Add information on declarative overlay usage
2020-09-26 10:58:06 +02:00
Jörg Thalheim
a2960ac430
Merge pull request #97603 from zowoq/rust-test-threads
2020-09-25 06:19:23 +02:00
Jan Tojnar
d471c5d1f3
Merge branch 'staging-next' into staging
2020-09-24 23:09:00 +02:00
Jan Tojnar
6d518ddf77
Merge pull request #98503 from jtojnar/doc-prompts
2020-09-24 22:48:38 +02:00
Rok Garbas
882b95802f
Merge pull request #98640 from raboof/rename-guide-to-nixpkgs-manual
...
doc: rename guide to 'Nixpkgs Manual'
2020-09-24 14:36:09 +02:00
Arnout Engelen
926c7e8b4e
doc: rename guide to 'Nixpkgs Manual'
...
For consistency with 'NixOS Manual' and 'Nix Manual', to better match what it's
often called in practice, and to match its URL and HTML title.
2020-09-24 14:07:25 +02:00
Doron Behar
5819bca301
docs/go: Add examples for and explain buildFlags
...
Move common attributes treated by both buildGoModule and buildGoPackage
to a separate section, out of the examples' "callouts".
Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
2020-09-24 11:03:20 +10:00
zowoq
e4c71e6c6c
buildRustPackage: support setting test-threads
2020-09-24 07:19:58 +10:00
Jan Tojnar
e1af37634b
doc: Improve code listings
...
By adding prompts and removing unnecessary indentation.
2020-09-23 01:25:25 +02:00
Frederik Rietdijk
7bff759fac
Merge staging-next into staging
2020-09-22 18:31:56 +02:00
zowoq
069757550e
doc/python: remove trailing whitespace
2020-09-21 09:35:27 +10:00
Manuel Bärenz
87cab901a3
agda.section.md: Fix header, enumerations, capitalisation
2020-09-18 12:42:06 +02:00
Robert Helgesson
fbc5093649
hooks: add moveSystemdUserUnitsHook
...
This hook moves systemd user service file from `lib/systemd/user` to
`share/systemd/user`. This is to allow systemd to find the user
services when installed into a user profile. The `lib/systemd/user`
path does not work since `lib` is not in `XDG_DATA_DIRS`.
2020-09-12 18:29:46 +02:00
Alexandre Esteves
0cad09a68a
docs/rust: fix typo
...
Co-authored-by: Drew <drewrisinger@users.noreply.github.com>
2020-09-10 19:10:27 +02:00
Daniël de Kok
466522c919
Merge pull request #97137 from danieldk/blis-0.7.0
...
blis: init at 0.7.0
2020-09-08 14:55:39 +02:00
zowoq
23c781a810
buildGoPackage: check/delete vendor
2020-09-08 16:32:39 +10:00
Daniël de Kok
aeb5951978
doc/using/overlays.xml: add BLIS
2020-09-07 19:49:51 +02:00
Silvan Mosberger
560bb92473
Merge pull request #76794 from dudebout/document-nix-env-multiple-output-install-bug
...
document nix-env bug relating to multiple output installation
2020-09-05 15:40:26 +02:00
Nicolas Dudebout
611258f063
document nix-env bug relating to multiple output installation
2020-09-05 05:31:54 -04:00
Michele Guerini Rocco
2b575c5f1f
Merge pull request #96963 from doronbehar/doc/nodejs
...
doc: nodejs: Update override example to use overlays
2020-09-04 22:58:36 +02:00
Jake Waksbaum
58e585c93b
vimPlugins: Document node-based plugins
2020-09-04 08:33:47 -07:00
Doron Behar
c67bcd23d4
doc: nodejs: Update override example to use overlays
...
Also: Add links so it'll be easier to find the referred files.
2020-09-02 19:00:46 +03:00
John Ericson
31dae7d627
Merge pull request #84047 from aaronjanse/document-android-emulator-variable
...
emulateApp: document $NIX_ANDROID_EMULATOR_FLAGS
2020-08-20 00:26:53 -04:00
Jonathan Ringer
233dc9c7d1
doc/python: Add pythonImportsCheck mention
2020-08-17 13:41:39 -07:00
Jonathan Ringer
93e7292976
doc/python: add pytestCheckHook section
2020-08-17 13:41:39 -07:00
worldofpeace
0149bdac53
Merge pull request #95511 from jtojnar/var-anchors
...
doc: Add anchors to stdenv variables
2020-08-16 22:50:13 -04:00
zowoq
473536e3b5
buildRustPackage: remove platform.all from packages
2020-08-16 12:48:18 +10:00
Jan Tojnar
3f2b7beaf3
doc: Add anchors to stdenv variables
...
Wanted to link them.
2020-08-15 17:55:30 +02:00
Frederik Rietdijk
49f4475307
Merge pull request #95305 from jonringer/remove-py35
...
python35: remove
2020-08-15 09:08:47 +02:00
zowoq
961aa31455
buildGoModule: update deleteVendor docs
2020-08-14 07:50:37 +10:00
Jonathan Ringer
8c7d49b726
docs: update python interpreter versions
2020-08-12 21:57:40 -07:00
Daniël de Kok
14ac67cbb3
doc/using/overlays.xml: fix some small glitches
2020-08-10 15:47:38 +02:00
Daniël de Kok
8ffc74313e
doc/using/overlays.xml: add AMD BLIS/LIBFLAME to the BLAS/LAPACK list
2020-08-10 15:41:33 +02:00
Matthew Mazzanti
2df0fda951
doc: Fix missing callout in go.xml
...
Pull #89453 introduced a bug in the documentation that is preventing the
hydra build for nixpkgs-unstable from finishing. I have added the
additional option indroduced in that patch (runVend for go modules) and
added the callout tag so that the documenation can build again.
2020-08-02 09:35:04 +10:00
zowoq
e703f3f34b
Merge pull request #89453 from c00w/vend
...
Add vend support to go-modules
2020-07-31 15:16:47 +10:00
zowoq
b3d71cd63d
doc/*: editorconfig fixes
2020-07-31 15:06:53 +10:00
Maciej Krüger
bee2b91b7f
doc/steam: add docs about new steam module
2020-07-30 20:26:33 +02:00
Colin L Rice
95be7b25be
go-modules: Add useVend flag to go-modules
2020-07-28 21:11:28 -04:00
Mitsuhiro Nakamura
f2b2347b29
doc: add section for cataclysm-dda
2020-07-18 14:23:25 +09:00
Mitsuhiro Nakamura
c9c6f5f693
doc: fix MD_TARGETS
...
globstar (**) does not work in Makefile
2020-07-18 14:23:25 +09:00
zowoq
ff3d205314
doc/perl: fix build
2020-07-18 15:12:37 +10:00
Jan Tojnar
fb7507d068
Merge pull request #92348 from jtojnar/explicit-only-gpl
...
licenses: Make single-version-only GPL explicit
2020-07-18 06:48:41 +02:00
Maximilian Bosch
98d2458e66
Merge pull request #90692 from Ma27/citrix-workspace
...
citrix_workspace: add more features, refactor derivation
2020-07-17 16:12:55 +02:00
Jörg Thalheim
3829979d8d
Merge pull request #86589 from raboof/document-running-perl-scripts-from-the-shell
...
doc: add section on running ad-hoc Perl programs to the nixpkgs manual
2020-07-17 10:20:24 +01:00
Arnout Engelen
6093372069
Add section on running ad-hoc Perl programs to the nixpkgs manual
...
Co-authored-by: Timo Kaufmann <timokau@zoho.com>
2020-07-17 09:08:53 +02:00
Markus S. Wamser
92ad9e9dc4
docs.stdenv: remove reference to replace tool
2020-07-17 08:21:09 +02:00
Maximilian Bosch
af83f9a24e
citrix_workspace: update docs about selfservice
2020-07-15 19:10:58 +02:00
Maximilian Bosch
fa3948a7c5
citrix_workspace: add more features, refactor derivation
...
In #89806 it has been reported that the final package is missing a lot
of features like support for the self-service GUI and the
config-management.
While working on supporting those components in the Nix-package, I
decided to refactor the package to simplify the entire setup.
This patch changes the following things:
* Binaries and libraries are patched using the `autoPatchelfHook` to
avoid having unneeded libraries linked (e.g. some programs use gtk2,
others use gtk3).
* Moved source-declarations into their own file.
* Wrapped `configmgr` and `selfservice` and added those to `$out/bin`.
* Don't mention the old `citrix_receiver`-packages in the manual anymore
since those packages were removed in 19.09 and are EOLed anyways.
Closes #89806
2020-07-15 19:10:58 +02:00
Jan Tojnar
13b5ae55cd
licenses: Make single-version-only GPL explicit
...
I commonly see people use the former when they should use the latter.
Would be also in line with the SPDX change https://www.gnu.org/licenses/identify-licenses-clearly.html
2020-07-05 17:51:30 +02:00
Frederik Rietdijk
c33ca7c5ce
Merge staging-next into staging
2020-07-02 17:14:53 +02:00
Sami Bouhlel
c179ae6567
Fix typos in documentation ( #91934 )
2020-07-01 16:54:22 +01:00
DavHau
c8c09b7dda
add autoPatchelfIgnoreMissingDeps to auto-patchelf.sh
2020-06-22 10:41:35 +02:00
Steve Purcell
c9e6a02c82
Add docs for dockerTools.streamLayeredImage
2020-06-22 15:19:44 +12:00
Maximilian Bosch
19dfc1b011
Merge pull request #90689 from cole-h/fix-manual
...
agda: fix manual build -- blocks nixpkgs-unstable
2020-06-17 23:05:58 +02:00
Cole Helbling
5baa7541d7
agda: fix manual build
...
/build/doc/manual-full.xml:12764:35: error: ID "build-phase" has already been defined
/build/doc/manual-full.xml:9029:33: error: first occurrence of ID "build-phase"
2020-06-17 13:51:43 -07:00
zowoq
c3a05f90ed
doc/stdenv: fix build
...
https://hydra.nixos.org/build/128037886/nixlog/1/tail
error: element "variable" not allowed anywhere
2020-10-03 18:49:10 +10:00
Jan Tojnar
74c5472090
Merge pull request #98304 from jtojnar/updateScript-commit3
...
maintainers/scripts/update.nix: Add support for auto-commiting changes
2020-10-02 06:16:09 +02:00
Jan Tojnar
0c5ddf3358
maintainers/scripts/update.nix: run update script with UPDATE_NIX_ATTR_PATH
...
The environment variable will contain the attribute path the script is supposed to update.
2020-09-20 20:12:33 +02:00
Jan Tojnar
c1b05442ff
doc: Undocument attr-set of passthru.updateScript
...
We no longer need it for most use cases so I am making it experimental.
I have something in mind where it might be useful in the future (customizing commit messages)
but for now, it would only confuse people.
2020-09-20 20:12:32 +02:00
Jan Tojnar
c21a85c6a0
maintainers/scripts/update.nix: auto-detect attrPath
2020-09-20 20:11:46 +02:00
Jan Tojnar
b828285933
maintainers/scripts/update.nix: support filling in auto-commit attributes
...
We can determine all of them when attrPath is present so we might jsut as well do it.
2020-09-20 20:11:46 +02:00
Jan Tojnar
4a161ddb3b
maintainers/scripts/update.nix: support auto-committing by passing attrPath
...
Instead of having the updateScript support returning JSON object,
it should be sufficient to specify attrPath in passthru.updateScript.
It is much easier to use.
The former is now considered experimental.
2020-09-20 20:11:46 +02:00
Jan Tojnar
1efc042d92
maintainers/scripts/update.nix: Add support for auto-commiting changes
...
Update scripts can now declare features using
passthru.updateScript = {
command = [ ../../update.sh pname ];
supportedFeatures = [ "commit" ];
};
A `commit` feature means that when the update script finishes successfully,
it will print a JSON list like the following:
[
{
"attrPath": "volume_key",
"oldVersion": "0.3.11",
"newVersion": "0.3.12",
"files": [
"/path/to/nixpkgs/pkgs/development/libraries/volume-key/default.nix"
]
}
]
and data from that will be used when update.nix is run with --argstr commit true
to create commits.
We will create a new git worktree for each thread in the pool and run the update
script there. Then we will commit the change and cherry pick it in the main repo,
releasing the worktree for a next change.
2020-09-20 20:11:22 +02:00
Lassulus
453014b456
Merge pull request #89245 from alexarice/agda-literate
...
agda: install literate files
2020-06-16 14:11:01 +02:00
Daniël de Kok
58ec4d5c77
doc: pip install
flags are specified with pipInstallFlags
...
The documentation incorrectly stated that `installFlags` are passed to
`pip install`.
2020-06-16 10:03:25 +02:00
Jan Tojnar
acb53e0698
Merge branch 'staging-next' into staging
2020-06-10 04:10:57 +02:00
Aaron Andersen
38de173440
Merge pull request #89840 from berbiche/patch-1
...
nixos/manual: s/environent/environment/g in configuration.xml
2020-06-09 06:31:21 -04:00
Rok Garbas
29c4fc94cf
Merge pull request #55302 from teto/lua_doc
...
doc: update lua documentation
2020-06-09 11:02:08 +02:00
Nicolas Berbiche
071c0f935c
nixos/manual: spelling s/environent/environment/g in configuration.xml
2020-06-08 16:34:50 -04:00
Matthieu Coudron
8d05c66dc6
fixup! update
2020-06-07 20:12:56 +02:00
Matthieu Coudron
3042b38ce1
update
2020-06-06 20:20:27 +02:00
Matthieu Coudron
2909dc9f39
builds
2020-06-06 17:33:41 +02:00
Matthieu Coudron
404d057e89
Added an example about overlay
2020-06-06 17:33:39 +02:00
Matthieu Coudron
5cfcfc300b
doc: update lua documentation
...
Reflects the recent changes to the lua infrastructure.
Packaging from luarocks should be encouraged.
2020-06-06 17:33:37 +02:00
Frederik Rietdijk
1c68570ab2
Merge staging-next into staging
2020-06-05 19:42:16 +02:00
Jörg Thalheim
f0396574ab
buildRustPackage: add documentation on how to create cargo.lock patches
2020-06-05 10:41:46 +01:00
Vladimír Čunát
677e3960b5
Merge #82342 : rustPlatform: increase build-speed of checkPhase
...
...for rust-packages (into staging)
2020-06-05 09:12:30 +02:00
Frederik Rietdijk
b7ff746540
python3: now points to python38
...
Note this also means python3Minimal is now also Python 3.8.
This reverts commit eb1369670b
and adds more.
2020-06-04 18:08:29 +02:00
Benjamin Hipple
4af635feff
Merge pull request #87866 from danieldk/validate-pkgconfig-hook
...
validatePkgConfig: init
2020-06-02 23:27:27 -04:00
Alex Rice
e215c3bcac
agda: install literate files
2020-06-01 13:59:20 +01:00
Jan Tojnar
55e7f95265
doc/stdenv: improve autoPatchelfHook description
...
* Add id
* Mention rpath
* The control variables do not really have to be env vars (though without structuredAttrs there is not a difference)
2020-06-01 07:21:48 +02:00
Maximilian Bosch
59e8e7a129
rust: improve docs
...
Co-authored-by: cole-h <cole.e.helbling@outlook.com>
Co-authored-by: asymmetric <lorenzo@mailbox.org>
2020-05-31 21:47:32 +02:00