diff --git a/flake.lock b/flake.lock index 362663e8..8e43dc69 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1664195620, - "narHash": "sha256-/0V1a1gAR+QbiQe4aCxBoivhkxss0xyt2mBD6yDrgjw=", + "lastModified": 1664370076, + "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62228ccc672ed000f35b1e5c82e4183e46767e52", + "rev": "854fdc68881791812eddd33b2fed94b954979a8e", "type": "github" }, "original": { diff --git a/modules/universal/allocations.nix b/modules/universal/allocations.nix index 0b18e01c..bf1dc2d1 100644 --- a/modules/universal/allocations.nix +++ b/modules/universal/allocations.nix @@ -33,6 +33,8 @@ in sane.allocations.systemd-coredump-gid = mkId 2003; # 996 sane.allocations.nscd-uid = mkId 2004; sane.allocations.nscd-gid = mkId 2004; + sane.allocations.systemd-oom-uid = mkId 2005; + sane.allocations.systemd-oom-gid = mkId 2005; # found on graphical machines sane.allocations.nm-iodine-uid = mkId 2101; # desko/moby/lappy diff --git a/modules/universal/users.nix b/modules/universal/users.nix index a97262d3..84eb11d9 100644 --- a/modules/universal/users.nix +++ b/modules/universal/users.nix @@ -100,6 +100,8 @@ in users.groups.systemd-coredump.gid = config.sane.allocations.systemd-coredump-gid; users.users.nscd.uid = config.sane.allocations.nscd-uid; users.groups.nscd.gid = config.sane.allocations.nscd-gid; + users.users.systemd-oom.uid = config.sane.allocations.systemd-oom-uid; + users.groups.systemd-oom.gid = config.sane.allocations.systemd-oom-gid; # guarantee determinism in uid/gid generation for users: assertions = let diff --git a/nixpatches/10-flutter-arm64.patch b/nixpatches/10-flutter-arm64.patch index f5191e25..a63cff67 100644 --- a/nixpatches/10-flutter-arm64.patch +++ b/nixpatches/10-flutter-arm64.patch @@ -10,8 +10,8 @@ index 565c44f72e9..f20a3d4e9be 100644 }: +let vendorHashes = { -+ x86_64-linux = "sha256-PSZK5frmQGeiTuEJNZ6Fh8NXSLIrLnoOzQk1Xa4jqHw="; -+ aarch64-linux = "sha256-tU83EeFwakTNkEaLo90ZJV55CnmN+NcicHgBJ0u/RKM="; ++ x86_64-linux = "sha256-p5EJP2zSvWyRV1uyTHw0EpFsEwAGtX5B9WVjpLmnVew="; ++ aarch64-linux = "sha256-DVMVPCab+7tSNRKwioQXi0WZnlpvm5tIhO/l1vFX3J8="; +}; +in flutter.mkFlutterApp rec {