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: 1b1be29bf827
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: 5d03cce7ed7c
Choose a head ref

Commits on Feb 23, 2018

  1. monkeysphere: wrap the monkeysphere executable with the necessary cry…

    …pto libraries for ssh-proxycommand
    sconybeare committed Feb 23, 2018
    Copy the full SHA
    8c5da27 View commit details

Commits on Feb 27, 2018

  1. rtaudio: 4.1.2 -> 5.0.0

    Semi-automatic update. These checks were performed:
    
    - built on NixOS
    - found 5.0.0 with grep in /nix/store/sxxwa9mma9933vxb4w3d2szxjqx5w773-rtaudio-5.0.0
    - found 5.0.0 in filename of file in /nix/store/sxxwa9mma9933vxb4w3d2szxjqx5w773-rtaudio-5.0.0
    
    cc "@magnetophon"
    ryantm committed Feb 27, 2018
    Copy the full SHA
    d37b43f View commit details

Commits on Mar 8, 2018

  1. gperftools: 2.6.1 -> 2.6.3

    Semi-automatic update. These checks were done:
    
    - built on NixOS
    - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` got 0 exit code
    - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` and found version 2.6.3
    - found 2.6.3 with grep in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3
    - found 2.6.3 in filename of file in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3
    ryantm committed Mar 8, 2018
    Copy the full SHA
    88d34b1 View commit details

Commits on Apr 4, 2018

  1. Copy the full SHA
    a683d2c View commit details

Commits on Apr 8, 2018

  1. calibre: remove unnecessary patch

    In addition to bumping the version, remove a patch which made
    self.update_checker None. This caused errors that showed on the terminal after
    closing Calibre (if it was launched from a terminal).
    jluttine committed Apr 8, 2018
    Copy the full SHA
    cc1ab74 View commit details

Commits on Apr 11, 2018

  1. tealdeer: init at 1.0.0

    davidak committed Apr 11, 2018
    Copy the full SHA
    a45dad9 View commit details
  2. Copy the full SHA
    42a8459 View commit details

Commits on Apr 16, 2018

  1. Fixed indentation

    rdnetto committed Apr 16, 2018
    Copy the full SHA
    7292c5a View commit details

Commits on Apr 18, 2018

  1. Copy the full SHA
    6bf47e0 View commit details

Commits on Apr 22, 2018

  1. ffmpeg library clash fix

    mt-caret committed Apr 22, 2018
    Copy the full SHA
    d71a853 View commit details
  2. nixos/systemd-networkd: wait for udev to settle

    ... to avoid race condition between udevd renaming and
    networkd configuring interfaces (39069)
    xeji committed Apr 22, 2018
    Copy the full SHA
    236703f View commit details

Commits on Apr 23, 2018

  1. Copy the full SHA
    8647df2 View commit details
  2. pdf-quench: init at 1.0.5

    flokli committed Apr 23, 2018
    Copy the full SHA
    0e5f82b View commit details

Commits on Apr 24, 2018

  1. Copy the full SHA
    cdfa85c View commit details
  2. tuxpaint: init at 0.9.22

    woffs committed Apr 24, 2018
    Copy the full SHA
    82a9df7 View commit details

Commits on Apr 25, 2018

  1. treewide: isArm -> isAarch32

    Following legacy packing conventions, `isArm` was defined just for
    32-bit ARM instruction set. This is confusing to non packagers though,
    because Aarch64 is an ARM instruction set.
    
    The official ARM overview for ARMv8[1] is surprisingly not confusing,
    given the overall state of affairs for ARM naming conventions, and
    offers us a solution. It divides the nomenclature into three levels:
    
    ```
    ISA:             ARMv8   {-A, -R, -M}
                     /    \
    Mode:     Aarch32     Aarch64
                 |         /   \
    Encoding:   A64      A32   T32
    ```
    
    At the top is the overall v8 instruction set archicture. Second are the
    two modes, defined by bitwidth but differing in other semantics too, and
    buttom are the encodings, (hopefully?) isomorphic if they encode the
    same mode.
    
    The 32 bit encodings are mostly backwards compatible with previous
    non-Thumb and Thumb encodings, and if so we can pun the mode names to
    instead mean "sets of compatable or isomorphic encodings", and then
    voilà we have nice names for 32-bit and 64-bit arm instruction sets
    which do not use the word ARM so as to not confused either laymen or
    experienced ARM packages.
    
    [1]: https://developer.arm.com/products/architecture/a-profile
    
    (cherry picked from commit ba52ae5)
    Ericson2314 committed Apr 25, 2018
    Copy the full SHA
    b9acfb4 View commit details
  2. qemu: 2.11.1 -> 2.12.0

    xeji committed Apr 25, 2018
    Copy the full SHA
    3e3b39f View commit details

Commits on Apr 26, 2018

  1. qemu: workaround 'struct sysinfo' conflict musl <--> linux

    Most everyone using musl patches the linux headers instead,
    but various software uses a local workaround like the
    one added in this commit (psutils, for example).
    
    It's not obvious to me which project has the "bug",
    and I'm reluctant to even propose modifying our headers
    without clear answer on the issue.
    
    Also, modifying those headers triggers rebuild-all-the-things.
    
    Hopefully upstream projects sort this out, in the meantime
    adding this define is a bit of a kludge but does the job.
    
    -------
    
    For the curious, the patch usually is something like this:
    https://patchwork.kernel.org/patch/3833241/
    
    Here's an updated version that also ensures
    kernel users get the sysinfo struct as expected too:
    https://raw.githubusercontent.com/openwrt/openwrt/e3c43ade0bae9491aeea50fa361e846bb5002dc0/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch
    
    (cherry picked from commit dtzWill/nixpkgs@91b5f5a)
    dtzWill authored and xeji committed Apr 26, 2018
    Copy the full SHA
    3d4aa7e View commit details
  2. qemu-riscv: remove, obsolete with qemu 2.12

    upstream qemu 2.12 includes riscv support
    xeji committed Apr 26, 2018
    Copy the full SHA
    00610fe View commit details
  3. Copy the full SHA
    a026242 View commit details
  4. Copy the full SHA
    4539f1f View commit details
  5. netbsd: propagate compat

    matthewbauer committed Apr 26, 2018
    Copy the full SHA
    e521bad View commit details
  6. Copy the full SHA
    968e8a1 View commit details

Commits on Apr 27, 2018

  1. Copy the full SHA
    ddc2359 View commit details
  2. netbsd: more cleanup

    matthewbauer committed Apr 27, 2018
    Copy the full SHA
    73d5006 View commit details
  3. Copy the full SHA
    3ee2db1 View commit details
  4. netbsd: fix finger

    matthewbauer committed Apr 27, 2018
    Copy the full SHA
    e2fb669 View commit details

Commits on Apr 28, 2018

  1. Copy the full SHA
    99b8d10 View commit details
  2. libressl: build netcat

    matthewbauer committed Apr 28, 2018
    Copy the full SHA
    949bb98 View commit details
  3. openbsd: fixup mg

    matthewbauer committed Apr 28, 2018
    Copy the full SHA
    c65000a View commit details
  4. netcat-openbsd: remove

    matthewbauer committed Apr 28, 2018
    Copy the full SHA
    3c3b822 View commit details
  5. openbsd: remove

    matthewbauer committed Apr 28, 2018
    Copy the full SHA
    6bc1939 View commit details
  6. netbsd: small fixups

    matthewbauer committed Apr 28, 2018
    Copy the full SHA
    004111c View commit details
  7. Copy the full SHA
    d11f290 View commit details
  8. Copy the full SHA
    5f419f3 View commit details
  9. gdk_pixbuf: export moduleDir

    jtojnar committed Apr 28, 2018
    Copy the full SHA
    e375bd4 View commit details
  10. gegl_0_4: init at 0.4.0

    jtojnar committed Apr 28, 2018
    Copy the full SHA
    3ebb162 View commit details
  11. Copy the full SHA
    59f8b1e View commit details
  12. Copy the full SHA
    0ff0d13 View commit details
  13. Copy the full SHA
    a77dc21 View commit details
  14. Copy the full SHA
    74fcb1c View commit details
  15. Revert ".version: remove final newline"

    This reverts commit e109784.
    Ma27 committed Apr 28, 2018
    Copy the full SHA
    9f2b67d View commit details
  16. osquery: use stdenv.lib.nixpkgsVersion

    This way easier to understand and the officially recommended approach.
    
    /cc @dezgeg @fpletz
    Ma27 committed Apr 28, 2018
    Copy the full SHA
    f66cdc7 View commit details
  17. lib: deduplicate version/suffix references

    The logic regarding the generated `.version-suffix` file is already
    defined in `lib/trivial.nix` and shouldn't be duplicated in
    `nixos/version`.
    Ma27 committed Apr 28, 2018
    Copy the full SHA
    3990928 View commit details
  18. treewide: rename version attributes

    As suggested in NixOS/nixpkgs#39416 (comment)
    the versioning attributes in `lib` should be consistent to
    `nixos/version` which implicates the following changes:
    
    * `lib.trivial.version` -> `lib.trivial.release`
    * `lib.trivial.suffix` -> `lib.trivial.versionSuffix`
    * `lib.nixpkgsVersion` -> `lib.version`
    
    As `lib.nixpkgsVersion` is referenced several times in `NixOS/nixpkgs`,
    `NixOS/nix` and probably several user's setups. As the rename will cause
    a notable impact it's better to keep `lib.nixpkgsVersion` as alias with
    a warning yielded by `builtins.trace`.
    Ma27 committed Apr 28, 2018
    Copy the full SHA
    9274ea3 View commit details
  19. Copy the full SHA
    ba1b2ef View commit details
  20. Copy the full SHA
    4797fe8 View commit details
  21. Copy the full SHA
    f2adf20 View commit details
  22. Copy the full SHA
    1526830 View commit details
  23. ratox: 0.4 -> 0.4.20180303

    peterhoeg committed Apr 28, 2018
    Copy the full SHA
    058df14 View commit details
Showing with 3,172 additions and 2,651 deletions.
  1. +2 −6 .editorconfig
  2. +1 −1 .version
  3. +1 −1 doc/Makefile
  4. +1 −1 doc/default.nix
  5. +1 −1 lib/default.nix
  6. +26 −6 lib/systems/examples.nix
  7. +1 −1 lib/systems/inspect.nix
  8. +7 −4 lib/trivial.nix
  9. +5 −0 maintainers/maintainer-list.nix
  10. +8 −0 nixos/doc/manual/Makefile
  11. +2 −2 nixos/doc/manual/administration/cleaning-store.xml
  12. +3 −3 nixos/doc/manual/administration/container-networking.xml
  13. +2 −2 nixos/doc/manual/administration/control-groups.xml
  14. +7 −7 nixos/doc/manual/administration/declarative-containers.xml
  15. +5 −5 nixos/doc/manual/administration/imperative-containers.xml
  16. +6 −6 nixos/doc/manual/configuration/abstractions.xml
  17. +2 −2 nixos/doc/manual/configuration/ad-hoc-network-config.xml
  18. +3 −3 nixos/doc/manual/configuration/adding-custom-packages.xml
  19. +13 −13 nixos/doc/manual/configuration/config-file.xml
  20. +1 −2 nixos/doc/manual/configuration/configuration.xml
  21. +3 −3 nixos/doc/manual/configuration/customizing-packages.xml
  22. +3 −3 nixos/doc/manual/configuration/declarative-packages.xml
  23. +4 −4 nixos/doc/manual/configuration/file-systems.xml
  24. +7 −7 nixos/doc/manual/configuration/firewall.xml
  25. +8 −5 nixos/doc/manual/configuration/ipv4-config.xml
  26. +7 −4 nixos/doc/manual/configuration/ipv6-config.xml
  27. +7 −7 nixos/doc/manual/configuration/linux-kernel.xml
  28. +3 −3 nixos/doc/manual/configuration/luks-file-systems.xml
  29. +18 −18 nixos/doc/manual/configuration/modularity.xml
  30. +2 −2 nixos/doc/manual/configuration/network-manager.xml
  31. +3 −3 nixos/doc/manual/configuration/ssh.xml
  32. +14 −14 nixos/doc/manual/configuration/user-mgmt.xml
  33. +2 −2 nixos/doc/manual/configuration/wireless.xml
  34. +23 −23 nixos/doc/manual/configuration/x-windows.xml
  35. +12 −12 nixos/doc/manual/configuration/xfce.xml
  36. +9 −3 nixos/doc/manual/default.nix
  37. +16 −4 nixos/doc/manual/development/writing-documentation.xml
  38. +1 −1 nixos/doc/manual/installation/changing-config.xml
  39. +8 −4 nixos/doc/manual/installation/installing-from-other-distro.xml
  40. +2 −2 nixos/doc/manual/installation/installing-virtualbox-guest.xml
  41. +38 −36 nixos/doc/manual/installation/installing.xml
  42. +2 −2 nixos/doc/manual/installation/upgrading.xml
  43. +2 −1 nixos/doc/manual/man-configuration.xml
  44. +0 −11 nixos/doc/manual/man-nixos-install.xml
  45. +3 −2 nixos/doc/manual/manual.xml
  46. +4 −4 nixos/doc/manual/options-to-docbook.xsl
  47. +27 −2 nixos/doc/manual/release-notes/rl-1809.xml
  48. +14 −3 nixos/lib/test-driver/Machine.pm
  49. +1 −1 nixos/maintainers/scripts/ec2/create-amis.sh
  50. +39 −39 nixos/modules/i18n/input-method/default.xml
  51. +2 −4 nixos/modules/misc/version.nix
  52. +1 −0 nixos/modules/module-list.nix
  53. +19 −19 nixos/modules/programs/digitalbitbox/doc.xml
  54. +1 −1 nixos/modules/programs/plotinus.xml
  55. +11 −11 nixos/modules/security/acme.xml
  56. +6 −6 nixos/modules/security/hidepid.xml
  57. +6 −6 nixos/modules/services/databases/postgresql.xml
  58. +10 −10 nixos/modules/services/editors/emacs.xml
  59. +29 −30 nixos/modules/services/misc/gitlab.xml
  60. +3 −1 nixos/modules/services/misc/nix-daemon.nix
  61. +6 −6 nixos/modules/services/misc/taskserver/doc.xml
  62. +10 −10 nixos/modules/services/networking/dnscrypt-proxy.xml
  63. +108 −0 nixos/modules/services/web-servers/hitch/default.nix
  64. +1 −1 nixos/modules/services/x11/window-managers/bspwm.nix
  65. +3 −0 nixos/modules/system/boot/networkd.nix
  66. +21 −9 nixos/modules/virtualisation/qemu-vm.nix
  67. +3 −1 nixos/release.nix
  68. +1 −1 nixos/tests/hibernate.nix
  69. +33 −0 nixos/tests/hitch/default.nix
  70. +53 −0 nixos/tests/hitch/example.pem
  71. +1 −0 nixos/tests/hitch/example/index.txt
  72. +28 −0 nixos/tests/osquery.nix
  73. +22 −25 nixos/tests/predictable-interface-names.nix
  74. +3 −2 nixos/tests/udisks2.nix
  75. +2 −2 pkgs/applications/altcoins/go-ethereum.nix
  76. +1 −1 pkgs/applications/audio/gmpc/default.nix
  77. +1 −1 pkgs/applications/audio/mpc123/default.nix
  78. +1 −1 pkgs/applications/audio/mpg321/default.nix
  79. +3 −3 pkgs/applications/editors/android-studio/default.nix
  80. +1 −1 pkgs/applications/editors/emacs-modes/calfw/default.nix
  81. +1 −1 pkgs/applications/editors/emacs-modes/jdee/default.nix
  82. +1 −1 pkgs/applications/editors/texmacs/default.nix
  83. +3 −3 pkgs/applications/editors/tiled/default.nix
  84. +1 −1 pkgs/applications/graphics/digikam/default.nix
  85. +1 −1 pkgs/applications/graphics/dosage/default.nix
  86. +1 −1 pkgs/applications/graphics/geeqie/default.nix
  87. +0 −57 pkgs/applications/graphics/gimp/2.8.nix
  88. +95 −0 pkgs/applications/graphics/gimp/default.nix
  89. +13 −56 pkgs/applications/graphics/gimp/plugins/default.nix
  90. +4 −3 pkgs/applications/graphics/gimp/wrapper.nix
  91. +4 −2 pkgs/applications/graphics/goxel/default.nix
  92. +13 −0 pkgs/applications/graphics/goxel/disable-imgui_ini.patch
  93. +1 −1 pkgs/applications/graphics/ocrad/default.nix
  94. +1 −1 pkgs/applications/graphics/panotools/default.nix
  95. +1 −1 pkgs/applications/graphics/qtpfsgui/default.nix
  96. +3 −3 pkgs/applications/graphics/sane/xsane.nix
  97. +1 −1 pkgs/applications/graphics/scantailor/advanced.nix
  98. +1 −1 pkgs/applications/graphics/scantailor/default.nix
  99. +21 −5 pkgs/applications/graphics/ufraw/default.nix
  100. +1 −1 pkgs/applications/graphics/viewnior/default.nix
  101. +1 −1 pkgs/applications/graphics/xfig/default.nix
  102. +0 −12 pkgs/applications/misc/calibre/no_updates_dialog.patch
  103. +2 −2 pkgs/applications/misc/chirp/default.nix
  104. +2 −2 pkgs/applications/misc/dbeaver/default.nix
  105. +44 −19 pkgs/applications/misc/gcalcli/default.nix
  106. +1 −1 pkgs/applications/misc/gramps/default.nix
  107. +2 −2 pkgs/applications/misc/lilyterm/default.nix
  108. +2 −2 pkgs/applications/misc/mwic/default.nix
  109. +36 −0 pkgs/applications/misc/pdf-quench/default.nix
  110. +8 −9 pkgs/applications/misc/qpdfview/default.nix
  111. +1 −1 pkgs/applications/misc/vit/default.nix
  112. +2 −1 pkgs/applications/networking/browsers/chromium/common.nix
  113. +21 −0 pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch
  114. +1 −1 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  115. +1 −1 pkgs/applications/networking/cluster/kubernetes/default.nix
  116. +1 −1 pkgs/applications/networking/ids/snort/default.nix
  117. +1 −1 pkgs/applications/networking/instant-messengers/bitlbee/default.nix
  118. +1 −1 pkgs/applications/networking/instant-messengers/franz/default.nix
  119. +18 −13 pkgs/applications/networking/instant-messengers/qtox/default.nix
  120. +4 −7 pkgs/applications/networking/instant-messengers/quaternion/default.nix
  121. +10 −8 pkgs/applications/networking/instant-messengers/ratox/default.nix
  122. +0 −5 pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
  123. +2 −2 pkgs/applications/networking/instant-messengers/riot/riot-web.nix
  124. +1 −1 pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
  125. +1 −1 pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
  126. +1 −1 pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
  127. +1 −1 pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
  128. +1 −1 pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
  129. +2 −2 pkgs/applications/networking/instant-messengers/toxic/default.nix
  130. +15 −9 pkgs/applications/networking/instant-messengers/utox/default.nix
  131. +1 −1 pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
  132. +1 −1 pkgs/applications/networking/irc/irssi/default.nix
  133. +2 −2 pkgs/applications/networking/mailreaders/notmuch/default.nix
  134. +1 −1 pkgs/applications/networking/p2p/gnunet/default.nix
  135. +92 −0 pkgs/applications/networking/p2p/gnunet/git.nix
  136. +1 −1 pkgs/applications/networking/p2p/gnunet/svn.nix
  137. +2 −2 pkgs/applications/networking/sync/rclone/default.nix
  138. +1 −1 pkgs/applications/office/gnucash/2.6.nix
  139. +1 −1 pkgs/applications/office/gnucash/default.nix
  140. +1 −1 pkgs/applications/science/machine-learning/torch/torch-distro.nix
  141. +1 −1 pkgs/applications/science/misc/megam/default.nix
  142. +1 −1 pkgs/applications/science/misc/tulip/default.nix
  143. +6 −6 pkgs/applications/video/makemkv/default.nix
  144. +2 −2 pkgs/applications/video/mpv/default.nix
  145. +1 −1 pkgs/applications/video/qstopmotion/default.nix
  146. +5 −7 pkgs/applications/virtualization/qemu/default.nix
  147. +0 −30 pkgs/applications/virtualization/qemu/riscv.nix
  148. +0 −197 pkgs/applications/virtualization/qemu/statfs-flags.patch
  149. +1 −1 pkgs/applications/window-managers/i3/default.nix
  150. +1 −1 pkgs/applications/window-managers/i3/status.nix
  151. +1 −1 pkgs/desktops/gnome-3/core/folks/default.nix
  152. +1 −1 pkgs/desktops/gnome-3/core/gnome-menus/default.nix
  153. +1 −1 pkgs/development/compilers/gprolog/default.nix
  154. +1 −1 pkgs/development/compilers/hhvm/default.nix
  155. +1 −1 pkgs/development/compilers/mit-scheme/default.nix
  156. +4 −1 pkgs/development/coq-modules/autosubst/default.nix
  157. +3 −1 pkgs/development/coq-modules/coquelicot/default.nix
  158. +4 −1 pkgs/development/coq-modules/interval/default.nix
  159. +13 −13 pkgs/development/coq-modules/mathcomp/default.nix
  160. +2 −2 pkgs/development/coq-modules/mathcomp/generic.nix
  161. +13 −13 pkgs/development/coq-modules/ssreflect/default.nix
  162. +2 −2 pkgs/development/coq-modules/ssreflect/generic.nix
  163. +1 −1 pkgs/development/guile-modules/guile-lib/default.nix
  164. +1 −1 pkgs/development/guile-modules/guile-ncurses/default.nix
  165. +1 −1 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
  166. +28 −26 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  167. +631 −693 pkgs/development/haskell-modules/hackage-packages.nix
  168. +1 −1 pkgs/development/libraries/LASzip/default.nix
  169. +2 −2 pkgs/development/libraries/audio/rtaudio/default.nix
  170. +38 −6 pkgs/development/libraries/cddlib/default.nix
  171. +1 −1 pkgs/development/libraries/clutter-gst/default.nix
  172. +1 −1 pkgs/development/libraries/clutter-gtk/default.nix
  173. +1 −1 pkgs/development/libraries/fcppt/default.nix
  174. +3 −0 pkgs/development/libraries/gdk-pixbuf/default.nix
  175. +38 −0 pkgs/development/libraries/gegl/4.0.nix
  176. +3 −1 pkgs/development/libraries/goocanvas/2.x.nix
  177. +5 −3 pkgs/development/libraries/gperftools/default.nix
  178. +4 −3 pkgs/development/libraries/ldb/default.nix
  179. +1 −1 pkgs/development/libraries/libLAS/default.nix
  180. +1 −1 pkgs/development/libraries/libcanberra/default.nix
  181. +1 −1 pkgs/development/libraries/libchamplain/default.nix
  182. +1 −1 pkgs/development/libraries/libchop/default.nix
  183. +1 −1 pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
  184. +1 −1 pkgs/development/libraries/libgpod/default.nix
  185. +1 −1 pkgs/development/libraries/libmsgpack/generic.nix
  186. +1 −1 pkgs/development/libraries/liboil/default.nix
  187. +3 −17 pkgs/development/libraries/libqmatrixclient/default.nix
  188. +10 −3 pkgs/development/libraries/libressl/default.nix
  189. +1 −1 pkgs/development/libraries/libssh2/default.nix
  190. +43 −38 pkgs/development/libraries/libtoxcore/default.nix
  191. +1 −1 pkgs/development/libraries/libxmi/default.nix
  192. +1 −1 pkgs/development/libraries/movit/default.nix
  193. +35 −0 pkgs/development/libraries/mypaint-brushes/default.nix
  194. +2 −0 pkgs/development/libraries/openssl/default.nix
  195. +1 −1 pkgs/development/libraries/tokyo-tyrant/default.nix
  196. +1 −1 pkgs/development/libraries/vcdimager/default.nix
  197. +30 −0 pkgs/development/python-modules/hdbscan/default.nix
  198. +29 −0 pkgs/development/python-modules/jira/default.nix
  199. +36 −0 pkgs/development/python-modules/patsy/default.nix
  200. +64 −0 pkgs/development/python-modules/pymc3/default.nix
  201. +24 −0 pkgs/development/python-modules/rocket-errbot/default.nix
  202. +23 −0 pkgs/development/python-modules/sleekxmpp/default.nix
  203. +55 −0 pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch
  204. +2 −2 pkgs/development/tools/analysis/flow/default.nix
  205. +1 −1 pkgs/development/tools/analysis/include-what-you-use/default.nix
  206. +4 −4 pkgs/development/tools/build-managers/cmake/2.8.nix
  207. +1 −1 pkgs/development/tools/castxml/default.nix
  208. +1 −1 pkgs/development/tools/gauge/default.nix
  209. +3 −3 pkgs/development/tools/gllvm/default.nix
  210. +1 −1 pkgs/development/tools/misc/complexity/default.nix
  211. +1 −1 pkgs/games/assaultcube/default.nix
  212. +2 −2 pkgs/games/extremetuxracer/default.nix
  213. +2 −2 pkgs/games/instead/default.nix
  214. +1 −1 pkgs/games/openmw/default.nix
  215. +46 −0 pkgs/games/tuxpaint/default.nix
  216. +16 −0 pkgs/games/tuxpaint/tuxpaint-completion.diff
  217. +3 −3 pkgs/misc/drivers/hplip/default.nix
  218. +5 −5 pkgs/misc/emulators/dolphin-emu/master.nix
  219. +1 −1 pkgs/misc/emulators/emulationstation/default.nix
  220. +0 −3 pkgs/os-specific/bsd/default.nix
  221. +310 −119 pkgs/os-specific/bsd/netbsd/default.nix
  222. +0 −42 pkgs/os-specific/bsd/openbsd/default.nix
  223. +0 −421 pkgs/os-specific/bsd/openbsd/nc.patch
  224. +11 −6 pkgs/os-specific/darwin/darling/default.nix
  225. +1 −1 pkgs/os-specific/gnu/mig/default.nix
  226. +3 −0 pkgs/os-specific/linux/kernel/hardened-config.nix
  227. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  228. +2 −2 pkgs/os-specific/linux/kernel/linux-4.16.nix
  229. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  230. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  231. +3 −3 pkgs/os-specific/linux/kernel/linux-testing.nix
  232. +2 −2 pkgs/os-specific/linux/pam_u2f/default.nix
  233. +2 −2 pkgs/os-specific/linux/wireguard/default.nix
  234. +1 −1 pkgs/servers/firebird/default.nix
  235. +23 −0 pkgs/servers/hitch/default.nix
  236. +1 −1 pkgs/servers/http/myserver/default.nix
  237. +6 −6 pkgs/servers/monitoring/uchiwa/bower-packages.nix
  238. +2 −2 pkgs/servers/monitoring/uchiwa/src.nix
  239. +2 −2 pkgs/servers/nextcloud/default.nix
  240. +1 −1 pkgs/servers/pies/default.nix
  241. +2 −2 pkgs/servers/xmpp/ejabberd/default.nix
  242. +1 −1 pkgs/tools/X11/xnee/default.nix
  243. +8 −2 pkgs/tools/admin/awscli/default.nix
  244. +2 −2 pkgs/tools/admin/dehydrated/default.nix
  245. +1 −1 pkgs/tools/backup/burp/default.nix
  246. +1 −1 pkgs/tools/filesystems/bindfs/default.nix
  247. +2 −2 pkgs/tools/filesystems/encfs/default.nix
  248. +1 −1 pkgs/tools/filesystems/irods/common.nix
  249. +1 −1 pkgs/tools/filesystems/mtools/default.nix
  250. +2 −2 pkgs/tools/filesystems/sshfs-fuse/default.nix
  251. +3 −1 pkgs/tools/graphics/asymptote/default.nix
  252. +30 −21 pkgs/tools/graphics/gmic/default.nix
  253. +1 −1 pkgs/tools/graphics/logstalgia/default.nix
  254. +1 −1 pkgs/tools/misc/gparted/default.nix
  255. +2 −2 pkgs/tools/misc/grc/default.nix
  256. +1 −1 pkgs/tools/misc/grub/pvgrub_image/default.nix
  257. +1 −1 pkgs/tools/misc/grub/trusted.nix
  258. +1 −1 pkgs/tools/misc/picocom/default.nix
  259. +4 −5 pkgs/tools/misc/sweep-visualizer/default.nix
  260. +34 −0 pkgs/tools/misc/tealdeer/default.nix
  261. +1 −1 pkgs/tools/misc/urjtag/default.nix
  262. +1 −1 pkgs/tools/networking/connect/default.nix
  263. +1 −1 pkgs/tools/networking/easyrsa/2.x.nix
  264. +1 −1 pkgs/tools/networking/easyrsa/default.nix
  265. +1 −1 pkgs/tools/networking/inetutils/default.nix
  266. +1 −1 pkgs/tools/networking/mailutils/default.nix
  267. +2 −2 pkgs/tools/networking/miniupnpd/default.nix
  268. +0 −51 pkgs/tools/networking/netcat-openbsd/default.nix
  269. 0 pkgs/tools/networking/{netcat-gnu → netcat}/default.nix
  270. +12 −2 pkgs/tools/networking/nss-mdns/default.nix
  271. +2 −2 pkgs/tools/networking/openvpn/default.nix
  272. +1 −1 pkgs/tools/networking/p2p/amule/default.nix
  273. +1 −1 pkgs/tools/networking/p2p/seeks/default.nix
  274. +1 −1 pkgs/tools/networking/p2p/tahoe-lafs/default.nix
  275. +10 −6 pkgs/tools/networking/strongswan/default.nix
  276. +1 −1 pkgs/tools/networking/telnet/default.nix
  277. +8 −11 pkgs/tools/networking/toxvpn/default.nix
  278. +1 −1 pkgs/tools/package-management/nix/default.nix
  279. +1 −1 pkgs/tools/security/clamav/default.nix
  280. +1 −1 pkgs/tools/security/gnupg/1.nix
  281. +5 −0 pkgs/tools/security/monkeysphere/default.nix
  282. +1 −1 pkgs/tools/security/mpw/default.nix
  283. +21 −11 pkgs/tools/security/notary/default.nix
  284. +15 −0 pkgs/tools/security/notary/no-git-usage.patch
  285. +1 −2 pkgs/tools/security/pcsc-scm-scl011/default.nix
  286. +1 −1 pkgs/tools/security/pius/default.nix
  287. +1 −1 pkgs/tools/system/freeipmi/default.nix
  288. +1 −1 pkgs/tools/system/osquery/default.nix
  289. +24 −0 pkgs/tools/system/psstop/default.nix
  290. +3 −3 pkgs/tools/text/highlight/default.nix
  291. +1 −1 pkgs/tools/text/namazu/default.nix
  292. +1 −1 pkgs/tools/text/numdiff/default.nix
  293. +2 −2 pkgs/tools/text/xml/html-xml-utils/default.nix
  294. +28 −0 pkgs/tools/text/xml/xmlformat/default.nix
  295. +1 −1 pkgs/tools/video/dvgrab/default.nix
  296. +1 −0 pkgs/top-level/aliases.nix
  297. +33 −16 pkgs/top-level/all-packages.nix
  298. +8 −27 pkgs/top-level/python-packages.nix
8 changes: 2 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ charset = utf-8

# see https://nixos.org/nixpkgs/manual/#chap-conventions

# Match nix/ruby files, set indent to spaces with width of two
[*.{nix,rb}]
# Match nix/ruby/docbook files, set indent to spaces with width of two
[*.{nix,rb,xml}]
indent_style = space
indent_size = 2

@@ -26,7 +26,3 @@ indent_size = 4
# Match diffs, avoid to trim trailing whitespace
[*.{diff,patch}]
trim_trailing_whitespace = false

# https://github.com/NixOS/nixpkgs/pull/39336#discussion_r183387754
[.version]
insert_final_newline = false
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.09
18.09
2 changes: 1 addition & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ manual-full.xml: ${MD_TARGETS} .version *.xml

.version:
nix-instantiate --eval \
-E '(import ../lib).nixpkgsVersion' > .version
-E '(import ../lib).version' > .version

%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
2 changes: 1 addition & 1 deletion doc/default.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ pkgs.stdenv.mkDerivation {
];

postPatch = ''
echo ${lib.nixpkgsVersion} > .version
echo ${lib.version} > .version
'';

installPhase = ''
2 changes: 1 addition & 1 deletion lib/default.nix
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ let
replaceStrings seq stringLength sub substring tail;
inherit (trivial) id const concat or and boolToString mergeAttrs
flip mapNullable inNixShell min max importJSON warn info
nixpkgsVersion mod compare splitByAndCompare
nixpkgsVersion version mod compare splitByAndCompare
functionArgs setFunctionArgs isFunction;

inherit (fixedPoints) fix fix' extends composeExtensions
32 changes: 26 additions & 6 deletions lib/systems/examples.nix
Original file line number Diff line number Diff line change
@@ -88,16 +88,36 @@ rec {
#

iphone64 = {
config = "aarch64-apple-darwin14";
arch = "arm64";
libc = "libSystem";
config = "aarch64-apple-ios";
# config = "aarch64-apple-darwin14";
sdkVer = "10.2";
useiOSPrebuilt = true;
platform = {};
};

iphone32 = {
config = "arm-apple-darwin10";
arch = "armv7-a";
libc = "libSystem";
config = "armv7-apple-ios";
# config = "arm-apple-darwin10";
sdkVer = "10.2";
useiOSPrebuilt = true;
platform = {};
};

iphone64-simulator = {
config = "x86_64-apple-ios";
# config = "x86_64-apple-darwin14";
sdkVer = "10.2";
useiOSPrebuilt = true;
isiPhoneSimulator = true;
platform = {};
};

iphone32-simulator = {
config = "i686-apple-ios";
# config = "i386-apple-darwin11";
sdkVer = "10.2";
useiOSPrebuilt = true;
isiPhoneSimulator = true;
platform = {};
};

2 changes: 1 addition & 1 deletion lib/systems/inspect.nix
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ rec {
isEfi = map (family: { cpu.family = family; })
[ "x86" "arm" "aarch64" ];

# Deprecated
# Deprecated after 18.03
isArm = isAarch32;
};

11 changes: 7 additions & 4 deletions lib/trivial.nix
Original file line number Diff line number Diff line change
@@ -58,11 +58,14 @@ rec {

inherit (lib.strings) fileContents;

release = fileContents ../.version;
versionSuffix = let suffixFile = ../.version-suffix; in
if pathExists suffixFile then fileContents suffixFile else "pre-git";

# Return the Nixpkgs version number.
nixpkgsVersion =
let suffixFile = ../.version-suffix; in
fileContents ../.version
+ (if pathExists suffixFile then fileContents suffixFile else "pre-git");
version = release + versionSuffix;

nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;

# Whether we're being called by nix-shell.
inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -1760,6 +1760,11 @@
github = "tftio";
name = "James Felix Black";
};
jflanglois = {
email = "yourstruly@julienlanglois.me";
github = "jflanglois";
name = "Julien Langlois";
};
jfrankenau = {
email = "johannes@frankenau.net";
github = "jfrankenau";
8 changes: 8 additions & 0 deletions nixos/doc/manual/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
debug:
nix-shell --packages xmloscopy \
--run 'xmloscopy --docbook5 ./manual.xml ./manual-combined.xml'

generated: ./options-to-docbook.xsl
nix-build ../../release.nix \
--attr manualGeneratedSources.x86_64-linux \
--out-link ./generated
4 changes: 2 additions & 2 deletions nixos/doc/manual/administration/cleaning-store.xml
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ this unit automatically at certain points in time, for instance, every
night at 03:15:

<programlisting>
nix.gc.automatic = true;
nix.gc.dates = "03:15";
<xref linkend="opt-nix.gc.automatic"/> = true;
<xref linkend="opt-nix.gc.dates"/> = "03:15";
</programlisting>

</para>
6 changes: 3 additions & 3 deletions nixos/doc/manual/administration/container-networking.xml
Original file line number Diff line number Diff line change
@@ -39,9 +39,9 @@ IP address. This can be accomplished using the following configuration
on the host:

<programlisting>
networking.nat.enable = true;
networking.nat.internalInterfaces = ["ve-+"];
networking.nat.externalInterface = "eth0";
<xref linkend="opt-networking.nat.enable"/> = true;
<xref linkend="opt-networking.nat.internalInterfaces"/> = ["ve-+"];
<xref linkend="opt-networking.nat.externalInterface"/> = "eth0";
</programlisting>
where <literal>eth0</literal> should be replaced with the desired
external interface. Note that <literal>ve-+</literal> is a wildcard
4 changes: 2 additions & 2 deletions nixos/doc/manual/administration/control-groups.xml
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s
CPU share in <filename>configuration.nix</filename>:

<programlisting>
systemd.services.httpd.serviceConfig.CPUShares = 512;
<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.CPUShares = 512;
</programlisting>

By default, every cgroup has 1024 CPU shares, so this will halve the
@@ -61,7 +61,7 @@ available memory. Per-cgroup memory limits can be specified in
<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):

<programlisting>
systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.MemoryLimit = "512M";
</programlisting>

</para>
14 changes: 7 additions & 7 deletions nixos/doc/manual/administration/declarative-containers.xml
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@ following specifies that there shall be a container named
containers.database =
{ config =
{ config, pkgs, ... }:
{ services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql96;
{ <xref linkend="opt-services.postgresql.enable"/> = true;
<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql96;
};
};
</programlisting>
@@ -33,11 +33,11 @@ ports. However, they cannot change the network configuration. You can
give a container its own network as follows:

<programlisting>
containers.database =
{ privateNetwork = true;
hostAddress = "192.168.100.10";
localAddress = "192.168.100.11";
};
containers.database = {
<link linkend="opt-containers._name_.privateNetwork">privateNetwork</link> = true;
<link linkend="opt-containers._name_.hostAddress">hostAddress</link> = "192.168.100.10";
<link linkend="opt-containers._name_.localAddress">localAddress</link> = "192.168.100.11";
};
</programlisting>

This gives the container a private virtual Ethernet interface with IP
10 changes: 5 additions & 5 deletions nixos/doc/manual/administration/imperative-containers.xml
Original file line number Diff line number Diff line change
@@ -30,8 +30,8 @@ line. For instance, to create a container that has

<screen>
# nixos-container create foo --config '
services.openssh.enable = true;
users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];
<xref linkend="opt-services.openssh.enable"/> = true;
<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
'
</screen>

@@ -100,9 +100,9 @@ specify a new configuration on the command line:

<screen>
# nixos-container update foo --config '
services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ];
<xref linkend="opt-services.httpd.enable"/> = true;
<xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
<xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
'

# curl http://$(nixos-container show-ip foo)/
12 changes: 6 additions & 6 deletions nixos/doc/manual/configuration/abstractions.xml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ to abstract. Take, for instance, this Apache HTTP Server configuration:

<programlisting>
{
services.httpd.virtualHosts =
<xref linkend="opt-services.httpd.virtualHosts"/> =
[ { hostName = "example.org";
documentRoot = "/webroot";
adminAddr = "alice@example.org";
@@ -43,7 +43,7 @@ let
};
in
{
services.httpd.virtualHosts =
<xref linkend="opt-services.httpd.virtualHosts"/> =
[ exampleOrgCommon
(exampleOrgCommon // {
enableSSL = true;
@@ -66,7 +66,7 @@ allowed. Thus, you also could have written:

<programlisting>
{
services.httpd.virtualHosts =
<xref linkend="opt-services.httpd.virtualHosts"/> =
let exampleOrgCommon = <replaceable>...</replaceable>; in
[ exampleOrgCommon
(exampleOrgCommon // { <replaceable>...</replaceable> })
@@ -86,7 +86,7 @@ the host name. This can be done as follows:

<programlisting>
{
services.httpd.virtualHosts =
<xref linkend="opt-services.httpd.virtualHosts"/> =
let
makeVirtualHost = name:
{ hostName = name;
@@ -113,7 +113,7 @@ element in a list:

<programlisting>
{
services.httpd.virtualHosts =
<xref linkend="opt-services.httpd.virtualHosts"/> =
let
makeVirtualHost = <replaceable>...</replaceable>;
in map makeVirtualHost
@@ -132,7 +132,7 @@ function that takes a <emphasis>set</emphasis> as its argument, like this:

<programlisting>
{
services.httpd.virtualHosts =
<xref linkend="opt-services.httpd.virtualHosts"/> =
let
makeVirtualHost = { name, root }:
{ hostName = name;
4 changes: 2 additions & 2 deletions nixos/doc/manual/configuration/ad-hoc-network-config.xml
Original file line number Diff line number Diff line change
@@ -6,14 +6,14 @@

<title>Ad-Hoc Configuration</title>

<para>You can use <option>networking.localCommands</option> to specify
<para>You can use <xref linkend="opt-networking.localCommands"/> to specify
shell commands to be run at the end of
<literal>network-setup.service</literal>. This is useful for doing
network configuration not covered by the existing NixOS modules. For
instance, to statically configure an IPv6 address:

<programlisting>
networking.localCommands =
<xref linkend="opt-networking.localCommands"/> =
''
ip -6 addr add 2001:610:685:1::1/64 dev eth0
'';
6 changes: 3 additions & 3 deletions nixos/doc/manual/configuration/adding-custom-packages.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ manual. Finally, you add it to
<literal>environment.systemPackages</literal>, e.g.

<programlisting>
environment.systemPackages = [ pkgs.my-package ];
<xref linkend="opt-environment.systemPackages"/> = [ pkgs.my-package ];
</programlisting>

and you run <command>nixos-rebuild</command>, specifying your own
@@ -41,7 +41,7 @@ Nixpkgs tree. For instance, here is how you specify a build of the
package directly in <filename>configuration.nix</filename>:

<programlisting>
environment.systemPackages =
<xref linkend="opt-environment.systemPackages"/> =
let
my-hello = with pkgs; stdenv.mkDerivation rec {
name = "hello-2.8";
@@ -57,7 +57,7 @@ environment.systemPackages =
Of course, you can also move the definition of
<literal>my-hello</literal> into a separate Nix expression, e.g.
<programlisting>
environment.systemPackages = [ (import ./my-hello.nix) ];
<xref linkend="opt-environment.systemPackages"/> = [ (import ./my-hello.nix) ];
</programlisting>
where <filename>my-hello.nix</filename> contains:
<programlisting>
Loading