diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-18 09:39:59 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-18 09:39:59 +0000 |
commit | 7f5b839524cad9211699c68ea02d11c1758a800b (patch) | |
tree | ed963d727a8e719d2e1eae8ed31454d59ba2aba3 /pkgs/tools/text | |
parent | 52e9488541dc9e207d853ce2aa31d0e453c34767 (diff) | |
download | nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.gz nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.bz2 nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.lz nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.xz nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.zst nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.zip |
* Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'. * Replaced `with args' with formal function arguments in several packages. * Renamed several files to `default.nix'. As a general rule, version numbers should only be included in the filename when there is a reason to keep multiple versions of a package in Nixpkgs. Otherwise, it just makes it harder to update the package. svn path=/nixpkgs/trunk/; revision=18403
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/cheetah-template/2.0.1.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/highlight/2.6.10.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/text/highlight/default.nix | 18 |
3 files changed, 19 insertions, 21 deletions
diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix index 117e0f88a8be..c20f5db97984 100644 --- a/pkgs/tools/text/cheetah-template/2.0.1.nix +++ b/pkgs/tools/text/cheetah-template/2.0.1.nix @@ -11,7 +11,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')]; - name = "cheetah-template-" + version; + name = "cheetah-template-2.0.1"; meta = { description = "Templating engine"; }; diff --git a/pkgs/tools/text/highlight/2.6.10.nix b/pkgs/tools/text/highlight/2.6.10.nix deleted file mode 100644 index 675a996445f4..000000000000 --- a/pkgs/tools/text/highlight/2.6.10.nix +++ /dev/null @@ -1,20 +0,0 @@ - -args : with args; -rec { - src = fetchurl { - url = http://www.andre-simon.de/zip/highlight-2.6.10.tar.bz2; - sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira"; - }; - - buildInputs = [getopt]; - configureFlags = []; - makeFlags = ["PREFIX=$out"]; - - /* doConfigure should be specified separately */ - phaseNames = ["doMakeInstall"]; - - name = "highlight-" + version; - meta = { - description = "Source code highlighting tool"; - }; -} diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix new file mode 100644 index 000000000000..dc4c0647f41f --- /dev/null +++ b/pkgs/tools/text/highlight/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, getopt }: + +stdenv.mkDerivation rec { + name = "highlight-2.6.10"; + + src = fetchurl { + url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; + sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira"; + }; + + buildInputs = [getopt]; + + makeFlags = ["PREFIX=$out"]; + + meta = { + description = "Source code highlighting tool"; + }; +} |