diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/gmrender-resurrect/default.nix | 76 | ||||
-rw-r--r-- | pkgs/tools/networking/mitmproxy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/vault/default.nix | 4 |
3 files changed, 43 insertions, 41 deletions
diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index be1ca9f265d..d942dce6a19 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -1,38 +1,38 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, makeWrapper -, gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: - -let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in - -stdenv.mkDerivation { - pname = "gmrender-resurrect"; - inherit version; - - src = fetchFromGitHub { - owner = "hzeller"; - repo = "gmrender-resurrect"; - rev = version; - sha256 = "1dmdhyz27bh74qmvncfd3kw7zqwnd05bhxcfjjav98z5qrxdygj4"; - }; - - preConfigurePhases = "autoconfPhase"; - - autoconfPhase = "./autogen.sh"; - - buildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav libupnp ]; - nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; - - postInstall = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "${gst-plugins-base}/lib/gstreamer-1.0:${gst-plugins-good}/lib/gstreamer-1.0:${gst-plugins-bad}/lib/gstreamer-1.0:${gst-plugins-ugly}/lib/gstreamer-1.0:${gst-libav}/lib/gstreamer-1.0" - done - ''; - - meta = with stdenv.lib; { - description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; - homepage = https://github.com/hzeller/gmrender-resurrect; - license = licenses.gpl2; - platforms = platforms.linux; - broken = true; - maintainers = [ maintainers.koral ]; - }; -} +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, makeWrapper, gstreamer +, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: + +let + version = "0.0.8"; + + makePluginPath = plugins: builtins.concatStringsSep ":" (map (p: p + "/lib/gstreamer-1.0") plugins); + + pluginPath = makePluginPath [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]; +in + stdenv.mkDerivation { + pname = "gmrender-resurrect"; + inherit version; + + src = fetchFromGitHub { + owner = "hzeller"; + repo = "gmrender-resurrect"; + rev = "v${version}"; + sha256 = "14i5jrry6qiap5l2x2jqj7arymllajl3wgnk29ccvr8d45zp4jn1"; + }; + + buildInputs = [ gstreamer libupnp ]; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + + postInstall = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH_1_0 : "${pluginPath}" + done + ''; + + meta = with stdenv.lib; { + description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; + homepage = https://github.com/hzeller/gmrender-resurrect; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ koral ashkitten ]; + }; + } diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index a9758e5fd47..53369baa01c 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -52,10 +52,12 @@ buildPythonPackage rec { doCheck = (!stdenv.isDarwin); + # examples.complex.xss_scanner doesn't import correctly with pytest5 checkPhase = '' export HOME=$(mktemp -d) export LC_CTYPE=en_US.UTF-8 - pytest -k 'not test_find_unclaimed_URLs and not test_tcp' + pytest --ignore test/examples \ + -k 'not test_find_unclaimed_URLs and not test_tcp' ''; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index dc5556c7016..1e5a16e1958 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1dqnl5pbhjb19sw2c9ry510vp4gls2l13xylf1bdqzcwd8gpxm42"; + sha256 = "0ayvmqg4fj9cliwbl4pb12mailq7062j3f9v8arpv6x5r4hydlpy"; }; goPackagePath = "github.com/hashicorp/vault"; |