From 80f84ceda26c6957dea5a438245a086b70495e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 20 Feb 2018 17:42:34 +0100 Subject: [PATCH] ddar: move out of pythonPackages --- pkgs/tools/backup/ddar/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 21 --------------------- 3 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 pkgs/tools/backup/ddar/default.nix diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix new file mode 100644 index 000000000000..d09ffdcdc4d2 --- /dev/null +++ b/pkgs/tools/backup/ddar/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, sqlite, roundup }: + +buildPythonApplication rec { + pname = "ddar"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "basak"; + repo = pname; + rev = "v${version}"; + sha256 = "158jdy5261k9yw540g48hddy5zyqrr81ir9fjlcy4jnrwfkg7ynm"; + }; + + preBuild = '' + make -f Makefile.prep synctus/ddar_pb2.py + ''; + + propagatedBuildInputs = [ protobuf ]; + + meta = with lib; { + description = "Unix de-duplicating archiver"; + license = licenses.gpl3; + homepage = src.meta.homepage; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb63e718e479..ce9470229f83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1031,6 +1031,8 @@ with pkgs; dateutils = callPackage ../tools/misc/dateutils { }; + ddar = pythonPackages.callPackage ../tools/backup/ddar { }; + ddate = callPackage ../tools/misc/ddate { }; dehydrated = callPackage ../tools/admin/dehydrated { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0eebd578c3a3..c3e2e99c9432 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3836,27 +3836,6 @@ in { }; }); - ddar = buildPythonPackage { - name = "ddar-1.0"; - - src = pkgs.fetchurl { - url = "https://github.com/basak/ddar/archive/v1.0.tar.gz"; - sha256 = "08lv7hrbhcv6hbl01sx8fgx3l8s2nn8rvcicdidafwm87bvi2nmr"; - }; - - preBuild = '' - make -f Makefile.prep synctus/ddar_pb2.py - ''; - - propagatedBuildInputs = with self; [ protobuf ]; - - meta = { - description = "Unix de-duplicating archiver"; - license = licenses.gpl3; - homepage = https://github.com/basak/ddar; - }; - }; - decorator = callPackage ../development/python-modules/decorator { }; deform = buildPythonPackage rec {