diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-08-06 09:28:20 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-08-06 09:28:20 +0200 |
| commit | 3b490c653c7912013084ae47f3b56a0ee0fecd51 (patch) | |
| tree | a642d2b767bc010ecec5ae839e03f774cfccd072 | |
| parent | c6a4f9af60c5cad94dd53ff4af9396d3b2714393 (diff) | |
| download | nixlib-3b490c653c7912013084ae47f3b56a0ee0fecd51.tar nixlib-3b490c653c7912013084ae47f3b56a0ee0fecd51.tar.gz nixlib-3b490c653c7912013084ae47f3b56a0ee0fecd51.tar.bz2 nixlib-3b490c653c7912013084ae47f3b56a0ee0fecd51.tar.lz nixlib-3b490c653c7912013084ae47f3b56a0ee0fecd51.tar.xz nixlib-3b490c653c7912013084ae47f3b56a0ee0fecd51.tar.zst nixlib-3b490c653c7912013084ae47f3b56a0ee0fecd51.zip | |
ddar: explicitly use python2
| -rw-r--r-- | pkgs/tools/backup/ddar/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index ce65ef4eb80b..3855152880e2 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }: +{ lib, python2, fetchFromGitHub, roundup }: -buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { pname = "ddar"; version = "1.0"; @@ -23,7 +23,7 @@ buildPythonApplication rec { make -f Makefile.prep synctus/ddar_pb2.py ''; - propagatedBuildInputs = [ protobuf ]; + propagatedBuildInputs = with python2.pkgs; [ protobuf ]; checkInputs = [ roundup ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd7deeae47fc..fd084801c6ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1147,7 +1147,7 @@ with pkgs; dateutils = callPackage ../tools/misc/dateutils { }; - ddar = pythonPackages.callPackage ../tools/backup/ddar { }; + ddar = callPackage ../tools/backup/ddar { }; ddate = callPackage ../tools/misc/ddate { }; |