From c04fb0a9c55aca2b4b24c252dbe62909e8036f87 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 21 Jul 2018 16:31:05 +0000 Subject: [PATCH] far2l: 2018-02-27 -> 2018-07-19 --- .../far2l/add-nix-syntax-highlighting.patch | 158 ------------------ pkgs/applications/misc/far2l/default.nix | 22 ++- 2 files changed, 14 insertions(+), 166 deletions(-) delete mode 100644 pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch deleted file mode 100644 index a50070c4ead..00000000000 --- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc -new file mode 100644 -index 0000000..1bd9bb5 ---- /dev/null -+++ b/colorer/configs/base/hrc/nix.hrc -@@ -0,0 +1,132 @@ -+ -+ -+ -+ -+ -+ -+ -+ Nix -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc -index 11e493b..2a67263 100644 ---- a/colorer/configs/base/hrc/proto.hrc -+++ b/colorer/configs/base/hrc/proto.hrc -@@ -156,6 +156,14 @@ - - /\.(w?lua)$/i - -+ -+ -+ /\.(nix)$/i -+ -+ -+ -+ -+ - - - /\.(rb|rbw|ruby|rake)$/i diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index d8a0c53d9e1..3cdd4fb0bfe 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: with stdenv.lib; stdenv.mkDerivation rec { - rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a"; - build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}"; + build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; - rev = rev; - sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b"; + rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4"; + sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; @@ -19,10 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 glib pcre ] ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - patches = [ ./add-nix-syntax-highlighting.patch ]; - postPatch = optionalString stdenv.isLinux '' - substituteInPlace far2l/bootstrap/open.sh \ + substituteInPlace far2l/bootstrap/trash.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' '' + optionalString stdenv.isDarwin '' substituteInPlace far2l/CMakeLists.txt \ @@ -44,6 +41,15 @@ stdenv.mkDerivation rec { --replace '"gzip ' '"${gzip}/bin/gzip ' \ --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"tar ' '"${gnutar}/bin/tar ' + + ( cd colorer/configs/base + patch -p2 < ${ fetchpatch { + name = "nix-language-highlighting.patch"; + url = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch; + sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch"; + } + } + ) ''; installPhase = ''