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

Merge master into staging-next

parents be6dc3cd 24dbf44d

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -11951,6 +11951,13 @@ 
    name = "André Kugland";

    keys = [ { fingerprint = "6A62 5E60 E3FF FCAE B3AA  50DC 1DA9 3817 80CD D833"; } ];

  };

  kuglimon = {

    name = "Tatu Argillander";

    email = "tatu.argillander@kouralabs.com";

    github = "kuglimon";

    githubId = 629430;

    keys = [ { fingerprint = "2843 750C B1AB E256 94BE  40E2 D843 D30B 42CA 0E2D"; } ];

  };

  kupac = {

    github = "Kupac";

    githubId = 8224569;

nixos/modules/virtualisation/libvirtd.nix

+6 −6
Original line number Diff line number Diff line
@@ -426,9 +426,11 @@ in 
            libvirt/qemu/networks/*.xml \

            libvirt/nwfilter/*.xml );

        do

            mkdir -p /var/lib/$(dirname $i) -m 755

            if [ ! -e /var/lib/$i ]; then

              cp -pd ${cfg.package}/var/lib/$i /var/lib/$i

            # Intended behavior

            # shellcheck disable=SC2174

            mkdir -p "/var/lib/$(dirname "$i")" -m 755

            if [ ! -e "/var/lib/$i" ]; then

              cp -pd "${cfg.package}/var/lib/$i" "/var/lib/$i"

            fi

        done
@@ -440,9 +442,7 @@ in 
          ln -s --force "$emulator" /run/${dirName}/nix-emulators/

        done



        for helper in bin/qemu-pr-helper; do

          ln -s --force ${cfg.qemu.package}/$helper /run/${dirName}/nix-helpers/

        done

        ln -s --force ${cfg.qemu.package}/bin/qemu-pr-helper /run/${dirName}/nix-helpers/



        ${optionalString cfg.qemu.ovmf.enable (let

          ovmfpackage = pkgs.buildEnv {

nixos/tests/wordpress.nix

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ rec { 
      networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];

    };

  }) {} [

    "6_5" "6_6"

    "6_6"

  ];



  testScript = ''

pkgs/applications/editors/vscode/extensions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4554,8 +4554,8 @@ let 
        mktplcRef = {

          name = "code-spell-checker";

          publisher = "streetsidesoftware";

          version = "4.0.15";

          hash = "sha256-Zow0laXwORa3V5Hy40pWDa/+Xq7kQbgn/Ia6PrJxI6E=";

          version = "4.0.16";

          hash = "sha256-1GH3liiExURy5e6owSRr5UJ7UXa8KUgglIzfGsSPARg=";

        };

        meta = {

          changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";

pkgs/applications/graphics/ImageMagick/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ in 


stdenv.mkDerivation (finalAttrs: {

  pname = "imagemagick";

  version = "7.1.1-39";

  version = "7.1.1-40";



  src = fetchFromGitHub {

    owner = "ImageMagick";

    repo = "ImageMagick";

    rev = finalAttrs.version;

    hash = "sha256-3NUl0q/j3dBdNBtLH+69vh0elobBnTOvqQpC/2KwGBU=";

    hash = "sha256-NrTIx1OvwPIeVlA39hGkXZ2Atk4FCsU3/55SZeSc40E=";

  };



  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big