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

Merge staging-next into staging

parents 152e5776 5e1d980f

maintainers/scripts/fetch-kde-qt.sh

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ files_before=$(grep -c 'src = ' "$SRCS") 
echo "writing output file $SRCS ..."

cat >"$SRCS" <<EOF

# DO NOT EDIT! This file is generated automatically.

# Command: $0 $@

# Command: ./maintainers/scripts/fetch-kde-qt.sh $@

{ fetchurl, mirror }:



{

maintainers/scripts/kde/collect-missing-deps.py

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ OK_MISSING_BY_PACKAGE = { 
    },

    "kwin": {

        "display-info",  # newer versions identify as libdisplay-info

        "Libcap",  # used to call setcap at build time and nothing else

    },

    "libksysguard": {

        "Libcap",  # used to call setcap at build time and nothing else
@@ -90,6 +91,7 @@ OK_MISSING_BY_PACKAGE = { 
    },

    "powerdevil": {

        "DDCUtil",  # cursed, intentionally disabled

        "Libcap",  # used to call setcap at build time and nothing else

    },

    "print-manager": {

        "PackageKitQt6",  # used for auto-installing drivers which does not work for obvious reasons

maintainers/scripts/kde/generate-sources.py

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ mkKdeDerivation { 
'''.strip())



ROOT_TEMPLATE = jinja2.Template('''

{callPackage}: {

{ callPackage }:

{

  {%- for p in packages %}

  {{ p }} = callPackage ./{{ p }} { };

  {%- endfor %}

nixos/doc/manual/release-notes/rl-2411.section.md

+2 −0
Original line number Diff line number Diff line
@@ -561,6 +561,8 @@ 


- Compatible string matching for `hardware.deviceTree.overlays` has been changed to a more correct behavior. See [below](#sec-release-24.11-migration-dto-compatible) for details.



- The `rustic` package was upgrade to `0.9.0`, which contains [breaking changes to the config file format](https://github.com/rustic-rs/rustic/releases/tag/v0.9.0).



## Other Notable Changes {#sec-release-24.11-notable-changes}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/profiles/macos-builder.nix

+1 −7
Original line number Diff line number Diff line
@@ -105,13 +105,7 @@ in 


    # The linux builder is a lightweight VM for remote building; not evaluation.

    nix.channel.enable = false;

    # remote builder uses `nix-daemon` (ssh-ng:) or `nix-store --serve` (ssh:)

    # --force: do not complain when missing

    # TODO: install a store-only nix

    #       https://github.com/NixOS/rfcs/blob/master/rfcs/0134-nix-store-layer.md#detailed-design

    environment.extraSetup = ''

      rm --force $out/bin/{nix-instantiate,nix-build,nix-shell,nix-prefetch*,nix}

    '';



    # Deployment is by image.

    # TODO system.switch.enable = false;?

    system.disableInstallerTools = true;