Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0655c904bfb8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d7cdc480e134
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 9, 2018

  1. hyx: 0.1.4 -> 0.1.5 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hyx/versions
    @r-ryantm
    r-ryantm committed Nov 9, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    disassembler Samuel Leathers
    GPG key ID: FFD741455081B713
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9fdf71d View commit details

Commits on Nov 10, 2018

  1. hyx: disable wall to fix darwin build

    @Mic92
    Mic92 committed Nov 10, 2018
    Copy the full SHA
    1fadff8 View commit details

  2. hyx: limit to linux 

    clock_gettime is not available on macOS
    @Mic92
    Mic92 committed Nov 10, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8031852 View commit details

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

    hyx: 0.1.4 -> 0.1.5
    @Mic92
    Mic92 authored Nov 10, 2018
    Copy the full SHA
    d7cdc48 View commit details
Showing with 16 additions and 3 deletions.
  1. +5 −3 pkgs/tools/text/hyx/default.nix
  2. +11 −0 pkgs/tools/text/hyx/no-wall-by-default.patch
8 changes: 5 additions & 3 deletions pkgs/tools/text/hyx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
11 changes: 11 additions & 0 deletions pkgs/tools/text/hyx/no-wall-by-default.patch
View file
Original file line number Diff line number Diff line change
@@ -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 \