Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0c17b7521060
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b28d151ac9b9
Choose a head ref

Commits on Apr 18, 2018

  1. Copy the full SHA
    d1f7c51 View commit details

Commits on Apr 20, 2018

  1. Copy the full SHA
    b95a24f View commit details

Commits on Apr 28, 2018

  1. Copy the full SHA
    3c4efe4 View commit details

Commits on Apr 30, 2018

  1. Copy the full SHA
    2fcf50a View commit details
  2. Copy the full SHA
    a7ce939 View commit details
  3. wesnoth-dev: 1.13.13 -> 1.14.0

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/wesnoth/versions.
    
    These checks were done:
    
    - built on NixOS
    - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnoth -h’ got 0 exit code
    - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnoth --help’ got 0 exit code
    - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd -h’ got 0 exit code
    - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd --help’ got 0 exit code
    - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd -V’ and found version 1.14.0
    - ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd --version’ and found version 1.14.0
    - found 1.14.0 with grep in /nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0
    - directory tree listing: https://gist.github.com/faf1d8fe4a47781eb51e8a411a546099
    R. RyanTM committed Apr 30, 2018
    Copy the full SHA
    99964ff View commit details

Commits on May 1, 2018

  1. Copy the full SHA
    ab1648b View commit details
  2. Copy the full SHA
    f5c0b3f View commit details
  3. nixos/docker-registry: cleanup module definition & enhance testcase

    The following changes have been applied:
    
    - the property `http.headers.X-Content-Type-Options` must a list of
      strings rather than a serialized list
    - instead of `/etc/docker/registry/config.yml` the configuration will be
      written with `pkgs.writeText` and the store path will be used to run
      the registry. This reduces the risk of possible impurities by relying
      on the Nix store only.
    - cleaned up the property paths to easy readability and reduce the
      verbosity.
    - enhanced the testcase to ensure that digests can be deleted as well
    - the `services.docker-registry.extraConfig` object will be merged with
      `registryConfig`
    
    /cc @ironpinguin
    Ma27 committed May 1, 2018
    Copy the full SHA
    593dc45 View commit details
  4. Copy the full SHA
    afd3136 View commit details
  5. lib/systems: Fix eval for iphone32* examples

    Whoops messed up 9a845de slightly.
    Ericson2314 committed May 1, 2018
    Copy the full SHA
    db4f96b View commit details
  6. Copy the full SHA
    1a18fed View commit details
  7. kid3: qt5 support

    AndersonTorres committed May 1, 2018
    Copy the full SHA
    f08de6c View commit details
  8. cquery: 2018-03-31 -> 2018-05-01

    The update should fix the build on osx.
    tobim committed May 1, 2018
    Copy the full SHA
    5fb8267 View commit details
  9. souffle: 1.0.0 -> 1.2.0

    wchresta committed May 1, 2018
    Copy the full SHA
    0cb3923 View commit details
  10. discord: 0.0.4 -> 0.0.5

    lightdiscord committed May 1, 2018
    Copy the full SHA
    d72b870 View commit details
  11. Merge pull request #39829 from LightDiscord/updates/discord

    discord: 0.0.4 -> 0.0.5
    pSub authored May 1, 2018
    Copy the full SHA
    07b8c39 View commit details
  12. Merge pull request #39822 from edef1c/mananager

    nixos doc: mananager -> manager
    pSub authored May 1, 2018
    Copy the full SHA
    7203e2c View commit details
  13. Copy the full SHA
    f787dfc View commit details
  14. Merge pull request #39827 from AndersonTorres/upload/kid3-qt5

    kid3: qt5 support
    xeji authored May 1, 2018
    Copy the full SHA
    3abe395 View commit details
  15. Merge pull request #39701 from romildo/upd.uget-integrator

    uget-integrator: init at 1.0.0
    pSub authored May 1, 2018
    Copy the full SHA
    839842b View commit details
  16. Merge pull request #39728 from r-ryantm/auto-update/wesnoth

    wesnoth-dev: 1.13.13 -> 1.14.0
    pSub authored May 1, 2018
    Copy the full SHA
    4bcf3d9 View commit details
  17. Merge pull request #39828 from wchresta/souffle-1.2

    souffle: 1.0.0 -> 1.2.0
    copumpkin authored May 1, 2018
    Copy the full SHA
    9a63471 View commit details
  18. Merge pull request #39825 from tobimpub/cquery-update

    cquery: 2018-03-31 -> 2018-05-01
    Mic92 authored May 1, 2018
    Copy the full SHA
    5a990f5 View commit details
  19. foundationdb: install the java client library

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed May 1, 2018
    Copy the full SHA
    ed5cbbb View commit details
  20. nixos: add TLS support to FoundationDB module, and tweak setup a bit

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed May 1, 2018
    Copy the full SHA
    55eec81 View commit details
  21. foundationdb: split into multiple, major-versioned packages to make u…

    …pgrades user-controllable
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed May 1, 2018
    Copy the full SHA
    5a24d99 View commit details
  22. Copy the full SHA
    92e5592 View commit details
  23. Copy the full SHA
    d3527d9 View commit details
  24. virtualbox: 5.2.8 -> 5.2.10

    closes #39182.
    flokli committed May 1, 2018
    Copy the full SHA
    8eb3167 View commit details
  25. Merge pull request #39711 from sephalon/luafilesystem

    luafilesystem: 1.6.3 -> 1.7.0
    xeji authored May 1, 2018
    Copy the full SHA
    af7da1c View commit details
  26. Merge pull request #39836 from flokli/virtualbox-5.2.10

    virtualbox: 5.2.8 -> 5.2.10
    matthewbauer authored May 1, 2018
    Copy the full SHA
    c46c5b8 View commit details
  27. buildbot: disable tests on aarch64 because of TimeoutErrors (#39826)

    buildbot: disable tests because of TimeoutErrors - only on aarch64
    seese authored and xeji committed May 1, 2018
    Copy the full SHA
    0a19162 View commit details
  28. stride: 1.8.18 -> 1.17.82

    puffnfresh committed May 1, 2018
    Copy the full SHA
    1abef3a View commit details
  29. Copy the full SHA
    374a3bd View commit details
  30. Merge pull request #39837 from obsidiansystems/ios-examples

    lib/systems: Fix eval for iphone32* examples
    Ericson2314 authored May 1, 2018
    Copy the full SHA
    5b8c550 View commit details
  31. Merge pull request #39786 from grahamc/format-nixpkgs-docs-target

    nixpkgs doc: add format Make target
    grahamc authored May 1, 2018
    Copy the full SHA
    4f5a995 View commit details
  32. Copy the full SHA
    d700432 View commit details
  33. nixos docs: fixup

    grahamc committed May 1, 2018
    Copy the full SHA
    9d4b966 View commit details
  34. Copy the full SHA
    fd2dce9 View commit details
  35. nixpkgs docs: format =)

    grahamc committed May 1, 2018
    Copy the full SHA
    77161de View commit details
  36. nixos docs: format =)

    grahamc committed May 1, 2018
    Copy the full SHA
    eca5c99 View commit details

Commits on May 2, 2018

  1. Copy the full SHA
    c07c23b View commit details
  2. mupdf: 1.12 -> 1.13

    7c6f434c committed May 2, 2018
    Copy the full SHA
    2cd5d35 View commit details
  3. Copy the full SHA
    b82ee7c View commit details
  4. gajim: 1.0.1 -> 1.0.2

    7c6f434c committed May 2, 2018
    Copy the full SHA
    cc6f2c0 View commit details
  5. slimerjs: 0.10.3 -> 1.0.0

    7c6f434c committed May 2, 2018
    Copy the full SHA
    80c77a2 View commit details
  6. apache-jena: 3.5.0 -> 3.7.0

    7c6f434c committed May 2, 2018
    Copy the full SHA
    035d0f7 View commit details
  7. dd_rescue: 1.99.7 -> 1.99.8

    7c6f434c committed May 2, 2018
    Copy the full SHA
    2a9ba64 View commit details
  8. Copy the full SHA
    18d7345 View commit details
Showing with 18,881 additions and 15,070 deletions.
  1. +6 −1 doc/Makefile
  2. +677 −537 doc/coding-conventions.xml
  3. +288 −281 doc/configuration.xml
  4. +19 −19 doc/contributing.xml
  5. +425 −264 doc/cross-compilation.xml
  6. +2 −1 doc/default.nix
  7. +558 −552 doc/functions.xml
  8. +277 −223 doc/languages-frameworks/beam.xml
  9. +137 −152 doc/languages-frameworks/bower.xml
  10. +31 −29 doc/languages-frameworks/coq.xml
  11. +84 −90 doc/languages-frameworks/go.xml
  12. +27 −32 doc/languages-frameworks/index.xml
  13. +40 −44 doc/languages-frameworks/java.xml
  14. +20 −23 doc/languages-frameworks/lua.xml
  15. +115 −118 doc/languages-frameworks/perl.xml
  16. +62 −46 doc/languages-frameworks/qt.xml
  17. +47 −45 doc/languages-frameworks/ruby.xml
  18. +72 −36 doc/languages-frameworks/texlive.xml
  19. +21 −26 doc/manual.xml
  20. +294 −250 doc/meta.xml
  21. +298 −84 doc/multiple-output.xml
  22. +143 −113 doc/overlays.xml
  23. +447 −480 doc/package-notes.xml
  24. +38 −46 doc/platform-notes.xml
  25. +184 −188 doc/quick-start.xml
  26. +710 −643 doc/release-notes.xml
  27. +476 −263 doc/reviewing-contributions.xml
  28. +1 −0 doc/shell.nix
  29. +2,311 −1,838 doc/stdenv.xml
  30. +462 −398 doc/submitting-changes.xml
  31. +1 −1 lib/systems/examples.nix
  32. +5 −0 maintainers/maintainer-list.nix
  33. +2 −0 nixos/doc/manual/.gitignore
  34. +18 −2 nixos/doc/manual/Makefile
  35. +78 −58 nixos/doc/manual/administration/boot-problems.xml
  36. +28 −37 nixos/doc/manual/administration/cleaning-store.xml
  37. +33 −36 nixos/doc/manual/administration/container-networking.xml
  38. +28 −28 nixos/doc/manual/administration/containers.xml
  39. +36 −44 nixos/doc/manual/administration/control-groups.xml
  40. +37 −37 nixos/doc/manual/administration/declarative-containers.xml
  41. +61 −78 nixos/doc/manual/administration/imperative-containers.xml
  42. +21 −30 nixos/doc/manual/administration/logging.xml
  43. +7 −9 nixos/doc/manual/administration/maintenance-mode.xml
  44. +14 −20 nixos/doc/manual/administration/network-problems.xml
  45. +20 −29 nixos/doc/manual/administration/rebooting.xml
  46. +23 −30 nixos/doc/manual/administration/rollback.xml
  47. +15 −18 nixos/doc/manual/administration/running.xml
  48. +31 −42 nixos/doc/manual/administration/service-mgmt.xml
  49. +23 −24 nixos/doc/manual/administration/store-corruption.xml
  50. +10 −12 nixos/doc/manual/administration/troubleshooting.xml
  51. +15 −23 nixos/doc/manual/administration/user-sessions.xml
  52. +51 −61 nixos/doc/manual/configuration/abstractions.xml
  53. +7 −11 nixos/doc/manual/configuration/ad-hoc-network-config.xml
  54. +38 −40 nixos/doc/manual/configuration/ad-hoc-packages.xml
  55. +24 −35 nixos/doc/manual/configuration/adding-custom-packages.xml
  56. +100 −119 nixos/doc/manual/configuration/config-file.xml
  57. +18 −20 nixos/doc/manual/configuration/config-syntax.xml
  58. +19 −25 nixos/doc/manual/configuration/configuration.xml
  59. +59 −66 nixos/doc/manual/configuration/customizing-packages.xml
  60. +25 −25 nixos/doc/manual/configuration/declarative-packages.xml
  61. +34 −34 nixos/doc/manual/configuration/file-systems.xml
  62. +23 −28 nixos/doc/manual/configuration/firewall.xml
  63. +23 −27 nixos/doc/manual/configuration/ipv4-config.xml
  64. +22 −21 nixos/doc/manual/configuration/ipv6-config.xml
  65. +45 −48 nixos/doc/manual/configuration/linux-kernel.xml
  66. +12 −18 nixos/doc/manual/configuration/luks-file-systems.xml
  67. +68 −80 nixos/doc/manual/configuration/modularity.xml
  68. +30 −27 nixos/doc/manual/configuration/network-manager.xml
  69. +12 −15 nixos/doc/manual/configuration/networking.xml
  70. +25 −28 nixos/doc/manual/configuration/package-mgmt.xml
  71. +12 −17 nixos/doc/manual/configuration/ssh.xml
  72. +202 −167 nixos/doc/manual/configuration/summary.xml
  73. +56 −68 nixos/doc/manual/configuration/user-mgmt.xml
  74. +22 −30 nixos/doc/manual/configuration/wireless.xml
  75. +77 −82 nixos/doc/manual/configuration/x-windows.xml
  76. +47 −69 nixos/doc/manual/configuration/xfce.xml
  77. +29 −35 nixos/doc/manual/development/assertions.xml
  78. +15 −20 nixos/doc/manual/development/building-nixos.xml
  79. +78 −79 nixos/doc/manual/development/building-parts.xml
  80. +14 −17 nixos/doc/manual/development/development.xml
  81. +10 −13 nixos/doc/manual/development/importing-modules.xml
  82. +28 −27 nixos/doc/manual/development/meta-attributes.xml
  83. +12 −13 nixos/doc/manual/development/nixos-tests.xml
  84. +142 −113 nixos/doc/manual/development/option-declarations.xml
  85. +49 −62 nixos/doc/manual/development/option-def.xml
  86. +618 −421 nixos/doc/manual/development/option-types.xml
  87. +215 −209 nixos/doc/manual/development/releases.xml
  88. +26 −22 nixos/doc/manual/development/replace-modules.xml
  89. +18 −21 nixos/doc/manual/development/running-nixos-tests-interactively.xml
  90. +13 −18 nixos/doc/manual/development/running-nixos-tests.xml
  91. +48 −65 nixos/doc/manual/development/sources.xml
  92. +7 −14 nixos/doc/manual/development/testing-installer.xml
  93. +131 −141 nixos/doc/manual/development/writing-documentation.xml
  94. +95 −95 nixos/doc/manual/development/writing-modules.xml
  95. +338 −252 nixos/doc/manual/development/writing-nixos-tests.xml
  96. +57 −74 nixos/doc/manual/installation/changing-config.xml
  97. +11 −15 nixos/doc/manual/installation/installation.xml
  98. +314 −271 nixos/doc/manual/installation/installing-from-other-distro.xml
  99. +33 −31 nixos/doc/manual/installation/installing-pxe.xml
  100. +49 −40 nixos/doc/manual/installation/installing-usb.xml
  101. +59 −41 nixos/doc/manual/installation/installing-virtualbox-guest.xml
  102. +309 −276 nixos/doc/manual/installation/installing.xml
  103. +45 −39 nixos/doc/manual/installation/obtaining.xml
  104. +97 −107 nixos/doc/manual/installation/upgrading.xml
  105. +25 −33 nixos/doc/manual/man-configuration.xml
  106. +74 −75 nixos/doc/manual/man-nixos-build-vms.xml
  107. +97 −97 nixos/doc/manual/man-nixos-enter.xml
  108. +140 −149 nixos/doc/manual/man-nixos-generate-config.xml
  109. +199 −182 nixos/doc/manual/man-nixos-install.xml
  110. +90 −99 nixos/doc/manual/man-nixos-option.xml
  111. +372 −356 nixos/doc/manual/man-nixos-rebuild.xml
  112. +88 −83 nixos/doc/manual/man-nixos-version.xml
  113. +16 −29 nixos/doc/manual/man-pages.xml
  114. +39 −39 nixos/doc/manual/manual.xml
  115. +15 −17 nixos/doc/manual/release-notes/release-notes.xml
  116. +4 −4 nixos/doc/manual/release-notes/rl-1310.xml
  117. +150 −131 nixos/doc/manual/release-notes/rl-1404.xml
  118. +454 −164 nixos/doc/manual/release-notes/rl-1412.xml
  119. +640 −381 nixos/doc/manual/release-notes/rl-1509.xml
  120. +529 −311 nixos/doc/manual/release-notes/rl-1603.xml
  121. +205 −167 nixos/doc/manual/release-notes/rl-1609.xml
  122. +685 −382 nixos/doc/manual/release-notes/rl-1703.xml
  123. +732 −444 nixos/doc/manual/release-notes/rl-1709.xml
  124. +766 −473 nixos/doc/manual/release-notes/rl-1803.xml
  125. +103 −91 nixos/doc/manual/release-notes/rl-1809.xml
  126. +8 −0 nixos/doc/manual/shell.nix
  127. +72 −0 nixos/doc/xmlformat.conf
  128. +67 −11 nixos/modules/services/databases/foundationdb.nix
  129. +47 −5 nixos/modules/services/databases/foundationdb.xml
  130. +89 −8 nixos/modules/services/misc/docker-registry.nix
  131. +13 −12 nixos/modules/services/monitoring/prometheus/exporters.nix
  132. +32 −0 nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix
  133. +4 −4 nixos/modules/virtualisation/virtualbox-host.nix
  134. +21 −1 nixos/tests/docker-registry.nix
  135. +9 −10 pkgs/applications/audio/kid3/default.nix
  136. +3 −61 pkgs/applications/misc/mupdf/default.nix
  137. +9 −5 pkgs/applications/misc/mupdf/{mupdf-1.12-shared_libs-1.patch → mupdf-1.13-shared_libs-1.patch}
  138. +0 −5 pkgs/applications/networking/browsers/chromium/common.nix
  139. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  140. +2 −1 pkgs/applications/networking/browsers/firefox/wrapper.nix
  141. +2 −2 pkgs/applications/networking/instant-messengers/discord/default.nix
  142. +2 −2 pkgs/applications/networking/instant-messengers/gajim/default.nix
  143. +2 −2 pkgs/applications/networking/instant-messengers/stride/default.nix
  144. +2 −2 pkgs/applications/networking/syncthing/default.nix
  145. +3 −3 pkgs/applications/office/libreoffice/default-primary-src.nix
  146. +3 −3 pkgs/applications/office/libreoffice/default.nix
  147. +8 −8 pkgs/applications/office/libreoffice/libreoffice-srcs.nix
  148. +1 −1 pkgs/applications/office/libreoffice/still.nix
  149. +4 −4 pkgs/applications/virtualization/virtualbox/default.nix
  150. +1 −1 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
  151. +9 −0 pkgs/applications/virtualization/xen/4.10.nix
  152. +2 −2 pkgs/development/compilers/sbcl/default.nix
  153. +7 −11 pkgs/development/compilers/souffle/default.nix
  154. +2 −2 pkgs/development/libraries/botan/2.0.nix
  155. +6 −6 pkgs/development/libraries/libe-book/default.nix
  156. +52 −0 pkgs/development/libraries/liblangtag/default.nix
  157. +2 −2 pkgs/development/libraries/vulkan-loader/default.nix
  158. +2 −2 pkgs/development/python-modules/nbxmpp/default.nix
  159. +3 −0 pkgs/development/tools/build-managers/buildbot/default.nix
  160. +3 −5 pkgs/development/tools/misc/cquery/default.nix
  161. +2 −2 pkgs/development/tools/slimerjs/default.nix
  162. +2 −2 pkgs/games/sgt-puzzles/default.nix
  163. +2 −2 pkgs/games/wesnoth/dev.nix
  164. +1 −1 pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
  165. +104 −72 pkgs/servers/foundationdb/default.nix
  166. +2 −2 pkgs/servers/http/nginx/mainline.nix
  167. +2 −2 pkgs/servers/http/nginx/stable.nix
  168. +23 −0 pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
  169. +2 −2 pkgs/servers/nosql/apache-jena/binary.nix
  170. +45 −0 pkgs/tools/filesystems/hfsprogs/default.nix
  171. +5 −5 pkgs/tools/filesystems/smbnetfs/default.nix
  172. +39 −0 pkgs/tools/networking/uget-integrator/default.nix
  173. +2 −2 pkgs/tools/system/dd_rescue/default.nix
  174. +15 −2 pkgs/tools/virtualization/nixos-container/nixos-container.pl
  175. +18 −3 pkgs/top-level/all-packages.nix
  176. +2 −2 pkgs/top-level/lua-packages.nix
  177. +2 −2 pkgs/top-level/python-packages.nix
7 changes: 6 additions & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))

.PHONY: all
all: validate out/html/index.html out/epub/manual.epub
all: validate format out/html/index.html out/epub/manual.epub

.PHONY: debug
debug:
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"

.PHONY: format
format:
find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}

.PHONY: clean
clean:
rm -f ${MD_TARGETS} .version manual-full.xml
Loading