update dependencies including kernel bluetooth fix

tpwrules · Jul 22, 2022 · 8b54e3b · 8b54e3b
1 parent cb0a25e
commit 8b54e3b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 Attempts to get NixOS up on M1 Macs.
 
-* [UEFI Boot Standalone NixOS (2022-07-19)](docs/uefi-standalone.md)
+* [UEFI Boot Standalone NixOS (2022-07-21)](docs/uefi-standalone.md)
 
 ## Credits
 

diff --git a/docs/uefi-standalone.md b/docs/uefi-standalone.md
@@ -1,10 +1,10 @@
-# UEFI Boot Standalone NixOS (2022-07-19)
+# UEFI Boot Standalone NixOS (2022-07-21)
 
 This guide will build and was tested with the following software:
-* Asahi Linux kernel, as of 2022-07-17 (5.19.0-rc5-asahi)
+* Asahi Linux kernel, as of 2022-07-20 (5.19.0-rc7-asahi)
 * m1n1, as of 2022-07-16 (v1.1.3)
 * Asahi Linux's U-Boot, as of 2022-07-11
-* Nixpkgs, as of 2022-07-18
+* Nixpkgs, as of 2022-07-21
 * macOS stub 12.3
 
 NOTE: The latest version of this guide will always be [at its home](https://github.com/tpwrules/nixos-m1/blob/main/docs/uefi-standalone.md). For more general information about Linux on Apple Silicon Macs, refer to the [Asahi Linux project](https://asahilinux.org/) and [alpha installer release](https://asahilinux.org/2022/03/asahi-linux-alpha-release/).

diff --git a/nix/installer-bootstrap/installer-configuration.nix b/nix/installer-bootstrap/installer-configuration.nix
@@ -63,12 +63,20 @@
  networking.wireless.userControlled.enable = true;
  systemd.services.wpa_supplicant.wantedBy = lib.mkOverride 50 [];
 
- # avoids the need to cross-compile rustc and spidermonkey and polkit
  nixpkgs.overlays = [
  (self: super: {
+ # avoids the need to cross-compile rustc and spidermonkey and polkit
  wpa_supplicant = super.wpa_supplicant.override {
  withPcsclite = false;
  };
+
+ # avoids triggering a buggy cross compilation situation with
+ # gobject-introspection triggered by commit
+ # https://github.com/NixOS/nixpkgs/commit/6940e5b55b2109529bad415d05cd027f6eb46850
+ # fixed by: https://github.com/NixOS/nixpkgs/pull/182417
+ util-linux = super.util-linux.override {
+ translateManpages = false;
+ };
  })
  ];
 

diff --git a/nix/m1-support/kernel/package.nix b/nix/m1-support/kernel/package.nix
@@ -23,15 +23,15 @@
  linuxKernel.manualConfig rec {
  inherit stdenv lib;
 
- version = "5.19.0-rc5-asahi";
+ version = "5.19.0-rc7-asahi";
  modDirVersion = version;
 
  src = fetchFromGitHub {
  # tracking branch: https://github.com/AsahiLinux/linux/tree/asahi
  owner = "AsahiLinux";
  repo = "linux";
- rev = "7f6b104b64539e3047b474c13dba17bdf5446d47";
- hash = "sha256-tZB7+cIGYcEkoM8FCMFB842VUmv56VBCE/XYxXZuo7Q=";
+ rev = "c7d02d6615a5fb4afefd3084fce93d86e5fb184d";
+ hash = "sha256-sed405+6L5U7S+Na2DNLGPNTNf3tv96LjK3CimeRjNU=";
  };
 
  kernelPatches = [

diff --git a/nix/pins.nix b/nix/pins.nix
@@ -2,9 +2,9 @@
  # https://hydra.nixos.org/jobset/mobile-nixos/unstable/evals
  # these evals have a cross-compiled stdenv available
  nixpkgs = fetchTarball {
- name = "nixpkgs-unstable-2022-07-18";
- url = "https://github.com/NixOS/nixpkgs/archive/8f485713f5e6b6883a9b6959afa98688360a3ecb.tar.gz";
- sha256 = "sha256:0gvp331v64azn7v29p3qgbjq2i0sp8bwbnsbrk0yffyjzpfvdvwq";
+ name = "nixpkgs-unstable-2022-07-21";
+ url = "https://github.com/NixOS/nixpkgs/archive/614a842b74b7a1497e8cfca7c61bec38f51911b3.tar.gz";
+ sha256 = "sha256:0gkpnjdcrh5s4jx0i8dc6679qfkffmz4m719aarzki4jss4l5n5p";
  };
 
  rust-overlay = fetchTarball {