Commit 511b5c422850

@@ -26,10 +26,4 @@ self: super: {
   stellar = import ../pkgs/stellar {
     inherit (self) stdenv lib fetchFromGitHub removeReferencesTo go;
   };
-  podman = import ../pkgs/podman {
-    inherit (self) stdenv lib fetchFromGitHub removeReferencesTo pkgconfig makeWrapper go libtool gpgme lvm2 btrfs-progs libseccomp gcc;
-  };
-  conmon = import ../pkgs/conmon {
-    inherit (self) stdenv lib fetchFromGitHub makeWrapper pkgconfig libtool gcc glib;
-  };
 }

@@ -1,23 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, libtool, gcc, glib }:
-
-stdenv.mkDerivation rec {
-  name = "conmon-${version}";
-  version = "unstable-2018-10-03";
-  rev = "605136242787b6c7e1c7c8233b74a14c9097e510";
-
-  src = fetchFromGitHub {
-    owner = "containers";
-    repo = "conmon";
-    sha256 = "1ks9m4hsv0iflcj62szy6s8ifzvdns0hmhx2cz9mhfa9a7796311";
-    inherit rev;
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    makeWrapper libtool gcc glib
-  ];
-
-  installPhase = ''
-    install -D -m 755 bin/conmon $out/bin/conmon
-  '';
-}

@@ -1,46 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
-, go, libtool, gpgme, lvm2
-, btrfs-progs, libseccomp, gcc
-}:
-
-stdenv.mkDerivation rec {
-  name = "podman-${version}";
-  version = "0.10.1";
-  src = fetchFromGitHub {
-    owner = "containers";
-    repo = "libpod";
-    rev = "v${version}";
-    sha256 = "0156aqdza7kqd4i42n81dcpv03yll92151ggsziklslz8brwc7yk";
-  };
-    # Optimizations break compilation of libseccomp c bindings
-    hardeningDisable = [ "fortify" ];
-
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [
-      makeWrapper removeReferencesTo go libtool
-      btrfs-progs libseccomp gcc gpgme lvm2
-      ];
-
-    dontStrip = true;
-
-    buildPhase = ''
-    patchShebangs .
-    mkdir -p .gopath/src/github.com/containers
-    ln -sf $PWD .gopath/src/github.com/containers/libpod
-    ln -sf $PWD/vendor/github.com/varlink .gopath/src/github.com/varlink
-    export GOPATH="$PWD/.gopath:$GOPATH"
-    make binaries
-    '';
-
-    installPhase = ''
-    install -Dm755 bin/podman $out/bin/podman
-    '';
-
-    outputs = ["out"];
-
-    preFixup = ''
-      find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' +
-      find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' +
-    '';
-
-}

@@ -31,11 +31,4 @@ rec {
   stellar = import ./stellar {
     inherit (pkgs) stdenv lib fetchFromGitHub removeReferencesTo go;
   };
-  # to upstream
-  podman = import ./podman {
-    inherit (pkgs) stdenv lib fetchFromGitHub removeReferencesTo pkgconfig makeWrapper go libtool gpgme lvm2 btrfs-progs libseccomp gcc;
-  };
-  conmon = import ./conmon {
-    inherit (pkgs) stdenv lib fetchFromGitHub makeWrapper pkgconfig libtool gcc glib;
-  };
 }