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: d594ca69fdbb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53d4649ddcef
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 4, 2017

  1. stdenv.lib.maintainers: add c0bw3b

    @c0bw3b
    c0bw3b authored Nov 4, 2017

    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
    27114d4 View commit details

  2. nsjail: 2.1 -> 2.2 

    plus fixed meta.license which should be Apache License 2.0
    @c0bw3b
    c0bw3b authored Nov 4, 2017

    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
    9754503 View commit details

  3. Merge pull request #31257 from c0bw3b/pkg/nsjail 

    nsjail: 2.1 -> 2.2
    @7c6f434c
    7c6f434c authored Nov 4, 2017

    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
    53d4649 View commit details
Showing with 9 additions and 6 deletions.
  1. +1 −0 lib/maintainers.nix
  2. +8 −6 pkgs/tools/security/nsjail/default.nix
1 change: 1 addition & 0 deletions lib/maintainers.nix
View file
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@
bramd = "Bram Duvigneau <bram@bramd.nl>";
bstrik = "Berno Strik <dutchman55@gmx.com>";
bzizou = "Bruno Bzeznik <Bruno@bzizou.net>";
c0bw3b = "Renaud <c0bw3b@gmail.com>";
c0dehero = "CodeHero <codehero@nerdpol.ch>";
calbrecht = "Christian Albrecht <christian.albrecht@mayflower.de>";
calrama = "Moritz Maxeiner <moritz@ucworks.org>";
14 changes: 8 additions & 6 deletions pkgs/tools/security/nsjail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,29 +3,31 @@

stdenv.mkDerivation rec {
name = "nsjail-${version}";
version = "2.1";
version = "2.2";

src = fetchFromGitHub {
owner = "google";
repo = "nsjail";
rev = version;
fetchSubmodules = true;
sha256 = "1wkhy86d0vgzngdvv593yhcghjh63chb8s67v891zll6bwgwg5h2";
sha256 = "11323j5wd02nm8ibvzbzq7dla70bmcldc71lv5bpk4x7h64ai14v";
};

nativeBuildInputs = [ autoconf libtool pkgconfig ];
buildInputs = [ bison flex libnl protobuf protobufc ];
enableParallelBuilding = true;

installPhase = ''
mkdir -p $out/bin
cp nsjail $out/bin
mkdir -p $out/bin $out/share/man/man1
install nsjail $out/bin/
install nsjail.1 $out/share/man/man1/
'';

meta = with stdenv.lib; {
description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters";
homepage = http://nsjail.com/;
license = licenses.apsl20;
maintainers = [ maintainers.bosu ];
license = licenses.asl20;
maintainers = with maintainers; [ bosu c0bw3b ];
platforms = platforms.linux;
};
}