From 26d716c7812cde3b2b7ea184daf0b772c1e63ef2 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 13 Jul 2016 10:06:22 +0200 Subject: urlwatch: 2.2 -> 2.5 --- krebs/5pkgs/urlwatch/default.nix | 8 ++------ krebs/5pkgs/urlwatch/setup.patch | 42 ---------------------------------------- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 krebs/5pkgs/urlwatch/setup.patch (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/urlwatch/default.nix b/krebs/5pkgs/urlwatch/default.nix index ae1416204..7a4df5c7c 100644 --- a/krebs/5pkgs/urlwatch/default.nix +++ b/krebs/5pkgs/urlwatch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { - name = "urlwatch-2.2"; + name = "urlwatch-2.5"; src = fetchurl { url = "https://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "0s9056mm1hkj5gpzsb5bz6fwxk0nm73i0dhnqwa1bfddjnvpl9d3"; + sha256 = "0qirpymdmpsx0klmhbx3icmiwpm6fx4wjma646gl9m90pifs8430"; }; propagatedBuildInputs = with python3Packages; [ @@ -15,10 +15,6 @@ python3Packages.buildPythonPackage rec { requests2 ]; - patches = [ - ./setup.patch - ]; - postFixup = '' wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH" ''; diff --git a/krebs/5pkgs/urlwatch/setup.patch b/krebs/5pkgs/urlwatch/setup.patch deleted file mode 100644 index 66626dbf0..000000000 --- a/krebs/5pkgs/urlwatch/setup.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001 -From: Thomas Perl -Date: Tue, 28 Jun 2016 18:15:51 +0200 -Subject: [PATCH] Check current directory and use os.path.relpath (Fixes #73) - ---- - setup.py | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 947a7c8..45405cd 100644 ---- a/setup.py -+++ b/setup.py -@@ -7,10 +7,15 @@ - - import os - import re -+import sys - - PACKAGE_NAME = 'urlwatch' - DEPENDENCIES = ['minidb', 'PyYAML', 'requests'] --HERE = os.path.dirname(__file__) -+HERE = os.path.abspath(os.path.dirname(__file__)) -+ -+if os.path.normpath(os.getcwd()) != os.path.normpath(HERE): -+ print('You must run {} inside {} (cwd={})'.format(os.path.basename(__file__), HERE, os.getcwd())) -+ sys.exit(1) - - # Assumptions: - # 1. Package name equals main script file name (and only one script) -@@ -29,9 +34,9 @@ - - m['scripts'] = [os.path.join(HERE, PACKAGE_NAME)] - m['package_dir'] = {'': os.path.join(HERE, 'lib')} --m['packages'] = ['.'.join(dirname[len(HERE)+1:].split(os.sep)[1:]) -+m['packages'] = ['.'.join(os.path.relpath(dirname, HERE).split(os.sep)[1:]) - for dirname, _, files in os.walk(os.path.join(HERE, 'lib')) if '__init__.py' in files] --m['data_files'] = [(dirname[len(HERE)+1:], [os.path.join(dirname[len(HERE)+1:], fn) for fn in files]) -+m['data_files'] = [(os.path.relpath(dirname, HERE), [os.path.join(os.path.relpath(dirname, HERE), fn) for fn in files]) - for dirname, _, files in os.walk(os.path.join(HERE, 'share')) if files] - m['install_requires'] = DEPENDENCIES - -- cgit v1.2.3 From 49ad0a990d00cc351e8339b9d22cfa79856008c1 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 16 Jul 2016 19:10:20 +0200 Subject: populate: init at 1.0.0 --- krebs/5pkgs/populate/default.nix | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 krebs/5pkgs/populate/default.nix (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/populate/default.nix new file mode 100644 index 000000000..0c73d936d --- /dev/null +++ b/krebs/5pkgs/populate/default.nix @@ -0,0 +1,35 @@ +{ coreutils, fetchgit, jq, openssh, proot, rsync, stdenv, ... }: + +let + PATH = stdenv.lib.makeBinPath [ + coreutils + jq + openssh + proot + rsync + ]; +in + +stdenv.mkDerivation rec { + name = "populate"; + version = "1.0.0"; + + src = fetchgit { + url = http://cgit.cd.krebsco.de/populate; + rev = "refs/tags/v${version}"; + sha256 = "12d8p8k6c8096rn423xjnbhbrxacbfpdm7c78g4g5j5nqxknghp5"; + }; + + phases = [ + "unpackPhase" + "installPhase" + ]; + + installPhase = '' + sed \ + '1s,.*,&\nPATH=${PATH},' \ + -i bin/populate + + cp -r . $out + ''; +} -- cgit v1.2.3 From 514daf3d4611c3d6f451964b5f7ebce22219e6d3 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 16 Jul 2016 21:43:38 +0200 Subject: replace krebs.build.populate by populate --- krebs/5pkgs/test/infest-cac-centos7/notes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes index ab6bc557c..2a3ebd6fc 100755 --- a/krebs/5pkgs/test/infest-cac-centos7/notes +++ b/krebs/5pkgs/test/infest-cac-centos7/notes @@ -138,8 +138,8 @@ ip=$(cac-api getserver $id | jq -r .ip) cat > shared/2configs/temp/dirs.nix < Date: Sat, 16 Jul 2016 23:59:56 +0200 Subject: populate: 1.0.0 -> 1.1.0 --- krebs/5pkgs/populate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/populate/default.nix index 0c73d936d..af7b05227 100644 --- a/krebs/5pkgs/populate/default.nix +++ b/krebs/5pkgs/populate/default.nix @@ -12,12 +12,12 @@ in stdenv.mkDerivation rec { name = "populate"; - version = "1.0.0"; + version = "1.1.0"; src = fetchgit { url = http://cgit.cd.krebsco.de/populate; rev = "refs/tags/v${version}"; - sha256 = "12d8p8k6c8096rn423xjnbhbrxacbfpdm7c78g4g5j5nqxknghp5"; + sha256 = "19drrzji4zdpfn9r1cfms8j4jrn7xgqpyrs6bfd5zszrx4wyw3gw"; }; phases = [ -- cgit v1.2.3 From b8d9b1507e444b2a80864c87769c67409d5c7f6e Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 17 Jul 2016 01:12:30 +0200 Subject: populate: add git to PATH --- krebs/5pkgs/populate/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/populate/default.nix index af7b05227..e68efa594 100644 --- a/krebs/5pkgs/populate/default.nix +++ b/krebs/5pkgs/populate/default.nix @@ -1,8 +1,9 @@ -{ coreutils, fetchgit, jq, openssh, proot, rsync, stdenv, ... }: +{ coreutils, fetchgit, git, jq, openssh, proot, rsync, stdenv, ... }: let PATH = stdenv.lib.makeBinPath [ coreutils + git jq openssh proot -- cgit v1.2.3 From 534850dc5723775706ae2d7121ccef4b1768956c Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 17 Jul 2016 01:26:26 +0200 Subject: populate: 1.1.0 -> 1.1.1 --- krebs/5pkgs/populate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/populate/default.nix index e68efa594..09b29c6c3 100644 --- a/krebs/5pkgs/populate/default.nix +++ b/krebs/5pkgs/populate/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { name = "populate"; - version = "1.1.0"; + version = "1.1.1"; src = fetchgit { url = http://cgit.cd.krebsco.de/populate; rev = "refs/tags/v${version}"; - sha256 = "19drrzji4zdpfn9r1cfms8j4jrn7xgqpyrs6bfd5zszrx4wyw3gw"; + sha256 = "139f4lzn56lca3qgqy9g33r94m3xi1mqns9340lkb4qm6626yvqd"; }; phases = [ -- cgit v1.2.3