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

Merge staging-next into staging

parents f4da8aac be3262ba

.github/labeler.yml

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ 
        #       *developed in this repo*;

        #       - not individual tests

        #       - not packages for test frameworks

        - pkgs/build-support/testers/**

        - nixos/lib/testing/**

        - nixos/lib/test-driver/**

        - nixos/tests/nixos-test-driver/**

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,12 @@ 
    name = "alyaeanyx";

    keys = [ { fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; } ];

  };

  amadejkastelic = {

    email = "amadejkastelic7@gmail.com";

    github = "amadejkastelic";

    githubId = 26391003;

    name = "Amadej Kastelic";

  };

  aman9das = {

    email = "amandas62640@gmail.com";

    github = "Aman9das";

nixos/modules/virtualisation/incus.nix

+6 −3
Original line number Diff line number Diff line
@@ -44,19 +44,21 @@ let 
        qemu-utils

        qemu_kvm

        rsync

        skopeo

        squashfs-tools-ng

        squashfsTools

        sshfs

        swtpm

        systemd

        thin-provisioning-tools

        umoci

        util-linux

        virtiofsd

        xdelta

        xz

      ]

      ++ lib.optionals (lib.versionAtLeast cfg.package.version "6.3.0") [

        skopeo

        umoci

      ]

      ++ lib.optionals config.security.apparmor.enable [

        apparmor-bin-utils
@@ -111,10 +113,11 @@ let 
  environment = lib.mkMerge [

    {

      INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";

      INCUS_EDK2_PATH = ovmf;

      INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";

      PATH = lib.mkForce serverBinPath;

    }

    (lib.mkIf (lib.versionOlder cfg.package.version "6.3.0") { INCUS_OVMF_PATH = ovmf; })

    (lib.mkIf (lib.versionAtLeast cfg.package.version "6.3.0") { INCUS_EDK2_PATH = ovmf; })

    (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; })

  ];

pkgs/applications/blockchains/haven-cli/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 


stdenv.mkDerivation rec {

  pname = "haven-cli";

  version = "4.0.0";

  version = "4.0.2";



  src = fetchFromGitHub {

    owner = "haven-protocol-org";

    repo = "haven-main";

    rev = "v${version}";

    hash = "sha256-craPgQtavSatoVzduIQCWuakIBeXWFWa9E0ALau4AcI=";

    hash = "sha256-XjRxpUW7NC12T5G7fol4avWLJDOOawxJbAHOp5eZ0Fk=";

    fetchSubmodules = true;

  };

pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix

+4 −4
Original line number Diff line number Diff line
@@ -6,16 +6,16 @@ 


rustPlatform.buildRustPackage {

  pname = "lspce-module";

  version = "1.1.0-unstable-2024-07-13";

  version = "1.1.0-unstable-2024-07-14";



  src = fetchFromGitHub {

    owner = "zbelial";

    repo = "lspce";

    rev = "01b77a4f544a912409857083842db51a20bfdbf3";

    hash = "sha256-oew5EujNYGjk/agBw3ECAVe7GZl8rw/4M5t32JM+1T8=";

    rev = "fd320476df89cfd5d10f1b70303c891d3b1e3c81";

    hash = "sha256-KnERYq/CvJhJIdQkpH/m82t9KFMapPl+CyZkYyujslU=";

  };



  cargoHash = "sha256-YLcSaFHsm/Iw7Q3y/YkfdbYKUPW0DRmaZnZ1A9vKR14=";

  cargoHash = "sha256-I2OobRu1hc6xc4bRrIO1FImPYBbFy1jXPcTsivbbskk=";



  checkFlags = [

    # flaky test