From 54f369fab9768dca493a6a61e49a8136b8794608 Mon Sep 17 00:00:00 2001 From: Dopplerian Date: Mon, 16 Dec 2024 13:00:54 +0100 Subject: [PATCH 1/2] maintainers: add dopplerian --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0fd6c5d4807f..82926fa6f0f1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5860,6 +5860,12 @@ githubId = 57304299; keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; } ]; }; + dopplerian = { + name = "Dopplerian"; + github = "Dopplerian"; + githubId = 53937537; + keys = [ { fingerprint = "BBC4 C071 516B A147 8D07 F9DC D2FD E6EC 2E8C 2BF4"; } ]; + }; doriath = { email = "tomasz.zurkowski@gmail.com"; github = "doriath"; From 6118a3d758d113db7a72dc425afbd6237d0a6803 Mon Sep 17 00:00:00 2001 From: Dopplerian Date: Mon, 16 Dec 2024 13:13:21 +0100 Subject: [PATCH 2/2] bashrun2: init at 0.2.6 --- pkgs/by-name/ba/bashrun2/package.nix | 90 +++++++++++++++++++ .../ba/bashrun2/remote-permissions.patch | 12 +++ 2 files changed, 102 insertions(+) create mode 100644 pkgs/by-name/ba/bashrun2/package.nix create mode 100644 pkgs/by-name/ba/bashrun2/remote-permissions.patch diff --git a/pkgs/by-name/ba/bashrun2/package.nix b/pkgs/by-name/ba/bashrun2/package.nix new file mode 100644 index 000000000000..057d1e3894a4 --- /dev/null +++ b/pkgs/by-name/ba/bashrun2/package.nix @@ -0,0 +1,90 @@ +{ + fetchFromGitHub, + lib, + stdenv, + makeWrapper, + xorg, + ncurses, + coreutils, + bashInteractive, + gnused, + gnugrep, + glibc, + xterm, + util-linux, +}: + +stdenv.mkDerivation rec { + pname = "bashrun2"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "hbekel"; + repo = "bashrun2"; + tag = "v${version}"; + hash = "sha256-U2ntplhyv8KAkaMd2D6wRsUIYkhJzxdgHo2xsbNRfqM="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + xorg.libX11 + ]; + + patches = [ + ./remote-permissions.patch + ]; + + postPatch = '' + substituteInPlace \ + man/bashrun2.1 \ + --replace-fail '/usr/bin/brwctl' "$out/bin/brwctl" + + substituteInPlace \ + src/bindings \ + src/registry \ + src/utils \ + src/bashrun2 \ + src/frontend \ + src/remote \ + src/plugin \ + src/engine \ + src/bookmarks \ + --replace-fail '/bin/rm' '${coreutils}/bin/rm' + + substituteInPlace \ + src/bashrun2 \ + --replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bashInteractive}' + + substituteInPlace \ + src/remote \ + --replace-fail '/bin/cp' '${coreutils}/bin/cp' + ''; + + postFixup = '' + wrapProgram $out/bin/bashrun2 \ + --prefix PATH : "$out/bin:${ + lib.makeBinPath [ + ncurses + coreutils + gnused + gnugrep + glibc + bashInteractive + xterm + util-linux + ] + }" \ + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" + ''; + + meta = { + maintainers = with lib.maintainers; [ dopplerian ]; + mainProgram = "bashrun2"; + homepage = "http://henning-liebenau.de/bashrun2/"; + license = lib.licenses.gpl2Plus; + description = "Application launcher based on a modified bash session in a small terminal window"; + }; +} diff --git a/pkgs/by-name/ba/bashrun2/remote-permissions.patch b/pkgs/by-name/ba/bashrun2/remote-permissions.patch new file mode 100644 index 000000000000..888280feaa2d --- /dev/null +++ b/pkgs/by-name/ba/bashrun2/remote-permissions.patch @@ -0,0 +1,12 @@ +diff --git a/src/remote b/src/remote +index 07674ca..07a6b25 100644 +--- a/src/remote ++++ b/src/remote +@@ -97,6 +97,7 @@ function §remote.interface.create { + local bookmarks="$bashrun_cache_home/remote-bookmarks.bash" + + /bin/cp "$bashrun_site/interface" "$interface" ++ chmod +w "$interface" + printf '%s\n' "$bashrun_remote_interface" >> "$interface" + + printf '%s\n' "source $bindings" >> "$interface"