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: 42f0be81ae05
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: 1459b34afa99
Choose a head ref

Commits on Dec 10, 2019

  1. Copy the full SHA
    5d21e8c View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    aca9ffe View commit details
  3. Copy the full SHA
    e8daa1e View commit details
  4. nixos/xserver: introduce attr display to xserver.drivers

    Specifically for NVIDIA so that only the device section would be created
    eadwu committed Dec 10, 2019
    Copy the full SHA
    632a8a7 View commit details
  5. Copy the full SHA
    026b601 View commit details
  6. nvidia_x11: fix *nvidia*.so* references

    gnidorah authored and eadwu committed Dec 10, 2019
    Copy the full SHA
    d48ed3b View commit details
  7. nvidia_x11: include libdrm in rpath

    Needed for PRIME render offload specifically
    eadwu committed Dec 10, 2019
    Copy the full SHA
    3b38766 View commit details

Commits on Dec 31, 2019

  1. Copy the full SHA
    a15efd8 View commit details

Commits on Jan 9, 2020

  1. Copy the full SHA
    27b8253 View commit details

Commits on Feb 8, 2020

  1. nixos/stage-1: fix predictable interfaces names

    This makes predictable interfaces names available as soon as possible
    with udev by adding the default network link units to initrd which are read
    by udev. Also adds some udev rules that are needed but which would normally
    loaded from the udev store path which is not included in the initrd.
    fpletz committed Feb 8, 2020
    Copy the full SHA
    44e289f View commit details
  2. nixos/initrd-network: flush interfaces before stage 2

    Depending on the network management backend being used, if the interface
    configuration in stage 1 is not cleared, there might still be some old
    addresses or routes from stage 1 present in stage 2 after network
    configuration has finished.
    fpletz committed Feb 8, 2020
    Copy the full SHA
    ea7d024 View commit details
  3. klibc: 2.0.4 -> 2.0.7

    fpletz committed Feb 8, 2020
    Copy the full SHA
    4ba8086 View commit details
  4. nixos/initrd-network: use ipconfig from klibc

    This apparently has features that the version from Arch's
    mkinitcpio-nfs-utils does not have. Fixes #75314.
    fpletz committed Feb 8, 2020
    Copy the full SHA
    d25c1a8 View commit details
  5. nixos/initrd-network: always run postCommands

    As outlined in #71447, postCommands should always be run if networking
    in initrd is enabled. regardless if the configuration actually
    succeeded.
    fpletz committed Feb 8, 2020
    Copy the full SHA
    5897899 View commit details

Commits on Feb 13, 2020

  1. poppler: 0.84.0 -> 0.85.0

    r-ryantm committed Feb 13, 2020
    Copy the full SHA
    d4a31f9 View commit details

Commits on Feb 14, 2020

  1. Copy the full SHA
    4e7ea9b View commit details
  2. Copy the full SHA
    d067b4a View commit details
  3. Copy the full SHA
    08d614c View commit details
  4. Copy the full SHA
    3668174 View commit details
  5. Copy the full SHA
    bfdb8f9 View commit details
  6. Copy the full SHA
    c25e180 View commit details

Commits on Feb 16, 2020

  1. cppunit: 1.15.0 -> 1.15.1

    r-ryantm authored and FRidh committed Feb 16, 2020
    Copy the full SHA
    e533111 View commit details
  2. libcdr: 0.1.5 -> 0.1.6

    r-ryantm authored and FRidh committed Feb 16, 2020
    Copy the full SHA
    c46b840 View commit details
  3. libbytesize: 2.1 -> 2.2

    r-ryantm authored and FRidh committed Feb 16, 2020
    Copy the full SHA
    17b46e8 View commit details

Commits on Feb 17, 2020

  1. haskell generic-builder: fix Darwin regression for lmdb

    Recent updates to the generic builder have caused haskellPackages.lmdb-simple to
    fail to build on Darwin, since it cannot see the lmdb C dynamic library included
    by its dependent haskellPackages.lmdb.
    
    The C dynamic library has suffix `.so` not `.dylib`, so this fix allows for
    that.
    
    Closes #80190, but that issue may identify a preferable solution.
    simonchatts authored and infinisil committed Feb 17, 2020
    Copy the full SHA
    019e86f View commit details
  2. Merge pull request #80337 from Infinisil/lmdb

    haskell generic-builder: fix Darwin regression for lmdb
    infinisil authored Feb 17, 2020
    Copy the full SHA
    2de0724 View commit details

Commits on Feb 18, 2020

  1. Merge pull request #80328 from marsam/update-postgresql

    postgresql: 9.5.20 -> 9.5.21, 9.6.16 -> 9.6.17, 10.11 -> 10.12, 11.6 -> 11.7, 12.1 -> 12.2
    danbst authored Feb 18, 2020
    Copy the full SHA
    036c524 View commit details
  2. nettle: runtime selection of HW-accelerated code

    > Include multiple versions of certain functions in the library,
    > and select the ones to use at run-time, depending on available
    > processor features. Supported for ARM and x86_64.
    
    The current version seems to accelerate AES and SHA families.
    
    Size increase on x86_64 is <10k in our case.
    
    It can make quite some performance difference; I tried
    $ time ./result-dev/bin/nettle-hash -a sha256 /some/file/around/2G
    And the total CPU time went down from 8.5s to 2s (single thread).
    Now it matches the time of openssl
    $ time openssl sha256 /some/file/around/2G
    Of course, in real life it will be much harder to notice a difference...
    
    Platforms without support for this (e.g. i686) seem to still build fine,
    and ARMv7 cross-build also succeeds for me, so hopefully all is OK.
    vcunat committed Feb 18, 2020
    Copy the full SHA
    03d6912 View commit details
  3. Merge staging-next into staging

    FRidh committed Feb 18, 2020
    Copy the full SHA
    1733127 View commit details

Commits on Feb 19, 2020

  1. bluez: 5.52 -> 5.53

    bhipple authored and Jon committed Feb 19, 2020
    Copy the full SHA
    0030d39 View commit details
  2. Revert "postgresql: build < 9.5 with openssl 1.0.2" (#80481)

    This reverts commit 2d6f0cb.
    
    postgresql versions < 9.5 have been removed from nixpkgs.
    zowoq authored Feb 19, 2020
    Copy the full SHA
    711617f View commit details
  3. Merge master into staging-next

    FRidh committed Feb 19, 2020
    Copy the full SHA
    e149ee7 View commit details
  4. Merge staging-next into staging

    FRidh committed Feb 19, 2020
    Copy the full SHA
    b1cca61 View commit details
  5. Copy the full SHA
    4f97819 View commit details
  6. Copy the full SHA
    20dd176 View commit details
  7. Merge pull request #80519 from r-ryantm/auto-update/nixpkgs-review

    nixpkgs-review: 2.1.1 -> 2.2.0
    Ma27 authored Feb 19, 2020
    Copy the full SHA
    64e356a View commit details
  8. qt5.qtbase: backport cmake macro fix

    Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD
    build failure when building with qt-5.12.7.
    
    https://bugreports.qt.io/browse/QTBUG-81715
    mmilata committed Feb 19, 2020
    Copy the full SHA
    80650ae View commit details

Commits on Feb 20, 2020

  1. Copy the full SHA
    42351ff View commit details
  2. Copy the full SHA
    504f8bf View commit details
  3. Copy the full SHA
    1b24c1a View commit details
  4. folks: 0.13.1 -> 0.13.2

    worldofpeace committed Feb 20, 2020
    Copy the full SHA
    fede9f6 View commit details
  5. gjs: 1.58.4 -> 1.58.5

    worldofpeace committed Feb 20, 2020
    Copy the full SHA
    df2d5fb View commit details
  6. gptfdisk: 1.0.4 -> 1.0.5

    r-ryantm committed Feb 20, 2020
    Copy the full SHA
    b4f0854 View commit details
  7. python: execute pythonImportsCheckPhase in subshell

    Execute in subshell so that the cwd returns back
    to the original directory. This is important as
    it enables pythonImportsCheck to work with checkPhase
    Jonathan Ringer committed Feb 20, 2020
    Copy the full SHA
    cd97c05 View commit details
  8. perl: Enable threading on darwin

    Perl on darwin (and any other sane platform) has a pretty good threading
    support, enable it.
    
    As it turns out, we were building non-multithreaded perl on all systems,
    since glibc was not part of the stdenv anymore:
    
        nix-repl> pkgs = import <nixpkgs> {}
    
        nix-repl> pkgs.stdenv ? glibc
        false
    
    meaning that the comments were incorrect. Thus, clear up the confusion
    and remove the misleading comments, while enabling multithreading by
    default. The builds will fail on unsupported platforms, and in this case
    the only place is the bootstrap, where we already force
    non-multithreaded perl.
    
    As a consequence of the above, this change will cause the full rebuild
    of stdenv on all platforms, including linux.
    knl authored and FRidh committed Feb 20, 2020
    Copy the full SHA
    6d8539c View commit details
  9. Copy the full SHA
    bb73acd View commit details
  10. blackmagic: add libusb, pkgconfig. expose pc-* (hosted) targets

    Add myself to maintainers and change meta.platforms to platforms.linux
    due to build failures on Darwin.
    sorki committed Feb 20, 2020
    Copy the full SHA
    87057d9 View commit details
  11. Copy the full SHA
    d7ceb17 View commit details
  12. Merge pull request #80597 from r-ryantm/auto-update/gptfdisk

    gptfdisk: 1.0.4 -> 1.0.5
    marsam authored Feb 20, 2020
    Copy the full SHA
    df4d126 View commit details
  13. riot-desktop: 1.5.9 -> 1.5.10

    Synching with the riot-web update (commit da45483).
    pacien committed Feb 20, 2020
    Copy the full SHA
    5091da0 View commit details
Showing with 10,462 additions and 8,267 deletions.
  1. +2 −2 doc/Makefile
  2. +10 −0 maintainers/maintainer-list.nix
  3. +0 −1 nixos/doc/manual/configuration/xfce.xml
  4. +19 −0 nixos/doc/manual/release-notes/rl-2003.xml
  5. +1 −1 nixos/modules/hardware/video/amdgpu-pro.nix
  6. +1 −1 nixos/modules/hardware/video/ati.nix
  7. +86 −52 nixos/modules/hardware/video/nvidia.nix
  8. +2 −0 nixos/modules/module-list.nix
  9. +42 −6 nixos/modules/security/acme.nix
  10. +7 −0 nixos/modules/security/rngd.nix
  11. +8 −0 nixos/modules/services/mail/mailman.nix
  12. +14 −1 nixos/modules/services/misc/home-assistant.nix
  13. +12 −1 nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
  14. +2 −2 nixos/modules/services/networking/git-daemon.nix
  15. +75 −0 nixos/modules/services/networking/nix-store-gcs-proxy.nix
  16. +2 −7 nixos/modules/services/networking/sslh.nix
  17. +10 −0 nixos/modules/services/networking/zerotierone.nix
  18. +99 −0 nixos/modules/services/wayland/cage.nix
  19. +4 −1 nixos/modules/services/x11/desktop-managers/pantheon.nix
  20. +130 −0 nixos/modules/services/x11/desktop-managers/pantheon.xml
  21. +39 −37 nixos/modules/services/x11/xserver.nix
  22. +37 −27 nixos/modules/system/boot/initrd-network.nix
  23. +4 −2 nixos/modules/system/boot/stage-1-init.sh
  24. +13 −2 nixos/modules/system/boot/stage-1.nix
  25. +20 −8 nixos/modules/testing/service-runner.nix
  26. +3 −0 nixos/tests/all-tests.nix
  27. +43 −0 nixos/tests/cage.nix
  28. +64 −0 nixos/tests/gitdaemon.nix
  29. +13 −2 nixos/tests/initrd-network.nix
  30. +1 −1 nixos/tests/opensmtpd.nix
  31. +6 −0 nixos/tests/predictable-interface-names.nix
  32. +1 −1 nixos/tests/prometheus-exporters.nix
  33. +14 −16 nixos/tests/rsyslogd.nix
  34. +36 −0 nixos/tests/service-runner.nix
  35. +2 −9 pkgs/applications/audio/deadbeef/default.nix
  36. +3 −3 pkgs/applications/audio/dragonfly-reverb/default.nix
  37. +2 −2 pkgs/applications/audio/lmms/default.nix
  38. +2 −2 pkgs/applications/audio/sunvox/default.nix
  39. +3 −3 pkgs/applications/editors/ed/default.nix
  40. +92 −77 pkgs/applications/editors/emacs-modes/elpa-generated.nix
  41. +3,977 −2,918 pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
  42. +1 −1 pkgs/applications/editors/texmacs/darwin.nix
  43. +2 −2 pkgs/applications/graphics/ideogram/default.nix
  44. +49 −0 pkgs/applications/graphics/qimgv/default.nix
  45. +8 −6 pkgs/applications/misc/blender/default.nix
  46. +33 −0 pkgs/applications/misc/dmenu/wayland.nix
  47. +25 −8 pkgs/applications/misc/iterm2/default.nix
  48. +3 −3 pkgs/applications/misc/latte-dock/default.nix
  49. +3 −3 pkgs/applications/misc/pastel/default.nix
  50. +1 −1 pkgs/applications/misc/timewarrior/default.nix
  51. +2 −2 pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
  52. +2 −2 pkgs/applications/networking/flexget/default.nix
  53. +1 −1 pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
  54. +2 −2 pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
  55. +2 −2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  56. +3 −3 pkgs/applications/office/aesop/default.nix
  57. +24 −0 pkgs/applications/radio/pyradio/default.nix
  58. +5 −4 pkgs/applications/science/biology/truvari/default.nix
  59. +2 −2 pkgs/applications/science/chemistry/marvin/default.nix
  60. +2 −2 pkgs/applications/science/chemistry/octopus/default.nix
  61. +3 −3 pkgs/applications/science/chemistry/quantum-espresso/default.nix
  62. +1 −1 pkgs/applications/science/electronics/fped/default.nix
  63. +17 −7 pkgs/applications/science/logic/monosat/default.nix
  64. +2 −2 pkgs/applications/version-management/git-and-tools/git-machete/default.nix
  65. +0 −2 pkgs/applications/version-management/git-and-tools/git/default.nix
  66. +6 −6 pkgs/applications/version-management/gitlab/data.json
  67. +2 −2 pkgs/applications/version-management/gitlab/gitaly/Gemfile
  68. +24 −22 pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
  69. +16 −5 pkgs/applications/version-management/gitlab/gitaly/default.nix
  70. +4 −4 pkgs/applications/version-management/gitlab/gitaly/deps.nix
  71. +41 −27 pkgs/applications/version-management/gitlab/gitaly/gemset.nix
  72. +1 −1 pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
  73. +2 −2 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
  74. +20 −14 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
  75. +100 −78 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
  76. +123 −90 pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
  77. +512 −448 pkgs/applications/version-management/gitlab/yarnPkgs.nix
  78. +21 −0 pkgs/applications/video/plex-mpv-shim/default.nix
  79. +11 −8 pkgs/applications/video/wf-recorder/default.nix
  80. +10 −27 pkgs/applications/virtualization/docker-slim/default.nix
  81. +1 −1 pkgs/applications/virtualization/gvisor/default.nix
  82. +15 −0 pkgs/build-support/build-bazel-package/default.nix
  83. +15 −16 pkgs/data/fonts/recursive/default.nix
  84. +2 −2 pkgs/data/themes/matcha/default.nix
  85. +2 −2 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
  86. +3 −3 pkgs/desktops/gnome-3/extensions/appindicator/default.nix
  87. 0 pkgs/desktops/gnome-3/extensions/{impatience.nix → impatience/default.nix}
  88. +0 −34 pkgs/desktops/gnome-3/extensions/volume-mixer.nix
  89. +8 −6 pkgs/desktops/mate/mate-backgrounds/default.nix
  90. +2 −2 pkgs/desktops/pantheon/apps/elementary-code/default.nix
  91. +2 −2 pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
  92. +1 −1 pkgs/desktops/xfce/default.nix
  93. +2 −2 pkgs/development/compilers/chicken/5/chicken.nix
  94. +2 −2 pkgs/development/compilers/chicken/5/eggDerivation.nix
  95. +3 −3 pkgs/development/compilers/chicken/5/eggs.nix
  96. +2 −2 pkgs/development/compilers/chicken/5/setup-hook.sh
  97. +245 −0 pkgs/development/compilers/go/1.14.nix
  98. +34 −0 pkgs/development/compilers/go/remove-test-pie-1.14.patch
  99. +15 −0 pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch
  100. +15 −0 pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch
  101. +58 −0 pkgs/development/compilers/llvm/5/compiler-rt-sys-ustat.patch
  102. +2 −1 pkgs/development/compilers/llvm/5/compiler-rt.nix
  103. +2 −2 pkgs/development/compilers/ocaml/4.10.nix
  104. +34 −0 pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch
  105. +3 −1 pkgs/development/compilers/polyml/5.7.nix
  106. +10 −2 pkgs/development/compilers/polyml/default.nix
  107. +7 −2 pkgs/development/coq-modules/coq-elpi/default.nix
  108. +1 −1 pkgs/development/haskell-modules/generic-builder.nix
  109. +4 −4 pkgs/development/haskell-modules/make-package-set.nix
  110. +13 −1 pkgs/development/interpreters/icon-lang/default.nix
  111. +1 −13 pkgs/development/interpreters/perl/default.nix
  112. +1 −1 pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
  113. +0 −2,282 pkgs/development/interpreters/wasmtime/cargo-lock.patch
  114. +5 −8 pkgs/development/interpreters/wasmtime/default.nix
  115. +2 −2 pkgs/development/libraries/cppunit/default.nix
  116. +18 −7 pkgs/development/libraries/folks/default.nix
  117. +2 −2 pkgs/development/libraries/gjs/default.nix
  118. +2 −2 pkgs/development/libraries/glib/default.nix
  119. +11 −11 pkgs/development/libraries/glib/split-dev-programs.patch
  120. +2 −13 pkgs/development/libraries/gom/default.nix
  121. +2 −2 pkgs/development/libraries/grilo-plugins/default.nix
  122. +2 −2 pkgs/development/libraries/grilo/default.nix
  123. +7 −4 pkgs/development/libraries/gsasl/default.nix
  124. +2 −5 pkgs/development/libraries/gtk/3.x.nix
  125. +0 −56 pkgs/development/libraries/gtk/patches/missing-header.patch
  126. +2 −2 pkgs/development/libraries/kerberos/krb5.nix
  127. +3 −3 pkgs/development/libraries/libamqpcpp/default.nix
  128. +2 −2 pkgs/development/libraries/libbytesize/default.nix
  129. +2 −2 pkgs/development/libraries/libcdr/default.nix
  130. +3 −5 pkgs/development/libraries/libgdata/default.nix
  131. +2 −2 pkgs/development/libraries/libgpod/default.nix
  132. +2 −2 pkgs/development/libraries/libinput/default.nix
  133. +3 −3 pkgs/development/libraries/libmypaint/default.nix
  134. +2 −6 pkgs/development/libraries/libpeas/default.nix
  135. +0 −22 pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
  136. +3 −3 pkgs/development/libraries/libqmi/default.nix
  137. +2 −10 pkgs/development/libraries/libsecret/default.nix
  138. +2 −0 pkgs/development/libraries/nettle/generic.nix
  139. +2 −2 pkgs/development/libraries/p11-kit/default.nix
  140. +2 −2 pkgs/development/libraries/pcre/default.nix
  141. +2 −2 pkgs/development/libraries/poppler/default.nix
  142. +7 −0 pkgs/development/libraries/qt-5/5.12/default.nix
  143. +1 −1 pkgs/development/libraries/tdlib/default.nix
  144. +2 −2 pkgs/development/libraries/tracker-miners/default.nix
  145. +2 −2 pkgs/development/libraries/tracker/default.nix
  146. +2 −2 pkgs/development/libraries/vte/default.nix
  147. +17 −0 pkgs/development/mobile/androidenv/generated/packages.nix
  148. +2 −1 pkgs/development/mobile/titaniumenv/default.nix
  149. +97 −0 pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
  150. +5 −5 pkgs/development/ocaml-modules/eigen/default.nix
  151. +2 −2 pkgs/development/ocaml-modules/elpi/default.nix
  152. +5 −2 pkgs/development/ocaml-modules/ocamlnet/default.nix
  153. +4 −4 pkgs/development/ocaml-modules/owl-base/default.nix
  154. +16 −4 pkgs/development/ocaml-modules/owl/default.nix
  155. +3 −3 pkgs/development/ocaml-modules/phylogenetics/default.nix
  156. +3 −3 pkgs/development/python-modules/asdf/default.nix
  157. +3 −3 pkgs/development/python-modules/authlib/default.nix
  158. +2 −2 pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
  159. +2 −2 pkgs/development/python-modules/bayesian-optimization/default.nix
  160. +6 −6 pkgs/development/python-modules/cocotb/default.nix
  161. +3 −3 pkgs/development/python-modules/dash-core-components/default.nix
  162. +3 −3 pkgs/development/python-modules/dash-renderer/default.nix
  163. +3 −3 pkgs/development/python-modules/dash-table/default.nix
  164. +5 −8 pkgs/development/python-modules/dash/default.nix
  165. +40 −10 pkgs/development/python-modules/digitalocean/default.nix
  166. +1 −1 pkgs/development/python-modules/dm-sonnet/default.nix
  167. +2 −2 pkgs/development/python-modules/hass-nabucasa/default.nix
  168. +3 −3 pkgs/development/python-modules/identify/default.nix
  169. +8 −2 pkgs/development/python-modules/importlib-metadata/default.nix
  170. +3 −3 pkgs/development/python-modules/ipdb/default.nix
  171. +13 −3 pkgs/development/python-modules/ipykernel/default.nix
  172. +21 −0 pkgs/development/python-modules/jsonpath/default.nix
  173. +3 −3 pkgs/development/python-modules/jupytext/default.nix
  174. +3 −3 pkgs/development/python-modules/localzone/default.nix
  175. +3 −3 pkgs/development/python-modules/phonenumbers/default.nix
  176. +3 −4 pkgs/development/python-modules/poetry/default.nix
  177. +38 −0 pkgs/development/python-modules/pushover-complete/default.nix
  178. +4 −2 pkgs/development/python-modules/pyicloud/default.nix
  179. +29 −0 pkgs/development/python-modules/python-mpv-jsonipc/default.nix
  180. +27 −0 pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix
  181. +3 −4 pkgs/development/python-modules/tensorflow-estimator/default.nix
  182. +1 −1 pkgs/development/python-modules/tensorflow-probability/default.nix
  183. +5 −3 pkgs/development/python-modules/tensorflow-tensorboard/default.nix
  184. +82 −24 pkgs/development/python-modules/tensorflow/bin.nix
  185. +37 −29 pkgs/development/python-modules/tensorflow/binary-hashes.nix
  186. +14 −6 pkgs/development/python-modules/tensorflow/default.nix
  187. +36 −25 pkgs/development/python-modules/tensorflow/prefetcher.sh
  188. +3 −3 pkgs/development/python-modules/tomlkit/default.nix
  189. +16 −2 pkgs/development/ruby-modules/bundled-common/default.nix
  190. +36 −21 pkgs/development/ruby-modules/bundler-env/default.nix
  191. +2 −2 pkgs/development/tools/aws-sam-cli/default.nix
  192. +1 −1 pkgs/development/tools/bazel-watcher/default.nix
  193. +5 −5 pkgs/development/tools/build-managers/bazel/{ → bazel-latest}/default.nix
  194. 0 pkgs/development/tools/build-managers/bazel/{ → bazel-latest}/src-deps.json
  195. +1 −1 pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
  196. +559 −0 pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
  197. +78 −0 pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch
  198. +506 −0 pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json
  199. +2 −2 pkgs/development/tools/continuous-integration/jenkins/default.nix
  200. +3 −3 pkgs/development/tools/database/liquibase/default.nix
  201. +2 −2 pkgs/development/tools/lazygit/default.nix
  202. +1 −1 pkgs/development/tools/literate-programming/noweb/default.nix
  203. +11 −8 pkgs/development/tools/misc/blackmagic/default.nix
  204. +11 −2 pkgs/development/tools/misc/blackmagic/helper.sh
  205. +4 −2 pkgs/development/tools/misc/gdb/debug-info-from-env.patch
  206. +2 −2 pkgs/development/tools/misc/luarocks/default.nix
  207. +6 −1 pkgs/development/tools/ocaml/ocp-build/default.nix
  208. +7 −9 pkgs/development/tools/ocaml/ocp-index/default.nix
  209. +0 −32 pkgs/development/tools/poetry/default.nix
  210. +293 −120 pkgs/development/tools/poetry/poetry.lock
  211. +3 −3 pkgs/development/tools/poetry/pyproject.toml
  212. +2 −2 pkgs/development/tools/poetry/src.json
  213. +57 −56 pkgs/development/tools/poetry2nix/poetry2nix/default.nix
  214. +8 −0 pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
  215. +8 −0 pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh
  216. +4 −0 pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
  217. +33 −0 pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
  218. +19 −7 pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
  219. +108 −7 pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
  220. +5 −5 pkgs/development/tools/yq-go/default.nix
  221. +40 −13 pkgs/games/sgt-puzzles/default.nix
  222. +6 −6 pkgs/misc/emulators/mgba/default.nix
  223. +0 −11 pkgs/misc/vim-plugins/generated.nix
  224. +7 −15 pkgs/misc/vim-plugins/overrides.nix
  225. +0 −1 pkgs/misc/vim-plugins/vim-plugin-names
  226. +2 −2 pkgs/misc/vscode-extensions/python/default.nix
  227. +2 −2 pkgs/misc/vscode-extensions/wakatime/default.nix
  228. +3 −3 pkgs/os-specific/linux/bluez/default.nix
  229. +2 −0 pkgs/os-specific/linux/kernel/common-config.nix
  230. +2 −2 pkgs/os-specific/linux/kernel/linux-testing.nix
  231. +8 −5 pkgs/os-specific/linux/klibc/default.nix
  232. +1 −1 pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
  233. +2 −2 pkgs/os-specific/linux/libcap-ng/default.nix
  234. +7 −0 pkgs/os-specific/linux/nvidia-x11/builder.sh
  235. +1 −1 pkgs/os-specific/linux/nvidia-x11/generic.nix
  236. +3 −3 pkgs/os-specific/linux/smemstat/default.nix
  237. +3 −3 pkgs/os-specific/linux/sysstat/default.nix
  238. +4 −4 pkgs/os-specific/linux/systemd/default.nix
  239. +2 −2 pkgs/servers/clickhouse/default.nix
  240. +2 −2 pkgs/servers/dns/knot-dns/default.nix
  241. +2 −2 pkgs/servers/gortr/default.nix
  242. +911 −905 pkgs/servers/home-assistant/component-packages.nix
  243. +6 −3 pkgs/servers/home-assistant/default.nix
  244. +2 −2 pkgs/servers/home-assistant/frontend.nix
  245. +111 −67 pkgs/servers/home-assistant/parse-requirements.py
  246. +22 −0 pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch
  247. +2 −2 pkgs/servers/monitoring/prometheus/nginx-exporter.nix
  248. +6 −6 pkgs/servers/monitoring/zabbix/versions.nix
  249. +3 −3 pkgs/servers/mpd/default.nix
  250. +2 −2 pkgs/servers/sql/mariadb/connector-c/3_1.nix
  251. +1 −0 pkgs/servers/sql/mariadb/connector-c/default.nix
  252. +2 −3 pkgs/servers/sql/postgresql/default.nix
  253. +3 −3 pkgs/shells/zsh/oh-my-zsh/default.nix
  254. +3 −3 pkgs/tools/admin/aws-google-auth/default.nix
  255. +67 −32 pkgs/tools/graphics/netpbm/default.nix
  256. +40 −0 pkgs/tools/graphics/netpbm/update.sh
  257. +3 −3 pkgs/tools/graphics/pfstools/default.nix
  258. +1 −1 pkgs/tools/graphics/sng/default.nix
  259. +2 −2 pkgs/tools/misc/kepubify/default.nix
  260. +3 −3 pkgs/tools/misc/parallel/default.nix
  261. +41 −19 pkgs/tools/misc/peruse/default.nix
  262. +3 −3 pkgs/tools/misc/plantuml/default.nix
  263. +3 −3 pkgs/tools/misc/starship/default.nix
  264. +2 −2 pkgs/tools/misc/wakatime/default.nix
  265. +2 −7 pkgs/tools/misc/wob/default.nix
  266. +1 −1 pkgs/tools/misc/yad/default.nix
  267. +3 −4 pkgs/tools/misc/youtube-dl/default.nix
  268. +3 −3 pkgs/tools/networking/bandwhich/default.nix
  269. +58 −0 pkgs/tools/networking/httpie/default.nix
  270. +2 −2 pkgs/tools/networking/network-manager/default.nix
  271. +11 −16 pkgs/tools/networking/openssh/default.nix
  272. +2 −2 pkgs/tools/security/keybase/default.nix
  273. +3 −3 pkgs/tools/security/keybase/gui.nix
  274. +2 −2 pkgs/tools/system/gptfdisk/default.nix
  275. +24 −12 pkgs/tools/system/ipmitool/default.nix
  276. +6 −6 pkgs/tools/text/groff/default.nix
  277. +6 −2 pkgs/tools/text/snippetpixie/default.nix
  278. +39 −17 pkgs/top-level/all-packages.nix
  279. +1 −1 pkgs/top-level/ocaml-packages.nix
  280. +10 −3 pkgs/top-level/python-packages.nix
4 changes: 2 additions & 2 deletions doc/Makefile
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ functions/library/generated: doc-support/result
ln -rfs ./doc-support/result/function-docs functions/library/generated

%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
pandoc $^ -w docbook \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
@@ -98,7 +98,7 @@ functions/library/generated: doc-support/result
| cat > $@

%.chapter.xml: %.chapter.md
pandoc $^ -w docbook+smart \
pandoc $^ -w docbook \
--top-level-division=chapter \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -1461,6 +1461,16 @@
githubId = 5684605;
name = "Cole Scott";
};
cole-h = {
name = "Cole Helbling";
email = "cole.e.helbling@outlook.com";
github = "cole-h";
githubId = 28582702;
keys = [{
longkeyid = "rsa4096/0xB37E0F2371016A4C";
fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C";
}];
};
copumpkin = {
email = "pumpkingod@gmail.com";
github = "copumpkin";
1 change: 0 additions & 1 deletion nixos/doc/manual/configuration/xfce.xml
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@
<programlisting>
<xref linkend="opt-services.xserver.desktopManager.xfce.enable" /> = true;
<xref linkend="opt-services.xserver.displayManager.defaultSession" /> = "xfce";
};
</programlisting>
</para>
<para>
19 changes: 19 additions & 0 deletions nixos/doc/manual/release-notes/rl-2003.xml
Original file line number Diff line number Diff line change
@@ -631,6 +631,16 @@ auth required pam_succeed_if.so uid >= 1000 quiet
</citerefentry>-script now uses the python test-driver.
</para>
</listitem>
<listitem>
<para>
The <package>riot-web</package> package now accepts configuration overrides as an attribute set instead of a string.
A formerly used JSON configuration can be converted to an attribute set with <literal>builtins.fromJSON</literal>.
</para>
<para>
The new default configuration also disables automatic guest account registration and analytics to improve privacy.
The previous behavior can be restored by setting <literal>config.riot-web.conf = { disable_guests = false; piwik = true; }</literal>.
</para>
</listitem>
</itemizedlist>
</section>

@@ -693,6 +703,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet
via <option>boot.initrd.luks.fido2Support</option>.
</para>
</listitem>
<listitem>
<para>
Predicatbly named network-interfaces get renamed in stage-1. This means that it's possible
to use the proper interface name for e.g. dropbear-setups.
</para>
<para>
For further reference, please read <link xlink:href="https://github.com/NixOS/nixpkgs/pull/68953">#68953</link> or the corresponding <link xlink:href="https://discourse.nixos.org/t/predictable-network-interface-names-in-initrd/4055">discourse thread</link>.
</para>
</listitem>
</itemizedlist>
</section>
</section>
2 changes: 1 addition & 1 deletion nixos/modules/hardware/video/amdgpu-pro.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ in
nixpkgs.config.xorg.abiCompat = "1.19";

services.xserver.drivers = singleton
{ name = "amdgpu"; modules = [ package ]; };
{ name = "amdgpu"; modules = [ package ]; display = true; };

hardware.opengl.package = package;
hardware.opengl.package32 = package32;
2 changes: 1 addition & 1 deletion nixos/modules/hardware/video/ati.nix
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ in
nixpkgs.config.xorg.abiCompat = "1.17";

services.xserver.drivers = singleton
{ name = "fglrx"; modules = [ ati_x11 ]; };
{ name = "fglrx"; modules = [ ati_x11 ]; display = true; };

hardware.opengl.package = ati_x11;
hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
138 changes: 86 additions & 52 deletions nixos/modules/hardware/video/nvidia.nix
Original file line number Diff line number Diff line change
@@ -34,26 +34,57 @@ let
enabled = nvidia_x11 != null;

cfg = config.hardware.nvidia;
optimusCfg = cfg.optimus_prime;
pCfg = cfg.prime;
syncCfg = pCfg.sync;
offloadCfg = pCfg.offload;
primeEnabled = syncCfg.enable || offloadCfg.enable;
in

{
imports =
[
(mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "enable" ] [ "hardware" "nvidia" "prime" "sync" "enable" ])
(mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ])
(mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "nvidiaBusId" ] [ "hardware" "nvidia" "prime" "nvidiaBusId" ])
(mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "intelBusId" ] [ "hardware" "nvidia" "prime" "intelBusId" ])
];

options = {
hardware.nvidia.modesetting.enable = lib.mkOption {
type = lib.types.bool;
hardware.nvidia.modesetting.enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable kernel modesetting when using the NVIDIA proprietary driver.
Enabling this fixes screen tearing when using Optimus via PRIME (see
<option>hardware.nvidia.optimus_prime.enable</option>. This is not enabled
<option>hardware.nvidia.prime.sync.enable</option>. This is not enabled
by default because it is not officially supported by NVIDIA and would not
work with SLI.
'';
};

hardware.nvidia.optimus_prime.enable = lib.mkOption {
type = lib.types.bool;
hardware.nvidia.prime.nvidiaBusId = mkOption {
type = types.str;
default = "";
example = "PCI:1:0:0";
description = ''
Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci
shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0".
'';
};

hardware.nvidia.prime.intelBusId = mkOption {
type = types.str;
default = "";
example = "PCI:0:2:0";
description = ''
Bus ID of the Intel GPU. You can find it using lspci; for example if lspci
shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0".
'';
};

hardware.nvidia.prime.sync.enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME.
@@ -66,8 +97,8 @@ in
be the only driver there.
If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be
specified (<option>hardware.nvidia.optimus_prime.nvidiaBusId</option> and
<option>hardware.nvidia.optimus_prime.intelBusId</option>).
specified (<option>hardware.nvidia.prime.nvidiaBusId</option> and
<option>hardware.nvidia.prime.intelBusId</option>).
If you enable this, you may want to also enable kernel modesetting for the
NVIDIA driver (<option>hardware.nvidia.modesetting.enable</option>) in order
@@ -79,31 +110,23 @@ in
'';
};

hardware.nvidia.optimus_prime.allowExternalGpu = lib.mkOption {
type = lib.types.bool;
hardware.nvidia.prime.sync.allowExternalGpu = mkOption {
type = types.bool;
default = false;
description = ''
Configure X to allow external NVIDIA GPUs when using optimus.
'';
};

hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
type = lib.types.str;
default = "";
example = "PCI:1:0:0";
hardware.nvidia.prime.offload.enable = mkOption {
type = types.bool;
default = false;
description = ''
Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci
shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0".
'';
};
Enable render offload support using the NVIDIA proprietary driver via PRIME.
hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
type = lib.types.str;
default = "";
example = "PCI:0:2:0";
description = ''
Bus ID of the Intel GPU. You can find it using lspci; for example if lspci
shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0".
If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be
specified (<option>hardware.nvidia.prime.nvidiaBusId</option> and
<option>hardware.nvidia.prime.intelBusId</option>).
'';
};
};
@@ -116,12 +139,19 @@ in
}

{
assertion = !optimusCfg.enable ||
(optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != "");
assertion = primeEnabled -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != "";
message = ''
When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
When NVIDIA PRIME is enabled, the GPU bus IDs must configured.
'';
}
{
assertion = offloadCfg.enable -> versionAtLeast nvidia_x11.version "435.21";
message = "NVIDIA PRIME render offload is currently only supported on versions >= 435.21.";
}
{
assertion = !(syncCfg.enable && offloadCfg.enable);
message = "Only one NVIDIA PRIME solution may be used at a time.";
}
];

# If Optimus/PRIME is enabled, we:
@@ -136,36 +166,38 @@ in
# - Configure the display manager to run specific `xrandr` commands which will
# configure/enable displays connected to the Intel GPU.

services.xserver.drivers = singleton {
services.xserver.useGlamor = mkDefault offloadCfg.enable;

services.xserver.drivers = optional primeEnabled {
name = "modesetting";
display = offloadCfg.enable;
deviceSection = ''
BusID "${pCfg.intelBusId}"
${optionalString syncCfg.enable ''Option "AccelMethod" "none"''}
'';
} ++ singleton {
name = "nvidia";
modules = [ nvidia_x11.bin ];
deviceSection = optionalString optimusCfg.enable
display = !offloadCfg.enable;
deviceSection = optionalString primeEnabled
''
BusID "${optimusCfg.nvidiaBusId}"
${optionalString optimusCfg.allowExternalGpu "Option \"AllowExternalGpus\""}
BusID "${pCfg.nvidiaBusId}"
${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""}
'';
screenSection =
''
Option "RandRRotation" "on"
${optionalString optimusCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
${optionalString syncCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
'';
};

services.xserver.extraConfig = optionalString optimusCfg.enable
''
Section "Device"
Identifier "nvidia-optimus-intel"
Driver "modesetting"
BusID "${optimusCfg.intelBusId}"
Option "AccelMethod" "none"
EndSection
'';
services.xserver.serverLayoutSection = optionalString optimusCfg.enable
''
Inactive "nvidia-optimus-intel"
'';
services.xserver.serverLayoutSection = optionalString syncCfg.enable ''
Inactive "Device-modesetting[0]"
'' + optionalString offloadCfg.enable ''
Option "AllowNVIDIAGPUScreens"
'';

services.xserver.displayManager.setupCommands = optionalString optimusCfg.enable ''
services.xserver.displayManager.setupCommands = optionalString syncCfg.enable ''
# Added by nvidia configuration module for Optimus/PRIME.
${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0
${pkgs.xorg.xrandr}/bin/xrandr --auto
@@ -175,11 +207,13 @@ in
source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";
};

hardware.opengl.package = nvidia_x11.out;
hardware.opengl.package32 = nvidia_libs32;
hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out;
hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_libs32;
hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out;
hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32;

environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
++ filter (p: p != null) [ nvidia_x11.persistenced ];

systemd.tmpfiles.rules = optional config.virtualisation.docker.enableNvidia
"L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin"
@@ -190,10 +224,10 @@ in

# nvidia-uvm is required by CUDA applications.
boot.kernelModules = [ "nvidia-uvm" ] ++
lib.optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ];
optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ];

# If requested enable modesetting via kernel parameter.
boot.kernelParams = optional cfg.modesetting.enable "nvidia-drm.modeset=1";
boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1";

# Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
services.udev.extraRules =
2 changes: 2 additions & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
@@ -660,6 +660,7 @@
./services/networking/ngircd.nix
./services/networking/nghttpx/default.nix
./services/networking/nix-serve.nix
./services/networking/nix-store-gcs-proxy.nix
./services/networking/nixops-dns.nix
./services/networking/nntp-proxy.nix
./services/networking/nsd.nix
@@ -807,6 +808,7 @@
./services/ttys/agetty.nix
./services/ttys/gpm.nix
./services/ttys/kmscon.nix
./services/wayland/cage.nix
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
Loading