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

Merge master into staging-next

parents 4ff02731 15792f0c

maintainers/maintainer-list.nix

+13 −0
Original line number Diff line number Diff line
@@ -1902,6 +1902,13 @@ 
    githubId = 7745457;

    name = "Astavie";

  };

  asterismono = {

    email = "cmiki@amono.me";

    github = "AsterisMono";

    githubId = 54884471;

    name = "Chatnoir Miki";

    matrix = "@mikiiki:matrix.org";

  };

  astro = {

    email = "astro@spaceboyz.net";

    github = "astro";
@@ -8083,6 +8090,12 @@ 
    githubId = 1162118;

    name = "Harald Gliebe";

  };

  hakan-demirli = {

    email = "ehdemirli@proton.me";

    github = "hakan-demirli";

    githubId = 78746991;

    name = "Emre Hakan Demirli";

  };

  hakuch = {

    email = "hakuch@gmail.com";

    github = "hakuch";

nixos/tests/userborn.nix

+8 −0
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ in 
    with subtest("sysusers group is created"):

      print(machine.succeed("getent group sysusers"))



    with subtest("Check files"):

      print(machine.succeed("grpck -r"))

      print(machine.succeed("pwck -r"))





    machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch")
@@ -123,5 +127,9 @@ in 


    with subtest("new-group group is created after switching to new generation"):

      print(machine.succeed("getent group new-group"))



    with subtest("Check files"):

      print(machine.succeed("grpck -r"))

      print(machine.succeed("pwck -r"))

  '';

}

pkgs/by-name/ad/ad-miner/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "ad-miner";

  version = "1.5.2";

  version = "1.6.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "Mazars-Tech";

    repo = "AD_Miner";

    rev = "refs/tags/v${version}";

    hash = "sha256-Xb0RFllg3oqW6PhUjRxDkgXd7lv7XD37FfBsnpxrN+s=";

    hash = "sha256-kWIareupm0r48HGnESk5S/0IEKjDfHtXWi64ehjdAQ4=";

  };



  # All requirements are pinned

pkgs/by-name/de/devenv/package.nix

+2 −4
Original line number Diff line number Diff line
@@ -4,19 +4,17 @@ 
, makeWrapper

, rustPlatform

, testers



, cachix

, darwin

, libgit2

, nix

, nixVersions

, openssl

, pkg-config



, devenv  # required to run version test

}:



let

  devenv_nix = nix.overrideAttrs (old: {

  devenv_nix = nixVersions.nix_2_24.overrideAttrs (old: {

    version = "2.24-devenv";

    src = fetchFromGitHub {

      owner = "domenkozar";

pkgs/by-name/n8/n8n/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: { 
    maintainers = with maintainers; [

      freezeboy

      gepbird

      k900

    ];

    license = licenses.sustainableUse;

    mainProgram = "n8n";