home

commit 2716550331f7b56368b4f793a00609b84339ac7f
parent 834fe17aa54df770dbe1abf7b02fb570d6dbbb68
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 16 Oct 2018 17:13:39 +0200

pkgs: move podman/conmon out…

… first in `nixos-configuration`, and later on upstream

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
overlays/sbr.nix
 | 
6
------
D
pkgs/conmon/default.nix
 | 
23
-----------------------
M
pkgs/default.nix
 | 
6
------
D
pkgs/podman/default.nix
 | 
46
----------------------------------------------

4 files changed, 0 insertions(+), 81 deletions(-)
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -3,9 +3,6 @@ self: super:
   ape = import ../pkgs/ape {
     inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
   };
-  conmon = import ../pkgs/conmon {
-    inherit (self) stdenv lib fetchFromGitHub makeWrapper pkgconfig libtool gcc glib;
-  };
   dobi = import ../pkgs/dobi {
     inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
   };
@@ -33,9 +30,6 @@ self: super:
   openshift = import ../pkgs/openshift {
     inherit (self) stdenv lib fetchFromGitHub removeReferencesTo which go_1_10 go-bindata makeWrapper rsync utillinux coreutils kerberos clang;
   };
-  podman = import ../pkgs/podman {
-    inherit (self) stdenv lib fetchFromGitHub removeReferencesTo pkgconfig makeWrapper go libtool gpgme lvm2 btrfs-progs libseccomp gcc;
-  };
   scripts = import ../pkgs/scripts {
     inherit (self) stdenv;
   };
diff --git a/pkgs/conmon/default.nix b/pkgs/conmon/default.nix
@@ -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
-  '';
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -6,9 +6,6 @@ in rec {
   ape = import ./ape {
     inherit (pkgs) stdenv lib buildGoPackage fetchFromGitHub;
   };
-  conmon = import ./conmon {
-    inherit (pkgs) stdenv lib fetchFromGitHub makeWrapper pkgconfig libtool gcc glib;
-  };
   dobi = import ./dobi {
     inherit (pkgs) stdenv lib fetchFromGitHub buildGoPackage;
   };
@@ -27,9 +24,6 @@ in rec {
   openshift = import ./openshift {
     inherit (pkgs) stdenv lib fetchFromGitHub removeReferencesTo which go_1_10 go-bindata makeWrapper rsync utillinux coreutils kerberos clang;
   };
-  podman = import ./podman {
-    inherit (pkgs) stdenv lib fetchFromGitHub removeReferencesTo pkgconfig makeWrapper go libtool gpgme lvm2 btrfs-progs libseccomp gcc;
-  };
   kubespy = import ./kubespy {
     inherit (pkgs) stdenv lib buildGoPackage fetchgit;
   };
diff --git a/pkgs/podman/default.nix b/pkgs/podman/default.nix
@@ -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.9.1";
-  src = fetchFromGitHub {
-    owner = "containers";
-    repo = "libpod";
-    rev = "v${version}";
-    sha256 = "10b8613gcy5xrjr0qmgcfr959jzrp244gagnd1wk0jb1hf294fqm";
-  };
-    # 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} '{}' +
-    '';
-
-}