瀏覽代碼

nixpkgs/elvish: update nix pin and carapace

Thomas Dy 2 年之前
父節點
當前提交
a410b8567e
共有 2 個文件被更改,包括 18 次插入9 次删除
  1. 7 5
      .config/nixpkgs/elvish/flake.lock
  2. 11 4
      .config/nixpkgs/elvish/flake.nix

+ 7 - 5
.config/nixpkgs/elvish/flake.lock

@@ -2,16 +2,18 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1662096612,
-        "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=",
+        "lastModified": 1671548329,
+        "narHash": "sha256-OrC6R6zihRjFqdKFF3/vD3bkz44poONSII8ncre1Wh0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "21de2b973f9fee595a7a1ac4693efff791245c34",
+        "rev": "ba6ba2b90096dc49f448aa4d4d783b5081b1cc87",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {

+ 11 - 4
.config/nixpkgs/elvish/flake.nix

@@ -1,6 +1,10 @@
 {
   description = "Elvish configuration";
 
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  };
+
   outputs = { self, nixpkgs }:
     {
       packages.x86_64-linux.carapace-bin =
@@ -9,13 +13,13 @@
         };
         buildGoModule rec {
           pname = "carapace-bin";
-          version = "0.15.0";
+          version = "0.19.0";
 
           src = fetchFromGitHub {
             owner = "rsteube";
             repo = "carapace-bin";
             rev = "v${version}";
-            sha256 = "0lnsrma6f6s25j21gyn56bsh3yfagb50xsw10sgsw6iczc8ri5fx";
+            sha256 = "sha256-Bdtuehfp81fq1ZSV+7jwSmxViu8FzVbBGoZ2HfDda5g=";
           };
 
           ldflags = [ "-s" "-w" ];
@@ -28,7 +32,7 @@
             go generate ./...
           '';
 
-          vendorSha256 = "sha256-OrbVqCgsVX5b5knN6IdlJBWeGfg2fh09a2xe5+2EGEs=";
+          vendorSha256 = "sha256-WXntyDbpGEXHkYgv21vN/JG/CVn6SqnMhmgXfFEQ9eM=";
         };
 
       packages.x86_64-linux.default =
@@ -54,7 +58,10 @@
           #!/bin/sh
           export XDG_DATA_DIRS="$XDG_DATA_DIRS:${config}"
           export PATH="$PATH:${carapace-bin}/bin"
-          keyctl new_session >/dev/null
+          if [ -z "$KEYCTL_INIT" ]; then
+            export KEYCTL_INIT=1
+            keyctl new_session >/dev/null
+          fi
           exec ${elvish}/bin/elvish -rc "${config}/elvish/rc.elv" "$@"
         '';
     };