From a4637e2bb15a86bd96faaf75914dc8d0dfcc6294 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Nov 2022 21:51:15 +0100
Subject: l: allow piping into sxiv

---
 lass/5pkgs/sxiv/default.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 lass/5pkgs/sxiv/default.nix

(limited to 'lass/5pkgs')

diff --git a/lass/5pkgs/sxiv/default.nix b/lass/5pkgs/sxiv/default.nix
new file mode 100644
index 00000000..04fc1c3f
--- /dev/null
+++ b/lass/5pkgs/sxiv/default.nix
@@ -0,0 +1,27 @@
+{ nsxiv, writers }:
+
+writers.writeDashBin "sxiv" ''
+  set -efu
+  tmpfile="''${TMPDIR:-/tmp}/nsxiv_pipe_$$"
+  trap 'rm -f -- $tmpfile' EXIT
+
+  if [ "$#" -eq 0 ]; then
+    if [ -t 0 ]; then
+      echo "sxiv: No arguments provided" >&2; exit 1
+    else
+      # Consume stdin and put it in the temporal file
+      cat > "$tmpfile"
+    fi
+  fi
+
+  for arg in "$@"; do
+    # if it's a pipe then drain it to $tmpfile
+    [ -p "$arg" ] && cat "$arg" > "$tmpfile"
+  done
+
+  if [ -s "$tmpfile" ]; then
+    ${nsxiv}/bin/nsxiv -q "$@" "$tmpfile" # -q to silence warnings
+  else
+    ${nsxiv}/bin/nsxiv "$@" # fallback
+  fi
+''
-- 
cgit v1.2.3


From 32b23666d15861f6f4d8b1f522ee53d4f21fabb6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 29 Nov 2022 13:47:36 +0100
Subject: l drbd: use drbd9

---
 lass/5pkgs/drbd9/default.nix | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 lass/5pkgs/drbd9/default.nix

(limited to 'lass/5pkgs')

diff --git a/lass/5pkgs/drbd9/default.nix b/lass/5pkgs/drbd9/default.nix
new file mode 100644
index 00000000..34ef0f56
--- /dev/null
+++ b/lass/5pkgs/drbd9/default.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, git, fetchzip, fetchFromGitHub, kernel }: let
+
+  version = "9.1.7";
+
+in stdenv.mkDerivation {
+  pname = "drbd";
+  version = "${kernel.version}-${version}";
+
+  src = fetchzip {
+    url = "https://pkg.linbit.com//downloads/drbd/9/drbd-9.1.7.tar.gz";
+    sha256 = "sha256-JsbtOrqhZkG7tFEc6tDmj3RlxZggl0HOKfCI8lYtQok=";
+  };
+  # src = fetchFromGitHub {
+  #   owner = "LINBIT";
+  #   repo = "drbd";
+  #   rev = "drbd-${version}";
+  #   sha256 = "sha256-8HAt+k0yi6XsZZ9mkVCQkv2pn65o3Zsa0KwTSBJh0yY=";
+  #   leaveDotGit = true;
+  # };
+
+  nativeBuildInputs = [ git ] ++ kernel.moduleBuildDependencies;
+
+  # hardeningDisable = [ "pic" ];
+
+  makeFlags = kernel.makeFlags ++ [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  installPhase = ''
+    install -D drbd/drbd.ko -t "$out/lib/modules/${kernel.modDirVersion}/updates/"
+    install -D drbd/drbd_transport_tcp.ko -t "$out/lib/modules/${kernel.modDirVersion}/updates/"
+  '';
+
+  enableParallelBuilding = true;
+}
-- 
cgit v1.2.3