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

Merge staging-next into staging

parents 4b697ae0 c1093794

doc/languages-frameworks/haskell.section.md

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ haskell.compiler.ghcjs ghcjs-8.10.7 
Each of those compiler versions has a corresponding attribute set built using

it. However, the non-standard package sets are not tested regularly and, as a

result, contain fewer working packages. The corresponding package set for GHC

9.4.4 is `haskell.packages.ghc944`. In fact `haskellPackages` is just an alias

9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias

for `haskell.packages.ghc927`:



```console

maintainers/scripts/update-luarocks-packages

+7 −3
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ log = logging.getLogger() 
log.addHandler(logging.StreamHandler())



ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore

from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment

import pluginupdate

from pluginupdate import update_plugins, FetchConfig, CleanEnvironment



PKG_LIST="maintainers/scripts/luarocks-packages.csv"

TMP_FILE="$(mktemp)"
@@ -70,7 +71,7 @@ class LuaPlugin: 
        return self.name.replace(".", "-")



# rename Editor to LangUpdate/ EcosystemUpdater

class LuaEditor(Editor):

class LuaEditor(pluginupdate.Editor):

    def get_current_plugins(self):

        return []
@@ -87,6 +88,9 @@ class LuaEditor(Editor): 
                luaPackages.append(plugin)

        return luaPackages



    def update(self, args):

        update_plugins(self, args)



    def generate_nix(

        self,

        results: List[Tuple[LuaPlugin, str]],

nixos/modules/services/misc/gitea.nix

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ in 
            ${replaceSecretBin} '#internaltoken#' '${internalToken}' '${runConfig}'



            ${lib.optionalString cfg.lfs.enable ''

              ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'"

              ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'

            ''}



            ${lib.optionalString (cfg.mailerPasswordFile != null) ''

nixos/modules/system/boot/systemd/initrd.nix

+0 −19
Original line number Diff line number Diff line
@@ -338,25 +338,6 @@ in { 
  };



  config = mkIf (config.boot.initrd.enable && cfg.enable) {

    assertions = map (name: {

      assertion = config.boot.initrd.${name} == "";

      message = ''

        systemd stage 1 does not support 'boot.initrd.${name}'. Please

        convert it to analogous systemd units in 'boot.initrd.systemd'.



          Definitions:

          ${lib.concatMapStringsSep "\n" ({ file, ... }: "- ${file}") options.boot.initrd.${name}.definitionsWithLocations}

      '';

    }) [

      "preFailCommands"

      "preDeviceCommands"

      "preLVMCommands"

      "postDeviceCommands"

      "postMountCommands"

      "extraUtilsCommands"

      "extraUtilsCommandsTest"

    ];



    system.build = { inherit initialRamdisk; };



    boot.initrd.availableKernelModules = [

pkgs/applications/audio/fluidsynth/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake

, alsa-lib, glib, libjack2, libsndfile, libpulseaudio

, AudioUnit, CoreAudio, CoreMIDI, CoreServices

, AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices

}:



stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [ glib libsndfile libjack2 ]

    ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ]

    ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];

    ++ lib.optionals stdenv.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ];



  cmakeFlags = [

    "-Denable-framework=off"