Unverified Commit a0c9222e authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging-next 

(a bit older master for now, due to a conflict in dhcpcd service)
parents 7271def4 8af94f7c

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

+2 −0
Original line number Diff line number Diff line
@@ -555,6 +555,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;

pkgs/applications/editors/vscode/extensions/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -2039,8 +2039,8 @@ let 
        mktplcRef = {

          publisher = "github";

          name = "copilot";

          version = "1.234.1133"; # compatible with vscode ^1.93.1

          hash = "sha256-kRQIB4ozN8f+JPG2U6tA/u0r3/J05kYfMuksaJrumZM=";

          version = "1.236.0"; # compatible with vscode ^1.94

          hash = "sha256-ozJwByuSjROWSxfrapcyxDkI7xgcjqf/IKtUfEC+MGk=";

        };



        meta = {
@@ -2056,8 +2056,8 @@ let 
        mktplcRef = {

          publisher = "github";

          name = "copilot-chat";

          version = "0.21.2024090602"; # latest compatible with vscode ^1.93

          hash = "sha256-9wl/orFbf1OFwGnF1uLfyOOtO2v5k2H1aUMBtngXDfs=";

          version = "0.22.2024100702"; # latest compatible with vscode ^1.94

          hash = "sha256-n/ecEnxz3LiTx9MuHO8AMIWBJPNNxQb6vghlG/hPMUY=";

        };

        meta = {

          description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";

pkgs/applications/networking/cluster/k3s/builder.nix

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ lib: 
  # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag

  criCtlVersion,

  updateScript ? null,

}:

}@attrs:



# builder.nix contains a "builder" expression that, given k3s version and hash

# variables, creates a package for that version.
@@ -325,6 +325,7 @@ in 
buildGoModule rec {

  pname = "k3s";

  version = k3sVersion;

  pos = builtins.unsafeGetAttrPos "k3sVersion" attrs;



  tags = [

    "libsqlite3"

pkgs/applications/version-management/git-credential-manager/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 


buildDotnetModule rec {

  pname = "git-credential-manager";

  version = "2.5.1";

  version = "2.6.0";



  src = fetchFromGitHub {

    owner = "git-ecosystem";

    repo = "git-credential-manager";

    rev = "v${version}";

    hash = "sha256-fD/HToyreYS8PG85CHHLPQOUKV1cDYGukxyVOr+7cKk=";

    hash = "sha256-8hjMtfPY/7cNH8WdHyG4kT2W+wGWteHbin1HgTBGiNQ=";

  };



  projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj";