From 3996b91cb1d30b0c38e991283c61ec8293f5d8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 20 Feb 2018 16:54:26 +0100 Subject: [PATCH 1/4] shocco: init at 1.0 --- pkgs/tools/text/shocco/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/text/shocco/default.nix diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix new file mode 100644 index 00000000000..97c677a7f70 --- /dev/null +++ b/pkgs/tools/text/shocco/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, perlPackages, pythonPackages }: + +stdenv.mkDerivation rec { + name = "shocco-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "rtomayko"; + repo = "shocco"; + rev = version; + sha256 = "1nkwcw9fqf4vyrwidqi6by7nrmainkjqkirkz3yxmzk6kzwr38mi"; + }; + + prePatch = '' + # Don't change $PATH + substituteInPlace configure --replace PATH= NIRVANA= + ''; + + buildInputs = [ perlPackages.TextMarkdown pythonPackages.pygments ]; + + meta = with stdenv.lib; { + description = "A quick-and-dirty, literate-programming-style documentation generator for / in POSIX shell"; + homepage = https://rtomayko.github.io/shocco/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9836161b812..e085bc474d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4628,6 +4628,8 @@ with pkgs; sharutils = callPackage ../tools/archivers/sharutils { }; + shocco = callPackage ../tools/text/shocco { }; + shotwell = callPackage ../applications/graphics/shotwell { }; shout = nodePackages.shout; From 08fdc973d49675eb176e719c3df8a60106d63161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 20 Feb 2018 17:19:23 +0100 Subject: [PATCH 2/4] roundup: init at 0.0.6 --- pkgs/tools/misc/roundup/default.nix | 38 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/roundup/default.nix diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix new file mode 100644 index 00000000000..e24b1fce06e --- /dev/null +++ b/pkgs/tools/misc/roundup/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, ronn, shocco }: + +stdenv.mkDerivation rec { + name = "roundup-${version}"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "bmizerany"; + repo = "roundup"; + rev = "v${version}"; + sha256 = "0nxaqmbv8mdvq9wcaqxk6k5mr31i68jzxf1wxa6pp7xp4prwdc9z"; + }; + + prePatch = '' + # Don't change $PATH + substituteInPlace configure --replace PATH= NIRVANA= + # There are only man pages in sections 1 and 5 \ + substituteInPlace Makefile --replace "{1..9}" "1 5" + ''; + + nativeBuildInputs = [ ronn shocco ]; + + installTargets = [ "install" "install-man" ]; + + preInstall = '' + for i in 1 5; do + mkdir -p $out/share/man/man$i + done + ''; + + meta = with stdenv.lib; { + description = "A unit testing tool for running test plans which are written in any POSIX shell"; + homepage = http://bmizerany.github.io/roundup/; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e085bc474d6..eb63e718e47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4498,6 +4498,8 @@ with pkgs; rnv = callPackage ../tools/text/xml/rnv { }; + roundup = callPackage ../tools/misc/roundup { }; + routino = callPackage ../tools/misc/routino { }; rq = callPackage ../development/tools/rq { 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 3/4] 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 00000000000..d09ffdcdc4d --- /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 eb63e718e47..ce9470229f8 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 0eebd578c3a..c3e2e99c943 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 { From f4b98ac64f26de87c0e9f1e91137414d4f14045c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 20 Feb 2018 17:43:22 +0100 Subject: [PATCH 4/4] ddar: fix tests --- pkgs/tools/backup/ddar/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index d09ffdcdc4d..eac589813f4 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, sqlite, roundup }: +{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, roundup }: buildPythonApplication rec { pname = "ddar"; @@ -11,12 +11,26 @@ buildPythonApplication rec { sha256 = "158jdy5261k9yw540g48hddy5zyqrr81ir9fjlcy4jnrwfkg7ynm"; }; + prePatch = '' + substituteInPlace t/local-functions \ + --replace 'PATH="$ddar_src:$PATH"' 'PATH="$out/bin:$PATH"' + # Test requires additional software and compilation of some C programs + substituteInPlace t/basic-test.sh \ + --replace it_stores_and_extracts_corpus0 dont_test + ''; + preBuild = '' make -f Makefile.prep synctus/ddar_pb2.py ''; propagatedBuildInputs = [ protobuf ]; + checkInputs = [ roundup ]; + + checkPhase = '' + roundup t/basic-test.sh + ''; + meta = with lib; { description = "Unix de-duplicating archiver"; license = licenses.gpl3;