commit b8937303cef45a9552be9eb3518038bb06c41128 · pyrox.dev/nixpkgs

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

···

       222
       222
        
       

     

       223
       223
        
       - [Limine](https://github.com/limine-bootloader/limine) a modern, advanced, portable, multiprotocol bootloader and boot manager. Available as [boot.loader.limine](#opt-boot.loader.limine.enable).

     

       224
       224
        
       

     

       225
       225
       +
       - [tee-supplicant](https://github.com/OP-TEE/optee_client), a userspace supplicant for OP-TEE OS. Available as [services.tee-supplicant](#opt-services.tee-supplicant.enable).

     

       226
       226
       +
       

     

       225
       227
        
       - [Orthanc](https://orthanc.uclouvain.be/) a lightweight, RESTful DICOM server for healthcare and medical research. Available as [services.orthanc](#opt-services.orthanc.enable).

     

       226
       228
        
       

     

       227
       229
        
       - [Docling Serve](https://github.com/docling-project/docling-serve) running [Docling](https://github.com/docling-project/docling) as an API service. Available as [services.docling-serve](#opt-services.docling-serve.enable).

nixos/modules/module-list.nix

···

       930
       930
        
         ./services/misc/taskchampion-sync-server.nix

     

       931
       931
        
         ./services/misc/taskserver

     

       932
       932
        
         ./services/misc/tautulli.nix

     

       933
       933
       +
         ./services/misc/tee-supplicant

     

       933
       934
        
         ./services/misc/tiddlywiki.nix

     

       934
       935
        
         ./services/misc/tp-auto-kbbl.nix

     

       935
       936
        
         ./services/misc/transfer-sh.nix

+95

nixos/modules/services/misc/tee-supplicant/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         inherit (lib)

     

       9
       9
       +
           getExe'

     

       10
       10
       +
           mkEnableOption

     

       11
       11
       +
           mkIf

     

       12
       12
       +
           mkOption

     

       13
       13
       +
           mkPackageOption

     

       14
       14
       +
           types

     

       15
       15
       +
           ;

     

       16
       16
       +
       

     

       17
       17
       +
         cfg = config.services.tee-supplicant;

     

       18
       18
       +
       

     

       19
       19
       +
         taDir = "optee_armtz";

     

       20
       20
       +
       

     

       21
       21
       +
         trustedApplications = pkgs.linkFarm "runtime-trusted-applications" (

     

       22
       22
       +
           map (

     

       23
       23
       +
             ta:

     

       24
       24
       +
             let

     

       25
       25
       +
               # This is safe since we are using it as the path value, so the context

     

       26
       26
       +
               # will still ensure that this nix store path exists on the running

     

       27
       27
       +
               # system.

     

       28
       28
       +
               taFile = builtins.baseNameOf (builtins.unsafeDiscardStringContext ta);

     

       29
       29
       +
             in

     

       30
       30
       +
             {

     

       31
       31
       +
               name = "lib/${taDir}/${taFile}";

     

       32
       32
       +
               path = ta;

     

       33
       33
       +
             }

     

       34
       34
       +
           ) cfg.trustedApplications

     

       35
       35
       +
         );

     

       36
       36
       +
       in

     

       37
       37
       +
       {

     

       38
       38
       +
         options.services.tee-supplicant = {

     

       39
       39
       +
           enable = mkEnableOption "OP-TEE userspace supplicant";

     

       40
       40
       +
       

     

       41
       41
       +
           package = mkPackageOption pkgs "optee-client" { };

     

       42
       42
       +
       

     

       43
       43
       +
           trustedApplications = mkOption {

     

       44
       44
       +
             type = types.listOf types.path;

     

       45
       45
       +
             default = [ ];

     

       46
       46
       +
             description = ''

     

       47
       47
       +
               A list of full paths to trusted applications that will be loaded at

     

       48
       48
       +
               runtime by tee-supplicant.

     

       49
       49
       +
             '';

     

       50
       50
       +
           };

     

       51
       51
       +
       

     

       52
       52
       +
           pluginPath = mkOption {

     

       53
       53
       +
             type = types.path;

     

       54
       54
       +
             default = "/run/current-system/sw/lib/tee-supplicant/plugins";

     

       55
       55
       +
             description = ''

     

       56
       56
       +
               The directory where plugins will be loaded from on startup.

     

       57
       57
       +
             '';

     

       58
       58
       +
           };

     

       59
       59
       +
       

     

       60
       60
       +
           reeFsParentPath = mkOption {

     

       61
       61
       +
             type = types.path;

     

       62
       62
       +
             default = "/var/lib/tee";

     

       63
       63
       +
             description = ''

     

       64
       64
       +
               The directory where the secure filesystem will be stored in the rich

     

       65
       65
       +
               execution environment (REE FS).

     

       66
       66
       +
             '';

     

       67
       67
       +
           };

     

       68
       68
       +
         };

     

       69
       69
       +
       

     

       70
       70
       +
         config = mkIf cfg.enable {

     

       71
       71
       +
           environment = mkIf (cfg.trustedApplications != [ ]) {

     

       72
       72
       +
             systemPackages = [ trustedApplications ];

     

       73
       73
       +
             pathsToLink = [ "/lib/${taDir}" ];

     

       74
       74
       +
           };

     

       75
       75
       +
       

     

       76
       76
       +
           systemd.services.tee-supplicant = {

     

       77
       77
       +
             description = "Userspace supplicant for OPTEE-OS";

     

       78
       78
       +
       

     

       79
       79
       +
             serviceConfig = {

     

       80
       80
       +
               ExecStart = toString [

     

       81
       81
       +
                 (getExe' cfg.package "tee-supplicant")

     

       82
       82
       +
                 "--ta-dir ${taDir}"

     

       83
       83
       +
                 "--fs-parent-path ${cfg.reeFsParentPath}"

     

       84
       84
       +
                 "--plugin-path ${cfg.pluginPath}"

     

       85
       85
       +
               ];

     

       86
       86
       +
               Restart = "always";

     

       87
       87
       +
             };

     

       88
       88
       +
       

     

       89
       89
       +
             after = [ "modprobe@optee.service" ];

     

       90
       90
       +
             wants = [ "modprobe@optee.service" ];

     

       91
       91
       +
       

     

       92
       92
       +
             wantedBy = [ "multi-user.target" ];

     

       93
       93
       +
           };

     

       94
       94
       +
         };

     

       95
       95
       +
       }

nixos/tests/all-tests.nix

···

       1064
       1064
        
         openvscode-server = runTest ./openvscode-server.nix;

     

       1065
       1065
        
         open-webui = runTest ./open-webui.nix;

     

       1066
       1066
        
         openvswitch = runTest ./openvswitch.nix;

     

       1067
       1067
       +
         optee = handleTestOn [ "aarch64-linux" ] ./optee.nix { };

     

       1067
       1068
        
         orangefs = runTest ./orangefs.nix;

     

       1068
       1069
        
         os-prober = handleTestOn [ "x86_64-linux" ] ./os-prober.nix { };

     

       1069
       1070
        
         osquery = handleTestOn [ "x86_64-linux" ] ./osquery.nix { };

+72

nixos/tests/optee.nix

···

       1
       1
       +
       import ./make-test-python.nix (

     

       2
       2
       +
         { pkgs, lib, ... }:

     

       3
       3
       +
         {

     

       4
       4
       +
           name = "optee";

     

       5
       5
       +
       

     

       6
       6
       +
           meta = with pkgs.lib.maintainers; {

     

       7
       7
       +
             maintainers = [ jmbaur ];

     

       8
       8
       +
           };

     

       9
       9
       +
       

     

       10
       10
       +
           nodes.machine =

     

       11
       11
       +
             { config, pkgs, ... }:

     

       12
       12
       +
             let

     

       13
       13
       +
               inherit (pkgs) armTrustedFirmwareQemu opteeQemuAarch64 ubootQemuAarch64;

     

       14
       14
       +
       

     

       15
       15
       +
               # Default environment for qemu-arm64 uboot does not work well with

     

       16
       16
       +
               # large nixos kernel/initrds.

     

       17
       17
       +
               uboot = ubootQemuAarch64.overrideAttrs (old: {

     

       18
       18
       +
                 postPatch =

     

       19
       19
       +
                   (old.postPatch or "")

     

       20
       20
       +
                   + ''

     

       21
       21
       +
                     substituteInPlace board/emulation/qemu-arm/qemu-arm.env \

     

       22
       22
       +
                       --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x46000000"

     

       23
       23
       +
                   '';

     

       24
       24
       +
               });

     

       25
       25
       +
       

     

       26
       26
       +
               bios = armTrustedFirmwareQemu.override {

     

       27
       27
       +
                 extraMakeFlags = [

     

       28
       28
       +
                   "SPD=opteed"

     

       29
       29
       +
                   "BL32=${opteeQemuAarch64}/tee-header_v2.bin"

     

       30
       30
       +
                   "BL32_EXTRA1=${opteeQemuAarch64}/tee-pager_v2.bin"

     

       31
       31
       +
                   "BL32_EXTRA2=${opteeQemuAarch64}/tee-pageable_v2.bin"

     

       32
       32
       +
                   "BL33=${uboot}/u-boot.bin"

     

       33
       33
       +
                   "all"

     

       34
       34
       +
                   "fip"

     

       35
       35
       +
                 ];

     

       36
       36
       +
                 filesToInstall = [

     

       37
       37
       +
                   "build/qemu/release/bl1.bin"

     

       38
       38
       +
                   "build/qemu/release/fip.bin"

     

       39
       39
       +
                 ];

     

       40
       40
       +
                 postInstall = ''

     

       41
       41
       +
                   dd if=$out/bl1.bin of=$out/bios.bin bs=4096 conv=notrunc

     

       42
       42
       +
                   dd if=$out/fip.bin of=$out/bios.bin seek=64 bs=4096 conv=notrunc

     

       43
       43
       +
                 '';

     

       44
       44
       +
               };

     

       45
       45
       +
             in

     

       46
       46
       +
             {

     

       47
       47
       +
               virtualisation = {

     

       48
       48
       +
                 inherit bios;

     

       49
       49
       +
                 cores = 2;

     

       50
       50
       +
                 qemu.options = [

     

       51
       51
       +
                   "-machine virt,secure=on,accel=tcg,gic-version=2"

     

       52
       52
       +
                   "-cpu cortex-a57"

     

       53
       53
       +
                 ];

     

       54
       54
       +
               };

     

       55
       55
       +
       

     

       56
       56
       +
               # VM boots up via qfw

     

       57
       57
       +
               boot.loader.grub.enable = false;

     

       58
       58
       +
       

     

       59
       59
       +
               services.tee-supplicant = {

     

       60
       60
       +
                 enable = true;

     

       61
       61
       +
                 # pkcs11 trusted application

     

       62
       62
       +
                 trustedApplications = [ "${opteeQemuAarch64.devkit}/ta/fd02c9da-306c-48c7-a49c-bbd827ae86ee.ta" ];

     

       63
       63
       +
               };

     

       64
       64
       +
             };

     

       65
       65
       +
           testScript = ''

     

       66
       66
       +
             machine.wait_for_unit("tee-supplicant.service")

     

       67
       67
       +
             out = machine.succeed("${pkgs.opensc}/bin/pkcs11-tool --module ${lib.getLib pkgs.optee-client}/lib/libckteec.so --list-token-slots")

     

       68
       68
       +
             if out.find("OP-TEE PKCS11 TA") < 0:

     

       69
       69
       +
                 raise Exception("optee pkcs11 token not found")

     

       70
       70
       +
           '';

     

       71
       71
       +
         }

     

       72
       72
       +
       )