Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b6ba25ce95e5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3baf946b767
Choose a head ref

Commits on Sep 19, 2019

  1. netbeans: 11.0 -> 11.1

    asbachb committed Sep 19, 2019
    Copy the full SHA
    b8ae6b1 View commit details
  2. Copy the full SHA
    3954ddd View commit details
  3. Copy the full SHA
    1aef41c View commit details

Commits on Oct 4, 2019

  1. qscintilla: Fix qt4 build

    lsix committed Oct 4, 2019
    Copy the full SHA
    eb1cd0d View commit details

Commits on Oct 16, 2019

  1. minetest 5.0.1 -> 5.1.0

    MicrosoftTakeover authored Oct 16, 2019
    Copy the full SHA
    8479d2b View commit details

Commits on Oct 17, 2019

  1. Copy the full SHA
    ab9fd67 View commit details

Commits on Oct 18, 2019

  1. Copy the full SHA
    0f93c22 View commit details
  2. plover.dev: add missing setuptools dependency

    Without this, it crashes instantly at startup looking for
    pkg_resources.
    edef1c committed Oct 18, 2019
    Copy the full SHA
    b954169 View commit details
  3. nixos/nix-daemon: don't refer to deprecated option aliases

    The `gc-` prefixed versions of these options have been
    deprecated since Nix 2.0.
    edef1c committed Oct 18, 2019
    Copy the full SHA
    a68219b View commit details
  4. wordpress: 5.2.3 -> 5.2.4

    aanderse committed Oct 18, 2019
    Copy the full SHA
    327d406 View commit details

Commits on Oct 19, 2019

  1. plover.dev: apply the Qt wrapper

    Without this, it crashes instantly at startup looking for the
    Qt xcb plugin.
    
    Co-authored-by: Kovacsics Robert <rmk35@cam.ac.uk>
    edef1c and Kovacsics Robert committed Oct 19, 2019
    Copy the full SHA
    3b0bc63 View commit details
  2. Copy the full SHA
    b36ee87 View commit details
  3. gitlab: Get rid of most 'already initialized constant'-warnings

    On start, unicorn, sidekiq and other parts running ruby code emits
    quite a few warnings similar to
    
    /var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS
    /nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here
    /var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL
    /nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here
    
    This seems to be caused by the same ruby files being evaluated
    multiple times due to the paths being different - sometimes they're
    loaded using the direct path and sometimes through a symlink, due to
    our split between config and package data. To fix this, we make sure
    that the offending files in the state directory always reference the
    store path, regardless of that being the real file or a symlink.
    talyz committed Oct 19, 2019
    Copy the full SHA
    ed4a09c View commit details
  4. Copy the full SHA
    e2283d9 View commit details
  5. Copy the full SHA
    efab039 View commit details
  6. Copy the full SHA
    06abd24 View commit details
  7. Copy the full SHA
    690b3c4 View commit details

Commits on Oct 20, 2019

  1. Copy the full SHA
    d130224 View commit details
  2. rust-cbindgen: skip expand tests

    The expand tests require unstable rust features.
    andir committed Oct 20, 2019
    Copy the full SHA
    06744bb View commit details
  3. rust-cbdindgen: 0.9.0 -> 0.9.1

    andir committed Oct 20, 2019
    Copy the full SHA
    e07c297 View commit details
  4. doc: organize chapters into parts, and reduce toc depth

    Reorganize the chapters into parts and reduce the TOC depth to make the
    TOC useful again. The top-level TOC is very brief, but that is fine
    because every part will have its own TOC.
    
    Section titles of languages/frameworks are also simplified to just
    the name of the language/framework.
    FRidh committed Oct 20, 2019
    Copy the full SHA
    95dfbe2 View commit details
  5. doc: merge package notes and package-specific notes

    Maybe there was an idea behind this separation, but looking at the
    contents I don't see any reason for these being separate.
    FRidh committed Oct 20, 2019
    1
    Copy the full SHA
    115018f View commit details
  6. Copy the full SHA
    efb55d2 View commit details
  7. Copy the full SHA
    16d733b View commit details
  8. zabbix: init at 4.4.0

    aanderse committed Oct 20, 2019
    Copy the full SHA
    fdee83d View commit details
  9. softmaker-office: fix product unlock error

    SoftMaker/FreeOffice collects some system information upon unlocking the
    product. But in doing so, it attempts to execute /bin/ls. If the execve
    syscall fails, the whole unlock procedure fails. This works around that
    by rewriting /bin/ls to the proper path.
    
    SoftMaker Office restarts itself upon some operations, such changing the
    theme and unlocking. Unfortunately, we do not have control over its
    environment then and it will fail with an error. Starting SoftMaker
    Office from scratch will then work.
    
    Fixes #71228
    danieldk committed Oct 20, 2019
    Copy the full SHA
    6f6331d View commit details
  10. openxcom: 1.0.0.2018.10.08 -> 1.0.0.2019.10.18

    - Updated repo owner
    sengaya committed Oct 20, 2019
    Copy the full SHA
    b09794c View commit details

Commits on Oct 21, 2019

  1. Copy the full SHA
    9d54ea9 View commit details
  2. Copy the full SHA
    24b1ef5 View commit details
  3. Copy the full SHA
    7673965 View commit details
  4. clfft: init at 2.21.2

    chessai committed Oct 21, 2019
    Copy the full SHA
    5feacc9 View commit details
  5. doc: move fhs and mkShell under builders/special

    In my opinion Functions should only contain pure functions. These are
    both meant to provide derivations so I put them under Builders. Don't
    know exactly *where* to put them so "special" it is...
    FRidh committed Oct 21, 2019
    Copy the full SHA
    2b9713c View commit details
  6. Merge pull request #71338 from edef1c/nix-daemon-opt-aliases

    nixos/nix-daemon: don't refer to deprecated option aliases
    edef1c authored Oct 21, 2019
    Copy the full SHA
    0599c89 View commit details
  7. Merge pull request #71335 from edef1c/plover-deps

    Add missing Plover deps
    worldofpeace authored Oct 21, 2019
    Copy the full SHA
    1a25b14 View commit details
  8. Merge pull request #71254 from MicrosoftTakeover/patch-1

    minetest 5.0.1 -> 5.1.0
    fpletz authored Oct 21, 2019
    Copy the full SHA
    cf52cd4 View commit details
  9. Merge pull request #71406 from astro/collectd

    collectd: plugins configuration, buildMinimalPackage
    fpletz authored Oct 21, 2019
    Copy the full SHA
    cc9b18f View commit details
  10. Revert "mbedtls: 2.16.0 -> 2.17.0"

    This reverts commit ba3b9c0.
    
    cc #60625 #71452
    fpletz committed Oct 21, 2019
    Copy the full SHA
    bf2f1c8 View commit details
  11. mbedtls: 2.16.0 -> 2.16.3

    Fixes CVE-2019-16910. Fixes #71452.
    fpletz committed Oct 21, 2019
    Copy the full SHA
    360e57a View commit details
  12. elmPackages.*: update to latest versions

    elm-language-server: 1.4.1 -> 1.4.2
    
    downstream updates in others
    BrianHicks committed Oct 21, 2019
    Copy the full SHA
    1d4f48d View commit details
  13. lib/trivial: add pipe function

    `pipe` is a useful operator for creating pipelines of functions.
    
    It works around the usual problem of e.g. string operations becoming
    deeply nested functions.
    
    In principle, there are four different ways this function could be
    written:
    
    pipe val [ f1 .. fn ]
    pipe val [ fn .. f1 ]
    compose [ f1 .. fn ] val
    compose [ fn .. f1 ] val
    
    The third and fourth form mirror composition of functions, they would
    be the same as e.g. `(f1 << f2 << f3 .. << fn) val`.
    However, it is not clear which direction the list should have (as one
    can see in the second form, which is the most absurd.
    
    In order not to confuse users, we decide for the most “intuitive”
    form, which mirrors the way unix pipes work (thus the name `pipe`).
    The flow of data goes from left to right.
    
    Co-Authored-By: Silvan Mosberger <infinisil@icloud.com>
    Profpatsch and infinisil committed Oct 21, 2019
    Copy the full SHA
    8252861 View commit details
  14. Copy the full SHA
    b1c21ad View commit details
  15. Copy the full SHA
    ad5994f View commit details
  16. Merge pull request #71494 from chessai/clFFT-add

    clfft: init at 2.12.2
    c0bw3b authored Oct 21, 2019
    Copy the full SHA
    9f4d260 View commit details
  17. Merge pull request #71521 from BrianHicks/update-elm-language-server

    elmPackages.*: update to latest versions
    domenkozar authored Oct 21, 2019
    Copy the full SHA
    3fd1d47 View commit details
  18. Copy the full SHA
    cfe3c89 View commit details
  19. cutelyst: 2.8.0 -> 2.9.0 (#71519)

    r-ryantm authored and fpletz committed Oct 21, 2019
    Copy the full SHA
    9d281cc View commit details
  20. xzoom: fix version

    davidak committed Oct 21, 2019
    Copy the full SHA
    49945b9 View commit details
  21. ammonite: 1.7.1 -> 1.7.4

    NeQuissimus committed Oct 21, 2019
    Copy the full SHA
    b0e4d7b View commit details
  22. Merge pull request #71522 from marsam/update-nodejs

    nodejs-12_x: 12.12.0 -> 12.13.0
    marsam authored Oct 21, 2019
    Copy the full SHA
    fa4524d View commit details
  23. Merge pull request #69124 from asbachb/update-to-netbeans-11.1

    Update to NetBeans 11.1
    fpletz authored Oct 21, 2019
    Copy the full SHA
    a2638b6 View commit details
Showing with 2,050 additions and 1,171 deletions.
  1. +4 −4 doc/{functions → builders}/fetchers.xml
  2. +12 −0 doc/builders/images.xml
  3. 0 doc/{functions → builders/images}/appimagetools.xml
  4. 0 doc/{functions → builders/images}/dockertools.xml
  5. 0 doc/{functions → builders/images}/ocitools.xml
  6. 0 doc/{functions → builders/images}/snap/example-firefox.nix
  7. 0 doc/{functions → builders/images}/snap/example-hello.nix
  8. 0 doc/{functions → builders/images}/snaptools.xml
  9. +12 −0 doc/builders/special.xml
  10. 0 doc/{functions → builders/special}/fhs-environments.xml
  11. 0 doc/{functions/shell.xml → builders/special/mkshell.xml}
  12. +3 −3 doc/{functions → builders}/trivial-builders.xml
  13. 0 doc/{contributing.xml → contributing-to-documentation.xml}
  14. +1 −1 doc/doc-support/parameters.xml
  15. +0 −9 doc/functions.xml
  16. +1 −1 doc/languages-frameworks/emscripten.section.md
  17. +1 −1 doc/languages-frameworks/haskell.section.md
  18. +1 −1 doc/languages-frameworks/idris.section.md
  19. +3 −3 doc/languages-frameworks/index.xml
  20. +2 −2 doc/languages-frameworks/node.section.md
  21. +2 −2 doc/languages-frameworks/r.section.md
  22. +1 −1 doc/languages-frameworks/rust.section.md
  23. +1 −1 doc/languages-frameworks/vim.section.md
  24. +32 −16 doc/manual.xml
  25. +3 −3 doc/{functions → }/overrides.xml
  26. +0 −422 doc/package-notes.xml
  27. +0 −357 doc/package-specific-user-notes.xml
  28. +44 −0 doc/packages/citrix.xml
  29. +24 −0 doc/packages/dlib.xml
  30. +72 −0 doc/packages/eclipse.xml
  31. +17 −0 doc/packages/elm.xml
  32. +131 −0 doc/packages/emacs.xml
  33. +57 −0 doc/packages/ibus.xml
  34. +23 −0 doc/packages/index.xml
  35. +14 −0 doc/packages/kakoune.xml
  36. +85 −0 doc/packages/linux.xml
  37. +13 −0 doc/packages/locales.xml
  38. +25 −0 doc/packages/nginx.xml
  39. +9 −0 doc/packages/opengl.xml
  40. +25 −0 doc/packages/shell-helpers.xml
  41. +131 −0 doc/packages/steam.xml
  42. +13 −0 doc/packages/unfree.xml
  43. +85 −0 doc/packages/weechat.xml
  44. +34 −0 doc/packages/xorg.xml
  45. +1 −1 doc/platform-notes.xml
  46. +1 −1 doc/reviewing-contributions.xml
  47. +2 −2 lib/default.nix
  48. +25 −0 lib/tests/misc.nix
  49. +37 −0 lib/trivial.nix
  50. +2 −0 nixos/modules/programs/seahorse.nix
  51. +2 −2 nixos/modules/services/continuous-integration/hydra/default.nix
  52. +3 −11 nixos/modules/services/databases/redis.nix
  53. +0 −1 nixos/modules/services/misc/gitlab.nix
  54. +2 −2 nixos/modules/services/misc/nix-daemon.nix
  55. +36 −3 nixos/modules/services/monitoring/collectd.nix
  56. +2 −2 pkgs/applications/audio/drumgizmo/default.nix
  57. +2 −2 pkgs/applications/editors/bvi/default.nix
  58. +6 −6 pkgs/applications/editors/netbeans/default.nix
  59. +2 −2 pkgs/applications/graphics/drawio/default.nix
  60. +2 −2 pkgs/applications/misc/calcurse/default.nix
  61. +2 −2 pkgs/applications/misc/dbeaver/default.nix
  62. +2 −2 pkgs/applications/misc/gallery-dl/default.nix
  63. +10 −4 pkgs/applications/misc/plover/default.nix
  64. +2 −2 pkgs/applications/networking/flexget/default.nix
  65. +2 −2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  66. +26 −4 pkgs/applications/office/softmaker/generic.nix
  67. +2 −2 pkgs/applications/radio/chirp/default.nix
  68. +2 −2 pkgs/applications/science/math/ginac/default.nix
  69. +2 −2 pkgs/applications/science/misc/golly/default.nix
  70. +2 −2 pkgs/applications/version-management/git-and-tools/git-secret/default.nix
  71. +8 −1 pkgs/applications/version-management/gitlab/default.nix
  72. +6 −6 pkgs/applications/virtualization/docker/default.nix
  73. +2 −2 pkgs/applications/virtualization/podman/default.nix
  74. +9 −3 pkgs/applications/window-managers/awesome/default.nix
  75. +2 −2 pkgs/build-support/rust/default.nix
  76. +2 −2 pkgs/data/fonts/iosevka/bin.nix
  77. +20 −7 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
  78. +2 −2 pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
  79. +11 −10 pkgs/development/compilers/elm/default.nix
  80. +3 −3 pkgs/development/compilers/elm/fetchElmDeps.nix
  81. +5 −5 pkgs/development/compilers/elm/makeDotElm.nix
  82. +24 −14 pkgs/development/compilers/elm/packages/elm-srcs.nix
  83. +12 −12 pkgs/development/compilers/elm/packages/elm.nix
  84. +11 −11 pkgs/development/compilers/elm/packages/elmi-to-json.nix
  85. +218 −56 pkgs/development/compilers/elm/packages/node-packages.nix
  86. BIN pkgs/development/compilers/elm/registry.dat
  87. +4 −3 pkgs/development/compilers/elm/update.sh
  88. BIN pkgs/development/compilers/elm/versions.dat
  89. +10 −0 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
  90. +2 −2 pkgs/development/libraries/catch2/default.nix
  91. +2 −2 pkgs/development/libraries/cimg/default.nix
  92. +34 −0 pkgs/development/libraries/clfft/default.nix
  93. +2 −2 pkgs/development/libraries/cutelyst/default.nix
  94. +2 −2 pkgs/development/libraries/ffmpegthumbnailer/default.nix
  95. +2 −2 pkgs/development/libraries/folly/default.nix
  96. +2 −2 pkgs/development/libraries/fstrm/default.nix
  97. +25 −17 pkgs/development/libraries/geoip/default.nix
  98. +1 −1 pkgs/development/libraries/libcutl/default.nix
  99. +23 −7 pkgs/development/libraries/libechonest/default.nix
  100. +37 −0 pkgs/development/libraries/libinjection/default.nix
  101. +3 −2 pkgs/development/libraries/mbedtls/default.nix
  102. +2 −2 pkgs/development/libraries/qscintilla/default.nix
  103. +11 −0 pkgs/development/libraries/qscintilla/fix-qt4-build.patch
  104. +7 −3 pkgs/development/libraries/unixODBCDrivers/default.nix
  105. +34 −0 pkgs/development/python-modules/mesa/default.nix
  106. +3 −3 pkgs/development/tools/ammonite/default.nix
  107. +3 −3 pkgs/development/tools/build-managers/sbt-extras/default.nix
  108. +2 −2 pkgs/development/tools/git-quick-stats/default.nix
  109. +2 −2 pkgs/development/tools/java/cfr/default.nix
  110. +7 −5 pkgs/development/tools/rust/cbindgen/default.nix
  111. +2 −2 pkgs/development/web/grails/default.nix
  112. +2 −2 pkgs/development/web/nodejs/v12.nix
  113. +3 −3 pkgs/games/minetest/default.nix
  114. +4 −4 pkgs/games/openxcom/default.nix
  115. +2 −2 pkgs/os-specific/linux/kernel/linux-testing.nix
  116. +5 −0 pkgs/servers/monitoring/zabbix/versions.nix
  117. +2 −2 pkgs/servers/web-apps/wordpress/default.nix
  118. +3 −3 pkgs/shells/zsh/oh-my-zsh/default.nix
  119. +7 −5 pkgs/tools/X11/xzoom/default.nix
  120. +31 −0 pkgs/tools/archivers/snzip/default.nix
  121. +2 −2 pkgs/tools/misc/diffoscope/default.nix
  122. +2 −2 pkgs/tools/networking/tridactyl-native/default.nix
  123. +1 −0 pkgs/tools/package-management/reuse/default.nix
  124. +9 −54 pkgs/tools/system/collectd/default.nix
  125. +347 −0 pkgs/tools/system/collectd/plugins.nix
  126. +2 −2 pkgs/tools/text/fanficfare/default.nix
  127. +8 −1 pkgs/top-level/all-packages.nix
  128. +5 −1 pkgs/top-level/python-packages.nix
8 changes: 4 additions & 4 deletions doc/functions/fetchers.xml → doc/builders/fetchers.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<section xmlns="http://docbook.org/ns/docbook"
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="sec-pkgs-fetchers">
<title>Fetcher functions</title>
xml:id="chap-pkgs-fetchers">
<title>Fetchers</title>

<para>
When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way.
@@ -145,4 +145,4 @@ stdenv.mkDerivation {
</listitem>
</varlistentry>
</variablelist>
</section>
</chapter>
12 changes: 12 additions & 0 deletions doc/builders/images.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="chap-images">
<title>Images</title>
<para>
This chapter describes tools for creating various types of images.
</para>
<xi:include href="images/appimagetools.xml" />
<xi:include href="images/dockertools.xml" />
<xi:include href="images/ocitools.xml" />
<xi:include href="images/snaptools.xml" />
</chapter>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 12 additions & 0 deletions doc/builders/special.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="chap-special">
<title>Special builders</title>
<para>
This chapter describes several special builders.
</para>
<xi:include href="special/fhs-environments.xml" />
<xi:include href="special/mkshell.xml" />
</chapter>


File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section xmlns="http://docbook.org/ns/docbook"
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="sec-trivial-builders">
xml:id="chap-trivial-builders">
<title>Trivial builders</title>

<para>
@@ -76,4 +76,4 @@
</listitem>
</varlistentry>
</variablelist>
</section>
</chapter>
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/doc-support/parameters.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<xsl:param name="html.script" select="'./highlightjs/highlight.pack.js ./highlightjs/loader.js'" />
<xsl:param name="xref.with.number.and.title" select="1" />
<xsl:param name="use.id.as.filename" select="1" />
<xsl:param name="toc.section.depth" select="3" />
<xsl:param name="toc.section.depth" select="0" />
<xsl:param name="admon.style" select="''" />
<xsl:param name="callout.graphics.extension" select="'.svg'" />
</xsl:stylesheet>
9 changes: 0 additions & 9 deletions doc/functions.xml
Original file line number Diff line number Diff line change
@@ -7,17 +7,8 @@
The nixpkgs repository has several utility functions to manipulate Nix expressions.
</para>
<xi:include href="functions/library.xml" />
<xi:include href="functions/overrides.xml" />
<xi:include href="functions/generators.xml" />
<xi:include href="functions/debug.xml" />
<xi:include href="functions/fetchers.xml" />
<xi:include href="functions/trivial-builders.xml" />
<xi:include href="functions/fhs-environments.xml" />
<xi:include href="functions/shell.xml" />
<xi:include href="functions/dockertools.xml" />
<xi:include href="functions/snaptools.xml" />
<xi:include href="functions/appimagetools.xml" />
<xi:include href="functions/prefer-remote-fetch.xml" />
<xi:include href="functions/nix-gitignore.xml" />
<xi:include href="functions/ocitools.xml" />
</chapter>
2 changes: 1 addition & 1 deletion doc/languages-frameworks/emscripten.section.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# User's Guide to Emscripten in Nixpkgs
# Emscripten

[Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler

2 changes: 1 addition & 1 deletion doc/languages-frameworks/haskell.section.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ title: User's Guide for Haskell in Nixpkgs
author: Peter Simons
date: 2015-06-01
---
# User's Guide to the Haskell Infrastructure
# Haskell


## How to install Haskell packages
2 changes: 1 addition & 1 deletion doc/languages-frameworks/idris.section.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Idris packages
# Idris

## Installing Idris

6 changes: 3 additions & 3 deletions doc/languages-frameworks/index.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="chap-language-support">
<title>Support for specific programming languages and frameworks</title>
<title>Languages and frameworks</title>
<para>
The <link linkend="chap-stdenv">standard build environment</link> makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of <literal>stdenv</literal>. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter.
</para>
<xi:include href="android.section.xml" />
<xi:include href="beam.xml" />
<xi:include href="bower.xml" />
<xi:include href="coq.xml" />
<xi:include href="crystal.section.xml" />
<xi:include href="emscripten.section.xml" />
<xi:include href="gnome.xml" />
<xi:include href="go.xml" />
<xi:include href="haskell.section.xml" />
@@ -27,6 +29,4 @@
<xi:include href="texlive.xml" />
<xi:include href="titanium.section.xml" />
<xi:include href="vim.section.xml" />
<xi:include href="emscripten.section.xml" />
<xi:include href="crystal.section.xml" />
</chapter>
4 changes: 2 additions & 2 deletions doc/languages-frameworks/node.section.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Node.js packages
================
Node.js
=======
The `pkgs/development/node-packages` folder contains a generated collection of
[NPM packages](https://npmjs.com/) that can be installed with the Nix package
manager.
4 changes: 2 additions & 2 deletions doc/languages-frameworks/r.section.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
R packages
==========
R
=

## Installation

2 changes: 1 addition & 1 deletion doc/languages-frameworks/rust.section.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ author: Matthias Beyer
date: 2017-03-05
---

# User's Guide to the Rust Infrastructure
# Rust

To install the rust compiler and cargo put

2 changes: 1 addition & 1 deletion doc/languages-frameworks/vim.section.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ title: User's Guide for Vim in Nixpkgs
author: Marc Weber
date: 2016-06-25
---
# User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs
# Vim

Both Neovim and Vim can be configured to include your favorite plugins
and additional libraries.
48 changes: 32 additions & 16 deletions doc/manual.xml
Original file line number Diff line number Diff line change
@@ -6,20 +6,36 @@
</subtitle>
</info>
<xi:include href="introduction.chapter.xml" />
<xi:include href="quick-start.xml" />
<xi:include href="package-specific-user-notes.xml" />
<xi:include href="stdenv.xml" />
<xi:include href="multiple-output.xml" />
<xi:include href="cross-compilation.xml" />
<xi:include href="configuration.xml" />
<xi:include href="functions.xml" />
<xi:include href="meta.xml" />
<xi:include href="languages-frameworks/index.xml" />
<xi:include href="platform-notes.xml" />
<xi:include href="package-notes.xml" />
<xi:include href="overlays.xml" />
<xi:include href="coding-conventions.xml" />
<xi:include href="submitting-changes.xml" />
<xi:include href="reviewing-contributions.xml" />
<xi:include href="contributing.xml" />
<part>
<title>Using Nixpkgs</title>
<xi:include href="configuration.xml" />
<xi:include href="overlays.xml" />
<xi:include href="overrides.xml" />
<xi:include href="functions.xml" />
</part>
<part>
<title>Standard environment</title>
<xi:include href="stdenv.xml" />
<xi:include href="meta.xml" />
<xi:include href="multiple-output.xml" />
<xi:include href="cross-compilation.xml" />
<xi:include href="platform-notes.xml" />
</part>
<part>
<title>Builders</title>
<xi:include href="builders/fetchers.xml" />
<xi:include href="builders/trivial-builders.xml" />
<xi:include href="builders/special.xml" />
<xi:include href="builders/images.xml" />
<xi:include href="languages-frameworks/index.xml" />
<xi:include href="packages/index.xml" />
</part>
<part>
<title>Contributing to Nixpkgs</title>
<xi:include href="quick-start.xml" />
<xi:include href="coding-conventions.xml" />
<xi:include href="submitting-changes.xml" />
<xi:include href="reviewing-contributions.xml" />
<xi:include href="contributing-to-documentation.xml" />
</part>
</book>
6 changes: 3 additions & 3 deletions doc/functions/overrides.xml → doc/overrides.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section xmlns="http://docbook.org/ns/docbook"
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="sec-overrides">
xml:id="chap-overrides">
<title>Overriding</title>

<para>
@@ -148,4 +148,4 @@ c = lib.makeOverridable f { a = 1; b = 2; };
The variable <varname>c</varname> however also has some additional functions, like <link linkend="sec-pkg-override">c.override</link> which can be used to override the default arguments. In this example the value of <varname>(c.override { a = 4; }).result</varname> is 6.
</para>
</section>
</section>
</chapter>
Loading