diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-11-10 13:50:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-10 13:50:49 +0000 |
| commit | d7cdc480e13473f85bbe7f5fa27bbdd0c09af3f4 (patch) | |
| tree | c21ac6f6e317e98048841c82f73a6380b58c4e62 /pkgs/tools/text | |
| parent | 0655c904bfb864613e154d1dcd90963cc47be4e6 (diff) | |
| parent | 80318523af612a0ccc0e3c685e1fcba96c76f7c2 (diff) | |
| download | nixlib-d7cdc480e13473f85bbe7f5fa27bbdd0c09af3f4.tar nixlib-d7cdc480e13473f85bbe7f5fa27bbdd0c09af3f4.tar.gz nixlib-d7cdc480e13473f85bbe7f5fa27bbdd0c09af3f4.tar.bz2 nixlib-d7cdc480e13473f85bbe7f5fa27bbdd0c09af3f4.tar.lz nixlib-d7cdc480e13473f85bbe7f5fa27bbdd0c09af3f4.tar.xz nixlib-d7cdc480e13473f85bbe7f5fa27bbdd0c09af3f4.tar.zst nixlib-d7cdc480e13473f85bbe7f5fa27bbdd0c09af3f4.zip | |
Merge pull request #50084 from r-ryantm/auto-update/hyx
hyx: 0.1.4 -> 0.1.5
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/hyx/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/text/hyx/no-wall-by-default.patch | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 1ba3534e3f8a..70745266fe55 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -1,13 +1,15 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hyx-0.1.4"; + name = "hyx-0.1.5"; src = fetchurl { url = "https://yx7.cc/code/hyx/${name}.tar.xz"; - sha256 = "049r610hyrrfa62vpiqyb3rh99bpy8cnqy4nd4sih01733cmdhyx"; + sha256 = "0gd8fbdyw12jwffa5dgcql4ry22xbdhqdds1qwzk1rkcrkgnc1mg"; }; + patches = [ ./no-wall-by-default.patch ]; + installPhase = '' install -vD hyx $out/bin/hyx ''; @@ -17,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://yx7.cc/code/; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/hyx/no-wall-by-default.patch b/pkgs/tools/text/hyx/no-wall-by-default.patch new file mode 100644 index 000000000000..48ee20eff179 --- /dev/null +++ b/pkgs/tools/text/hyx/no-wall-by-default.patch @@ -0,0 +1,11 @@ +--- 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 \ |