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

Merge master into staging-nixos

parents 39d1a3a7 dcb331fe

doc/doc-support/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ stdenvNoCC.mkDerivation ( 
    };

  in

  {

    name = "nixpkgs-manual";

    inherit (lib.trivial) version;

    pname = "nixpkgs-manual";



    nativeBuildInputs = [ nixos-render-docs ];

doc/packages/eclipse.section.md

+5 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by 
$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description

```



If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.

If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ src }` and either `pname` or `name` + `version` as arguments, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes `{ srcFeature, srcPlugin }` and either `pname` or `name` + `version` as arguments, where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.



Expanding the previous example with two plugins using the above functions, we have:
@@ -47,7 +47,8 @@ Expanding the previous example with two plugins using the above functions, we ha 
        plugins = [

          plugins.color-theme

          (plugins.buildEclipsePlugin {

            name = "myplugin1-1.0";

            pname = "myplugin1";

            version = "1.0";

            srcFeature = fetchurl {

              url = "http://…/features/myplugin1.jar";

              hash = "sha256-123…";
@@ -58,7 +59,8 @@ Expanding the previous example with two plugins using the above functions, we ha 
            };

          })

          (plugins.buildEclipseUpdateSite {

            name = "myplugin2-1.0";

            pname = "myplugin2";

            version = "1.0";

            src = fetchurl {

              stripRoot = false;

              url = "http://…/myplugin2.zip";

maintainers/maintainer-list.nix

+0 −20
Original line number Diff line number Diff line
@@ -1403,14 +1403,6 @@ 
    githubId = 60479013;

    name = "Alma Cemerlic";

  };

  alois31 = {

    name = "Alois Wohlschlager";

    email = "alois1@gmx-topmail.de";

    matrix = "@aloisw:kde.org";

    github = "alois31";

    githubId = 36605164;

    keys = [ { fingerprint = "CA97 A822 FF24 25D4 74AF  3E4B E0F5 9EA5 E521 6914"; } ];

  };

  Alper-Celik = {

    email = "alper@alper-celik.dev";

    name = "Alper Çelik";
@@ -1755,12 +1747,6 @@ 
    matrix = "@andrew:kvalhe.im";

    name = "Andrew Kvalheim";

  };

  andrewrk = {

    email = "superjoe30@gmail.com";

    github = "andrewrk";

    githubId = 106511;

    name = "Andrew Kelley";

  };

  andrewzah = {

    name = "Andrew Zah";

    github = "andrewzah";
@@ -13850,12 +13836,6 @@ 
    githubId = 20063;

    name = "Pascal Hertleif";

  };

  kiloreux = {

    email = "kiloreux@gmail.com";

    github = "kiloreux";

    githubId = 6282557;

    name = "Kiloreux Emperex";

  };

  kim0 = {

    email = "email.ahmedkamal@googlemail.com";

    github = "kim0";

nixos/modules/services/hardware/tuxedo-rs.nix

+3 −1
Original line number Diff line number Diff line
@@ -49,5 +49,7 @@ in 
    ]

  );



  meta.maintainers = with lib.maintainers; [ mrcjkb ];

  meta.maintainers = with lib.maintainers; [

    xaverdh

  ];

}

nixos/modules/services/networking/acme-dns.nix

+2 −2
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ in 
          database = {

            engine = mkOption {

              type = types.enum [

                "sqlite3"

                "sqlite"

                "postgres"

              ];

              description = "Database engine to use.";

              default = "sqlite3";

              default = "sqlite";

            };

            connection = mkOption {

              type = types.str;