3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1316 commits

Author SHA1 Message Date
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Doron Behar 80b96cf4ad
Merge pull request #100660 from fzakaria/faridzakaria/maven-documentation 2020-11-04 00:24:19 +02:00
Farid Zakaria b9321adf1e documentation: add documentation for maven
Add nice markdown documentation for how to use mvn2nix plugin and the
buildMaven function within nixpkgs.

Update doc/languages-frameworks/maven.md

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>
2020-11-03 09:23:05 -08:00
Frederik Rietdijk 237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Daniel Gorin 550389392a kakoune: rework plugin support
The previous implementation of plugin-support for the kakoune derivation
was based on generating, at build time, a `plugins.kak` file that would
source all .kak files in the list of plugins, and wrap the `kak` binary
in a script that would add some command-line arguments so that this
file gets loaded on start-up. The main problem with this approach
is that the plugins' code get executed *after* the user's configuration
file is loaded, so effectively one cannot automatically activate/configure
these plugins.

The idiomatic way of loading plugins is ensuring they end up installed
somwhere under `share/kak/autoload`. Because plugins are already being
packaged to have their code in `share/kak/autoload/plugins/<name-of-plugin>`,
we can obtain a derivation that includes the plugins simply by doing a
`symlinkJoin` of `kakoune-unwrapped` and all the requested plugins.

For this to work, we need to fix two issues:

  1. By default, kakoune makes `share/kak/autoload` a symbolic link to
     `share/kak/rc`, which contains all builtin definitions. We need
     to patch this to put the symlink under `share/kak/autoload/rc`, so that
     the join works.

  2. By default kakoune expects the `autoload` directory to be in
     `../share/kak/autoload` relative to the location of the `kak` binary.
     We need to set the `KAKOUNE_RUNTIME` to point the symlinked
     share/kak for this to work.
2020-11-01 14:35:49 +00:00
Vladimír Čunát dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Anderson Torres 066bf7dd5d
Merge pull request #101894 from AndersonTorres/terminal-emulators
Create a directory-category for terminal emulators
2020-10-28 23:27:05 -03:00
Austin Butler 7fd9976af3 vimPlugins: document update proces 2020-10-28 13:51:24 -07:00
AndersonTorres 2bb3a9da24 A directory-category for terminal emulators
This is a mostly cosmetical commit, in the sense it doesn't change the contents
of any package, but reorganizes the overall Nixpkgs expressions.

Terminal emulators are an ubiquitous tool for any Unix user; even the beginners
are routinely familiarized to it. And, manifestly, there are many
implementations of terminal emulators out there, from those traditionally made
in C and C++ to those written in Haskell and Go.

Terminal emulators deserve more highlight. This commit does that by creating a
category for them.
2020-10-28 10:22:39 -03:00
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
Peter Simons 56bc587444 Merge remote-tracking branch 'origin/master' into haskell-updates, 2020-10-15 19:39:16 +02: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
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