From 81ab7974135d8a523d693a1dc99dfae7db48b8da Mon Sep 17 00:00:00 2001 From: langsjo <104687438+langsjo@users.noreply.github.com> Date: Fri, 18 Jul 2025 02:41:26 +0300 Subject: [PATCH] ghi: rename `env` used for `bundlerEnv` to `rubyEnv` `env` is now only allowed to be an attribute set in `stdenv.mkDerivation` --- pkgs/by-name/gh/ghi/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gh/ghi/package.nix b/pkgs/by-name/gh/ghi/package.nix index 5fd5c6b860c8..a26fbbf47c84 100644 --- a/pkgs/by-name/gh/ghi/package.nix +++ b/pkgs/by-name/gh/ghi/package.nix @@ -6,29 +6,30 @@ bundlerEnv, tree, }: - -stdenv.mkDerivation (finalAttrs: { - pname = "ghi"; +let version = "1.2.1"; src = fetchFromGitHub { owner = "drazisil"; repo = "ghi"; - rev = "refs/tags/${finalAttrs.version}"; + tag = version; hash = "sha256-3V1lxI4VhP0jC3VSWyNS327gOCKowbbLB6ae1idpFFI="; }; - env = bundlerEnv { + rubyEnv = bundlerEnv { name = "ghi"; - - gemfile = "${finalAttrs.src}/Gemfile"; - lockfile = "${finalAttrs.src}/Gemfile.lock"; + gemfile = "${src}/Gemfile"; + lockfile = "${src}/Gemfile.lock"; gemset = ./gemset.nix; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "ghi"; + inherit version src; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ finalAttrs.env.wrappedRuby ]; + buildInputs = [ rubyEnv.wrappedRuby ]; installPhase = '' mkdir -p $out/bin