Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-02-27 00:08:08 +00:00
504 changed files with 28750 additions and 13232 deletions
+2 -2
View File
@@ -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";
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, pythonPackages, fetchurl, dialog }:
pythonPackages.buildPythonPackage rec {
pythonPackages.buildPythonApplication rec {
version = "0.1.0";
name = "letsencrypt-${version}";
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonPackage rec {
pythonPackages.buildPythonApplication rec {
name = "simp_le-2016-01-09";
src = fetchFromGitHub {