Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 42001e561347
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8137763956a1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 29, 2020

  1. Doc: Fix typo 

    (cherry picked from commit dc434b0)
    @davidak
    davidak committed Mar 29, 2020
    Copy the full SHA
    680d4ce View commit details

  2. nixos/phpfpm: add example to socket 

    (cherry picked from commit c7e4c3b)
    @davidak
    davidak committed Mar 29, 2020
    Copy the full SHA
    9f99a89 View commit details

Commits on Mar 30, 2020

  1. Merge pull request #83726 from davidak/backport 

    [20.03] Backport small doc improvements
    @rnhmjoj
    rnhmjoj authored Mar 30, 2020
    Copy the full SHA
    8137763 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 nixos/doc/manual/release-notes/rl-2003.xml
  2. +1 −0 nixos/modules/services/web-servers/phpfpm/default.nix
2 changes: 1 addition & 1 deletion nixos/doc/manual/release-notes/rl-2003.xml
View file
Original file line number Diff line number Diff line change
@@ -485,7 +485,7 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
<listitem>
<para>
The <literal>buildRustCrate</literal> infrastructure now produces <literal>lib</literal> outputs in addition to the <literal>out</literal> output.
This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output.
This has led to drastically reduced closure sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output.
</para>
</listitem>
<listitem>
1 change: 1 addition & 0 deletions nixos/modules/services/web-servers/phpfpm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ let
Path to the unix socket file on which to accept FastCGI requests.
<note><para>This option is read-only and managed by NixOS.</para></note>
'';
example = "${runtimeDir}/<name>.sock";
};

listen = mkOption {