Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 544f1d471a6e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 221583478973
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 4, 2018

  1. simp_le: use python3Packages (#44476)

    @dotlambda
    dotlambda authored Aug 4, 2018
    Copy the full SHA
    2215834 View commit details
Showing with 7 additions and 5 deletions.
  1. +3 −1 nixos/tests/acme.nix
  2. +4 −4 pkgs/tools/admin/simp_le/default.nix
4 changes: 3 additions & 1 deletion nixos/tests/acme.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@ let
'';
});

pythonPackages = (super.python.override {
# Override certifi so that it accepts fake certificate for Let's Encrypt
# Need to override the attribute used by simp_le, which is python3Packages
python3Packages = (super.python3.override {
packageOverrides = lib.const (pysuper: {
certifi = pysuper.certifi.overridePythonAttrs (attrs: {
postPatch = (attrs.postPatch or "") + ''
8 changes: 4 additions & 4 deletions pkgs/tools/admin/simp_le/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, pythonPackages, bash }:
{ stdenv, python3Packages, bash }:

pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "simp_le-client";
version = "0.9.0";

src = pythonPackages.fetchPypi {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1yxfznd78zkg2f657v520zj5w4dvq5n594d0kpm4lra8xnpg4zcv";
};
@@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
$out/bin/simp_le --test
'';

propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy idna ];
propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ];

meta = with stdenv.lib; {
homepage = https://github.com/zenhack/simp_le;