diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-27 00:08:08 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-27 00:08:08 +0000 |
| commit | 3477e662e60ba80a777f9126ba65ca6e9e0fcdf8 (patch) | |
| tree | 26aa99e97f980701131668a00a24fcb85c5cd8a8 /pkgs/tools/admin | |
| parent | b4dadff5429d0bf47bcdafff14dd3d0032039699 (diff) | |
| parent | 766ad682f146a755b460dd87006912a96d915bcd (diff) | |
| download | nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.gz nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.bz2 nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.lz nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.xz nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.zst nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/cli53/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/admin/letsencrypt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/admin/simp_le/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 2fa54796e4c4..3248ac63bf79 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, pythonPackages, fetchurl }: +{ lib, buildPythonApplication, pythonPackages, fetchurl }: -buildPythonPackage rec { +buildPythonApplication rec { name = "cli53-${version}"; namePrefix = ""; # Suppress "python27-" name prefix version = "0.4.4"; diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index 2c74a677b913..516fc20c5a74 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -1,6 +1,6 @@ { stdenv, pythonPackages, fetchurl, dialog }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { version = "0.1.0"; name = "letsencrypt-${version}"; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index f6b352056fa0..77c45e0ad3fe 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "simp_le-2016-01-09"; src = fetchFromGitHub { |