6 files changed, 74 insertions, 67 deletions
diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix
index 6f90b558bac4..5f2eeb6492b2 100644
--- a/pkgs/by-name/oi/oidc-agent/package.nix
+++ b/pkgs/by-name/oi/oidc-agent/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   curl,
-  webkitgtk,
+  webkitgtk_4_0,
   libmicrohttpd,
   libsecret,
   qrencode,
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "oidc-agent";
-  version = "5.2.1";
+  version = "5.2.3";
 
   src = fetchFromGitHub {
     owner = "indigo-dc";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SjpCD/x93kYB5759e/D0btLO48d6g4SkEUAX7PYfm2w=";
+    hash = "sha256-Vj/YoZpbiV8psU70i3SIKJM/qPQYuy96ogEhT8cG7RU=";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     curl
-    webkitgtk
+    webkitgtk_4_0
     libmicrohttpd
     libsecret
     qrencode
diff --git a/pkgs/by-name/oi/oidentd/package.nix b/pkgs/by-name/oi/oidentd/package.nix
new file mode 100644
index 000000000000..4d3c03d90564
--- /dev/null
+++ b/pkgs/by-name/oi/oidentd/package.nix
@@ -0,0 +1,20 @@
+{ lib, stdenv, fetchurl, bison, flex }:
+
+stdenv.mkDerivation rec {
+  pname = "oidentd";
+  version = "3.1.0";
+  nativeBuildInputs = [ bison flex ];
+
+  src = fetchurl {
+    url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz";
+    sha256 = "sha256-yyvcnabxNkcIMOiZBjvoOm/pEjrGXFt4W4SG5lprkbc=";
+  };
+
+  meta = with lib; {
+    description = "Configurable Ident protocol server";
+    mainProgram = "oidentd";
+    homepage = "https://oidentd.janikrabe.com/";
+    license = licenses.gpl2Only;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/oi/oil-buku/package.nix b/pkgs/by-name/oi/oil-buku/package.nix
new file mode 100644
index 000000000000..5f895179f1f4
--- /dev/null
+++ b/pkgs/by-name/oi/oil-buku/package.nix
@@ -0,0 +1,45 @@
+{ stdenvNoCC, lib, fetchFromGitHub, jq, gawk, peco, makeWrapper }:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "oil-buku";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "AndreiUlmeyda";
+    repo = "oil";
+    rev = version;
+    sha256 = "12g0fd7h11hh94b2pyg3pqwbf8bc7gcnrnm1qqbf18s6z02b6ixr";
+  };
+
+  postPatch = ''
+    substituteInPlace src/oil --replace \
+      "LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib"
+
+    substituteInPlace src/json-to-line.jq --replace \
+      "/usr/bin/env -S jq" "${jq}/bin/jq"
+
+    substituteInPlace src/format-columns.awk --replace \
+      "/usr/bin/env -S awk" "${gawk}/bin/awk"
+  '';
+
+  makeFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "LIBDIR=${placeholder "out"}/lib"
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/oil \
+        --prefix PATH : ${lib.makeBinPath [ peco ]}
+  '';
+
+  meta = with lib; {
+    description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco";
+    homepage = "https://github.com/AndreiUlmeyda/oil";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ atila ];
+    mainProgram = "oil";
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/by-name/oi/oil/package.nix b/pkgs/by-name/oi/oil/package.nix
deleted file mode 100644
index 3cce7d592fee..000000000000
--- a/pkgs/by-name/oi/oil/package.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }:
-
-let
-  readline-all = symlinkJoin {
-    name = "readline-all"; paths = [ readline readline.dev ];
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "oil";
-  version = "0.22.0";
-
-  src = fetchurl {
-    url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    hash = "sha256-RS5/1Ci2hqp1LP65viuU+fz3upqyLgrlcKh83PeCJC4=";
-  };
-
-  postPatch = ''
-    patchShebangs build
-  '';
-
-  preInstall = ''
-    mkdir -p $out/bin
-  '';
-
-  strictDeps = true;
-  buildInputs = lib.optional withReadline readline;
-  # As of 0.20.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder),
-  # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to
-  # work just fine though, so we disable the error here.
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
-  configureFlags = [
-    "--datarootdir=${placeholder "out"}"
-  ] ++ lib.optionals withReadline [
-    "--with-readline"
-    "--readline=${readline-all}"
-  ];
-
-  # Stripping breaks the bundles by removing the zip file from the end.
-  dontStrip = true;
-
-  meta = {
-    description = "New unix shell - Python version";
-    homepage = "https://www.oilshell.org/";
-
-    license = with lib.licenses; [
-      psfl # Includes a portion of the python interpreter and standard library
-      asl20 # Licence for Oil itself
-    ];
-
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ melkor333 ];
-    changelog = "https://www.oilshell.org/release/${version}/changelog.html";
-  };
-
-  passthru = {
-    shellPath = "/bin/osh";
-  };
-}
diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix
index 67dbc80e8afc..b33c93ac6d4f 100644
--- a/pkgs/by-name/oi/oils-for-unix/package.nix
+++ b/pkgs/by-name/oi/oils-for-unix/package.nix
@@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "oils-for-unix";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz";
-    hash = "sha256-etZK2VH6qbj9MQ/BffCpMpHgQat1MRrKG8hcu/p61F8=";
+    hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix
index 405e807e4c33..fb39bf80247c 100644
--- a/pkgs/by-name/oi/oink/package.nix
+++ b/pkgs/by-name/oi/oink/package.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "oink";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "rlado";
     repo = "oink";
     rev = "v${version}";
-    hash = "sha256-nA1M+TIj2mWhaftS5y4D2zIs7HAI4eDRjSdmLUifGKg=";
+    hash = "sha256-MBNEMIrpJdXzMjmNwmKXTIzPNNGalElhIxmMU4y6zXo=";
   };
 
   vendorHash = null;
@@ -25,6 +25,6 @@ buildGoModule rec {
     homepage = "https://github.com/rlado/oink";
     license = lib.licenses.mit;
     mainProgram = "oink";
-    maintainers = with lib.maintainers; [ jtbx ];
+    maintainers = with lib.maintainers; [ jtbx pmw ];
   };
 }