Commit 382ef6cd authored by Emily's avatar Emily
Browse files

Merge staging-next into staging

parents 38eefea4 28739cf8

ci/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/doc/languages-frameworks/java.section.md @NixOS/java

/doc/languages-frameworks/gradle.section.md @NixOS/java

/doc/languages-frameworks/maven.section.md @NixOS/java

/nixos/modules/programs/java.nix @NixOS/java

/pkgs/top-level/java-packages.nix @NixOS/java



# Jetbrains

doc/build-helpers/trivial-build-helpers.chapter.md

+0 −4
Original line number Diff line number Diff line
@@ -754,10 +754,6 @@ This creates a derivation with a directory structure like the following: 
...

```



## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile}



Deprecated. Use [`writeClosure`](#trivial-builder-writeClosure) instead.



## `writeClosure` {#trivial-builder-writeClosure}



Given a list of [store paths](https://nixos.org/manual/nix/stable/glossary#gloss-store-path) (or string-like expressions coercible to store paths), write their collective [closure](https://nixos.org/manual/nix/stable/glossary#gloss-closure) to a text file.

doc/redirects.json

+2 −4
Original line number Diff line number Diff line
@@ -1421,11 +1421,9 @@ 
  "trivial-builder-symlinkJoin": [

    "index.html#trivial-builder-symlinkJoin"

  ],

  "trivial-builder-writeReferencesToFile": [

    "index.html#trivial-builder-writeReferencesToFile"

  ],

  "trivial-builder-writeClosure": [

    "index.html#trivial-builder-writeClosure"

    "index.html#trivial-builder-writeClosure",

    "index.html#trivial-builder-writeReferencesToFile"

  ],

  "trivial-builder-writeDirectReferencesToFile": [

    "index.html#trivial-builder-writeDirectReferencesToFile"

lib/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ let 
      scrubOptionValue literalExpression literalExample

      showOption showOptionWithDefLocs showFiles

      unknownModule mkOption mkPackageOption mkPackageOptionMD

      mdDoc literalMD;

      literalMD;

    inherit (self.types) isType setType defaultTypeMerge defaultFunctor

      isOptionType mkOptionType;

    inherit (self.asserts)

lib/options.nix

+0 −7
Original line number Diff line number Diff line
@@ -399,13 +399,6 @@ rec { 


  literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression;



  /* Transition marker for documentation that's already migrated to markdown

     syntax. Has been a no-op for some while and been removed from nixpkgs.

     Kept here to alert downstream users who may not be aware of the migration's

     completion that it should be removed from modules.

  */

  mdDoc = lib.warn "lib.mdDoc will be removed from nixpkgs in 24.11. Option descriptions are now in Markdown by default; you can remove any remaining uses of lib.mdDoc.";



  /* For use in the `defaultText` and `example` option attributes. Causes the

     given MD text to be inserted verbatim in the documentation, for when

     a `literalExpression` would be too hard to read.