From 2a8ec570befbc55de2fe259dbf88c93ac4fa7f43 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 10 Sep 2025 11:22:38 +0200 Subject: [PATCH 1/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/4a44fb9f7555da362af9d499817084f4288a957f' (2025-08-23) → 'github:nix-community/home-manager/07fc025fe10487dd80f2ec694f1cd790e752d0e8' (2025-08-31) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/3dac8a872557e0ca8c083cdcfc2f218d18e113b0' (2025-08-16) → 'github:NixOS/nixos-hardware/11b2a10c7be726321bb854403fdeec391e798bf0' (2025-09-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9cb344e96d5b6918e94e1bca2d9f3ea1e9615545' (2025-08-20) → 'github:NixOS/nixpkgs/d179d77c139e0a3f5c416477f7747e9d6b7ec315' (2025-09-09) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 70dca4e..31d4cd8 100644 --- a/flake.lock +++ b/flake.lock @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -298,11 +298,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { From f5f69c5baf92e21bf57e4f6ed1375dee783e1426 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Sep 2025 16:28:17 +0200 Subject: [PATCH 2/5] flake: tailscale overlay to bypass failing tests This isn't the right fix but it will do for now. --- flake.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/flake.nix b/flake.nix index 7155240..250e03e 100644 --- a/flake.nix +++ b/flake.nix @@ -102,6 +102,18 @@ inherit system; config.allowUnfree = true; }; + + tailscale = super.tailscale.overrideAttrs (old: { + checkFlags = + builtins.map ( + flag: + if super.lib.hasPrefix "-skip=" flag + then flag + "|^TestGetList$|^TestIgnoreLocallyBoundPorts$|^TestPoller$" + else flag + ) + old.checkFlags; + }); + }) agenix.overlays.default From ad2e202a9f4aefe65fe7b2917d0929ea2eea0077 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Sep 2025 16:28:17 +0200 Subject: [PATCH 3/5] flake: bump jj to v0.33 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 31d4cd8..afac4fe 100644 --- a/flake.lock +++ b/flake.lock @@ -183,16 +183,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1754498174, - "narHash": "sha256-TFKUz8hUCRM9RPkp9CBvKnd4e+TnR8H5t9/N76cAKzI=", + "lastModified": 1756954389, + "narHash": "sha256-EKYM18UavIbZeI5/F5OKUzyjQip0yb6WPt6BZ2YpYww=", "owner": "jj-vcs", "repo": "jj", - "rev": "44de571887f261a94f543d977a7ab3a9df918aba", + "rev": "24f4e1083e8bcd6e5b8aaee3fa86e08cb7081d13", "type": "github" }, "original": { "owner": "jj-vcs", - "ref": "v0.32.0", + "ref": "v0.33.0", "repo": "jj", "type": "github" } diff --git a/flake.nix b/flake.nix index 250e03e..a7a3d0f 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ type = "github"; owner = "jj-vcs"; repo = "jj"; - ref = "v0.32.0"; + ref = "v0.33.0"; inputs.nixpkgs.follows = "nixpkgs"; }; }; From 7bc6694a5a483bf3c335772bf61edabb0d1ae6e7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Sep 2025 16:34:38 +0200 Subject: [PATCH 4/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/07fc025fe10487dd80f2ec694f1cd790e752d0e8' (2025-08-31) → 'github:nix-community/home-manager/f21d9167782c086a33ad53e2311854a8f13c281e' (2025-09-14) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/11b2a10c7be726321bb854403fdeec391e798bf0' (2025-09-05) → 'github:NixOS/nixos-hardware/67a709cfe5d0643dafd798b0b613ed579de8be05' (2025-09-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d179d77c139e0a3f5c416477f7747e9d6b7ec315' (2025-09-09) → 'github:NixOS/nixpkgs/9a094440e02a699be5c57453a092a8baf569bdad' (2025-09-14) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index afac4fe..8ceef31 100644 --- a/flake.lock +++ b/flake.lock @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -298,11 +298,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757408970, - "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { From 172c52ba84f2883b4f4962d75dd38088e937a6a1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Sep 2025 16:38:07 +0200 Subject: [PATCH 5/5] Revert "flake: tailscale overlay to bypass failing tests" This reverts commit f5f69c5baf92e21bf57e4f6ed1375dee783e1426. --- flake.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/flake.nix b/flake.nix index a7a3d0f..ac084e0 100644 --- a/flake.nix +++ b/flake.nix @@ -102,18 +102,6 @@ inherit system; config.allowUnfree = true; }; - - tailscale = super.tailscale.overrideAttrs (old: { - checkFlags = - builtins.map ( - flag: - if super.lib.hasPrefix "-skip=" flag - then flag + "|^TestGetList$|^TestIgnoreLocallyBoundPorts$|^TestPoller$" - else flag - ) - old.checkFlags; - }); - }) agenix.overlays.default