diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-30 12:54:59 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-30 12:54:59 +0200 |
commit | db1d965ae64bf548cce6d71d199fbda460c4371e (patch) | |
tree | 4c48e4ac3d7a713e48f8415b464e5e43a227d2a7 /pkgs/tools | |
parent | c99076e968d28a8d9ce06c858cdcc7db8f398902 (diff) | |
download | nixlib-db1d965ae64bf548cce6d71d199fbda460c4371e.tar nixlib-db1d965ae64bf548cce6d71d199fbda460c4371e.tar.gz nixlib-db1d965ae64bf548cce6d71d199fbda460c4371e.tar.bz2 nixlib-db1d965ae64bf548cce6d71d199fbda460c4371e.tar.lz nixlib-db1d965ae64bf548cce6d71d199fbda460c4371e.tar.xz nixlib-db1d965ae64bf548cce6d71d199fbda460c4371e.tar.zst nixlib-db1d965ae64bf548cce6d71d199fbda460c4371e.zip |
Revert "duply: add pythonPackages.cryptography"
This reverts commit 400d1d5c89741c2d6e94aa5c60b13f03fdc53e1c. Didn't fix https://github.com/NixOS/nixpkgs/issues/18112
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/backup/duply/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 5bde5e78afad..a055b87c2631 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -2,9 +2,7 @@ , gnugrep, txt2man, makeWrapper, which }: -let - pythonEnv = python.withPackages (ps: [ps.cryptography] ); -in stdenv.mkDerivation { +stdenv.mkDerivation { name = "duply-1.9.2"; src = fetchurl { @@ -13,7 +11,7 @@ in stdenv.mkDerivation { }; buildInputs = [ txt2man makeWrapper ]; - propagatedBuildInputs = [ pythonEnv ]; + phases = [ "unpackPhase" "installPhase" ]; installPhase = '' @@ -22,7 +20,7 @@ in stdenv.mkDerivation { sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply mv duply "$out/bin" 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" ''; |