downloading 'https://nix-community.cachix.org/nix-cache-info'
downloading 'https://cache.nixos.org/nix-cache-info'
Cloning into 'repo'...
remote: Enumerating objects: 4708, done.
remote: Counting objects:   0% (1/1904)
remote: Counting objects:   1% (20/1904)
remote: Counting objects:   2% (39/1904)
remote: Counting objects:   3% (58/1904)
remote: Counting objects:   4% (77/1904)
remote: Counting objects:   5% (96/1904)
remote: Counting objects:   6% (115/1904)
remote: Counting objects:   7% (134/1904)
remote: Counting objects:   8% (153/1904)
remote: Counting objects:   9% (172/1904)
remote: Counting objects:  10% (191/1904)
remote: Counting objects:  11% (210/1904)
remote: Counting objects:  12% (229/1904)
remote: Counting objects:  13% (248/1904)
remote: Counting objects:  14% (267/1904)
remote: Counting objects:  15% (286/1904)
remote: Counting objects:  16% (305/1904)
remote: Counting objects:  17% (324/1904)
remote: Counting objects:  18% (343/1904)
remote: Counting objects:  19% (362/1904)
remote: Counting objects:  20% (381/1904)
remote: Counting objects:  21% (400/1904)
remote: Counting objects:  22% (419/1904)
remote: Counting objects:  23% (438/1904)
remote: Counting objects:  24% (457/1904)
remote: Counting objects:  25% (476/1904)
remote: Counting objects:  26% (496/1904)
remote: Counting objects:  27% (515/1904)
remote: Counting objects:  28% (534/1904)
remote: Counting objects:  29% (553/1904)
remote: Counting objects:  30% (572/1904)
remote: Counting objects:  31% (591/1904)
remote: Counting objects:  32% (610/1904)
remote: Counting objects:  33% (629/1904)
remote: Counting objects:  34% (648/1904)
remote: Counting objects:  35% (667/1904)
remote: Counting objects:  36% (686/1904)
remote: Counting objects:  37% (705/1904)
remote: Counting objects:  38% (724/1904)
remote: Counting objects:  39% (743/1904)
remote: Counting objects:  40% (762/1904)
remote: Counting objects:  41% (781/1904)
remote: Counting objects:  42% (800/1904)
remote: Counting objects:  43% (819/1904)
remote: Counting objects:  44% (838/1904)
remote: Counting objects:  45% (857/1904)
remote: Counting objects:  46% (876/1904)
remote: Counting objects:  47% (895/1904)
remote: Counting objects:  48% (914/1904)
remote: Counting objects:  49% (933/1904)
remote: Counting objects:  50% (952/1904)
remote: Counting objects:  51% (972/1904)
remote: Counting objects:  52% (991/1904)
remote: Counting objects:  53% (1010/1904)
remote: Counting objects:  54% (1029/1904)
remote: Counting objects:  55% (1048/1904)
remote: Counting objects:  56% (1067/1904)
remote: Counting objects:  57% (1086/1904)
remote: Counting objects:  58% (1105/1904)
remote: Counting objects:  59% (1124/1904)
remote: Counting objects:  60% (1143/1904)
remote: Counting objects:  61% (1162/1904)
remote: Counting objects:  62% (1181/1904)
remote: Counting objects:  63% (1200/1904)
remote: Counting objects:  64% (1219/1904)
remote: Counting objects:  65% (1238/1904)
remote: Counting objects:  66% (1257/1904)
remote: Counting objects:  67% (1276/1904)
remote: Counting objects:  68% (1295/1904)
remote: Counting objects:  69% (1314/1904)
remote: Counting objects:  70% (1333/1904)
remote: Counting objects:  71% (1352/1904)
remote: Counting objects:  72% (1371/1904)
remote: Counting objects:  73% (1390/1904)
remote: Counting objects:  74% (1409/1904)
remote: Counting objects:  75% (1428/1904)
remote: Counting objects:  76% (1448/1904)
remote: Counting objects:  77% (1467/1904)
remote: Counting objects:  78% (1486/1904)
remote: Counting objects:  79% (1505/1904)
remote: Counting objects:  80% (1524/1904)
remote: Counting objects:  81% (1543/1904)
remote: Counting objects:  82% (1562/1904)
remote: Counting objects:  83% (1581/1904)
remote: Counting objects:  84% (1600/1904)
remote: Counting objects:  85% (1619/1904)
remote: Counting objects:  86% (1638/1904)
remote: Counting objects:  87% (1657/1904)
remote: Counting objects:  88% (1676/1904)
remote: Counting objects:  89% (1695/1904)
remote: Counting objects:  90% (1714/1904)
remote: Counting objects:  91% (1733/1904)
remote: Counting objects:  92% (1752/1904)
remote: Counting objects:  93% (1771/1904)
remote: Counting objects:  94% (1790/1904)
remote: Counting objects:  95% (1809/1904)
remote: Counting objects:  96% (1828/1904)
remote: Counting objects:  97% (1847/1904)
remote: Counting objects:  98% (1866/1904)
remote: Counting objects:  99% (1885/1904)
remote: Counting objects: 100% (1904/1904)
remote: Counting objects: 100% (1904/1904), done.
remote: Compressing objects:   0% (1/234)
remote: Compressing objects:   1% (3/234)
remote: Compressing objects:   2% (5/234)
remote: Compressing objects:   3% (8/234)
remote: Compressing objects:   4% (10/234)
remote: Compressing objects:   5% (12/234)
remote: Compressing objects:   6% (15/234)
remote: Compressing objects:   7% (17/234)
remote: Compressing objects:   8% (19/234)
remote: Compressing objects:   9% (22/234)
remote: Compressing objects:  10% (24/234)
remote: Compressing objects:  11% (26/234)
remote: Compressing objects:  12% (29/234)
remote: Compressing objects:  13% (31/234)
remote: Compressing objects:  14% (33/234)
remote: Compressing objects:  15% (36/234)
remote: Compressing objects:  16% (38/234)
remote: Compressing objects:  17% (40/234)
remote: Compressing objects:  18% (43/234)
remote: Compressing objects:  19% (45/234)
remote: Compressing objects:  20% (47/234)
remote: Compressing objects:  21% (50/234)
remote: Compressing objects:  22% (52/234)
remote: Compressing objects:  23% (54/234)
remote: Compressing objects:  24% (57/234)
remote: Compressing objects:  25% (59/234)
remote: Compressing objects:  26% (61/234)
remote: Compressing objects:  27% (64/234)
remote: Compressing objects:  28% (66/234)
remote: Compressing objects:  29% (68/234)
remote: Compressing objects:  30% (71/234)
remote: Compressing objects:  31% (73/234)
remote: Compressing objects:  32% (75/234)
remote: Compressing objects:  33% (78/234)
remote: Compressing objects:  34% (80/234)
remote: Compressing objects:  35% (82/234)
remote: Compressing objects:  36% (85/234)
remote: Compressing objects:  37% (87/234)
remote: Compressing objects:  38% (89/234)
remote: Compressing objects:  39% (92/234)
remote: Compressing objects:  40% (94/234)
remote: Compressing objects:  41% (96/234)
remote: Compressing objects:  42% (99/234)
remote: Compressing objects:  43% (101/234)
remote: Compressing objects:  44% (103/234)
remote: Compressing objects:  45% (106/234)
remote: Compressing objects:  46% (108/234)
remote: Compressing objects:  47% (110/234)
remote: Compressing objects:  48% (113/234)
remote: Compressing objects:  49% (115/234)
remote: Compressing objects:  50% (117/234)
remote: Compressing objects:  51% (120/234)
remote: Compressing objects:  52% (122/234)
remote: Compressing objects:  53% (125/234)
remote: Compressing objects:  54% (127/234)
remote: Compressing objects:  55% (129/234)
remote: Compressing objects:  56% (132/234)
remote: Compressing objects:  57% (134/234)
remote: Compressing objects:  58% (136/234)
remote: Compressing objects:  59% (139/234)
remote: Compressing objects:  60% (141/234)
remote: Compressing objects:  61% (143/234)
remote: Compressing objects:  62% (146/234)
remote: Compressing objects:  63% (148/234)
remote: Compressing objects:  64% (150/234)
remote: Compressing objects:  65% (153/234)
remote: Compressing objects:  66% (155/234)
remote: Compressing objects:  67% (157/234)
remote: Compressing objects:  68% (160/234)
remote: Compressing objects:  69% (162/234)
remote: Compressing objects:  70% (164/234)
remote: Compressing objects:  71% (167/234)
remote: Compressing objects:  72% (169/234)
remote: Compressing objects:  73% (171/234)
remote: Compressing objects:  74% (174/234)
remote: Compressing objects:  75% (176/234)
remote: Compressing objects:  76% (178/234)
remote: Compressing objects:  77% (181/234)
remote: Compressing objects:  78% (183/234)
remote: Compressing objects:  79% (185/234)
remote: Compressing objects:  80% (188/234)
remote: Compressing objects:  81% (190/234)
remote: Compressing objects:  82% (192/234)
remote: Compressing objects:  83% (195/234)
remote: Compressing objects:  84% (197/234)
remote: Compressing objects:  85% (199/234)
remote: Compressing objects:  86% (202/234)
remote: Compressing objects:  87% (204/234)
remote: Compressing objects:  88% (206/234)
remote: Compressing objects:  89% (209/234)
remote: Compressing objects:  90% (211/234)
remote: Compressing objects:  91% (213/234)
remote: Compressing objects:  92% (216/234)
remote: Compressing objects:  93% (218/234)
remote: Compressing objects:  94% (220/234)
remote: Compressing objects:  95% (223/234)
remote: Compressing objects:  96% (225/234)
remote: Compressing objects:  97% (227/234)
remote: Compressing objects:  98% (230/234)
remote: Compressing objects:  99% (232/234)
remote: Compressing objects: 100% (234/234)
remote: Compressing objects: 100% (234/234), done.
Receiving objects:   0% (1/4708)
Receiving objects:   1% (48/4708)
Receiving objects:   2% (95/4708)
Receiving objects:   3% (142/4708)
Receiving objects:   4% (189/4708)
Receiving objects:   5% (236/4708)
Receiving objects:   6% (283/4708)
Receiving objects:   7% (330/4708)
Receiving objects:   8% (377/4708)
Receiving objects:   9% (424/4708)
Receiving objects:  10% (471/4708)
Receiving objects:  11% (518/4708)
Receiving objects:  12% (565/4708)
Receiving objects:  13% (613/4708)
Receiving objects:  14% (660/4708)
Receiving objects:  15% (707/4708)
Receiving objects:  16% (754/4708)
Receiving objects:  17% (801/4708)
Receiving objects:  18% (848/4708)
Receiving objects:  19% (895/4708)
Receiving objects:  20% (942/4708)
Receiving objects:  21% (989/4708)
Receiving objects:  22% (1036/4708)
Receiving objects:  23% (1083/4708)
Receiving objects:  24% (1130/4708)
Receiving objects:  25% (1177/4708)
Receiving objects:  26% (1225/4708)
Receiving objects:  27% (1272/4708)
Receiving objects:  28% (1319/4708)
Receiving objects:  29% (1366/4708)
Receiving objects:  30% (1413/4708)
Receiving objects:  31% (1460/4708)
Receiving objects:  32% (1507/4708)
Receiving objects:  33% (1554/4708)
Receiving objects:  34% (1601/4708)
Receiving objects:  35% (1648/4708)
Receiving objects:  36% (1695/4708)
Receiving objects:  37% (1742/4708)
Receiving objects:  38% (1790/4708)
Receiving objects:  39% (1837/4708)
Receiving objects:  40% (1884/4708)
Receiving objects:  41% (1931/4708)
Receiving objects:  42% (1978/4708)
Receiving objects:  43% (2025/4708)
Receiving objects:  44% (2072/4708)
Receiving objects:  45% (2119/4708)
Receiving objects:  46% (2166/4708)
Receiving objects:  47% (2213/4708)
Receiving objects:  48% (2260/4708)
Receiving objects:  49% (2307/4708)
Receiving objects:  50% (2354/4708)
Receiving objects:  51% (2402/4708)
Receiving objects:  52% (2449/4708)
Receiving objects:  53% (2496/4708)
Receiving objects:  54% (2543/4708)
Receiving objects:  55% (2590/4708)
Receiving objects:  56% (2637/4708)
Receiving objects:  57% (2684/4708)
Receiving objects:  58% (2731/4708)
Receiving objects:  59% (2778/4708)
Receiving objects:  60% (2825/4708)
Receiving objects:  61% (2872/4708)
Receiving objects:  62% (2919/4708)
Receiving objects:  63% (2967/4708)
Receiving objects:  64% (3014/4708)
Receiving objects:  65% (3061/4708)
Receiving objects:  66% (3108/4708)
Receiving objects:  67% (3155/4708)
Receiving objects:  68% (3202/4708)
Receiving objects:  69% (3249/4708)
Receiving objects:  70% (3296/4708)
Receiving objects:  71% (3343/4708)
Receiving objects:  72% (3390/4708)
Receiving objects:  73% (3437/4708)
Receiving objects:  74% (3484/4708)
Receiving objects:  75% (3531/4708)
Receiving objects:  76% (3579/4708)
Receiving objects:  77% (3626/4708)
Receiving objects:  78% (3673/4708)
Receiving objects:  79% (3720/4708)
Receiving objects:  80% (3767/4708)
Receiving objects:  81% (3814/4708)
Receiving objects:  82% (3861/4708)
Receiving objects:  83% (3908/4708)
Receiving objects:  84% (3955/4708)
Receiving objects:  85% (4002/4708)
Receiving objects:  86% (4049/4708)
Receiving objects:  87% (4096/4708)
Receiving objects:  88% (4144/4708)
Receiving objects:  89% (4191/4708)
Receiving objects:  90% (4238/4708)
remote: Total 4708 (delta 1707), reused 1745 (delta 1669), pack-reused 2804
Receiving objects:  91% (4285/4708)
Receiving objects:  92% (4332/4708)
Receiving objects:  93% (4379/4708)
Receiving objects:  94% (4426/4708)
Receiving objects:  95% (4473/4708)
Receiving objects:  96% (4520/4708)
Receiving objects:  97% (4567/4708)
Receiving objects:  98% (4614/4708)
Receiving objects:  99% (4661/4708)
Receiving objects: 100% (4708/4708)
Receiving objects: 100% (4708/4708), 870.85 KiB | 5.58 MiB/s, done.
Resolving deltas:   0% (0/3226)
Resolving deltas:   1% (33/3226)
Resolving deltas:   2% (65/3226)
Resolving deltas:   3% (98/3226)
Resolving deltas:   4% (130/3226)
Resolving deltas:   5% (163/3226)
Resolving deltas:   6% (194/3226)
Resolving deltas:   7% (226/3226)
Resolving deltas:   8% (260/3226)
Resolving deltas:   9% (291/3226)
Resolving deltas:  10% (323/3226)
Resolving deltas:  11% (357/3226)
Resolving deltas:  12% (388/3226)
Resolving deltas:  13% (421/3226)
Resolving deltas:  14% (453/3226)
Resolving deltas:  15% (484/3226)
Resolving deltas:  16% (518/3226)
Resolving deltas:  17% (554/3226)
Resolving deltas:  18% (581/3226)
Resolving deltas:  19% (613/3226)
Resolving deltas:  20% (646/3226)
Resolving deltas:  21% (678/3226)
Resolving deltas:  22% (710/3226)
Resolving deltas:  23% (744/3226)
Resolving deltas:  24% (776/3226)
Resolving deltas:  25% (807/3226)
Resolving deltas:  26% (841/3226)
Resolving deltas:  27% (872/3226)
Resolving deltas:  28% (906/3226)
Resolving deltas:  29% (936/3226)
Resolving deltas:  30% (968/3226)
Resolving deltas:  31% (1001/3226)
Resolving deltas:  32% (1033/3226)
Resolving deltas:  33% (1069/3226)
Resolving deltas:  34% (1097/3226)
Resolving deltas:  35% (1130/3226)
Resolving deltas:  36% (1163/3226)
Resolving deltas:  37% (1194/3226)
Resolving deltas:  38% (1226/3226)
Resolving deltas:  39% (1261/3226)
Resolving deltas:  40% (1291/3226)
Resolving deltas:  41% (1324/3226)
Resolving deltas:  42% (1355/3226)
Resolving deltas:  43% (1388/3226)
Resolving deltas:  44% (1420/3226)
Resolving deltas:  45% (1452/3226)
Resolving deltas:  46% (1484/3226)
Resolving deltas:  47% (1517/3226)
Resolving deltas:  48% (1549/3226)
Resolving deltas:  49% (1581/3226)
Resolving deltas:  50% (1613/3226)
Resolving deltas:  51% (1647/3226)
Resolving deltas:  52% (1679/3226)
Resolving deltas:  53% (1711/3226)
Resolving deltas:  54% (1743/3226)
Resolving deltas:  55% (1775/3226)
Resolving deltas:  56% (1807/3226)
Resolving deltas:  57% (1840/3226)
Resolving deltas:  58% (1872/3226)
Resolving deltas:  59% (1904/3226)
Resolving deltas:  60% (1936/3226)
Resolving deltas:  61% (1968/3226)
Resolving deltas:  62% (2001/3226)
Resolving deltas:  63% (2033/3226)
Resolving deltas:  64% (2065/3226)
Resolving deltas:  65% (2097/3226)
Resolving deltas:  66% (2130/3226)
Resolving deltas:  67% (2162/3226)
Resolving deltas:  68% (2194/3226)
Resolving deltas:  69% (2226/3226)
Resolving deltas:  70% (2259/3226)
Resolving deltas:  71% (2291/3226)
Resolving deltas:  72% (2323/3226)
Resolving deltas:  73% (2356/3226)
Resolving deltas:  74% (2388/3226)
Resolving deltas:  75% (2420/3226)
Resolving deltas:  76% (2452/3226)
Resolving deltas:  77% (2485/3226)
Resolving deltas:  78% (2517/3226)
Resolving deltas:  79% (2549/3226)
Resolving deltas:  80% (2581/3226)
Resolving deltas:  81% (2614/3226)
Resolving deltas:  82% (2646/3226)
Resolving deltas:  83% (2678/3226)
Resolving deltas:  84% (2710/3226)
Resolving deltas:  85% (2743/3226)
Resolving deltas:  86% (2775/3226)
Resolving deltas:  87% (2807/3226)
Resolving deltas:  88% (2841/3226)
Resolving deltas:  89% (2872/3226)
Resolving deltas:  90% (2904/3226)
Resolving deltas:  91% (2937/3226)
Resolving deltas:  92% (2968/3226)
Resolving deltas:  93% (3002/3226)
Resolving deltas:  94% (3035/3226)
Resolving deltas:  95% (3065/3226)
Resolving deltas:  96% (3098/3226)
Resolving deltas:  97% (3132/3226)
Resolving deltas:  98% (3162/3226)
Resolving deltas:  99% (3194/3226)
Resolving deltas: 100% (3226/3226)
Resolving deltas: 100% (3226/3226), done.
branch 'flake-update' set up to track 'origin/flake-update'.
Switched to a new branch 'flake-update'
Rebasing flake-update onto origin/master ...
Rebasing (1/7)
Auto-merging flake.lock
CONFLICT (content): Merge conflict in flake.lock
error: could not apply 9aa2a95... flake.lock: Update
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 9aa2a95... flake.lock: Update
Failed. Please resolve conflicts by hand and push to HEAD.
Conflicts with diff; summary at end:

diff --cc flake.lock
index 080a13c,90076f4..0000000
--- a/flake.lock
+++ b/flake.lock
@@@ -139,14 -95,20 +139,23 @@@
          "type": "github"
        }
      },
 -    "neovim-flake": {
 -      "inputs": {
 -        "flake-utils": "flake-utils",
 -        "nixpkgs": [
 -          "nixpkgs"
 -        ]
 -      },
 +    "neovim-src": {
 +      "flake": false,
        "locked": {
++<<<<<<< HEAD
 +        "lastModified": 1716642936,
 +        "narHash": "sha256-l53vGzYIy6tI1rYBlbxW502sDgpmZ4i/uTdWWtPKPtM=",
 +        "owner": "neovim",
 +        "repo": "neovim",
 +        "rev": "52389e724366ebb2fb58f08c657f580900dd09ee",
++=======
+         "dir": "contrib",
+         "lastModified": 1715889844,
+         "narHash": "sha256-59K+jbZvf+X5q1aWj0VUIQ6YdFCcIuZBgI3EUS/p6IE=",
+         "owner": "neovim",
+         "repo": "neovim",
+         "rev": "06135cc21571b2707121e31176f544a0e0901e1d",
++>>>>>>> 9aa2a95 (flake.lock: Update)
          "type": "github"
        },
        "original": {

Conflict summary:

flake.lock

uploading state files after failure