From 135dc5297ab71045a1f58e053c4584f694988146 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 May 2019 09:18:08 +0200 Subject: ma pkgs.prison-break: move back to own namespace, use nur.repos.makefu.prison-break for krebs --- krebs/5pkgs/default.nix | 1 + krebs/5pkgs/simple/prison-break/default.nix | 20 -------------------- .../5pkgs/simple/prison-break/straight-plugin.nix | 22 ---------------------- 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 krebs/5pkgs/simple/prison-break/default.nix delete mode 100644 krebs/5pkgs/simple/prison-break/straight-plugin.nix (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 4cdaedebf..3cb471c77 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -16,6 +16,7 @@ foldl' mergeAttrs {} reaktor2 = self.haskellPackages.reaktor2; ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; + prison-break = nur.repos.makefu.prison-break; # https://github.com/proot-me/PRoot/issues/106 proot = self.writeDashBin "proot" '' diff --git a/krebs/5pkgs/simple/prison-break/default.nix b/krebs/5pkgs/simple/prison-break/default.nix deleted file mode 100644 index 672e0b3a0..000000000 --- a/krebs/5pkgs/simple/prison-break/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{pkgs, fetchFromGitHub}: -with pkgs.python3.pkgs; - -buildPythonPackage rec { - pname = "prison-break"; - version = "1.2.0"; - src = fetchFromGitHub { - owner = "makefu"; - repo = pname; - rev = version; - sha256 = "07wy6f06vj9s131c16gw1xl1jf9gq5xiqia8awfb26s99gxlv7l9"; - }; - propagatedBuildInputs = [ - docopt - requests - beautifulsoup4 - (callPackage ./straight-plugin.nix {}) - ]; - checkInputs = [ black ]; -} diff --git a/krebs/5pkgs/simple/prison-break/straight-plugin.nix b/krebs/5pkgs/simple/prison-break/straight-plugin.nix deleted file mode 100644 index 606c60b5d..000000000 --- a/krebs/5pkgs/simple/prison-break/straight-plugin.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "straight-plugin"; - version = "1.5.0"; - - src = fetchPypi { - pname = "straight.plugin"; - inherit version; - sha256 = "818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38"; - }; - - meta = with lib; { - description = "A simple namespaced plugin facility"; - homepage = https://github.com/ironfroggy/straight.plugin; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; -} -- cgit v1.2.3