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

Merge master into staging-next

parents 7be243f4 b618b954

doc/languages-frameworks/haskell.section.md

+3 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,9 @@ benchmark component. 
`disableLibraryProfiling drv`

: Sets the `enableLibraryProfiling` argument to `false` for `drv`.



`disableParallelBuilding drv`

: Sets the `enableParallelBuilding` argument to `false` for `drv`.



#### Library functions in the Haskell package sets {#haskell-package-set-lib-functions}



Some library functions depend on packages from the Haskell package sets. Thus they are

lib/tests/modules.sh

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ checkConfigError 'A submoduleWith option is declared multiple times with conflic 


# _type check

checkConfigError 'Expected a module, but found a value of type .*"flake".*, while trying to load a module into .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix

checkConfigOutput '^true$' "$@" config.enable ./declare-enable.nix ./define-enable-with-top-level-mkIf.nix

checkConfigOutput '^true$' config.enable ./declare-enable.nix ./define-enable-with-top-level-mkIf.nix

checkConfigError 'Expected a module, but found a value of type .*"configuration".*, while trying to load a module into .*/import-configuration.nix.' config ./import-configuration.nix

checkConfigError 'please only import the modules that make up the configuration' config ./import-configuration.nix

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -23800,6 +23800,13 @@ 
    githubId = 1108325;

    name = "Théo Zimmermann";

  };

  zimward = {

    name = "zimward";

    github = "zimward";

    githubId = 96021122;

    matrix = "@memoryfragmentation:matrix.org";

    keys = [ { fingerprint = "CBF7 FA5E F4B5 8B68 5977  3E3E 4CAC 61D6 A482 FCD9"; } ];

  };

  zlepper = {

    name = "Rasmus Hansen";

    github = "zlepper";

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

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

        cfg = config.boot.initrd.systemd;

      in

      lib.mkIf cfg.tpm2.enable {

      lib.mkIf (cfg.enable && cfg.tpm2.enable) {

        boot.initrd.systemd.additionalUpstreamUnits = [

          "tpm2.target"

          "systemd-tpm2-setup-early.service"

pkgs/applications/audio/galaxy-buds-client/default.nix

+13 −11
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ buildDotnetModule rec { 
    gm convert $src/GalaxyBudsClient/Resources/icon_white.ico $out/share/icons/hicolor/256x256/apps/${meta.mainProgram}.png

  '';



  desktopItems = makeDesktopItem {

  desktopItems = [

    (makeDesktopItem {

      name = meta.mainProgram;

      exec = meta.mainProgram;

      icon = meta.mainProgram;
@@ -54,7 +55,8 @@ buildDotnetModule rec { 
      type = "Application";

      categories = [ "Settings" ];

      startupNotify = true;

  };

    })

  ];



  meta = with lib; {

    mainProgram = "GalaxyBudsClient";