From 3c54a209bf6cc768545d50dc5cde2f0a63528aba Mon Sep 17 00:00:00 2001 From: Artem Sheremet Date: Sun, 4 Oct 2026 12:43:23 +0000 Subject: [PATCH] nix flake update and workarounds --- flake.lock | 67 ++++++++++++++++-------------------------- flake.nix | 5 ---- hosts/deimos/home.nix | 7 +---- hosts/deimos/nixos.nix | 9 ++++++ 4 files changed, 35 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index 6790490..6ac6150 100644 --- a/flake.lock +++ b/flake.lock @@ -3,36 +3,20 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1786945682, - "narHash": "sha256-VBESSoJccikdhxh3vp3SQeG7cZXTOulMvVkoSqNDEhs=", + "lastModified": 1789661079, + "narHash": "sha256-geVTQ51PGZ1mLULM5k7wO7qt/6xenOR/YG8X7Q3eCaI=", "owner": "Homebrew", "repo": "brew", - "rev": "5b90e281d4e0c8fbd6ca4d8358276fb305b8d0bd", + "rev": "edb70f031e4170c780799633a1226ff73e1077f4", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "6.0.18", + "ref": "7.0.4", "repo": "brew", "type": "github" } }, - "crush-src": { - "flake": false, - "locked": { - "lastModified": 1787722829, - "narHash": "sha256-4F/NavyTDYzi+YDUlRdQWE+PnITIV5N4T6dgq6t61dQ=", - "owner": "joestump-agent", - "repo": "crush", - "rev": "d1a66dadc229dd8ef3bbad77680bb72cd976bdf7", - "type": "github" - }, - "original": { - "owner": "joestump-agent", - "repo": "crush", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -156,11 +140,11 @@ ] }, "locked": { - "lastModified": 1788267358, - "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=", + "lastModified": 1790500375, + "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "27555e2624241fb116b49095df4caaee85a25691", + "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4", "type": "github" }, "original": { @@ -176,11 +160,11 @@ ] }, "locked": { - "lastModified": 1788355065, - "narHash": "sha256-gAz5oTI7ur34CfuakQduiQd/2ZhO62Bn2XXg08nZYYQ=", + "lastModified": 1790989254, + "narHash": "sha256-ZN+riaeFuE+DZ5zfqJiXlM12jLwZzeIXiNkU1YeHMXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9d750e4fc11c10cab2da677bdd31e427f3a3a71", + "rev": "acd21c5a3420a9d5fd0ed06299b10828267ef9ba", "type": "github" }, "original": { @@ -196,11 +180,11 @@ ] }, "locked": { - "lastModified": 1787377438, - "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=", + "lastModified": 1790996401, + "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=", "owner": "nix-community", "repo": "home-manager", - "rev": "65258d5c65a250189fde2e35f490d15e064c4c62", + "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35", "type": "github" }, "original": { @@ -252,11 +236,11 @@ }, "jail-nix": { "locked": { - "lastModified": 1783532714, - "narHash": "sha256-2MC7ivWBgyhHh6WBIvj1LRz00s8mZTti0iVyqeF+K/s=", + "lastModified": 1788928033, + "narHash": "sha256-UQRytK4SsshV1CeX6aKF+P855Sbcqg9aA731eYTakNg=", "owner": "~alexdavid", "repo": "jail.nix", - "rev": "e9210ebaa4b264cc1710a2a23254cc0402c34d0f", + "rev": "7cd53acef3ad51b9c775be759f5643f8d3bcf6eb", "type": "sourcehut" }, "original": { @@ -270,11 +254,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1787330919, - "narHash": "sha256-LslMncqN7uOOH5S88WZtO/EVt2HwD8ltUnfyANk+mC0=", + "lastModified": 1789928041, + "narHash": "sha256-iV37ieTcE4ZLOYEe0VznW6dWMBe4lEL8AbK1vblyZGM=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "b00218e4aec0e5bf07d61a0bb13f842faa582d7b", + "rev": "c11cccfdd36dd69b5323d70d354b2853379c2426", "type": "github" }, "original": { @@ -316,11 +300,11 @@ }, "nixpkgs-mars": { "locked": { - "lastModified": 1788334797, - "narHash": "sha256-nskSa8kDimM7F0VFSP8IdoSNo4G0vKzOtxwvOFpoGDI=", + "lastModified": 1790772421, + "narHash": "sha256-754eQtr0m8xKtNnKYhX7ukI7XaA7oeiQpui1LiEuhyU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c19db427a1fdfc7591c0b0baeb4665dcef2c61da", + "rev": "e49322d1ec25b45f7c587c5fd69ac826d1a57dbc", "type": "github" }, "original": { @@ -332,11 +316,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1788179007, - "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", + "lastModified": 1790822859, + "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", "type": "github" }, "original": { @@ -348,7 +332,6 @@ }, "root": { "inputs": { - "crush-src": "crush-src", "darwin": "darwin", "fw_nix": "fw_nix", "git-hooks": "git-hooks_2", diff --git a/flake.nix b/flake.nix index 3dfdf1a..8df2408 100644 --- a/flake.nix +++ b/flake.nix @@ -29,10 +29,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; jail-nix.url = "sourcehut:~alexdavid/jail.nix"; - crush-src = { - url = "github:joestump-agent/crush"; - flake = false; - }; }; outputs = @@ -94,7 +90,6 @@ }; extraSpecialArgs = { primaryUser = homeManagerUser; - inherit (inputs) crush-src; }; modules = [ inputs.fw_nix.nixosModules.identities diff --git a/hosts/deimos/home.nix b/hosts/deimos/home.nix index 2402836..43e406c 100644 --- a/hosts/deimos/home.nix +++ b/hosts/deimos/home.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - crush-src, ... }: let @@ -28,11 +27,7 @@ in yt-dlp attic-client opencode - ((crush.override { buildGo126Module = pkgs.buildGo127Module; }).overrideAttrs (_: { - src = crush-src; - version = crush-src.shortRev or "dirty"; - vendorHash = "sha256-B29pB157+SZS60ZOtg/UHRt7OYcmfnqeKxqH+eP7BwY="; - })) + crush ]; systemd.user.mounts."${haremote-unit}" = { diff --git a/hosts/deimos/nixos.nix b/hosts/deimos/nixos.nix index 1bf1088..bb19c67 100644 --- a/hosts/deimos/nixos.nix +++ b/hosts/deimos/nixos.nix @@ -21,6 +21,15 @@ virtualisation.docker.enable = true; nixpkgs.config.allowUnfree = true; + nixpkgs.overlays = [ + (_: prev: { + # Temporary workaround until upstream nixpkgs fix lands: + # https://github.com/NixOS/nixpkgs/issues/569695 + ltrace = prev.ltrace.overrideAttrs (_: { + doCheck = false; + }); + }) + ]; programs.fuse.enable = true; # for ~/src/haremote mount