diff options
| -rw-r--r-- | pkgs/development/compilers/tinycc/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/python-modules/hypothesis.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/simpleproxy/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 28 insertions, 4 deletions
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index dfbbaa4d4310..fcad6045dbfb 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; let - date = "20170225"; + date = "20170527"; version = "0.9.27pre-${date}"; - rev = "bb93064d7857d887b674999c9b4152b44a628f9a"; - sha256 = "12wcahj1x4qy9ia931i23lvwkqjmyhaks3wipnzvbnlnc2b03kpr"; + rev = "53c5fc2246270e0242903de0152a9a5d40f3d679"; + sha256 = "0z5ayz0kdn5xqm84k730hmd7r9cq0zxxf45g5phgqppdfajrmswz"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index 0927c703fbfd..b9f95d1a0313 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' + rm tox.ini # This file changes how py.test runs and breaks it py.test tests/cover ''; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 2d25e6bf4304..c53f766cb7d3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "m17n engine for ibus"; - homepage = https://github.com.com/ibus/ibus-m17n; + homepage = https://github.com/ibus/ibus-m17n; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix new file mode 100644 index 000000000000..476e7dc229df --- /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 debd100368b1..9cd3199a1d5a 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 { }; |