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: 0a19162fa9a7
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: 236a9189e3f6
Choose a head ref
12 contributors

Commits on Apr 18, 2018

  1. vulkan-loader: fix broken symlink in output

    @Ralith
    Ralith committed Apr 18, 2018
    Copy the full SHA
    d1f7c51 View commit details

Commits on Apr 20, 2018

  1. nixos-container: support restarts

    @peterhoeg
    peterhoeg committed Apr 20, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b95a24f View commit details

Commits on Apr 28, 2018

  1. xen_4_10: fix build (qemu-xen memfd patch)

    @xeji
    xeji committed Apr 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3c4efe4 View commit details

Commits on May 1, 2018

  1. nixpkgs doc: add format Make target

    @grahamc
    grahamc committed May 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ab1648b View commit details

  2. lib/systems: Fix eval for iphone32* examples 

    Whoops messed up 9a845de slightly.
    @Ericson2314
    Ericson2314 committed May 1, 2018
    Copy the full SHA
    db4f96b View commit details

  3. stride: 1.8.18 -> 1.17.82

    @puffnfresh
    puffnfresh committed May 1, 2018
    Copy the full SHA
    1abef3a View commit details

  4. nixos docs: makefile for formatting

    @grahamc
    grahamc committed May 1, 2018
    Copy the full SHA
    374a3bd View commit details

  5. Merge pull request #39837 from obsidiansystems/ios-examples 

    lib/systems: Fix eval for iphone32* examples
    @Ericson2314
    Ericson2314 authored May 1, 2018
    Copy the full SHA
    5b8c550 View commit details

  6. Merge pull request #39786 from grahamc/format-nixpkgs-docs-target 

    nixpkgs doc: add format Make target
    @grahamc
    grahamc authored May 1, 2018
    Copy the full SHA
    4f5a995 View commit details

  7. syncthing: 0.14.46 -> 0.14.47

    @peterhoeg
    peterhoeg committed May 1, 2018
    Copy the full SHA
    d700432 View commit details

  8. nixos docs: fixup

    @grahamc
    grahamc committed May 1, 2018
    Copy the full SHA
    9d4b966 View commit details

  9. nixos docs: ignore generated files

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

  10. nixpkgs docs: format =)

    @grahamc
    grahamc committed May 1, 2018
    Copy the full SHA
    77161de View commit details

  11. nixos docs: format =)

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

Commits on May 2, 2018

  1. chromium: 66.0.3359.117 -> 66.0.3359.139

    @bendlas
    bendlas committed May 2, 2018
    Copy the full SHA
    c07c23b View commit details

  2. mupdf: 1.12 -> 1.13

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    2cd5d35 View commit details

  3. pythonPackages.nbxmpp: 0.6.4 -> 0.6.5

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    b82ee7c View commit details

  4. gajim: 1.0.1 -> 1.0.2

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    cc6f2c0 View commit details

  5. slimerjs: 0.10.3 -> 1.0.0

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    80c77a2 View commit details

  6. apache-jena: 3.5.0 -> 3.7.0

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    035d0f7 View commit details

  7. dd_rescue: 1.99.7 -> 1.99.8

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    2a9ba64 View commit details

  8. nginxMainline: 1.13.9 -> 1.13.12

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    18d7345 View commit details

  9. nginxStable: 1.12.2 -> 1.14.0

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    36f9b21 View commit details

  10. sgtpuzzles: 20180409 -> 20180429

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    d3b3ce4 View commit details

  11. smbnetfs: 0.6.0 -> 0.6.1

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    f7bd84b View commit details

  12. sbcl: 1.4.6 -> 1.4.7

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    e1ae2ef View commit details

  13. botan2: 2.3 -> 2.6

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    8b62a1b View commit details

  14. liblangtag: init at 0.6.1

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    28201b8 View commit details

  15. libe-book: 0.1.2 -> 0.1.3

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    e09c5ed View commit details

  16. libreoffice-still: try fixing icon references

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    3228dcd View commit details

  17. libreoffice-fresh: 6.0.2.1 -> 6.0.3.2

    @7c6f434c
    7c6f434c committed May 2, 2018
    Copy the full SHA
    1cb0cfb View commit details

  18. Revert "Revert "hfsprogs: init at 332.25"" 

    This reverts commit 6c182dd.

No reason to drop working code, for which there is no other alternative
(in this case, formatting/checking HFS+ filesystems).
    @dezgeg
    dezgeg committed May 2, 2018
    Copy the full SHA
    4602e61 View commit details

  19. Merge pull request #39839 from puffnfresh/pkgs/stride 

    stride: 1.8.18 -> 1.17.82
    @xeji
    xeji authored May 2, 2018
    Copy the full SHA
    ccd986d View commit details

  20. Merge pull request #39663 from xeji/xen-4-10-memfd 

    xen_4_10: fix qemu-xen build error (memfd)
    @xeji
    xeji authored May 2, 2018
    Copy the full SHA
    f50e688 View commit details

  21. Merge pull request #39094 from Ralith/vulkan 

    vulkan-loader: fix broken symlink in output
    @xeji
    xeji authored May 2, 2018
    Copy the full SHA
    599ecd5 View commit details

  22. virtulabox: update guest additions hash 

    missed in 8eb3167
    @flokli
    flokli committed May 2, 2018
    Copy the full SHA
    0a80a37 View commit details

  23. Merge pull request #39848 from flokli/virtualbox-5.2.10-guest-additions 

    virtualbox: update guest additions hash
    @peterhoeg
    peterhoeg authored May 2, 2018
    Copy the full SHA
    87595a4 View commit details

  24. Merge pull request #39717 from peterhoeg/f/container 

    nixos-container: support restarts
    @peterhoeg
    peterhoeg authored May 2, 2018
    Copy the full SHA
    236a918 View commit details
Showing with 18,383 additions and 14,915 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. +2 −0 nixos/doc/manual/.gitignore
  33. +18 −2 nixos/doc/manual/Makefile
  34. +78 −58 nixos/doc/manual/administration/boot-problems.xml
  35. +28 −37 nixos/doc/manual/administration/cleaning-store.xml
  36. +33 −36 nixos/doc/manual/administration/container-networking.xml
  37. +28 −28 nixos/doc/manual/administration/containers.xml
  38. +36 −44 nixos/doc/manual/administration/control-groups.xml
  39. +37 −37 nixos/doc/manual/administration/declarative-containers.xml
  40. +61 −78 nixos/doc/manual/administration/imperative-containers.xml
  41. +21 −30 nixos/doc/manual/administration/logging.xml
  42. +7 −9 nixos/doc/manual/administration/maintenance-mode.xml
  43. +14 −20 nixos/doc/manual/administration/network-problems.xml
  44. +20 −29 nixos/doc/manual/administration/rebooting.xml
  45. +23 −30 nixos/doc/manual/administration/rollback.xml
  46. +15 −18 nixos/doc/manual/administration/running.xml
  47. +31 −42 nixos/doc/manual/administration/service-mgmt.xml
  48. +23 −24 nixos/doc/manual/administration/store-corruption.xml
  49. +10 −12 nixos/doc/manual/administration/troubleshooting.xml
  50. +15 −23 nixos/doc/manual/administration/user-sessions.xml
  51. +51 −61 nixos/doc/manual/configuration/abstractions.xml
  52. +7 −11 nixos/doc/manual/configuration/ad-hoc-network-config.xml
  53. +38 −40 nixos/doc/manual/configuration/ad-hoc-packages.xml
  54. +24 −35 nixos/doc/manual/configuration/adding-custom-packages.xml
  55. +100 −119 nixos/doc/manual/configuration/config-file.xml
  56. +18 −20 nixos/doc/manual/configuration/config-syntax.xml
  57. +19 −25 nixos/doc/manual/configuration/configuration.xml
  58. +59 −66 nixos/doc/manual/configuration/customizing-packages.xml
  59. +25 −25 nixos/doc/manual/configuration/declarative-packages.xml
  60. +34 −34 nixos/doc/manual/configuration/file-systems.xml
  61. +23 −28 nixos/doc/manual/configuration/firewall.xml
  62. +23 −27 nixos/doc/manual/configuration/ipv4-config.xml
  63. +22 −21 nixos/doc/manual/configuration/ipv6-config.xml
  64. +45 −48 nixos/doc/manual/configuration/linux-kernel.xml
  65. +12 −18 nixos/doc/manual/configuration/luks-file-systems.xml
  66. +68 −80 nixos/doc/manual/configuration/modularity.xml
  67. +30 −27 nixos/doc/manual/configuration/network-manager.xml
  68. +12 −15 nixos/doc/manual/configuration/networking.xml
  69. +25 −28 nixos/doc/manual/configuration/package-mgmt.xml
  70. +12 −17 nixos/doc/manual/configuration/ssh.xml
  71. +202 −167 nixos/doc/manual/configuration/summary.xml
  72. +56 −68 nixos/doc/manual/configuration/user-mgmt.xml
  73. +22 −30 nixos/doc/manual/configuration/wireless.xml
  74. +77 −82 nixos/doc/manual/configuration/x-windows.xml
  75. +47 −69 nixos/doc/manual/configuration/xfce.xml
  76. +29 −35 nixos/doc/manual/development/assertions.xml
  77. +15 −20 nixos/doc/manual/development/building-nixos.xml
  78. +78 −79 nixos/doc/manual/development/building-parts.xml
  79. +14 −17 nixos/doc/manual/development/development.xml
  80. +10 −13 nixos/doc/manual/development/importing-modules.xml
  81. +28 −27 nixos/doc/manual/development/meta-attributes.xml
  82. +12 −13 nixos/doc/manual/development/nixos-tests.xml
  83. +142 −113 nixos/doc/manual/development/option-declarations.xml
  84. +49 −62 nixos/doc/manual/development/option-def.xml
  85. +618 −421 nixos/doc/manual/development/option-types.xml
  86. +215 −209 nixos/doc/manual/development/releases.xml
  87. +26 −22 nixos/doc/manual/development/replace-modules.xml
  88. +18 −21 nixos/doc/manual/development/running-nixos-tests-interactively.xml
  89. +13 −18 nixos/doc/manual/development/running-nixos-tests.xml
  90. +48 −65 nixos/doc/manual/development/sources.xml
  91. +7 −14 nixos/doc/manual/development/testing-installer.xml
  92. +131 −141 nixos/doc/manual/development/writing-documentation.xml
  93. +95 −95 nixos/doc/manual/development/writing-modules.xml
  94. +338 −252 nixos/doc/manual/development/writing-nixos-tests.xml
  95. +57 −74 nixos/doc/manual/installation/changing-config.xml
  96. +11 −15 nixos/doc/manual/installation/installation.xml
  97. +314 −271 nixos/doc/manual/installation/installing-from-other-distro.xml
  98. +33 −31 nixos/doc/manual/installation/installing-pxe.xml
  99. +49 −40 nixos/doc/manual/installation/installing-usb.xml
  100. +59 −41 nixos/doc/manual/installation/installing-virtualbox-guest.xml
  101. +309 −276 nixos/doc/manual/installation/installing.xml
  102. +45 −39 nixos/doc/manual/installation/obtaining.xml
  103. +97 −107 nixos/doc/manual/installation/upgrading.xml
  104. +25 −33 nixos/doc/manual/man-configuration.xml
  105. +74 −75 nixos/doc/manual/man-nixos-build-vms.xml
  106. +97 −97 nixos/doc/manual/man-nixos-enter.xml
  107. +140 −149 nixos/doc/manual/man-nixos-generate-config.xml
  108. +199 −182 nixos/doc/manual/man-nixos-install.xml
  109. +90 −99 nixos/doc/manual/man-nixos-option.xml
  110. +372 −356 nixos/doc/manual/man-nixos-rebuild.xml
  111. +88 −83 nixos/doc/manual/man-nixos-version.xml
  112. +16 −29 nixos/doc/manual/man-pages.xml
  113. +39 −39 nixos/doc/manual/manual.xml
  114. +15 −17 nixos/doc/manual/release-notes/release-notes.xml
  115. +4 −4 nixos/doc/manual/release-notes/rl-1310.xml
  116. +150 −131 nixos/doc/manual/release-notes/rl-1404.xml
  117. +454 −164 nixos/doc/manual/release-notes/rl-1412.xml
  118. +640 −381 nixos/doc/manual/release-notes/rl-1509.xml
  119. +529 −311 nixos/doc/manual/release-notes/rl-1603.xml
  120. +205 −167 nixos/doc/manual/release-notes/rl-1609.xml
  121. +685 −382 nixos/doc/manual/release-notes/rl-1703.xml
  122. +732 −444 nixos/doc/manual/release-notes/rl-1709.xml
  123. +766 −473 nixos/doc/manual/release-notes/rl-1803.xml
  124. +96 −91 nixos/doc/manual/release-notes/rl-1809.xml
  125. +8 −0 nixos/doc/manual/shell.nix
  126. +72 −0 nixos/doc/xmlformat.conf
  127. +3 −61 pkgs/applications/misc/mupdf/default.nix
  128. +9 −5 pkgs/applications/misc/mupdf/{mupdf-1.12-shared_libs-1.patch → mupdf-1.13-shared_libs-1.patch}
  129. +0 −5 pkgs/applications/networking/browsers/chromium/common.nix
  130. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  131. +2 −2 pkgs/applications/networking/instant-messengers/gajim/default.nix
  132. +2 −2 pkgs/applications/networking/instant-messengers/stride/default.nix
  133. +2 −2 pkgs/applications/networking/syncthing/default.nix
  134. +3 −3 pkgs/applications/office/libreoffice/default-primary-src.nix
  135. +3 −3 pkgs/applications/office/libreoffice/default.nix
  136. +8 −8 pkgs/applications/office/libreoffice/libreoffice-srcs.nix
  137. +1 −1 pkgs/applications/office/libreoffice/still.nix
  138. +1 −1 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
  139. +9 −0 pkgs/applications/virtualization/xen/4.10.nix
  140. +2 −2 pkgs/development/compilers/sbcl/default.nix
  141. +2 −2 pkgs/development/libraries/botan/2.0.nix
  142. +6 −6 pkgs/development/libraries/libe-book/default.nix
  143. +52 −0 pkgs/development/libraries/liblangtag/default.nix
  144. +2 −2 pkgs/development/libraries/vulkan-loader/default.nix
  145. +2 −2 pkgs/development/python-modules/nbxmpp/default.nix
  146. +2 −2 pkgs/development/tools/slimerjs/default.nix
  147. +2 −2 pkgs/games/sgt-puzzles/default.nix
  148. +1 −1 pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
  149. +2 −2 pkgs/servers/http/nginx/mainline.nix
  150. +2 −2 pkgs/servers/http/nginx/stable.nix
  151. +2 −2 pkgs/servers/nosql/apache-jena/binary.nix
  152. +45 −0 pkgs/tools/filesystems/hfsprogs/default.nix
  153. +5 −5 pkgs/tools/filesystems/smbnetfs/default.nix
  154. +2 −2 pkgs/tools/system/dd_rescue/default.nix
  155. +15 −2 pkgs/tools/virtualization/nixos-container/nixos-container.pl
  156. +7 −0 pkgs/top-level/all-packages.nix
7 changes: 6 additions & 1 deletion doc/Makefile
View file
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