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

Merge master into staging-next

parents cdd0c54f 9c7fe48d

nixos/modules/virtualisation/docker-rootless.nix

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ in 
      default = pkgs.docker;

      defaultText = literalExpression "pkgs.docker";

      type = types.package;

      example = literalExpression "pkgs.docker-edge";

      description = ''

        Docker package to be used in the module.

      '';

nixos/modules/virtualisation/docker.nix

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ in 
      default = pkgs.docker;

      defaultText = literalExpression "pkgs.docker";

      type = types.package;

      example = literalExpression "pkgs.docker-edge";

      description = ''

        Docker package to be used in the module.

      '';

nixos/tests/all-tests.nix

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ let 
  doas = handleTest ./doas.nix {};

  docker = handleTestOn ["x86_64-linux"] ./docker.nix {};

  docker-rootless = handleTestOn ["x86_64-linux"] ./docker-rootless.nix {};

  docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {};

  docker-registry = handleTest ./docker-registry.nix {};

  docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};

  docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};

nixos/tests/docker-edge.nix

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
# This test runs docker and checks if simple container starts



import ./make-test-python.nix ({ pkgs, ...} : {

  name = "docker";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ nequissimus offline ];

  };



  nodes = {

    docker =

      { pkgs, ... }:

        {

          virtualisation.docker.enable = true;

          virtualisation.docker.package = pkgs.docker-edge;



          users.users = {

            noprivs = {

              isNormalUser = true;

              description = "Can't access the docker daemon";

              password = "foobar";

            };



            hasprivs = {

              isNormalUser = true;

              description = "Can access the docker daemon";

              password = "foobar";

              extraGroups = [ "docker" ];

            };

          };

        };

    };



  testScript = ''

    start_all()



    docker.wait_for_unit("sockets.target")

    docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg")

    docker.succeed(

        "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"

    )

    docker.succeed("docker ps | grep sleeping")

    docker.succeed("sudo -u hasprivs docker ps")

    docker.fail("sudo -u noprivs docker ps")

    docker.succeed("docker stop sleeping")



    # Must match version 4 times to ensure client and server git commits and versions are correct

    docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "4" ]')

  '';

})

pkgs/applications/audio/gnaural/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ gtk2 libsndfile portaudio ];



  # Workaround build failure on -fno-common toolchains:

  #   ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint';

  #     src/net/../../src/gnauralnet.h:233: first defined here

  NIX_CFLAGS_COMPILE = "-fcommon";



  postInstall = ''

    mkdir -p $out/share/applications

    substitute \