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/servers/gpm | |
parent | 52e9488541dc9e207d853ce2aa31d0e453c34767 (diff) | |
download | nixpkgs-7f5b839524cad9211699c68ea02d11c1758a800b.tar nixpkgs-7f5b839524cad9211699c68ea02d11c1758a800b.tar.gz nixpkgs-7f5b839524cad9211699c68ea02d11c1758a800b.tar.bz2 nixpkgs-7f5b839524cad9211699c68ea02d11c1758a800b.tar.lz nixpkgs-7f5b839524cad9211699c68ea02d11c1758a800b.tar.xz nixpkgs-7f5b839524cad9211699c68ea02d11c1758a800b.tar.zst nixpkgs-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/servers/gpm')
-rw-r--r-- | pkgs/servers/gpm/1.20.6.nix | 22 | ||||
-rw-r--r-- | pkgs/servers/gpm/default.nix | 21 |
2 files changed, 21 insertions, 22 deletions
diff --git a/pkgs/servers/gpm/1.20.6.nix b/pkgs/servers/gpm/1.20.6.nix deleted file mode 100644 index 6e9e6e64d51..00000000000 --- a/pkgs/servers/gpm/1.20.6.nix +++ /dev/null @@ -1,22 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = http://linux.schottelius.org/gpm/archives/gpm-1.20.6.tar.lzma; - sha256 = "13w61bh9nyjaa0n5a7qq1rvbqxjbxpqz5qmdmqqpqgrd2jlviar7"; - }; - - buildInputs = [lzma flex bison ncurses]; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - - preConfigure = fullDepEntry ('' - sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in - '') ["addInputs" "doUnpack" "minInit"]; - - name = "gpm-" + version; - meta = { - description = "Mouse daemon"; - }; -} diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix new file mode 100644 index 00000000000..9b6eb2d648b --- /dev/null +++ b/pkgs/servers/gpm/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, lzma, flex, bison, ncurses }: + +stdenv.mkDerivation rec { + name = "gpm-1.20.6"; + + src = fetchurl { + url = "http://linux.schottelius.org/gpm/archives/${name}.tar.lzma"; + sha256 = "13w61bh9nyjaa0n5a7qq1rvbqxjbxpqz5qmdmqqpqgrd2jlviar7"; + }; + + buildInputs = [lzma flex bison ncurses]; + + preConfigure = + '' + sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in + ''; + + meta = { + description = "Mouse daemon"; + }; +} |