home

commit 56f8ed3e726a1c7ef9328390a6f36f52239b8bf8
parent ecd5bb80f6c4165cab68fb1a9e500ac147faa1f2
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue,  2 Oct 2018 10:38:21 +0200

openshift: add s2i package

… should upstream s2i as it's pretty stable

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

Diffstat:
M
openshift.nix
 | 
1
+
M
overlays/sbr.nix
 | 
3
+++
M
pkgs/default.nix
 | 
3
+++
A
pkgs/s2i/default.nix
 | 
23
+++++++++++++++++++++++

4 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/openshift.nix b/openshift.nix
@@ -5,5 +5,6 @@
   home.packages = with pkgs; [
     docker-machine-kvm
     docker-machine-kvm2
+    s2i
   ];
 }
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -27,6 +27,9 @@ self: super:
   scripts = import ../pkgs/scripts {
     inherit (self) stdenv;
   };
+  s2i= import ../pkgs/s2i {
+    inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
+  };
   envbox = import ../pkgs/envbox {
     inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
   };
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -30,6 +30,9 @@ in rec {
   scripts = import ./scripts {
     inherit (pkgs) stdenv;
   };
+  s2i = import ./s2i {
+    inherit (pkgs) stdenv lib buildGoPackage fetchFromGitHub;
+  };
   envbox = import ./envbox {
     inherit (pkgs) stdenv lib buildGoPackage fetchFromGitHub;
   };
diff --git a/pkgs/s2i/default.nix b/pkgs/s2i/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "s2i-${version}";
+  version = "1.1.11";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/openshift/source-to-image";
+  subPackages = [ "cmd/s2i" ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "openshift";
+    repo = "source-to-image";
+    sha256 = "0mi4wnvawlgsv4zxg6skg022lqyshgyr3xab5sb2rvqvy0wiqvmr";
+  };
+
+  meta = {
+    description = "A tool for building/building artifacts from source and injecting into docker images";
+    homepage = https://github.com/openshift/source-to-image;
+    licence = lib.licenses.asl20;
+  };
+}