diff --git a/pkgs/tools/package-management/nixos-shell/default.nix b/pkgs/tools/package-management/nixos-shell/default.nix
new file mode 100644
index 0000000000000..fa199227c418d
--- /dev/null
+++ b/pkgs/tools/package-management/nixos-shell/default.nix
@@ -0,0 +1,27 @@
+{stdenv, go, fetchFromGitHub, nixos-container}:
+
+stdenv.mkDerivation rec{
+  pname = "nixos-shell";
+  version = "2015-05-23";
+  src = fetchFromGitHub {
+    owner = "wavewave";
+    repo = pname;
+    fetchSubmodules = true;
+    rev = "1e896190f7971e963efed6c3db45c6783dc9032b";
+    sha256 = "1sjp9vawybiqr4pa6aryqgz17vixnywml17x4maiirw11v4marhb";
+  };
+  buildInputs = [ go ];
+  propagatedBuildInputs = [ nixos-container ];
+  phases = [ "buildPhase" ];
+  buildPhase =
+    ''
+    mkdir -p $out/bin
+    GOPATH=$src HOME="." go build -o $out/bin/nixos-shell nixos-shell
+    '';
+  meta = with stdenv.lib;{
+    homepage = "https://github.com/wavewave/nixos-shell" ;
+    description = "Spawn ephemeral development environments in containers";
+    license = licenses.free;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fe2129fef67b..9dbf9a9d458c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24535,6 +24535,8 @@ in
 
   nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };
 
+  nixos-shell = callPackage ../tools/package-management/nixos-shell/default.nix { };
+
   /* Evaluate a NixOS configuration using this evaluation of Nixpkgs.
 
      With this function you can write, for example, a package that