Commit Graph

636 Commits

Author SHA1 Message Date
John Ericson
18742471af Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
Dmitry Kalinkin
3dd6350420
doc: use "with stdenv.lib" in meta 2018-05-22 13:25:09 -04:00
Josef Kemetmüller
a28c4a5396 perlPackages.BerkeleyDB: fix db dependency
This fixes a regression introduced in 4b06383.

[dezgeg squashed in to fit the changes introduced in "db: Use more
conventional outputs, also split bin"]
2018-05-22 17:49:04 +03:00
John Ericson
8e891e6ed4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 10:57:33 -04:00
Ben Creasy
18ae1b6d31 docs: fix broken link to staging policy 2018-05-13 23:23:44 -07:00
John Ericson
81387c2e78 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 17:12:04 -04:00
Scott Trinh
7c2d43f3f9 Fix small typo in configuration documentation (#40357)
* Fix small typo in configuration documentation
* doc: Fix second instance of same typo
2018-05-11 21:31:56 +02:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Antoine Eiche
d35dcb1280 dockerTools.pullImage: documentation and release note 2018-05-02 21:32:20 +02:00
Graham Christensen
77161de454
nixpkgs docs: format =) 2018-05-01 19:54:21 -04:00
Graham Christensen
ab1648bf0d
nixpkgs doc: add format Make target 2018-04-30 22:37:58 -04:00
Maximilian Bosch
9274ea3903
treewide: rename version attributes
As suggested in https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745
the versioning attributes in `lib` should be consistent to
`nixos/version` which implicates the following changes:

* `lib.trivial.version` -> `lib.trivial.release`
* `lib.trivial.suffix` -> `lib.trivial.versionSuffix`
* `lib.nixpkgsVersion` -> `lib.version`

As `lib.nixpkgsVersion` is referenced several times in `NixOS/nixpkgs`,
`NixOS/nix` and probably several user's setups. As the rename will cause
a notable impact it's better to keep `lib.nixpkgsVersion` as alias with
a warning yielded by `builtins.trace`.
2018-04-28 14:23:53 +02:00
xeji
7b75efa231
Merge pull request #39623 from Ekleog/doc-typo
doc: fix typo in cross-compilation docs
2018-04-27 22:31:46 +02:00
Léo Gaspard
876bbce480
doc: fix typo in cross-compilation docs 2018-04-27 22:14:16 +02:00
Profpatsch
21b87a7bdb docs: initial manual entry for lib/debug.nix
It is more of a stub for now, but at least points to the right file.
2018-04-27 18:59:39 +02:00
Jan Malakhovski
87651b32fe stdenv: steal checkInputs from buildPythonPackage
Note that a bunch of non-python packages use this attribute already.
Some of those are clearly unaware of the fact that this attribute does
not exists in stdenv because they define it but don't to add it to
their `bulidInputs` :)

Also note that I use `buildInputs` here and only handle regular
builds because python and haskell builders do it this way and I'm not
sure how to properly handle the cross-compilation case.
2018-04-26 20:22:51 +00:00
Matthew Justin Bauer
8edb13f079
doc: add filtered pr list 2018-04-23 17:07:53 -05:00
Peter Simons
21d688f9b8
Merge pull request #39309 from LumiGuide/haskell.overrides
RFC: haskell: allow overriding all package sets at once
2018-04-23 21:07:58 +02:00
Vladimír Čunát
17c4b83d05
Merge #31320: docs and glibc: explicit comments on outputs 2018-04-22 11:55:23 +02:00
Bas van Dijk
bf6d796a27 haskell: allow overriding all package sets at once
Setting haskell.packageOverrides like so:

  haskell = super.haskell // {
    packageOverrides = self: super: {
      my-package = ...;
      my-other-package = ...;
    };
  };

causes all compiler-specific package sets to be overridden with those
overrides.
2018-04-22 10:34:44 +02:00
Will Dietz
4f273627a1 tree-wide: fix instance of "meta.maintainer" -> "meta.maintainers"
Encountered one of these when using check-meta, did a quick
search to find other instances.
2018-04-19 10:41:12 -05:00
John Ericson
c66440c104 doc: Document config.allowUnsupportedSystem and its env var 2018-04-17 16:34:28 -04:00
Jörg Thalheim
6366951310
Merge pull request #38568 from samueldr/fix/nixpkgs-rebase-callout
doc: Fixes repeated callout in nixpkgs manual 15.1
2018-04-08 11:59:28 +01:00
Samuel Dionne-Riel
e675ae456c doc: Fixes repeated callout in 15.1 2018-04-07 15:50:18 -04:00
Samuel Dionne-Riel
d807aa1c8d doc: Fixes in-text callouts and screen callouts. 2018-04-07 15:38:12 -04:00
Graham Christensen
8f33464ca7
nixos docs: syntax highlight
- Rectifies diverging CSS by combining
   nixos/nixpkgs docs CSS
 - Moves our custom Highlight.js loader in to
   the hljs package
 - Switches the nixos docs to use SVG
   callouts too
2018-04-05 07:54:01 -04:00
Michael Raskin
ed1312f782
Merge pull request #38428 from Ekleog/doc-weechat
Add documentation for weechat
2018-04-04 13:34:20 +00:00
Léo Gaspard
f57fb2ee26 weechat: add hint in documentation 2018-04-04 14:58:53 +02:00
Andre Ramos
51c8e9ff5e nixos/doc: fix instructions for nox-review usage 2018-04-03 13:01:51 +02:00
Austin Seipp
dc40fca23f nixpkgs: remove ancient 'ecj' package
Nobody has stepped up to keep maintaining this and it's several
years old, and the last strict Java 7 dependency, as it won't work
with newer versions without an update.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Profpatsch
e01d485ce4 lib/generators: add an example of overriding defaults
An example of overriding the `toINI` generator is added,
hopefully clarifying the expressiveness of generators.
2018-03-29 16:53:06 +02:00
Garrett Berg
f7342a3625 docs: extend rust docs (#35587)
- Add example for setting up nix-shell, improve rust docs
- Rust docs: add gcc rust dependencies and fix carnix commands
- Fix a typo with the carnix command.
2018-03-28 02:07:19 +01:00
Graham Christensen
8dac5ce146
nixpkgs docs: syntax highlight 2018-03-26 21:44:24 -04:00
Graham Christensen
da17974541
Move the overridden CSS to overrides.css which can be applied on nixos.org 2018-03-26 14:45:00 -04:00
Graham Christensen
a80856cec5
nixpkgs docs: Use SVGs for callouts 2018-03-26 14:08:36 -04:00
Graham Christensen
67f9d2425d
Add 'make debug' to call xmloscopy 2018-03-25 20:01:31 -04:00
Graham Christensen
fce1fb7e75
Move validate to top-level so it doesn't rebuild the outputs every time 2018-03-25 19:52:08 -04:00
Graham Christensen
30dd2d3feb
Validate when building outputs 2018-03-25 19:52:08 -04:00
Graham Christensen
f67ea4a6d0
Document shell.nix / xmloscopy / make for the nixpkgs docs 2018-03-25 19:52:08 -04:00
Graham Christensen
7e25ff7106
docs: Build with a makefile 2018-03-25 19:52:07 -04:00
Graham Christensen
8c7be5927e
Ignore generated XML and other generated files 2018-03-25 19:52:07 -04:00
Graham Christensen
92d53362d4
Move all nixpkgs doc files in to the doc directory
This makes a makefile-driven developer workflow nicer.
2018-03-25 19:52:00 -04:00
giraffito
319866ae11
python.md: fix grammar around bdist_wheel FAQ 2018-03-21 19:57:52 +00:00
Eelco Dolstra
7db841512a
Remove obsolete /nix/var/nix/{manifests,channel-cache} 2018-03-20 18:26:13 +01:00
Matthew Justin Bauer
bfdc402928
Merge pull request #37296 from matthewbauer/fix-maintainers-path
Fix fallout from #36275
2018-03-19 03:37:53 -05:00
Joachim Schiele
f41a3e7d7d
Emscripten 1.37.16 to 1.37.36 (#37291)
* trying to build emscriptenPackages not all fail

* reading the console.log it turns out python executable is not in place and that is why emconfigure didnt work

* backup commit

* much more targets are compiling now

* added common revisioning

* revision bump to 1.37.36 (not tested)

* fixed xmllint

* forcing unit testing, will implement the tests after i get home

* json_c test working

* added tests

* tiny fixes

* added documentation
2018-03-18 13:34:46 +01:00
Matthew Bauer
124d47c65a meta: fix fallout from #36275 2018-03-18 00:16:43 -05:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Michael Raskin
76e465de52 A note about scheme-* in texlive.combine 2018-03-07 22:25:01 +01:00