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: 3112aa3e2fa5
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: 5226e6b51318
Choose a head ref
18 contributors

Commits on Jul 14, 2020

  1. kdeApplications: 20.04.1 -> 20.04.3

    @ttuegel
    ttuegel committed Jul 14, 2020
    Copy the full SHA
    3d86666 View commit details

Commits on Jul 21, 2020

  1. blockbook: fix build on aarch64-linux

    @prusnak
    prusnak committed Jul 21, 2020
    Copy the full SHA
    f03eb5f View commit details

Commits on Jul 22, 2020

  1. python-packages: fix trailing whitespaces

    @flokli
    flokli committed Jul 22, 2020
    Copy the full SHA
    391a5fd View commit details

  2. certbot: move to python package set, cleanup

    @flokli
    flokli committed Jul 22, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    8ad6216 View commit details

  3. certbot: add certbot.withPlugins 

    This can be used to wrap certbot to include some plugins.

certbot.withPlugins has a similar calling convention as python*.withPackages:

```
certbot.withPlugins (cp: [ cp.certbot-dns-foo ])
```
    @flokli
    flokli committed Jul 22, 2020
    Copy the full SHA
    718a449 View commit details

  4. certbot-full: init

    @flokli
    flokli committed Jul 22, 2020
    Copy the full SHA
    9d86dea View commit details

  5. cri-o: 1.18.2 -> 1.18.3 

    https://github.com/cri-o/cri-o/releases/tag/v1.18.3
    @zowoq
    zowoq committed Jul 22, 2020
    Copy the full SHA
    1e49cff View commit details

  6. Merge pull request #92786 from flokli/certbot-with-plugins 

    certbot: add certbot.withPlugins
    @flokli
    flokli authored Jul 22, 2020
    Copy the full SHA
    3d50d64 View commit details

  7. nushell: 0.16.0 -> 0.17.0

    @cust0dian
    cust0dian committed Jul 22, 2020
    Copy the full SHA
    491fe83 View commit details

  8. subsurface: 4.9.3 -> 4.9.6

    @adisbladis
    adisbladis committed Jul 22, 2020
    Copy the full SHA
    144aba6 View commit details

  9. Merge pull request #93637 from zowoq/cri-o 

    cri-o: 1.18.2 -> 1.18.3
    @danieldk
    danieldk authored Jul 22, 2020
    Copy the full SHA
    8a03bbc View commit details

  10. Merge pull request #93641 from adisbladis/subsurface-4_9_6 

    subsurface: 4.9.3 -> 4.9.6
    @adisbladis
    adisbladis authored Jul 22, 2020
    Copy the full SHA
    3f12f0b View commit details

  11. nixUnstable: 2.4pre20200719_a79b6dd -> 2.4pre20200721_ff314f1 

    Fixes errors like this for me:

```
error: --- Error ------------------------------- nix-build
Nix daemon out of memory
(use '--show-trace' to show detailed location information)
```
    @Ma27
    Ma27 committed Jul 22, 2020
    Copy the full SHA
    85819d4 View commit details

  12. nixos/manual: add a section about Vulkan drivers 

    - Add a general block about how to configure and test Vulkan
- Add a section about switching between mesa/radv and amdvlk on AMD
  GPUs.
    @Flakebi
    Flakebi committed Jul 22, 2020
    Copy the full SHA
    350f1d6 View commit details

  13. Merge pull request #93642 from Ma27/update-nix-unstable 

    nixUnstable: 2.4pre20200719_a79b6dd -> 2.4pre20200721_ff314f1
    @edolstra
    edolstra authored Jul 22, 2020
    Copy the full SHA
    bef8c2b View commit details

  14. linux: 4.14.188 -> 4.14.189

    @NeQuissimus
    NeQuissimus committed Jul 22, 2020
    Copy the full SHA
    c5f8c25 View commit details

  15. linux: 4.19.133 -> 4.19.134

    @NeQuissimus
    NeQuissimus committed Jul 22, 2020
    Copy the full SHA
    4a99628 View commit details

  16. linux: 4.4.230 -> 4.4.231

    @NeQuissimus
    NeQuissimus committed Jul 22, 2020
    Copy the full SHA
    14e4240 View commit details

  17. linux: 4.9.230 -> 4.9.231

    @NeQuissimus
    NeQuissimus committed Jul 22, 2020
    Copy the full SHA
    81ca9a2 View commit details

  18. linux: 5.4.52 -> 5.4.53

    @NeQuissimus
    NeQuissimus committed Jul 22, 2020
    Copy the full SHA
    81a576d View commit details

  19. linux: 5.7.9 -> 5.7.10

    @NeQuissimus
    NeQuissimus committed Jul 22, 2020
    Copy the full SHA
    fc9ad83 View commit details

  20. Merge pull request #93638 from cust0dian/nushell-0.17.0 

    nushell: 0.16.0 -> 0.17.0
    @Ma27
    Ma27 authored Jul 22, 2020
    Copy the full SHA
    a2a7d50 View commit details

  21. wabt: 1.0.18 -> 1.0.19 

    https://github.com/WebAssembly/wabt/releases/tag/1.0.19
    @Ma27
    Ma27 committed Jul 22, 2020
    Copy the full SHA
    7b17579 View commit details

  22. Merge pull request #93610 from prusnak/blockbook 

    blockbook: fix build on aarch64-linux
    @mmahut
    mmahut authored Jul 22, 2020
    Copy the full SHA
    b8c367a View commit details

  23. pythonPackages.pystray: 0.15.0 -> 0.16.0

    @jojosch @FRidh
    jojosch authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    70f6c1a View commit details

  24. python3Packages.pytest-localserver: fix build 

    All package tests rely on networking which breaks sandboxed builds.
Fall back to pythonImportsCheck instead.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
    @siriobalmelli @FRidh
    siriobalmelli authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    163e7a0 View commit details

  25. Merge pull request #93152 from ttuegel/kde-applications-20.04.3 

    kdeApplications: 20.04.1 -> 20.04.3
    @ttuegel
    ttuegel authored Jul 22, 2020
    Copy the full SHA
    8fad714 View commit details

  26. pytmx: 3.21.7 -> 3.22.0 

    Next to the version bump, this fixes the test for Python 2.
    @oxzi @FRidh
    oxzi authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    17dfbf4 View commit details

  27. pythonPackages.flower: 0.9.4 -> 0.9.5

    @lsix @FRidh
    lsix authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    1e597a5 View commit details

  28. python37Packages.mpv: 0.4.6 -> 0.4.7

    @r-ryantm @FRidh
    r-ryantm authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    1f709cf View commit details

  29. python3Packages.aioharmony: 0.2.3 -> 0.2.5

    @Oro @FRidh
    Oro authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    ade1348 View commit details

  30. python3Packages.HAP-python: 2.8.1 -> 2.9.2

    @Oro @FRidh
    Oro authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    dc848ce View commit details

  31. python37Packages.aioftp: 0.16.0 -> 0.16.1

    @r-ryantm @FRidh
    r-ryantm authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    fa401f5 View commit details

  32. python27Packages.flask_sqlalchemy: 2.4.3 -> 2.4.4

    @r-ryantm @FRidh
    r-ryantm authored and FRidh committed Jul 22, 2020
    Copy the full SHA
    2e531d5 View commit details

  33. Merge pull request #93591 from Flakebi/vulkan-manual 

    nixos/manual: add a section about Vulkan drivers
    @danieldk
    danieldk authored Jul 22, 2020
    Copy the full SHA
    5226e6b View commit details
Showing with 1,076 additions and 1,018 deletions.
  1. +90 −1 nixos/doc/manual/configuration/gpu-accel.xml
  2. +1 −1 pkgs/applications/kde/fetch.sh
  3. +868 −868 pkgs/applications/kde/srcs.nix
  4. +0 −41 pkgs/applications/misc/subsurface/0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch
  5. +6 −9 pkgs/applications/misc/subsurface/default.nix
  6. +2 −2 pkgs/applications/virtualization/cri-o/default.nix
  7. +3 −2 pkgs/development/python-modules/HAP-python/default.nix
  8. +2 −2 pkgs/development/python-modules/aioftp/default.nix
  9. +2 −2 pkgs/development/python-modules/aioharmony/default.nix
  10. +28 −14 pkgs/{tools/admin → development/python-modules}/certbot/default.nix
  11. +2 −2 pkgs/development/python-modules/flask-sqlalchemy/default.nix
  12. +10 −9 pkgs/development/python-modules/flower/default.nix
  13. +2 −2 pkgs/development/python-modules/mpv/default.nix
  14. +2 −2 pkgs/development/python-modules/pystray/default.nix
  15. +6 −9 pkgs/development/python-modules/pytest-localserver/default.nix
  16. +4 −10 pkgs/development/python-modules/pytmx/default.nix
  17. +2 −2 pkgs/development/tools/wabt/default.nix
  18. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  19. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  20. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  21. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  22. +2 −2 pkgs/os-specific/linux/kernel/linux-5.4.nix
  23. +2 −2 pkgs/os-specific/linux/kernel/linux-5.7.nix
  24. +14 −16 pkgs/servers/blockbook/default.nix
  25. +3 −3 pkgs/shells/nushell/default.nix
  26. +3 −3 pkgs/tools/package-management/nix/default.nix
  27. +7 −1 pkgs/top-level/all-packages.nix
  28. +7 −5 pkgs/top-level/python-packages.nix
91 changes: 90 additions & 1 deletion nixos/doc/manual/configuration/gpu-accel.xml
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@
<para>
The proper installation of OpenCL drivers can be verified through
the <command>clinfo</command> command of the <package>clinfo</package>
package. This command will report the number of hardware devides
package. This command will report the number of hardware devices
that is found and give detailed information for each device:
</para>

@@ -101,4 +101,93 @@ ROCR_EXT_DIR=`nix-build '&lt;nixpkgs&gt;' --no-out-link -A rocm-runtime-ext`/lib
</para>
</section>
</section>

<section xml:id="sec-gpu-accel-vulkan">
<title>Vulkan</title>

<para>
<link xlink:href="https://en.wikipedia.org/wiki/Vulkan_(API)">Vulkan</link> is a
graphics and compute API for GPUs. It is used directly by games or indirectly though
compatibility layers like <link xlink:href="https://github.com/doitsujin/dxvk/wiki">DXVK</link>.
</para>

<para>
By default, if <xref linkend="opt-hardware.opengl.driSupport"/> is enabled,
<package>mesa</package> is installed and provides Vulkan for supported hardware.
</para>

<para>
Similar to OpenCL, Vulkan drivers are loaded through the <emphasis>Installable Client
Driver</emphasis> (ICD) mechanism. ICD files for Vulkan are JSON files that specify
the path to the driver library and the supported Vulkan version. All successfully
loaded drivers are exposed to the application as different GPUs.
In NixOS, there are two ways to make ICD files visible to Vulkan applications: an
environment variable and a module option.
</para>

<para>
The first option is through the <varname>VK_ICD_FILENAMES</varname>
environment variable. This variable can contain multiple JSON files, separated by
<literal>:</literal>. For example:

<screen><prompt>$</prompt> export \
VK_ICD_FILENAMES=`nix-build '&lt;nixpkgs&gt;' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json</screen>
</para>

<para>
The second mechanism is to add the Vulkan driver package to
<xref linkend="opt-hardware.opengl.extraPackages"/>. This links the
ICD file under <filename>/run/opengl-driver</filename>, where it will
be visible to the ICD loader.
</para>

<para>
The proper installation of Vulkan drivers can be verified through
the <command>vulkaninfo</command> command of the <package>vulkan-tools</package>
package. This command will report the hardware devices and drivers found,
in this example output amdvlk and radv:
</para>

<screen><prompt>$</prompt> vulkaninfo | grep GPU
GPU id : 0 (Unknown AMD GPU)
GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1))
...
GPU0:
deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU
deviceName = Unknown AMD GPU
GPU1:
deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU</screen>

<para>
A simple graphical application that uses Vulkan is <command>vkcube</command>
from the <package>vulkan-tools</package> package.
</para>

<section xml:id="sec-gpu-accel-vulkan-amd">
<title>AMD</title>

<para>
Modern AMD <link
xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics
Core Next</link> (GCN) GPUs are supported through either radv, which is
part of <package>mesa</package>, or the <package>amdvlk</package> package.
Adding the <package>amdvlk</package> package to
<xref linkend="opt-hardware.opengl.extraPackages"/> makes both drivers
available for applications and lets them choose. A specific driver can
be forced as follows:

<programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [
<package>amdvlk</package>
];

# For amdvlk
<xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =
"/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
# For radv
<xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =
"/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
</programlisting>
</para>
</section>
</section>
</chapter>
2 changes: 1 addition & 1 deletion pkgs/applications/kde/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.1/src)
WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src)
Loading