summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Saponara <as@php.net>2023-05-26 01:32:01 -0400
committerAdam Saponara <as@php.net>2023-05-26 01:32:05 -0400
commit6fdb2bef3721e5e539ee20d8a0096d88d2351536 (patch)
tree8d6b70f4bd3a1cd7795e83b1e6f8137d7e7f3023
parent30fd9eeadcfa6244c2c7762061161a30ec8e8a8b (diff)
downloadnixpkgs-6fdb2bef3721e5e539ee20d8a0096d88d2351536.tar
nixpkgs-6fdb2bef3721e5e539ee20d8a0096d88d2351536.tar.gz
nixpkgs-6fdb2bef3721e5e539ee20d8a0096d88d2351536.tar.bz2
nixpkgs-6fdb2bef3721e5e539ee20d8a0096d88d2351536.tar.lz
nixpkgs-6fdb2bef3721e5e539ee20d8a0096d88d2351536.tar.xz
nixpkgs-6fdb2bef3721e5e539ee20d8a0096d88d2351536.tar.zst
nixpkgs-6fdb2bef3721e5e539ee20d8a0096d88d2351536.zip
mle: 1.5.0 -> 1.7.2
-rw-r--r--pkgs/applications/editors/mle/default.nix27
1 files changed, 4 insertions, 23 deletions
diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix
index e6744ac8a82..088f10a9e97 100644
--- a/pkgs/applications/editors/mle/default.nix
+++ b/pkgs/applications/editors/mle/default.nix
@@ -1,8 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
-, pcre
+, pcre2
 , uthash
 , lua5_4
 , makeWrapper
@@ -11,29 +10,15 @@
 
 stdenv.mkDerivation rec {
   pname = "mle";
-  version = "1.5.0";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "adsr";
     repo = "mle";
     rev = "v${version}";
-    sha256 = "1nhd00lsx9v12zdmps92magz76c2d8zzln3lxvzl4ng73gbvq3n0";
+    sha256 = "0rkk7mh6w5y1lrbdv7wmxdgl5cqzpzw0p26adazkqlfdyb6wbj9k";
   };
 
-  # Bug fixes found after v1.5.0 release
-  patches = [
-    (fetchpatch {
-      name = "skip_locale_dep_test.patch";
-      url = "https://github.com/adsr/mle/commit/e4dc4314b02a324701d9ae9873461d34cce041e5.patch";
-      sha256 = "sha256-j3Z/n+2LqB9vEkWzvRVSOrF6yE+hk6f0dvEsTQ74erw=";
-    })
-    (fetchpatch {
-      name = "fix_input_trail.patch";
-      url = "https://github.com/adsr/mle/commit/bc05ec0eee4143d824010c6688fce526550ed508.patch";
-      sha256 = "sha256-dM63EBDQfHLAqGZk3C5NtNAv23nCTxXVW8XpLkAeEyQ=";
-    })
-  ];
-
   # Fix location of Lua 5.4 header and library
   postPatch = ''
     substituteInPlace Makefile --replace "-llua5.4" "-llua";
@@ -41,13 +26,9 @@ stdenv.mkDerivation rec {
     patchShebangs tests/*
   '';
 
-  # Use select(2) instead of poll(2) (poll is returning POLLINVAL on macOS)
-  # Enable compiler optimization
-  CFLAGS = "-DTB_OPT_SELECT -O2";
-
   nativeBuildInputs = [ makeWrapper installShellFiles ];
 
-  buildInputs = [ pcre uthash lua5_4 ];
+  buildInputs = [ pcre2 uthash lua5_4 ];
 
   doCheck = true;