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

Revert "duply: add pythonPackages.cryptography"

Browse Source 
This reverts commit 400d1d5c89.

Didn't fix https://github.com/NixOS/nixpkgs/issues/18112
This commit is contained in:
Frederik Rietdijk 2016-08-30 12:54:59 +02:00
parent c99076e968
commit db1d965ae6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/backup/duply/default.nix
View File

@ -2,9 +2,7 @@
, gnugrep, txt2man, makeWrapper, which , gnugrep, txt2man, makeWrapper, which
}: }:
let stdenv.mkDerivation {
pythonEnv = python.withPackages (ps: [ps.cryptography] );
in stdenv.mkDerivation {
name = "duply-1.9.2"; name = "duply-1.9.2";
src = fetchurl { src = fetchurl {
@ -13,7 +11,7 @@ in stdenv.mkDerivation {
}; };
buildInputs = [ txt2man makeWrapper ]; buildInputs = [ txt2man makeWrapper ];
propagatedBuildInputs = [ pythonEnv ];
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
installPhase = '' installPhase = ''
@ -22,7 +20,7 @@ in stdenv.mkDerivation {
sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply
mv duply "$out/bin" mv duply "$out/bin"
wrapProgram "$out/bin/duply" --set PATH \ wrapProgram "$out/bin/duply" --set PATH \
"${coreutils}/bin:${pythonEnv}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin:${which}/bin" "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin:${which}/bin"
"$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz" "$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz"
''; '';