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

Merge master into staging-nixos

parents 1294e05b cb578a48

ci/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/top-level/agda-packages.nix         @NixOS/agda

/pkgs/development/libraries/agda          @NixOS/agda

/doc/languages-frameworks/agda.section.md @NixOS/agda

/nixos/tests/agda.nix                     @NixOS/agda

/nixos/tests/agda                         @NixOS/agda



# Idris

/pkgs/development/idris-modules @Infinisil

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -4254,6 +4254,11 @@ 
    githubId = 498906;

    name = "Karolis Stasaitis";

  };

  carlostome = {

    name = "Carlos Tomé Cortiñas";

    github = "carlostome";

    githubId = 2206578;

  };

  carlsverre = {

    email = "accounts@carlsverre.com";

    github = "carlsverre";

maintainers/team-list.nix

+1 −11
Original line number Diff line number Diff line
@@ -351,17 +351,7 @@ with lib.maintainers; 
  };



  formatter = {

    members = [

      piegames

      infinisil

      das_j

      _0x4A6F

      MattSturgeon

      jfly

      Sereja313

    ];

    scope = "Nix formatting team: https://nixos.org/community/teams/formatting/";

    shortName = "Nix formatting team";

    github = "nix-formatting";

  };



  freedesktop = {

nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix

+1 −0
Original line number Diff line number Diff line
@@ -1353,6 +1353,7 @@ in 
        netmask = mkCommaSepListParam [ ] "Address or CIDR subnets";

        server = mkCommaSepListParam [ ] "Address or CIDR subnets";

        subnet = mkCommaSepListParam [ ] "Address or CIDR subnets";

        p_cscf = mkCommaSepListParam [ ] "Address or CIDR subnets";

        split_include = mkCommaSepListParam [ ] "Address or CIDR subnets";

        split_exclude = mkCommaSepListParam [ ] "Address or CIDR subnets";

      }

nixos/tests/agda.nix→nixos/tests/agda/base.nix

+5 −7
Original line number Diff line number Diff line 
{ pkgs, ... }:



let

  hello-world = pkgs.writeText "hello-world" ''

    {-# OPTIONS --guardedness #-}

    open import IO

    open import Level



    main = run {0ℓ} (putStrLn "Hello World!")

  '';

  hello-world = ./files/HelloWorld.agda;

in

{

  name = "agda";
@@ -30,6 +24,10 @@ in 
    };



  testScript = ''

    # agda and agda-mode are in path

    machine.succeed("agda --version")

    machine.succeed("agda-mode")



    # Minimal script that typechecks

    machine.succeed("touch TestEmpty.agda")

    machine.succeed("agda TestEmpty.agda")