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

* Update or disable some stuff. 

svn path=/nixpkgs/trunk/; revision=5509
This commit is contained in:
Eelco Dolstra 2006-06-24 10:26:52 +00:00
parent c9db2ab939
commit 8a58852d9d
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/xchm/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, wxGTK, chmlib}: {stdenv, fetchurl, wxGTK, chmlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xchm-1.2"; name = "xchm-1.9";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/xchm-1.2.tar.gz; url = http://surfnet.dl.sourceforge.net/sourceforge/xchm/xchm-1.9.tar.gz;
md5 = "17f2cda873f61470636dbfeebb4a531d"; md5 = "12e1faf49447c743c5c936636cd8a172";
}; };
buildInputs = [wxGTK chmlib]; buildInputs = [wxGTK chmlib];
} }

6
pkgs/applications/video/vlc/default.nix
View File

@ -6,11 +6,11 @@ assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
assert xvSupport -> libXv != null; assert xvSupport -> libXv != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "vlc-0.7.2"; name = "vlc-0.8.5";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/vlc-0.7.2.tar.gz; url = http://ftp.snt.utwente.nl/pub/software/videolan/vlc/0.8.5/vlc-0.8.5.tar.gz;
md5 = "25dfcc804cb92f46c0b64ce1466515cc"; md5 = "90d19a5ba2ef2e03e6062fadc2e810d2";
}; };
buildInputs = [ buildInputs = [

4
pkgs/development/libraries/chmlib/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, libtool}: {stdenv, fetchurl, libtool}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "chmlib-0.36"; name = "chmlib-0.38";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/chmlib-0.36.tbz; url = http://66.93.236.84/~jedwin/projects/chmlib/chmlib-0.38.tar.bz2;
md5 = "8fa5e9a1af13084ca465d9ee09e1946e"; md5 = "8fa5e9a1af13084ca465d9ee09e1946e";
}; };
buildInputs = [libtool]; buildInputs = [libtool];

3
pkgs/development/libraries/haskell/uulib/builder.sh
View File

@ -1,6 +1,9 @@
source $stdenv/setup source $stdenv/setup
export HOME=$(pwd)/fake-home
#add ghc to search path #add ghc to search path
test -n "$ghc" && PATH=$PATH:$ghc/bin test -n "$ghc" && PATH=$PATH:$ghc/bin

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

@ -811,7 +811,7 @@ rec {
strategoxt = (import ../development/compilers/strategoxt/strategoxt-0.14.nix) { strategoxt = (import ../development/compilers/strategoxt/strategoxt-0.14.nix) {
inherit fetchurl pkgconfig sdf; inherit fetchurl pkgconfig sdf;
aterm = aterm23x; aterm = aterm23x;
stdenv = overrideInStdenv stdenv [gnumake380]; stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;;
}; };
stlport = (import ../development/libraries/stlport) { stlport = (import ../development/libraries/stlport) {

4
pkgs/top-level/build-for-release.nix
View File

@ -110,7 +110,7 @@ let {
uulib uulib
valgrind valgrind
vim vim
vlc # vlc
wget wget
xchm xchm
xineUI xineUI
@ -118,7 +118,7 @@ let {
xmms xmms
xorg_sys_opengl xorg_sys_opengl
xsel xsel
zapping # zapping
zdelta zdelta
zip zip
# atermjava # atermjava