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

Merge pull request #85901 from zowoq/slirp

Browse Source 
libslirp: 4.2.0 -> 4.3.0, slirp4netns: 1.0.0 -> 1.0.1
This commit is contained in:
adisbladis 2020-04-24 11:37:00 +02:00 committed by GitHub
commit 755d20a0ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libslirp/default.nix
View File

@ -8,20 +8,24 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libslirp"; pname = "libslirp";
version = "4.2.0"; version = "4.3.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = "slirp"; owner = "slirp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1qk513fgfh4hwb1ajjmvg9m1bl97m3n731ymxqsh1c3fj468a2am"; sha256 = "1hajbdwx20a48hp8kv6jqbjvnzjvcdqmbjfsymzy2xa80idqkfab";
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ glib ]; buildInputs = [ glib ];
postPatch = ''
echo ${version} > .tarball-version
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "General purpose TCP-IP emulator"; description = "General purpose TCP-IP emulator";
homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; homepage = "https://gitlab.freedesktop.org/slirp/libslirp";

4
pkgs/tools/networking/slirp4netns/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "slirp4netns"; pname = "slirp4netns";
version = "1.0.0"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rootless-containers"; owner = "rootless-containers";
repo = "slirp4netns"; repo = "slirp4netns";
rev = "v${version}"; rev = "v${version}";
sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2"; sha256 = "1p5cvq0jsjkl136b8cz3j552x01g96j38ygh6m8ss62bmyzb8ayc";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];