commit 818089ba7383b6a8950a8b74d12744850cd46652 · pyrox.dev/nixpkgs

+12

maintainers/maintainer-list.nix

···

       8363
       8363
        
           githubId = 287769;

     

       8364
       8364
        
           name = "Sergii Paryzhskyi";

     

       8365
       8365
        
         };

     

       8366
       8366
       +
         hehongbo = {

     

       8367
       8367
       +
           name = "Hongbo";

     

       8368
       8368
       +
           github = "hehongbo";

     

       8369
       8369
       +
           githubId = 665472;

     

       8370
       8370
       +
           matrix = "@hehongbo:matrix.org";

     

       8371
       8371
       +
         };

     

       8366
       8372
        
         heijligen = {

     

       8367
       8373
        
           email = "src@posteo.de";

     

       8368
       8374
        
           github = "heijligen";

     
···

       17484
       17490
        
           github = "Rampoina";

     

       17485
       17491
        
           githubId = 5653911;

     

       17486
       17492
        
           name = "Rampoina";

     

       17493
       17493
       +
         };

     

       17494
       17494
       +
         rane = {

     

       17495
       17495
       +
           email = "rane+nix@junkyard.systems";

     

       17496
       17496
       +
           github = "digitalrane";

     

       17497
       17497
       +
           githubId = 1829286;

     

       17498
       17498
       +
           name = "Rane";

     

       17487
       17499
        
         };

     

       17488
       17500
        
         ranfdev = {

     

       17489
       17501
        
           email = "ranfdev@gmail.com";

+13

maintainers/team-list.nix

···

       1022
       1022
        
           shortName = "WDZ GmbH";

     

       1023
       1023
        
         };

     

       1024
       1024
        
       

     

       1025
       1025
       +
         xen = {

     

       1026
       1026
       +
           members = [

     

       1027
       1027
       +
             hehongbo

     

       1028
       1028
       +
             lach

     

       1029
       1029
       +
             rane

     

       1030
       1030
       +
             sigmasquadron

     

       1031
       1031
       +
           ];

     

       1032
       1032
       +
           scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem.";

     

       1033
       1033
       +
           shortName = "Xen Project Hypervisor";

     

       1034
       1034
       +
           enableFeatureFreezePing = true;

     

       1035
       1035
       +
           githubTeams = [ "xen-project" ];

     

       1036
       1036
       +
         };

     

       1037
       1037
       +
       

     

       1025
       1038
        
         xfce = {

     

       1026
       1039
        
           members = [

     

       1027
       1040
        
             bobby285271

+3 -3

nixos/doc/manual/release-notes/rl-2411.section.md

···

       49
       49
        
       - Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html)

     

       50
       50
        
         was added through the `boot.initrd.systemd.dmVerity` option.

     

       51
       51
        
       

     

       52
       52
       -
       - The [Xen Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable).

     

       52
       52
       +
       - The [Xen Project Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable).

     

       53
       53
        
         - This release includes Xen [4.17.5](https://wiki.xenproject.org/wiki/Xen_Project_4.17_Release_Notes), [4.18.3](https://wiki.xenproject.org/wiki/Xen_Project_4.18_Release_Notes) and [4.19.0](https://wiki.xenproject.org/wiki/Xen_Project_4.19_Release_Notes), as well as support for booting the hypervisor on EFI systems.

     

       54
       54
        
         ::: {.warning}

     

       55
       55
       -
           Booting into Xen through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported.

     

       55
       55
       +
           Booting into the Xen Project Hypervisor through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported.

     

       56
       56
        
         :::

     

       57
       57
        
         - There are two flavours of Xen available by default: `xen`, which includes all built-in components, and `xen-slim`, which replaces the built-in components with their Nixpkgs equivalents.

     

       58
       58
       -
           - The `qemu-xen-traditional` component has been deprecated by upstream Xen, and is no longer available in any of the Xen packages.

     

       58
       58
       +
           - The `qemu-xen-traditional` component has been deprecated by the upstream Xen Project, and is no longer available in any of the Xen Project Hypervisor packages.

     

       59
       59
        
         - The OCaml-based Xen Store can now be configured using  [`virtualisation.xen.store.settings`](#opt-virtualisation.xen.store.settings).

     

       60
       60
        
         - The `virtualisation.xen.bridge` options have been deprecated in this release cycle. Users who need network bridges are encouraged to set up their own networking configurations.

     

       61
       61

+1 -1

nixos/modules/virtualisation/xe-guest-utilities.nix

···

       4
       4
        
       in {

     

       5
       5
        
         options = {

     

       6
       6
        
           services.xe-guest-utilities = {

     

       7
       7
       -
             enable = lib.mkEnableOption "the Xen guest utilities daemon";

     

       7
       7
       +
             enable = lib.mkEnableOption "the XenServer guest utilities daemon";

     

       8
       8
        
           };

     

       9
       9
        
         };

     

       10
       10
        
         config = lib.mkIf cfg.enable {

+2 -2

nixos/modules/virtualisation/xen-boot-builder.sh

···

       5
       5
        
       [[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1

     

       6
       6
        
       case "$1" in

     

       7
       7
        
           "quiet") true ;;

     

       8
       8
       -
           "default" | "info") echo -n "Installing Xen Hypervisor boot entries..." ;;

     

       8
       8
       +
           "default" | "info") echo -n "Installing Xen Project Hypervisor boot entries..." ;;

     

       9
       9
        
           "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m called with the '$1' flag" ;;

     

       10
       10
        
           *)

     

       11
       11
        
               echo -e "\e[1;31merror:\e[0m xenBootBuilder was called with an invalid argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option."

     
···

       150
       150
        
           esac

     

       151
       151
        
           if [ "$1" = "info" ]; then

     

       152
       152
        
               if [[ ${#preGenerations[@]} == "${#postGenerations[@]}" ]]; then

     

       153
       153
       -
                   echo -e "\e[1;33mNo Change:\e[0m Xen Hypervisor boot entries were refreshed, but their contents are identical."

     

       153
       153
       +
                   echo -e "\e[1;33mNo Change:\e[0m Xen Project Hypervisor boot entries were refreshed, but their contents are identical."

     

       154
       154
        
               else

     

       155
       155
        
                   echo -e "\e[1;32mSuccess:\e[0m Changed the following boot entries:"

     

       156
       156
        
                   # We briefly unset errexit and pipefail here, as GNU diff has no option to not fail when files differ.

+5 -5

nixos/modules/virtualisation/xen-dom0.nix

···

       1
       1
       -
       # Xen hypervisor (Dom0) support.

     

       1
       1
       +
       # Xen Project Hypervisor (Dom0) support.

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         config,

     
···

       123
       123
        
       

     

       124
       124
        
         options.virtualisation.xen = {

     

       125
       125
        
       

     

       126
       126
       -
           enable = lib.options.mkEnableOption "the Xen Hypervisor, a virtualisation technology defined as a *type-1 hypervisor*, which allows multiple virtual machines, known as *domains*, to run concurrently on the physical machine. NixOS runs as the privileged *Domain 0*. This option requires a reboot into a Xen kernel to take effect";

     

       126
       126
       +
           enable = lib.options.mkEnableOption "the Xen Project Hypervisor, a virtualisation technology defined as a *type-1 hypervisor*, which allows multiple virtual machines, known as *domains*, to run concurrently on the physical machine. NixOS runs as the privileged *Domain 0*. This option requires a reboot into a Xen kernel to take effect";

     

       127
       127
        
       

     

       128
       128
        
           debug = lib.options.mkEnableOption "Xen debug features for Domain 0. This option enables some hidden debugging tests and features, and should not be used in production";

     

       129
       129
        
       

     
···

       141
       141
        
             defaultText = lib.options.literalExpression "pkgs.xen";

     

       142
       142
        
             example = lib.options.literalExpression "pkgs.xen-slim";

     

       143
       143
        
             description = ''

     

       144
       144
       -
               The package used for Xen Hypervisor.

     

       144
       144
       +
               The package used for Xen Project Hypervisor.

     

       145
       145
        
             '';

     

       146
       146
        
             relatedPackages = [

     

       147
       147
        
               "xen"

     
···

       207
       207
        
       

     

       208
       208
        
                 - `quiet` supresses all messages.

     

       209
       209
        
       

     

       210
       210
       -
                 - `default` adds a simple "Installing Xen Hypervisor boot entries...done." message to the script.

     

       210
       210
       +
                 - `default` adds a simple "Installing Xen Project Hypervisor boot entries...done." message to the script.

     

       211
       211
        
       

     

       212
       212
        
                 - `info` is the same as `default`, but it also prints a diff with information on which generations were altered.

     

       213
       213
        
                   - This option adds two extra dependencies to the script: `diffutils` and `bat`.

     
···

       870
       870
        
             };

     

       871
       871
        
           };

     

       872
       872
        
         };

     

       873
       873
       -
         meta.maintainers = with lib.maintainers; [ sigmasquadron ];

     

       873
       873
       +
         meta.maintainers = lib.teams.xen.members;

     

       874
       874
        
       }

+3 -3

pkgs/applications/virtualization/xen/README.md

···

       15
       15
        
         </a>

     

       16
       16
        
       </p>

     

       17
       17
        
       

     

       18
       18
       -
       # Xen Hypervisor <a href="https://xenproject.org/"><img src="https://downloads.xenproject.org/Branding/Mascots/Xen-Fu-Panda-2000px.png" width="48px" align="top" alt="Xen Fu Panda"></a>

     

       18
       18
       +
       # Xen Project Hypervisor <a href="https://xenproject.org/"><img src="https://downloads.xenproject.org/Branding/Mascots/Xen-Fu-Panda-2000px.png" width="48px" align="top" alt="Xen Fu Panda"></a>

     

       19
       19
        
       

     

       20
       20
       -
       This directory includes the build recipes for the [Xen Hypervisor](https://xenproject.org/).

     

       20
       20
       +
       This directory includes the build recipes for the [Xen Project Hypervisor](https://xenproject.org/).

     

       21
       21
        
       

     

       22
       22
       -
       Some other notable packages that compose the Xen Ecosystem include:

     

       22
       22
       +
       Some other notable packages that compose the Xen Project Ecosystem include:

     

       23
       23
        
       

     

       24
       24
        
       - `ocamlPackages.xenstore`: Mirage's `oxenstore` implementation.

     

       25
       25
        
       - `ocamlPackages.vchan`: Mirage's `xen-vchan` implementation.

+9 -11

pkgs/applications/virtualization/xen/generic/default.nix

···

       647
       647
        
       

     

       648
       648
        
               # Short description for Xen.

     

       649
       649
        
               description =

     

       650
       650
       -
                 "Xen Hypervisor"

     

       650
       650
       +
                 "Xen Project Hypervisor"

     

       651
       651
        
                 # The "and related components" addition is automatically hidden if said components aren't being built.

     

       652
       652
        
                 + lib.strings.optionalString (prefetchedSources != { }) " and related components"

     

       653
       653
        
                 # To alter the description inside the paranthesis, edit ./packages.nix.

     
···

       681
       681
        
                       # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't

     

       682
       682
        
                       # that many optional components, we just use lib.strings.optionalString, because it's simpler.

     

       683
       683
        
                       # Optional components that aren't being built are automatically hidden.

     

       684
       684
       -
                       + lib.strings.optionalString withEFI "\n* `xen.efi`: Xen's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package."

     

       684
       684
       +
                       + lib.strings.optionalString withEFI "\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package."

     

       685
       685
        
                       + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package."

     

       686
       686
       -
                       + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: Xen's mirror of [QEMU](https://www.qemu.org/)."

     

       687
       687
       -
                       + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)."

     

       688
       688
       -
                       + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)."

     

       689
       689
       -
                       + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: Xen's pinned version of [iPXE](https://ipxe.org/)."

     

       686
       686
       +
                       + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: The Xen Project's mirror of [QEMU](https://www.qemu.org/)."

     

       687
       687
       +
                       + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: The Xen Project's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)."

     

       688
       688
       +
                       + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: The Xen Project's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)."

     

       689
       689
       +
                       + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: The Xen Project's pinned version of [iPXE](https://ipxe.org/)."

     

       690
       690
        
                     )

     

       691
       691
        
                 # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to.

     

       692
       692
        
                 # This will hopefully give users the peace of mind that their Xen is secure, without needing

     

       693
       693
        
                 # to search the source code for the XSA patches.

     

       694
       694
        
                 + lib.strings.optionalString (writeAdvisoryDescription != [ ]) (

     

       695
       695
       -
                   "\n\nThis Xen (${version}) has been patched against the following known security vulnerabilities:\n"

     

       695
       695
       +
                   "\n\nThis Xen Project Hypervisor (${version}) has been patched against the following known security vulnerabilities:\n"

     

       696
       696
        
                   + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription)

     

       697
       697
        
                 );

     

       698
       698
        
       

     
···

       712
       712
        
               ];

     

       713
       713
        
       

     

       714
       714
        
               # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support.

     

       715
       715
       -
               maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) (

     

       716
       716
       -
                 with lib.maintainers; [ sigmasquadron ]

     

       717
       717
       -
               );

     

       718
       718
       -
               knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html";

     

       715
       715
       +
               maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) lib.teams.xen.members;

     

       716
       716
       +
               knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "The Xen Project Hypervisor version ${version} is no longer supported by the Xen Project Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html";

     

       719
       717
        
       

     

       720
       718
        
               mainProgram = "xl";

     

       721
       719

+11 -11

pkgs/applications/virtualization/xen/packages.nix

···

       2
       2
        
       let

     

       3
       3
        
         standard = {

     

       4
       4
        
           meta = {

     

       5
       5
       -
             description = "Standard Xen";

     

       5
       5
       +
             description = "Standard";

     

       6
       6
        
             longDescription = ''

     

       7
       7
       -
               Standard version of Xen. Uses forks of QEMU, SeaBIOS, OVMF and iPXE provided

     

       8
       8
       -
               by the Xen Project. This provides the vanilla Xen experince, but wastes space

     

       9
       9
       -
               and build time. A typical NixOS setup that runs lots of VMs will usually need

     

       10
       10
       -
               to build two different versions of QEMU when using this Xen derivation (one

     

       11
       11
       -
               fork and upstream).

     

       7
       7
       +
               Standard version of the Xen Project Hypervisor. Uses forks of QEMU, SeaBIOS,

     

       8
       8
       +
               OVMF and iPXE provided by the Xen Project. This provides the vanilla Xen

     

       9
       9
       +
               experience, but wastes space and build time. A typical NixOS setup that runs

     

       10
       10
       +
               lots of VMs will usually need to build two different versions of QEMU when using

     

       11
       11
       +
               this Xen derivation (one fork and upstream).

     

       12
       12
        
             '';

     

       13
       13
        
           };

     

       14
       14
        
         };

     
···

       16
       16
        
           meta = {

     

       17
       17
        
             description = "Without Internal Components";

     

       18
       18
        
             longDescription = ''

     

       19
       19
       -
               Slimmed-down version of Xen that reuses nixpkgs packages as much as possible.

     

       20
       20
       -
               Instead of using the Xen forks for various internal components, this version uses

     

       21
       21
       -
               `seabios`, `ovmf` and `ipxe` from nixpkgs. These components may ocasionally get

     

       22
       22
       -
               out of sync with the hypervisor itself, but this builds faster and uses less space

     

       23
       23
       -
               than the default derivation.

     

       19
       19
       +
               Slimmed-down version of the Xen Project Hypervisor that reuses nixpkgs packages

     

       20
       20
       +
               as much as possible. Instead of using the Xen Project forks for various internal

     

       21
       21
       +
               components, this version uses `seabios`, `ovmf` and `ipxe` from Nixpkgs. These

     

       22
       22
       +
               components may ocasionally get out of sync with the hypervisor itself, but this

     

       23
       23
       +
               builds faster and uses less space than the default derivation.

     

       24
       24
        
             '';

     

       25
       25
        
           };

     

       26
       26
        
         };

+2 -4

pkgs/by-name/xe/xen-guest-agent/package.nix

···

       45
       45
        
           homepage = "https://gitlab.com/xen-project/xen-guest-agent";

     

       46
       46
        
           license = lib.licenses.agpl3Only;

     

       47
       47
        
           platforms = lib.platforms.unix;

     

       48
       48
       -
           maintainers = with lib.maintainers; [

     

       49
       49
       -
             matdibu

     

       50
       50
       -
             sigmasquadron

     

       51
       51
       -
           ];

     

       48
       48
       +
           maintainers = lib.teams.xen.members;

     

       49
       49
       +
           mainProgram = "xen-guest-agent";

     

       52
       50
        
         };

     

       53
       51
        
       }

+1 -1

pkgs/by-name/xt/xtf/package.nix

···

       71
       71
        
           description = "Xen Test Framework and Suite for creating microkernel-based tests";

     

       72
       72
        
           homepage = "https://xenbits.xenproject.org/docs/xtf/index.html";

     

       73
       73
        
           license = lib.licenses.bsd2;

     

       74
       74
       -
           maintainers = with lib.maintainers; [ sigmasquadron ];

     

       74
       74
       +
           maintainers = lib.teams.xen.members;

     

       75
       75
        
           mainProgram = "xtf-runner";

     

       76
       76
        
           platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64;

     

       77
       77
        
         };

+1 -1

pkgs/development/ocaml-modules/vchan/default.nix

···

       32
       32
        
           description = "Xen Vchan implementation";

     

       33
       33
        
           homepage = "https://github.com/mirage/ocaml-vchan";

     

       34
       34
        
           license = licenses.isc;

     

       35
       35
       -
           maintainers = [ maintainers.sternenseemann ];

     

       35
       35
       +
           maintainers = teams.xen.members ++ [ maintainers.sternenseemann ];

     

       36
       36
        
         };

     

       37
       37
        
       }

+1 -4

pkgs/development/ocaml-modules/xenstore/default.nix

···

       25
       25
        
         meta = with lib; {

     

       26
       26
        
           description = "Xenstore protocol in pure OCaml";

     

       27
       27
        
           license = licenses.lgpl21Only;

     

       28
       28
       -
           maintainers = with maintainers; [

     

       29
       29
       -
             sternenseemann

     

       30
       30
       -
             sigmasquadron

     

       31
       31
       -
           ];

     

       28
       28
       +
           maintainers = teams.xen.members ++ [ maintainers.sternenseemann ];

     

       32
       29
        
           homepage = "https://github.com/mirage/ocaml-xenstore";

     

       33
       30
        
         };

     

       34
       31
        
       }

+1

pkgs/development/ocaml-modules/xenstore_transport/default.nix

···

       23
       23
        
           description = "Low-level libraries for connecting to a xenstore service on a xen host";

     

       24
       24
        
           license = licenses.lgpl21Only;

     

       25
       25
        
           homepage = "https://github.com/xapi-project/ocaml-xenstore-clients";

     

       26
       26
       +
           maintainers = teams.xen.members;

     

       26
       27
        
         };

     

       27
       28
        
       }