From 33af4a02e4a76217d3bdc2a8857eec8c33bf5bad Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Sat, 23 Sep 2023 18:17:53 +0200 Subject: [PATCH] change bento to own fork --- utils/pkgs/bento.nix | 37 ------------------------------------ utils/pkgs/bento/default.nix | 6 +++--- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 utils/pkgs/bento.nix diff --git a/utils/pkgs/bento.nix b/utils/pkgs/bento.nix deleted file mode 100644 index 5c8683b..0000000 --- a/utils/pkgs/bento.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ pkgs, stdenv, fetchgit }: - -stdenv.mkDerivation rec { - - name = "bento"; - - src = fetchgit { - url = "https://github.com/rapenne-s/bento.git"; - rev = "6418bd64ecabbfa720c7a87ec39ee1a8b46a907e"; - sha256 = "69b056298cf570debd3718b2e2cb7e63ad9465919c8190cf38043791ce61d0d6"; - }; - - buildInputs = [ ]; - - patchPhase = '' - substituteInPlace bento --replace 'inotifywait' "${pkgs.inotify-tools}/bin/inotifywait"; - ''; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - install -Dm555 bento $out/bin/ - install -Dm444 fleet.nix $out/share/ - install -Dm444 config.sh.sample $out/share/ - install -Dm444 LICENSE $out/share/ - install -Dm444 README.md $out/share/ - install -Dm444 utils/bento.nix $out/share/ - ''; - - meta = with stdenv.lib; { - description = "A KISS deployment tool to keep your NixOS fleet (servers & workstations) up to date."; - homepage = "https://github.com/rapenne-s/bento"; - license = licenses.MIT; - platforms = platforms.linux; - }; - -} diff --git a/utils/pkgs/bento/default.nix b/utils/pkgs/bento/default.nix index 17757ad..e21f5fd 100644 --- a/utils/pkgs/bento/default.nix +++ b/utils/pkgs/bento/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { name = "bento"; src = fetchgit { - url = "https://github.com/rapenne-s/bento.git"; - rev = "6418bd64ecabbfa720c7a87ec39ee1a8b46a907e"; + url = "https://github.com/dpolakovics/bento.git"; + rev = "eba7d076e25b68df7cf1f40ba0f9d91bc2bca4af"; sha256 = "sha256-gLWoZh7fMn3cpIYSJFSVOQHA6qUIJikHXmucHX7P2WI="; }; buildInputs = [ ]; - patchPhase = '' + postPatch = '' substituteInPlace bento --replace 'inotifywait' "${pkgs.inotify-tools}/bin/inotifywait"; '';