Merge pull request #108808 from Emantor/bump/gensio_sern2et

This commit is contained in:
Sandro 2021-01-12 01:46:17 +01:00 committed by GitHub
commit 0a680e382c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 8 deletions

View file

@ -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";

View file

@ -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";