diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2015-06-15 13:15:03 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2015-06-15 23:31:37 +0200 |
| commit | ed554d5ae21b7769d64835d02cdad9f8185dcd0f (patch) | |
| tree | 48e4112f923886e6f2f25b58d08e18ab73f4dd2d /pkgs | |
| parent | e1af50c4c4c0332136283e9231f0a32ac11f2b90 (diff) | |
| download | nixlib-ed554d5ae21b7769d64835d02cdad9f8185dcd0f.tar nixlib-ed554d5ae21b7769d64835d02cdad9f8185dcd0f.tar.gz nixlib-ed554d5ae21b7769d64835d02cdad9f8185dcd0f.tar.bz2 nixlib-ed554d5ae21b7769d64835d02cdad9f8185dcd0f.tar.lz nixlib-ed554d5ae21b7769d64835d02cdad9f8185dcd0f.tar.xz nixlib-ed554d5ae21b7769d64835d02cdad9f8185dcd0f.tar.zst nixlib-ed554d5ae21b7769d64835d02cdad9f8185dcd0f.zip | |
Delete redundant expression cheetahTemplate
Use the one provided by python-packages instead; retain the top-level cheetahTemplate name as an alias.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/text/cheetah-template/2.0.1.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 1 insertions, 22 deletions
diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix deleted file mode 100644 index 0bfa72ca00d5..000000000000 --- a/pkgs/tools/text/cheetah-template/2.0.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = mirror://sourceforge/cheetahtemplate/Cheetah-2.0.1.tar.gz; - sha256 = "134k4s5f116k23vb7wf9bynlx3gf0wwl7y0zp9ciz0q66nh1idkh"; - }; - - buildInputs = [python makeWrapper]; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')]; - - name = "cheetah-template-2.0.1"; - meta = { - description = "Templating engine"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cf9fed11ae2..e8382d21446e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1022,10 +1022,6 @@ let checkinstall = callPackage ../tools/package-management/checkinstall { }; - cheetahTemplate = builderDefsPackage (import ../tools/text/cheetah-template/2.0.1.nix) { - inherit makeWrapper python; - }; - chkrootkit = callPackage ../tools/security/chkrootkit { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -14802,6 +14798,7 @@ let haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 inherit (haskell.compiler) jhc uhc; # 2015-05-15 + cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 opentsdb = callPackage ../tools/misc/opentsdb {}; |