Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7c70f2e10bc
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba86df00602d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on May 14, 2020

  1. slirp4netns: 0.4.3 -> 0.4.4 

    https://github.com/rootless-containers/slirp4netns/releases/tag/v0.4.4

(cherry picked from commit b4cf1c9)
    @zowoq @mmilata
    zowoq authored and mmilata committed May 14, 2020
    Copy the full SHA
    6de57b4 View commit details

  2. slirp4netns: 0.4.4 -> 0.4.5 

    https://github.com/rootless-containers/slirp4netns/releases/tag/v0.4.5

Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-1983
    @mmilata
    mmilata committed May 14, 2020
    Copy the full SHA
    def173f View commit details

Commits on May 15, 2020

  1. Merge pull request #87808 from mmilata/20.03/slirp4netns-0.4.5 

    [20.03] slirp4netns 0.4.3 -> 0.4.5
    @adisbladis
    adisbladis authored May 15, 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
    ba86df0 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/tools/networking/slirp4netns/default.nix
10 changes: 5 additions & 5 deletions pkgs/tools/networking/slirp4netns/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, libcap, libseccomp }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, libcap, libseccomp }:

stdenv.mkDerivation rec {
pname = "slirp4netns";
version = "0.4.3";
version = "0.4.5";

src = fetchFromGitHub {
owner = "rootless-containers";
repo = "slirp4netns";
rev = "v${version}";
sha256 = "0g7apfw33wkxxj7qwvlnnhv7qy13s1gkbmvns8612c0yfv9jrsvq";
sha256 = "09vfa26a6cxyswpjv4chx602k9xq2nqx8a5jzvpiryyk7iq3h2hk";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];

buildInputs = [ libcap libseccomp glib ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = https://github.com/rootless-containers/slirp4netns;
homepage = "https://github.com/rootless-containers/slirp4netns";
description = "User-mode networking for unprivileged network namespaces";
license = licenses.gpl2;
maintainers = with maintainers; [ orivej saschagrunert ];