diff options
| author | lassulus <lass@blue.r> | 2018-10-09 11:30:02 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-10-09 11:30:02 +0200 |
| commit | 5ac5ee66bd006cd6161a05c35a2df088abe0616b (patch) | |
| tree | bb34b0506da2fca7e7eb19eb7e3469e752e2e415 /krebs/5pkgs/simple | |
| parent | 1f23af4309d077a4a98c2ad8539db12d062842a5 (diff) | |
| parent | 29d4f4357afc0965c73f7ed33c3f03880e8e84e2 (diff) | |
Merge branch '18.09'
Diffstat (limited to 'krebs/5pkgs/simple')
| -rw-r--r-- | krebs/5pkgs/simple/buildbot-classic/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/pass-otp/default.nix | 30 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/repo-sync/default.nix | 1 |
3 files changed, 1 insertions, 32 deletions
diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix index 665b36ab4..c127d2987 100644 --- a/krebs/5pkgs/simple/buildbot-classic/default.nix +++ b/krebs/5pkgs/simple/buildbot-classic/default.nix @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [ python2Packages.jinja2 python2Packages.twisted - python2Packages.dateutil_1_5 + python2Packages.dateutil python2Packages.sqlalchemy_migrate python2Packages.pysqlite pkgs.coreutils diff --git a/krebs/5pkgs/simple/pass-otp/default.nix b/krebs/5pkgs/simple/pass-otp/default.nix deleted file mode 100644 index 33411180a..000000000 --- a/krebs/5pkgs/simple/pass-otp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, oathToolkit }: -stdenv.mkDerivation rec { - name = "pass-otp-${version}"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "tadfisher"; - repo = "pass-otp"; - rev = "v${version}"; - sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb"; - }; - - buildInputs = [ oathToolkit ]; - - patchPhase = '' - sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash - ''; - - installPhase = '' - make PREFIX=$out install - ''; - - meta = with stdenv.lib; { - description = "A pass extension for managing one-time-password (OTP) tokens"; - homepage = https://github.com/tadfisher/pass-otp; - license = licenses.gpl3; - maintainers = with maintainers; [ jwiegley tadfisher ]; - platforms = platforms.unix; - }; -} diff --git a/krebs/5pkgs/simple/repo-sync/default.nix b/krebs/5pkgs/simple/repo-sync/default.nix index 8393cd79f..66f220ba6 100644 --- a/krebs/5pkgs/simple/repo-sync/default.nix +++ b/krebs/5pkgs/simple/repo-sync/default.nix @@ -3,7 +3,6 @@ with python3Packages; buildPythonPackage rec { name = "repo-sync-${version}"; version = "0.2.7"; - disabled = isPy26 || isPy27; propagatedBuildInputs = [ docopt GitPython |