Unverified Commit 3bb3e89f authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents f018e44b 65ed2124

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -11457,6 +11457,12 @@ 
    githubId = 36448130;

    name = "Michael Brantley";

  };

  linbreux = {

    email = "linbreux@gmail.com";

    github = "linbreux";

    githubId = 29354411;

    name = "linbreux";

  };

  linc01n = {

    email = "git@lincoln.hk";

    github = "linc01n";

maintainers/scripts/bootstrap-files/README.md

+24 −0
Original line number Diff line number Diff line
@@ -47,6 +47,30 @@ target: 
   who can help you test the updated architecture and once reviewed tag

  `@lovesegfault` to upload the tarballs.



## How to add bootstrap files for a new target



The procedure to add a new target is very similar to the update

procedure. The only difference is that you need to set up a new job to

build the `bootstrapFiles`. To do that you will need the following:



1. Add your new target to `lib/systems/examples.nix`



   This will populate `pkgsCross.$target` attribute set. If you are

   dealing with `bootstrapFiles` upload you probably already have it.



2. Add your new target to

   `pkgs/stdenv/linux/make-bootstrap-tools-cross.nix`. This will add a

   new hydra job to `nixpkgs:cross-trunk` jobset.



3. Wait for a hydra to build your bootstrap tarballs.



4. Add your new target to

   `maintainers/scripts/bootstrap-files/refresh-tarballs.bash` around

   `CROSS_TARGETS=()`.



5. Add your new target to `pkgs/stdenv/linux/default.nix` and follow

   standard bootstrap seed update procedure above.



## Bootstrap files job definitions



There are two types of bootstrap files:

nixos/modules/services/monitoring/nezha-agent.nix

+14 −1
Original line number Diff line number Diff line
@@ -24,6 +24,13 @@ in 
          Enable SSL/TLS encryption.

        '';

      };

      gpu = lib.mkOption {

        type = lib.types.bool;

        default = true;

        description = ''

          Enable GPU monitoring.

        '';

      };

      disableCommandExecute = lib.mkOption {

        type = lib.types.bool;

        default = true;
@@ -46,7 +53,12 @@ in 
        '';

      };

      reportDelay = lib.mkOption {

        type = lib.types.enum [ 1 2 3 4 ];

        type = lib.types.enum [

          1

          2

          3

          4

        ];

        default = 1;

        description = ''

          The interval between system status reportings.
@@ -96,6 +108,7 @@ in 
        ++ lib.optional cfg.skipConnection "--skip-conn"

        ++ lib.optional cfg.skipProcess "--skip-procs"

        ++ lib.optional cfg.tls "--tls"

        ++ lib.optional cfg.gpu "--gpu"

      );

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

    };

nixos/modules/services/web-apps/keycloak.nix

+5 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ in 
            };



            hostname = mkOption {

              type = str;

              type = nullOr str;

              example = "keycloak.example.com";

              description = ''

                The hostname part of the public URL used as base for
@@ -477,6 +477,10 @@ in 
            assertion = createLocalPostgreSQL -> config.services.postgresql.settings.standard_conforming_strings or true;

            message = "Setting up a local PostgreSQL db for Keycloak requires `standard_conforming_strings` turned on to work reliably";

          }

          {

            assertion = cfg.settings.hostname != null || ! cfg.settings.hostname-strict or true;

            message = "Setting the Keycloak hostname is required, see `services.keycloak.settings.hostname`";

          }

          {

            assertion = cfg.settings.hostname-url or null == null;

            message = ''

pkgs/applications/blockchains/trezor-suite/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
let

  pname = "trezor-suite";

  version = "24.6.2";

  name = "${pname}-${version}";



  suffix = {

    aarch64-linux = "linux-arm64";
@@ -17,7 +16,7 @@ let 
  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");



  src = fetchurl {

    url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";

    url = "https://github.com/trezor/trezor-suite/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";

    hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'

      aarch64-linux = "sha512-fJnka//9DbvTTq7GEN++6thU8f8BL4cHh1J4P/Tu9Eu94KWCHDG2IwFALOXEvZnwLbxFYiu3Cqldp2RIxYFXTA==";

      x86_64-linux  = "sha512-/gRQR1EriiwrDj04BTnhXlsawJgHp6TqgHpgVCMO1r+U2zGiFLdNfwG/SYwARE+55X8Umls5hCt/wuCpTEPkEg==";
@@ -25,16 +24,15 @@ let 
  };



  appimageContents = appimageTools.extractType2 {

    inherit name src;

    inherit pname version src;

  };



in



appimageTools.wrapType2 rec {

  inherit name src;

  inherit pname version src;



  extraInstallCommands = ''

    mv $out/bin/${name} $out/bin/${pname}

    mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources



    cp -a ${appimageContents}/locales/ $out/share/${pname}