public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87109 from B4dM4n/jshon-update

Browse Source 
jshon: 20160111.2 -> 20170302 + musl build
This commit is contained in:
Jörg Thalheim 2020-05-07 10:04:01 +01:00 committed by GitHub
commit 05aa39eb01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/tools/parsing/jshon/default.nix
View File

@ -1,29 +1,27 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: { stdenv, lib, fetchFromGitHub, fetchpatch, jansson }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jshon-20160111.2"; pname = "jshon";
version = "20170302";
rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7";
sha256 = "1053w7jbl90q3p5y34pi4i8an1ddsjzwaib5cfji75ivamc5wdmh";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev sha256;
owner = "keenerd"; owner = "keenerd";
repo = "jshon"; repo = "jshon";
rev = "d919aeaece37962251dbe6c1ee50f0028a5c90e4";
sha256 = "1x4zfmsjq0l2y994bxkhx3mn5vzjxxr39iib213zjchi9h6yxvnc";
}; };
patches = [
# Fix null termination in read_stream.
# https://github.com/keenerd/jshon/issues/53
(fetchpatch {
url = "https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch";
sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl";
})
];
buildInputs = [ jansson ]; buildInputs = [ jansson ];
patchPhase = patches = [
(fetchpatch {
# https://github.com/keenerd/jshon/pull/62
url = "https://github.com/keenerd/jshon/commit/96b4e9dbf578be7b31f29740b608aa7b34df3318.patch";
sha256 = "0kwbn3xb37iqb5y1n8vhzjiwlbg5jmki3f38pzakc24kzc5ksmaa";
})
];
postPatch =
'' ''
substituteInPlace Makefile --replace "/usr/" "/" substituteInPlace Makefile --replace "/usr/" "/"
''; '';