From 8442447bfd7b3336cb72ac63acafbeda92538de4 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 21 Jun 2024 10:22:43 -0500 Subject: [PATCH] actually import lipgloss --- lib/default.nix | 2 +- pkgs/oizys/oizys-go/cmd/root.go | 1 + pkgs/oizys/oizys-go/default.nix | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 239d5cc..e420808 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -57,7 +57,7 @@ in # oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig { inherit zig2nix; }; # oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim { }; # oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs { }; - oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go { inherit self lib; }; + oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go { inherit self; }; default = oizys-go; }); devShells = forAllSystems (pkgs: { diff --git a/pkgs/oizys/oizys-go/cmd/root.go b/pkgs/oizys/oizys-go/cmd/root.go index 26b1196..2fd51de 100644 --- a/pkgs/oizys/oizys-go/cmd/root.go +++ b/pkgs/oizys/oizys-go/cmd/root.go @@ -6,6 +6,7 @@ import ( o "oizys/internal/oizys" "github.com/charmbracelet/log" + "github.com/charmbracelet/lipgloss" cc "github.com/ivanpirog/coloredcobra" "github.com/spf13/cobra" ) diff --git a/pkgs/oizys/oizys-go/default.nix b/pkgs/oizys/oizys-go/default.nix index 5fd0741..e1538d0 100644 --- a/pkgs/oizys/oizys-go/default.nix +++ b/pkgs/oizys/oizys-go/default.nix @@ -1,4 +1,5 @@ { + self, lib, installShellFiles, buildGoModule, @@ -12,7 +13,7 @@ let in buildGoModule { pname = "oizys"; - version = "unstable"; + version = "${self.shortRev or "dirty"}"; src = cleanSource ./.; vendorHash = "sha256-/JVXhXrU2np/ty7AGFy+LPZCo1NaLYl9NAyD9+FJYBI=";