Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 955170761f84
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 755d20a0ae98
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 24, 2020

  1. libslirp: 4.2.0 -> 4.3.0 

    https://gitlab.freedesktop.org/slirp/libslirp/-/releases/v4.3.0
    @zowoq
    zowoq committed Apr 24, 2020
    Copy the full SHA
    3f2fdbb View commit details

  2. slirp4netns: 1.0.0 -> 1.0.1 

    https://github.com/rootless-containers/slirp4netns/releases/tag/v1.0.1
    @zowoq
    zowoq committed Apr 24, 2020
    Copy the full SHA
    4781556 View commit details

  3. Merge pull request #85901 from zowoq/slirp 

    libslirp: 4.2.0 -> 4.3.0, slirp4netns: 1.0.0 -> 1.0.1
    @adisbladis
    adisbladis authored Apr 24, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    755d20a View commit details
Showing with 8 additions and 4 deletions.
  1. +6 −2 pkgs/development/libraries/libslirp/default.nix
  2. +2 −2 pkgs/tools/networking/slirp4netns/default.nix
8 changes: 6 additions & 2 deletions pkgs/development/libraries/libslirp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,20 +8,24 @@

stdenv.mkDerivation rec {
pname = "libslirp";
version = "4.2.0";
version = "4.3.0";

src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "slirp";
repo = pname;
rev = "v${version}";
sha256 = "1qk513fgfh4hwb1ajjmvg9m1bl97m3n731ymxqsh1c3fj468a2am";
sha256 = "1hajbdwx20a48hp8kv6jqbjvnzjvcdqmbjfsymzy2xa80idqkfab";
};

nativeBuildInputs = [ meson ninja pkg-config ];

buildInputs = [ glib ];

postPatch = ''
echo ${version} > .tarball-version
'';

meta = with stdenv.lib; {
description = "General purpose TCP-IP emulator";
homepage = "https://gitlab.freedesktop.org/slirp/libslirp";
4 changes: 2 additions & 2 deletions pkgs/tools/networking/slirp4netns/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@

stdenv.mkDerivation rec {
pname = "slirp4netns";
version = "1.0.0";
version = "1.0.1";

src = fetchFromGitHub {
owner = "rootless-containers";
repo = "slirp4netns";
rev = "v${version}";
sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2";
sha256 = "1p5cvq0jsjkl136b8cz3j552x01g96j38ygh6m8ss62bmyzb8ayc";
};

nativeBuildInputs = [ autoreconfHook pkg-config ];