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

Merge master into staging-next

parents dd5343d5 fd643e9c

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -16521,6 +16521,12 @@ 
    github = "RossComputerGuy";

    githubId = 19699320;

  };

  rostan-t = {

    name = "Rostan Tabet";

    email = "rostan.tabet@gmail.com";

    github = "rostan-t";

    githubId = 30502549;

  };

  rotaerk = {

    name = "Matthew Stewart";

    email = "m.scott.stewart@gmail.com";

nixos/modules/services/x11/desktop-managers/deepin.nix

+5 −4
Original line number Diff line number Diff line
@@ -173,19 +173,20 @@ in 
          ];

          optionalPackages = [

            onboard # dde-dock plugin

            deepin-camera

            deepin-calculator

            deepin-compressor

            deepin-editor

            deepin-picker

            deepin-draw

            deepin-album

            deepin-image-viewer

            deepin-music

            deepin-movie-reborn

            deepin-system-monitor

            deepin-screen-recorder

            deepin-shortcut-viewer

            # freeimage has knownVulnerabilties, don't install packages using freeiamge by default

            # deepin-album

            # deepin-camera

            # deepin-image-viewer

            # deepin-screen-recorder

          ];

        in

        requiredPackages

nixos/modules/system/boot/uki.nix

+16 −1
Original line number Diff line number Diff line
@@ -27,6 +27,20 @@ in 
        description = lib.mdDoc "Version of the image or generation the UKI belongs to";

      };



      tries = lib.mkOption {

        type = lib.types.nullOr lib.types.ints.unsigned;

        default = null;

        description = lib.mdDoc ''

          Number of boot attempts before this UKI is considered bad.



          If no tries are specified (the default) automatic boot assessment remains inactive.



          See documentation on [Automatic Boot Assessment](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/) and

          [boot counting](https://uapi-group.org/specifications/specs/boot_loader_specification/#boot-counting)

          for more information.

        '';

      };



      settings = lib.mkOption {

        type = format.type;

        description = lib.mdDoc ''
@@ -69,8 +83,9 @@ in 
        name = config.boot.uki.name;

        version = config.boot.uki.version;

        versionInfix = if version != null then "_${version}" else "";

        triesInfix = if cfg.tries != null then "+${builtins.toString cfg.tries}" else "";

      in

      name + versionInfix + ".efi";

      name + versionInfix + triesInfix + ".efi";



    system.build.uki = pkgs.runCommand config.system.boot.loader.ukiFile { } ''

      mkdir -p $out

pkgs/applications/editors/rehex/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, which

, zip

, libicns

, botan2

, capstone

, jansson

, libunistring
@@ -19,19 +20,19 @@ 


stdenv.mkDerivation rec {

  pname = "rehex";

  version = "0.60.1";

  version = "0.61.0";



  src = fetchFromGitHub {

    owner = "solemnwarning";

    repo = pname;

    rev = version;

    hash = "sha256-oF8XtxKqyo6c2lNH6WDq6aEPeZw8RqBinDVhPpaDAWg=";

    hash = "sha256-NBBBeTy15q6G30XR2PVd/xdIg41U2pWSPtqpdQX/+9o=";

  };



  nativeBuildInputs = [ pkg-config which zip ]

    ++ lib.optionals stdenv.isDarwin [ libicns ];



  buildInputs = [ capstone jansson libunistring wxGTK32 ]

  buildInputs = [ botan2 capstone jansson libunistring wxGTK32 ]

    ++ (with lua53Packages; [ lua busted ])

    ++ (with perlPackages; [ perl TemplateToolkit ])

    ++ lib.optionals stdenv.isLinux [ gtk3 ]

pkgs/applications/misc/1password-gui/default.nix

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



  pname = "1password";

  version = if channel == "stable" then "8.10.24" else "8.10.26-1.BETA";

  version = if channel == "stable" then "8.10.24" else "8.10.26-38.BETA";



  sources = {

    stable = {
@@ -33,19 +33,19 @@ let 
    beta = {

      x86_64-linux = {

        url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";

        hash = "sha256-dAasy1D5HXQ8Eu5cx0u9exobNMf2TIV4iCTcys/uCtQ=";

        hash = "sha256-7+rwEX/BP5KD77djrJXCl41zviwHfiEi+WZfQeOQksc=";

      };

      aarch64-linux = {

        url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";

        hash = "sha256-sIPNv4HiU/6CLaER6deMG88zOOFwu6cm5XoB2Cr4qLQ=";

        hash = "sha256-ELnO6cRgyZQHWTdB0143Z37Tdkc2iZUauFWTf3eL8AE=";

      };

      x86_64-darwin = {

        url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";

        hash = "sha256-Va4WgbPKrI7u+GYzVmA8Gp6NRY4EdJuoz00Pc5HsMIg=";

        hash = "sha256-fTpz1POmnqWcMtKCfkwyEFoyrZcpV5y7UP4DamsKbzU=";

      };

      aarch64-darwin = {

        url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";

        hash = "sha256-Dj96QoEcmJxV7qBkb68ovonr+XYqQdScb9GMeL8OCJo=";

        hash = "sha256-vAWPcOrjrcY8rC0N9PuNe+vivOkWvB6etW2QQWJJz1k=";

      };

    };

  };