mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-13 16:15:30 +00:00
Code Issues Wiki Activity
96144 commits 204 branches 125 tags 8.4 GiB
Commit graph

64 commits

Author SHA1 Message Date
Peter Simons 0a685cf8ea Merge pull request #20257 from expipiplus1/haskell-doc-typo 
fix documentation typo in doc/languages-frameworks/haskell.md
 2016-11-09 08:47:07 +01:00
Joe Hermaszewski 05f31e5c8a fix documentation typo in doc/languages-frameworks/haskell.md 2016-11-08 17:42:27 +00:00
Frederik Rietdijk 9cdfb33401 Docs: improve Python expressions 
as it contained several mistakes and was just messy.
 2016-11-08 12:44:49 +01:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Richard Zetterberg 2206d7afe2 texlive manual: adds import of nixpkgs in nix-repl 
I wanted to list the different texlive collections using the nix-repl, as per the [manual](https://nixos.org/nixpkgs/manual/#idm140737316065984). 

It didn't work, since the nixpkgs were not loaded. Doing `:l <nixpkgs>` first resolved the problem.

This change adds the nixpkgs loading step to the manual so that the next inexperienced person don't have to figure out why it didn't work.

I tested this on NixOS unstable (16.09pre90254.6b20d5b) with nix-repl 1.11.3.
 2016-10-20 08:50:54 +02:00
Frederik Rietdijk 8fa308126f Python: update docs with change in default interpreter version 2016-10-18 23:16:05 +02:00
Frederik Rietdijk 107c035bf0 Python: remove pythonSmall 
In #19309 a separate output for tkinter was added.

Several dependencies of Python depend indirectly on Python. We have the
following two paths:
```
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ -
‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ -
‘python-2.7.12’

‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ -
‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’
```
Because only `tkinter` needs this, I added
```
pythonSmall = python.override {x11Support = false;};
```
to break the infinite recursion. We also still have the output
`tkinter`.

However, we might as well build without x11Support by default. Then we build with x11Support as well so we get the tkinter module and put that in a separate package.
 2016-10-16 14:31:26 +02:00
Frederik Rietdijk 1e544b2993 pythonPackages.tkinter: use this instead of the output python.tkinter 2016-10-13 10:38:21 +02:00
Frederik Rietdijk d3766b2601 Python: update docs separate output tkinter 2016-10-10 10:33:24 +02:00
Luca Bruno da514a2cf9 Merge pull request #18798 from siddharthist/doc/node-readme 
manual: add node.js to languages & frameworks
 2016-09-22 22:12:37 +01:00
Langston Barrett a3bbb45e5c manual: add node to languages & frameworks 
fixes #18609
 2016-09-20 20:38:24 +00:00
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
Mathieu Boespflug db481dca31 doc/language-frameworks/haskell.md: typo in code example. (#18313) 2016-09-05 13:27:00 +02:00
Robert Helgesson 86af88d7c4
perl docs: update generated expression 
This provides an up-to-date illustration of how `nix-generate-from-cpan`
generates packages.
 2016-09-03 18:14:06 +02: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
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
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
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
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
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00: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
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
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
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
Benno Fünfstück 5e0acb90d6 doc/python: fix conversion errors in example code 2016-05-29 16:44:54 +02:00
Benno Fünfstück bad156a0d5 doc/python: replace buildEnv usage by withPackages 2016-05-29 16:30:29 +02:00
Benno Fünfstück 3bdf167619 doc/python: document python.withPackages 2016-05-29 16:08:27 +02:00
Domen Kožar 7d8a7be241 manual: revert title change to keep the link working 2016-05-22 11:31:08 +01:00
Eric Sagnes 96a4e1f80d nixpkgs manual: cleanup (#15611) 2016-05-22 10:05:37 +01:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Frederik Rietdijk 303e976245 Python: allow installing wheels 
By passing `format="wheel"` it is now possible to install a wheel.
It's not recommended, but it can be useful.
 2016-05-09 13:17:42 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Frederik Rietdijk d5e6a4494a Python: use PyPI mirror (#15001) 
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
 2016-04-26 13:38:03 +01:00
Chris Martin d24523cc13 nixpkgs manual: fix link to go2nix 2016-04-22 14:51:49 -07:00
Robin Gloster a73a28de7b fix grammar errors 2016-04-06 16:16:23 +00:00