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

Merge master into staging-next

parents 4de88b48 d6f326af

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -16554,6 +16554,18 @@ 
    githubId = 3521180;

    name = "Tom Sydney Kerckhove";

  };

  normalcea = {

    name = "normalcea";

    email = "normalc@posteo.net";

    github = "normalcea";

    githubId = 190049873;

    keys = [

      {

        fingerprint = "6057 1155 7BA4 B922 66D6 2064 3DE3 BCB2 142A 8C71";

      }

    ];

    matrix = "@normalcea:matrix.org";

  };

  nosewings = {

    name = "Nicholas Coltharp";

    email = "coltharpnicholas@gmail.com";

nixos/modules/system/etc/etc.nix

+2 −2
Original line number Diff line number Diff line
@@ -268,10 +268,10 @@ in 


            ${lib.optionalString config.system.etc.overlay.mutable ''

              # These directories are usually created in initrd,

              # but we need to create them here when we didn't we're called directly,

              # but we need to create them here when we're called directly,

              # for instance by nixos-enter

              mkdir --parents /.rw-etc/upper /.rw-etc/work

              chmod --recursive 0755 /.rw-etc

              chmod 0755 /.rw-etc /.rw-etc/upper /.rw-etc/work

            ''}



            tmpMetadataMount=$(TMPDIR="/run" mktemp --directory -t nixos-etc-metadata.XXXXXXXXXX)

nixos/tests/pleroma.nix

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ import ./make-test-python.nix ( 
        pleroma.succeed("provision-db")

        pleroma.wait_for_file("/var/lib/pleroma")

        pleroma.succeed("provision-secrets")

        pleroma.systemctl("restart pleroma-migrations.service")

        pleroma.systemctl("restart pleroma.service")

        pleroma.wait_for_unit("pleroma.service")

        pleroma.succeed("provision-user")

pkgs/applications/networking/cluster/terraform-providers/providers.json

+3 −3
Original line number Diff line number Diff line
@@ -714,13 +714,13 @@ 
    "vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ="

  },

  "kubectl": {

    "hash": "sha256-5r8ZpifNJZ+UHys7jWVZCd6f9ylT3NBiccsCSQbNy6o=",

    "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",

    "homepage": "https://registry.terraform.io/providers/gavinbunney/kubectl",

    "owner": "gavinbunney",

    "repo": "terraform-provider-kubectl",

    "rev": "v1.18.0",

    "rev": "v1.19.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-pE0WujGxCMW0/27F8aaNtyIHdsOJTwEJL+bdiHpzu7s="

    "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="

  },

  "kubernetes": {

    "hash": "sha256-eSAgeN/ExP75Kbhb099t3vW0XQA2TXIhiyv1RUt4ziM=",

pkgs/applications/networking/remote/freerdp/3.nix

+3 −5
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  stdenv,

  lib,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  docbook-xsl-nons,

  libxslt,
@@ -62,20 +61,19 @@ 
  # tries to compile and run generate_argument_docbook.c

  withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,



  buildPackages,

  gnome,

  remmina,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "freerdp";

  version = "3.9.0";

  version = "3.10.3";



  src = fetchFromGitHub {

    owner = "FreeRDP";

    repo = "FreeRDP";

    rev = finalAttrs.version;

    hash = "sha256-oThlqUpEmhcLpMMYExMA3GbtB2+lq6oc5TRZt0eKRLA=";

    hash = "sha256-qFjR1Z2GZsNpgjlbHw+o+dLCBLZQ9D9c93FFqFGM8T4=";

  };



  postPatch =