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

Merge master into staging-next

parents 6743bc9b 82690ff5

maintainers/maintainer-list.nix

+6 −18
Original line number Diff line number Diff line
@@ -476,12 +476,6 @@ 
    githubId = 908758;

    name = "Abigail Bunyan";

  };

  aborsu = {

    email = "a.borsu@gmail.com";

    github = "aborsu";

    githubId = 5033617;

    name = "Augustin Borsu";

  };

  aboseley = {

    email = "adam.boseley@gmail.com";

    github = "aboseley";
@@ -23982,12 +23976,6 @@ 
    email = "hey@sandydoo.me";

    matrix = "@sandydoo:matrix.org";

  };

  santosh = {

    email = "santoshxshrestha@gmail.com";

    name = "Santosh Shrestha";

    github = "santoshxshrestha";

    githubId = 182977126;

  };

  sarahec = {

    email = "seclark@nextquestion.net";

    github = "sarahec";
@@ -26250,12 +26238,6 @@ 
    githubId = 12595971;

    name = "Guillaume Girol";

  };

  synthetica = {

    email = "nix@hilhorst.be";

    github = "Synthetica9";

    githubId = 7075751;

    name = "Patrick Hilhorst";

  };

  sysedwinistrator = {

    email = "edwin.mowen@gmail.com";

    github = "sysedwinistrator";
@@ -28463,6 +28445,12 @@ 
    githubId = 7235381;

    name = "Ondřej Kvapil";

  };

  vimlinuz = {

    email = "vimlinuz@gmail.com";

    name = "Santosh Shrestha";

    github = "vimlinuz";

    githubId = 182977126;

  };

  vincentbernat = {

    email = "vincent@bernat.ch";

    github = "vincentbernat";

maintainers/scripts/hydra_eval_check

deleted100755 → 0
+0 −13
Original line number Diff line number Diff line 
#! /bin/sh



# give absolute path of release.nix as argument

hydra_eval_jobs \

  --argstr system x86_64-linux \

  --argstr system i686-linux \

  --argstr system x86_64-darwin \

  --argstr system i686-cygwin \

  --argstr system x86_64-cygwin \

  --argstr system i686-freebsd \

  --arg officialRelease false \

  --arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \

  $@

maintainers/team-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ with lib.maintainers; 


  gcc = {

    members = [

      synthetica

      vcunat

      ericson2314

    ];

nixos/modules/services/development/jupyter/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ let 
in

{

  meta.maintainers = with lib.maintainers; [

    aborsu

    b-m-f

  ];

nixos/tests/pulseaudio.nix

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ let 
      in

      {

        name = "pulseaudio${lib.optionalString fullVersion "Full"}${lib.optionalString systemWide "-systemWide"}";

        meta = with pkgs.lib.maintainers; {

          maintainers = [ synthetica ] ++ pkgs.pulseaudio.meta.maintainers;

        meta = {

          maintainers = pkgs.pulseaudio.meta.maintainers;

        };



        nodes.machine =