diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
tree | 70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/tools/admin | |
parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
download | nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2 nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/analog/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/letsencrypt/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/admin/sec/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/admin/simp_le/default.nix | 8 |
4 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index 54dac32141fe..a309ed3826e9 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { homepage = "http://www.analog.cx/"; license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index be314a567313..90c97eb6373e 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "letsencrypt-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "letsencrypt"; - repo = "letsencrypt"; + owner = "certbot"; + repo = "certbot"; rev = "v${version}"; - sha256 = "0r2wis48w5nailzp2d5brkh2f40al6sbz816xx0akh3ll0rl1hbv"; + sha256 = "0x098cdyfgqvh7x5d3sz56qjpjyg5b4fl82086sm43d8mbz0h5rm"; }; propagatedBuildInputs = with pythonPackages; [ @@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec { zope_component zope_interface ]; - buildInputs = with pythonPackages; [ nose dialog ]; + buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); patchPhase = '' substituteInPlace letsencrypt/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" @@ -41,10 +41,10 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/letsencrypt/letsencrypt; + homepage = src.meta.homepage; description = "ACME client that can obtain certs and extensibly update server configurations"; platforms = platforms.unix; - maintainers = [ maintainers.iElectric ]; + maintainers = [ maintainers.domenkozar ]; license = licenses.asl20; }; } diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index c74814ae1974..56da02cc8d08 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - configurePhase = ":"; - buildPhase = ":"; + dontBuild = false; + doCheck = false; + installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp sec $out/bin cp sec.man $out/share/man/man1/sec.1 ''; - doCheck = false; meta = { homepage = "http://simple-evcorr.sourceforge.net/"; @@ -26,5 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; }; - } diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 78ae1953ad71..fdb531736d05 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "simp_le-2016-02-06"; + name = "simp_le-2016-04-17"; src = fetchFromGitHub { owner = "kuba"; repo = "simp_le"; - rev = "8f258bc098a84b7a20c2732536d0740244d814f7"; - sha256 = "1r2c31bhj91n3cjyf01spx52vkqxi5475zzkc9s1aliy3fs3lc4r"; + rev = "3a103b76f933f9aef782a47401dd2eff5057a6f7"; + sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z"; }; - propagatedBuildInputs = with pythonPackages; [ acme_0_1 ]; + propagatedBuildInputs = with pythonPackages; [ acme ]; meta = with stdenv.lib; { inherit (src.meta) homepage; |