From 5022ddc71b74c276974c07a4d1cb669ca0dfc35c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 24 Nov 2020 20:19:05 +0100 Subject: tv mailaids: init at 1.0.0 --- tv/5pkgs/haskell/mailaids.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tv/5pkgs/haskell/mailaids.nix (limited to 'tv/5pkgs') diff --git a/tv/5pkgs/haskell/mailaids.nix b/tv/5pkgs/haskell/mailaids.nix new file mode 100644 index 000000000..b705c7c69 --- /dev/null +++ b/tv/5pkgs/haskell/mailaids.nix @@ -0,0 +1,21 @@ +{ mkDerivation, aeson, aeson-pretty, base, bytestring +, case-insensitive, fetchgit, lens, optparse-applicative +, purebred-email, stdenv, text, vector, word8 +}: +mkDerivation { + pname = "mailaids"; + version = "1.0.0"; + src = fetchgit { + url = "https://cgit.krebsco.de/mailaids"; + sha256 = "15h0k82czm89gkwhp1rwdy77jz8dmb626qdz7c2narvz9j7169v5"; + rev = "8f11927ea74d6adb332c884502ebd9c486837523"; + fetchSubmodules = true; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring case-insensitive lens + optparse-applicative purebred-email text vector word8 + ]; + license = stdenv.lib.licenses.mit; +} -- cgit v1.2.3 From 64c99a011f3e709dae034fe1b0c3950ba4e8b57b Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 25 Nov 2020 21:44:18 +0100 Subject: tv editor-input: init --- tv/5pkgs/simple/editor-input.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tv/5pkgs/simple/editor-input.nix (limited to 'tv/5pkgs') diff --git a/tv/5pkgs/simple/editor-input.nix b/tv/5pkgs/simple/editor-input.nix new file mode 100644 index 000000000..931179af6 --- /dev/null +++ b/tv/5pkgs/simple/editor-input.nix @@ -0,0 +1,18 @@ +{ pkgs }: +pkgs.writeDashBin "editor-input" '' + exec \ + ${pkgs.utillinux}/bin/setsid -f \ + ${pkgs.with-tmpdir}/bin/with-tmpdir -t editor-input.XXXXXXXX \ + ${pkgs.writeDash "editor-input.sh" '' + f=$TMPDIR/input + ${pkgs.rxvt_unicode}/bin/urxvt -name editor-input-urxvt -e \ + ${pkgs.vim}/bin/vim --cmd ':set noeol binary' -c startinsert "$f" + if test -e "$f"; then + ${pkgs.xsel}/bin/xsel -ip < "$f" + ${pkgs.xsel}/bin/xsel -ib < "$f" + ${pkgs.xdotool}/bin/xdotool key --clearmodifiers shift+Insert + ${pkgs.xsel}/bin/xsel -dp + ${pkgs.xsel}/bin/xsel -db + fi + ''} +'' -- cgit v1.2.3 From 05538a6aed36c62381f7b68d1d03131b2b5b9d4f Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 25 Nov 2020 23:12:03 +0100 Subject: tv rxvt_unicode: do not call perl_destruct --- tv/5pkgs/override/rxvt_unicode.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tv/5pkgs') diff --git a/tv/5pkgs/override/rxvt_unicode.nix b/tv/5pkgs/override/rxvt_unicode.nix index da657fb20..971a03d9a 100644 --- a/tv/5pkgs/override/rxvt_unicode.nix +++ b/tv/5pkgs/override/rxvt_unicode.nix @@ -5,5 +5,11 @@ rxvt_unicode.overrideAttrs (old: { url = https://cgit.krebsco.de/rxvt-unicode/patch/?id=15f3f94; sha256 = "12vldwsds27c9l15ffc6svk9mj17jhypcz736pvpmpqbsymlkz2p"; }) + + # Fix segfault when calling editor-input from XMonad. + (fetchurl { + url = "https://cgit.krebsco.de/rxvt-unicode/patch/?id=d63f96a"; + sha256 = "0i8nqrqgprv7cygflkrdp5zx75dv9bv84vrr2yc3vnfpqxamc43n"; + }) ]; }) -- cgit v1.2.3 From ba1bc1e8d493fd785d01fe39025cfe8888d72813 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 25 Nov 2020 23:12:39 +0100 Subject: tv rxvt_unicode: name patches sensibly --- tv/5pkgs/override/rxvt_unicode.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tv/5pkgs') diff --git a/tv/5pkgs/override/rxvt_unicode.nix b/tv/5pkgs/override/rxvt_unicode.nix index 971a03d9a..4d9c3abc3 100644 --- a/tv/5pkgs/override/rxvt_unicode.nix +++ b/tv/5pkgs/override/rxvt_unicode.nix @@ -2,12 +2,14 @@ rxvt_unicode.overrideAttrs (old: { patches = old.patches ++ [ (fetchurl { + name = "rxvt-unicode.cancel-running-selection-request.patch"; url = https://cgit.krebsco.de/rxvt-unicode/patch/?id=15f3f94; sha256 = "12vldwsds27c9l15ffc6svk9mj17jhypcz736pvpmpqbsymlkz2p"; }) # Fix segfault when calling editor-input from XMonad. (fetchurl { + name = "rxvt-unicode.no-perl_destruct.patch"; url = "https://cgit.krebsco.de/rxvt-unicode/patch/?id=d63f96a"; sha256 = "0i8nqrqgprv7cygflkrdp5zx75dv9bv84vrr2yc3vnfpqxamc43n"; }) -- cgit v1.2.3 From 37ef25d0c04d98b963edd6bd2e8f7aee0f5e1d4f Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 6 Dec 2020 23:39:27 +0100 Subject: tv rox-filer: init at 14354e2 --- tv/5pkgs/simple/rox-filer.nix | 113 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 tv/5pkgs/simple/rox-filer.nix (limited to 'tv/5pkgs') diff --git a/tv/5pkgs/simple/rox-filer.nix b/tv/5pkgs/simple/rox-filer.nix new file mode 100644 index 000000000..fe5342b1d --- /dev/null +++ b/tv/5pkgs/simple/rox-filer.nix @@ -0,0 +1,113 @@ +{ autoconf, stdenv, fetchFromGitHub, pkgconfig, libxml2, libSM +, shared-mime-info + +# Even though imported, this causes: +# (rox:32319): Gtk-WARNING **: 20:16:03.163: Could not find the icon 'text-x-log'. The 'hicolor' theme +# was not found either, perhaps you need to install it. +# You can get a copy from: +# http://icon-theme.freedesktop.org/releases +# +# XXX can we use propagatedBuildInputs instead? +, hicolor-icon-theme + +, libxslt, docbook_xml_dtd_412, docbook_xsl +, gtk ? gtk2, gtk2 # This is normally in top-level/all-packages.nix +}: + +let + version = "2.11"; +in stdenv.mkDerivation rec { + name = "rox-filer-${version}-tv"; + + src = fetchFromGitHub { + owner = "seirios"; + repo = "rox-filer"; + rev = "14354e21bf94a5f3906238706f6b7ac968fa7fce"; + sha256 = "07fz6ns9g7bh1764agl8myy3b0j7qvlkns6dq1lsd5kcf4yx201c"; + }; + + nativeBuildInputs = [ + autoconf + docbook_xsl + pkgconfig + libxslt + ]; + + buildInputs = [ libxml2 gtk shared-mime-info hicolor-icon-theme libSM ]; + + #patches = [ + # + #]; + + # go to the source directory after unpacking the sources + setSourceRoot = "export sourceRoot=source/ROX-Filer"; + + ## patch source with defined patches + #patchFlags = "-p0"; + + # patch the main.c to disable the lookup of the APP_DIR environment variable, + # which is used to lookup the location for certain images when rox-filer + # starts; rather override the location with an absolute path to the directory + # where images are stored to prevent having to use a wrapper, which sets the + # APP_DIR environment variable prior to starting rox-filer + preConfigure = '' + (cd src && autoconf) + sed -i -e "s:g_strdup(getenv(\"APP_DIR\")):\"$out\":" src/main.c + mkdir build + cd build + ''; + + preBuild = '' + for f in \ + ../src/Docs/Manual.xml \ + ../src/Docs/Manual-fr.xml \ + ../src/Docs/Manual-it.xml ; + do + substituteInPlace "$f" \ + --replace \ + /usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd \ + ${docbook_xml_dtd_412}/xml/dtd/docbook/docbookx.dtd + done + make -C ../src/Docs MAN=.. || exit 1 + ''; + + configureScript = "../src/configure"; + + installPhase = '' + mkdir -p "$out" + cd .. + cp -av Help Messages Options.xml ROX images style.css .DirIcon "$out" + + mkdir -p "$out/share/man/man1" + cp -av src/rox.1 "$out/share/man/man1" + + # the main executable + mkdir "$out/bin/" + cp -v ROX-Filer "$out/bin/rox" + + # mime types + mkdir -p "$out/ROX/MIME" + cd "$out/ROX/MIME" + ln -sv text-x-{diff,patch}.png + ln -sv application-x-font-{afm,type1}.png + ln -sv application-xml{,-dtd}.png + ln -sv application-xml{,-external-parsed-entity}.png + ln -sv application-{,rdf+}xml.png + ln -sv application-x{ml,-xbel}.png + ln -sv application-{x-shell,java}script.png + ln -sv application-x-{bzip,xz}-compressed-tar.png + ln -sv application-x-{bzip,lzma}-compressed-tar.png + ln -sv application-x-{bzip-compressed-tar,lzo}.png + ln -sv application-x-{bzip,xz}.png + ln -sv application-x-{gzip,lzma}.png + ln -sv application-{msword,rtf}.png + ''; + + meta = with stdenv.lib; { + description = "Fast, lightweight, gtk2 file manager"; + homepage = http://rox.sourceforge.net/desktop; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.eleanor ]; + }; +} -- cgit v1.2.3 From 4075e7a347b2fbd12cd216960300f466b3f7c609 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 6 Dec 2020 23:40:48 +0100 Subject: tv rox-filer: GitHub -> GitLab --- tv/5pkgs/simple/rox-filer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tv/5pkgs') diff --git a/tv/5pkgs/simple/rox-filer.nix b/tv/5pkgs/simple/rox-filer.nix index fe5342b1d..6f00a0b2a 100644 --- a/tv/5pkgs/simple/rox-filer.nix +++ b/tv/5pkgs/simple/rox-filer.nix @@ -1,4 +1,4 @@ -{ autoconf, stdenv, fetchFromGitHub, pkgconfig, libxml2, libSM +{ autoconf, stdenv, fetchFromGitLab, pkgconfig, libxml2, libSM , shared-mime-info # Even though imported, this causes: @@ -19,7 +19,7 @@ let in stdenv.mkDerivation rec { name = "rox-filer-${version}-tv"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "seirios"; repo = "rox-filer"; rev = "14354e21bf94a5f3906238706f6b7ac968fa7fce"; -- cgit v1.2.3 From eda867803aece664ad3708538abd0d697ee024fc Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 6 Dec 2020 23:47:55 +0100 Subject: tv rox-filer: 14354e2 -> 3c3ad5d --- tv/5pkgs/simple/rox-filer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tv/5pkgs') diff --git a/tv/5pkgs/simple/rox-filer.nix b/tv/5pkgs/simple/rox-filer.nix index 6f00a0b2a..71cb9ca03 100644 --- a/tv/5pkgs/simple/rox-filer.nix +++ b/tv/5pkgs/simple/rox-filer.nix @@ -22,8 +22,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "seirios"; repo = "rox-filer"; - rev = "14354e21bf94a5f3906238706f6b7ac968fa7fce"; - sha256 = "07fz6ns9g7bh1764agl8myy3b0j7qvlkns6dq1lsd5kcf4yx201c"; + rev = "3c3ad5d85a1ab548574bf450f730886b60092587"; + sha256 = "0h743zpx1v9rrsaxn0q3nwpq8wkjf6icgzrg8jpqldsphw3ygkhr"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 311c93143c80dc363f6e2dac3b9f5fa9834db015 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 7 Dec 2020 00:17:33 +0100 Subject: tv rox-filer: cleanup --- tv/5pkgs/simple/rox-filer.nix | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) (limited to 'tv/5pkgs') diff --git a/tv/5pkgs/simple/rox-filer.nix b/tv/5pkgs/simple/rox-filer.nix index 71cb9ca03..bce89cacd 100644 --- a/tv/5pkgs/simple/rox-filer.nix +++ b/tv/5pkgs/simple/rox-filer.nix @@ -1,23 +1,11 @@ -{ autoconf, stdenv, fetchFromGitLab, pkgconfig, libxml2, libSM -, shared-mime-info - -# Even though imported, this causes: -# (rox:32319): Gtk-WARNING **: 20:16:03.163: Could not find the icon 'text-x-log'. The 'hicolor' theme -# was not found either, perhaps you need to install it. -# You can get a copy from: -# http://icon-theme.freedesktop.org/releases -# -# XXX can we use propagatedBuildInputs instead? -, hicolor-icon-theme - +{ autoconf, stdenv, fetchFromGitLab, pkgconfig, libxml2, libSM, shared-mime-info , libxslt, docbook_xml_dtd_412, docbook_xsl -, gtk ? gtk2, gtk2 # This is normally in top-level/all-packages.nix +, gtk ? gtk2, gtk2 }: -let - version = "2.11"; -in stdenv.mkDerivation rec { - name = "rox-filer-${version}-tv"; +stdenv.mkDerivation { + pname = "rox-filer"; + version = "2.11-tv"; src = fetchFromGitLab { owner = "seirios"; @@ -29,22 +17,15 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf docbook_xsl - pkgconfig libxslt + pkgconfig ]; - buildInputs = [ libxml2 gtk shared-mime-info hicolor-icon-theme libSM ]; - - #patches = [ - # - #]; + buildInputs = [ libxml2 gtk shared-mime-info libSM ]; # go to the source directory after unpacking the sources setSourceRoot = "export sourceRoot=source/ROX-Filer"; - ## patch source with defined patches - #patchFlags = "-p0"; - # patch the main.c to disable the lookup of the APP_DIR environment variable, # which is used to lookup the location for certain images when rox-filer # starts; rather override the location with an absolute path to the directory @@ -105,7 +86,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, lightweight, gtk2 file manager"; - homepage = http://rox.sourceforge.net/desktop; + homepage = "http://rox.sourceforge.net/desktop"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; -- cgit v1.2.3