mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Added nc6, updated xkeyboard-config

Browse source 
svn path=/nixpkgs/trunk/; revision=10469
This commit is contained in:
Michael Raskin 2008-02-03 08:53:47 +00:00
parent 3547462f7a
commit f6ee57b67f
5 changed files with 90 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/data/misc/xkeyboard-config/0.9.nix Normal file
View file

@ -0,0 +1,23 @@
args: with args;
stdenv.mkDerivation {
name = "xkeyboard-config-0.9";
src = fetchurl {
url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
};
buildInputs = [perl perlXMLParser xkbcomp];
ICONV = "iconv";
preConfigure = "
configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
";
postInstall = ''
rm ''${out}/etc/X11/xkb/compiled
cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
'';
}

22
pkgs/data/misc/xkeyboard-config/1.2.nix Normal file
View file

@ -0,0 +1,22 @@
args: with args;
stdenv.mkDerivation {
name = "xkeyboard-config-${version}";
src = fetchurl {
url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.2.tar.bz2;
sha256 = "1xr7vfgabgyggnkjb56a0bd39yxjhyrldcdsq9pqnw3izfb6i1b4";
};
buildInputs = [perl perlXMLParser xkbcomp gettext];
ICONV = "iconv";
preConfigure = "
configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
";
postInstall = ''
rm ''${out}/etc/X11/xkb/compiled || true;
cat ${./level3-deadkeys-us-intl} | sed -e 's/altgr-intl/altgr-intl-rich/g' >> $out/etc/X11/xkb/symbols/us
'';
}

2
pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
View file

@ -44,7 +44,7 @@ xkb_symbols "altgr-intl" {
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
key <AE04> { [ 4, dollar, currency, sterling ] };
key <AE05> { [ 5, percent, EuroSign ] };
key <AE06> { [ 6, asciicircum, dead_circumflex ] };
key <AE06> { [ 6, asciicircum, dead_circumflex, dead_stroke ] };
key <AE07> { [ 7, ampersand, dead_horn ] };
key <AE08> { [ 8, asterisk, dead_ogonek ] };
key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] };

25
pkgs/tools/networking/nc6/1.0.nix Normal file
View file

@ -0,0 +1,25 @@
args : with args; with builderDefs {src="";} null;
let localDefs = builderDefs (rec {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
};
buildInputs = [];
configureFlags = [];
}) null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "nc6-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
nc6 - one more netcat, IPv6 support included.
";
homepage = "http://www.deepspace6.net/projects/netcat6.html";
};
}

21
pkgs/top-level/all-packages.nix
View file

@ -638,6 +638,13 @@ rec {
inherit fetchurl stdenv gettext;
};
nc6Fun = lib.sumArgs (selectVersion ../tools/networking/nc6) {
version = "1.0";
inherit builderDefs;
};
nc6 = nc6Fun null;
ncat = import ../tools/networking/ncat {
inherit fetchurl stdenv openssl;
};
@ -4005,11 +4012,14 @@ rec {
inherit fetchurl stdenv cabextract;
};
xkeyboard_config = import ../data/misc/xkeyboard-config {
inherit fetchurl stdenv perl perlXMLParser;
xkeyboard_configFun = lib.sumArgs (selectVersion ../data/misc/xkeyboard-config ) {
inherit fetchurl stdenv perl perlXMLParser gettext;
inherit (xlibs) xkbcomp;
version = "1.2";
};
xkeyboard_config = xkeyboard_configFun null;
### APPLICATIONS
@ -5393,6 +5403,13 @@ rec {
inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
};
/*tetexX11 = import ../misc/tex/tetex {
inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
inherit (xlibs) libX11 libXext libXmu libXaw libXt libXpm;
inherit freetype t1lib;
builderX11 = true;
};*/
texFunctions = import ../misc/tex/nix {
inherit stdenv perl tetex graphviz ghostscript;
};