From b512d4c1bff129a17a8f54fc73fbfff2697fdb08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 24 Oct 2023 20:18:17 -0300 Subject: [PATCH 1/4] liquidprompt: add update script --- pkgs/shells/liquidprompt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index acb34377d28d..f119b349dfce 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, gitUpdater }: stdenv.mkDerivation rec { pname = "liquidprompt"; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { $out/share/zsh/plugins/liquidprompt/liquidprompt ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; homepage = "https://github.com/nojhan/liquidprompt"; From fa107c65e405358b1f6793c3428b5a21cc0876fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 24 Oct 2023 20:20:46 -0300 Subject: [PATCH 2/4] liquidprompt: update homepage and git repository --- pkgs/shells/liquidprompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index f119b349dfce..07da18265917 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.2"; src = fetchFromGitHub { - owner = "nojhan"; + owner = "liquidprompt"; repo = pname; rev = "v${version}"; sha256 = "sha256-7mnrXLqnCdOuS2aRs4tVLfO8SRFrqZHNM40gWE/CVFI="; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; - homepage = "https://github.com/nojhan/liquidprompt"; + homepage = "https://github.com/liquidprompt/liquidprompt"; license = licenses.agpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ gerschtli ]; From 22277f6274343e91a730c30496c51e67a70b7e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 24 Oct 2023 20:22:12 -0300 Subject: [PATCH 3/4] liquidprompt: run preInstall and postInstall hooks --- pkgs/shells/liquidprompt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 07da18265917..13156562731a 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { strictDeps = true; installPhase = '' + runHook preInstall + install -D -m 0444 liquidprompt $out/bin/liquidprompt install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist install -D -m 0444 liquid.theme $out/share/doc/liquidprompt/liquid.theme @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { $out/share/zsh/plugins/liquidprompt/liquidprompt.plugin.zsh install -D -m 0444 liquidprompt \ $out/share/zsh/plugins/liquidprompt/liquidprompt + + runHook postInstall ''; passthru.updateScript = gitUpdater { }; From b59a2179d961a778a646f6b6504c85e9cc78bbad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 24 Oct 2023 20:24:38 -0300 Subject: [PATCH 4/4] liquidprompt: 2.1.2 -> 2.2.0 liquidpromptrc-dist and liquid.theme are not available anymore generate liquidpromptrc-dist from the docs install themes and contributed presets --- pkgs/shells/liquidprompt/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 13156562731a..35e097a4ca89 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -2,28 +2,41 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "liquidprompt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7mnrXLqnCdOuS2aRs4tVLfO8SRFrqZHNM40gWE/CVFI="; + hash = "sha256-ra+uJg9E2Cr1k0Ni1+xG9yKFF9iMInJFB5oAFnc52lc="; }; strictDeps = true; + + postPatch = '' + patchShebangs tools/*.sh + ''; + installPhase = '' runHook preInstall install -D -m 0444 liquidprompt $out/bin/liquidprompt - install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist - install -D -m 0444 liquid.theme $out/share/doc/liquidprompt/liquid.theme install -D -m 0444 liquidprompt.plugin.zsh \ $out/share/zsh/plugins/liquidprompt/liquidprompt.plugin.zsh install -D -m 0444 liquidprompt \ $out/share/zsh/plugins/liquidprompt/liquidprompt + # generate default config file + mkdir -p $out/share/doc/liquidprompt + tools/config-from-doc.sh --verbose > $out/share/doc/liquidprompt/liquidpromptrc-dist + + mkdir -p $out/share/liquidprompt + cp -a themes $out/share/liquidprompt/ + + mkdir -p $out/share/liquidprompt/contrib + cp -a contrib/presets $out/share/liquidprompt/contrib/ + runHook postInstall '';