|
@@ -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" "$@"
|
|
|
'';
|
|
|
};
|