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

Merge staging-next into staging

parents 6176f16d d4de7c01

doc/doc-support/lib-function-locations.nix

+1 −1
Original line number Diff line number Diff line 
{ pkgs, nixpkgs ? { }, libsets }:

let

  revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");

  revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master");



  libDefPos = prefix: set:

    builtins.concatMap

doc/languages-frameworks/coq.section.md

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c 
* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`,

* `extraBuildInputs` (optional, deprecated), an additional list of derivation to add to `buildInputs`,

* `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements,

* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly,

* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environments of subsequent derivation, which is necessary for Coq packages to work correctly,

* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against.

* `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"`  will use dune if the version of the package is greater or equal to `"1.1"`,

* `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.

maintainers/maintainer-list.nix

+19 −0
Original line number Diff line number Diff line
@@ -4149,6 +4149,16 @@ 
    githubId = 1931963;

    name = "David Sferruzza";

  };

  dsuetin = {

    name = "Danil Suetin";

    email = "suetin085@gmail.com";

    matrix = "@dani0854:matrix.org";

    github = "dani0854";

    githubId = 32674935;

    keys = [{

      fingerprint = "6CC2 D713 6703 0D86 CA29  C71F 23B5 AA6F A374 F2FE";

    }];

  };

  dsymbol = {

    name = "dsymbol";

    github = "dsymbol";
@@ -12615,6 +12625,15 @@ 
    githubId = 1024891;

    name = "Jens Nolte";

  };

  quentin = {

    email = "quentin@mit.edu";

    github = "quentinmit";

    githubId = 115761;

    name = "Quentin Smith";

    keys = [{

      fingerprint = "1C71 A066 5400 AACD 142E  B1A0 04EE 05A8 FCEF B697";

    }];

  };

  quentini = {

    email = "quentini@airmail.cc";

    github = "QuentinI";

nixos/modules/services/networking/peroxide.nix

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ let 
in

{

  options.services.peroxide = {

    enable = mkEnableOption (lib.mdDoc "enable");

    enable = mkEnableOption (lib.mdDoc "peroxide");



    package = mkPackageOptionMD pkgs "peroxide" {

      default = [ "peroxide" ];

pkgs/applications/audio/go-musicfox/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
# gcc only supports objc on darwin

buildGoModule.override { stdenv = clangStdenv; } rec {

  pname = "go-musicfox";

  version = "4.0.1";

  version = "4.0.2";



  src = fetchFromGitHub {

    owner = "anhoder";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-eOcQWw5wXU59/EzDLk028mV/Ro6Ii0DYcp4wdDedhrA=";

    hash = "sha256-ZxyW/NUKSCcx/KGgFV2pt5ucTBP7BE7qFeTvBoRmUvQ=";

  };



  deleteVendor = true;