Commit 9ad1d1ffeb02

@@ -18,7 +18,7 @@ in
         type = types.package;
       };
       runcPackage = mkOption {
-        default = pkgs.runc-edge;
+        default = pkgs.nur.repos.vdemeester.runc;
         description = "runc package to be used";
         type = types.package;
       };

@@ -13,12 +13,12 @@ in
         type = types.bool;
       };
       package = mkOption {
-      default = pkgs.containerd-edge;
+        default = pkgs.nur.repos.vdemeester.containerd;
         description = "containerd package to be used";
         type = types.package;
       };
       runcPackage = mkOption {
-        default = pkgs.runc-edge;
+        default = pkgs.nur.repos.vdemeester.runc;
         description = "runc package to be used";
         type = types.package;
       };

@@ -24,7 +24,7 @@ in
         type = types.package;
       };
       runcPackage = mkOption {
-        default = pkgs.runc-edge;
+        default = pkgs.nur.repos.vdemeester.runc;
         description = "runc package to be used";
         type = types.package;
       };

@@ -47,7 +47,7 @@ in
 
     packages = mkOption {
       type = types.listOf types.package;
-      default = [ pkgs.runc-edge ];
+      default = [ pkgs.runc ];
       description = "List of packages to be added to containerd service path";
     };
 

@@ -8,12 +8,6 @@ self: super: {
   vde-thinkpad = import ../pkgs/vde-thinkpad {
     inherit (self) stdenv lib;
   };
-  runc-edge = import ../pkgs/runc {
-    inherit (self) stdenv lib fetchFromGitHub removeReferencesTo go-md2man go pkgconfig libapparmor apparmor-parser libseccomp;
-  };
-  containerd-edge = import ../pkgs/containerd {
-    inherit (self) stdenv lib fetchFromGitHub removeReferencesTo go btrfs-progs;
-  };
   cni = import ../pkgs/cni {
     inherit (self) stdenv fetchFromGitHub go;
   };

@@ -1,54 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, removeReferencesTo
-, go, btrfs-progs }:
-
-with lib;
-
-stdenv.mkDerivation rec {
-  name = "containerd-${version}";
-  version = "1.2.0";
-
-  src = fetchFromGitHub {
-    owner = "containerd";
-    repo = "containerd";
-    rev = "v${version}";
-    sha256 = "03d244v85975bavmlg66kd283jdb22yyvwkwcgy91n63jhvvbadk";
-  };
-
-  hardeningDisable = [ "fortify" ];
-
-  buildInputs = [ removeReferencesTo go btrfs-progs ];
-  buildFlags = "VERSION=v${version}";
-
-  BUILDTAGS = []
-    ++ optional (btrfs-progs == null) "no_btrfs";
-
-  preConfigure = ''
-    # Extract the source
-    cd "$NIX_BUILD_TOP"
-    mkdir -p "go/src/github.com/containerd"
-    mv "$sourceRoot" "go/src/github.com/containerd/containerd"
-    export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
-'';
-
-  preBuild = ''
-    cd go/src/github.com/containerd/containerd
-    patchShebangs .
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin
-  '';
-
-  preFixup = ''
-    find $out -type f -exec remove-references-to -t ${go} '{}' +
-  '';
-
-  meta = {
-    homepage = https://containerd.io/;
-    description = "A daemon to control runC";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ offline vdemeester ];
-    platforms = platforms.linux;
-  };
-}

@@ -1,69 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, removeReferencesTo, go-md2man
-, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
-
-with lib;
-
-stdenv.mkDerivation rec {
-  name = "runc-${version}";
-  version = "1.0.0-rc6";
-
-  src = fetchFromGitHub {
-    owner = "opencontainers";
-    repo = "runc";
-    rev = "f3ce8221ea760f51b5403a9892a69ace43845c2c";
-    sha256 = "1789ph2cw6zhalhjpg1bd8wh2w8mq9n45dadqlkanaxl8g9mqawm";
-  };
-
-  outputs = [ "out" "man" ];
-
-  hardeningDisable = ["fortify"];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ removeReferencesTo go-md2man go libseccomp libapparmor apparmor-parser ];
-
-  makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
-
-  preConfigure = ''
-    # Extract the source
-    cd "$NIX_BUILD_TOP"
-    mkdir -p "go/src/github.com/opencontainers"
-    mv "$sourceRoot" "go/src/github.com/opencontainers/runc"
-    export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
-  '';
-
-  preBuild = ''
-    cd go/src/github.com/opencontainers/runc
-    patchShebangs .
-    substituteInPlace libcontainer/apparmor/apparmor.go \
-      --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser
-  '';
-
-  installPhase = ''
-    install -Dm755 runc $out/bin/runc
-
-    # Include contributed man pages
-    man/md2man-all.sh -q
-    manRoot="$man/share/man"
-    mkdir -p "$manRoot"
-    for manDir in man/man?; do
-      manBase="$(basename "$manDir")" # "man1"
-      for manFile in "$manDir"/*; do
-        manName="$(basename "$manFile")" # "docker-build.1"
-        mkdir -p "$manRoot/$manBase"
-        gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz"
-      done
-    done
-  '';
-
-  preFixup = ''
-    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
-  '';
-
-  meta = {
-    homepage = https://runc.io/;
-    description = "A CLI tool for spawning and running containers according to the OCI specification";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ offline vdemeester ];
-    platforms = platforms.linux;
-  };
-}

@@ -13,12 +13,6 @@ rec {
   vde-thinkpad = import ./vde-thinkpad {
     inherit (pkgs) stdenv lib;
   };
-  runc-edge = import ./runc {
-    inherit (pkgs) stdenv lib fetchFromGitHub removeReferencesTo go-md2man go pkgconfig libapparmor apparmor-parser libseccomp;
-  };
-  containerd-edge = import ./containerd {
-    inherit (pkgs) stdenv lib fetchFromGitHub removeReferencesTo go btrfs-progs;
-  };
   cni = import ./cni {
     inherit (pkgs) stdenv fetchFromGitHub go;
   };