Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #50084 from r-ryantm/auto-update/hyx

hyx: 0.1.4 -> 0.1.5

authored by

Jörg Thalheim and committed by
GitHub
d7cdc480 0655c904

+16 -3
+5 -3
pkgs/tools/text/hyx/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "hyx-0.1.4"; 4 + name = "hyx-0.1.5"; 5 5 6 6 src = fetchurl { 7 7 url = "https://yx7.cc/code/hyx/${name}.tar.xz"; 8 - sha256 = "049r610hyrrfa62vpiqyb3rh99bpy8cnqy4nd4sih01733cmdhyx"; 8 + sha256 = "0gd8fbdyw12jwffa5dgcql4ry22xbdhqdds1qwzk1rkcrkgnc1mg"; 9 9 }; 10 + 11 + patches = [ ./no-wall-by-default.patch ]; 10 12 11 13 installPhase = '' 12 14 install -vD hyx $out/bin/hyx ··· 17 19 homepage = https://yx7.cc/code/; 18 20 license = licenses.mit; 19 21 maintainers = with maintainers; [ fpletz ]; 20 - platforms = platforms.all; 22 + platforms = platforms.linux; 21 23 }; 22 24 }
+11
pkgs/tools/text/hyx/no-wall-by-default.patch
··· 1 + --- hyx-0.1.5.org/Makefile 2018-06-02 17:14:37.000000000 +0100 2 + +++ hyx-0.1.5/Makefile 2018-11-10 09:25:49.569961762 +0000 3 + @@ -1,7 +1,7 @@ 4 + 5 + all: CFLAGS ?= -O2 -Wl,-s \ 6 + -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all 7 + -all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG 8 + +all: CFLAGS += -std=c99 -DNDEBUG 9 + all: hyx 10 + 11 + debug: CFLAGS ?= -O0 -g \