1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Commit graph

1159 commits

Author SHA1 Message Date
Elis Hirwing 3b6539896b
Merge pull request #83896 from etu/slim-down-default-php-v3
PHP: Make the default package more sane [v3]
2020-04-05 20:00:03 +02:00
talyz ca8b8a26e9
php: Add enabledExtensions attribute to PHP derivations
This provides a means to build a PHP package based on a list of
extensions from another.

For example, to generate a package with all default extensions
enabled, except opcache, but with ImageMagick:

php.withExtensions (e:
  (lib.filter (e: e != php.extensions.opcache) php.enabledExtensions)
  ++ [ e.imagick ])
2020-04-05 16:46:38 +02:00
talyz b5c59cebc6
php: Document withExtensions + general improvements 2020-04-05 16:46:05 +02:00
Elis Hirwing a2099156ec
php: split php.packages to php.packages and php.extensions
So now we have only packages for human interaction in php.packages and
only extensions in php.extensions. With this php.packages.exts have
been merged into the same attribute set as all the other extensions to
make it flat and nice.

The nextcloud module have been updated to reflect this change as well
as the documentation.
2020-04-05 16:45:17 +02:00
Elis Hirwing e4cee802ad
doc/php: Add initial documentation for PHP 2020-04-05 16:45:04 +02:00
Sander van der Burg 542a74a9dc
Merge pull request #82118 from lucafavatella/androidenv-update-2
androidenv: update generated expressions
2020-04-05 14:59:04 +02:00
Kyle Sferrazza 131cb42efe
nixpkgs manual preface: change howoldis link to status page link 2020-04-02 21:52:44 -04:00
ryneeverett 0a2759483a vimPlugins: update auto-commiting based on review
- Use git.Repo(ROOT, search_parent_directories=True) to find nixpkgs
repo.
- Don't commit overrides.nix.
- Remove "-a" short argument.
- Remove "--commit" flag and commit by default.
- Improve help/error messages.
- Favor closure pattern over classes.Use a closure to wrap the update
function with state rather than a callable class.
- break NixpkgsRepo class into functions
- Optional None-type arguments
- Remove repo checks from update.py. Git is too flexible and permits too
many workflows for my attempt to replace documentation with code to work.
My goal would be to separate the `--add` functionality from the update
functionality in the near term and then there will be no reason for this
usage to create commits anyway.
2020-04-01 17:19:01 +00:00
ryneeverett f1ae95f6d3 vimPlugins: update.py --add <plugin> argument
- update.py's new --add argument replaces manual editing of
vim-plugin-names for basic use cases.
2020-04-01 14:30:39 +00:00
ryneeverett df0db17740 vimPlugins: automatically commit update 2020-04-01 14:30:23 +00:00
Florian Klink 855a12eacf Revert "make-tarball.nix: Restore the 'commit' field in packages.json"
This reverts commit 5e8545e723.

It breaks eval:

attribute 'rev' missing, at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/top-level/make-tarball.nix:106:39
2020-03-29 20:57:50 +02:00
Eelco Dolstra 5e8545e723
make-tarball.nix: Restore the 'commit' field in packages.json
Also change incorrect 'revision' to 'rev' in the default value for
'nixpkgs' in release.nix.

Fixes https://github.com/NixOS/nixos-homepage/issues/372.
2020-03-29 20:16:07 +02:00
Leif Metcalf c3f8e598ed
Update git clone command example 2020-03-25 15:48:25 +09:00
Benjamin Hipple 05343f6ff1 rust: remove legacy cargo fetcher
We have now migrated every single Rust package in NixPkgs! This deletes the
legacy fetcher, which is now unused.

Resolves #79975
2020-03-18 20:12:32 -07:00
Sander van der Burg 52c89d0572
Merge pull request #82067 from lucafavatella/androidenv-generate
androidenv: enhance script for the generated expressions
2020-03-16 22:48:17 +01:00
Vladimír Čunát dcd33b7a76
doc: tiny grammar improvement in the same sentence again 2020-03-10 10:08:26 +01:00
Raphael Borun Das Gupta a7c53f7640 doc: fix grammar / typo in NixPkgs GNOME manual 2020-03-09 23:01:40 +01:00
Luca Favatella d56fd6975c androidenv: align basic emulateApp usage example
... to the actually tested one.
2020-03-09 19:46:46 +00:00
Luca Favatella 12a97158a2 androidenv: rely on shebang of ./generate.sh 2020-03-09 03:43:19 +00:00
Jan Tojnar 1a44e325d2
Merge branch 'staging-next' into staging 2020-03-04 21:24:05 +01:00
Vladimír Čunát 83015ff795
nixpkgs manual: fix build after pandoc(?) update
I din't try to pinpoint the exact commit, but we started getting:
> The extension smart is not supported for docbook
Reading pandoc docs, I can't see what use to us "smart" could be
when writing the in-between docbook (to be converted to html).
https://pandoc.org/MANUAL.html#extension-smart
2020-03-02 08:24:54 +01:00
Robert Hensing e38a01db5d
Merge pull request #68491 from roberth/fix-dontRecurseIntoAttrs
Fix dontRecurseIntoAttrs + add to lib + doc
2020-03-01 11:05:34 +01:00
Frederik Rietdijk 21b808cd76 Merge staging-next into staging 2020-02-29 15:29:45 +01:00
Benjamin Hipple ad30a30488 rustPlatform.fetchCargo: handle custom Cargo.lock patchfiles with validation
Previously, we would asssert that the lockfiles are consistent during the
unpackPhase, but if the pkg has a patch for the lockfile itself then we must
wait until the patchPhase is complete to check.

This also removes an implicity dependency on the src attribute coming from
`fetchzip` / `fetchFromGitHub`, which happens to name the source directory
"source". Now we glob for it, so different fetchers will work consistently.
2020-02-28 18:54:23 -08:00
worldofpeace 10eeabe6d1
Merge pull request #81272 from worldofpeace/crystal-openssl
crystal: use latest openssl
2020-02-29 00:12:15 +00:00
Gabor Greif c8554c0574 ghc: add 8.8.3
https://mail.haskell.org/pipermail/ghc-devs/2020-February/018643.html
2020-02-28 20:42:25 +01:00
Peter Simons 5bcd07a07d haskellPackages: update default compiler from ghc-8.6.5 to 8.8.2 (LTS-15.x) 2020-02-28 20:31:25 +01:00
worldofpeace e10900b068 crystal: use latest openssl 2020-02-28 01:32:20 -05:00
edef f8c8f523a8
Merge pull request #80279 from edef1c/ocitools-exec
doc/ociTools: exec is a shell builtin, not an external command
2020-02-18 13:18:03 +00:00
Jonathan Ringer 3990b914c3 manual: use quoted homepage urls 2020-02-16 09:49:12 -08:00
edef 2aa4fba8d1 doc/ociTools: exec is a shell builtin, not an external command 2020-02-16 17:41:06 +00:00
Benjamin Hipple 131a32a5af rust: update docs on legacyCargoFetcher; remove unnecessary defaults
As mentioned in #79975, the default on `legacyCargoFetcher` if left unspecified
is now `false`.
2020-02-15 22:07:47 -08:00
Florian Klink a3779ce53a
Merge pull request #79631 from bhipple/doc/python-formatting
doc: consistent formatting on python manual section
2020-02-13 23:19:20 +01:00
Frederik Rietdijk 1a6c3cb06b Merge staging into staging-next 2020-02-11 07:59:53 +01:00
Kyle Sferrazza 2843a7d122 jdiskreport: remove builder.sh link from docs 2020-02-10 20:17:59 +01:00
Michele Guerini Rocco 565724c775
Merge pull request #77347 from rnhmjoj/urxvt
rxvt-unicode: rewrite plugin system
2020-02-10 17:21:59 +01:00
Vladimír Čunát 79210713e6
nixpkgs manual: fix a typo in cross-compilation
I can't say I really understand that much about our cross stuff,
but this seems very clear.
2020-02-10 16:58:50 +01:00
Benjamin Hipple 2115a2037c fetchcargo: use flat tar.gz file for vendored src instead of recursive hash dir
This has several advantages:

1. It takes up less space on disk in-between builds in the nix store.
2. It uses less space in the binary cache for vendor derivation packages.
3. It uses less network traffic downloading from the binary cache.
4. It plays nicely with hashed mirrors like tarballs.nixos.org, which only
   substitute --flat hashes on single files (not recursive directory hashes).
5. It's consistent with how simple `fetchurl` src derivations work.
6. It provides a stronger abstraction between input src-package and output
   package, e.g., it's harder to accidentally depend on the src derivation at
   runtime by referencing something like `${src}/etc/index.html`. Likewise, in
   the store it's harder to get confused with something that is just there as a
   build-time dependency vs. a runtime dependency, since the build-time
   src dependencies are tarred up.

Disadvantages are:
1. It takes slightly longer to untar at the start of a build.

As currently implemented, this attaches the compacted vendor.tar.gz feature as a
rider on `verifyCargoDeps`, since both of them are relatively newly implemented
behavior that change the `cargoSha256`.

If this PR is accepted, I will push forward the remaining rust packages with a
series of treewide PRs to update the `cargoSha256`s.
2020-02-10 10:17:29 -05:00
Jonathan Ringer 519519b6fc dotnet: add framework doc 2020-02-09 19:26:15 -08:00
Benjamin Hipple 4988805287 doc: consistent formatting on python manual section
No material changes to docs, but trying to sanitize them for consistent
readability prior to looking at #75837.

- Use `*` for lists instead of `-`. I have no opinion one way or the other, but
  the latter was only used in 1-2 places.
- Pad the code blocks with whitespace.
- Wrap to 80 characters, except for a few 1-liners that were only slightly over.
2020-02-09 11:23:11 -05:00
Dima e9ba4b94fb doc: python: fixing mistake in venv example
When updating the section to python 3 some places still
referred to pythonPackages and were overlooked.
Decided to switch it to be more similar to the first
example binding pythonPackages and clarified comments a
bit based on confusion I observed on IRC.

Related to https://github.com/NixOS/nixpkgs/pull/77569
2020-02-02 09:39:58 -08:00
rnhmjoj ef9a029700
doc: document new urxvt plugin system 2020-02-02 12:00:51 +01:00
adisbladis fece3e5ca1
doc: Remove comment advising to install build tooling system-wide
We should not encourage installing build-tooling system-wide but
instead promote nix-shell.
2020-01-23 21:09:30 +00:00
adisbladis 65ff43e866
doc: Fix callout reference in appimagetools 2020-01-23 17:49:13 +00:00
Dima 25d0d2b5e8 doc: python: refreshing virtualenv section for venv
Updating section about imperative use of ad-hoc virtual-environments for
use of pythons built-in `venv` module via venvShellHook.  Also trying to
make it a bit friendlier to beginners by adding a bit more explanation
to the code snippet and some remarks old-school virtualenv.

Adjusting for venvShellHook and adding manual example

Adding pip install and replacing python2 example with python3
2020-01-20 18:01:12 -08:00
Frederik Rietdijk eba1f79418 pythonPackages.venvShellHook: init
This is a hook that loads a virtualenv from the specified `venvDir`
location. If the virtualenv does not exist, it is created.
2020-01-14 22:36:21 +01:00
Graham Christensen 6ed0b0a86f
Merge pull request #77683 from jtojnar/prompt-no-select
doc: Make callout marks & prompts unselectable
2020-01-14 14:39:52 -05:00
Jan Tojnar 1e6265afe9
doc: Make callout marks in code unselectable
To make example copying easier.
2020-01-14 15:24:57 +01:00
Jan Tojnar 8334b83595
doc: Make prompt unselectable
Weirdly, no-one seems to have noticed this was broken.
2020-01-14 15:04:21 +01:00
Frederik Rietdijk ed1b0d0bac Merge master into staging-next 2020-01-13 16:08:59 +01:00