JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Committing Lluís Batlle's submissions from mailing list posting

Browse Source 
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
This commit is contained in:
Peter Simons 2009-01-12 21:12:07 +00:00
parent 4080ba42c5
commit 6fb297513a
15 changed files with 267 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/misc/truecrypt/builder.sh
View File

@ -1,15 +1,15 @@
source $stdenv/setup
# PATH=$perl/bin:$PATH
tar zxvf $wxWidgets
# we need the absolute path, relative will not work
wxwdir=$(pwd)/wxX11-*
tar xvfz $src
cd truecrypt-*
make WX_ROOT=$wxwdir wxbuild
make
cp $pkcs11h pkcs11.h
cp $pkcs11th pkcs11t.h
cp $pkcs11fh pkcs11f.h
make PKCS11_INC="`pwd`"
mkdir -p $out/bin
cp Main/truecrypt $out/bin
mkdir -p $out/share/$name
cp License.txt $out/share/$name/LICENSE

34
pkgs/applications/misc/truecrypt/default.nix
View File

@ -40,24 +40,38 @@ library, use the 'NOGUI' parameter:
$ make NOGUI=1
*/
{ fetchurl, stdenv, pkgconfig, fuse, gtk, libSM, glibc
{ fetchurl, stdenv, pkgconfig, fuse, wxGTK, devicemapper
}:
stdenv.mkDerivation {
name = "trueCrypt-6.0a";
name = "trueCrypt-6.1a";
builder = ./builder.sh;
src = fetchurl {
url = http://www.sfr-fresh.com/unix/misc/TrueCrypt-6.0a-Source.tar.gz;
sha256 = "dea0ac2f1f6964d7e88f6751fa9f0a89d0dbfb957e9a557e8dee48492d0b4fac";
url = http://www.sfr-fresh.com/unix/misc/TrueCrypt-6.1a-Source.tar.gz;
sha256 = "a2bb8273edcb3c3d10d9819daac853f940033deb1f9726986311356bd5b88c4a";
};
wxWidgets = fetchurl {
url = mirror://sourceforge/wxwindows/wxX11-2.8.8.tar.gz;
sha256 = "85e1a458fd9523c68b22af0a51eb507b792894e9ba58a560f9dbe7b6faa6f625";
pkcs11h = fetchurl {
url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11.h;
sha256 = "1563d877b6f8868b8eb8687358162bfb7f868104ed694beb35ae1c5cf1a58b9b";
};
buildInputs = [pkgconfig fuse gtk libSM glibc];
#configureFlags =
#postInstall = "
pkcs11th = fetchurl {
url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11t.h;
sha256 = "8ce68616304684f92a7e267bcc8f486441e92a5cbdfcfd97e69ac9a0b436fb7b";
};
pkcs11fh = fetchurl {
url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11f.h;
sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
};
buildInputs = [pkgconfig fuse wxGTK devicemapper];
meta = {
description = "Free Open-Source filesystem on-the-fly encryption";
homepage = http://www.truecrypt.org/;
license = "TrueCrypt License Version 2.6";
};
}

20
pkgs/applications/networking/instant-messengers/psi/0.12.nix Normal file
View File

@ -0,0 +1,20 @@
args : with args;
rec {
src = fetchurl {
url = mirror://sourceforge/psi/psi-0.12.tar.gz;
sha256 = "6afbb3b017009bf4d8d275ec1481e92831b0618ecb58f1372cd9189140a316af";
};
buildInputs = [aspell qt zlib sox openssl libX11 xproto
libSM libICE];
configureFlags = [" --with-zlib-inc=${zlib}/include "
" --with-openssl-inc=${openssl}/include "
];
phaseNames = ["doConfigure" "doMakeInstall"];
name = "psi-" + version;
meta = {
description = "Psi, an XMPP (Jabber) client";
};
}

8
pkgs/applications/networking/skype/default.nix
View File

@ -1,12 +1,12 @@
args: with args;
stdenv.mkDerivation ( rec {
pname = "skype";
version = "1.4.0.118";
name = "skype-1.4";
version = "2.0.0.72";
name = "skype-2.0";
src = fetchurl {
url = http://www.skype.com/go/getskype-linux-static;
sha256 = "1293f54811a36b2a1b83c56a4ad2844e58c753fe39b61422fac66b001d0f9e0c";
sha256 = "2f37963e8f19c0ec5efd8631abe9633b6551f09dee024460c40fad10728bc580";
name = "${pname}_static-${version}.tar.bz2";
};
@ -17,6 +17,8 @@ stdenv.mkDerivation ( rec {
libSM
libICE
libXi
libXv
libXScrnSaver
libXrender
libXrandr
libXfixes

1
pkgs/applications/window-managers/dwm/default.nix
View File

@ -8,6 +8,7 @@ args: with args; stdenv.mkDerivation {
buildInputs = [ libX11 libXinerama ];
patchPhase = ''sed -i "s@/usr/local@$out@" config.mk'';
buildPhase = " make ";
meta = { homepage = "www.suckless.org";

2
pkgs/data/misc/xkeyboard-config/1.2.nix
View File

@ -15,6 +15,8 @@ stdenv.mkDerivation {
configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
";
patches = [ ./eo.patch ];
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

83
pkgs/data/misc/xkeyboard-config/eo.patch Normal file
View File

@ -0,0 +1,83 @@
diff --git a/rules/base.lst b/rules/base.lst
index 7004bcd..804f9f0 100644
--- a/rules/base.lst
+++ b/rules/base.lst
@@ -168,6 +168,7 @@
nl Netherlands
bt Bhutan
ee Estonia
+ eo Esperanto
ir Iran
iq Iraq
fo Faroe Islands
diff --git a/rules/base.xml.in b/rules/base.xml.in
index ec321f8..e9c3546 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1786,6 +1786,13 @@
</layout>
<layout>
<configItem>
+ <name>eo</name>
+ <_shortDescription>Esp</_shortDescription>
+ <_description>Esperanto</_description>
+ </configItem>
+ </layout>
+ <layout>
+ <configItem>
<name>ir</name>
<_shortDescription>Irn</_shortDescription>
<_description>Iran</_description>
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 97c816d..d7e3a4e 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -10,7 +10,7 @@ bt by braille \
ca cd \
ch cn cz \
de dk \
-ee es et epo \
+ee eo es et epo \
fi fo fr \
gb ge gh gn \
gr hr hu \
diff --git a/symbols/Makefile.in b/symbols/Makefile.in
index b5be077..5cddcc7 100644
--- a/symbols/Makefile.in
+++ b/symbols/Makefile.in
@@ -222,7 +222,7 @@ bt by braille \
ca cd \
ch cn cz \
de dk \
-ee es et epo \
+ee eo es et epo \
fi fo fr \
gb ge gh gn \
gr hr hu \
diff --git a/symbols/eo b/symbols/eo
new file mode 100644
index 0000000..d6358c9
--- /dev/null
+++ b/symbols/eo
@@ -0,0 +1,21 @@
+// $XFree86$
+
+partial alphanumeric_keys
+xkb_symbols "basic" {
+
+ // Describes the differences between a very simple en_US
+ // keyboard and a simple Esperanto keyboard
+ // Press AltGr or Windows Menu key together with C, H, J, S, U
+ // to get accented letters.
+ // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk>
+
+ key.type = "FOUR_LEVEL";
+
+ key <AD02> { [w,W, ubreve,Ubreve ] };
+ key <AD07> { [u,U, ubreve, Ubreve ] };
+ key <AC02> { [s,S, scircumflex, Scircumflex ] };
+ key <AC05> { [g,G, gcircumflex,Gcircumflex ] };
+ key <AC06> { [h,H, hcircumflex,Hcircumflex ] };
+ key <AC07> { [j,J, jcircumflex,Jcircumflex ] };
+ key <AB03> { [c,C, ccircumflex,Ccircumflex ] };
+};

22
pkgs/development/libraries/freeimage/default.nix Normal file
View File

@ -0,0 +1,22 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation {
name = "freeimage-3.11.0";
src = fetchurl {
url = mirror://sourceforge/freeimage/FreeImage3110.zip;
sha256 = "84021b8c0b86e5801479474ad9a99c18d121508ee16d363e02ddcbf24195340c";
};
buildInputs = [ unzip ];
patchPhase = ''
sed -e s@/usr/@$out/@ \
-e 's@-o root -g root@@' \
-e 's@ldconfig@echo not running ldconfig@' \
-i Makefile.gnu
'';
preInstall = "mkdir -p $out/include $out/lib";
meta = {
description = "Open Source library for accessing popular graphics image file formats";
homepage = http://freeimage.sourceforge.net/;
license = "GPL";
};
}

17
pkgs/development/libraries/vxl/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
stdenv.mkDerivation {
name = "vxl-1.11.0";
src = fetchurl {
url = mirror://sourceforge/vxl/vxl-1.11.0.zip;
sha256 = "84f38d0c3656b5e4470e16ddce715bafcaa478ff066e6cec6f54524b5d72fa68";
};
buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ];
meta = {
description = "C++ Libraries for Computer Vision Research and Implementation";
homepage = http://vxl.sourceforge.net/;
license = "VXL License";
};
}

9
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -1,4 +1,4 @@
{fetchurl, stdenv, replace}:
{fetchurl, stdenv, replace, ncurses}:
stdenv.mkDerivation rec {
name = "cmake-2.6.2";
@ -10,7 +10,12 @@ stdenv.mkDerivation rec {
url = "http://www.cmake.org/files/v2.6/${name}.tar.gz";
sha256 = "b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9";
};
inherit ncurses;
propagatedBuildInputs = [replace];
postUnpack = "source \${setupHook}; fixCmakeFiles \${sourceRoot}";
postUnpack = "
source \${setupHook}; fixCmakeFiles \${sourceRoot};
echo 'SET (CMAKE_SYSTEM_PREFIX_PATH \"'\${ncurses}'\" CACHE FILEPATH \"Root for libs for cmake\" FORCE)' > \${sourceRoot}/cmakeInit.txt
";
configureFlags= [ " --init=cmakeInit.txt " ];
postInstall="fixCmakeFiles \$out/share";
}

19
pkgs/os-specific/linux/cpufrequtils/default.nix Normal file
View File

@ -0,0 +1,19 @@
{stdenv, fetchurl, kernelHeaders, glibc, libtool, gettext}:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "cpufrequtils-005";
src = fetchurl {
url = http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-005.tar.gz;
md5 = "100a8220a546ce61ce943d4107e67db9";
};
patchPhase = ''
sed -e "s@= /usr/bin/@= @g" \
-e "s@/usr/@$out/@" \
-i Makefile
'';
buildInputs = [ kernelHeaders glibc libtool gettext ];
}

2
pkgs/servers/x11/xorg/default.nix
View File

@ -2424,7 +2424,7 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-via-0.2.2.tar.bz2;
sha256 = "0qn89m1s50m4jajw95wcidarknyxn19h8696dbkgwy21cjpvs9jh";
};
buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC mesaHeaders glproto ];
}) // {inherit fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;};
xf86videovmware = (stdenv.mkDerivation {

16
pkgs/tools/networking/proxychains/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ stdenv, fetchurl } :
stdenv.mkDerivation {
name = "proxychains-3.1";
src = fetchurl {
url = mirror://sourceforge/proxychains/proxychains-3.1.tar.gz;
sha256 = "9a27657fe9f6e17de9e402ba5c60f9954e7e79fb270c1ef242770f3c01d8515a";
};
patchPhase = "sed -e s@libproxychains.so@$out/lib/libproxychains.so@ -i proxychains/proxychains";
meta = {
description = "Proxifier for SOCKS proxies.";
homepage = http://proxychains.sourceforge.net;
license = "GPLv2+";
};
}

13
pkgs/tools/security/ccrypt/default.nix Normal file
View File

@ -0,0 +1,13 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "ccrypt-1.7";
src = fetchurl {
url = mirror://sourceforge/ccrypt/ccrypt-1.7.tar.gz;
sha256 = "1bf974c9ee5f20332f0117c5b80784825f505f1a24eb57a10c8195c3ad16540e";
};
meta = {
description = "Utility for encrypting and decrypting files and streams with AES-256";
license = "GPLv2+";
};
}

36
pkgs/top-level/all-packages.nix
View File

@ -561,6 +561,10 @@ let
inherit fetchurl stdenv;
};
ccrypt = import ../tools/security/ccrypt {
inherit fetchurl stdenv;
};
cdrdao = import ../tools/cd-dvd/cdrdao {
inherit fetchurl stdenv;
};
@ -1097,6 +1101,10 @@ let
inherit (xlibs) libX11;
};
proxychains = import ../tools/networking/proxychains {
inherit fetchurl stdenv;
};
proxytunnel = import ../tools/misc/proxytunnel {
inherit fetchurl stdenv openssl;
};
@ -1279,10 +1287,8 @@ let
};
truecrypt = import ../applications/misc/truecrypt {
inherit fetchurl stdenv pkgconfig fuse;
inherit (gtkLibs) gtk;
inherit (xorg) libSM;
glibc = stdenv.gcc.libc;
inherit fetchurl stdenv pkgconfig fuse devicemapper;
wxGTK = wxGTK28;
};
ttmkfdir = import ../tools/misc/ttmkfdir {
@ -2309,7 +2315,7 @@ let
};
cmake = import ../development/tools/build-managers/cmake {
inherit fetchurl stdenv replace;
inherit fetchurl stdenv replace ncurses;
};
cproto = import ../development/tools/misc/cproto {
@ -2872,6 +2878,10 @@ let
flags = [ "useNixLibs" "threads" "shared" "gl" ];
};
freeimage = import ../development/libraries/freeimage {
inherit fetchurl stdenv unzip;
};
cfitsio = import ../development/libraries/cfitsio {
inherit fetchurl stdenv;
};
@ -3804,6 +3814,10 @@ let
inherit postgresql mysql sqlite;
});
vxl = import ../development/libraries/vxl {
inherit fetchurl stdenv cmake unzip libtiff expat zlib libpng libjpeg;
};
webkit = builderDefsPackage (import ../development/libraries/webkit) {
inherit (gtkLibs) gtk atk pango;
inherit freetype fontconfig gettext gperf curl
@ -5903,6 +5917,12 @@ let
inherit fetchurl stdenv autoconf automake;
};
cpufrequtils = import ../os-specific/linux/cpufrequtils {
inherit fetchurl stdenv libtool gettext;
glibc = stdenv.gcc.libc;
kernelHeaders = stdenv.gcc.libc.kernelHeaders;
};
cryopid = import ../os-specific/linux/cryopid {
inherit fetchurl stdenv zlibStatic;
};
@ -7806,7 +7826,7 @@ let
inherit (xlibs) libX11 libSM libICE libXt libXext;
qt = qt3;
#33motif = lesstif;
libstdcpp5 = (if (stdenv.system == "i686-linux") then gcc33 /* stdc++ 3.8 is used */ else gcc).gcc;
libstdcpp5 = (if (stdenv.system == "i686-linux") then gcc33 /* stdc++ 3.8 is used */ else gcc42).gcc;
};
pan = import ../applications/networking/newsreaders/pan {
@ -7928,7 +7948,7 @@ let
inherit fetchurl stdenv;
inherit glibc alsaLib freetype fontconfig libsigcxx gcc;
inherit (xlibs) libSM libICE libXi libXrender libXrandr libXfixes libXcursor
libXinerama libXext libX11;
libXinerama libXext libX11 libXv libXScrnSaver;
};
slim = import ../applications/display-managers/slim {
@ -8796,7 +8816,7 @@ let
};
psi = builderDefsPackage
(selectVersion ../applications/networking/instant-messengers/psi "0.11")
(selectVersion ../applications/networking/instant-messengers/psi "0.12")
{
inherit builderDefs zlib aspell sox openssl;
inherit (xlibs) xproto libX11 libSM libICE;