diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-05-27 18:54:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 18:54:19 +0100 |
| commit | 801adf99c2248ef8e8928ff5b13252f48cbf0b23 (patch) | |
| tree | 36a81994e21f6e98507552c1588875871f14cf99 | |
| parent | 476086929af70ed022c79fdc5cced15e502ee2b8 (diff) | |
| parent | 6de69a2425446035af7b589809de5fd2f3e637dd (diff) | |
| download | nixpkgs-801adf99c2248ef8e8928ff5b13252f48cbf0b23.tar nixpkgs-801adf99c2248ef8e8928ff5b13252f48cbf0b23.tar.gz nixpkgs-801adf99c2248ef8e8928ff5b13252f48cbf0b23.tar.bz2 nixpkgs-801adf99c2248ef8e8928ff5b13252f48cbf0b23.tar.lz nixpkgs-801adf99c2248ef8e8928ff5b13252f48cbf0b23.tar.xz nixpkgs-801adf99c2248ef8e8928ff5b13252f48cbf0b23.tar.zst nixpkgs-801adf99c2248ef8e8928ff5b13252f48cbf0b23.zip | |
Merge pull request #26158 from montag451/simpleproxy
simpleproxy: init at 3.5
| -rw-r--r-- | pkgs/tools/networking/simpleproxy/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix new file mode 100644 index 00000000000..476e7dc229d --- /dev/null +++ b/pkgs/tools/networking/simpleproxy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "simpleproxy-${version}"; + version = "3.5"; + rev = "v.${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "vzaliva"; + repo = "simpleproxy"; + sha256 = "1my9g4vp19dikx3fsbii4ichid1bs9b9in46bkg05gbljhj340f6"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/vzaliva/simpleproxy; + description = "A simple TCP proxy"; + license = licenses.gpl2; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index debd100368b..9cd3199a1d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4058,6 +4058,8 @@ with pkgs; silver-searcher = callPackage ../tools/text/silver-searcher { }; ag = self.silver-searcher; + simpleproxy = callPackage ../tools/networking/simpleproxy { }; + simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; sipsak = callPackage ../tools/networking/sipsak { }; |