Tuomas Tynkkynen
e2c6740c37
Merge commit 'adaee73' from staging into master
...
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.
Conflicts:
pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Frederik Rietdijk
4f6b6f1472
pythonPackages: use mkPythonDerivation
2016-09-01 16:16:31 +02:00
Frederik Rietdijk
3e05cce97c
Python: separate buildPythonPackage into two functions
...
1. mkDerivation which is used when the source is without setup.py and
not a wheel
2. buildPythonPackage which is used as before and calls mkDerivation
2016-09-01 16:16:31 +02:00
Frederik Rietdijk
b080748d42
Python: move python-modules/generic to interpreter folder
2016-09-01 16:16:31 +02:00
Tuomas Tynkkynen
8c4aeb1780
Merge staging into master
...
Brings in:
- changed output order for multiple outputs:
https://github.com/NixOS/nixpkgs/pull/14766
- audit disabled by default
https://github.com/NixOS/nixpkgs/pull/17916
Conflicts:
pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Eelco Dolstra
8172cd734c
docdev -> devdoc
...
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Domen Kožar
da421bc75f
Fix #4210 : Remove builderDefs
...
This was one of the ways to build packages, we are trying
hard to minimize different ways so it's easier for newcomers
to learn only one way.
This also:
- removes texLive (old), fixes #14807
- removed upstream-updater, if that code is still used it should be in
separate repo
- changes a few packages like gitit/mit-scheme to use new texlive
2016-08-31 11:34:46 +02:00
Domen Kožar
7b3a36132a
Merge pull request #9607 from nckx/update-doc
...
doc: specify that *Flags are string lists
2016-08-31 10:02:16 +02:00
Frederik Rietdijk
850e6287c5
Doc: improve python bdist_wheel fix
2016-08-30 17:16:49 +02:00
Frederik Rietdijk
95021f061a
Doc: fix python override examples
2016-08-30 17:06:44 +02:00
Tuomas Tynkkynen
03fb2c1f32
doc: Document changes to multiple-output conventions
2016-08-30 04:46:59 +03:00
obadz
0e8d2725dc
Merge branch 'master' into staging
2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
4bd0a16148
haskell docs: Fix output reference in example
2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen
9551d400b2
python manual: Fix 'fftw*' output references in example
2016-08-23 03:20:21 +03:00
obadz
24a9183f90
Merge branch 'hardened-stdenv' into staging
...
Closes #12895
Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Nikolay Amiantov
01624e1ac2
wrapPythonProgram: use site.addsitedir instead of PYTHONPATH
2016-08-20 00:42:49 +03:00
Peter Simons
36f2dc5649
Merge pull request #17549 from ericsagnes/nixpkgs-doc/patches
...
nixpkgs-doc: add patches to coding conventions
2016-08-19 11:08:53 +02:00
Robin Gloster
33e1c78ae3
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-16 07:54:01 +00:00
Frederik Rietdijk
888efed972
Doc: fix python examples
2016-08-16 09:47:13 +02:00
Franz Pletz
bd4490e277
Merge branch 'master' into hardened-stdenv
2016-08-13 16:59:55 +02:00
Frederik Rietdijk
6f1551d597
Doc: how to create a Python wheel
2016-08-13 14:19:33 +02:00
Robin Gloster
af04b6d5a5
hardening docs: fix typo
2016-08-13 10:06:24 +00:00
Franz Pletz
55966c2189
doc: complete the hardening documentation
2016-08-12 18:14:02 +02:00
Kamil Chmielewski
da3ddd48e4
buildGoPackage: remove Go deps file libs.json
...
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046
> Because of the content-addressable store, if two programs have the
> same dependency it will already result in the same derivation in
> the
> store. Git also has compression in the pack files so it won't make
> much difference to duplicate the dependencies on disk. And finally
> most users will just use the binary builds so it won't make any
> differences to them.
This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Eric Sagnes
b1abc2c8d6
nixpkgs-doc: add patches to coding conventions
2016-08-06 09:05:23 +09:00
Robin Gloster
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
Frederik Rietdijk
25980ed01e
DOC: unstable packages names should append -unstable, not -git or -svn
2016-07-29 08:53:24 +02:00
Robin Gloster
f222d98746
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-25 12:47:13 +00:00
Joachim Fasting
c6ccc96397
nixpkgs manual: document the paxctl setup-hook
2016-07-23 19:09:48 +02:00
Robin Gloster
1f04b4a566
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-21 00:56:43 +00:00
Christine Koppelt
27e72d14af
add epub for nixpkgs manual ( #15575 ) ( #17053 )
...
* add epub for nixpkgs manual ( #15575 )
* change epub filename (interpreted as title & author by some epub readers)
2016-07-20 17:57:31 +02:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
Alex Berg
b5a95b1812
Improve overrideDerivation docs. ( #16867 )
...
* Improve overrideDerivation docs.
Explain how antiquotation in a package's attribute behaves when overriding the package.
* Edit antiquotation note. Fix closing-element.
2016-07-12 09:57:26 +02:00
Frederik Rietdijk
1c0af40757
Doc: how to install a Python environment
...
See https://github.com/NixOS/nixpkgs/issues/10597 .
2016-07-01 14:30:18 +02:00
zimbatm
4f5918cd2e
Revert "stdenv: introduce baseHash() to replace stripHash()"
...
Introduced by mistake
This reverts commit e71a5cb878
.
2016-06-25 14:25:58 +01:00
zimbatm
e71a5cb878
stdenv: introduce baseHash() to replace stripHash()
...
stripHash uses a global variable to communicate it's computation
results, but it's not necessary. You can just pipe to stdout in a
subshell. A function mostly behaves like just another command.
baseHash() also introduces a suffix-stripping capability since it's
something the users of the function tend to use.
2016-06-25 14:20:56 +01:00
zimbatm
7473e4f2b4
Merge pull request #16398 from tboettch/master
...
doc: Update stripHash documentation
2016-06-23 11:30:07 +01:00
John Ericson
f073df60d6
Replace ./../*
with ../*
in Nix expressions ( #16414 )
2016-06-22 10:39:50 +02:00
Tom Boettcher
a1083a5d27
doc: Update stripHash documentation
...
The documentation now matches the behavior of the function.
2016-06-21 09:38:11 -05:00
michael bishop
410aad942f
haskell docs: now that hydra pushes directly to S3, it cant function as a binary cache
2016-06-18 21:14:33 -03:00
Domen Kožar
3ea8068181
buildPythonPackage: be able to disable package conflict check
2016-06-16 11:49:19 +01:00
Mathieu Boespflug
3adf86eed6
doc(haskell): Remove pesky tabs in code snippets.
2016-06-13 11:42:50 +02:00
Mathieu Boespflug
e6aa4e0ccb
doc: Document how to set custom GHC version in haskell.lib.buildStackProject.
2016-06-13 00:55:33 +02:00
Rushmore Mushambi
1965bd56e6
Merge pull request #16146 from kamilchm/rework-go
...
all-packages references to Go packages includes all outputs
2016-06-11 19:24:35 +02:00
Nikolay Amiantov
b341de88e9
Merge pull request #16030 from abbradar/fhs-refactor
...
Improvements for FHS user chrootenv
2016-06-11 21:04:20 +04:00
Kamil Chmielewski
7d02cc1dd5
all-packages references to Go packages includes all outputs
2016-06-11 18:57:29 +02:00
Kamil Chmielewski
14d49ddc40
buildGoPackage: updated docs for goPackages after rework in https://github.com/NixOS/nixpkgs/pull/16017
2016-06-10 20:31:20 +02:00
Nikolay Amiantov
75ea0523c4
doc: update buildFHSUserEnv documentation
2016-06-09 18:20:56 +03:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Ryan Mulligan
6b2b2e5b1c
fix link formatting
2016-05-30 09:25:32 -07:00