From 95c1729ff82417f04c92efef74861e5e28859026 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 13 Aug 2024 22:06:03 +0200
Subject: [PATCH] git-octopus: remove 'with lib;'

---
 .../applications/version-management/git-octopus/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-octopus/default.nix b/pkgs/applications/version-management/git-octopus/default.nix
index 877c795e205d..3865c9ac83b8 100644
--- a/pkgs/applications/version-management/git-octopus/default.nix
+++ b/pkgs/applications/version-management/git-octopus/default.nix
@@ -1,7 +1,5 @@
 { lib, stdenv, fetchFromGitHub, git, perl, makeWrapper }:
 
-with lib;
-
 stdenv.mkDerivation rec {
   pname = "git-octopus";
   version = "1.4";
@@ -13,7 +11,7 @@ stdenv.mkDerivation rec {
   # perl provides shasum
   postInstall = ''
     for f in $out/bin/*; do
-      wrapProgram $f --prefix PATH : ${makeBinPath [ git perl ]}
+      wrapProgram $f --prefix PATH : ${lib.makeBinPath [ git perl ]}
     done
   '';
 
@@ -24,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/lesfurets/git-octopus";
     description = "Continuous merge workflow";
     license = licenses.lgpl3;