From 816d5336d8417c5f02e77410c375621cba0a6f4e Mon Sep 17 00:00:00 2001 From: Pasquale Date: Mon, 11 Nov 2019 02:18:14 +0100 Subject: [PATCH 1/4] nixos-shell:init at 2015-05-23 --- .../nixos-shell/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/package-management/nixos-shell/default.nix 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..4ddc282b0d09e --- /dev/null +++ b/pkgs/tools/package-management/nixos-shell/default.nix @@ -0,0 +1,20 @@ +{stdenv, go, fetchFromGitHub}: + +stdenv.mkDerivation rec{ + pname = "nixos-shell"; + version = "2015-05-23"; + src = fetchFromGitHub { + owner = "wavewave"; + repo = pname; + fetchSubmodules = true; + rev = "1e896190f7971e963efed6c3db45c6783dc9032b"; + sha256 = "1sjp9vawybiqr4pa6aryqgz17vixnywml17x4maiirw11v4marhb"; + }; + buildInputs = [ go ]; + phases = [ "buildPhase" ]; + buildPhase = + '' + mkdir -p $out/bin + GOPATH=$src HOME="." go build -o $out/bin/nixos-shell nixos-shell + ''; +} 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 From 1670d0c7b5a59d245ec793b38f30ff0d088bacfa Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Wed, 13 Nov 2019 21:09:23 +0000 Subject: [PATCH 2/4] nixos-shell:added meta field --- pkgs/tools/package-management/nixos-shell/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/package-management/nixos-shell/default.nix b/pkgs/tools/package-management/nixos-shell/default.nix index 4ddc282b0d09e..d6763251a3d1e 100644 --- a/pkgs/tools/package-management/nixos-shell/default.nix +++ b/pkgs/tools/package-management/nixos-shell/default.nix @@ -17,4 +17,10 @@ stdenv.mkDerivation rec{ 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,like nix-shell only more"; + license = licenses.free; + platform = platforms.linux; + }; } From a7fb9badb793b4983960d6e2c2ecbe9d7cdd87d0 Mon Sep 17 00:00:00 2001 From: Pasquale Date: Fri, 13 Dec 2019 01:55:25 +0100 Subject: [PATCH 3/4] nixos-shell:added nixos-container dependency --- pkgs/tools/package-management/nixos-shell/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nixos-shell/default.nix b/pkgs/tools/package-management/nixos-shell/default.nix index 4ddc282b0d09e..7511db56a7a1a 100644 --- a/pkgs/tools/package-management/nixos-shell/default.nix +++ b/pkgs/tools/package-management/nixos-shell/default.nix @@ -1,4 +1,4 @@ -{stdenv, go, fetchFromGitHub}: +{stdenv, go, fetchFromGitHub, nixos-container}: stdenv.mkDerivation rec{ pname = "nixos-shell"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "1sjp9vawybiqr4pa6aryqgz17vixnywml17x4maiirw11v4marhb"; }; buildInputs = [ go ]; + propagatedBuildInputs = [ nixos-container ]; phases = [ "buildPhase" ]; buildPhase = '' From 7bb1f9b935e8c2d00561195ad7ecadcefbec254e Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Sat, 18 Jan 2020 01:34:30 +0000 Subject: [PATCH 4/4] nixos-shell: corret meta Co-Authored-By: Renaud --- pkgs/tools/package-management/nixos-shell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nixos-shell/default.nix b/pkgs/tools/package-management/nixos-shell/default.nix index b3dc60f2b5faf..fa199227c418d 100644 --- a/pkgs/tools/package-management/nixos-shell/default.nix +++ b/pkgs/tools/package-management/nixos-shell/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec{ homepage = "https://github.com/wavewave/nixos-shell" ; description = "Spawn ephemeral development environments in containers"; license = licenses.free; - platform = platforms.linux; + platforms = platforms.linux; }; }