From 78dd741ec77cc698596d3520a306fe99cf137420 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Mon, 4 Jan 2021 10:44:07 +0100 Subject: [PATCH 1/2] gensio: 2.1.7 -> 2.2.1 Version bump, add passthru.updateScript, pkg-config and an upstream patch required for the build. --- pkgs/development/libraries/gensio/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index b3bf33f0e88..a568078f991 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -1,21 +1,42 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ autoreconfHook +, fetchFromGitHub +, fetchpatch +, lib +, nix-update-script +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "gensio"; - version = "2.1.7"; + version = "2.2.1"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih"; + sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb"; + }; + + patches = [ + # Fix compilation without openipmi, can be dropped for the next release. + (fetchpatch { + url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch"; + sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; }; configureFlags = [ "--with-python=no" ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "General Stream I/O"; From 2faf844d8386e837b2bb41fd83368b45fdd8d26f Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Mon, 4 Jan 2021 11:13:57 +0100 Subject: [PATCH 2/2] ser2net: 4.2.1 -> 4.3.0 Version bump, organize inputs and add passthru.updateScript. --- pkgs/servers/ser2net/default.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index 466f07052b8..bbb40844ae5 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -1,17 +1,33 @@ -{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook, pkgconfig }: +{ autoreconfHook +, fetchFromGitHub +, gensio +, lib +, libyaml +, nix-update-script +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw"; + sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx"; }; - buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = [ gensio libyaml ]; meta = with lib; { description = "Serial to network connection server";