Merge branch 'master' into staging

3 files changed, 30 insertions, 5 deletions

diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 63389153a0a..a99e6f56956 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "remotebox-${version}";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchurl {
     url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
-    sha256 = "0pyi433pwbpyh58p08q8acav7mk90gchgjghvl9f8wqafx7bp404";
+    sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5";
   };
 
   buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 7c5cc8de7ab..a1c6927043e 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -4,7 +4,7 @@
 let
   # Always get the information from
   # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk
-  coreosImageRelease = "1151.0.0";
+  coreosImageRelease = "1192.0.0";
   coreosImageSystemdVersion = "231";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
@@ -12,7 +12,7 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.17.0";
+  version = "1.19.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       owner = "coreos";
       repo = "rkt";
       rev = "v${version}";
-      sha256 = "1jbdnbd2h58zd5irllim6cfa9bf0fdk5nr8qxpjnsgd1fsyhkpld";
+      sha256 = "0s3x27m16jl7nw63zg8g522km1zkwwgafrs8l8sc7pfryhnpmvag";
   };
 
   stage1BaseImage = fetchurl {
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
new file mode 100644
index 00000000000..e318a0b64d7
--- /dev/null
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "singularity-${version}";
+  version = "2.2";
+
+  src = fetchFromGitHub {
+    owner = "singularityware";
+    repo = "singularity";
+    rev = version;
+    sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px";
+  };
+
+  buildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    homepage = http://singularity.lbl.gov/;
+    description = "Designed around the notion of extreme mobility of compute and reproducible science, Singularity enables users to have full control of their operating system environment";
+    license = "BSD license with 2 modifications";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jbedo ];
+  };
+}