nixpkgs/elvish: update flake.lock

.config/nixpkgs/elvish/flake.lock

@@ -1,15 +1,31 @@
 {
   "nodes": {
+    "elvishSrc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1752498477,
+        "narHash": "sha256-ZdaJhvUu+u/2mnMEBpK/qeMlIqEfDFWhzDsYlb/oRgg=",
+        "owner": "elves",
+        "repo": "elvish",
+        "rev": "26a8bd5c4ee1eb5c0a2d53578d0368de2b8b3274",
+        "type": "github"
+      },
+      "original": {
+        "owner": "elves",
+        "repo": "elvish",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -20,11 +36,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726583932,
-        "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=",
+        "lastModified": 1771147098,
+        "narHash": "sha256-jpfPdBjKO232s5NueoNEvvVzpndiUzPLNYcH4/Ov0gY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "658e7223191d2598641d50ee4e898126768fe847",
+        "rev": "e3cb16bccd9facebae3ba29c6a76a4cc1b73462a",
         "type": "github"
       },
       "original": {
@@ -36,6 +52,7 @@
     },
     "root": {
       "inputs": {
+        "elvishSrc": "elvishSrc",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }

.config/nixpkgs/elvish/flake.nix

@@ -4,20 +4,38 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    elvishSrc = {
+      url = "github:elves/elvish";
+      flake = false;
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, elvishSrc }:
     flake-utils.lib.eachDefaultSystem (system:
-      with nixpkgs.legacyPackages.${system}; {
-        packages.carapace-bin = buildGo123Module rec {
+      with nixpkgs.legacyPackages.${system};
+      let
+        elvish = buildGoModule {
+          pname = "elvish";
+          version = "nightly";
+
+          src = elvishSrc;
+
+          ldflags = [ "-s" "-w" ];
+
+          subPackages = [ "cmd/elvish" ];
+
+          vendorHash = "sha256-eCA+vdAFOiCUSrapB6vcL3aF/0MuK3Vx6P2vuDdk9v8=";
+        };
+      in {
+        packages.carapace-bin = buildGoModule rec {
           pname = "carapace-bin";
-          version = "1.0.6";
+          version = "1.6.2";
 
           src = fetchFromGitHub {
             owner = "carapace-sh";
             repo = "carapace-bin";
             rev = "v${version}";
-            hash = "sha256-onkYihS4abrOfqOehlDy+ooL2d04w6DwOY3+B4+L3IQ=";
+            hash = "sha256-6b5jxK52uS0v0huI1IkPA0bPYMp8vdnVTVqPMUq9IA8=";
           };
 
           ldflags = [ "-s" "-w" ];
@@ -26,11 +44,11 @@
 
           subPackages = [ "cmd/carapace" ];
 
-          preBuild = ''
+          postConfigure = ''
             go generate ./...
           '';
 
-          vendorHash = "sha256-UFpQAlXFS1O/MqeGvUAWSQLhP03wf8JX8zz8cMyMmrc=";
+          vendorHash = "sha256-RhhfnA2ix0U+vUy5c8aNGo1HBMnydyCYDDBCq6NmjZM=";
         };
 
         packages.elvish =