parent
e17a21b820
commit
a7703662a4
@ -0,0 +1,72 @@ |
||||
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. |
||||
# but I have gvim with python support now :) - Marc |
||||
args: |
||||
let edf = args.lib.enableDisableFeature; in |
||||
( args.mkDerivationByConfiguration { |
||||
# most interpreters aren't tested yet.. (see python for example how to do it) |
||||
flagConfig = { |
||||
mandatory = { cfgOption = "--enable-gui=auto --with-features=${args.features}"; |
||||
buildInputs = ["ncurses" "pkgconfig"]; |
||||
}; |
||||
X11 = { buildInputs = [ "libX11" "libXext" "libSM" "libXpm" "libXt" "libXaw" "libXau" "libXmu" ]; }; |
||||
|
||||
} // edf "darwin" "darwin" { } #Disable Darwin (Mac OS X) support. |
||||
// edf "xsmp" "xsmp" { } #Disable XSMP session management |
||||
// edf "xsmp_interact" "xsmp_interact" { } #Disable XSMP interaction |
||||
// edf "mzscheme" "mzschemeinterp" { } #Include MzScheme interpreter. |
||||
// edf "perl" "perlinterp" { } #Include Perl interpreter. |
||||
// edf "python" "pythoninterp" { pass = "python"; } #Include Python interpreter. |
||||
// edf "tcl" "tclinterp" { } #Include Tcl interpreter. |
||||
// edf "ruby" "rubyinterp" { } #Include Ruby interpreter. |
||||
// edf "cscope" "cscope" { } #Include cscope interface. |
||||
// edf "workshop" "workshop" { } #Include Sun Visual Workshop support. |
||||
// edf "netbeans" "netbeans" { } #Disable NetBeans integration support. |
||||
// edf "sniff" "sniff" { } #Include Sniff interface. |
||||
// edf "multibyte" "multibyte" { } #Include multibyte editing support. |
||||
// edf "hangulinput" "hangulinput" { } #Include Hangul input support. |
||||
// edf "xim" "xim" { pass = "xim"; } #Include XIM input support. |
||||
// edf "fontset" "fontset" { } #Include X fontset output support. |
||||
|
||||
#--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon |
||||
/* |
||||
// edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes |
||||
// edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes |
||||
// edf "gnome_check" "gnome_check" { } #If GTK GUI, check for GNOME default=no |
||||
// edf "motif_check" "motif_check" { } #If auto-select GUI, check for Motif default=yes |
||||
// edf "athena_check" "athena_check" { } #If auto-select GUI, check for Athena default=yes |
||||
// edf "nextaw_check" "nextaw_check" { } #If auto-select GUI, check for neXtaw default=yes |
||||
// edf "carbon_check" "carbon_check" { } #If auto-select GUI, check for Carbon default=yes |
||||
// edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program |
||||
*/ |
||||
// edf "acl" "acl" { } #Don't check for ACL support. |
||||
// edf "gpm" "gpm" { } #Don't use gpm (Linux mouse daemon). |
||||
// edf "nls" "nls" { } #Don't support NLS (gettext()). |
||||
; |
||||
|
||||
optionals = ["python"]; |
||||
|
||||
extraAttrs = co : { |
||||
name = "vim_configurable-7.1"; |
||||
|
||||
src = args.fetchurl { |
||||
url = ftp://ftp.nluug.nl/pub/editors/vim/unix/vim-7.1.tar.bz2; |
||||
sha256 = "0w6gy49gdbw7hby5rjkjpa7cdvc0z5iajsm4j1h8108rvfam22kz"; |
||||
}; |
||||
|
||||
postInstall = " |
||||
rpath=`patchelf --print-rpath \$out/bin/vim`; |
||||
for i in $\buildInputs; do |
||||
echo adding \$i/lib |
||||
rpath=\$rpath:\$i/lib |
||||
done |
||||
echo \$buildInputs |
||||
echo \$rpath |
||||
patchelf --set-rpath \$rpath \$out/bin/{vim,gvim} |
||||
"; |
||||
|
||||
meta = { |
||||
description = "The most popular clone of the VI editor"; |
||||
homepage = "www.vim.org"; |
||||
}; |
||||
}; |
||||
} ) args |
@ -0,0 +1,45 @@ |
||||
args: |
||||
args.stdenv.mkDerivation { |
||||
name = "freemind-0.9.0_Beta_13"; |
||||
|
||||
src = args.fetchurl { |
||||
url = http://downloads.sourceforge.net/freemind/freemind-src-0.9.0_Beta_13_icon_butterfly.tar.gz; |
||||
sha256 = "00389bhg73qknydrq0f3bskb5lyrdg2p58mnnp19wdvzzmfbic4w"; |
||||
}; |
||||
|
||||
buildInputs =(with args; [jdk ant]); |
||||
|
||||
inherit (args) jre; |
||||
|
||||
phases="buildPhase installPhase"; |
||||
|
||||
buildPhase="ant dist"; |
||||
# LIBXCB_ALLOW_SLOPPY_LOCK=true : |
||||
# don't know yet what this option really means but I'm no longer getting |
||||
# Checking Java Version... |
||||
# Locking assertion failure. Backtrace: |
||||
# java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed |
||||
# this way |
||||
# reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103 |
||||
# JDK 7 beta seems to have fixed this (bug ?) |
||||
|
||||
installPhase=" |
||||
ensureDir \$out/{bin,nix-support} |
||||
cp -r ../bin/dist \$out/nix-support |
||||
sed -i 's/which/type -p/' \$out/nix-support/dist/freemind.sh |
||||
cat > \$out/bin/freemind << EOF |
||||
#!/bin/sh |
||||
export LIBXCB_ALLOW_SLOPPY_LOCK=true |
||||
export JAVA_HOME=\$jre |
||||
\$out/nix-support/dist/freemind.sh |
||||
EOF |
||||
|
||||
chmod +x \$out/{bin/freemind,nix-support/dist/freemind.sh} |
||||
"; |
||||
|
||||
meta = { |
||||
description = "mind mapping software"; |
||||
homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page; |
||||
license = "GPL"; |
||||
}; |
||||
} |
@ -1,10 +1,12 @@ |
||||
{stdenv, fetchurl, ncurses}: |
||||
{stdenv, fetchurl, ncurses, readline}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "pinfo-0.6.8"; |
||||
name = "pinfo-0.6.9"; |
||||
src = fetchurl { |
||||
url = http://dione.cc/~pborys/software/pinfo/pinfo-0.6.8.tar.gz; |
||||
md5 = "55feb4ebaa709b52bd00a15ed0fb52fb"; |
||||
url = https://alioth.debian.org/frs/download.php/1498/pinfo-0.6.9.tar.bz2; |
||||
sha256 = "1rbsz1y7nyz6ax9xfkw5wk6pnrhvwz2xcm0wnfnk4sb2wwq760q3"; |
||||
}; |
||||
buildInputs = [ncurses]; |
||||
buildInputs = [ncurses readline]; |
||||
|
||||
configureFlags = "--with-curses=${ncurses} --with-readline=${readline}"; |
||||
} |
||||
|
@ -0,0 +1,74 @@ |
||||
args: |
||||
let optionIncLib = name : attr : " -D${name}_INCLUDE_DIR=${__getAttr attr args}/inc" |
||||
+ " -D${name}_LIBRARY=${__getAttr attr args}/lib "; # lib 64? |
||||
in |
||||
( args.mkDerivationByConfiguration { |
||||
|
||||
flagConfig = { |
||||
mandatory = { |
||||
buildInputs = [ "gdal" "cmake" "qt" "flex" "bison" "proj" "geos" "x11" "sqlite" "gsl"]; |
||||
cfgOption = [ (optionIncLib "GEOS" "geos") |
||||
(optionIncLib "PROJ" "proj") |
||||
(optionIncLib "QT_X11_X11" "qt") |
||||
(optionIncLib "QT_X11_Xext" "qt") |
||||
(optionIncLib "QT_X11_m" "glibc") |
||||
(optionIncLib "SQLITE3" "sqlite") |
||||
|
||||
"-DQT_FONTCONFIG_LIBRARY=${args.fontconfig}/lib" |
||||
"-DQT_FREETYPE_LIBRARY=${args.freetype}/lib" |
||||
"-DQT_PNG_LIBRARY=${args.libpng}/lib" |
||||
"-DQT_X11_ICE_LIBRARY=${args.libICE}/lib" |
||||
"-DQT_X11_SM_LIBRARY=${args.libSM}/lib" |
||||
"-DQT_XCURSOR_LIBRARY=${args.libXcursor}/lib" |
||||
"-DQT_XINERAMA_LIBRARY=${args.libXinerama}/lib" |
||||
"-DQT_XRANDR_LIBRARY=${args.libXrandr}/lib" |
||||
"-DQT_XRENDER_LIBRARY=${args.libXrender}/lib" |
||||
"-DQT_ZLIB_LIBRARY=${args.zlib}/lib" |
||||
]; |
||||
|
||||
/* advanced options - feel free to add them if you have time to |
||||
"-DPROJ_INCLUDE_DIR" |
||||
"-DPROJ_LIBRARY" |
||||
"-DQT_X11_X11_LIBRARY" |
||||
"-DQT_X11_Xext_LIBRARY" |
||||
"-DQT_X11_m_LIBRARY" |
||||
"-DSQLITE3_INCLUDE_DIR" |
||||
"-DSQLITE3_LIBRARY" |
||||
-DQT_FONTCONFIG_LIBRARY (ADVANCED) |
||||
-DQT_FREETYPE_LIBRARY (ADVANCED) |
||||
-DQT_PNG_LIBRARY (ADVANCED) |
||||
-DQT_X11_ICE_LIBRARY (ADVANCED) |
||||
-DQT_X11_SM_LIBRARY (ADVANCED) |
||||
-DQT_XCURSOR_LIBRARY (ADVANCED) |
||||
-DQT_XINERAMA_LIBRARY (ADVANCED) |
||||
-DQT_XRANDR_LIBRARY (ADVANCED) |
||||
-DQT_XRENDER_LIBRARY (ADVANCED) |
||||
-DQT_ZLIB_LIBRARY (ADVANCED) |
||||
*/ |
||||
}; |
||||
}; |
||||
|
||||
#inherit geos proj x11 libXext; |
||||
|
||||
extraAttrs = co : { |
||||
|
||||
name = "qgis-svn"; |
||||
|
||||
src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis; |
||||
md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; }; |
||||
|
||||
meta = { |
||||
description = "user friendly Open Source Geographic Information System"; |
||||
homepage = http://www.qgis.org; |
||||
# you can choose one of the following licenses: |
||||
license = [ "GPL" ]; |
||||
}; |
||||
|
||||
phases = "unpackPhase buildPhase installPhase"; |
||||
buildPhase = "cmake -DCMAKE_INSTALL_PREFIX=\$out ${co.configureFlags} ."; |
||||
|
||||
#configurePhase="./autogen.sh --prefix=\$out --with-gdal=\$gdal/bin/gdal-config --with-qtdir=\$qt"; |
||||
# buildPhases="unpackPhase buildPhase"; |
||||
}; |
||||
|
||||
} ) args |
@ -0,0 +1,57 @@ |
||||
args: with args; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "firefox-3b2"; |
||||
|
||||
src = |
||||
fetchurl { |
||||
url = ftp://ftp.mozilla.org/pub/firefox/releases/3.0b2/source/firefox-3.0b2-source.tar.bz2; |
||||
sha256 = "0mszad8j35wvzi67dp3j9sznqkgb9b3in22c5790g9b9pv6xk8jp"; |
||||
}; |
||||
|
||||
buildInputs = [ |
||||
pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo |
||||
python curl coreutils dbus dbus_glib pango freetype fontconfig |
||||
libX11 libXrender libXft libXt |
||||
]; |
||||
|
||||
configureFlags = [ |
||||
"--enable-application=browser" |
||||
"--enable-optimize" |
||||
"--disable-debug" |
||||
"--enable-xft" |
||||
"--disable-freetype2" |
||||
"--enable-svg" |
||||
"--enable-canvas" |
||||
"--enable-strip" |
||||
"--enable-default-toolkit=cairo-gtk2" |
||||
"--with-system-jpeg" |
||||
"--with-system-zlib" |
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
||||
* "--enable-system-cairo" |
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ |
||||
] |
||||
; |
||||
|
||||
postInstall = " |
||||
export dontPatchELF=1; |
||||
sed -e 's@moz_libdir=.*@&\\nexport PATH=\$PATH:${coreutils}/bin@' -i \$out/bin/firefox |
||||
sed -e 's@`/bin/pwd@`${coreutils}/bin/pwd@' -i \$out/bin/firefox |
||||
sed -e 's@`/bin/ls@`${coreutils}/bin/ls@' -i \$out/bin/firefox |
||||
|
||||
strip -S \$out/lib/*/* || true |
||||
|
||||
libDir=\$(cd \$out/lib && ls -d firefox-[0-9]*) |
||||
test -n \"\$libDir\" |
||||
|
||||
echo \"running firefox -register...\" |
||||
(cd \$out/lib/\$libDir && LD_LIBRARY_PATH=. ./firefox-bin -register) || false |
||||
"; |
||||
|
||||
meta = { |
||||
description = "Mozilla Firefox - the browser, reloaded"; |
||||
}; |
||||
|
||||
passthru = {inherit gtk;}; |
||||
} |
||||
|
@ -0,0 +1,55 @@ |
||||
args: with args; |
||||
|
||||
assert stdenv.system == "i686-linux"; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "firefox-3b1"; |
||||
|
||||
src = |
||||
fetchurl { |
||||
url = ftp://ftp.mozilla.org/pub/firefox/releases/3.0b1/linux-i686/en-US/firefox-3.0b1.tar.bz2; |
||||
sha256 = "1cpcc5b07zdqyd5kiwhb4dqhy2mzbf97plsglcp6bc9054cmsylk"; |
||||
}; |
||||
buildInputs = [ |
||||
pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo |
||||
python curl coreutils atk pango glib libX11 libXrender |
||||
freetype fontconfig libXft libXt |
||||
]; |
||||
|
||||
buildPhase = " |
||||
additionalRpath=''; |
||||
for i in \$buildInputs ${stdenv.glibc} ${stdenv.gcc.gcc}; do |
||||
additionalRpath=\$additionalRpath:\$i/lib; |
||||
done |
||||
for i in firefox-bin ; do |
||||
oldrpath=$(patchelf --print-rpath \$i) |
||||
patchelf --set-rpath \$oldrpath\$additionalRpath \$i |
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \$i |
||||
done |
||||
"; |
||||
|
||||
installPhase = " |
||||
export dontPatchELF=1; |
||||
mkdir -p \$out |
||||
cp -r . \$out/firefox |
||||
mkdir -p \$out/bin |
||||
ln -s \$out/firefox/firefox \$out/bin/firefox |
||||
|
||||
sed -e 's@moz_libdir=.*@moz_libdir='\$out'/firefox/@' -i \$out/bin/firefox |
||||
sed -e 's@moz_libdir=.*@&\\nexport PATH=\$PATH:${coreutils}/bin@' -i \$out/bin/firefox |
||||
sed -e 's@`/bin/pwd@`${coreutils}/bin/pwd@' -i \$out/bin/firefox |
||||
sed -e 's@`/bin/ls@`${coreutils}/bin/ls@' -i \$out/bin/firefox |
||||
|
||||
strip -S \$out/firefox/*.so || true |
||||
|
||||
echo \"running firefox -register...\" |
||||
\$out/firefox/firefox-bin -register || false |
||||
"; |
||||
|
||||
meta = { |
||||
description = "Mozilla Firefox - the browser, reloaded"; |
||||
}; |
||||
|
||||
passthru = {inherit gtk;}; |
||||
} |
||||
|
@ -0,0 +1,71 @@ |
||||
/* |
||||
License issues: |
||||
Date: Mon, 10 Dec 2007 19:55:16 -0500 |
||||
From: TeamSpeak Sales <sales@tritoncia.com> |
||||
To: 'Marc Weber' <marco-oweber@gmx.de> |
||||
Subject: RE: teamspeak on nix? |
||||
|
||||
Yes, that would be fine. As long as you are not renting servers or selling |
||||
TeamSpeak then you are more than welcome to distribute it. |
||||
|
||||
Thank you, |
||||
|
||||
TeamSpeak Sales Team |
||||
________________________________ |
||||
e-Mail: sales@tritoncia.com |
||||
TeamSpeak: http://www.TeamSpeak.com |
||||
Account Login: https://sales.TritonCIA.com/users |
||||
|
||||
|
||||
|
||||
-----Original Message----- |
||||
From: Marc Weber [mailto:marco-oweber@gmx.de] |
||||
Sent: Monday, December 10, 2007 5:03 PM |
||||
To: sales@tritoncia.com |
||||
Subject: teamspeak on nix? |
||||
|
||||
Hello, |
||||
|
||||
nix is very young software distribution system (http://nix.cs.uu.nl/) |
||||
I'd like to ask wether you permit us to add teamspeak (server/ client?) |
||||
|
||||
Sincerly |
||||
Marc Weber (small nix contributor) |
||||
*/ |
||||
|
||||
args: |
||||
args.stdenv.mkDerivation { |
||||
name = "teamspeak-client-rc2-2032"; |
||||
|
||||
src = args.fetchurl { |
||||
url = ftp://213.202.254.114/teamspeak/releases/ts2_client_rc2_2032.tar.bz2; |
||||
md5 = "e93d17a25e07b1cbe400e4eb028ca8f8"; |
||||
}; |
||||
|
||||
phases="installPhase"; |
||||
|
||||
rpathInputs = (with args; [ glibc x11 ] ); |
||||
|
||||
installPhase=" |
||||
set -x |
||||
i=\$out/nix-support |
||||
ensureDir \$out/{bin,nix-support} |
||||
mv setup.data/image \$i |
||||
cp \$out/{nix-support/image/TeamSpeak,bin} |
||||
echo sed |
||||
sed -i \"s=%installdir%=\$i/image=\" \$out/bin/TeamSpeak |
||||
|
||||
echo for |
||||
for p in $\rpathInputs; do |
||||
rpath=\$rpath:\$p/lib |
||||
done |
||||
echo patchelf |
||||
patchelf --set-rpath \$rpath \$i/image/TeamSpeak.bin |
||||
"; |
||||
|
||||
meta = { |
||||
description = "The TeamSpeak voice communication tool"; |
||||
homepage = http://www.goteamspeak.com; |
||||
license = "TODO"; # non commercial use see email above |
||||
}; |
||||
} |
@ -1,10 +1,10 @@ |
||||
{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "wireshark-0.99.6"; |
||||
name = "wireshark-0.99.7"; |
||||
src = fetchurl { |
||||
url = http://www.wireshark.org/download/src/wireshark-0.99.6.tar.gz; |
||||
sha256 = "1f2i84dk4nw05nh78b2j4n9pbwdngcqx0grrja5831r6paj35x1y"; |
||||
url = http://www.wireshark.org/download/src/wireshark-0.99.7.tar.bz2; |
||||
sha256 = "10pb2mn6p40gsq2nbnqdzihrpa078jdgxqh8l4zs33bxa1h37frc"; |
||||
}; |
||||
buildInputs = [perl pkgconfig gtk libpcap]; |
||||
} |
||||
|
@ -0,0 +1,26 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://fabrice.bellard.free.fr/qemu/qemu-0.9.0.tar.gz; |
||||
sha256 = "1h85njd8xvn472yhcm92rjyzqjr719ab73rxwmz9cm2n6gwsq7s9"; |
||||
}; |
||||
|
||||
buildInputs = [ SDL zlib which ]; |
||||
configureFlags = []; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
let |
||||
preConfigure = FullDepEntry (" |
||||
gcc --version |
||||
") [minInit]; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
name = "qemu-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [ preConfigure doConfigure doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
QEmu processor emulator. |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,27 @@ |
||||
|
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2; |
||||
sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1"; |
||||
}; |
||||
buildInputs = []; |
||||
configureFlags = []; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
let |
||||
doCopy = FullDepEntry (" |
||||
ensureDir \$out/share/qemu-images |
||||
cp linux-${version}.img \$out/share/qemu-images/ |
||||
") [minInit doUnpack defEnsureDir]; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
name = "QEmu-Linux-Image-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [doCopy doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
${abort "Write a description"} |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,21 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://www.virtualbox.org/download/1.5.2/VirtualBox-1.5.2_OSE.tar.bz2; |
||||
sha256 = "1g9rvkqjcsfx36gwk6i9c0bml6053xx2mdn1sn7vyyy0sgwkwk53"; |
||||
}; |
||||
buildInputs = [libXcursor bridge_utils umlutilities kernelHeaders |
||||
wine jre libxslt libIDL SDL qt3 openssl zlib]; |
||||
configureFlags = []; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
stdenv.mkDerivation rec { |
||||
name = "VirtualBox-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
Virtual Box is just software for running virtual machines. |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,27 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src =""; /* put a fetchurl here */ |
||||
buildInputs = [mkfontdir mkfontscale]; |
||||
configureFlags = []; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
let |
||||
doInstall = FullDepEntry (" |
||||
ensureDir \$out/share/fonts/ |
||||
cd \$out/share/fonts |
||||
for i in ${toString paths}; do |
||||
find \$i -type f -exec ln -s '{}' . ';' ; |
||||
done |
||||
mkfontdir |
||||
mkfontscale |
||||
") [minInit addInputs defEnsureDir] ; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
name = "wrapped-font-dir"; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [ doInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
Just a wrapper to create fots.dir and fonts.scale . |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,95 @@ |
||||
|
||||
// Grabbed from http://lists.freedesktop.org/archives/xorg/2007-July/026686.html |
||||
// Submitted there by Adriaan van Nijendaal, he says he submitted it to X.org |
||||
// for inclusion, so it should be OK to use it as if it were part of X.org |
||||
|
||||
// The keyboard section in the X-server config file |
||||
// (/etc/X11/xorg.conf on my system) looks like this: |
||||
// |
||||
// Section "InputDevice" |
||||
// Driver "kbd" |
||||
// Identifier "Keyboard[0]" |
||||
// Option "XkbModel" "pc101" |
||||
// Option "XkbLayout" "us" |
||||
// Option "XkbVariant" "altgr-intl" |
||||
// EndSection |
||||
// |
||||
// To be effective, you need to install this file, change the X config |
||||
// file and restart the X-server. Or, alternatively, you can do this |
||||
// run-time: |
||||
// |
||||
// setxkbmap -v -rules xorg -model pc101 -layout us -variant altgr-intl |
||||
// |
||||
// Once the X-server has loaded the new config, a keyboard can be |
||||
// displayed with: (if you change "-ll 1" into "-ll 2", you'll see |
||||
// the special keys ONLY.) |
||||
// |
||||
// xkbcomp -o /tmp/keyboard.xkm -opt cgkst -xkb $DISPLAY |
||||
// xkbprint -o /tmp/keyboard.xkm.ps -kc -nkg 2 -ntg 4 -lg 1 -ll 1 \ |
||||
// -lc en_US.iso885915 -level2 -mono -label symbols -w 3 $DISPLAY; |
||||
// gv -seascape /tmp/keyboard.xkm.ps |
||||
// rm -f /tmp/keyboard.xkm.ps /tmp/keyboard.xkm |
||||
// |
||||
|
||||
partial alphanumeric_keys |
||||
xkb_symbols "altgr-intl" { |
||||
|
||||
name[Group1]= "U.S. English - International (AltGr dead keys)"; |
||||
|
||||
include "us(basic)" |
||||
|
||||
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] }; |
||||
key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; |
||||
key <AE02> { [ 2, at, twosuperior, dead_doubleacute] }; |
||||
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 <AE07> { [ 7, ampersand, dead_horn ] }; |
||||
key <AE08> { [ 8, asterisk, dead_ogonek ] }; |
||||
key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] }; |
||||
key <AE10> { [ 0, parenright,rightsinglequotemark,dead_abovering ] }; |
||||
key <AE11> { [ minus, underscore, yen, dead_belowdot ] }; |
||||
key <AE12> { [ equal, plus, multiply, division ] }; |
||||
|
||||
key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] }; |
||||
key <AD02> { [ w, W, aring, Aring ] }; |
||||
key <AD03> { [ e, E, eacute, Eacute ] }; |
||||
key <AD04> { [ r, R, ediaeresis, Ediaeresis ] }; |
||||
key <AD05> { [ t, T, thorn, THORN ] }; |
||||
key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] }; |
||||
key <AD07> { [ u, U, uacute, Uacute ] }; |
||||
key <AD08> { [ i, I, iacute, Iacute ] }; |
||||
key <AD09> { [ o, O, oacute, Oacute ] }; |
||||
key <AD10> { [ p, P, odiaeresis, Odiaeresis ] }; |
||||
key <AD11> { [ bracketleft, braceleft, guillemotleft ] }; |
||||
key <AD12> { [ bracketright,braceright, guillemotright ] }; |
||||
|
||||
key <AC01> { [ a, A, aacute, Aacute ] }; |
||||
key <AC02> { [ s, S, ssharp, section ] }; |
||||
key <AC03> { [ d, D, eth, ETH ] }; |
||||
key <AC04> { [ f, F ] }; |
||||
key <AC05> { [ g, G ] }; |
||||
key <AC06> { [ h, H ] }; |
||||
key <AC07> { [ j, J, idiaeresis, Idiaeresis ] }; |
||||
key <AC08> { [ k, K ] }; |
||||
key <AC09> { [ l, L, oslash, Ooblique ] }; |
||||
key <AC10> { [semicolon, colon, paragraph, degree ] }; |
||||
key <AC11> { [apostrophe, quotedbl, dead_acute, dead_diaeresis ] }; |
||||
|
||||
key <AB01> { [ z, Z, ae, AE ] }; |
||||
key <AB02> { [ x, X, oe, OE ] }; |
||||
key <AB03> { [ c, C, copyright, cent ] }; |
||||
key <AB04> { [ v, V, registered, registered ] }; |
||||
key <AB05> { [ b, B ] }; |
||||
key <AB06> { [ n, N, ntilde, Ntilde ] }; |
||||
key <AB07> { [ m, M, mu, mu ] }; |
||||
key <AB08> { [ comma, less, ccedilla, Ccedilla ] }; |
||||
key <AB09> { [ period, greater, dead_abovedot, dead_caron ] }; |
||||
key <AB10> { [ slash, question, questiondown, dead_hook ] }; |
||||
key <BKSL> { [backslash, bar, notsign, brokenbar ] }; |
||||
|
||||
// Let's have free choice |
||||
//include "level3(ralt_switch)" |
||||
}; |
||||
|
@ -1,26 +0,0 @@ |
||||
source $stdenv/setup |
||||
|
||||
# Setup isolated package management |
||||
postInstall() |
||||
{ |
||||
ensureDir "$out/nix-support" |
||||
echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook |
||||
echo "ghc=$out" >> $out/nix-support/setup-hook |
||||
echo "" >> $out/nix-support/setup-hook |
||||
cat $setupHook >> $out/nix-support/setup-hook |
||||
} |
||||
postInstall=postInstall |
||||
|
||||
configureFlags="--with-gmp-libraries=$gmp/lib --with-readline-libraries=\"$readline/lib\"" |
||||
|
||||
preConfigure() |
||||
{ |
||||
chmod u+x rts/gmp/configure |
||||
# still requires a hack for ncurses |
||||
sed -i "s|^\(library-dirs.*$\)|\1 \"$ncurses/lib\"|" libraries/readline/package.conf.in |
||||
} |
||||
preConfigure=preConfigure |
||||
|
||||
|
||||
# Standard configure/make/make install |
||||
genericBuild |
@ -1,26 +0,0 @@ |
||||
source $stdenv/setup |
||||
|
||||
# Setup isolated package management |
||||
postInstall() |
||||
{ |
||||
ensureDir "$out/nix-support" |
||||
echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook |
||||
echo "ghc=$out" >> $out/nix-support/setup-hook |
||||
echo "" >> $out/nix-support/setup-hook |
||||
cat $setupHook >> $out/nix-support/setup-hook |
||||
} |
||||
postInstall=postInstall |
||||
|
||||
configureFlags="--with-gmp-libraries=$gmp/lib --with-readline-libraries=\"$readline/lib\"" |
||||
|
||||
preConfigure() |
||||
{ |
||||
chmod u+x rts/gmp/configure |
||||
# still requires a hack for ncurses |
||||
sed -i "s|^\(library-dirs.*$\)|\1 \"$ncurses/lib\"|" libraries/readline/package.conf.in |
||||
} |
||||
preConfigure=preConfigure |
||||
|
||||
|
||||
# Standard configure/make/make install |
||||
genericBuild |
@ -1,45 +1,40 @@ |
||||
args: with args; |
||||
|
||||
stdenv.mkDerivation (rec { |
||||
name = "ghc-6.8.1"; |
||||
name = "ghc-6.8.2"; |
||||
homepage = "http://www.haskell.org/ghc"; |
||||
|
||||
src = map fetchurl [ |
||||
{ url = "${homepage}/dist/stable/dist/${name}-src.tar.bz2"; |
||||
sha256 = "16gr19bwyjv0fmjdrsj79vqpaxxg5hasni94nwv9d6c85n5myivz"; |
||||
md5 = "745c6b7d4370610244419cbfec4b2f84"; |
||||
} |
||||
{ url = "${homepage}/dist/stable/dist/${name}-src-extralibs.tar.bz2"; |
||||
sha256 = "1h3nc6x4g838mdcirymadmv3fsmp1wh062syb3a8aqv6f468akvm"; |
||||
md5 = "d199c50814188fb77355d41058b8613c"; |
||||
} |
||||
]; |
||||
|
||||
buildInputs = [ghc readline perl m4 pkgconfig gtk]; |
||||
patchPhase = " |
||||
sed -e s@/bin/cat@\$(type -p cat)@ -i configure |
||||
" + |
||||
(if (stdenv.system == "x86_64-linx") then "patch -p2 < $patch64" else ""); |
||||
buildInputs = [ghc readline perl m4 gmp]; |
||||
|
||||
setupHook = ./setup-hook.sh; |
||||
|
||||
meta = { |
||||
description = "The Glasgow Haskell Compiler v6.8.1"; |
||||
description = "The Glasgow Haskell Compiler"; |
||||
}; |
||||
|
||||
postInstall = " |
||||
ensureDir \"$out/nix-support\" |
||||
echo \"# Path to the GHC compiler directory in the store\" > $out/nix-support/setup-hook |
||||
echo \"ghc=$out\" >> $out/nix-support/setup-hook |
||||
echo \"\" >> $out/nix-support/setup-hook |
||||
cat $setupHook >> $out/nix-support/setup-hook |
||||
"; |
||||
|
||||
patch64 = ./x86_64-linux_patch; |
||||
postInstall = '' |
||||
ensureDir "$out/nix-support" |
||||
echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook |
||||
echo "ghc=$out" >> $out/nix-support/setup-hook |
||||
echo "" >> $out/nix-support/setup-hook |
||||
cat $setupHook >> $out/nix-support/setup-hook |
||||
''; |
||||
|
||||
# the presence of this file makes Cabal cry for happy while generating makefiles ... |
||||
preConfigure = " |
||||
echo 'GhcThreaded=NO' > mk/build.mk |
||||
rm libraries/haskell-src/Language/Haskell/Parser.ly |
||||
# still requires a hack for ncurses |
||||
sed -i \"s|^\\\(ld-options.*$\\\)|\\\1 -L${ncurses}/lib|\" libraries/readline/readline.buildinfo.in |
||||
"; |
||||
|
||||
dontStrip = 1; |
||||
inherit (stdenv) gcc; |
||||
inherit readline gmp ncurses; |
||||
}) |
||||
|
@ -1,21 +1,56 @@ |
||||
{stdenv, fetchurl, perl, readline, ncurses, gmp}: |
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "ghc-6.4.2"; |
||||
builder = ./boot.sh; |
||||
src = if stdenv.system == "i686-linux" then |
||||
(fetchurl { |
||||
url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2; |
||||
md5 = "092fe2e25dab22b926babe97cc77db1f"; |
||||
}) else |
||||
(fetchurl { |
||||
url = http://haskell.org/ghc/dist/6.4.2/ghc-6.4.2-x86_64-unknown-linux.tar.bz2; |
||||
md5 = "8f5fe48798f715cd05214a10987bf6d5"; |
||||
}); |
||||
name = if stdenv.system == "i686-darwin" then "ghc-6.6.1" else "ghc-6.4.2"; |
||||
|
||||
src = |
||||
if stdenv.system == "i686-linux" then |
||||
fetchurl { |
||||
url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2; |
||||
md5 = "092fe2e25dab22b926babe97cc77db1f"; |
||||
} |
||||
else if stdenv.system == "x86_64-linux" then |
||||
fetchurl { |
||||
url = http://haskell.org/ghc/dist/6.4.2/ghc-6.4.2-x86_64-unknown-linux.tar.bz2; |
||||
md5 = "8f5fe48798f715cd05214a10987bf6d5"; |
||||
} |
||||
else if stdenv.system == "i686-darwin" then |
||||
fetchurl { |
||||
url = http://www.haskell.org/ghc/dist/6.6.1/ghc-6.6.1-i386-apple-darwin.tar.bz2; |
||||
sha256 = "1drbsicanr6jlykvs4vs6gbi2q9ac1bcaxz2vzwh3pfv3lfibwia"; |
||||
} |
||||
else throw "cannot bootstrap GHC on this platform"; |
||||
|
||||
buildInputs = [perl]; |
||||
propagatedBuildInputs = [readline ncurses gmp]; |
||||
dontStrip = 1; |
||||
inherit readline ncurses gmp; |
||||
|
||||
# On Linux, use patchelf to modify the executables so that they can |
||||
# find readline/gmp. |
||||
postBuild = if stdenv.isLinux then " |
||||
find . -type f -perm +100 \\ |
||||
-exec patchelf --interpreter \"$(cat $NIX_GCC/nix-support/dynamic-linker)\" \\ |
||||
--set-rpath \"${readline}/lib:${ncurses}/lib:${gmp}/lib\" {} \\; |
||||
" else ""; |
||||
|
||||
# The binaries for Darwin use frameworks, so fake those frameworks, |
||||
# and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so |
||||
# that the executables work with no special setup. |
||||
postInstall = if stdenv.isDarwin then " |
||||
|
||||
ensureDir $out/frameworks/GMP.framework/Versions/A |
||||
ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP |
||||
ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP |
||||
ensureDir $out/frameworks/GNUreadline.framework/Versions/A |
||||
ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/GNUreadline |
||||
ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/Versions/A/GNUreadline |
||||
|
||||
mv $out/bin $out/bin-orig |
||||
mkdir $out/bin |
||||
for i in $(cd $out/bin-orig && ls); do |
||||
echo \"#! $SHELL -e\" >> $out/bin/$i |
||||
echo \"DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \\\"\\$@\\\"\" >> $out/bin/$i |
||||
chmod +x $out/bin/$i |
||||
done |
||||
|
||||
" else ""; |
||||
} |
||||
|
@ -1,10 +0,0 @@ |
||||
source $stdenv/setup |
||||
|
||||
postBuild=postBuild |
||||
postBuild () { |
||||
find . -type f -perm +100 \ |
||||
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ |
||||
--set-rpath "$readline/lib:$ncurses/lib:$gmp/lib" {} \; |
||||
} |
||||
|
||||
genericBuild |
@ -1,10 +1,10 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "tcl-8.4.13"; |
||||
name = "tcl-8.4.16"; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = mirror://sourceforge/tcl/tcl8.4.13-src.tar.gz; |
||||
md5 = "c6b655ad5db095ee73227113220c0523"; |
||||
url = mirror://sourceforge/tcl/tcl8.4.16-src.tar.gz; |
||||
sha256 = "0v9mh53kdvfm4kxgsw8gfxsfl8kvbnnp22bpwyyg5sa4jyjjbs93"; |
||||
}; |
||||
} |
||||
|
@ -0,0 +1,222 @@ |
||||
diff -u -U3 -r acl-2.2.45-orig/aclocal.m4 acl-2.2.45-mod/aclocal.m4 |
||||
--- acl-2.2.45-orig/aclocal.m4 2007-12-23 16:16:11.000000000 +0300 |
||||
+++ acl-2.2.45-mod/aclocal.m4 2007-12-23 18:09:04.000000000 +0300 |
||||
@@ -228,32 +228,32 @@ |
||||
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) |
||||
|
||||
if test -z "$MAKE"; then |
||||
- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
+ AC_PATH_PROG(MAKE, gmake,,) |
||||
fi |
||||
if test -z "$MAKE"; then |
||||
- AC_PATH_PROG(MAKE, make,, /usr/bin) |
||||
+ AC_PATH_PROG(MAKE, make,, ) |
||||
fi |
||||
make=$MAKE |
||||
AC_SUBST(make) |
||||
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) |
||||
|
||||
if test -z "$LIBTOOL"; then |
||||
- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) |
||||
+ AC_PATH_PROG(LIBTOOL, glibtool,, ) |
||||
fi |
||||
if test -z "$LIBTOOL"; then |
||||
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
+ AC_PATH_PROG(LIBTOOL, libtool,, ) |
||||
fi |
||||
libtool=$LIBTOOL |
||||
AC_SUBST(libtool) |
||||
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) |
||||
|
||||
if test -z "$TAR"; then |
||||
- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) |
||||
+ AC_PATH_PROG(TAR, tar,, ) |
||||
fi |
||||
tar=$TAR |
||||
AC_SUBST(tar) |
||||
if test -z "$ZIP"; then |
||||
- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
+ AC_PATH_PROG(ZIP, gzip,, ) |
||||
fi |
||||
|
||||
zip=$ZIP |
||||
@@ -266,25 +266,25 @@ |
||||
AC_SUBST(makedepend) |
||||
|
||||
if test -z "$AWK"; then |
||||
- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) |
||||
+ AC_PATH_PROG(AWK, awk,, ) |
||||
fi |
||||
awk=$AWK |
||||
AC_SUBST(awk) |
||||
|
||||
if test -z "$SED"; then |
||||
- AC_PATH_PROG(SED, sed,, /bin:/usr/bin) |
||||
+ AC_PATH_PROG(SED, sed,, ) |
||||
fi |
||||
sed=$SED |
||||
AC_SUBST(sed) |
||||
|
||||
if test -z "$ECHO"; then |
||||
- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) |
||||
+ AC_PATH_PROG(ECHO, echo,, ) |
||||
fi |
||||
echo=$ECHO |
||||
AC_SUBST(echo) |
||||
|
||||
if test -z "$SORT"; then |
||||
- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) |
||||
+ AC_PATH_PROG(SORT, sort,, ) |
||||
fi |
||||
sort=$SORT |
||||
AC_SUBST(sort) |
||||
@@ -294,21 +294,21 @@ |
||||
|
||||
if test "$enable_gettext" = yes; then |
||||
if test -z "$MSGFMT"; then |
||||
- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
+ AC_PATH_PROG(MSGFMT, msgfmt,, ) |
||||
fi |
||||
msgfmt=$MSGFMT |
||||
AC_SUBST(msgfmt) |
||||
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) |
||||
|
||||
if test -z "$MSGMERGE"; then |
||||
- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
+ AC_PATH_PROG(MSGMERGE, msgmerge,, ) |
||||
fi |
||||
msgmerge=$MSGMERGE |
||||
AC_SUBST(msgmerge) |
||||
AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext) |
||||
|
||||
if test -z "$XGETTEXT"; then |
||||
- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
+ AC_PATH_PROG(XGETTEXT, xgettext,, ) |
||||
fi |
||||
xgettext=$XGETTEXT |
||||
AC_SUBST(xgettext) |
||||
@@ -316,7 +316,7 @@ |
||||
fi |
||||
|
||||
if test -z "$RPM"; then |
||||
- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) |
||||
+ AC_PATH_PROG(RPM, rpm,, ) |
||||
fi |
||||
rpm=$RPM |
||||
AC_SUBST(rpm) |
||||
ôÏÌØËÏ × acl-2.2.45-orig/: configure |
||||
diff -u -U3 -r acl-2.2.45-orig/m4/package_utilies.m4 acl-2.2.45-mod/m4/package_utilies.m4 |
||||
--- acl-2.2.45-orig/m4/package_utilies.m4 2007-12-23 16:16:11.000000000 +0300 |
||||
+++ acl-2.2.45-mod/m4/package_utilies.m4 2007-12-23 18:01:28.000000000 +0300 |
||||
@@ -23,32 +23,26 @@ |
||||
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) |
||||
|
||||
if test -z "$MAKE"; then |
||||
- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
fi |
||||
if test -z "$MAKE"; then |
||||
- AC_PATH_PROG(MAKE, make,, /usr/bin) |
||||
fi |
||||
make=$MAKE |
||||
AC_SUBST(make) |
||||
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) |
||||
|
||||
if test -z "$LIBTOOL"; then |
||||
- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) |
||||
fi |
||||
if test -z "$LIBTOOL"; then |
||||
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
fi |
||||
libtool=$LIBTOOL |
||||
AC_SUBST(libtool) |
||||
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) |
||||
|
||||
if test -z "$TAR"; then |
||||
- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) |
||||
fi |
||||
tar=$TAR |
||||
AC_SUBST(tar) |
||||
if test -z "$ZIP"; then |
||||
- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
fi |
||||
|
||||
zip=$ZIP |
||||
@@ -61,25 +55,21 @@ |
||||
AC_SUBST(makedepend) |
||||
|
||||
if test -z "$AWK"; then |
||||
- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) |
||||
fi |
||||
awk=$AWK |
||||
AC_SUBST(awk) |
||||
|
||||
if test -z "$SED"; then |
||||
- AC_PATH_PROG(SED, sed,, /bin:/usr/bin) |
||||
fi |
||||
sed=$SED |
||||
AC_SUBST(sed) |
||||
|
||||
if test -z "$ECHO"; then |
||||
- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) |
||||
fi |
||||
echo=$ECHO |
||||
AC_SUBST(echo) |
||||
|
||||
if test -z "$SORT"; then |
||||
- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) |
||||
fi |
||||
sort=$SORT |
||||
AC_SUBST(sort) |
||||
@@ -89,21 +79,18 @@ |
||||
|
||||
if test "$enable_gettext" = yes; then |
||||
if test -z "$MSGFMT"; then |
||||
- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
fi |
||||
msgfmt=$MSGFMT |
||||
AC_SUBST(msgfmt) |
||||
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) |
||||
|
||||
if test -z "$MSGMERGE"; then |
||||
- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
fi |
||||
msgmerge=$MSGMERGE |
||||
AC_SUBST(msgmerge) |
||||
AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext) |
||||
|
||||
if test -z "$XGETTEXT"; then |
||||
- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin) |
||||
fi |
||||
xgettext=$XGETTEXT |
||||
AC_SUBST(xgettext) |
||||
@@ -111,7 +98,6 @@ |
||||
fi |
||||
|
||||
if test -z "$RPM"; then |
||||
- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) |
||||
fi |
||||
rpm=$RPM |
||||
AC_SUBST(rpm) |
||||
diff -u -U3 -r acl-2.2.45-orig/Makefile acl-2.2.45-mod/Makefile |
||||
--- acl-2.2.45-orig/Makefile 2007-12-23 16:16:11.000000000 +0300 |
||||
+++ acl-2.2.45-mod/Makefile 2007-12-23 18:01:28.000000000 +0300 |
||||
@@ -33,19 +33,6 @@ |
||||
endif |
||||
|
||||
$(CONFIGURE): |
||||
- autoconf |
||||
- ./configure \ |
||||
- --prefix=/ \ |
||||
- --exec-prefix=/ \ |
||||
- --sbindir=/bin \ |
||||
- --bindir=/usr/bin \ |
||||
- --libdir=/lib \ |
||||
- --libexecdir=/usr/lib \ |
||||
- --enable-lib64=yes \ |
||||
- --includedir=/usr/include \ |
||||
- --mandir=/usr/share/man \ |
||||
- --datadir=/usr/share \ |
||||
- $$LOCAL_CONFIGURE_OPTIONS |
||||
touch .census |
||||
|
||||
aclocal.m4:: |
@ -0,0 +1,12 @@ |
||||
source $stdenv/setup |
||||
|
||||
preConfigure() { |
||||
rm configure |
||||
autoconf |
||||
} |
||||
|
||||
preConfigure=preConfigure |
||||
|
||||
installFlags='install-lib install-dev' |
||||
|
||||
genericBuild |
@ -0,0 +1,14 @@ |
||||
args: with args; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "acl-2.2.45"; |
||||
|
||||
builder = ./builder.sh; |
||||
src = |
||||
fetchurl { |
||||
url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.45-1.tar.gz; |
||||
sha256 = "1bb2k5br494yk863w27k1h8gkdkq4kzakvajhj844hl1cixhhf1a"; |
||||
}; |
||||
buildInputs = [autoconf libtool gettext attr]; |
||||
patches = [ ./acl-2.2.45-patch ]; |
||||
} |
@ -1,9 +1,9 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "audiofile-0.2.3"; |
||||
name = "audiofile-0.2.6"; |
||||
src = fetchurl { |
||||
url = http://www.68k.org/~michael/audiofile/audiofile-0.2.5.tar.gz; |
||||
md5 = "fd07c62a17ceafa317929e55e51e26c5"; |
||||
url = http://www.68k.org/~michael/audiofile/audiofile-0.2.6.tar.gz; |
||||
sha256 = "1a921w6jwcnkmx3vm091qrj7109jzri6kw4ygjq6ym91dssnfqab"; |
||||
}; |
||||
} |
||||
|
@ -1,9 +1,13 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "boehm-gc-6.8"; |
||||
name = "boehm-gc-7.0"; |
||||
src = fetchurl { |
||||
url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz; |
||||
md5 = "418d38bd9c66398386a372ec0435250e"; |
||||
url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.0.tar.gz; |
||||
sha256 = "0nqy0462ainp79fjmx5lgr89s2d433fggr3n9d1p09xq77lwc2nj"; |
||||
}; |
||||
meta = { |
||||
description = "A garbage collector for C and C++"; |
||||
homepage = http://www.hpl.hp.com/personal/Hans_Boehm/gc/; |
||||
}; |
||||
} |
||||
|
@ -1,9 +1,9 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "coredumper-0.2"; |
||||
name = "coredumper-1.1"; |
||||
src = fetchurl { |
||||
url = mirror://sourceforge/goog-coredumper/coredumper-0.2.tar.gz; |
||||
md5 = "024f8e4afe73c4cc4f4a0b0ef585e9b7"; |
||||
url = http://google-coredumper.googlecode.com/files/coredumper-1.1.tar.gz; |
||||
sha256 = "1phl1zg2n17rp595dyzz9iw01gfdpsdh0l6wy2hfb5shi71h63rx"; |
||||
}; |
||||
} |
||||
|
@ -1,7 +1,7 @@ |
||||
{stdenv, fetchurl}: stdenv.mkDerivation { |
||||
name = "expat-2.0.0"; |
||||
name = "expat-2.0.1"; |
||||
src = fetchurl { |
||||
url = mirror://sourceforge/expat/expat-2.0.0.tar.gz; |
||||
md5 = "d945df7f1c0868c5c73cf66ba9596f3f"; |
||||
url = mirror://sourceforge/expat/expat-2.0.1.tar.gz; |
||||
sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4"; |
||||
}; |
||||
} |
||||
|
@ -0,0 +1,10 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "giflib-4.1.6"; |
||||
src = fetchurl { |
||||
url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2; |
||||
sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1"; |
||||
}; |
||||
} |
||||
|
@ -1,11 +1,20 @@ |
||||
{stdenv, fetchurl, m4}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "gmp-4.2.1"; |
||||
name = "gmp-4.2.2"; |
||||
|
||||
src = fetchurl { |
||||
url = mirror://gnu/gmp/gmp-4.2.1.tar.bz2; |
||||
md5 = "091c56e0e1cca6b09b17b69d47ef18e3"; |
||||
url = mirror://gnu/gmp/gmp-4.2.2.tar.bz2; |
||||
sha256 = "0yv593sk62ypn21gg2x570g955lmsi4i6f2bc3s43p52myn0lb1b"; |
||||
}; |
||||
|
||||
buildInputs = [m4]; |
||||
|
||||
doCheck = true; |
||||
|
||||
meta = { |
||||
description = "A free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers"; |
||||
homepage = http://gmplib.org/; |
||||
license = "LGPL"; |
||||
}; |
||||
} |
||||
|
@ -0,0 +1,30 @@ |
||||
args: |
||||
let edf = args.lib.enableDisableFeature; in |
||||
( args.mkDerivationByConfiguration { |
||||
flagConfig = { } |
||||
# TODO! implement flags |
||||
# I want to get kino and cinelerra working. That's why I don't spend more time on this now |
||||
// edf "libtool_lock" "libtool_lock" { } #avoid locking (might break parallel builds) |
||||
// edf "asm" "asm" { } #disable use of architecture specific assembly code |
||||
// edf "sdl" "sdl" { } #enable use of SDL for display |
||||
// edf "gtk" "gtk" { } #disable use of gtk for display |
||||
// edf "xv" "xv" { } #disable use of XVideo extension for display |
||||
// edf "gprof" "gprof" { } #enable compiler options for gprof profiling |
||||
; |
||||
|
||||
extraAttrs = co : { |
||||
name = "libdv-1.0.0"; |
||||
|
||||
src = args.fetchurl { |
||||
url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz; |
||||
sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"; |
||||
}; |
||||
|
||||
meta = { |
||||
description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; |
||||
homepage = http://sourceforge.net/projects/libdv/; |
||||
# you can choose one of the following licenses: |
||||
license = []; |
||||
}; |
||||
}; |
||||
} ) args |
@ -0,0 +1,17 @@ |
||||
args: |
||||
args.stdenv.mkDerivation { |
||||
name = "libraw1394-1.2.0"; |
||||
|
||||
src = args.fetchurl { |
||||
url = "mirror://sourceforge/libraw1394/libraw1394-1.2.0.tar.gz"; |
||||
sha256 = "1b9zqqzyz0ihyfvhn135y3wc6vmym5yz21jxj9dp0f09b96gmp0z"; |
||||
}; |
||||
|
||||
buildInputs =(with args; []); |
||||
|
||||
meta = { |
||||
description = "library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface"; |
||||
homepage = "http://wiki.linux1394.org/"; |
||||
license = ["GPL" "LGPL"]; |
||||
}; |
||||
} |
@ -1,10 +1,10 @@ |
||||
{stdenv, fetchurl, libogg, libvorbis}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "libtheora-1.0alpha7"; |
||||
name = "libtheora-1.0beta2"; |
||||
src = fetchurl { |
||||
url = http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.bz2; |
||||
md5 = "1bc851e39e4b16977131d5e5f769f48b"; |
||||
url = http://downloads.xiph.org/releases/theora/libtheora-1.0beta2.tar.gz; |
||||
sha256 = "0iwwprpi4s9y37c5yvlb572wd5gb2s635pxrkz5589266g1j1dcg"; |
||||
}; |
||||
propagatedBuildInputs = [libogg libvorbis]; |
||||
} |
||||
|
@ -1,10 +1,10 @@ |
||||
{stdenv, fetchurl, libogg}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "libvorbis-1.1.2"; |
||||
name = "libvorbis-1.2.0"; |
||||
src = fetchurl { |
||||
url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.1.2.tar.gz; |
||||
md5 = "37847626b8e1b53ae79a34714c7b3211"; |
||||
url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.bz2; |
||||
sha256 = "0nq62b8y2rhhgxxyiw6b4wchic61q5v649fdl8dd7090nxxcbx4y"; |
||||
}; |
||||
buildInputs = [libogg]; |
||||
} |
||||
|
@ -1,9 +1,9 @@ |
||||
args: with args; |
||||
stdenv.mkDerivation { |
||||
name = "libwpd-0.8.5"; |
||||
name = "libwpd-0.8.13"; |
||||
src = fetchurl { |
||||
url = mirror://sourceforge/libwpd/libwpd-0.8.5.tar.gz; |
||||
md5 = "6b679e205a2805c3d23f41c65b35e266"; |
||||
url = mirror://sourceforge/libwpd/libwpd-0.8.13.tar.gz; |
||||
sha256 = "08mb8bp0d3387l1snii4c0ighfhkby7qx2b3wymqb4a0l76rlzfn"; |
||||
}; |
||||
buildInputs = [pkgconfig glib libgsf libxml2 bzip2]; |
||||
} |
||||
|
@ -0,0 +1,11 @@ |
||||
--- a/support/shobj-conf.orig 2006-04-11 06:15:43.000000000 -0700
|
||||
+++ b/support/shobj-conf 2007-11-08 01:15:43.000000000 -0800
|
||||
@@ -171,7 +171,7 @@
|
||||
SHLIB_LIBSUFF='dylib'
|
||||
|
||||
case "${host_os}" in
|
||||
- darwin[78]*) SHOBJ_LDFLAGS=''
|
||||
+ darwin[789]*) SHOBJ_LDFLAGS=''
|
||||
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
||||
;;
|
||||
*) SHOBJ_LDFLAGS='-dynamic'
|
@ -1,10 +1,10 @@ |
||||
args: with args; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "speex-1.2beta2"; |
||||
name = "speex-1.2beta3"; |
||||
src = fetchurl { |
||||
url = http://downloads.us.xiph.org/releases/speex/speex-1.2beta2.tar.gz; |
||||
sha256 = "1np34q5i7yswkgknb8pa6ngqb4l4jv84c9yqnn0215vncbl76xg5"; |
||||
url = http://downloads.us.xiph.org/releases/speex/speex-1.2beta3.tar.gz; |
||||
sha256 = "1az7kiwa8mzi1x7j01gcakx854qcbm4g67n0c4s56bvny6dn18vp"; |
||||
}; |
||||
buildInputs = [libogg]; |
||||
} |
||||
|
@ -1,11 +1,12 @@ |
||||
{stdenv, fetchurl, x11, libXaw}: |
||||
{stdenv, fetchurl, x11, libXaw, libXpm}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "t1lib-5.1.0"; |
||||
src = fetchurl { |
||||
url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.0.tar.gz; |
||||
md5 = "a05bed4aa63637052e60690ccde70421"; |
||||
url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.1.tar.gz; |
||||
sha256 = "0r1wb94kjd8jwym9na2k2snikizrnyc4cf4mf92v89r4yy0apph8"; |
||||
}; |
||||
buildInputs = [x11 libXaw]; |
||||
buildInputs = [x11 libXaw libXpm]; |
||||
buildFlags = "without_doc"; |
||||
} |
||||
|
||||
|
@ -1,7 +1,7 @@ |
||||
{stdenv, fetchurl}: |
||||
args: with args; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "elfutils-0.127"; |
||||
name = "elfutils-"+version; |
||||
src = fetchurl { |
||||
url = http://nix.cs.uu.nl/dist/tarballs/elfutils-0.127.tar.gz; |
||||
sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv"; |
@ -0,0 +1,9 @@ |
||||
args: with args; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "elfutils-"+version; |
||||
src = fetchurl { |
||||
url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz; |
||||
sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll"; |
||||
}; |
||||
} |
@ -1,10 +1,10 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "strace-4.5.15"; |
||||
name = "strace-4.5.16"; |
||||
|
||||
src = fetchurl { |
||||
url = mirror://sourceforge/strace/strace-4.5.15.tar.gz; |
||||
sha256 = "07n62yv53p2hsb59srfaxb0kk8b6p6iq77drmf65pq8jpa50s9ip"; |
||||
url = mirror://sourceforge/strace/strace-4.5.16.tar.bz2; |
||||
sha256 = "15ks9i1gv7mbyiwnzbjls2xy0pyv5x4j9a5ca2x0258fq8lxwdhp"; |
||||
}; |
||||
} |
||||
|
@ -1,16 +1,17 @@ |
||||
{stdenv, fetchurl}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "valgrind-3.2.3"; |
||||
name = "valgrind-3.3.0"; |
||||
src = fetchurl { |
||||
url = http://valgrind.org/downloads/valgrind-3.2.3.tar.bz2; |
||||
sha256 = "0hf48y13mm1c1zg59bvkbr0lzcwng5mb33lgiv3d0gzl4w2r5jhv"; |
||||
url = http://valgrind.org/downloads/valgrind-3.3.0.tar.bz2; |
||||
sha256 = "0yllx5a2f5bx18gqz74aikr27zxwpblswn65lqvm9rbzswlq5w2s"; |
||||
}; |
||||
|
||||
configureFlags = |
||||
if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else []; |
||||
|
||||
meta = { |
||||
homepage = http://www.valgrind.org/; |
||||
description = "Award-winning suite of tools for debugging and profiling Linux programs"; |
||||
}; |
||||
} |
||||
|
@ -0,0 +1,23 @@ |
||||
{stdenv, fetchurl, ghc, perl}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "alex-2.1.0"; |
||||
src = fetchurl { |
||||
url = http://www.haskell.org/alex/dist/2.1.0/alex-2.1.0.tar.gz; |
||||
sha1 = "37599b7be5249d639b3a5a3fdc61907dc4dad660"; |
||||
}; |
||||
buildInputs = [ghc perl]; |
||||
|
||||
configurePhase = " |
||||
ghc --make Setup.lhs |
||||
./Setup configure --prefix=\"\${out}\" |
||||
"; |
||||
|
||||
buildPhase = " |
||||
./Setup build |
||||
"; |
||||
|
||||
installPhase = " |
||||
./Setup install |
||||
"; |
||||
} |
@ -0,0 +1,23 @@ |
||||
args: |
||||
args.stdenv.mkDerivation { |
||||
name = "maven-2.0.8-bin"; |
||||
|
||||
src = args.fetchurl { |
||||
# TODO mirrors |
||||
url = http://apache.linux-mirror.org/maven/binaries/apache-maven-2.0.8-bin.tar.bz2; |
||||
sha256 = "1wasvqplw7xk04j38vsq94zbrlpdg2k4348bg8730snr6zgaasai"; |
||||
}; |
||||
|
||||
phases = "unpackPhase installPhase"; |
||||
|
||||
installPhase = " |
||||
ensureDir \$out; mv * \$out |
||||
"; |
||||
|
||||
buildInputs =(with args; []); |
||||
|
||||
meta = { |
||||
description = "Java build tool"; |
||||
homepage = "apache.org"; |
||||
}; |
||||
} |
@ -0,0 +1,34 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.3.3.tar.bz2; |
||||
sha256 = "1dq56dx81wfhpgipbrl3gk2is3g1xvysx2pl6vxyj0dhslkcnf3y"; |
||||
}; |
||||
|
||||
buildInputs = []; |
||||
configureFlags = []; |
||||
makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; |
||||
patchAR2425x86 = ""; /*(if args ? pci001c_rev01 && args.pci001c_rev01 then |
||||
fetchurl { |
||||
url = http://madwifi.org/attachment/ticket/1679/madwifi-ng-0933.ar2425.20071130.i386.patch?format=raw; |
||||
name = "madwifi-AR2425-x86.patch"; |
||||
sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg"; |
||||
} else "")*/; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
let |
||||
doPatch = FullDepEntry (if patchAR2425x86 !="" then '' |
||||
cd hal |
||||
patch -Np1 -i ${patchAR2425x86} |
||||
'' else "") [minInit doUnpack]; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
name = "atheros-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [doPatch doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
Atheros WiFi driver. |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,35 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2756-20071018.tar.gz; |
||||
sha256 = "0mm1kx9pjvvla792rv7k48yhsa0fpzvd1717g9xzazjsz2mqwzyv"; |
||||
}; |
||||
|
||||
buildInputs = []; |
||||
configureFlags = []; |
||||
makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; |
||||
patchAR2425x86 = (if args ? pci001c_rev01 && args.pci001c_rev01 then |
||||
fetchurl { |
||||
url = http://madwifi.org/attachment/ticket/1679/madwifi-ng-0933.ar2425.20071130.i386.patch?format=raw; |
||||
name = "madwifi-AR2425-x86.patch"; |
||||
sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg"; |
||||
} else ""); |
||||
} null; /* null is a terminator for sumArgs */ |
||||
let |
||||
doPatch = FullDepEntry (if patchAR2425x86 !="" then '' |
||||
cd hal |
||||
patch -Np1 -i ${patchAR2425x86} |
||||
cd .. |
||||
'' else "") [minInit doUnpack]; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
name = "atheros-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [doPatch doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
Atheros WiFi driver. |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,22 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r3122-20080109.tar.gz; |
||||
sha256 = "188258c6q96n8lb57c0cqsvxp47psninirdax13w4yd07v1rymwd"; |
||||
}; |
||||
|
||||
buildInputs = []; |
||||
configureFlags = []; |
||||
makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
stdenv.mkDerivation rec { |
||||
name = "atheros-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
Atheros WiFi driver. |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,22 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.9.tar.bz2; |
||||
sha256 = "05g0ln400fhqjspg9h4x0a1dvmwiyjq5rk9q9kimxvywbg1b53l8"; |
||||
}; |
||||
|
||||
buildInputs = []; |
||||
configureFlags = []; |
||||
makeFlags = "prefix=\$out"; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
stdenv.mkDerivation rec { |
||||
name = "dmidecode-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [ doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
Tool to decode Desktop Management Interface and SBIOS data. |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,27 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.0.tar.gz; |
||||
sha256 = "08hljn2vfn794dfrfpp3m245dbpb6nhk40igfpqm6wg9qimc9zy9"; |
||||
}; |
||||
|
||||
buildInputs = [cdrkit m4]; |
||||
configureFlags = []; |
||||
makeFlags = [" prefix=\$out "]; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
let |
||||
preBuild = FullDepEntry (" |
||||
sed -e 's@/usr/local@'\$out'@g' -i Makefile.m4 Makefile |
||||
") [minInit doUnpack]; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
name = "dvd+rw-tools-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [preBuild doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
DVD+RW tools. |
||||
"; |
||||
}; |
||||
} |
@ -1,11 +1,19 @@ |
||||
{stdenv, fetchurl}: |
||||
args: with args; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "fuse-2.6.5"; |
||||
name = "fuse-2.7.2"; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = mirror://sourceforge/fuse/fuse-2.6.5.tar.gz; |
||||
sha256 = "0901hrhi1z6dwlgvgn75cg2268wvaz53x0knn7jplk6acwir54db"; |
||||
url = mirror://sourceforge/fuse/fuse-2.7.2.tar.gz; |
||||
sha256 = "1zxssdiirf19mihbnxpy0kiix35d4256b9lani7qwqi7m940jfgv"; |
||||
}; |
||||
configureFlags = [ "--disable-kernel-module"]; |
||||
buildInputs = [ utillinux ]; |
||||
|
||||
inherit utillinux; |
||||
|
||||
meta = { |
||||
homepage = http://fuse.sourceforge.net/; |
||||
description = "Kernel module and library that allows filesystems to be implemented in user space"; |
||||
}; |
||||
configureFlags = [ "--disable-kernel-module" ]; |
||||
} |
||||
|
@ -1,14 +0,0 @@ |
||||
diff -rc linux-2.6.22.1/arch/i386/kernel/paravirt.c linux-2.6.22.1-para/arch/i386/kernel/paravirt.c
|
||||
*** linux-2.6.22.1/arch/i386/kernel/paravirt.c 2007-07-20 16:19:35.000000000 +0200
|
||||
--- linux-2.6.22.1-para/arch/i386/kernel/paravirt.c 2007-07-20 16:20:00.000000000 +0200
|
||||
***************
|
||||
*** 344,347 ****
|
||||
.activate_mm = paravirt_nop,
|
||||
};
|
||||
|
||||
! EXPORT_SYMBOL(paravirt_ops);
|
||||
--- 344,347 ----
|
||||
.activate_mm = paravirt_nop,
|
||||
};
|
||||
|
||||
! EXPORT_SYMBOL_GPL(paravirt_ops);
|
@ -0,0 +1,38 @@ |
||||
args: |
||||
(import ./meta.nix) |
||||
( args // |
||||
{ |
||||
version = "2.6.23.12"; |
||||
src_hash = { sha256 = "1x3ngnhyxy9rlaislm2hzijaaa2mp8v930dyp8zmmhjdpzjf3w8k"; }; |
||||
|
||||
systemPatches = [ |
||||
{ # resume with resume=swap:/dev/xx |
||||
name = "tux on ice"; # (swsusp2) |
||||
patch = args.fetchurl { |
||||
url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc3-for-2.6.23.9.patch.bz2"; |
||||
sha256 = "16f61cn0mdi7yklhdx4isi7c85843fzxq2cifd05cpsl6x6ilrfk"; |
||||
}; |
||||
extraConfig = " |
||||
CONFIG_SUSPEND2=y |
||||
CONFIG_SUSPEND2_FILE=y |
||||
CONFIG_SUSPEND2_SWAP=y |
||||
CONFIG_CRYPTO_LZF=y |
||||
"; |
||||
} |
||||
{ name = "fbsplash-0.9.2-r5-2.6.21"; |
||||
patch = args.fetchurl { |
||||
url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.22/4200_fbsplash-0.9.2-r5.patch; |
||||
sha256 = "0822wwlf2dqsap5qslnnp0yl1nbvvvb76l73w2dd8zsyn0bqg3px"; |
||||
}; |
||||
extraConfig = "CONFIG_FB_SPLASH=y"; |
||||
} |
||||
]; |
||||
|
||||
config = with args; |
||||
if config != null then config else |
||||
if userModeLinux then ./config-2.6.23-uml else |
||||
if stdenv.system == "i686-linux" then ./config-2.6.23-i686-smp else |
||||
if stdenv.system == "x86_64-linux" then ./config-2.6.23-x86_64-smp else |
||||
abort "No kernel configuration for your platform!"; |
||||
} |
||||
) |
@ -0,0 +1,30 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre11.tar.gz; |
||||
sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl"; |
||||
}; |
||||
buildInputs = []; |
||||
configureFlags = [''--prefix=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
let |
||||
debugStep = FullDepEntry ('' |
||||
cat config-host.mak |
||||
'') [minInit]; |
||||
preConfigure = FullDepEntry ('' |
||||
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh |
||||
sed -e '/depmod/d' -i install.sh |
||||
cat install.sh |
||||
'') [minInit doUnpack]; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
name = "kqemu-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [preConfigure doConfigure debugStep doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
Kernel module for Qemu acceleration |
||||
"; |
||||
}; |
||||
} |
@ -0,0 +1,34 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
addSbinPath = true; |
||||
src = ""; |
||||
buildInputs = [lndir module_init_tools]; |
||||
configureFlags = []; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
let |
||||
|
||||
doCollect = FullDepEntry ('' |
||||
ensureDir $out/ |
||||
cd $out/ |
||||
for i in $moduleSources; do |
||||
lndir $i/ |
||||
done |
||||
rm -rf nix-support |
||||
cd lib/modules/ |
||||
rm */modules.* |
||||
MODULE_DIR=$PWD/ depmod -a |
||||
'') [minInit addInputs defEnsureDir]; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
name = "module-aggregator"; |
||||
inherit moduleSources; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [doCollect doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
A directory to hold all the modules, including those |
||||
built separately from kernel. Earlier directories in |
||||
moduleSources have higher priority. |
||||
"; |
||||
}; |
||||
} |
@ -1,101 +1,76 @@ |
||||
source $stdenv/setup |
||||
|
||||
echo "Building linux driver against kernel: " $kernelOutPath; |
||||
echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH" |
||||
|
||||
echo $nvidiasrc |
||||
cp $nvidiasrc . |
||||
chmod 755 ./*-NVIDIA* |
||||
./*-NVIDIA* -x |
||||
cd NVIDIA*/ |
||||
|
||||
cd usr/src/nv/ |
||||
pwd -P |
||||
|
||||
#Clean up |
||||
#make clean |
||||
|
||||
#Create the module |
||||
echo $out |
||||
mkdir $out |
||||
make SYSSRC=$kernelOutPath/lib/modules/2.*/build/ module |
||||
|
||||
#go to the usr dir of the nvidia package |
||||
cd ../../ |
||||
|
||||
echo "Copying all files to " $out/lib"" |
||||
|
||||
cp -R * $out |
||||
|
||||
#add extra symlinks in $out |
||||
ln -snf $out/lib/libGLcore.so.$versionNumber $out/lib/libGLcore.so |
||||
ln -snf $out/lib/libGLcore.so.$versionNumber $out/lib/libGLcore.so.1 |
||||
ln -snf $out/lib/libGL.so.$versionNumber $out/lib/libGL.so |
||||
ln -snf $out/lib/libGL.so.$versionNumber $out/lib/libGL.so.1 |
||||
ln -snf $out/lib/libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1 |
||||
ln -snf $out/lib/libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1 |
||||
ln -snf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber $out/X11R6/lib/libXvMCNVIDIA.so.1 |
||||
ln -snf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA.so.1 |
||||
ln -snf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber $out/X11R6/lib/modules/libnvidia-wfb.so.1 |
||||
ln -snf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber $out/lib/libnvidia-wfb.so.1 |
||||
ln -snf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber $out/X11R6/lib/modules/extensions/libglx.so.1 |
||||
ln -snf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber $out/lib/libglx.so.1 |
||||
|
||||
#TODO: patchelf binaries ! |
||||
#patchelf --set-interpreter ${path glibc TODO /lib/ld-linux.so.2 $out/bin/.... |
||||
|
||||
#from dep on xorg-sys-opengl: add symlinks in /usr/lib/ (especially libGL.so.1) to the real location... |
||||
|
||||
ensureDir /usr/lib/ |
||||
cd /usr/lib |
||||
ln -snf $out/lib/libGLcore.so.$versionNumber libGLcore.so.1 |
||||
ln -snf $out/lib/libGL.la libGL.la |
||||
ln -snf $out/lib/libGL.so.$versionNumber libGL.so.1 |
||||
ln -snf $out/lib/libnvidia-cfg.so.$versionNumber libnvidia-cfg.so.1 |
||||
ln -snf $out/lib/libnvidia-tls.so.$versionNumber libnvidia-tls.so.1 |
||||
ensureDir /usr/lib/tls/ |
||||
ln -snf $out/lib/tls/libnvidia-tls.so.$versionNumber /usr/lib/tls/libnvidia-tls.so.1 |
||||
ln -snf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber libglx.so.1 |
||||
ln -snf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber libnvidia-wfb.so.1 |
||||
ln -snf $out/X11R6/lib/modules/drivers/nvidia_drv.so nvidia_drv.so |
||||
ln -snf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber libXvMCNVIDIA.so.1 |
||||
ln -snf $out/bin/tls_test_dso.so tls_test_dso.so |
||||
ln -snf $out/src/nv/nvidia.ko nvidia.ko |
||||
|
||||
echo "YOU! need to add symlinks as root to the libs in the current $xorgOutPath/lib/xorg/modules/extensions/ (especially libglx.so)" |
||||
rwlibs=" |
||||
cd $xorgOutPath/lib/xorg/modules/extensions/; |
||||
mv libglx.so libglx.so.org; |
||||
mv libglx.la libglx.la.org; |
||||
mv libGLcore.so libGLcore.so.org; |
||||
ln -snf /usr/lib/libglx.so.1 libglx.so; |
||||
ln -snf /usr/lib/libglx.so.1 libglx.so.1; |
||||
ln -snf /usr/lib/libGLcore.so.1 libGLcore.so; |
||||
ln -snf /usr/lib/libGLcore.so.1 libGLcore.so.1; |
||||
ln -snf /usr/lib/libGL.so.1 libGL.so; |
||||
ln -snf /usr/lib/libGL.so.1 libGL.so.1; |
||||
ln -snf /usr/lib/libglx.la libglx.la; |
||||
ln -snf /usr/lib/libglx.so.1 libglx.so; |
||||
ln -snf /usr/lib/libglx.so.1 libglx.so.1; |
||||
ln -snf /usr/lib/nvidia_drv.so nvidia_drv.so; |
||||
|
||||
# rm /var/run/opengl-driver; |
||||
ln -snf /var/run/opengl-driver $out; |
||||
|
||||
kerneldrvnvpath=$kernelOutPath/lib/modules/*-default/kernel/drivers/video/nvidia; |
||||
#echo TODO kerneldrvnvpath: \$kerneldrvnvpath |
||||
ln -snf $out/src/nv/nvidia.ko \$kerneldrvnvpath/nvidia.ko; |
||||
" |
||||
#TODO ADD ln -sf is sometimes not strong enough ... |
||||
|
||||
rwlibsfile="$out/bin/nvidia-rewriteLibs.sh" |
||||
|
||||
echo "--------------------------------------------------------" |
||||
echo "YOU MUST RUN $rwlibsfile as ROOT after this installation" |
||||
echo "--------------------------------------------------------" |
||||
echo $rwlibs > $rwlibsfile |
||||
chmod 755 $rwlibsfile |
||||
|
||||
sleep 5 |
||||
dontPatchELF=1 # must keep libXv, $out in RPATH |
||||
|
||||
|
||||
unpackFile() { |
||||
sh $src -x |
||||
} |
||||
|
||||
|
||||
buildPhase=myBuildPhase |
||||
myBuildPhase() { |
||||
echo "Building linux driver against kernel: " $kernel; |
||||
|
||||
cd usr/src/nv/ |
||||
|
||||
# Workaround: get it to build on kernels that have CONFIG_XEN set. |
||||
# Disable the test, apply a patch to disable the Xen functionality. |
||||
#substituteInPlace Makefile.kbuild --replace xen_sanity_check fnord |
||||
#patch -p1 < $xenPatch |
||||
|
||||
# Create the module. |
||||
sysSrc=$(echo $kernel/lib/modules/2.*/build/) |
||||
unset src # used by the nv makefile |
||||
make SYSSRC=$sysSrc module |
||||
cd ../../.. |
||||
} |
||||
|
||||
|
||||
installPhase=myInstallPhase |
||||
myInstallPhase() { |
||||
|
||||
# Install the kernel module. |
||||
ensureDir $out/lib |
||||
cp usr/src/nv/nvidia.ko $out/lib/ |
||||
|
||||
# Install libGL and friends. |
||||
cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/ |
||||
|
||||
ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so |
||||
ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so.1 |
||||
ln -snf libGL.so.$versionNumber $out/lib/libGL.so |
||||
ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1 |
||||
ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1 |
||||
ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1 |
||||
ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1 |
||||
ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1 |
||||
ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1 |
||||
|
||||
# Install the X driver. |
||||
ensureDir $out/lib/xorg/modules |
||||
cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/ |
||||
|
||||
ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 |
||||
ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so |
||||
|
||||
# Install the programs. |
||||
ensureDir $out/bin |
||||
|
||||
fullPath=$out/lib |
||||
for i in $libPath; do |
||||
fullPath=$fullPath:$i/lib |
||||
done |
||||
|
||||
for i in nvidia-settings nvidia-xconfig; do |
||||
cp usr/bin/$i $out/bin/$i |
||||
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ |
||||
--set-rpath $fullPath $out/bin/$i |
||||
done |
||||
|
||||
# Header files etc. |
||||
cp -prd usr/include usr/share $out |
||||
} |
||||
|
||||
|
||||
genericBuild |
||||
|
@ -1,46 +1,26 @@ |
||||
{ stdenv |
||||
, fetchurl |
||||
|
||||
, kernel |
||||
, coreutils |
||||
, xorg_server |
||||
|
||||
#deps |
||||
,libXext, libX11 |
||||
|
||||
}: |
||||
{stdenv, fetchurl, kernel, xlibs, gtkLibs}: |
||||
|
||||
let |
||||
|
||||
versionNumber = "100.14.19"; #important ! to also update this if the sources are updated, this is used as follows: extensions/libglx.so.$versionNumber |
||||
versionNumber = "169.07"; |
||||
|
||||
in |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "nvidiaDrivers-" + versionNumber; |
||||
builder = ./builder.sh; |
||||
|
||||
|
||||
nvidiasrc = fetchurl { #we cannot use $src since this variable is also used in the nvidia sources |
||||
#url = http://www.denbreejen.net/public/nixos/NVIDIA-Linux-x86-1.0-9755-pkg1.run; |
||||
#sha256 = "1985373866b1dcae80f3da66dbbbd3c28ad76e75a620865be321ee870ad9d1ea"; |
||||
#url = http://us.download.nvidia.com/XFree86/Linux-x86/100.14.11/NVIDIA-Linux-x86-100.14.11-pkg1.run; |
||||
#sha256 = "8665370e590328cc5bf3d13737739a80dacbfb6844436cab03c992e84bf16b0c"; |
||||
url = http://us.download.nvidia.com/XFree86/Linux-x86/100.14.19/NVIDIA-Linux-x86-100.14.19-pkg1.run; |
||||
sha256 = "4dc97d8ff5340954f3cd446093636261c54b147e9721eb295574207d79e9a7e7"; |
||||
src = fetchurl { |
||||
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg1.run"; |
||||
sha256 = "1q4sbwcf24rvx72sj19pvhsmg5n8v2rfzsxf56mfxjbiy2jhjbaa"; |
||||
}; |
||||
inherit versionNumber; |
||||
|
||||
kernelOutPath = kernel.outPath; |
||||
xorgOutPath = xorg_server.outPath; |
||||
#xenPatch = ./nvidia-2.6.24-xen.patch; |
||||
|
||||
buildInputs = [ |
||||
libXext libX11 |
||||
]; |
||||
inherit versionNumber kernel; |
||||
|
||||
propagatedBuildInputs = [ |
||||
libX11 libXext |
||||
libPath = [ |
||||
gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib |
||||
xlibs.libXext xlibs.libX11 xlibs.libXv |
||||
]; |
||||
|
||||
NIX_LDFLAGS = "-rpath ${libX11}/lib -rpath ${libXext}/lib"; |
||||
LD_LIBRARY_PATH = "${libX11}/lib:${libXext}/lib/"; |
||||
} |
||||
|
@ -0,0 +1,21 @@ |
||||
args : with args; |
||||
with builderDefs { |
||||
src = /* put a fetchurl here */ |
||||
fetchurl { |
||||
url = http://sg.torque.net/sg/p/sdparm-1.02.tgz; |
||||
sha256 = "13acyg6r65gypdprjhfkmvaykgfcj1riwpnycpvv9znzgq9fxsiv"; |
||||
}; |
||||
|
||||
buildInputs = []; |
||||
configureFlags = []; |
||||
} null; /* null is a terminator for sumArgs */ |
||||
stdenv.mkDerivation rec { |
||||
name = "sdparm-"+version; |
||||
builder = writeScript (name + "-builder") |
||||
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); |
||||
meta = { |
||||
description = " |
||||
SCSI parameters utility. |
||||
"; |
||||
}; |
||||
} |
@ -1,11 +1,11 @@ |
||||
{stdenv, fetchurl, zlib}: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "squashfs-3.1-r2"; |
||||
name = "squashfs-3.3"; |
||||
builder = ./builder.sh; |
||||
src = fetchurl { |
||||
url = mirror://sourceforge/squashfs/squashfs3.1-r2.tar.gz; |
||||
md5 = "c252e5286b142afa54ca49829c51a33f"; |
||||
url = mirror://sourceforge/squashfs/squashfs3.3.tgz; |
||||
sha256 = "1j55m26nyvlbld4yxad0r6s1f4rdw9yg89y2gv93ihkx3rx048w4"; |
||||
}; |
||||
buildInputs = [zlib]; |
||||
} |
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue