Unverified Commit dc23b83b authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 9f09f92c e6f9181e

doc/languages-frameworks/python.section.md

+7 −0
Original line number Diff line number Diff line
@@ -1259,6 +1259,13 @@ as many tests should be enabled as possible. Failing tests can still be 
a good indication that the package is not in a valid state.

:::



::: {.note}

We only want to test the functionality of a package. In particular, we are not

interested in coverage, formatting, and type checking. If pytest fails with

`unrecognized arguments: --cov`, add `pytest-cov-stub` to `nativeCheckInputs`

rather than `pytest-cov`.

:::



#### Using pytest {#using-pytest}



Pytest is the most common test runner for python repositories. A trivial

nixos/tests/all-tests.nix

+0 −1
Original line number Diff line number Diff line
@@ -1529,7 +1529,6 @@ in 
  zoom-us = runTest ./zoom-us.nix;

  zram-generator = runTest ./zram-generator.nix;

  zrepl = runTest ./zrepl.nix;

  zsh-history = runTest ./zsh-history.nix;

  zwave-js = runTest ./zwave-js.nix;

  zwave-js-ui = runTest ./zwave-js-ui.nix;

}

nixos/tests/zsh-history.nix

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
{ pkgs, ... }:

{

  name = "zsh-history";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ ];

  };



  nodes.default =

    { ... }:

    {

      programs = {

        zsh.enable = true;

      };

      environment.systemPackages = [ pkgs.zsh-history ];

      programs.zsh.interactiveShellInit = ''

        source ${pkgs.zsh-history.out}/share/zsh/init.zsh

      '';

      users.users.root.shell = "${pkgs.zsh}/bin/zsh";

    };



  testScript = ''

    start_all()

    default.wait_for_unit("multi-user.target")

    default.wait_until_succeeds("pgrep -f 'agetty.*tty1'")



    # Login

    default.wait_until_tty_matches("1", "login: ")

    default.send_chars("root\n")

    default.wait_until_tty_matches("1", r"\nroot@default\b")



    # Generate some history

    default.send_chars("echo foobar\n")

    default.wait_until_tty_matches("1", "foobar")



    # Ensure that command was recorded in history

    default.succeed("/run/current-system/sw/bin/history list | grep -q foobar")

  '';

}

pkgs/by-name/_0/_0xpropo/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation rec { 
    runHook postInstall

  '';



  meta = with lib; {

  meta = {

    description = "Proportional version of the 0xProto font";

    homepage = "https://github.com/0xType/0xPropo";

    changelog = "https://github.com/0xType/0xPropo/releases/tag/${version}";

    license = licenses.ofl;

    maintainers = with maintainers; [ vinnymeller ];

    platforms = platforms.all;

    license = lib.licenses.ofl;

    maintainers = with lib.maintainers; [ vinnymeller ];

    platforms = lib.platforms.all;

  };

}

pkgs/by-name/_3/_3270font/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -29,15 +29,15 @@ stdenvNoCC.mkDerivation rec { 
    runHook postInstall

  '';



  meta = with lib; {

  meta = {

    description = "Monospaced font based on IBM 3270 terminals";

    homepage = "https://github.com/rbanffy/3270font";

    changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md";

    license = [

      licenses.bsd3

      licenses.ofl

      lib.licenses.bsd3

      lib.licenses.ofl

    ];

    maintainers = [ ];

    platforms = platforms.all;

    maintainers = with lib.maintainers; [ ];

    platforms = lib.platforms.all;

  };

}