about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Korotkiy <sikmir@gmail.com>2020-07-22 11:39:55 +0300
committerNikolay Korotkiy <sikmir@gmail.com>2020-07-22 13:09:03 +0300
commitfe6c0ff6b2bbd1f1b1485d32867536fdf9042d3e (patch)
tree581ffe8b1ca52657ee213bc1d6eb901bd37a6455
parent156ce0c3026b40ede429e5b55c17621abd233b4a (diff)
downloadnixlib-fe6c0ff6b2bbd1f1b1485d32867536fdf9042d3e.tar
nixlib-fe6c0ff6b2bbd1f1b1485d32867536fdf9042d3e.tar.gz
nixlib-fe6c0ff6b2bbd1f1b1485d32867536fdf9042d3e.tar.bz2
nixlib-fe6c0ff6b2bbd1f1b1485d32867536fdf9042d3e.tar.lz
nixlib-fe6c0ff6b2bbd1f1b1485d32867536fdf9042d3e.tar.xz
nixlib-fe6c0ff6b2bbd1f1b1485d32867536fdf9042d3e.tar.zst
nixlib-fe6c0ff6b2bbd1f1b1485d32867536fdf9042d3e.zip
hyx: 0.1.5 -> 2020-06-09
-rw-r--r--pkgs/tools/text/hyx/default.nix9
-rw-r--r--pkgs/tools/text/hyx/no-wall-by-default.patch11
2 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix
index 83fdabb8f46f..6553e935fe8e 100644
--- a/pkgs/tools/text/hyx/default.nix
+++ b/pkgs/tools/text/hyx/default.nix
@@ -1,15 +1,14 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hyx-0.1.5";
+  pname = "hyx";
+  version = "2020-06-09";
 
   src = fetchurl {
-    url = "https://yx7.cc/code/hyx/${name}.tar.xz";
-    sha256 = "0gd8fbdyw12jwffa5dgcql4ry22xbdhqdds1qwzk1rkcrkgnc1mg";
+    url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] version}.tar.xz";
+    sha256 = "1x8dmll93hrnj24kn5knpwj36y6r1v2ygwynpjwrg2hwd4c1a8hi";
   };
 
-  patches = [ ./no-wall-by-default.patch ];
-
   installPhase = ''
     install -vD hyx $out/bin/hyx
   '';
diff --git a/pkgs/tools/text/hyx/no-wall-by-default.patch b/pkgs/tools/text/hyx/no-wall-by-default.patch
deleted file mode 100644
index 48ee20eff179..000000000000
--- a/pkgs/tools/text/hyx/no-wall-by-default.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hyx-0.1.5.org/Makefile	2018-06-02 17:14:37.000000000 +0100
-+++ hyx-0.1.5/Makefile	2018-11-10 09:25:49.569961762 +0000
-@@ -1,7 +1,7 @@
- 
- all: CFLAGS ?= -O2 -Wl,-s \
-                -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all
--all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG
-+all: CFLAGS += -std=c99 -DNDEBUG
- all: hyx
- 
- debug: CFLAGS ?= -O0 -g \