From bee368ea1fb9766292ff0e2cd03aa71927de5818 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 1 Mar 2023 10:23:47 +0000 Subject: [PATCH] flake update: nixpkgs 2023-02-16 -> 2023-02-26; sops-nix, mobile-nixos (?!) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'mobile-nixos': 'github:nixos/mobile-nixos/8701fcb1448f1eb67c0d47631ec2bdb613bd6a38' (2023-02-12) → 'github:nixos/mobile-nixos/c252e7bd9122704f0e0303c638f8b8412c2521c2' (2023-02-26) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/ac1f5b72a9e95873d1de0233fddcb56f99884b37' (2023-02-16) → 'github:nixos/nixpkgs/7f5639fa3b68054ca0b062866dc62b22c3f11505' (2023-02-26) • Updated input 'sops-nix': 'github:Mic92/sops-nix/c5dab21d8706afc7ceb05c23d4244dcb48d6aade' (2023-02-12) → 'github:Mic92/sops-nix/27018a9084006b8371b1f833882adfb85bd23004' (2023-02-28) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/d863ca850a06d91365c01620dcac342574ecf46f' (2023-02-12) → 'github:NixOS/nixpkgs/40968a3aa489191cf4b7ba85cf2a54d8a75c8daa' (2023-02-28) ``` --- flake.lock | 30 ++++++++++++------------- hosts/common/ids.nix | 2 +- nixpatches/2023-02-28-mesa-22.3.6.patch | 23 +++++++++++++++++++ nixpatches/list.nix | 4 +++- 4 files changed, 42 insertions(+), 17 deletions(-) create mode 100644 nixpatches/2023-02-28-mesa-22.3.6.patch diff --git a/flake.lock b/flake.lock index ab3bf372..7b03d9d8 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1676240485, - "narHash": "sha256-bef1Zrfpo9cxaf19QhqfTwaagpeoNc08sc8OjYDjSnQ=", + "lastModified": 1677431790, + "narHash": "sha256-diCr0inBOSQYehHSxYQ2Wb5dYSrLfJYqbH2gJYmSL/c=", "owner": "nixos", "repo": "mobile-nixos", - "rev": "8701fcb1448f1eb67c0d47631ec2bdb613bd6a38", + "rev": "c252e7bd9122704f0e0303c638f8b8412c2521c2", "type": "github" }, "original": { @@ -39,22 +39,22 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-AJlQHunLsnhZ8LdYirwIcqD1iojYJEQAdxGfJn9siPs=", - "path": "/nix/store/7s2pgwqd5ch6n53mh2v8hw7d1zp1r654-source/nixpatches", + "narHash": "sha256-DUkF2pd7uio+DRxOXQkNE9u9KAnoxqXwF+GCHjF7jbM=", + "path": "/nix/store/hkmfh776nv853g3avjvjy7617kbdvr80-source/nixpatches", "type": "path" }, "original": { - "path": "/nix/store/7s2pgwqd5ch6n53mh2v8hw7d1zp1r654-source/nixpatches", + "path": "/nix/store/hkmfh776nv853g3avjvjy7617kbdvr80-source/nixpatches", "type": "path" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1676162277, - "narHash": "sha256-GK3cnvKNo1l0skGYXXiLJ/TLqdKyIYXd7jOlo0gN+Qw=", + "lastModified": 1677560965, + "narHash": "sha256-Tqwt5alTtMnbYUPKCYRYZqlfbjprLgDWqjMhXpFMQ6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d863ca850a06d91365c01620dcac342574ecf46f", + "rev": "40968a3aa489191cf4b7ba85cf2a54d8a75c8daa", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1676569297, - "narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=", + "lastModified": 1677407201, + "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37", + "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1676171095, - "narHash": "sha256-2laeSjBAAJ9e/C3uTIPb287iX8qeVLtWiilw1uxqG+A=", + "lastModified": 1677594933, + "narHash": "sha256-qUoODrgbHRDKcg5r1Wsck01zIsJyKi/G4R2YAQafXPQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5dab21d8706afc7ceb05c23d4244dcb48d6aade", + "rev": "27018a9084006b8371b1f833882adfb85bd23004", "type": "github" }, "original": { diff --git a/hosts/common/ids.nix b/hosts/common/ids.nix index 0ad3b33c..fbe9d14b 100644 --- a/hosts/common/ids.nix +++ b/hosts/common/ids.nix @@ -36,7 +36,7 @@ sane.ids.sshd.uid = 2001; # 997 sane.ids.sshd.gid = 2001; # 997 sane.ids.polkituser.gid = 2002; # 998 - # sane.ids.systemd-coredump.gid = 2003; # 996 # 2023/02/12: upstream now specifies this as 151 + sane.ids.systemd-coredump.gid = 2003; # 996 sane.ids.nscd.uid = 2004; sane.ids.nscd.gid = 2004; sane.ids.systemd-oom.uid = 2005; diff --git a/nixpatches/2023-02-28-mesa-22.3.6.patch b/nixpatches/2023-02-28-mesa-22.3.6.patch new file mode 100644 index 00000000..817b071c --- /dev/null +++ b/nixpatches/2023-02-28-mesa-22.3.6.patch @@ -0,0 +1,23 @@ +diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix +index 52633a6d21649..20d839b74c2ea 100644 +--- a/pkgs/development/libraries/mesa/default.nix ++++ b/pkgs/development/libraries/mesa/default.nix +@@ -88,7 +88,7 @@ + let + # Release calendar: https://www.mesa3d.org/release-calendar.html + # Release frequency: https://www.mesa3d.org/releasing.html#schedule +- version = "22.3.5"; ++ version = "22.3.6"; + branch = lib.versions.major version; + + withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; +@@ -120,7 +120,7 @@ self = stdenv.mkDerivation { + "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" + "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" + ]; +- sha256 = "3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9"; ++ hash = "sha256-TsjsZdvbHulETbpylwiQEooZVDpYzwWTG9b1TxJOEX8="; + }; + + # TODO: + diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 151f3639..50472cfd 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -31,9 +31,11 @@ ./2022-12-19-i2p-aarch64.patch # fix for CMA memory leak in mesa: + # fixed in mesa 22.3.6: # only necessary on aarch64. # it's a revert of nixpkgs commit dcf630c172df2a9ecaa47c77f868211e61ae8e52 - ./2023-01-30-mesa-cma-leak.patch + # ./2023-01-30-mesa-cma-leak.patch + ./2023-02-28-mesa-22.3.6.patch # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible).