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

Merge master into staging-next

parents 31c583a7 18f0a621
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ In addition to numerous new and upgraded packages, this release has the followin
  If undesired, the old behavior can be restored by overriding the builders with
  `{ installDocumentation = false; }`.

- The new option `networking.nftables.checkRuleset` controls whether the ruleset is checked for syntax or not during build.  It is `true` by default.  The check might fail because it is in a sandbox environment.  To circumvent this, the ruleset file can be edited using the `networking.nftables.preCheckRuleset` option.

- `mastodon` now supports connection to a remote `PostgreSQL` database.

- `nextcloud` has an option to enable SSE-C in S3.
+6 −1
Original line number Diff line number Diff line
@@ -619,7 +619,12 @@ in stdenv.mkDerivation {
    # Swift has a separate resource root from Clang, but locates the Clang
    # resource root via subdir or symlink. Provide a default here, but we also
    # patch Swift to prefer NIX_CC if set.
    ln -s ${clang}/resource-root $lib/lib/swift/clang
    #
    # NOTE: We don't symlink directly here, because that'd add a run-time dep
    # on the full Clang compiler to every Swift executable. The copy here is
    # just copying the 3 symlinks inside to smaller closures.
    mkdir $lib/lib/swift/clang
    cp -P ${clang}/resource-root/* $lib/lib/swift/clang/

    ${lib.optionalString stdenv.isDarwin ''
    # Install required library for ObjC interop.
+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    # Fix function detection for btf__type_cnt()
    (fetchpatch {
      url = "https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3.patch";
      sha256 = "1i4s4y0z9pf3dnjzxy8k0jkjshhz3b0v49qw4cspjrjlmcmy0x00";
      sha256 = "n6qG/bojSGUowrAaJWxecYpWdv9OceHkoaGlhbl81hA=";
    })
  ];

+13 −3
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper, bash, age, git ? null
, xclip ? null }:
{ lib
, stdenv
, fetchFromGitHub
, makeBinaryWrapper
, bash
, age
, git ? null
, xclip ? null
# Used to pretty-print list of all stored passwords, but is not needed to fetch
# or store password by its name. Most users would want this dependency.
, tree ? null
}:

stdenv.mkDerivation {
  pname = "passage";
@@ -14,7 +24,7 @@ stdenv.mkDerivation {

  nativeBuildInputs = [ makeBinaryWrapper ];

  extraPath = lib.makeBinPath [ age git xclip ];
  extraPath = lib.makeBinPath [ age git xclip tree ];

  # Using $0 is bad, it causes --help to mention ".passage-wrapped".
  postInstall = ''