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

Updating from trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
This commit is contained in:
Lluís Batlle i Rossell 2009-12-10 14:48:45 +00:00
commit 89fe676bb3
124 changed files with 1304 additions and 609 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/editors/emacs-modes/prolog/default.nix Normal file
View File

@ -0,0 +1,19 @@
{stdenv, fetchurl}:
stdenv.mkDerivation
{
name = "prolog-mode-1.22";
src = fetchurl
{
url = "http://bruda.ca/emacs-prolog/prolog.el";
sha256 = "f46915b2436642bb3302cb38cc457d3c121d0c3e95aecdf128fedc2ae5ea0c87";
};
buildCommand = "install -v -D -m644 $src $out/share/emacs/site-lisp/prolog.el";
meta = {
homepage = "http://turing.ubishops.ca/home/bruda/emacs-prolog/";
description = "Prolog mode for Emacs";
license = "GPL";
};
}

6
pkgs/applications/graphics/cinepaint/default.nix
View File

@ -11,8 +11,8 @@ stdenv.mkDerivation {
src = fetchcvs {
cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
module = "cinepaint-project";
date = "2004-03-01";
sha256 = "bf6dc04f3ea2094b7ef6f87f40f2c90d75a557e40a773f8eb76e8a71f14362cf";
date = "2008-11-06";
sha256 = "f5ac249628ffe04349d1bb3b1e078be0cda7575dd71d12ae74143baa006acb6d";
};
buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
@ -35,5 +35,7 @@ stdenv.mkDerivation {
homepage = http://www.cinepaint.org/;
license = "free";
description = "Image editor which supports images over 8bpp and ICC profiles";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

4
pkgs/applications/graphics/hugin/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
" -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" +
" -lpng12 -lpano13 -lImath -lIlmImf -lIex -lHalf -lIlmThread" +
" -ljpeg -ltiff -lz -lexiv2 -lboost_thread-mt\"" +
" -ljpeg -ltiff -lz -lexiv2 -lboost_thread\"" +
" -DCMAKE_SKIP_BUILD_RPATH=ON" +
" -DCMAKE_BUILD_TYPE=Release" +
" -DCMAKE_INSTALL_PREFIX=$out";
@ -47,5 +47,7 @@ stdenv.mkDerivation {
homepage = http://hugin.sourceforge.net/;
description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

32
pkgs/applications/graphics/qtpfsgui/default.nix
View File

@ -1,27 +1,35 @@
{stdenv, fetchurl, qt4, exiv2, openexr, fftw, libtiff, ilmbase }:
stdenv.mkDerivation {
name = "qtpfsgui-1.9.2";
stdenv.mkDerivation rec {
name = "qtpfsgui-1.9.3";
src = fetchurl {
url = mirror://sourceforge/qtpfsgui/qtpfsgui-1.9.2.tar.gz;
sha256 = "13kcw760136zpg3b5qhd1sw3kqplicvlsqmy3rxxn5ygm0zfqqj4";
url = "mirror://sourceforge/qtpfsgui/${name}.tar.gz";
sha256 = "1mlg9dry4mfnnjlnwsw375hzsiagssdhccfmapx5nh6ykqrslsh1";
};
buildInputs = [ qt4 exiv2 openexr fftw libtiff ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
configurePhase = ''
qmake PREFIX=$out EXIV2PATH=${exiv2}/include/exiv2 \
OPENEXRDIR=${openexr}/include/OpenEXR \
FFTW3DIR=${fftw}/include \
LIBTIFFDIR=${libtiff}/include \
export CPATH="${ilmbase}/include/OpenEXR:$CPATH"
qmake PREFIX=$out EXIV2PATH=${exiv2}/include/exiv2 \
OPENEXRDIR=${openexr}/include/OpenEXR \
FFTW3DIR=${fftw}/include \
LIBTIFFDIR=${libtiff}/include
'';
meta = {
homepage = http://qtpfsgui.sourceforge.net/;
description = "GUI frontend for some pfstools";
license = "GPLv2";
description = "Qtpfsqui, a graphical application for high dynamic range (HDR) imaging";
longDescription =
'' Qtpfsgui is an open source graphical user interface application that
aims to provide a workflow for high dynamic range (HDR) imaging.
'';
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.gnu;
};
}

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

@ -45,12 +45,12 @@ library, use the 'NOGUI' parameter:
}:
stdenv.mkDerivation {
name = "truecrypt-6.3";
name = "truecrypt-6.3a";
builder = ./builder.sh;
src = fetchurl {
url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3_Source.tar.gz;
sha256 = "0vgyng5zmdjdqlhai0szzapfm14njr3swamnw6yyb6pnjdncd0jq";
url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3a_Source.tar.gz;
sha256 = "1vwnzay9gjlldqbdb20rhq2arhyzhdy347qc00hkpqmv2b8z070y";
};
pkcs11h = fetchurl {

2
pkgs/applications/networking/sync/unison/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation (rec {
name = "unison-2.27.57";
src = fetchurl {
url = "http://www.seas.upenn.edu/~bcpierce/unison//download/releases/stable/unison-2.27.57.tar.gz";
url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.27.57/unison-2.27.57.tar.gz";
sha256 = "49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae";
};

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -9,11 +9,11 @@
assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings);
stdenv.mkDerivation rec {
name = "git-1.6.5.2";
name = "git-1.6.5.5";
src = fetchurl {
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
sha256 = "a7050b45a4c5a2b40db83dc67dc3ff4b422ef1864df72316b3221ead2eefb5c1";
sha256 = "4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3";
};
patches = [ ./docbook2texi.patch ];

6
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation {
name = "virtualbox-3.0.10-${kernel.version}";
name = "virtualbox-3.1.0-${kernel.version}";
src = fetchurl {
url = http://download.virtualbox.org/virtualbox/3.0.10/VirtualBox-3.0.10-OSE.tar.bz2;
sha256 = "0b8l3nnlpfxy6a7q43h1qnibkqj4q12z0dgfagyipmq51bkj9iq1";
url = http://download.virtualbox.org/virtualbox/3.1.0/VirtualBox-3.1.0-OSE.tar.bz2;
sha256 = "0f86w4awscgbg9az26h0rlg4i7xr9319hbddjs69ils28g2gz2ns";
};
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl];

9
pkgs/build-support/fetchsvn/nix-prefetch-svn
View File

@ -48,7 +48,14 @@ if test -z "$finalPath"; then
trap "rm -rf $tmpPath" EXIT
# Perform the checkout.
echo p | svn export --quiet -r "$rev" "$url" $tmpFile >&2
if test "$NIX_PREFETCH_SVN_LEAVE_DOT_SVN" != 1
then
command="export"
else
command="checkout"
fi
echo p | svn "$command" --quiet -r "$rev" "$url" "$tmpFile" >&2
# Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)

8
pkgs/build-support/release/source-tarball.nix
View File

@ -16,6 +16,12 @@ let
then ""
else if src ? rev then "pre${toString src.rev}" else "";
# By default, provide all the GNU Build System as input.
bootstrapBuildInputs =
if (args ? bootstrapBuildInputs)
then args.bootstrapBuildInputs
else [ autoconf automake libtool ];
in
stdenv.mkDerivation (
@ -71,7 +77,7 @@ stdenv.mkDerivation (
{
name = name + "-" + version + versionSuffix;
buildInputs = buildInputs ++ [autoconf automake libtool];
buildInputs = buildInputs ++ bootstrapBuildInputs;
postHook = ''
ensureDir $out/nix-support

2
pkgs/build-support/upstream-updater/snippets.sh
View File

@ -4,6 +4,8 @@
#http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz
skipRedirectSF='s@^http://sourceforge.net/projects/@http://downloads.sourceforge.net/@; s@/download$@@'
extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@'
apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@'
skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@'
replaceAllVersionOccurences() {
echo s/"$version"/\${version}/g

26
pkgs/build-support/vm/default.nix
View File

@ -773,6 +773,28 @@ rec {
archs = ["noarch" "x86_64"];
} // args);
fedora12i386 = args: makeImageFromRPMDist ({
name = "fedora-12-i386";
fullName = "Fedora 12 (i386)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/12/Fedora/i386/os/repodata/92857daf45687583ffa0fa6f8f97c71d08c50d8b6305dfeea8a3332bf2f7f27c-primary.xml.gz;
sha256 = "0z7jyzr2ncx3m3pdy1b3ic6wa20xqybqyvzsl3zq6xb88nppv1cj";
};
urlPrefix = mirror://fedora/linux/releases/12/Fedora/i386/os;
archs = ["noarch" "i386" "i586" "i686"];
} // args);
fedora12x86_64 = args: makeImageFromRPMDist ({
name = "fedora-12-x86_64";
fullName = "Fedora 12 (x86_64)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/12/Fedora/x86_64/os/repodata/a4ebee776b3c4898086e124a512e7f8c701ab1699fd83b2dcea3d7592b5c9ff0-primary.xml.gz;
sha256 = "1w4zbhmmkmx3rqnkpn4zd6qilw4cgwp52jhjdq49hj1wddvyxsx4";
};
urlPrefix = mirror://fedora/linux/releases/12/Fedora/x86_64/os;
archs = ["noarch" "x86_64"];
} // args);
opensuse103i386 = args: makeImageFromRPMDist ({
name = "opensuse-10.3-i586";
fullName = "openSUSE 10.3 (i586)";
@ -1091,6 +1113,8 @@ rec {
fedora10x86_64 = diskImageExtraFuns.fedora10x86_64 [];
fedora11i386 = diskImageExtraFuns.fedora11i386 [];
fedora11x86_64 = diskImageExtraFuns.fedora11x86_64 [];
fedora12i386 = diskImageExtraFuns.fedora12i386 [];
fedora12x86_64 = diskImageExtraFuns.fedora12x86_64 [];
opensuse103i386 = diskImageExtraFuns.opensuse103i386 [];
opensuse110i386 = diskImageExtraFuns.opensuse110i386 [];
opensuse110x86_64 = diskImageExtraFuns.opensuse110x86_64 [];
@ -1124,6 +1148,8 @@ rec {
fedora10x86_64 = extraVirtualPackages : diskImageFuns.fedora10x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
fedora11i386 = extraVirtualPackages : diskImageFuns.fedora11i386 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
fedora11x86_64 = extraVirtualPackages : diskImageFuns.fedora11x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
fedora12i386 = extraVirtualPackages : diskImageFuns.fedora12i386 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
fedora12x86_64 = extraVirtualPackages : diskImageFuns.fedora12x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
opensuse103i386 = extraVirtualPackages : diskImageFuns.opensuse103i386 { packages = commonOpenSUSEPackages ++ ["devs"] ++ extraVirtualPackages; };
opensuse110i386 = extraVirtualPackages : diskImageFuns.opensuse110i386 { packages = commonOpenSUSEPackages ++ extraVirtualPackages; };
opensuse110x86_64 = extraVirtualPackages : diskImageFuns.opensuse110x86_64 { packages = commonOpenSUSEPackages ++ extraVirtualPackages; };

6
pkgs/data/documentation/std-man-pages/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "std-man-pages-4.2.2";
name = "std-man-pages-4.4.0";
src = fetchurl {
url = mirror://gcc/libstdc++/doxygen/libstdc++-man-4.2.2.tar.bz2;
sha256 = "1572a5hlrj50gk03aardlrhhila0yjlvhqszl424297ga4g95mk2";
url = mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2;
sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v";
};
installPhase = ''

6
pkgs/desktops/kde-4.3/accessibility/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdeaccessibility-4.3.3";
name = "kdeaccessibility-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdeaccessibility-4.3.3.tar.bz2;
sha1 = "g71fn825bd3ici3vypjgnizypgv345hw";
url = mirror://kde/stable/4.3.4/src/kdeaccessibility-4.3.4.tar.bz2;
sha1 = "96aa150b8a5c368b6bb36476ed5fb3e3b3c30547";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];

6
pkgs/desktops/kde-4.3/admin/default.nix
View File

@ -3,10 +3,10 @@
, kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdeadmin-4.3.3";
name = "kdeadmin-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdeadmin-4.3.3.tar.bz2;
sha1 = "xaps0gpjv68gn9d2vw3iq0568yxk1ilh";
url = mirror://kde/stable/4.3.4/src/kdeadmin-4.3.4.tar.bz2;
sha1 = "8f61aeb2ff9d51712d72cd77dad837c8902b6a5d";
};
builder = ./builder.sh;
inherit system_config_printer;

6
pkgs/desktops/kde-4.3/artwork/default.nix
View File

@ -2,10 +2,10 @@
, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
stdenv.mkDerivation {
name = "kdeartwork-4.3.3";
name = "kdeartwork-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdeartwork-4.3.3.tar.bz2;
sha1 = "r3gpy7d7g6arb0vlnp6959ly6c5dcrbj";
url = mirror://kde/stable/4.3.4/src/kdeartwork-4.3.4.tar.bz2;
sha1 = "7a095932bad297f22b23765ce6ee17bfd2438bf2";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl xscreensaver

6
pkgs/desktops/kde-4.3/base-runtime/default.nix
View File

@ -2,10 +2,10 @@
, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore}:
stdenv.mkDerivation {
name = "kdebase-runtime-4.3.3";
name = "kdebase-runtime-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdebase-runtime-4.3.3.tar.bz2;
sha1 = "lb4y1pgflp112g98plzm4q9wpdnbkw23";
url = mirror://kde/stable/4.3.4/src/kdebase-runtime-4.3.4.tar.bz2;
sha1 = "871d23457c4a2676704722e2e3b7194d447904ee";
};
/* CLUCENE_HOME=cluceneCore;*/
includeAllQtDirs=true;

6
pkgs/desktops/kde-4.3/base-workspace/default.nix
View File

@ -6,10 +6,10 @@
}:
stdenv.mkDerivation {
name = "kdebase-workspace-4.3.3";
name = "kdebase-workspace-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdebase-workspace-4.3.3.tar.bz2;
sha1 = "kl5brn6c2nahxmavd38fmy6frq9yjf98";
url = mirror://kde/stable/4.3.4/src/kdebase-workspace-4.3.4.tar.bz2;
sha1 = "5b43447139d22247d5bc2deee8e3a944447f0bbf";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

6
pkgs/desktops/kde-4.3/base/default.nix
View File

@ -3,10 +3,10 @@
, automoc4, phonon, strigi, qimageblitz, soprano}:
stdenv.mkDerivation {
name = "kdebase-4.3.3";
name = "kdebase-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdebase-4.3.3.tar.bz2;
sha1 = "57ihndwiq8nx5v964s0b8q9965sylnbl";
url = mirror://kde/stable/4.3.4/src/kdebase-4.3.4.tar.bz2;
sha1 = "7f8637367177c93916dfc2e6a2f6323a5e91c6ce";
};
includeAllQtDirs=true;
buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394

6
pkgs/desktops/kde-4.3/bindings/default.nix
View File

@ -5,10 +5,10 @@
# some bindings are even broken.
stdenv.mkDerivation {
name = "kdebindings-4.3.3";
name = "kdebindings-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdebindings-4.3.3.tar.bz2;
sha1 = "8101wqhahlmrrpdr4f32p5iqsgawzp9l";
url = mirror://kde/stable/4.3.4/src/kdebindings-4.3.4.tar.bz2;
sha1 = "0c7bf45bd3d81bf6aa1d2b085c17b4ce925c656b";
};
builder = ./builder.sh;
includeAllQtDirs=true;

6
pkgs/desktops/kde-4.3/edu/default.nix
View File

@ -3,10 +3,10 @@
, kdelibs, automoc4, phonon, eigen}:
stdenv.mkDerivation {
name = "kdeedu-4.3.3";
name = "kdeedu-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdeedu-4.3.3.tar.bz2;
sha1 = "d1cmnmmq1m9yqh694xipy1s8wnkviqgx";
url = mirror://kde/stable/4.3.4/src/kdeedu-4.3.4.tar.bz2;
sha1 = "ee646d57db11b761d8da33fc03c596c8f531eb9d";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet

6
pkgs/desktops/kde-4.3/extragear/kdesvn/default.nix
View File

@ -2,10 +2,10 @@
, kdelibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdesvn-1.4.0";
name = "kdesvn-1.4.1";
src = fetchurl {
url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.4.0.tar.bz2;
sha256 = "0rb213jybs9mgiwvphk8dhryz6q9m6qvxl1m7bqwzars48cspgl0";
url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.4.1.tar.bz2;
sha256 = "1xaankj3zl1wxm1zf9dayb9qwnp9s5xx964p83w7pcsir4h5959z";
};
includeAllQtDirs=true;
builder = ./builder.sh;

6
pkgs/desktops/kde-4.3/extragear/koffice/default.nix
View File

@ -3,10 +3,10 @@
, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}:
stdenv.mkDerivation {
name = "koffice-2.0.2";
name = "koffice-2.1.0";
src = fetchurl {
url = mirror://kde/stable/koffice-2.0.2/src/koffice-2.0.2.tar.bz2;
sha256 = "1nvpj8viw7ijjnz1pg6kdb21srsm13vh6c1v7s01hn4xrv9zwyic";
url = mirror://kde/stable/koffice-2.1.0/koffice-2.1.0.tar.bz2;
sha256 = "1jdc2rvj5xqd66d152zmjz2psq44kbraqpl0fq05yjg2wz8kdsln";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

6
pkgs/desktops/kde-4.3/extragear/konversation/default.nix
View File

@ -2,10 +2,10 @@
, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
stdenv.mkDerivation {
name = "konversation";
name = "konversation-1.2.1";
src = fetchurl {
url = mirror://kde/stable/konversation/1.2/src/konversation-1.2.tar.bz2;
sha256 = "16plhy7m8sch52a8hyzsqgc10wj4lgygqbwicfssbad7l6j2a935";
url = mirror://kde/stable/konversation/1.2.1/src/konversation-1.2.1.tar.bz2;
sha256 = "1rx4xgw14cfzkxghgn80np8i2ndq26sbdvv96g46r0s14qkdyq8w";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

6
pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
View File

@ -2,10 +2,10 @@
kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}:
stdenv.mkDerivation {
name = "ktorrent-3.2.4";
name = "ktorrent-3.3.1";
src = fetchurl {
url = http://ktorrent.org/downloads/3.2.4/ktorrent-3.2.4.tar.bz2;
sha256 = "1h06fwjykmk4sxjfsic0a42wfh4wwaa9z6a4470vwi5fyx2apxbn";
url = http://ktorrent.org/downloads/3.3.1/ktorrent-3.3.1.tar.bz2;
sha256 = "15cyq9bixism15qb3g196ga47q6iyw68sizclcn43nw91g0xl9r1";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

6
pkgs/desktops/kde-4.3/games/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}:
stdenv.mkDerivation {
name = "kdegames-4.3.3";
name = "kdegames-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdegames-4.3.3.tar.bz2;
sha1 = "2xy5wvk51rxbifwp28rgby776kwq93vz";
url = mirror://kde/stable/4.3.4/src/kdegames-4.3.4.tar.bz2;
sha1 = "33ea8ec476b1557a55c90c071bd462e5ceb7c52b";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ];

6
pkgs/desktops/kde-4.3/graphics/default.nix
View File

@ -3,10 +3,10 @@
, kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
stdenv.mkDerivation {
name = "kdegraphics-4.3.3";
name = "kdegraphics-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdegraphics-4.3.3.tar.bz2;
sha1 = "8krz6r99lnkdj1ywwhwvykyzdrd1blzk";
url = mirror://kde/stable/4.3.4/src/kdegraphics-4.3.4.tar.bz2;
sha1 = "bb32171b0d562d5698d4f0526be2b069e99f7448";
};
includeAllQtDirs=true;
buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib

238
pkgs/desktops/kde-4.3/l10n/default.nix
View File

@ -4,7 +4,7 @@
let
deriv = attr : stdenv.mkDerivation {
name = "kde-l10n-${attr.lang}-4.3.3";
name = "kde-l10n-${attr.lang}-4.3.4";
src = fetchurl {
url = attr.url;
sha256 = attr.sha256;
@ -24,356 +24,356 @@ in
ar = deriv {
lang = "ar";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ar-4.3.3.tar.bz2";
sha256 = "0js4w2lgrffszg8xvgvvjd0ql41s8bfd4k8arzg0ym4rinsghb6f";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ar-4.3.4.tar.bz2";
sha256 = "0dgk97j0qv8qxfhiwv0cwqbmfgnxn0k7znm7vd40ngblbp4k75y1";
};
bg = deriv {
lang = "bg";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-bg-4.3.3.tar.bz2";
sha256 = "1ys5f4rsvkm8f8dzyfka51rpkj02qrd3j4mcccsp963mgw9s12lk";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-bg-4.3.4.tar.bz2";
sha256 = "13mshqlskqndfm20s07978300p5ik432krhdk9k5a049f7w543dp";
};
bn_IN = deriv {
lang = "bn_IN";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-bn_IN-4.3.3.tar.bz2";
sha256 = "1mf260w44i9267rdvvi26lj7qhywndhm66sbrsgic06gibmb3g45";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-bn_IN-4.3.4.tar.bz2";
sha256 = "0zh7zra2si0z966r8qq41m3g4l9864acfg70hjbgr4bhvhn642zd";
};
ca = deriv {
lang = "ca";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ca-4.3.3.tar.bz2";
sha256 = "0xqdiv3sydbmncfh2sh53dqqhi205mdbq6iphinbzsr09xjcrqr3";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ca-4.3.4.tar.bz2";
sha256 = "1ry403z9qgimcj8nilznr0f7bkviybcpwm3clww13na74ngmz4a1";
};
cs = deriv {
lang = "cs";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-cs-4.3.3.tar.bz2";
sha256 = "0wb2ld2shjvyglajqip0s91q8y9sry6a3jwmr3g221gh6xz49dil";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-cs-4.3.4.tar.bz2";
sha256 = "1gd0rl0c59fawd7s20nrmnc5vr915aqhz7f57wrgpw2kxgva33nk";
};
csb = deriv {
lang = "csb";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-csb-4.3.3.tar.bz2";
sha256 = "1q65365mqsrjg7j59s1dkx03m4hmwq45aa0yzkw5np8sgvf7f65z";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-csb-4.3.4.tar.bz2";
sha256 = "02b8341cpgzbp4ijnzs8bkvynz9mhz18ma5yk66i9q0js6rk8bn2";
};
da = deriv {
lang = "da";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-da-4.3.3.tar.bz2";
sha256 = "0s649zxpqcigpj3yar48liaf5jcmb3m2q0azfm9cwgkvmz9gd1nz";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-da-4.3.4.tar.bz2";
sha256 = "1r7kn5qdcx64p0rlj9mb3011hk5rvrqzvr8k6nrfsfmw2h7mnjym";
};
de = deriv {
lang = "de";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-de-4.3.3.tar.bz2";
sha256 = "1p4lz80myhrq7gq1gmpfhlw9i32ca0s4z7gni9rlsv5dhsbpmcsf";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-de-4.3.4.tar.bz2";
sha256 = "0nclr4chx2ir036fjhs7zp2l1k43vn11lww7338v2nn9mcwfdyn3";
};
el = deriv {
lang = "el";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-el-4.3.3.tar.bz2";
sha256 = "01ym4yxdh2xghwc6mngs0iyw8idvmv3c4k6lkf9hasbkcr77s0dn";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-el-4.3.4.tar.bz2";
sha256 = "104ycjq95zhkv2by36lndqc2w2shn3dp386ir5wj52x4f26j1zd0";
};
en_GB = deriv {
lang = "en_GB";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-en_GB-4.3.3.tar.bz2";
sha256 = "074is29a0h69ypk82s051f037aqcpflnaapwlccrz24x2hncw3zb";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-en_GB-4.3.4.tar.bz2";
sha256 = "044s656x90xdgp14cddsz499bxfhsscnngvx4q13pnxrd2gbr2xj";
};
es = deriv {
lang = "es";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-es-4.3.3.tar.bz2";
sha256 = "1ygx2cyvgfz09i8x9wpynlaisvxv70n5p9r0hq72yypjxd1nqixb";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-es-4.3.4.tar.bz2";
sha256 = "0fx40sx0cqjashlj9z9da2jndwbg6s36njsgsx6kjfd90p23snvi";
};
et = deriv {
lang = "et";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-et-4.3.3.tar.bz2";
sha256 = "0yxvq1ggbqvrm45ljriibnz9s2zarszyk8wxjb1zsxlqs34ym02h";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-et-4.3.4.tar.bz2";
sha256 = "08s9y9h9qx2ahz1chmlcycldmf543c0kc8wfrsryrf1iaajdma0r";
};
eu = deriv {
lang = "eu";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-eu-4.3.3.tar.bz2";
sha256 = "1x6r31s0zyxi5sdnfr5ldbvhfdbm5fcgfqxxz8x6sfm4zrpc8mhv";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-eu-4.3.4.tar.bz2";
sha256 = "1q0vjvbc6lywpqzizi61cz91scrkjplxjp2jywyi6dnrv475w6b9";
};
fi = deriv {
lang = "fi";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-fi-4.3.3.tar.bz2";
sha256 = "0wky41anl3p3ml0rccg9153s442mxncwzp784qpczlczrihg7sly";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fi-4.3.4.tar.bz2";
sha256 = "1z2jmcmr46f0a5hins4hkj843r3bd6azykiz6nwwkgk7png21axm";
};
fr = deriv {
lang = "fr";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-fr-4.3.3.tar.bz2";
sha256 = "0mvsgyrf15yr4g24hfmiis54i68byyq35x09j0hrsn79z2wszgba";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fr-4.3.4.tar.bz2";
sha256 = "07fi4c7k9h69m5jacp0vlyd268gxljh2j3hj9fk5vka4333rp2x0";
};
fy = deriv {
lang = "fy";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-fy-4.3.3.tar.bz2";
sha256 = "1c03w0ac9q3fxgjfyw1iq5lcq0n6hr8k8mpn7b3zr9rrvfdsldx5";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fy-4.3.4.tar.bz2";
sha256 = "1l22bjccdxnsqgsns3nbh5wwplacbjgxhw72lvysnc3c7kkjm789";
};
ga = deriv {
lang = "ga";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ga-4.3.3.tar.bz2";
sha256 = "16032253hs5ikhi6f8j1l4lyy739kpks8qqmh205xxcx5fha9xjh";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ga-4.3.4.tar.bz2";
sha256 = "1kkz7gsyfpzrvy7pg2gajw24jybr8crk5yighp9mqa337cqjma6z";
};
gl = deriv {
lang = "gl";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-gl-4.3.3.tar.bz2";
sha256 = "0d6j4ln5xz1m4r67ldc7byi4yd0p2gbwq7xpms36yrpyg1zx7r93";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-gl-4.3.4.tar.bz2";
sha256 = "161dh3w3jwrlzk83is3v25nvaxi5441n3q3bp6kg1fc1jqsinyr0";
};
gu = deriv {
lang = "gu";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-gu-4.3.3.tar.bz2";
sha256 = "12cgplf9z0lsqslnwjbcbzkkz4g37n6h579gdcj3cs8gfmxja1mj";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-gu-4.3.4.tar.bz2";
sha256 = "1i69ma0cw85rf0gxa1wzlbmdhqm3lzyk1br4m4m6iz68am61pkdr";
};
he = deriv {
lang = "he";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-he-4.3.3.tar.bz2";
sha256 = "0izvz3zry36ypbqn34gx68z3hwik0dmykhbgnhm0xhcapjjhq95r";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-he-4.3.4.tar.bz2";
sha256 = "0353x14wmh9r1q46vcn2m9sp6fvrfzkj55v0kh0xbh4jdprw8cpn";
};
hi = deriv {
lang = "hi";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-hi-4.3.3.tar.bz2";
sha256 = "1pqplq1b6vv60z6nwigiymh2n7gwhwhpjnkq84dml7p1jxabwckj";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hi-4.3.4.tar.bz2";
sha256 = "1wing32i5f12qn3w6f4zlf7dwvarf8wwzxxvb1jjld16m7vxkksx";
};
hne = deriv {
lang = "hne";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-hne-4.3.3.tar.bz2";
sha256 = "17hkpx4adb3j7vzfij5dc3imqxgd76gpa3vknwmj1d7znzhf484c";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hne-4.3.4.tar.bz2";
sha256 = "149nahrhybv8cyxdqwdj7p787vsh902yr73r7a0l1sjblisrx84g";
};
hr = deriv {
lang = "hr";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-hr-4.3.3.tar.bz2";
sha256 = "0kciza7zbxv6gr0hk1hpg0fcm5v0anw3p3bzsmaj8svsymkvqkmr";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hr-4.3.4.tar.bz2";
sha256 = "0wg2qahvz8lanv4kqp5128paja7sai68prbincfgfwbi4xdbkfnq";
};
hu = deriv {
lang = "hu";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-hu-4.3.3.tar.bz2";
sha256 = "1m290f1aw8rq2nmybi2dd5xbdyv50d5ma29jjc55i7cqjbh9vn9a";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hu-4.3.4.tar.bz2";
sha256 = "05vkqxrw3rxb2brm3ggb600al1ggrv739qdfc1m659m1qxhnxgjw";
};
is = deriv {
lang = "is";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-is-4.3.3.tar.bz2";
sha256 = "1pjbi3a7hskgg3wd43nfddjjhnwy4r824zl6gdxrc42x8j8gh5r0";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-is-4.3.4.tar.bz2";
sha256 = "0212ymk3h58bmhaccprn5wfs65fhcpaq73dnqp3v0xmgkfnz6dhy";
};
it = deriv {
lang = "it";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-it-4.3.3.tar.bz2";
sha256 = "1p9njh83k0zdczwyzilxfv50nw31mpdh466yid5y9973b6chbfzb";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-it-4.3.4.tar.bz2";
sha256 = "0h72ln0jwizxg86kwk6m1zi1wws14prv9xvlzhbmyvcb0sa98v75";
};
ja = deriv {
lang = "ja";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ja-4.3.3.tar.bz2";
sha256 = "07p3rg1iysgrpz13ac81gvqi26syyfwc0568gr3plk40xnkvs0bl";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ja-4.3.4.tar.bz2";
sha256 = "0nw4ybl429y3d9d58y13gyaxzrkrvjgxz4vn68ryn8vlb8d0sb6j";
};
kk = deriv {
lang = "kk";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-kk-4.3.3.tar.bz2";
sha256 = "0bpr89798kfs9g59pq6yl5zvzdranlk6kzxpiqxzdrw65rj1r2fy";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-kk-4.3.4.tar.bz2";
sha256 = "01j28srx3vbgs8l0vv30fx3ki05i18ddf6sg2jqdli4ylg517l66";
};
km = deriv {
lang = "km";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-km-4.3.3.tar.bz2";
sha256 = "0niifkgrqqwdaq1fcgck8v9lj8x8facp3zpxjzmf04cbr70wjy3b";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-km-4.3.4.tar.bz2";
sha256 = "1zdbvgn1lz9lyzrkhjf05k7n1cpdjwzv1v62aja7h438qn8scqnh";
};
kn = deriv {
lang = "kn";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-kn-4.3.3.tar.bz2";
sha256 = "0f9ksq1540bmjy57b2civ44javniqn4xvkmg8411kwh50ccx7qby";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-kn-4.3.4.tar.bz2";
sha256 = "193ibxndpgl400djlggwsy6h3mjdkhmvmc5dalh9h2k3fz9fdswn";
};
ko = deriv {
lang = "ko";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ko-4.3.3.tar.bz2";
sha256 = "03n4ifhh5ki9i9dhdzzqypg7iz7h7fdnanbv76v3nhklbkdw5aap";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ko-4.3.4.tar.bz2";
sha256 = "1888mwknd4l8rcs01w1mi7147cl9phylxjpcsmg3gda61pq12035";
};
ku = deriv {
lang = "ku";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ku-4.3.3.tar.bz2";
sha256 = "0mbjy88m57sljw12lman98bb60iv528qw223hl2rwi5kpjbzbf4a";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ku-4.3.4.tar.bz2";
sha256 = "1w70dc75k6s8mpn1fraz1znknfz6cpdbb96frh611fz3r3hzgaix";
};
lt = deriv {
lang = "lt";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-lt-4.3.3.tar.bz2";
sha256 = "0xwbqla7vqnbmpj0pk3p6lx0isfcyqximxzrh28pajgjrdq9q441";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-lt-4.3.4.tar.bz2";
sha256 = "098cw3hz9w0kb2b33p5qwxli4z38qw4rcby4j75hwm66l6fw9iqk";
};
lv = deriv {
lang = "lv";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-lv-4.3.3.tar.bz2";
sha256 = "16jf1ci6v1n8b7sl7dadv5j3axjmicdrfm1d390bs1yqgv43g26a";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-lv-4.3.4.tar.bz2";
sha256 = "08rfi68mz8iarmscvnn11b1gyr7k2j0gyhs7673gnk5m3avmz2ab";
};
mai = deriv {
lang = "mai";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-mai-4.3.3.tar.bz2";
sha256 = "1mir9yxqb6j52aippjhz2s8z4ya8gnram8bw09bfxlg90ws2q09c";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mai-4.3.4.tar.bz2";
sha256 = "0pkad1rchrra15jjij4r76xy26zkmshm80amqfn8ba9nabxr7nxa";
};
mk = deriv {
lang = "mk";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-mk-4.3.3.tar.bz2";
sha256 = "0j4h3xaqsl3v7j5lf8n49w5i0n2x37mg5vpipknd72h57k6qqqmd";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mk-4.3.4.tar.bz2";
sha256 = "041iw3754j5x6b02yzk6zyy0fggmx1lq1kgv1d3g5nxv2a4dp311";
};
ml = deriv {
lang = "ml";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ml-4.3.3.tar.bz2";
sha256 = "04rpijjnbaj5267adcf7l85i1m5rdn10712vhmdfscsy7mikdlwv";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ml-4.3.4.tar.bz2";
sha256 = "0y6050gb5vrlpbimackzzpsv08j8zxp67cg2gdn4x0v31xpvpxfr";
};
mr = deriv {
lang = "mr";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-mr-4.3.3.tar.bz2";
sha256 = "0mdp2rls0zykdb9ldqqk1413f70amvbla5a06gqan47js8smmywb";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mr-4.3.4.tar.bz2";
sha256 = "08asxp8g0qijla04m29lb16544gdibk6d4vf92zmcsff04a1wis2";
};
nb = deriv {
lang = "nb";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-nb-4.3.3.tar.bz2";
sha256 = "00lqjp5sg0dqw2c9cxqrx4y3vk3v4k713xj7nc4qkm172yrsngqb";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nb-4.3.4.tar.bz2";
sha256 = "179p6ha1py6j9rinzknqqcr8p062x3g9jz2m160vklsc780y1whw";
};
nds = deriv {
lang = "nds";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-nds-4.3.3.tar.bz2";
sha256 = "11mjzs49zy6w45z22jlcj3kg0xvzrqfqgcm2l037hqs04djlgcck";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nds-4.3.4.tar.bz2";
sha256 = "144rsvkw2qr4cd8zh0sxpvnc3rh17i23l3pxhpk65ldq6b7xnybb";
};
nl = deriv {
lang = "nl";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-nl-4.3.3.tar.bz2";
sha256 = "15rfawzmzmvamvi1jnlzn4whksv595nhjajlfav6ps7wfphiwa7i";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nl-4.3.4.tar.bz2";
sha256 = "15gnqpg7blc3aj2pdj5pswmimlyhic18jqrlgjk3xsxq4744r4wc";
};
nn = deriv {
lang = "nn";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-nn-4.3.3.tar.bz2";
sha256 = "0pfa6ssgyv0b9vaggsi8bx7p0y1c8a99mdy5ngpd22qc3j885vnf";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nn-4.3.4.tar.bz2";
sha256 = "0414fmkm19n5bjvbdcxh9vkn0hmpk3w2r60lvm7gmpi8zdak0p2p";
};
pa = deriv {
lang = "pa";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-pa-4.3.3.tar.bz2";
sha256 = "08l6mbcmsck00g1p8mpjmsrx5yjnrccpx77r2vshi07bp5lj6d2l";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pa-4.3.4.tar.bz2";
sha256 = "0974jsd3l70ygipzf0fv5zvs9ykyn4c6dnm9gf0krdzxskrimfxp";
};
pl = deriv {
lang = "pl";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-pl-4.3.3.tar.bz2";
sha256 = "05nfkc4zg9nafms1v325vk05ndcgx27j8yxgds2radilzdqay6pb";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pl-4.3.4.tar.bz2";
sha256 = "0f5hr7mff4a8hpwapz67wjlg02jwdnainaa8jk2j64lwzbswybyr";
};
pt = deriv {
lang = "pt";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-pt-4.3.3.tar.bz2";
sha256 = "1nv7k5091617xqnxzn6ssg6sqf822vygv707b02dragmp5l85s0y";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pt-4.3.4.tar.bz2";
sha256 = "07bclil0lhr59faqr8a59bfmvsdjla0pg0x0a4qqmnqhhan1ki3p";
};
pt_BR = deriv {
lang = "pt_BR";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-pt_BR-4.3.3.tar.bz2";
sha256 = "08y1482w8bjzwzad5b7igk4b9gsm1qnyqrg4pjjnii9886rgj37x";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pt_BR-4.3.4.tar.bz2";
sha256 = "03y3fk1b2yzp6jbaic76y06522wbq3lzxf1pbc5xi22q3gw14dls";
};
ro = deriv {
lang = "ro";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ro-4.3.3.tar.bz2";
sha256 = "12khmpq2w3zrpd45l10kr1k5vp73i722kqqf0zkvyc6plvjbcipg";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ro-4.3.4.tar.bz2";
sha256 = "0nqdl8jbr29bjdvxdppbmjjgamh68gcg38j8gsh5zp6ak1ac2abc";
};
ru = deriv {
lang = "ru";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ru-4.3.3.tar.bz2";
sha256 = "0bjf0d4ss7kvvf0a6d6d5z9sdazfqbvrz6sx9w43dkx6gj4hnbzz";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ru-4.3.4.tar.bz2";
sha256 = "0n5g26p98dshngv35izfc826ahirqppx4ig6ycj9pfza5aakajah";
};
sk = deriv {
lang = "sk";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-sk-4.3.3.tar.bz2";
sha256 = "0r19i9dwlg46zl22ydz6yjp7rndmldv9cay91ch2fggkwd28m8mm";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sk-4.3.4.tar.bz2";
sha256 = "0jwh0sx09hxz922snak4jxajcl1p3rciycwqw4fgmk6fx5ra7s48";
};
sl = deriv {
lang = "sl";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-sl-4.3.3.tar.bz2";
sha256 = "0y4rp69wpig9syim5w7xwbif70mqiibz4l3sdzspik4nvx87cn0q";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sl-4.3.4.tar.bz2";
sha256 = "063lbb2g5zpg3330hz749m5kh9hx8xrf7ifj95xjkbkh1sa0g2dm";
};
sr = deriv {
lang = "sr";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-sr-4.3.3.tar.bz2";
sha256 = "1krw9dh719d3wa1zzlpynfpgpl41i1sr2q9gam2cmg56vn89p9pn";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sr-4.3.4.tar.bz2";
sha256 = "121vdrzk9fm30s8q4m5b7vd3lv3n4azzx7dm62qx84qyx9zs8r4y";
};
sv = deriv {
lang = "sv";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-sv-4.3.3.tar.bz2";
sha256 = "12kcf9nj98r3vpddgd5ywimxm316yf9f0n94jd9bvcnjz7zw8m0d";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sv-4.3.4.tar.bz2";
sha256 = "192yw9vjwv9s7bdmcndqq0dx0g6djpjbyiq9skpzpq21zphgf0n1";
};
tg = deriv {
lang = "tg";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-tg-4.3.3.tar.bz2";
sha256 = "1i16l33x1hxdhrmacp5swcm2ha05xhb8aqbm7qpkxp489ffcvyr5";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-tg-4.3.4.tar.bz2";
sha256 = "0q90k5fk6f41baiyxl3055y6b55nx7plq7hzlkp1h2d60q2d8yhs";
};
th = deriv {
lang = "th";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-th-4.3.3.tar.bz2";
sha256 = "0y642apxgzhx74kshsdx4insfzw4na38xvskhrhs0i70wzvs1h6z";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-th-4.3.4.tar.bz2";
sha256 = "00jc6dkhpcxc95jkg7v1fsgn2ymk38mqs0h8x1an23jgs5sbl43r";
};
tr = deriv {
lang = "tr";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-tr-4.3.3.tar.bz2";
sha256 = "0canxvscyazqvm1wxr3wckj7kp03zcmly29liylp3i7s6f6pymws";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-tr-4.3.4.tar.bz2";
sha256 = "1igr4fw1h3617kyqhxdgg798k1gdiwxz5g2s59g281vm16r3rg01";
};
uk = deriv {
lang = "uk";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-uk-4.3.3.tar.bz2";
sha256 = "1i9klbr74g85rpxlflcp3wz9y4y4aydbx9gjbj99flgx4fqq9x9w";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-uk-4.3.4.tar.bz2";
sha256 = "0sir7ayb2ydrhl5dbq9ni10l2w45blh9pdd7bpfxmgqz7n1kylp8";
};
wa = deriv {
lang = "wa";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-wa-4.3.3.tar.bz2";
sha256 = "1p9v4nsavh0rqhwy90zpx4anj3ifi02kqngq6s0ppzrgpck5d6qp";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-wa-4.3.4.tar.bz2";
sha256 = "0ip3idiq6sfxzgg872sjw9ra1sy137q9m47ik3fdfcxgfwv7bj1r";
};
zh_CN = deriv {
lang = "zh_CN";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-zh_CN-4.3.3.tar.bz2";
sha256 = "1jq9qgsdazb1mid09xlm7gql4r8cwpd42cd733sfw942czhyvx42";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-zh_CN-4.3.4.tar.bz2";
sha256 = "0c8m6zj3pzr0pkmb6m3h6a5n274s2v8wpp7gfqkxrkardq0scwxb";
};
zh_TW = deriv {
lang = "zh_TW";
url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-zh_TW-4.3.3.tar.bz2";
sha256 = "072x1lmdvxvs7vdn37zfgf78xpd1iv4imw6rywp9zhv15dpy9x4r";
url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-zh_TW-4.3.4.tar.bz2";
sha256 = "1xiav7nhvkfpizih845z1cr8avkphvszd4j8i547lcb8xnvvk0bw";
};
}

4
pkgs/desktops/kde-4.3/l10n/generate-expr-from-tarballs.pl
View File

@ -2,7 +2,7 @@
# Typical command to generate the list of tarballs:
# export i="mirror://kde/stable/4.3.3/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list
# export i="mirror://kde/stable/4.3.4/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list
# manually update extra.list
# then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
@ -63,7 +63,7 @@ print OUT <<EOF;
let
deriv = attr : stdenv.mkDerivation {
name = "kde-l10n-\${attr.lang}-4.3.3";
name = "kde-l10n-\${attr.lang}-4.3.4";
src = fetchurl {
url = attr.url;
sha256 = attr.sha256;

6
pkgs/desktops/kde-4.3/libs-experimental/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, automoc4, kdelibs, phonon}:
stdenv.mkDerivation {
name = "kdelibs-experimental-4.3.3";
name = "kdelibs-experimental-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdelibs-experimental-4.3.3.tar.bz2;
sha1 = "5fhzsmpmhpzn923rg25dk9siqpmqzab8";
url = mirror://kde/stable/4.3.4/src/kdelibs-experimental-4.3.4.tar.bz2;
sha1 = "43e19c44c3cdc1049c9ee9aca2e2f83a48ffe8bd";
};
builder = ./builder.sh;
buildInputs = [ cmake qt4 perl automoc4 kdelibs phonon ];

6
pkgs/desktops/kde-4.3/libs/default.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation {
name = "kdelibs-4.3.3";
name = "kdelibs-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdelibs-4.3.3.tar.bz2;
sha1 = "8pgrd83zsl6m83ysm4slii07w215kdc9";
url = mirror://kde/stable/4.3.4/src/kdelibs-4.3.4.tar.bz2;
sha1 = "1af2d185c88898b71f36b57f033e3a6d9839ab3d";
};
includeAllQtDirs = true;

6
pkgs/desktops/kde-4.3/multimedia/default.nix
View File

@ -2,10 +2,10 @@
, kdelibs, kdelibs_experimental, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdemultimedia-4.3.3";
name = "kdemultimedia-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdemultimedia-4.3.3.tar.bz2;
sha1 = "g6dfpv3mfpmgmg8sv7cazyhrl6zmw8fl";
url = mirror://kde/stable/4.3.4/src/kdemultimedia-4.3.4.tar.bz2;
sha1 = "cf8f2696267ec682ee48fbb0f6171d9e9f7aa4b3";
};
includeAllQtDirs=true;
buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame

6
pkgs/desktops/kde-4.3/network/default.nix
View File

@ -4,10 +4,10 @@
, kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
stdenv.mkDerivation {
name = "kdenetwork-4.3.3";
name = "kdenetwork-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdenetwork-4.3.3.tar.bz2;
sha1 = "1ky5w8cm7pakfw1n9gkrg999wv7z0hmq";
url = mirror://kde/stable/4.3.4/src/kdenetwork-4.3.4.tar.bz2;
sha1 = "e066c3642d254e1e8213ef511546e960c5658596";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

6
pkgs/desktops/kde-4.3/oxygen-icons/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, lib, cmake}:
stdenv.mkDerivation {
name = "oxygen-icons-4.3.3";
name = "oxygen-icons-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/oxygen-icons-4.3.3.tar.bz2;
sha1 = "b93d8q30ymrpgsj6f5n4ryip5cnf15x8";
url = mirror://kde/stable/4.3.4/src/oxygen-icons-4.3.4.tar.bz2;
sha1 = "9905f6b5a47db85c05f7387a75b6ae0e0fdd756e";
};
buildInputs = [ cmake ];
meta = {

6
pkgs/desktops/kde-4.3/pim-runtime/default.nix
View File

@ -3,10 +3,10 @@
, automoc4, phonon, akonadi, soprano, strigi}:
stdenv.mkDerivation {
name = "kdepim-runtime-4.3.3";
name = "kdepim-runtime-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdepim-runtime-4.3.3.tar.bz2;
sha1 = "cqgavixw2hljdx2afxdrg9k4zipp44rc";
url = mirror://kde/stable/4.3.4/src/kdepim-runtime-4.3.4.tar.bz2;
sha1 = "bef70088aec4355f5bb8c0375082388eaa3d4b26";
};
buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
kdelibs kdelibs_experimental kdepimlibs

6
pkgs/desktops/kde-4.3/pim/default.nix
View File

@ -3,10 +3,10 @@
, kdelibs, kdelibs_experimental, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
stdenv.mkDerivation {
name = "kdepim-4.3.3";
name = "kdepim-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdepim-4.3.3.tar.bz2;
sha1 = "bj8fidfd8vw7xr9qanawjc96cmy7yild";
url = mirror://kde/stable/4.3.4/src/kdepim-4.3.4.tar.bz2;
sha1 = "3ddc34c2b0c96c0273431631ccf47a8b9b4289b3";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

6
pkgs/desktops/kde-4.3/pimlibs/default.nix
View File

@ -2,10 +2,10 @@
, kdelibs, automoc4, phonon, akonadi}:
stdenv.mkDerivation {
name = "kdepimlibs-4.3.3";
name = "kdepimlibs-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdepimlibs-4.3.3.tar.bz2;
sha1 = "wb93wdnjxgmrnsqr796q2g230xvyr053";
url = mirror://kde/stable/4.3.4/src/kdepimlibs-4.3.4.tar.bz2;
sha1 = "4f7cd55999e82f504e3766b6f360ae58b984d5cb";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap shared_mime_info

6
pkgs/desktops/kde-4.3/plasma-addons/default.nix
View File

@ -3,10 +3,10 @@
, automoc4, phonon, soprano, eigen, qimageblitz}:
stdenv.mkDerivation {
name = "kdeplasma-addons-4.3.3";
name = "kdeplasma-addons-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdeplasma-addons-4.3.3.tar.bz2;
sha1 = "y8pl322b45ki3nnhcqjwpysir69s2x64";
url = mirror://kde/stable/4.3.4/src/kdeplasma-addons-4.3.4.tar.bz2;
sha1 = "0b7af5db24fd194dd5fbbe1690d4ea62f597b891";
};
inherit kdebase_workspace;
builder = ./builder.sh;

6
pkgs/desktops/kde-4.3/sdk/default.nix
View File

@ -2,10 +2,10 @@
, kdelibs, kdepimlibs, automoc4, phonon, strigi}:
stdenv.mkDerivation {
name = "kdesdk-4.3.3";
name = "kdesdk-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdesdk-4.3.3.tar.bz2;
sha1 = "p8pgbiw7hca1qm4xk1a4i4jxjdijhn1v";
url = mirror://kde/stable/4.3.4/src/kdesdk-4.3.4.tar.bz2;
sha1 = "42b6209908f8baadc0add46153649ebdfa9a977a";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

8
pkgs/desktops/kde-4.3/toys/default.nix
View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdetoys-4.3.3";
name = "kdetoys-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdetoys-4.3.3.tar.bz2;
sha1 = "jqva7p33yzsi5ij3b1fq1yqxkcbikp39";
url = mirror://kde/stable/4.3.4/src/kdetoys-4.3.4.tar.bz2;
sha1 = "96f6121990590acd3fb5b8cae25ef98b5572733c";
};
includeAllQtDirs=true;
buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
meta = {
description = "KDE Games";
description = "KDE Toys";
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];

6
pkgs/desktops/kde-4.3/utils/default.nix
View File

@ -3,10 +3,10 @@
, kdelibs, kdelibs_experimental, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}:
stdenv.mkDerivation {
name = "kdeutils-4.3.3";
name = "kdeutils-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdeutils-4.3.3.tar.bz2;
sha1 = "ni41n5ma0v7yx6dp4z6lzbi0234xafxg";
url = mirror://kde/stable/4.3.4/src/kdeutils-4.3.4.tar.bz2;
sha1 = "2d5e26055e364af2df7459cdbc3aebdc3a8abdea";
};
builder = ./builder.sh;
inherit system_config_printer;

6
pkgs/desktops/kde-4.3/webdev/default.nix
View File

@ -2,10 +2,10 @@
, kdelibs, kdepimlibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdewebdev-4.3.3";
name = "kdewebdev-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.3/src/kdewebdev-4.3.3.tar.bz2;
sha1 = "zgavpqh263vjf9ay03291dmbkqm42kzq";
url = mirror://kde/stable/4.3.4/src/kdewebdev-4.3.4.tar.bz2;
sha1 = "697f0557c616497a6f80bbcac472ad6ddd687ae8";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;

127
pkgs/development/compilers/gcc-apple64/builder.sh Normal file
View File

@ -0,0 +1,127 @@
source $stdenv/setup
export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
mkdir $NIX_FIXINC_DUMMY
# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
# Thing.
export CPP="gcc -E"
if test "$noSysDirs" = "1"; then
# Figure out what extra flags to pass to the gcc compilers being
# generated to make sure that they use our glibc.
if test -e $NIX_GCC/nix-support/orig-glibc; then
glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
# Ugh. Copied from gcc-wrapper/builder.sh. We can't just
# source in $NIX_GCC/nix-support/add-flags, since that would
# cause *this* GCC to be linked against the *previous* GCC.
# Need some more modularity there.
extraCFlags="-B$glibc/lib -isystem $glibc/include"
extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \
-Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2"
# Oh, what a hack. I should be shot for this. In stage 1, we
# should link against the previous GCC, but not afterwards.
# Otherwise we retain a dependency. However, ld-wrapper,
# which adds the linker flags for the previous GCC, is also
# used in stage 2/3. We can prevent it from adding them by
# NIX_GLIBC_FLAGS_SET, but then gcc-wrapper will also not add
# them, thereby causing stage 1 to fail. So we use a trick to
# only set the flags in gcc-wrapper.
hook=$(pwd)/ld-wrapper-hook
echo "NIX_GLIBC_FLAGS_SET=1" > $hook
export NIX_LD_WRAPPER_START_HOOK=$hook
# Use *real* header files, otherwise a limits.h is generated
# that does not include Glibc's limits.h (notably missing
# SSIZE_MAX, which breaks the build).
export NIX_FIXINC_DUMMY=$glibc/include
fi
export NIX_EXTRA_CFLAGS=$extraCFlags
export NIX_EXTRA_LDFLAGS=$extraLDFlags
export CFLAGS=$extraCFlags
export CXXFLAGS=$extraCFlags
export LDFLAGS=$extraLDFlags
fi
preConfigure() {
# Determine the frontends to build.
langs="c"
if test -n "$langCC"; then
langs="$langs,c++"
fi
if test -n "$langF77"; then
langs="$langs,f95"
fi
# Perform the build in a different directory.
mkdir ../build
cd ../build
configureScript=../$sourceRoot/configure
configureFlags="--enable-languages=$langs --disable-libstdcxx-pch --disable-libstdcxx-debug --disable-multilib --with-gxx-include-dir=${STDCXX_INCDIR} --host=x86_64-apple-darwin10 --build=x86_64-apple-darwin10 --target=x86_64-apple-darwin10"
}
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.
find $out/include -name "*.gch" -exec rm -rf {} \; -prune
# Remove `fixincl' to prevent a retained dependency on the
# previous gcc.
rm -rf $out/libexec/gcc/*/*/install-tools
}
postUnpack() {
mv $libstdcxx/libstdcxx $sourceRoot/
}
STDCXX_INCDIR="$out/include/c++/4.2.1"
genericBuild
echo '-------------------------------------------------------------------------------------------------------------------------'
echo 'libstdcxx-16'
echo '-------------------------------------------------------------------------------------------------------------------------'
cd ..
pwd
preConfigure() {
# Perform the build in a different directory.
mkdir ../build_libstdcxx
cd ../build_libstdcxx
ln -s ../build/gcc gcc
configureScript=../$sourceRoot/libstdcxx/configure
configureFlags="--disable-libstdcxx-pch --disable-libstdcxx-debug --disable-multilib --with-gxx-include-dir=${STDCXX_INCDIR}"
}
unpackPhase () {
echo '-'
}
postInstall() {
echo '-'
echo "cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/"
cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/
}
patchPhase() {
echo '-'
}
genericBuild
ln -s $out/lib/x86_64 $out/lib64

30
pkgs/development/compilers/gcc-apple64/debug_list.patch Normal file
View File

@ -0,0 +1,30 @@
diff -rc libstdcxx-16-orig/libstdcxx/libstdc++-v3/src/Makefile.in libstdcxx-16/libstdcxx/libstdc++-v3/src/Makefile.in
*** libstdcxx-16-orig/libstdcxx/libstdc++-v3/src/Makefile.in Thu Jul 23 19:13:52 2009
--- libstdcxx-16/libstdcxx/libstdc++-v3/src/Makefile.in Thu Jul 23 19:38:23 2009
***************
*** 65,71 ****
numeric_members.lo time_members.lo
am__objects_2 = basic_file.lo c++locale.lo
am__objects_3 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \
! codecvt.lo complex_io.lo ctype.lo debug.lo debug_list.lo \
functexcept.lo globals_locale.lo globals_io.lo ios.lo \
ios_failure.lo ios_init.lo ios_locale.lo limits.lo list.lo \
locale.lo locale_init.lo locale_facets.lo localename.lo \
--- 65,71 ----
numeric_members.lo time_members.lo
am__objects_2 = basic_file.lo c++locale.lo
am__objects_3 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \
! codecvt.lo complex_io.lo ctype.lo debug.lo \
functexcept.lo globals_locale.lo globals_io.lo ios.lo \
ios_failure.lo ios_init.lo ios_locale.lo limits.lo list.lo \
locale.lo locale_init.lo locale_facets.lo localename.lo \
***************
*** 315,321 ****
complex_io.cc \
ctype.cc \
debug.cc \
- debug_list.cc \
functexcept.cc \
globals_locale.cc \
globals_io.cc \
--- 315,320 ----

30
pkgs/development/compilers/gcc-apple64/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, noSysDirs
, langC ? true, langCC ? true, langF77 ? false
, profiledCompiler ? false
, gmp ? null, mpfr ? null, bison ? null, flex ? null
}:
assert langC;
assert stdenv.isDarwin;
assert langF77 -> gmp != null;
stdenv.mkDerivation ({
name = "gcc-4.2.1-apple-5646";
builder = ./builder.sh;
src =
stdenv.lib.optional /*langC*/ true (fetchurl {
url = http://www.opensource.apple.com/tarballs/gcc/gcc-5646.tar.gz;
sha256 = "13jghyb098104kfym96iwwdvbj6snnws2c92h48lbd4fmyf1iv24";
}) ++
stdenv.lib.optional langCC (fetchurl {
url = http://www.opensource.apple.com/tarballs/libstdcxx/libstdcxx-39.tar.gz ;
sha256 = "1fy6j41rhxdsm19sib9wygjl5l54g8pm13c6y5x13f40mavw1mma";
}) ;
libstdcxx = "libstdcxx-39";
sourceRoot = "gcc-5646/";
patches =
[./pass-cxxcpp.patch ]
++ (if noSysDirs then [./no-sys-dirs.patch] else []);
inherit noSysDirs langC langCC langF77 profiledCompiler;
} // (if langF77 then {buildInputs = [gmp mpfr bison flex];} else {}))

126
pkgs/development/compilers/gcc-apple64/no-sys-dirs.patch Normal file
View File

@ -0,0 +1,126 @@
diff -ruN gcc-4.1.0/gcc/cppdefault.c gcc-4.1.0.new/gcc/cppdefault.c
--- gcc-4.1.0/gcc/cppdefault.c 2005-06-25 04:02:01.000000000 +0200
+++ gcc-4.1.0.new/gcc/cppdefault.c 2006-03-01 18:48:58.000000000 +0100
@@ -41,6 +41,10 @@
# undef CROSS_INCLUDE_DIR
#endif
+#undef LOCAL_INCLUDE_DIR
+#undef SYSTEM_INCLUDE_DIR
+#undef STANDARD_INCLUDE_DIR
+
const struct default_include cpp_include_defaults[]
#ifdef INCLUDE_DEFAULTS
= INCLUDE_DEFAULTS;
diff -ruN gcc-4.1.0/gcc/Makefile.in gcc-4.1.0.new/gcc/Makefile.in
--- gcc-4.1.0/gcc/Makefile.in 2006-02-16 16:23:24.000000000 +0100
+++ gcc-4.1.0.new/gcc/Makefile.in 2006-03-01 18:55:12.000000000 +0100
@@ -219,7 +219,7 @@
CPPFLAGS = @CPPFLAGS@
# These exists to be overridden by the x-* and t-* files, respectively.
-X_CFLAGS =
+X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS)
T_CFLAGS =
X_CPPFLAGS =
@@ -383,7 +383,11 @@
MD5_H = $(srcdir)/../include/md5.h
# Default native SYSTEM_HEADER_DIR, to be overridden by targets.
-NATIVE_SYSTEM_HEADER_DIR = /usr/include
+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
+# `fixinc' from fixing header files in /usr/include. However,
+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
+# it to some dummy directory.
+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
# Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
@@ -395,7 +399,7 @@
STMP_FIXINC = @STMP_FIXINC@
# Test to see whether <limits.h> exists in the system header files.
-LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
+LIMITS_H_TEST = true
# Directory for prefix to system directories, for
# each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
@@ -3002,7 +3006,7 @@
-DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
-DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
-DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
@TARGET_SYSTEM_ROOT_DEFINE@
diff -ruN gcc-4.1.0/libstdc++-v3/include/Makefile.in gcc-4.1.0.new/libstdc++-v3/include/Makefile.in
--- gcc-4.1.0/libstdc++-v3/include/Makefile.in 2006-01-10 18:14:00.000000000 +0100
+++ gcc-4.1.0.new/libstdc++-v3/include/Makefile.in 2006-03-01 18:57:32.000000000 +0100
@@ -1257,8 +1257,8 @@
if [ ! -d "${pch_output_builddir}" ]; then \
mkdir -p ${pch_output_builddir}; \
fi; \
- $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \
- $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch;
+ $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \
+ $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch;
# For robustness sake (in light of junk files or in-source
# configuration), copy from the build or source tree to the install
diff -ruN gcc-4.1.0/ltcf-cxx.sh gcc-4.1.0.new/ltcf-cxx.sh
--- gcc-4.1.0/ltcf-cxx.sh 2005-07-16 04:30:53.000000000 +0200
+++ gcc-4.1.0.new/ltcf-cxx.sh 2006-03-01 18:58:15.000000000 +0100
@@ -989,7 +989,7 @@
# the conftest object file.
pre_test_object_deps_done=no
- for p in `eval $output_verbose_link_cmd`; do
+ for p in `true`; do
case $p in
diff -ruN gcc-4.1.0/ltconfig gcc-4.1.0.new/ltconfig
--- gcc-4.1.0/ltconfig 2005-07-16 04:30:53.000000000 +0200
+++ gcc-4.1.0.new/ltconfig 2006-03-01 18:59:58.000000000 +0100
@@ -2322,6 +2322,11 @@
# A language-specific compiler.
CC=$CC
+# Ugly hack to get libmudflap (and possibly other libraries) to build.
+# Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag
+# to Glibc gets lost. Here we forcibly add it to any invocation.
+CC="\$CC $NIX_EXTRA_LDFLAGS"
+
# Is the compiler the GNU C compiler?
with_gcc=$with_gcc
diff -ruN gcc-4.1.0/Makefile.in gcc-4.1.0.new/Makefile.in
--- gcc-4.1.0/Makefile.in 2005-12-15 15:02:02.000000000 +0100
+++ gcc-4.1.0.new/Makefile.in 2006-03-01 19:41:04.000000000 +0100
@@ -286,7 +286,7 @@
WINDRES = @WINDRES@
CFLAGS = @CFLAGS@
-LDFLAGS =
+LDFLAGS = $(NIX_EXTRA_LDFLAGS)
LIBCFLAGS = $(CFLAGS)
CXXFLAGS = @CXXFLAGS@
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
@@ -329,12 +329,12 @@
# CFLAGS will be just -g. We want to ensure that TARGET libraries
# (which we know are built with gcc) are built with optimizations so
# prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(NIX_EXTRA_CFLAGS)
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(NIX_EXTRA_CFLAGS)
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-LDFLAGS_FOR_TARGET =
+LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS)
PICFLAG_FOR_TARGET =
# ------------------------------------

21
pkgs/development/compilers/gcc-apple64/pass-cxxcpp.patch Normal file
View File

@ -0,0 +1,21 @@
diff -rc gcc-orig/Makefile.in gcc-4.1.1/Makefile.in
*** gcc-orig/Makefile.in Wed Jun 21 13:40:23 2006
--- gcc-4.1.1/Makefile.in Wed Jun 21 14:19:44 2006
***************
*** 213,219 ****
RAW_CXX_TARGET_EXPORTS = \
$(BASE_TARGET_EXPORTS) \
CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
! CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
NORMAL_TARGET_EXPORTS = \
$(BASE_TARGET_EXPORTS) \
--- 213,220 ----
RAW_CXX_TARGET_EXPORTS = \
$(BASE_TARGET_EXPORTS) \
CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
! CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
! CXXCPP="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD) -E"; export CXXCPP;
NORMAL_TARGET_EXPORTS = \
$(BASE_TARGET_EXPORTS) \

49
pkgs/development/compilers/haxe/default.nix Normal file
View File

@ -0,0 +1,49 @@
args: with args;
stdenv.mkDerivation {
name = "haxe-cvs";
src = sourceByName "haxe";
buildInputs = [ocaml zlib makeWrapper];
inherit zlib;
buildPhase = ''
mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs
# strange setup. install.ml seems to co the same repo again into haxe directory!
tar xfz $src --strip-components=1 -C haxe
t(){ tar xfz $1 -C $2 --strip-components=2; }
t ${sourceByName "haxe_swflib"} ocaml/swflib
t ${sourceByName "haxe_extc"} ocaml/extc
t ${sourceByName "haxe_extlib_dev"} ocaml/extlib-dev
t ${sourceByName "haxe_xml_light"} ocaml/xml-light
t ${sourceByName "haxe_neko_include"} neko/libs
sed -e '/download();/d' \
-e "s@/usr/lib/@''${zlib}/lib/@g" \
doc/install.ml > install.ml
ocaml install.ml
'';
# probably rpath should be set properly
installPhase = ''
ensureDir $out/lib/haxe
cp -r bin $out/bin
wrapProgram "$out/bin/haxe" \
--set "LD_LIBRARY_PATH" $zlib/lib \
--set HAXE_LIBRARY_PATH "''${HAXE_LIBRARY_PATH}''${HAXE_LIBRARY_PATH:-:}:$out/lib/haxe/std:."
cp -r std $out/lib/haxe/
'';
meta = {
description = "programming language targeting JavaScript, Flash, NekVM, PHP, C++";
homepage = http://haxe.org;
license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
};
}

55
pkgs/development/compilers/neko/default.nix Normal file
View File

@ -0,0 +1,55 @@
args: with args;
let
inherit (args.composableDerivation) composableDerivation edf wwf;
libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk];
includes = lib.concatMapStrings (x: ''"${x}/include",'' ) libs + ''"{gkt}/include/gtk-2.0",'';
in
composableDerivation {} ( fixed : {
name = "neko-cvs";
src = sourceByName "neko";
# optionally remove apache mysql like gentoo does?
# they just remove libs/{apache,mod_neko}
buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs;
# apr should be in apacheHttpd propagatedBuildInputs
preConfigure = ''
sed -i \
-e 's@"/usr/include",@${includes}@' \
src/tools/install.neko
sed -i "s@/usr/local@$out@" Makefile
ensureDir $out/{bin,lib}
'';
inherit zlib;
meta = {
description = "Neko is an high-level dynamicly typed programming language";
homepage = http://nekovm.org;
license = ["GPLv2" ]; # -> docs/license.txt
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
};
# if stripping was done neko and nekoc would be the same. ?!
dontStrip = 1;
postInstall = ''
wrapProgram "$out/bin/nekoc" \
--set "LD_LIBRARY_PATH" $out/lib/neko \
wrapProgram "$out/bin/neko" \
--set "LD_LIBRARY_PATH" $out/lib/neko \
'';
# TODO make them optional and make them work
patches = [ ./disable-modules.patch ];
})

59
pkgs/development/compilers/neko/disable-modules.patch Normal file
View File

@ -0,0 +1,59 @@
diff --git a/src/tools/install.neko b/src/tools/install.neko
index 4cffa5e..5702add 100644
--- a/src/tools/install.neko
+++ b/src/tools/install.neko
@@ -39,26 +39,6 @@ buffer_string = $loader.loadprim("std@buffer_string",1);
// LIBS DATAS
libs = {
- mod_neko => {
- src => $array("../../vm/stats","mod_neko","cgi"),
- inc => "httpd.h",
- incname => "Apache 1.3.x"
- },
- mod_neko2 => {
- src => $array("../../vm/stats","mod_neko","cgi"),
- inc => $array("httpd.h","apr.h"),
- incname => "Apache 2.2.x",
- cflags => "-D_LARGEFILE64_SOURCE",
- realdir => "mod_neko",
- apache2 => true,
- },
- mysql => {
- src => $array("mysql"),
- inc => "mysql.h",
- incname => "MySQL 4.+"
- lib => "libmysqlclient_r.a",
- lparams => "-lz -lssl"
- },
mysql5 => {
src => $array("../common/sha1","../common/socket","my_proto/my_proto","my_proto/my_api","mysql"),
inc => $array(),
@@ -83,27 +63,6 @@ libs = {
incname => "Sqlite 3",
lparams => "-lsqlite3",
},
- ui => {
- src => $array("ui"),
- inc => switch system { "Mac" => "Carbon.h" default => "gtk/gtk.h" },
- incname => switch system { "Mac" => "Carbon" default => "GTK+2.0" },
- cflags => switch system { "Mac" => "" default => "`pkg-config --cflags gtk+-2.0`" },
- lparams => switch system { "Mac" => "-framework Carbon" default => "`pkg-config --libs gtk+-2.0` -lgthread-2.0" },
- },
- mod_tora => {
- src => $array("../common/socket","protocol","mod_tora"),
- inc => "httpd.h",
- incname => "Apache 1.3.x",
- cflags => "-I../common",
- },
- mod_tora2 => {
- src => $array("../common/socket","protocol","mod_tora"),
- inc => $array("httpd.h","apr.h"),
- incname => "Apache 2.2.x",
- cflags => "-D_LARGEFILE64_SOURCE -I../common",
- realdir => "mod_tora",
- apache2 => true,
- },
}
// PLATFORM

18
pkgs/development/compilers/strategoxt/0.17.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk}:
{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk, readline, ncurses}:
rec {
@ -43,6 +43,22 @@ rec {
};
};
strategoShell = stdenv.mkDerivation rec {
name = "stratego-shell-0.7";
src = fetchurl {
url = "ftp://ftp.strategoxt.org/pub/stratego/StrategoXT/strategoxt-0.17/stratego-shell-0.7.tar.gz";
sha256 = "0q21vks9gaw9v4rxz90wb0pxzb19l7gwi4nbjvk4zb1imdk7znck";
};
buildInputs = [pkgconfig aterm sdf strategoxt getopt readline ncurses];
meta = {
homepage = http://strategoxt.org/;
meta = "A language and toolset for program transformation";
};
};
javafront = stdenv.mkDerivation (rec {
name = "java-front-0.9";

29
pkgs/development/compilers/strategoxt/0.18.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk, makeStaticBinaries}:
{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk, makeStaticBinaries, readline, ncurses}:
rec {
@ -56,6 +56,21 @@ rec {
};
};
strategoShell = stdenv.mkDerivation rec {
name = "stratego-shell-0.7";
src = fetchurl {
url = "ftp://ftp.strategoxt.org/pub/stratego/StrategoXT/strategoxt-0.17/stratego-shell-0.7.tar.gz";
sha256 = "0q21vks9gaw9v4rxz90wb0pxzb19l7gwi4nbjvk4zb1imdk7znck";
};
buildInputs = [pkgconfig aterm sdf strategoxt getopt readline ncurses];
meta = {
homepage = http://strategoxt.org/;
meta = "A language and toolset for program transformation";
};
};
javafront = stdenv.mkDerivation (rec {
name = "java-front-0.9";
@ -78,6 +93,18 @@ rec {
} // ( if stdenv.system == "i686-cygwin" then { CFLAGS = "-O2"; } else {} ) ) ;
aspectjfront = stdenv.mkDerivation (rec {
name = "aspectj-front-0.2pre20035";
src = fetchurl {
url = "http://hydra.nixos.org/build/175690/download/1/aspectj-front-0.2pre20035.tar.gz";
sha256 = "48f6cda6f9f19436e9553e8d27e6bb42500d08370332e3ad214affb49851e58e";
};
buildInputs = [pkgconfig aterm sdf strategoxt javafront];
} // ( if stdenv.system == "i686-cygwin" then { CFLAGS = "-O2"; } else {} ) ) ;
dryad = stdenv.mkDerivation rec {
name = "dryad-0.2pre1835518355";

12
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -1,13 +1,17 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, libXinerama, libXft, libXpm, libSM, libXt }:
stdenv.mkDerivation {
name = "swi-prolog-5.6.51";
name = "swi-prolog-5.6.64";
src = fetchurl {
url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.51.tar.gz";
sha256 = "d43862606284e659ec3acba9cddea53b772f9afb67d12aa36391d26fe1a05ad8";
url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.64.tar.gz";
sha256 = "b0e70c3c02b7753ed440359746e7729d21c93e42689c1f0f32b148167b1b2c66";
};
buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama libXft libXpm libSM libXt zlib];
configureFlags = "--with-world --enable-gmp --enable-shared";
makeFlags = "world";
meta = {
homepage = http://www.swi-prolog.org/;
description = "A Prolog compiler and interpreter";

4
pkgs/development/interpreters/php_configurable/default.nix
View File

@ -1,4 +1,4 @@
let version = "5.2.9"; in
let version = "5.2.11"; in
args: with args;
@ -177,7 +177,7 @@ composableDerivation {} ( fixed : {
src = args.fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
md5 = "280d6cda7f72a4fc6de42fda21ac2db7";
md5 = "286bf34630f5643c25ebcedfec5e0a09";
name = "php-${version}.tar.bz2";
};

2
pkgs/development/interpreters/python/2.5/default.nix
View File

@ -82,4 +82,4 @@ stdenv.mkDerivation ( {
# - On Darwin, `python.exe' fails with "Bus Error".
platforms = stdenv.lib.platforms.allBut "i686-darwin";
};
} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )
} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )

2
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -89,4 +89,4 @@ stdenv.mkDerivation ( {
meta = {
platforms = stdenv.lib.platforms;
};
} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )
} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )

2
pkgs/development/libraries/cl-ppcre/default.nix
View File

@ -10,7 +10,7 @@ in
rec {
src = fetchurl {
url = http://weitz.de/files/cl-ppcre.tar.gz;
sha256 = "10698b7cmap4hk1lmlsvx2adcgsni5gly98qpj19fsdgy9ic7dhv";
sha256 = "1hrk051yi1qixy0vdig99cbv0v0p825acli65s08yz99b0pjz7m5";
};
inherit buildInputs;

25
pkgs/development/libraries/glefw/default.nix Normal file
View File

@ -0,0 +1,25 @@
args: with args;
stdenv.mkDerivation {
name = "glefw-2.6";
src = fetchurl {
url = http://prdownloads.sourceforge.net/glfw/glfw-2.6.tar.bz2;
sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv";
};
buildInputs = [mesa libX11 libXext];
buildPhase = ''
ensureDir $out
make x11-install PREFIX=$out
'';
installPhase=":";
meta = {
description = "multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
homepage = http://glfw.sourceforge.net/;
license = "zlib/libpng"; # http://www.opensource.org/licenses/zlib-license.php
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
};
}

12
pkgs/development/libraries/haskell/httpd-shed/default.nix Normal file
View File

@ -0,0 +1,12 @@
{cabal, network}:
cabal.mkDerivation (self : {
pname = "httpd-shed";
version = "0.4";
sha256 = "c03f784742bdc3053c7e867e587ee859a9a3adaa082d36bdb2ea69da1b02069f";
propagatedBuildInputs = [network];
meta = {
description = "A simple web-server with an interact style API";
};
})

6
pkgs/development/libraries/lcms/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "lcms-1.17";
name = "lcms-1.19";
src = fetchurl {
url = http://www.littlecms.com/lcms-1.17.tar.gz;
sha256 = "10s5s6b6r5mhf0g6l431l6fwymhjzqrvm7g214h7fmh9ngdb9wsy";
url = http://www.littlecms.com/lcms-1.19.tar.gz;
sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0";
};
meta = {

8
pkgs/development/libraries/neon/0.28.nix
View File

@ -9,12 +9,12 @@ assert compressionSupport -> zlib != null;
assert sslSupport -> openssl != null;
assert static || shared;
stdenv.mkDerivation {
name = "neon-0.28.3";
stdenv.mkDerivation rec {
name = "neon-0.28.6";
src = fetchurl {
url = http://www.webdav.org/neon/neon-0.28.3.tar.gz;
sha256 = "1hnd9wlbnfpppx6rvalhdkc1rf29afacl1m15z751g3h9hdybplh";
url = "http://www.webdav.org/neon/${name}.tar.gz";
sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6";
};
buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;

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

@ -1,13 +1,13 @@
{stdenv, fetchurl}:
let version = "4.8"; in
let version = "4.8.2"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "1znvc7fb4f6318kbn1w86p134r4cslij25sg7kcspfx746m89pm2";
sha256 = "1klv656ha97ysm4d0863sq2f1xyr5rijrh7k07gvdi7f88m1iv13";
};
preConfigure = "cd mozilla/nsprpub";

6
pkgs/development/libraries/nss/default.nix
View File

@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation {
name = "nss-3.12.3";
name = "nss-3.12.4";
src = fetchurl {
url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_RTM/src/nss-3.12.3.tar.bz2;
sha1 = "eeca14a37629287baa10eb7562a5fb927e9dd171";
url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/nss-3.12.4.tar.gz;
sha1 = "a152bf980f3a3dcf575c2d149fb279058ef2e757";
};
buildInputs = [nspr perl zlib];

20
pkgs/development/libraries/openssl/darwin-arch.patch
View File

@ -1,20 +1,24 @@
diff -rc openssl-0.9.8k-orig/Configure openssl-0.9.8k/Configure
*** openssl-0.9.8k-orig/Configure Tue Jun 30 15:45:36 2009
--- openssl-0.9.8k/Configure Tue Jun 30 15:46:15 2009
diff -rc openssl-0.9.8k/Configure openssl-0.9.8k-new/Configure
*** openssl-0.9.8k/Configure Mon Feb 16 09:44:22 2009
--- openssl-0.9.8k-new/Configure Fri Nov 27 13:41:58 2009
***************
*** 518,524 ****
*** 518,526 ****
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
! "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
! "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--- 518,524 ----
##### A/UX
--- 518,526 ----
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
! "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
! "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
! "darwin64-x86_64-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
##### A/UX

2
pkgs/development/libraries/openssl/default.nix
View File

@ -18,4 +18,4 @@ stdenv.mkDerivation (rec {
homepage = http://www.openssl.org/;
description = "A cryptographic library that implements the SSL and TLS protocols";
};
} // (if stdenv.system == "i686-darwin" then { patches = [ ./darwin-arch.patch ]; } else {}))
} // (if stdenv.isDarwin then { patches = [ ./darwin-arch.patch ]; } else {}))

11
pkgs/development/misc/bleeding-edge-repos/default.nix
View File

@ -90,5 +90,16 @@ args:
libdom = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/dom"; groups = "netsurf_group"; };
netsurf_haru = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libharu"; groups = "netsurf_group"; };
# haxe
haxe = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "haxe"; groups = "haxe_group"; };
haxe_swflib = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; };
haxe_extc = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; };
haxe_extlib_dev = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; };
haxe_xml_light = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; };
haxe_neko_include = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; };
neko = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; };
} // kde4support // getConfig [ "bleedingEdgeRepos" "repos" ] {};
}

4
pkgs/development/tools/misc/elfutils/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, m4}:
stdenv.mkDerivation rec {
name = "elfutils-0.140";
name = "elfutils-0.143";
src = fetchurl {
url = "https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2";
sha256 = "5479c0a0b50b4a370a2baa0f8e906e7e51c403ce3afe3a4cbc6aea7c34eebffd";
sha256 = "1zrqs93m6frg7j70a96xdhdb4mnzmqgh91f9bbm39jnmgs50qp23";
};
buildInputs = [m4];

6
pkgs/development/tools/misc/openocd/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libftdi}:
stdenv.mkDerivation {
name = "openocd-0.2.0";
name = "openocd-0.3.1";
src = fetchurl {
url = "http://download.berlios.de/openocd/openocd-0.2.0.tar.bz2";
sha256 = "1qdl2a2mxhl07xz32l9nxjvmf16b0717aqlrhd28akn6si3jps54";
url = "http://download.berlios.de/openocd/openocd-0.3.1.tar.bz2";
sha256 = "1ww66gj4mn3ih4k0b2w21795gfl6g53nm41irii9n7bbjn2dmgrp";
};

13
pkgs/games/xboard/default.nix
View File

@ -1,17 +1,18 @@
a :
a:
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "4.2.7" a;
buildInputs = with a; [
libX11 xproto libXt libXaw libSM libICE libXmu
libXext gnuchess
libXext gnuchess texinfo libXpm
];
s = import ./src-for-default.nix;
in
rec {
src = fetchurl {
url = "http://ftp.gnu.org/gnu/xboard/xboard-${version}.tar.gz";
sha256 = "0fwdzcav8shvzi7djphrlav29vwxnx63spzsldlhrglr7qpg28av";
inherit(s) url;
sha256 = s.hash;
};
inherit buildInputs;
@ -25,7 +26,7 @@ rec {
sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
'') ["doUnpack" "minInit"];
name = "xboard-" + version;
inherit(s) name;
meta = {
description = "XBoard - a chess board compatible with GNU Chess";
};

9
pkgs/games/xboard/src-for-default.nix Normal file
View File

@ -0,0 +1,9 @@
rec {
version="4.4.2";
name="xboard-4.4.2";
hash="1ihg39nnwp90w410rzwxj9layadavz08gc9m2b1jg5z5c6ky28zp";
url="http://ftp.gnu.org/gnu/xboard/xboard-${version}.tar.gz";
advertisedUrl="http://ftp.gnu.org/gnu/xboard/xboard-4.4.2.tar.gz";
}

4
pkgs/games/xboard/src-info-for-default.nix Normal file
View File

@ -0,0 +1,4 @@
{
downloadPage = "http://ftp.gnu.org/gnu/xboard/?C=T,M;O=D";
baseName = "xboard";
}

6
pkgs/lib/lists.nix
View File

@ -161,4 +161,10 @@ rec {
in
qs list [];
# haskell's take: take 2 [1 2 3 4] yields [1 2]
take = count: list:
if list == [] || count == 0 then []
else [ (head list) ] ++ take (builtins.sub count 1) (tail list);
}

9
pkgs/lib/tests.nix
View File

@ -61,6 +61,15 @@ runTests {
expected = true;
};
testTake = testAllTrue [
([] == (take 0 [ 1 2 3 ]))
([1] == (take 1 [ 1 2 3 ]))
([ 1 2 ] == (take 2 [ 1 2 3 ]))
([ 1 2 3 ] == (take 3 [ 1 2 3 ]))
([ 1 2 3 ] == (take 4 [ 1 2 3 ]))
];
testOverridableDelayableArgsTest = {
expr =
let res1 = defaultOverridableDelayableArgs id {};

28
pkgs/misc/bleeding-edge-fetch-infos.nix
View File

@ -295,4 +295,32 @@
url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz";
sha256 = "4d99bf7eefe86dd3305fc5ce27581830fc7dfe10f66ff5c5da054f737704b0bd";
};
haxe = args: with args; fetchurl { # Fri Nov 27 00:39:37 CET 2009
url = "http://mawercer.de/~nix/repos/haxe-F_00-39-37.tar.gz";
sha256 = "7c5f275568b1a5ce7b672bfad232696004e5b6607f3767bbfe8c32880d6583b1";
};
haxe_extc = args: with args; fetchurl { # Fri Nov 27 00:39:38 CET 2009
url = "http://mawercer.de/~nix/repos/haxe_extc-F_00-39-38.tar.gz";
sha256 = "78800c67ecc328fd5358ebdbf561189f40125238f3f35045eb8b5416e77fc115";
};
haxe_extlib_dev = args: with args; fetchurl { # Fri Nov 27 00:39:39 CET 2009
url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_00-39-39.tar.gz";
sha256 = "383044c91d39585e960c416b9c2eeaaa3f89613171662cb78dcb75fe6fe918b7";
};
haxe_neko_include = args: with args; fetchurl { # Fri Nov 27 00:39:40 CET 2009
url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_00-39-40.tar.gz";
sha256 = "efbb4ce93d01a649b2d32e46c4a0e1fb016d104a136cd428b8cc1704b4ab3dc7";
};
haxe_swflib = args: with args; fetchurl { # Fri Nov 27 00:39:45 CET 2009
url = "http://mawercer.de/~nix/repos/haxe_swflib-F_00-39-45.tar.gz";
sha256 = "05ae9c8006b2ffac91794c13db7189b5f21687a4afe0d1358fd3681be18705ba";
};
haxe_xml_light = args: with args; fetchurl { # Fri Nov 27 00:39:46 CET 2009
url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_00-39-46.tar.gz";
sha256 = "b23004c09d5e76b76de5a1938333c1aaccf059ebe62ad25728a267df79069a43";
};
neko = args: with args; fetchurl { # Fri Nov 27 18:37:43 CET 2009
url = "http://mawercer.de/~nix/repos/neko-F_18-37-40.tar.gz";
sha256 = "eac9c6144872d741c31a1c15539672b001977e877f30f01b9649f69b4df1d97c";
};
}

20
pkgs/os-specific/linux/davfs2/default.nix
View File

@ -1,20 +0,0 @@
{stdenv, fetchurl, neon, zlib}:
stdenv.mkDerivation rec {
name = "davfs2-1.4.1";
src = fetchurl {
url = "http://www.very-clever.com/download/nongnu/davfs2/${name}.tar.gz";
sha256 = "0fqq331rd3ylzfhdsbbj0b2znn3d0js0kxcv3w54dl9g2cs8fqhn";
};
buildInputs = [ neon zlib ];
patches = [ ./davfs2-install.patch ];
meta = {
description = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV.";
license = "GPLv3+";
homepage = http://savannah.nongnu.org/projects/davfs2;
};
}

12
pkgs/os-specific/linux/fuse/default.nix
View File

@ -1,18 +1,18 @@
args: with args;
{ stdenv, fetchurl, utillinux }:
stdenv.mkDerivation {
name = "fuse-2.7.4";
stdenv.mkDerivation rec {
name = "fuse-2.8.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/fuse/fuse-2.7.4.tar.gz;
sha256 = "1rj9xn6ynbcqp6n5pf54jcyq13viij0jhv7adv89pq6lwpn71c68";
url = "mirror://sourceforge/fuse/${name}.tar.gz";
sha256 = "1brfgm2yxy060i6kcdlg30g2d48r6v9nhyxbfscpr6ijrrb10zq0";
};
configureFlags = "--disable-kernel-module";
buildInputs = [utillinux];
buildInputs = [ utillinux ];
inherit utillinux;

4
pkgs/os-specific/linux/kernel/linux-2.6.27.nix
View File

@ -5,11 +5,11 @@ assert !userModeLinux;
import ./generic.nix (
rec {
version = "2.6.27.38";
version = "2.6.27.39";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1cciqyw7pz5iik1iz1p9xv6zc4xwy6dbbkwwbjnfwgkssx8bzyj3";
sha256 = "0l43mbh19d2h98c43y6i6xx39dhcwr9q2ggn8qhrw8jlgzn42hq8";
};
features = {

4
pkgs/os-specific/linux/kernel/linux-2.6.31.nix
View File

@ -45,7 +45,9 @@ import ./generic.nix (
killOption 'CONFIG_GCOV.*'
killOption 'CONFIG_KGDB.*'
killOption 'CONFIG_.*_TEST'
killOption 'CONFIG_USB_OTG_BLACKLIST_HUB'
killOption CONFIG_KERNEL_BZIP2
killOption CONFIG_KERNEL_LZMA
setOptionYes CONFIG_KERNEL_GZIP

15
pkgs/os-specific/linux/util-linux-ng/default.nix
View File

@ -1,11 +1,17 @@
{ stdenv, fetchurl, ncurses ? null, ... }:
{ stdenv, fetchurl, ncurses ? null, autoconf, libtool, automake,
gettext, cvs, pkgconfig, ... }:
stdenv.mkDerivation rec {
name = "util-linux-ng-2.16.2";
# src = fetchurl {
# url = "mirror://kernel/linux/utils/util-linux-ng/v2.16/${name}.tar.bz2";
# sha256 = "1sx3z64z8z95v93k0c9lczcp04zw4nm3d2rkhczkyxcpdfcgbhxi";
# };
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux-ng/v2.16/${name}.tar.bz2";
sha256 = "1sx3z64z8z95v93k0c9lczcp04zw4nm3d2rkhczkyxcpdfcgbhxi";
url = "file:///home/llbatlle/arm/stdenv-updates/util-linux-ng.tar.gz";
sha256 = "07ichlan4jqrcz13ldbcrwqn8z28fmj0jz7k4naf1ajyk1l9m4h1";
};
configureFlags = ''
@ -13,6 +19,7 @@ stdenv.mkDerivation rec {
${if ncurses == null then "--without-ncurses" else ""}
'';
buildNativeInputs = [ autoconf libtool automake gettext pkgconfig cvs ];
buildInputs = stdenv.lib.optional (ncurses != null) ncurses;
# !!! It would be better to obtain the path to the mount helpers
@ -22,6 +29,8 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace mount/mount.c --replace /sbin/mount. /var/run/current-system/sw/sbin/mount.
substituteInPlace mount/umount.c --replace /sbin/umount. /var/run/current-system/sw/sbin/umount.
sh autogen.sh
autoreconf -vfi
'';
}

23
pkgs/os-specific/linux/xfsprogs/default.nix
View File

@ -1,23 +0,0 @@
{ stdenv, fetchurl, libtool, gettext, libuuid }:
stdenv.mkDerivation {
name = "xfsprogs-2.9.7-1";
src = fetchurl {
urls = [ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs_2.9.7-1.tar.gz http://ftp.lfs-matrix.org/pub/blfs/svn/x/xfsprogs_2.9.7-1.tar.gz ];
sha256 = "0g4pr1rv4lgc7vab18wiwrcr6jq40fs1krb2vfkgh779p7gf3il7";
};
buildInputs = [libtool gettext libuuid];
preConfigure =
''
sp_path=$(echo $PATH | sed -e 's/:/ /g');
sed -e 's@/usr/bin@'"$PATH: $sp_path"'@g' -i configure
sed -e 's@/usr/local/bin@'"$PATH: sp_path"'@g' -i configure
'';
meta = {
description = "SGI XFS utilities";
};
}

13
pkgs/servers/http/couchdb/default.nix
View File

@ -1,13 +1,16 @@
{stdenv, fetchurl, erlang, spidermonkey, icu, getopt}:
args @ {stdenv, fetchurl, erlang, spidermonkey,
icu, getopt, curl, ...}:
let s = import ./src-for-default.nix; in
stdenv.mkDerivation rec {
name = "apache-couchdb-0.8.1-incubating";
inherit (s) name;
src = fetchurl {
url = mirror://apache/incubator/couchdb/0.8.1-incubating/apache-couchdb-0.8.1-incubating.tar.gz;
sha256 = "0w59kl7p5mgym1cd7j2pji6fcjq0y7yabcx2hx43vrcyjw31azv4";
inherit (s) url;
sha256 = s.hash;
};
buildInputs = [erlang spidermonkey icu];
buildInputs = [erlang spidermonkey icu curl];
postInstall = ''
sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb

9
pkgs/servers/http/couchdb/src-for-default.nix Normal file
View File

@ -0,0 +1,9 @@
rec {
version="0.10.1";
name="couchdb-0.10.1";
hash="0sy644slqmklj3v6dndxw6mh4jn0bm8f90sacycy7l1pclhzfsic";
url="mirror://apache/couchdb/0.10.1/apache-couchdb-${version}.tar.gz";
advertisedUrl="http://www.apache.org/dist/couchdb/0.10.1/apache-couchdb-0.10.1.tar.gz";
}

7
pkgs/servers/http/couchdb/src-info-for-default.nix Normal file
View File

@ -0,0 +1,7 @@
{
downloadPage = "http://couchdb.apache.org/downloads.html";
baseName = "couchdb";
choiceCommand = ''head -1 | sed -re "$skipRedirectApache" '';
mirrorSedScript = ''$apacheMirror'';
}

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

@ -1308,11 +1308,11 @@ let
})) // {inherit inputproto randrproto xorgserver xproto ;};
xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
name = "xf86-input-evdev-2.3.0";
name = "xf86-input-evdev-2.3.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.5/src/everything/xf86-input-evdev-2.3.0.tar.bz2;
sha256 = "1j36qckxn8pbj11da800ab4xrzwri6ygdidm5x7s20cjrq644mvd";
url = mirror://xorg/individual/driver/xf86-input-evdev-2.3.1.tar.bz2;
sha256 = "13qxa5ah10d3m4501n7wpj2vzp04rlva4r57kzh8g6iqzpi2lbs6";
};
buildInputs = [pkgconfig xorgserver xproto ];
})) // {inherit xorgserver xproto ;};
@ -1998,11 +1998,11 @@ let
})) // {inherit ;};
xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
name = "xorg-server-1.7.1";
name = "xorg-server-1.7.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.5/src/everything/xorg-server-1.7.1.tar.bz2;
sha256 = "082c7d8xhb9zm063r01ja442mvfi9alp1vn538d7saxxkki0v355";
url = mirror://xorg/individual/xserver/xorg-server-1.7.3.tar.bz2;
sha256 = "1d1dkidb8bpnws8akihy8wfxqqz055jpng602mvcf3q3rl9l2r2b";
};
buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
})) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};

17
pkgs/servers/x11/xorg/overrides.nix
View File

@ -77,21 +77,6 @@ in
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
};
libXaw = attrs: attrs // {
# The libXaw installation is broken on MacOS X. The package has hard-coded
# know-how that assumes shared libraries use an .so suffix. MacOS, however,
# uses .dylib. Furthermore, the package fails to install an unversioned
# libtool .la file for the library.
postInstall = ''
cd $out/lib
ln -s libXaw8.la libXaw.la
if [ ${args.stdenv.system} = "i686-darwin" ]; then
rm *.so*
ln -s libXaw8.dylib libXaw.dylib
fi
'';
};
setxkbmap = attrs: attrs // {
postInstall =
''
@ -148,7 +133,7 @@ in
[ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto
xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto
xorg.libdmx xorg.xf86vidmodeproto xorg.libXext
xorg.libdmx xorg.xf86vidmodeproto xorg.libXext
];
propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ];

3
pkgs/servers/x11/xorg/tarballs-7.5.list
View File

@ -114,6 +114,7 @@ mirror://xorg/X11R7.5/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-acecad-1.4.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.3.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-evdev-2.3.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2
@ -179,7 +180,7 @@ mirror://xorg/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/xorg-server-1.7.1.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.7.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2

2
pkgs/stdenv/nix/prehook.sh
View File

@ -1,7 +1,7 @@
export NIX_ENFORCE_PURITY=1
export NIX_IGNORE_LD_THROUGH_GCC=1
if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin"; then
if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin"; then
export NIX_DONT_SET_RPATH=1
export NIX_NO_SELF_RPATH=1
dontFixLibtool=1

0
pkgs/tools/security/aefs/default.nix → pkgs/tools/filesystems/aefs/default.nix
View File

0
pkgs/os-specific/linux/btrfsprogs/default.nix → pkgs/tools/filesystems/btrfsprogs/default.nix
View File

0
pkgs/tools/networking/curlftpfs/default.nix → pkgs/tools/filesystems/curlftpfs/default.nix
View File

0
pkgs/os-specific/linux/davfs2/davfs2-install.patch → pkgs/tools/filesystems/davfs2/davfs2-install.patch
View File

21
pkgs/tools/filesystems/davfs2/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, neon, zlib }:
stdenv.mkDerivation rec {
name = "davfs2-1.4.5";
src = fetchurl {
url = "mirror://savannah/davfs2/${name}.tar.gz";
sha256 = "1pkl2braggp2qg4c68dwfv399l9jz7cvi7gkm4xbj6mgvl0cxw18";
};
buildInputs = [ neon zlib ];
patches = [ ./davfs2-install.patch ];
meta = {
longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV.";
license = "GPLv3+";
homepage = http://savannah.nongnu.org/projects/davfs2;
};
}

0
pkgs/tools/misc/dosfstools/default.nix → pkgs/tools/filesystems/dosfstools/default.nix
View File

0
pkgs/os-specific/linux/e2fsprogs/default.nix → pkgs/tools/filesystems/e2fsprogs/default.nix
View File

0
pkgs/os-specific/linux/genext2fs/default.nix → pkgs/tools/filesystems/genext2fs/default.nix
View File

0
pkgs/tools/networking/glusterfs/default.nix → pkgs/tools/filesystems/glusterfs/default.nix
View File

0
pkgs/tools/networking/glusterfs/src-for-default.nix → pkgs/tools/filesystems/glusterfs/src-for-default.nix
View File

0
pkgs/tools/networking/glusterfs/src-info-for-default.nix → pkgs/tools/filesystems/glusterfs/src-info-for-default.nix
View File

0
pkgs/os-specific/linux/jfsrec/default.nix → pkgs/tools/filesystems/jfsrec/default.nix
View File

0
pkgs/os-specific/linux/jfsutils/default.nix → pkgs/tools/filesystems/jfsutils/default.nix
View File

Some files were not shown because too many files have changed in this diff Show More