From 9ac2a6f064700a75dbd674b2706a22fe00f95c78 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jun 2022 04:20:00 +0000 Subject: [PATCH 1/2] jansson: 2.13.1 -> 2.14 https://github.com/akheron/jansson/raw/v2.14/CHANGES --- pkgs/development/libraries/jansson/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 21a697f1e3a..04921e5d0a5 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,17 +1,22 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "jansson"; - version = "2.13.1"; + version = "2.14"; - src = fetchurl { - url = "https://digip.org/jansson/releases/${pname}-${version}.tar.gz"; - sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl"; + src = fetchFromGitHub { + owner = "akheron"; + repo = "jansson"; + rev = "v${version}"; + sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4="; }; + nativeBuildInputs = [ cmake ]; + meta = with lib; { - homepage = "http://www.digip.org/jansson/"; + homepage = "https://github.com/akheron/jansson"; description = "C library for encoding, decoding and manipulating JSON data"; + changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES"; license = licenses.mit; platforms = platforms.all; }; From 2b6596c426cf3c3e0bf4b588571bfc8b74c93f33 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jun 2022 04:20:00 +0000 Subject: [PATCH 2/2] jansson: add marsam to maintainers --- pkgs/development/libraries/jansson/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 04921e5d0a5..44d48329fad 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES"; license = licenses.mit; platforms = platforms.all; + maintainers = [ maintainers.marsam ]; }; }