public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15506 from nckx/update-certbot

Browse Source 
certbot: 0.5.0 -> 0.6.0; rename from letsencrypt
This commit is contained in:
Tobias Geerinckx-Rice 2016-05-21 13:53:33 +02:00
commit 1099becf41
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/utox/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "utox-${version}"; name = "utox-${version}";
version = "0.7.0"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GrayHatter"; owner = "GrayHatter";
repo = "uTox"; repo = "uTox";
rev = "v${version}"; rev = "v${version}";
sha256 = "1md8fw6zqd3giskd89i56dgrsl83vn27xwr8k22263wkj1fxxw4c"; sha256 = "12l2821m4r8p3vmsqhqhfj60yhkl4w4xfy73cvy73qqw6xf2yam1";
}; };
buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype

10
pkgs/tools/admin/letsencrypt/default.nix → pkgs/tools/admin/certbot/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, dialog }: { stdenv, pythonPackages, fetchFromGitHub, dialog }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "letsencrypt-${version}"; name = "certbot-${version}";
version = "0.5.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "certbot"; owner = "certbot";
repo = "certbot"; repo = "certbot";
rev = "v${version}"; rev = "v${version}";
sha256 = "0x098cdyfgqvh7x5d3sz56qjpjyg5b4fl82086sm43d8mbz0h5rm"; sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c";
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
@ -29,8 +29,8 @@ pythonPackages.buildPythonApplication rec {
buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
patchPhase = '' patchPhase = ''
substituteInPlace letsencrypt/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail"
substituteInPlace letsencrypt/le_util.py --replace "sw_vers" "/usr/bin/sw_vers" substituteInPlace certbot/le_util.py --replace "sw_vers" "/usr/bin/sw_vers"
''; '';
postInstall = '' postInstall = ''

1
pkgs/top-level/aliases.nix
View File

@ -54,6 +54,7 @@ doNotDisplayTwice rec {
inotifyTools = inotify-tools; inotifyTools = inotify-tools;
joseki = apache-jena-fuseki; # added 2016-02-28 joseki = apache-jena-fuseki; # added 2016-02-28
jquery_ui = jquery-ui; # added 2014-09-07 jquery_ui = jquery-ui; # added 2014-09-07
letsencrypt = certbot; # added 2016-05-16
libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19
libcap_manpages = libcap.doc; # added 2016-04-29 libcap_manpages = libcap.doc; # added 2016-04-29
libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29

4
pkgs/top-level/all-packages.nix
View File

@ -6652,6 +6652,8 @@ in
cegui = callPackage ../development/libraries/cegui {}; cegui = callPackage ../development/libraries/cegui {};
certbot = callPackage ../tools/admin/certbot { };
cgal = callPackage ../development/libraries/CGAL {}; cgal = callPackage ../development/libraries/CGAL {};
cgui = callPackage ../development/libraries/cgui {}; cgui = callPackage ../development/libraries/cgui {};
@ -7452,8 +7454,6 @@ in
libpng = libpng12; libpng = libpng12;
}; };
letsencrypt = callPackage ../tools/admin/letsencrypt { };
lib3ds = callPackage ../development/libraries/lib3ds { }; lib3ds = callPackage ../development/libraries/lib3ds { };
libaacs = callPackage ../development/libraries/libaacs { }; libaacs = callPackage ../development/libraries/libaacs { };

2
pkgs/top-level/python-packages.nix
View File

@ -371,7 +371,7 @@ in modules // {
}; };
acme = buildPythonPackage rec { acme = buildPythonPackage rec {
inherit (pkgs.letsencrypt) src version; inherit (pkgs.certbot) src version;
name = "acme-${version}"; name = "acme-${version}";