diff --git a/pkgs/applications/networking/browsers/firefox/5.0.nix b/pkgs/applications/networking/browsers/firefox/5.0.nix deleted file mode 100644 index f59d50fb6de..00000000000 --- a/pkgs/applications/networking/browsers/firefox/5.0.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "5.0.1"; - - xulVersion = "5.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "c93b3513e160d87535a9d61c5e06a6a701e9cd3e"; - }; - - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix deleted file mode 100644 index c4fef3dfaf2..00000000000 --- a/pkgs/applications/networking/browsers/firefox/7.0.nix +++ /dev/null @@ -1,184 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "7.0.1"; - - xulVersion = "7.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - cp -i security/coreconf/Linux{2.6,3.0}.mk - cp -i security/coreconf/Linux{2.6,3.1}.mk - cp -i security/coreconf/Linux{2.6,3.2}.mk - cp -i security/coreconf/Linux{2.6,3.3}.mk - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done; - for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite file - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/9.0.nix b/pkgs/applications/networking/browsers/firefox/9.0.nix index f14eb05899d..32d785e7692 100644 --- a/pkgs/applications/networking/browsers/firefox/9.0.nix +++ b/pkgs/applications/networking/browsers/firefox/9.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "9.0b1"; + firefoxVersion = "9.0"; xulVersion = "9.0"; # this attribute is used by other packages src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "0mvm0bjzghqywh54fnk5qhz7fjm5d8y952sf59ypq64bhs5dh009"; + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha1 = "f79324ec6205e4c23d51d8ab2e790de1b2541657"; }; commonConfigureFlags = diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index c2200841ee1..9da45184978 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,28 +1,26 @@ -{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11, gettext}: +{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11, +gettext}: stdenv.mkDerivation rec { - name = "kicad-svn-2518"; + name = "kicad-20110708"; - src = fetchsvn { - url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad; - rev = 2518; - sha256 = "05z4fnkvvy91d0krf72q8xyislwh3zg8k0gy9w18caizbla5sih5"; + src = fetchurl { + url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip; + sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a"; }; - srcLibrary = fetchsvn { - url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad-library; - rev = 2518; - sha256 = "05sfmbp1z3hjxzcspj4vpprww5bxc6hq4alcjlc1vg6cvx2qgb9s"; + srcLibrary = fetchbzr { + url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library"; + revision = 112; + sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312"; }; + cmakeFlags = "-DKICAD_TESTING_VERSION=ON"; + # They say they only support installs to /usr or /usr/local, # so we have to handle this. patchPhase = '' sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp - pushd internat/ca - sed -i -e s/iso-8859-1/utf-8/ kicad.po - msgfmt -o kicad.mo kicad.po - popd ''; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index b7949909760..02b7017d295 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.25.1"; + version = "5.26.0"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "8e98ad742151e52edb56337bd62c8a9749f7b598cb6ed4e991980e0e6f89706a"; + sha256 = "887105c99a91122f3e622472aa39bdd1ca8ed6198cf09b49917f63f8396dced9"; }; buildInputs = [sbcl texinfo perl makeWrapper]; @@ -29,8 +29,9 @@ stdenv.mkDerivation { ln -s ../maxima/${version}/doc $out/share/doc/maxima ''; - # The regression test suite has minor failures, but curiously enough - # this doesn't seem to abort the build process: + # Failures in the regression test suite are not going to abort the + # build process. We run the suite mostly so that potential errors show + # up in the build log. See also: # . doCheck = true; diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index 85bc00db713..b074c3ec507 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.1.0.10565"; - name="veracity-1.1.0.10565"; - hash="0sx12zzc60pdvzhf8ax2lisnw0rsrvnrk2500y1vfqhwxh2r04id"; - url="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz"; + version="1.5.0.10647"; + name="veracity-1.5.0.10647"; + hash="1b10npyxxg9592wigfpv66h17bzbsg2hqcfm7imyn941a34qrkd3"; + url="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-${version}.tar.gz"; + advertisedUrl="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-1.5.0.10647.tar.gz"; } diff --git a/pkgs/development/compilers/llvm/clang-include-paths.patch b/pkgs/development/compilers/llvm/clang-include-paths.patch index aaa9a5fc4b5..828c554175e 100644 --- a/pkgs/development/compilers/llvm/clang-include-paths.patch +++ b/pkgs/development/compilers/llvm/clang-include-paths.patch @@ -1,39 +1,49 @@ -diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp ---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-03-21 20:24:04.000000000 -0400 -+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-10-18 12:09:50.624355551 -0400 -@@ -438,6 +438,7 @@ - - void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, - const HeaderSearchOptions &HSOpts) { -+#if 0 - llvm::Triple::OSType os = triple.getOS(); - - switch (os) { -@@ -559,6 +560,8 @@ - } - - AddPath("/usr/include", System, false, false, false); -+#endif -+ AddPath(C_INCLUDE_PATH, System, false, false, false); - } - - void InitHeaderSearch:: -@@ -577,6 +580,7 @@ - triple); +diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp +--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500 ++++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 06:29:27.562428830 -0500 +@@ -1926,14 +1926,17 @@ + if (DriverArgs.hasArg(options::OPT_nostdinc)) return; - } -+#if 0 - // FIXME: temporary hack: hard-coded paths. - switch (os) { - case llvm::Triple::Cygwin: -@@ -847,6 +851,10 @@ - default: - break; - } + ++#if 0 + if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) + addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); + +#endif -+ AddGnuCPlusPlusIncludePaths( -+ CPP_INCLUDE_PATH, -+ CPP_HOST, "", "", triple); + if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { + llvm::sys::Path P(D.ResourceDir); + P.appendComponent("include"); + addSystemInclude(DriverArgs, CC1Args, P.str()); + } ++#if 0 + + if (DriverArgs.hasArg(options::OPT_nostdlibinc)) + return; +@@ -1998,6 +2001,8 @@ + return; + + addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); ++#endif ++ addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + C_INCLUDE_PATH); } - void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang, + static bool addLibStdCXXIncludePaths(Twine Base, Twine TargetArchDir, +@@ -2030,6 +2035,7 @@ + bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 || + TargetArch == llvm::Triple::ppc64); + ++#if 0 + StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT); + if (!CxxIncludeRoot.empty()) { + StringRef CxxIncludeArch(CXX_INCLUDE_ARCH); +@@ -2072,6 +2078,10 @@ + GCCInstallation.getTriple() + Suffix, + DriverArgs, CC1Args); + } ++#endif ++ addLibStdCXXIncludePaths(CPP_INCLUDE_PATH, ++ CPP_HOST, ++ DriverArgs, CC1Args); + } + + /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly. diff --git a/pkgs/development/compilers/llvm/clang-ld-flags.patch b/pkgs/development/compilers/llvm/clang-ld-flags.patch index fc625a0e0b7..62b8bc763f9 100644 --- a/pkgs/development/compilers/llvm/clang-ld-flags.patch +++ b/pkgs/development/compilers/llvm/clang-ld-flags.patch @@ -1,33 +1,26 @@ -diff -Naur a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp ---- a/tools/clang/lib/Driver/ToolChains.cpp 2011-03-21 17:29:27.000000000 -0400 -+++ b/tools/clang/lib/Driver/ToolChains.cpp 2011-10-18 19:43:48.999590771 -0400 -@@ -1482,12 +1482,9 @@ - Lib = Lib64; - } +diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp +--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500 ++++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 05:32:38.695513475 -0500 +@@ -1800,6 +1800,7 @@ -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -- if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) -- Linker = LinkerPath.str(); -- else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld"); + Linker = GetProgramPath("ld"); +#if 0 LinuxDistro Distro = DetectLinuxDistro(Arch); - if (IsUbuntu(Distro)) { -@@ -1531,6 +1528,7 @@ - Paths.push_back(Base + "/../../.."); - if (Arch == getArch() && IsUbuntu(Distro)) - Paths.push_back("/usr/lib/" + GccTriple); + if (IsOpenSuse(Distro) || IsUbuntu(Distro)) { +@@ -1882,6 +1883,7 @@ + addPathIfExists(SysRoot + "/lib", Paths); + addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); + addPathIfExists(SysRoot + "/usr/lib", Paths); +#endif } bool Linux::HasNativeLLVMSupport() const { -diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp ---- a/tools/clang/lib/Driver/Tools.cpp 2011-03-06 18:31:01.000000000 -0500 -+++ b/tools/clang/lib/Driver/Tools.cpp 2011-10-18 18:44:00.799604267 -0400 -@@ -3619,6 +3619,7 @@ +diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp +--- clang-3.0.src-orig/lib/Driver/Tools.cpp 2011-11-07 05:27:39.000000000 -0500 ++++ clang-3.0.src/lib/Driver/Tools.cpp 2011-12-19 05:34:44.075325534 -0500 +@@ -4306,6 +4306,7 @@ ToolChain.getArch() == llvm::Triple::thumb || (!Args.hasArg(options::OPT_static) && !Args.hasArg(options::OPT_shared))) { @@ -35,8 +28,8 @@ diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp CmdArgs.push_back("-dynamic-linker"); if (ToolChain.getArch() == llvm::Triple::x86) CmdArgs.push_back("/lib/ld-linux.so.2"); -@@ -3627,6 +3628,7 @@ - CmdArgs.push_back("/lib/ld-linux.so.3"); +@@ -4318,6 +4319,7 @@ + CmdArgs.push_back("/lib64/ld64.so.1"); else CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); +#endif diff --git a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch deleted file mode 100644 index 0d82cf4017a..00000000000 --- a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur llvm-2.9-orig/Makefile.rules llvm-2.9/Makefile.rules ---- llvm-2.9-orig/Makefile.rules 2011-03-25 02:26:58.000000000 -0400 -+++ llvm-2.9/Makefile.rules 2011-10-19 15:31:38.538674143 -0400 -@@ -941,7 +941,7 @@ - @echo "*** llvm-config doesn't exist - rebuilding it." - @$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config - --$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG) -+$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): - - ifeq ($(ENABLE_SHARED), 1) - # We can take the "auto-import" feature to get rid of using dllimport. -@@ -1137,7 +1137,7 @@ - else - SharedLibKindMessage := "Shared Library" - endif --$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir -+$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(SharedLibDir)/.dir - $(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \ - $(notdir $@) - $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \ -@@ -1411,7 +1411,7 @@ - $(ToolBuildPath): $(ToolDir)/.dir - endif - --$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) -+$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) - $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) - $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ - $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) -diff -Naur llvm-2.9-orig/unittests/Makefile.unittest llvm-2.9/unittests/Makefile.unittest ---- llvm-2.9-orig/unittests/Makefile.unittest 2011-02-04 12:12:18.000000000 -0500 -+++ llvm-2.9/unittests/Makefile.unittest 2011-10-19 15:47:27.100035616 -0400 -@@ -47,7 +47,7 @@ - Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" - endif - --$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) -+$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) - $(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg) - $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ - $(TESTLIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) diff --git a/pkgs/development/compilers/llvm/clang-tblgen.patch b/pkgs/development/compilers/llvm/clang-tblgen.patch deleted file mode 100644 index 9533529555d..00000000000 --- a/pkgs/development/compilers/llvm/clang-tblgen.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -Naur a/tools/clang/include/clang/AST/Makefile b/tools/clang/include/clang/AST/Makefile ---- a/tools/clang/include/clang/AST/Makefile 2010-08-18 19:23:40.000000000 -0400 -+++ b/tools/clang/include/clang/AST/Makefile 2011-10-19 14:19:21.420750346 -0400 -@@ -6,24 +6,24 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute classes with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-classes -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute implementations with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-impl -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) \ -+$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang statement node tables with tblgen" - $(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $< - --$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) \ -+$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang declaration node tables with tblgen" - $(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/include/clang/Basic/Makefile b/tools/clang/include/clang/Basic/Makefile ---- a/tools/clang/include/clang/Basic/Makefile 2010-09-09 16:27:36.000000000 -0400 -+++ b/tools/clang/include/clang/Basic/Makefile 2011-10-19 14:17:54.950837324 -0400 -@@ -29,20 +29,20 @@ - CLANG_HAS_VERSION_PATCHLEVEL := 1 - endif - --$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(ObjDir)/.dir - $(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen" - $(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $< - --$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(ObjDir)/.dir - $(Echo) "Building Clang diagnostic groups with tblgen" - $(Verb) $(TableGen) -gen-clang-diag-groups -o $(call SYSPATH, $@) $< - --$(ObjDir)/AttrList.inc.tmp : Attr.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/AttrList.inc.tmp : Attr.td $(ObjDir)/.dir - $(Echo) "Building Clang attribute list with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-list -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../.. $< - --$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(ObjDir)/.dir - $(Echo) "Building Clang arm_neon.inc with tblgen" - $(Verb) $(TableGen) -gen-arm-neon-sema -o $(call SYSPATH, $@) $< - -diff -Naur a/tools/clang/include/clang/Driver/Makefile b/tools/clang/include/clang/Driver/Makefile ---- a/tools/clang/include/clang/Driver/Makefile 2010-06-08 16:34:18.000000000 -0400 -+++ b/tools/clang/include/clang/Driver/Makefile 2011-10-19 14:25:33.739369159 -0400 -@@ -5,14 +5,14 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang Driver Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< - --$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang CC1 Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< - --$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang CC1 Assembler Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/include/clang/Lex/Makefile b/tools/clang/include/clang/Lex/Makefile ---- a/tools/clang/include/clang/Lex/Makefile 2010-10-19 22:31:43.000000000 -0400 -+++ b/tools/clang/include/clang/Lex/Makefile 2011-10-19 14:18:25.082807086 -0400 -@@ -6,7 +6,7 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute spellings with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-spelling-list -o $(call SYSPATH, $@) \ -diff -Naur a/tools/clang/include/clang/Serialization/Makefile b/tools/clang/include/clang/Serialization/Makefile ---- a/tools/clang/include/clang/Serialization/Makefile 2010-08-18 19:23:40.000000000 -0400 -+++ b/tools/clang/include/clang/Serialization/Makefile 2011-10-19 14:25:05.764398164 -0400 -@@ -6,13 +6,13 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang PCH reader with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-pch-read -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang PCH writer with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-pch-write -o $(call SYSPATH, $@) \ -diff -Naur a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile ---- a/tools/clang/lib/Headers/Makefile 2010-07-21 21:19:36.000000000 -0400 -+++ b/tools/clang/lib/Headers/Makefile 2011-10-19 14:15:18.520993127 -0400 -@@ -49,6 +49,6 @@ - - install-local:: $(INSTHEADERS) - --$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(ObjDir)/.dir - $(Echo) "Building Clang arm_neon.h.inc with tblgen" - $(Verb) $(TableGen) -gen-arm-neon -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile ---- a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-02-15 02:42:38.000000000 -0500 -+++ b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-10-19 14:15:58.240953760 -0400 -@@ -19,6 +19,6 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(ObjDir)/.dir - $(Echo) "Building Clang SA Checkers tables with tblgen" - $(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $< diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 1763e1e9e16..4d8bb3fe834 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,51 +1,31 @@ -{ stdenv, fetchurl, perl, groff, llvm }: +{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }: -assert stdenv.isLinux && stdenv.gcc.gcc != null; - -let version = "2.9"; in +let version = "3.0"; in stdenv.mkDerivation { name = "clang-${version}"; - src = llvm.src; + buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; - buildInputs = [ perl llvm groff ]; + patches = stdenv.lib.optionals (stdenv.gcc.libc != null) + [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] - ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ - "--with-built-clang=yes" - "CXX=clang++" - ]; - - srcClang = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.tgz"; - sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h"; - }; - - prePatch = '' - pushd tools - unpackFile $srcClang - mv clang-${version} clang - popd - find - ''; - - patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ]; - - buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ]; - - preBuild = '' + postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ - -e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \ + -e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \ -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ - tools/clang/lib/Frontend/InitHeaderSearch.cpp - - pushd utils/unittest - make - popd - cd tools/clang + lib/Driver/ToolChains.cpp ''; + cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" ]; + + enableParallelBuilding = true; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/clang-${version}.tar.gz"; + sha256 = "0v8j9rgmb7w74ihc44zfxa22q17c946n5b6prwl38z3d6pd74kmn"; + }; + passthru = { gcc = stdenv.gcc.gcc; }; meta = { @@ -53,6 +33,7 @@ stdenv.mkDerivation { description = "A C language family frontend for LLVM"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; all; }; } + diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index afc1a55b093..01b16fcda8d 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }: +{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }: let version = "3.0"; in @@ -10,14 +10,10 @@ stdenv.mkDerivation { sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji"; }; - buildInputs = [ perl groff ] ++ - stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility; + buildInputs = [ perl groff cmake ] ++ + stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ]; - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] - ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ - "--with-built-clang=yes" - "CXX=clang++" - ]; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix new file mode 100644 index 00000000000..5b3052b544a --- /dev/null +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, ncurses, x11 }: + +let + useX11 = stdenv.isi686 || stdenv.isx86_64; + useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; + inherit (stdenv.lib) optionals optionalString; +in + +stdenv.mkDerivation rec { + + name = "ber-metaocaml-003"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2"; + sha256 = "0hw1yp1mmfyn1pmda232d0ry69m7ln1z0fn5lgi8nz3y1mx3iww6"; + }; + + metaocaml = fetchurl { + url = "http://okmij.org/ftp/ML/ber-metaocaml.tar.gz"; + sha256 = "1kq1if25c1wvcdiy4g46xk05dkc1am2gc4qvmg4x19wvvaz09gzf"; + }; + + # Needed to avoid a SIGBUS on the final executable on mips + NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; + + patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + installFlags = "-i"; + installTargets = "install"; # + optionalString useNativeCompilers " installopt"; + prePatch = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + patch -p0 < ${./mips64.patch} + ''; + postConfigure = '' + tar -xvzf $metaocaml + cd ${name} + make patch + cd .. + ''; + postBuild = '' + ensureDir $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + postInstall = '' + cd ${name} + make all + make install + make test + make test-compile + cd .. + ''; + + meta = { + homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; + licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; + }; +} diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix new file mode 100644 index 00000000000..b115a8fedcf --- /dev/null +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, x11, ncurses }: + +stdenv.mkDerivation (rec { + + name = "metaocaml-3.09-alpha-30"; + + src = fetchurl { + url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz"; + sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk" "-x11lib" x11]; + buildFlags = "world bootstrap world.opt"; + buildInputs = [x11 ncurses]; + installTargets = "install installopt"; + patchPhase = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + ensureDir $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + meta = { + homepage = http://www.metaocaml.org/; + license = "QPL, LGPL2 (library part)"; + desctiption = "A compiled, type-safe, multi-stage programming language"; + }; + +}) diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 0baba9c603e..390fa28f6f7 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -3,7 +3,7 @@ }: let - revision = "2375"; + revision = "2381"; in stdenv.mkDerivation { name = "uhc-svn-${revision}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchsvn { url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC"; rev = revision; - sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619"; + sha256 = "37598f49cda8ff67b0b4d1c75b0bf50bfcd29a92b08ea427c5071080e368c4bc"; }; propagatedBuildInputs = [mtl network binary fgl syb]; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix new file mode 100644 index 00000000000..5dcb4cbe618 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.1.2"; + sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "http://projects.haskell.org/http/"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 1d89afe5968..523f59de5e9 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.2"; - sha256 = "1fa2y8yc0ppmh37alc20a75gpb90i8s3pgnh3kg8n0577gvhjhzz"; + version = "3.1.4"; + sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix index 85f5a1d9e6e..4bf301bd66d 100644 --- a/pkgs/development/libraries/haskell/NanoProlog/default.nix +++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "NanoProlog"; - version = "0.2.3.3"; - sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba"; + version = "0.3"; + sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn"; isLibrary = true; isExecutable = true; buildDepends = [ ListLike uuParsinglib ]; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix similarity index 56% rename from pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix rename to pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix index df686f71c5b..69a1c1dc417 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -1,12 +1,12 @@ -{ cabal, extensibleExceptions, mtl, random }: +{ cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; - version = "2.1.0.3"; - sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1"; - buildDepends = [ extensibleExceptions mtl random ]; + version = "2.4.2"; + sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg"; + buildDepends = [ extensibleExceptions random ]; meta = { - homepage = "http://www.cs.chalmers.se/~koen"; + homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 0bd68b6b92e..04a94c222c6 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.4.0.0"; - sha256 = "1j0m7hh82ab7lg757wq75k28llfd1igawmg4g2qdia5gimm652pa"; + version = "0.4.0.1"; + sha256 = "15aq3r36vda8v1fn3pn0k638w32kzy15kbrf97krvg3xdwrvybky"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 7ba67e5ce79..73601f462e9 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1.1"; - sha256 = "13l7gcrgngr2bdr7hxh1wbsh21q7nc5bdknz0gpzjf65297g44an"; + version = "0.6.1.2"; + sha256 = "1655fp71l8qjif4p6c1y2xk8r0gj58djg7np5zwwm6jlj780773r"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 3a55192b76a..0c41a350103 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.3.1"; - sha256 = "01xqqnvy2xjcgnp5qq5xiqm1whxywa31cgd79mm290i2r4baiq8s"; + version = "0.10.4"; + sha256 = "0bjxlnc2qf1900ch9cnab26qz6a0vdz5nz1dwrjby1n5xqqzjd7x"; buildDepends = [ aeson attoparsec base64Bytestring blazeBuilder caseInsensitive enumerator failure httpEnumerator httpTypes network random RSA SHA @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { xmlEnumerator ]; meta = { - homepage = "http://github.com/snoyberg/authenticate/tree/master"; + homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index ab0233e1956..ae9d23f57d4 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base-unicode-symbols"; - version = "0.2.2.2"; - sha256 = "13bn580r3wk7g5bq8ry04i2lvrcf576wjzlr0imli8rklkx8k3b8"; + version = "0.2.2.3"; + sha256 = "0803ncdydkxivn4kcjfn9v0lm43xg47y5iws7lajhhyg6v4zq08j"; meta = { homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index b95052d02d9..b09024851de 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base16-bytestring"; - version = "0.1.1.3"; - sha256 = "0v08fnkykvd6y6in6f9a808vk2gfd9pf0wd7rr28z6wwxm5d2x6l"; + version = "0.1.1.4"; + sha256 = "061rxlw5kjwj0s08kml46qpw602xwwp05285gpad8c7baw5mzxlr"; meta = { homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 2e8a5868d12..dbeb4721f33 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.2.2"; - sha256 = "1fg0qgqml7ar3m0as9sk9zc260j2jvdsf5cdfrsify5l62ip060f"; + version = "0.4.3.0"; + sha256 = "1018mfsc1cqbyxlil136171n9qi9sypchlmmfqawf3aa1sjskmfg"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index b5924d7c73b..67d87905143 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-textual"; - version = "0.2.0.5"; - sha256 = "0rl41idjmrw227yi2x6nk2rlm93rgzz2y7jvz2yvmya2ihrppzjf"; + version = "0.2.0.6"; + sha256 = "1699fj9zig6ids9bdjn5v0gqhnyx5dkzi542gkx1gs8943c94737"; buildDepends = [ blazeBuilder text time vector ]; meta = { homepage = "http://github.com/bos/blaze-textual"; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 2c08676d9c4..19f69ede610 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.1.2.1"; - sha256 = "01w0fbfzdmrfnmnkjkg9paagfkzsjn57rx7lf2npzp95rmljplkb"; + version = "1.2.0.2"; + sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index 51c93043e8b..d31f8546d4c 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "colour"; - version = "2.3.1"; - sha256 = "58cf12b8abf7d01a752b1b778b64cc406903874702e3475d65c2aa35689fa49b"; + version = "2.3.2"; + sha256 = "1j0y8cfdzhzjid1hg50qvh5nsa6kfnxcwxaizxyk73z60dn8g9b6"; meta = { homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; - license = "unknown"; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index 88d1b6ed067..7f7b65702b0 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dataenc"; - version = "0.14.0.2"; - sha256 = "1zym24259d053b7vbxir2l7229gilkg81vvc0wf9605873j6gw5b"; + version = "0.14.0.3"; + sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index ee84665ad63..7c810a29565 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "double-conversion"; - version = "0.2.0.3"; - sha256 = "17ny1gvd622rnqjvlrmcpgw3wlabrsc6d046d4ii6xv299z97qw9"; + version = "0.2.0.4"; + sha256 = "00rb8n2ky20ah9ry398jagi9gb0gz40yjfalh35cpckmg30z199x"; buildDepends = [ text ]; meta = { homepage = "https://github.com/bos/double-conversion"; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index b2a6142bbaf..ddd6905d314 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.0.4"; - sha256 = "051ryqjzc74lnlbdd1ngxgqj56p43ls5xhafmldnyhkv75x59svw"; + version = "1.1.0.1"; + sha256 = "0nzqx1d4hwailfkcb9g03hagws9j6valqd5yp7972kmhbq0c8h3s"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix new file mode 100644 index 00000000000..8dd833a7bf0 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix @@ -0,0 +1,42 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, + stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, + cabalInstall, alex, happy, haddock, ghc}: + +# This is just a meta-package. Because upstream fails to provide proper versioned +# release tarballs that can be used for the purpose of verifying this package, we +# just create it on the fly from a simple Setup.hs file and a .cabal file that we +# store directly in the nixpkgs repository. + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2011.4.0.0"; + cabalFile = ./haskell-platform-2011.4.0.0.cabal; + setupFile = ./Setup.hs; + src = null; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel parsec regexBase regexCompat regexPosix + stm syb deepseq text transformers mtl xhtml zlib + cabalInstall alex happy ghc haddock + ]; + unpackPhase = '' + sourceRoot=haskell-platform + mkdir $sourceRoot + cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal + cp ${self.setupFile} $sourceRoot/Setup.hs + touch $sourceRoot/LICENSE + ''; + noHaddock = true; + meta = { + homepage = "http://haskell.org/platform"; + description = "Haskell Platform meta package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal new file mode 100644 index 00000000000..56414de90c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal @@ -0,0 +1,90 @@ +name: haskell-platform +version: 2011.4.0.0 +homepage: http://haskell.org/platform +license: BSD3 +license-file: LICENSE +author: libraries@haskell.org +maintainer: haskell-platform@projects.haskell.org +category: System +synopsis: The Haskell Platform +description: + The Haskell Platform (HP) is the blessed set of libraries and tools on + which to build further Haskell libraries and applications. It is + intended to provide a comprehensive, stable, and quality tested base for + Haskell projects to work from. + . + This version specifies the following additional developer tools be + installed, for a system to be in full compliance: + . + * cabal-install + * alex + * happy + * haddock + +cabal-version: >= 1.8 +build-type: Custom +tested-with: GHC ==7.0.4 + +library + build-depends: + -- ghc 7.x + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- array ==0.3.0.2 + -- base ==4.3.1.0 + -- bytestring ==0.9.1.10 + -- Cabal ==1.10.2.0 + -- containers ==0.4.0.0 + -- directory ==1.1.0.0 + -- extensible-exceptions ==0.1.1.2 + -- filepath ==1.2.0.0 + -- haskell2010 ==1.0.0.0 + -- haskell98 ==1.1.0.1 + -- hpc ==0.5.0.6 + -- old-locale ==1.0.0.2 + -- old-time ==1.0.0.6 + -- pretty ==1.0.1.2 + -- process ==1.0.1.5 + -- random ==1.0.0.3 + -- template-haskell ==2.5.0.0 + -- time ==1.2.0.3 + -- unix ==XXX 2.4.2.0 + -- Win32 ==XXX 2.2.0.1 + + -- Libraries in addition to what GHC provides: + -- Note: newer versions of cgi need monad-catchio. + cgi ==3001.1.7.4, + fgl ==5.4.2.4, + GLUT ==2.1.2.1, + haskell-src ==1.0.1.4, + html ==1.0.1.2, + HUnit ==1.2.4.2, + network ==2.3.0.5, + OpenGL ==2.2.3.0, + parallel ==3.1.0.1, + parsec ==3.1.1, + QuickCheck ==2.4.1.1, + regex-base ==0.93.2, + regex-compat ==0.95.1, + regex-posix ==0.95.1, + stm ==2.2.0.1, + syb ==0.3.3, + xhtml ==3000.2.0.4, + zlib ==0.5.3.1, + HTTP ==4000.1.2, + deepseq ==1.1.0.2, + + -- 2011.1 proposals: + text ==0.11.1.5, + transformers ==0.2.2.0, + mtl ==2.0.1.0 + + -- Depending on programs does not work, they are not registered + -- We list them to help distro packaging. + build-tools: + cabal-install ==0.10.2, + alex ==2.3.5, + happy ==1.18.6 + -- hscolour ==1.17 + -- haddock ==2.9.2 -- need to use the one shipped with ghc + diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 1006d2fd2c3..890d5100147 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.6.7"; - sha256 = "04bmw5k9gvlh7x4ggmwz7pdc1ik3va0v4icg7nv47ab2w2pn88pb"; + version = "0.6.8"; + sha256 = "0amjpn93wc7jhfy1n69mhiryi2yy40k5388ap3iwqi79mblkjf31"; isLibrary = true; isExecutable = true; buildDepends = [ blazeBuilder caseInsensitive text ]; diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index 52e3d001f48..bf4ca6d0042 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.3.0.1"; - sha256 = "0aa73cw82yssias0a9y237h9r4v4abvs0lv2lmhxaa4a4mdrj3ms"; + version = "0.3.1"; + sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45"; buildDepends = [ baseUnicodeSymbols transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix index 8b6850ea08d..e8a2e298c98 100644 --- a/pkgs/development/libraries/haskell/monad-par/default.nix +++ b/pkgs/development/libraries/haskell/monad-par/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.1.0.2"; - sha256 = "0ca5fbc92bmghg8pk40rwcf58jk3y7xcr0nwfhyhi67riqnwqrl8"; + version = "0.1.0.3"; + sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg"; buildDepends = [ deepseq HUnit ]; meta = { homepage = "https://github.com/simonmar/monad-par"; diff --git a/pkgs/development/libraries/haskell/multirec/0.5.1.nix b/pkgs/development/libraries/haskell/multirec/0.5.1.nix deleted file mode 100644 index 3e994f878cc..00000000000 --- a/pkgs/development/libraries/haskell/multirec/0.5.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "multirec"; - version = "0.5.1"; - sha256 = "0y62gb2ml0799a3f1ny5ydjc4rjwj1dgs48f5fj6hf2fpl4hk02l"; - noHaddock = true; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; - description = "Generic programming for families of recursive datatypes"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/multirec/0.6.nix b/pkgs/development/libraries/haskell/multirec/default.nix similarity index 84% rename from pkgs/development/libraries/haskell/multirec/0.6.nix rename to pkgs/development/libraries/haskell/multirec/default.nix index 6fb6acd58ed..e5a1b2a85a9 100644 --- a/pkgs/development/libraries/haskell/multirec/0.6.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.6"; - sha256 = "1k0icyz9i4hc5vfpwrv42l3q4lrnsb1bswhyyv63d9azffn5flys"; + version = "0.7"; + sha256 = "1n196qqggfnk8fa1x296rdbyb77a6ykhy01z8x2glgdimzpxsiay"; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix new file mode 100644 index 00000000000..bf9330eb256 --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix @@ -0,0 +1,18 @@ +{ cabal, parsec }: + +cabal.mkDerivation (self: { + pname = "network"; + version = "2.3.0.5"; + sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; + buildDepends = [ parsec ]; + meta = { + homepage = "http://github.com/haskell/network"; + description = "Low-level networking interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix similarity index 80% rename from pkgs/development/libraries/haskell/parallel/3.2.0.0.nix rename to pkgs/development/libraries/haskell/parallel/3.2.0.2.nix index 9c260d06566..81d37e3a2b0 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "parallel"; - version = "3.2.0.0"; - sha256 = "1wqdy9p7xqq84ffgzdakvqydxq9668r9xq3wyay9wlgrk83wd1sq"; + version = "3.2.0.2"; + sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2"; buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index c0639515bf5..c6be9f80258 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.7"; - sha256 = "1rplv1pg531jfmvxlhl7lz9hdhbxllk59daik013i172wglggivp"; + version = "0.7.0.1"; + sha256 = "010w3ycwalz48288342rmwg87pdml7ixg9drw38k206q9s9a9cp9"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder blazeBuilderEnumerator bytestringMmap bytestringNums diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index da786f8a7c6..e6eafd47eab 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.7"; - sha256 = "1zvijghk7597xbmxv2x3qk92jlckwpz73c57cmfl63as5x6psxhr"; + version = "0.7.0.1"; + sha256 = "149jgd9mcndw9sc051020y7yiai1fipjnqk4s3sbw4lmaysap673"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 8463200e387..604c4a0a0f2 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "split"; - version = "0.1.4.1"; - sha256 = "0cdn2sb3m62bnxdz59diwwaxysh3kj4kk1srn4m80p03fj60s0q5"; + version = "0.1.4.2"; + sha256 = "09vi7vw4i4r78gyp3bbvhvvyiqi8rgf678ppmq99qrfqm34c2fl9"; meta = { homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix new file mode 100644 index 00000000000..01cc80c883d --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "syb"; + version = "0.3.3"; + sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 75f13c948e9..ee42d3415f2 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.3"; - sha256 = "16a57dipz3aid5n22gzyd9yqmsxm98c3s6vb7minj82q9rbl5z67"; + version = "0.4.4"; + sha256 = "16904xwbcy82ghf1bckw8h63pfj9jfbdlqrr8jf91jzl27lqlwxf"; buildDepends = [ deepseq text ]; meta = { - homepage = "https://john-millikin.com/software/hs-filepath/"; + homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.9.nix b/pkgs/development/libraries/haskell/text/0.11.1.12.nix similarity index 82% rename from pkgs/development/libraries/haskell/text/0.11.1.9.nix rename to pkgs/development/libraries/haskell/text/0.11.1.12.nix index 5b095c97e67..805c96d2af0 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.9.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.12.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.1.9"; - sha256 = "12lq9v1byrsan7rp7kywkbwp15qyganpkanmln43yylxdzdc8a2k"; + version = "0.11.1.12"; + sha256 = "0j2044whj3xckmxqmgdjbc2mpwdan481qzjslwplqbqwml2jvkml"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix new file mode 100644 index 00000000000..db438a54bc2 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -0,0 +1,18 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.1.5"; + sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://bitbucket.org/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 52cdfc5ffe4..d9d5c8c11d6 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.1"; - sha256 = "0yimnq5p89jfbnk5cpa9w30zvfqs9dxxjxy2a86l8jvba5xb8068"; + version = "0.4.2"; + sha256 = "14zi5xzdyzdzw9qv6775li635x8i9rkp2z655ygzcwz5v3spjz9z"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index ef0f1bb4dd0..c5e56ec6b80 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.3.2"; - sha256 = "1g30viz94qhwv3v16d9njrwyqmv0p1hs0r11xmzx0adp806w54z9"; + version = "0.8.4"; + sha256 = "1xd6cax4ldvahjjs5kdhcjmy4rx1ywp6r3alaifxbk2397zi7p1v"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index 6571b082281..951458eb4eb 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "transformers-base"; - version = "0.4.0.1"; - sha256 = "0avnnxbxh59xgxzb8vldysrbw37sim9iaiiscgjhdlscxy6yasbb"; + version = "0.4.1"; + sha256 = "1d3w7k7smvdnnn4q6xpdhsj9zvj6372ihyhz4lrhdvgh72pfiaag"; buildDepends = [ transformers ]; meta = { homepage = "https://github.com/mvv/transformers-base"; diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index df50bacd522..da4616a1367 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.1.4.4"; - sha256 = "1fvicb2a8fnfg7579x6v4fpyz3dhjij8vmny4fa8x5g8ih608kb8"; + version = "0.1.4.6"; + sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d"; buildDepends = [ deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 124d08aabc0..ed6701976dd 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.3.1"; - sha256 = "11lwf2b4l4sll6xvscv3c2n3kl6hs0s8rplw66cwskcck3mvs7ms"; + version = "2.7.3.2"; + sha256 = "0z53s9wvk57g3d9x3iswjydwm7nw5vfrj7k08v75fw6rwldkal60"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 19ba48b58cc..ce9c3c29808 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.7.2"; - sha256 = "1zqxg13hpd45i2nyhh1bvaly1cwaygmjpz46cm7knp553bdhy8c8"; + version = "0.7.8"; + sha256 = "1v3mvb22g56frvwb82l73k7cqrl926hg133x5idl5q66fp8h94q0"; buildDepends = [ aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 7ed924fb07b..c6ce1d024c1 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.4"; - sha256 = "05hvffzhwb6x6cmpvpf60hbzm4lvn7gp47rvspm5k6y6d999az3l"; + version = "0.3.4.1"; + sha256 = "0khkc4bpqfgfs0zl753x4l5qpkfr8hv0kwzz6qpry5skxa326q6i"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index b456c1d81a0..f7c6a81d188 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "zeromq-haskell"; - version = "0.8.1"; - sha256 = "19fl3nd548yj6d6c3jqr6lxk6y033qa68jgnc5aq5w8kmlpn70mc"; + version = "0.8.2"; + sha256 = "0wi3s3ygxd15jbj5bpq6xvrsjsm94hhj6na8r45j241j0cgr322x"; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; - description = "bindings to zeromq"; + description = "Bindings to ZeroMQ 2.1.x"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 4cfca3bf1a3..2ade79bffa1 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zipper"; - version = "0.3.1"; - sha256 = "170qjc3mbk6i96z5js745ix57i0xkgpa5h9xjiiirq9x6bfbbqyp"; + version = "0.4"; + sha256 = "0s3gw883kwxgmz9sk3638ba8i1zb5dirv2hanc3caf6pfay6caks"; buildDepends = [ multirec ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/protobuf/2.2.0.nix b/pkgs/development/libraries/protobuf/2.2.0.nix deleted file mode 100644 index c9419367fd6..00000000000 --- a/pkgs/development/libraries/protobuf/2.2.0.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, zlib }: - -stdenv.mkDerivation rec { - name = "protobuf-2.2.0"; - - src = fetchurl { - url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0jvj7i0fifl4fqjf84f67chb9b6q2z1jqkfc1zic9fz035mzn7bk"; - }; - - buildInputs = [ zlib ]; - - doCheck = true; - - meta = { - description = "Protocol Buffers - Google's data interchange format"; - - longDescription = - '' Protocol Buffers are a way of encoding structured data in an - efficient yet extensible format. Google uses Protocol Buffers for - almost all of its internal RPC protocols and file formats. - ''; - - license = "mBSD"; - - homepage = http://code.google.com/p/protobuf/; - }; -} diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index 05dabd23773..57dc58bdfa1 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-2.3.0"; + name = "protobuf-2.4.1"; src = fetchurl { url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1b40cb7ij4bnw78k46y0a2jkm8qisxkk1gbbj40yi77yqc3pf33n"; + sha256 = "1gxhfhk37jyjq1z4y3d4bz4i1fk2an5ydhk5kjzlp0rhfcs5516g"; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix new file mode 100644 index 00000000000..8ef50777522 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -0,0 +1,109 @@ +{ stdenv, fetchurl, substituteAll +, alsaLib, gstreamer, gstPluginsBase +, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext +, libXfixes, libXrandr, libSM, freetype, fontconfig +, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig +, libtiff, glib, icu +, mysql, postgresql, sqlite +, perl, coreutils, libXi +, flashplayerFix ? true, gdk_pixbuf +, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +}: + +let + v = "4.8.0"; +in + +# TODO: +# * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid +# false build-time dependencies + +stdenv.mkDerivation rec { + name = "qt-${v}"; + + src = fetchurl { + url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; + sha256 = "0vhb6bysjqz8l0dygg2yypm4frsggma2g9877rdgf5ay917bg4lk"; + }; + + patches = [ ( substituteAll { + src = ./dlopen-absolute-paths.diff; + inherit cups icu libXfixes; + glibc = stdenv.gcc.libc; + }) + ] ++ stdenv.lib.optional gtkStyle ( + substituteAll { + src = ./dlopen-gtkstyle.diff; + # substituteAll ignores env vars starting with capital letter + gconf = GConf; + inherit gnome_vfs libgnomeui gtk; + } + ) ++ stdenv.lib.optional flashplayerFix ( + substituteAll { + src = ./dlopen-webkit-nsplugin.diff; + inherit gtk gdk_pixbuf; + } + ); + + preConfigure = + '' + export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" + configureFlags+=" + -docdir $out/share/doc/${name} + -plugindir $out/lib/qt4/plugins + -importdir $out/lib/qt4/imports + -examplesdir $out/share/doc/${name}/examples + -demosdir $out/share/doc/${name}/demos + -datadir $out/share/${name} + -translationdir $out/share/${name}/translations + " + ''; + + configureFlags = + '' + -v -no-separate-debug-info -release -no-fast -confirm-license -opensource + + -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig + -qdbus -cups -glib -dbus-linked -openssl-linked + + -plugin-sql-mysql -system-sqlite + + -exceptions -xmlpatterns + + -make libs -make tools -make translations + -nomake demos -nomake examples -nomake docs + + -no-phonon -webkit -multimedia -audio-backend + ''; + + propagatedBuildInputs = + [ libXrender libXrandr libXinerama libXcursor libXext libXfixes + libXv libXi libSM mesa + alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib + gstreamer gstPluginsBase + ]; + + # The following libraries are only used in plugins + buildInputs = [ cups # Qt dlopen's libcups instead of linking to it + mysql postgresql sqlite libjpeg libmng libtiff icu ]; + + buildNativeInputs = [ perl pkgconfig which ]; + + prefixKey = "-prefix "; + + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://qt.nokia.com/products; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = with maintainers; [ urkud sander ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff new file mode 100644 index 00000000000..9823d649365 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -0,0 +1,64 @@ +--- a/src/gui/painting/qcups.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/painting/qcups.cpp 2011-12-18 12:17:07.000000000 +0400 +@@ -87,7 +87,7 @@ + + static void resolveCups() + { +- QLibrary cupsLib(QLatin1String("cups"), 2); ++ QLibrary cupsLib(QLatin1String("@cups@/lib/libcups"), 2); + if(cupsLib.load()) { + _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); + _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); +--- a/src/gui/painting/qprinterinfo_unix.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/painting/qprinterinfo_unix.cpp 2011-12-23 16:22:15.000000000 +0400 +@@ -454,7 +454,7 @@ + char *domain; + int err; + +- QLibrary lib(QLatin1String("nsl")); ++ QLibrary lib(QLatin1String("@glibc@/lib/libnsl")); + typedef int (*ypGetDefaultDomain)(char **); + ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain"); + typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *); +--- a/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:26:07.000000000 +0400 ++++ b/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:25:55.000000000 +0400 +@@ -95,7 +95,7 @@ + static void resolveLibrary() + { + #ifndef QT_NO_LIBRARY +- QLibrary lib(QLatin1String("resolv")); ++ QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + +--- a/src/corelib/tools/qlocale_icu.cpp 2011-12-08 09:06:03.000000000 +0400 ++++ b/src/corelib/tools/qlocale_icu.cpp 2011-12-23 16:29:15.000000000 +0400 +@@ -81,7 +81,7 @@ + if (status == NotLoaded) { + + // resolve libicui18n +- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); + if (!lib.load()) { + qWarning() << "Unable to load library icui18n" << lib.errorString(); + status = ErrorLoading; +@@ -110,7 +110,7 @@ + } + + // resolve libicuuc +- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); + if (!ucLib.load()) { + qWarning() << "Unable to load library icuuc" << ucLib.errorString(); + status = ErrorLoading; +--- a/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-23 20:38:49.000000000 +0400 +@@ -242,7 +242,7 @@ + } + + # define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \ +- (symbol_type)qt_load_library_runtime("libXfixes", vernum, 4, #symbol); ++ (symbol_type)qt_load_library_runtime("@libXfixes@/lib/libXfixes", vernum, 4, #symbol); + # define XFIXES_LOAD_V1(symbol) \ + XFIXES_LOAD_RUNTIME(1, symbol, Ptr##symbol) + # define XFIXES_LOAD_V2(symbol) \ diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff new file mode 100644 index 00000000000..522676a2b31 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff @@ -0,0 +1,35 @@ +--- a/src/gui/styles/qgtkstyle_p.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/styles/qgtkstyle_p.cpp 2011-12-24 17:56:46.000000000 +0400 +@@ -312,7 +312,7 @@ + void QGtkStylePrivate::resolveGtk() const + { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); + gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); +@@ -434,8 +434,8 @@ + pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); + pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); + +- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); +- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); ++ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); ++ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); + } + + /* \internal +@@ -607,9 +607,9 @@ + static bool resolveGConf() + { + if (!QGtkStylePrivate::gconf_client_get_default) { +- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); +- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); +- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); ++ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); ++ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); ++ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); + } + return (QGtkStylePrivate::gconf_client_get_default !=0); + } diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff new file mode 100644 index 00000000000..14199d40503 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff @@ -0,0 +1,52 @@ +diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index 19941d6..0ec15e2 100644 +--- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -121,7 +121,7 @@ static void initializeGtk(QLibrary* module = 0) + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +index 2fe69d1..b658e4a 100644 +--- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -857,7 +857,7 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp +index 2c9b465..56b3074 100644 +--- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp ++++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp +@@ -42,7 +42,7 @@ namespace WebKit { + #if PLATFORM(QT) + static void initializeGTK() + { +- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = reinterpret_cast(library.resolve("gtk_init_check")); +diff --git a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index b8c8f2a..e7f4dc5 100644 +--- a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -54,7 +54,7 @@ static Display *getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix new file mode 100644 index 00000000000..107bb08759f --- /dev/null +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, libxml2, libxslt, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-apiextractor-0.10.7-6-gdcb1195"; + + src = fetchgit { + url = "git://github.com/PySide/Apiextractor.git"; + rev = "dcb11958cabe518630f9f2d2bebd9f8711c2b15b"; + sha256 = "d7b6cb16d11b6134de17a15635d0b5ad7460d31d7870cafe23a690141b9a2274"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake libxml2 libxslt python27Packages.sphinx qt4 ]; + + meta = { + description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/apiextractor/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix new file mode 100644 index 00000000000..791d5e83d3c --- /dev/null +++ b/pkgs/development/python-modules/pyside/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: + +stdenv.mkDerivation { + name = "pyside-1.0.9"; + + src = fetchgit { + url = "git://github.com/PySide/PySide.git"; + rev = "4e47b3284fd8715b68342e755cd06ba02b1df0de"; + sha256 = "1fd302e78c5dea8a9c312bd493c04240f2383517ee745d9df2b070f15f0ab515"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; + + makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; + + meta = { + description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework."; + license = stdenv.lib.licenses.lgpl21; + homepage = "http://www.pyside.org"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix new file mode 100644 index 00000000000..afb258cec70 --- /dev/null +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-generatorrunner-0.6.13-9-g567ca6e"; + + src = fetchgit { + url = "git://github.com/PySide/Generatorrunner.git"; + rev = "567ca6effaecdf97b33d1d13eada23bafe0f7535"; + sha256 = "182aba79af9fc865337f4befc96faf3eaca1ab9bcb902a57e0a68af49f071c74"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideApiextractor python27Packages.sphinx qt4 ]; + + meta = { + description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/generatorrunner/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix new file mode 100644 index 00000000000..d8ef2d7b52f --- /dev/null +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-shiboken-1.0.7-73-g9f110f8"; + + src = fetchgit { + url = "git://github.com/PySide/Shiboken.git"; + rev = "9f110f83c213867e15b0141a802ebbf74f2ed9f7"; + sha256 = "4618ed113fb20840fd9acb7d08460eb257f630cbca6d61113c16549a6bb651cd"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideApiextractor pysideGeneratorrunner python27 python27Packages.sphinx qt4 ]; + + preConfigure = '' + echo "preConfigure: Fixing shiboken_generator install target." + substituteInPlace generator/CMakeLists.txt --replace \ + \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ + ''; + + meta = { + description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/shiboken/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix new file mode 100644 index 00000000000..0b5e6851761 --- /dev/null +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, pyside, python27, qt4, pysideShiboken }: + +stdenv.mkDerivation { + name = "pyside-tools-0.2.13"; + + src = fetchgit { + url = "git://github.com/PySide/Tools.git"; + rev = "23e0712360442e50f34be0d6e4651b8c4c806d47"; + sha256 = "68f059e4936fb8dfae6aa3a463db8c28adcb7bd050b29e8b6fef82431f72da07"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pyside python27 qt4 pysideShiboken ]; + + meta = { + description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework."; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index 2110f258229..c50391efd4e 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-bootstrap"; - version = "0.9.39.1.0"; - sha256 = "06w330j0nds5piv1rr3m6m1idnf0c5swfk9qwdqzi0pmpws6lpkj"; + version = "0.9.40.2"; + sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq"; isLibrary = true; isExecutable = true; buildDepends = [ haskellSrcExts mtl uulib ]; diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 70c0a8e9931..9a0ae50fc9a 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.0.10"; - sha256 = "0dqj5nqq8qpylbxyv8cpy3rrnna9yqb4dnxxk7sgyhw6yvz48l56"; + version = "1.0.2.0"; + sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0"; buildDepends = [ mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 417f430ba9b..6a662055df4 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.39.1"; - sha256 = "0zqhwpafq51czy97z0f93cbxd8k6hllnmb24a6yzr4y6kzzv65hd"; + version = "0.9.40.2"; + sha256 = "1qc5sqm2lqysm5rplzc229rfw5750w4z8b7cgxaid7jjv4csrbf8"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix new file mode 100644 index 00000000000..e41e88fc1b0 --- /dev/null +++ b/pkgs/games/beret/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer }: + +stdenv.mkDerivation { + name = "beret-1.2.0"; + + buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; + + NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; + + NIX_CFLAGS_LINK = "-lgcc_s"; + + patches = [ ./use-home-dir.patch ]; + + postPatch = '' + sed -i 's@RESOURCE_PATH ""@RESOURCE_PATH "'$out'/share/"@' game.c + ''; + + src = fetchurl { + url = https://gitorious.org/beret/beret/archive-tarball/ae029777; + name = "beret-1.2.0.tar.gz"; + sha256 = "0md00ipacvz5mq8q83h7xbzycnwympr06pc1n5c351swjvyw0ysx"; + }; + + installPhase = '' + ensureDir $out/bin + install -v -m755 beret $out/bin + ensureDir $out/share + cp -av tahoma.ttf images music rooms sfx $out/share + ''; + + meta = { + description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities"; + homepage = http://kiwisauce.com/beret/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl2; + }; +} + diff --git a/pkgs/games/beret/use-home-dir.patch b/pkgs/games/beret/use-home-dir.patch new file mode 100644 index 00000000000..c8597a0303b --- /dev/null +++ b/pkgs/games/beret/use-home-dir.patch @@ -0,0 +1,48 @@ +diff -Naur beret-beret-orig/game.c beret-beret/game.c +--- beret-beret-orig/game.c 2011-12-17 18:51:32.000000000 -0500 ++++ beret-beret/game.c 2011-12-21 13:16:37.047511020 -0500 +@@ -10,12 +10,10 @@ + #include + #include + #include +-#ifdef __APPLE__ + #include + #include + #include + #include +-#endif + + #define CAMSCROLL 15 + #define SCR_WIDTH 780 +@@ -88,12 +86,8 @@ + #define DIRSEP "/" + #endif + +-#ifdef __APPLE__ +-#define SUPPORT_PATH "Library/Application Support/Beret/" +-#define RESOURCE_PATH "Beret.app/Contents/Resources/" +-#else ++#define SUPPORT_PATH ".beret" + #define RESOURCE_PATH "" +-#endif + + #define QUITMOD_WIN KMOD_ALT + #define QUITKEY_WIN SDLK_F4 +@@ -812,7 +806,6 @@ + + int init() { + +- #ifdef __APPLE__ + char filestr[512]; + // Get the home directory of the user. + struct passwd *pwd = getpwuid(getuid()); +@@ -827,9 +820,6 @@ + sprintf(filestr, "%s/saves", support_path); + mkdir(filestr, S_IRWXU); + } +- #else +- sprintf(support_path, ""); +- #endif + + if (SDL_Init(SDL_INIT_EVERYTHING) == -1) { + printf("Error: couldn't initialize SDL\n"); diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 74db3a0d890..35bf57c269e 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, linuxHeaders, glibc, libtool, gettext}: +{ stdenv, fetchurl, libtool, gettext }: assert stdenv.isLinux && stdenv.system != "powerpc-linux"; @@ -16,5 +16,10 @@ stdenv.mkDerivation { -i Makefile ''; - buildInputs = [ linuxHeaders glibc libtool gettext ]; + buildInputs = [ stdenv.gcc.libc.kernelHeaders libtool gettext ]; + + meta = { + description = "Tools to display or change the CPU governor settings"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 0e3ace5c384..576ef0941f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -214,17 +214,18 @@ in import ./generic.nix ( rec { - version = "3.2-rc1"; + version = "3.2-rc6"; - modDirVersion = "3.2.0-rc1"; + modDirVersion = "3.2.0-rc6"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "0pp79njklvjzzr4wpyymqhkiq0xgz1sgil5sjms2xj583jg8c4wm"; + #url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; + url = "mirror://kernel/linux/kernel/v3.0/testing/linux-${version}.tar.bz2"; + sha256 = "18wdp3r3xvq12ddv7c7z0h0i8zsm3wrahl83s6jqbixrw4aq5zbd"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix new file mode 100644 index 00000000000..4cfbdd6e691 --- /dev/null +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, bison, flex, which, perl }: + +let version = "3.3.1"; in + +stdenv.mkDerivation rec { + name = "lm-sensors-3.3.1"; + + src = fetchurl { + url = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"; + sha256 = "13v2gszagmx8hwjyzh2k47rdpc2kyg9zky3kdqhdbgzp8lwpik6g"; + }; + + buildInputs = [ bison flex which perl ]; + + preBuild = '' + makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc) + ''; + + meta = { + homepage = http://www.lm-sensors.org/; + description = "Tools for reading hardware sensors"; + }; +} diff --git a/pkgs/os-specific/linux/lm_sensors/default.nix b/pkgs/os-specific/linux/lm_sensors/default.nix deleted file mode 100644 index f3957f41ead..00000000000 --- a/pkgs/os-specific/linux/lm_sensors/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, bison, flex, perl}: - -stdenv.mkDerivation rec { - name = "lm_sensors-3.1.1"; - - src = fetchurl { - url = "http://dl.lm-sensors.org/lm-sensors/releases/${name}.tar.bz2"; - sha256 = "1vsrs2cl35h2gry03lp0pwbzpw0nbpsbpds5w4mdmx16clm3ynnr"; - }; - - buildInputs = [bison flex perl]; - - preBuild = '' - makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc) - ''; - - meta = { - homepage = http://www.lm-sensors.org/; - description = "Tools for reading hardware sensors"; - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix index 0d36013ffd2..a7ba4d5ca95 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -2,7 +2,7 @@ let - versionNumber = "96.43.19"; + versionNumber = "96.43.20"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "1j7im9ra7nmm1hn11c1brvf895xibs49xrxkxcrsnmpa17l10n72"; + sha256 = "05vm36jnydp4cfdkfvrvxczd64i3f0pp0yp7dn8y8pklrxi80xxw"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "1g8z36wz3ww1q6vjbypzwl0973vy0miz6rw2fd7v3a36yxl2gvn5"; + sha256 = "0a8ninp4wyql3xh6z93dzhbacvz7g0h8gs4pg5279a0i6h05wb1w"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 17482f69899..191f34489a7 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -3,11 +3,11 @@ , libxslt, docbook_xsl, utillinux, automake, autoconf }: stdenv.mkDerivation rec { - name = "udisks-1.0.3"; + name = "udisks-1.0.4"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0jwavs2ag0cv46517j17943s16a8fw2lqk4k3cljgivh5aswwnyr"; + sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; }; # Move 80-udisks.rules manually to make the patch smaller @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { patches = [ ./purity.patch ]; - buildInputs = [ sg3_utils udev glib dbus dbus_glib polkit parted lvm2 libatasmart intltool libuuid libxslt docbook_xsl @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ automake autoconf pkgconfig ]; - configureFlags = "--localstatedir=/var"; + configureFlags = "--localstatedir=/var --enable-lvm2"; preConfigure = '' diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 963a4f48d7a..32698ac4efb 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.13"; + name = "upower-0.9.15"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "08jasjkp44ydvsnk020xghrshi0jspp5078id26n5nhidp1d4z9c"; + sha256 = "1313lr404hb29fzkf9frn1z0xxvibi451xmk05sf9kidyf01956m"; }; buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace /usr/sbin/pm- ${pmutils}/sbin/pm- ''; - installFlags = "localstatedir=$(TMPDIR)/var"; + installFlags = "historydir=$(TMPDIR)/foo"; meta = { homepage = http://upower.freedesktop.org/; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index a39ba002d23..2a8bef6c6ed 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,23 +1,38 @@ -{stdenv, fetchurl, utillinux}: +{stdenv, fetchurl, utillinux, libuuid +, crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { - pname = "ntfs-3g"; - version = "2010.10.2"; + pname = "ntfs-3g_ntfsprogs"; + version = "2011.4.12"; name = "${pname}-${version}"; + buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt]; + buildNativeInputs = stdenv.lib.optional crypto pkgconfig; + src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ntfs-3g/ntfs-3g-2010.10.2.tgz/91405690f25822142cdcb43d03e62d3f/ntfs-3g-2010.10.2.tgz"; - sha256 = "0wcyks4nvi1kck8i2dgwfsy5zxhil0v0xam8zbg1p592xbqygiqp"; + url = "http://tuxera.com/opensource/${name}.tgz"; + sha256 = "01gfn94f4fdrl1rjhhxjvjbarr1mipdi4pmhhwirp0gy1dzp935a"; }; - preConfigure = '' - substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' + patchPhase = '' + substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' + substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' substituteInPlace libfuse-lite/mount_util.c \ --replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/umount ${utillinux}/bin/umount ''; - configureFlags = "--disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper"; + configureFlags = + '' + --disable-ldconfig --exec-prefix=''${prefix} --enable-mount-helper + --enable-posix-acls --enable-xattr-mappings --${if crypto then "enable" else "disable"}-crypto + ''; + + postInstall = + '' + # Prefer ntfs-3g over the ntfs driver in the kernel. + ln -sv mount.ntfs-3g $out/sbin/mount.ntfs + ''; meta = { homepage = http://www.tuxera.com/community/; diff --git a/pkgs/tools/filesystems/ntfsprogs/default.nix b/pkgs/tools/filesystems/ntfsprogs/default.nix deleted file mode 100644 index 3deb668eddb..00000000000 --- a/pkgs/tools/filesystems/ntfsprogs/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, libuuid}: - -stdenv.mkDerivation rec { - name = "ntfsprogs-2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/linux-ntfs/${name}.tar.bz2"; - sha256 = "ad36e19706c7303b10aa0a9bf2c2dd0309b91cd0171f1c9eb361d94a85017432"; - }; - - buildInputs = [libuuid]; - - preConfigure = - '' - substituteInPlace ntfsprogs/Makefile.in --replace /sbin $out/sbin - ''; - - meta = { - description = "Utilities for the NTFS filesystem"; - homepage = http://sourceforge.net/projects/linux-ntfs; - license = "GPL"; - }; -} diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 303fc086874..b314da4a3ed 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -23,9 +23,10 @@ rec { configureFlags = []; /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex" - "doConfigure" "dumpRealVars" "doMakeInstall" "fixPathsResult"]; - + phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex" + "doConfigure" "dumpRealVars" "doMakeInstall" "fixPathsResult" + "fixInfoDir"]; + setVars = a.noDepEntry '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.boehmgc}/include/gc" export HOME="$PWD" @@ -38,6 +39,13 @@ rec { fixPaths = a.doPatchShebangs ''.''; fixPathsResult = a.doPatchShebangs ''$out/bin''; + fixInfoDir = a.noDepEntry '' + mv -v "$out/share/info/asymptote/"*.info $out/share/info/ + sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info + rmdir $out/share/info/asymptote + rm $out/share/info/dir + ''; + extractTexinfoTex = a.fullDepEntry '' lzma -d < ${a.texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex cp texinfo-*/doc/texinfo.tex doc/ diff --git a/pkgs/tools/graphics/asymptote/src-for-default.nix b/pkgs/tools/graphics/asymptote/src-for-default.nix index e960b74655b..1f8a46ae581 100644 --- a/pkgs/tools/graphics/asymptote/src-for-default.nix +++ b/pkgs/tools/graphics/asymptote/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.03"; - name="asymptote-2.03"; - hash="1npj9igf4b9dy1frriqc20ihm1s0f3yw2pgs0xc4rv514rp0wkpx"; + version="2.15"; + name="asymptote-2.15"; + hash="11y8w2r51g48znqvl1wwrg0wsrwz3194r70aq1mlgq1g0xzln0w9"; url="http://downloads.sourceforge.net/project/asymptote/asymptote/${version}/asymptote-${version}.src.tgz"; - advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/2.03/asymptote-2.03.src.tgz"; - - + advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/2.15/asymptote-2.15.src.tgz"; + + } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f1388135bcb..ce564e8de4f 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "gnuplot-4.4.2"; + name = "gnuplot-4.4.4"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1r799l6ww9w21qnklqfn335jkfc6y0ilhv3sv4x4mf4ghgacis1p"; + sha256 = "1zfv3npsxfn743wl65ibh11djxrc8fxzi2mgg75ppy6m12fmja6j"; }; configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 30487055669..708951814bc 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre30706"; + name = "nix-1.0pre31028"; src = fetchurl { - url = "http://hydra.nixos.org/build/1580753/download/4/${name}.tar.bz2"; - sha256 = "2658a4fea95799d8719685a808ab354f0b5a3ce38af92117e1a15c394c261c5b"; + url = "http://hydra.nixos.org/build/1648301/download/4/${name}.tar.bz2"; + sha256 = "5a74cff532e0615b23a3937003ee67d257b4371d89fc60ae2be9f342efd979d2"; }; buildNativeInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a0e4fc16bf..055051b9d92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1070,7 +1070,8 @@ let ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; - ntfsprogs = callPackage ../tools/filesystems/ntfsprogs { }; + # ntfsprogs are merged into ntfs-3g + ntfsprogs = pkgs.ntfs3g; ntp = callPackage ../tools/networking/ntp { }; @@ -1658,13 +1659,12 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clangBootUnwrapped = callPackage ../development/compilers/llvm/clang.nix { }; - - clangBoot = wrapClang clangBootUnwrapped; - - clangUnwrapped = let clangBootStdenv = stdenvAdapters.overrideGCC stdenv clangBoot; in clangBootUnwrapped.override { - stdenv = clangBootStdenv; - llvm = llvm.override { stdenv = clangBootStdenv; }; + clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { + # There is a bug in gcc-4.5 that prevents building a release build of + # clang-3.0 + stdenv = if stdenv.isLinux + then (stdenvAdapters.overrideGCC stdenv gcc46) + else stdenv; }; clang = wrapClang clangUnwrapped; @@ -2335,6 +2335,10 @@ let ocaml_3_12_1 = lowPrio (callPackage ../development/compilers/ocaml/3.12.1.nix { }); + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; + + ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; + mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec { inherit ocaml; @@ -2494,7 +2498,8 @@ let clang = baseClang; libc = glibc; shell = bash; - inherit stdenv binutils coreutils zlib; + binutils = stdenv.gcc.binutils; + inherit stdenv coreutils zlib; }; wrapClang = wrapClangWith (import ../build-support/clang-wrapper) glibc; @@ -3545,7 +3550,7 @@ let else callPackage ../development/libraries/gmp { }; - gmpxx = gmp.override { cxx = true; }; + gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; @@ -4425,7 +4430,6 @@ let postgis = callPackage ../development/libraries/postgis { }; protobuf = callPackage ../development/libraries/protobuf { }; - protobuf_2_2_0 = callPackage ../development/libraries/protobuf/2.2.0.nix { }; pth = callPackage ../development/libraries/pth { }; @@ -4458,6 +4462,13 @@ let inherit (pkgs.gnome) glib; }; + qt48 = callPackage ../development/libraries/qt-4.x/4.8 { + # GNOME dependencies are not used unless gtkStyle == true + inherit (pkgs.gnome) gtk libgnomeui GConf gnome_vfs; + # GStreamer is required for HTML5 video in QtWebKit + inherit (pkgs.gst_all) gstreamer gstPluginsBase; + }; + qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; @@ -4888,6 +4899,16 @@ let pyqt4 = callPackage ../development/python-modules/pyqt { }; + pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; + + pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; + + pyside = callPackage ../development/python-modules/pyside { }; + + pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; + pyx = callPackage ../development/python-modules/pyx { }; pyxml = callPackage ../development/python-modules/pyxml { }; @@ -5155,6 +5176,8 @@ let bluez = callPackage ../os-specific/linux/bluez { }; + beret = callPackage ../games/beret { }; + bridge_utils = callPackage ../os-specific/linux/bridge-utils { }; checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; @@ -5163,12 +5186,7 @@ let conky = callPackage ../os-specific/linux/conky { }; - cpufrequtils = ( - import ../os-specific/linux/cpufrequtils { - inherit fetchurl stdenv libtool gettext; - glibc = stdenv.gcc.libc; - linuxHeaders = stdenv.gcc.libc.kernelHeaders; - }); + cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cryopid = callPackage ../os-specific/linux/cryopid { }; @@ -5850,7 +5868,7 @@ let libsmbios = callPackage ../os-specific/linux/libsmbios { }; - lm_sensors = callPackage ../os-specific/linux/lm_sensors { }; + lm_sensors = callPackage ../os-specific/linux/lm-sensors { }; lsiutil = callPackage ../os-specific/linux/lsiutil { }; @@ -6660,20 +6678,6 @@ let firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; - firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix { - inherit (gtkLibs) gtk pango; - inherit (gnome) libIDL; - }; - - firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; }; - - firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { - inherit (gtkLibs) gtk pango; - inherit (gnome) libIDL; - }; - - firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; }; - firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; @@ -6681,11 +6685,13 @@ let firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; }; - firefox90bPkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix { + firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; + firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; }; + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer11; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0217a343ea5..8fe6bb15f2c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -87,7 +87,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc701Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link ghc702Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; - ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link + ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_4_0_0 super; # link ghc721Prefs = super : super // super.haskellPlatformDefaults_future super; ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; #link ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super; @@ -130,7 +130,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # We try to support several platform versions. For these, we set all # versions explicitly. - # NOTE: 2011.2.0.1 is the current default. + # NOTE: 2011.4.0.0 is the current default. haskellPlatformArgs_future = self : { inherit (self) cabal ghc; @@ -142,9 +142,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok - parallel = self.parallel_3_2_0_0; # 7.2 ok, 7.3 ok + parallel = self.parallel_3_2_0_2; # 7.2 ok, 7.3 ok parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok - QuickCheck = self.QuickCheck_2_4_1_1; # 7.2 ok, 7.3 ok + QuickCheck = self.QuickCheck_2_4_2; # 7.2 ok, 7.3 ok regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok @@ -154,7 +154,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_9; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_12; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_1_1; # 7.2 ok, 7.3 ok @@ -174,6 +174,48 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); deepseq = null; # apparently a core library in ghc-7.3 }; + haskellPlatformArgs_2011_4_0_0 = self : { + inherit (self) cabal ghc; + cgi = self.cgi_3001_1_7_4; + fgl = self.fgl_5_4_2_4; + GLUT = self.GLUT_2_1_2_1; + haskellSrc = self.haskellSrc_1_0_1_4; + html = self.html_1_0_1_2; + HUnit = self.HUnit_1_2_4_2; + network = self.network_2_3_0_5; + OpenGL = self.OpenGL_2_2_3_0; + parallel = self.parallel_3_1_0_1; + parsec = self.parsec_3_1_1; + QuickCheck = self.QuickCheck_2_4_1_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_95_1; + regexPosix = self.regexPosix_0_95_1; + stm = self.stm_2_2_0_1; + syb = self.syb_0_3_3; + xhtml = self.xhtml_3000_2_0_4; + zlib = self.zlib_0_5_3_1; + HTTP = self.HTTP_4000_1_2; + deepseq = self.deepseq_1_1_0_2; + text = self.text_0_11_1_5; + transformers = self.transformers_0_2_2_0; + mtl = self.mtl_2_0_1_0; + cabalInstall = self.cabalInstall_0_10_2; + alex = self.alex_2_3_5; + happy = self.happy_1_18_6; + haddock = self.haddock_2_9_2; + }; + + haskellPlatformDefaults_2011_4_0_0 = + self : self.haskellPlatformArgs_2011_4_0_0 self // { + haskellPlatform = self.haskellPlatform_2011_4_0_0; + mtl1 = self.mtl_1_1_1_1; + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + }; + + haskellPlatform_2011_4_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2011.4.0.0.nix + (self.haskellPlatformArgs_2011_4_0_0 self); + haskellPlatformArgs_2011_2_0_1 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; @@ -209,7 +251,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_9; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -308,7 +349,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_2_0; alex = self.alex_2_3_2; cgi = self.cgi_3001_1_7_2; - QuickCheck = self.QuickCheck_2_1_0_3; + QuickCheck = self.QuickCheck_2_1_1_1; HTTP = self.HTTP_4000_0_9; HUnit = self.HUnit_1_2_2_1; network = self.network_2_2_1_7; @@ -714,6 +755,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; + HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; HTTP = self.HTTP_4000_2_1; @@ -802,7 +844,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; - HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; + HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; HUnit = self.HUnit_1_2_0_3; hxt = callPackage ../development/libraries/haskell/hxt {}; @@ -905,9 +947,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); multiplate = callPackage ../development/libraries/haskell/multiplate {}; - multirec_0_5_1 = callPackage ../development/libraries/haskell/multirec/0.5.1.nix {}; - multirec_0_6 = callPackage ../development/libraries/haskell/multirec/0.6.nix {}; - multirec = self.multirec_0_6; + multirec = callPackage ../development/libraries/haskell/multirec {}; multiset = callPackage ../development/libraries/haskell/multiset {}; @@ -922,6 +962,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; + network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_8 = callPackage ../development/libraries/haskell/network/2.3.0.8.nix {}; network = self.network_2_3_0_8; @@ -963,8 +1004,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; - parallel_3_2_0_0 = callPackage ../development/libraries/haskell/parallel/3.2.0.0.nix {}; - parallel = self.parallel_1_1_0_1; + parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {}; + parallel = self.parallel_3_2_0_2; parseargs = callPackage ../development/libraries/haskell/parseargs {}; @@ -1015,12 +1056,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; QuickCheck_1_2_0_1 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.1.nix {}; - QuickCheck_2_1_0_3 = callPackage ../development/libraries/haskell/QuickCheck/2.1.0.3.nix {}; QuickCheck_2_1_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.1.1.1.nix {}; QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; + QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; - QuickCheck2 = self.QuickCheck_2_4_1_1; + QuickCheck2 = self.QuickCheck_2_4_2; QuickCheck = self.QuickCheck2; RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; @@ -1055,6 +1096,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix { regexPosix = self.regexPosix_0_95_1; }; + regexCompat93 = self.regexCompat_0_93_1; regexCompat = self.regexCompat_0_71_0_1; regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; @@ -1118,6 +1160,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; + syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {}; syb = null; # by default, we assume that syb ships with GHC, which is # true for the older GHC versions @@ -1207,8 +1250,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; - text_0_11_1_9 = callPackage ../development/libraries/haskell/text/0.11.1.9.nix {}; - text = self.text_0_11_1_9; + text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; + text_0_11_1_12 = callPackage ../development/libraries/haskell/text/0.11.1.12.nix {}; + text = self.text_0_11_1_12; thespian = callPackage ../development/libraries/haskell/thespian {}; @@ -1367,9 +1411,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; - zipper = callPackage ../development/libraries/haskell/zipper { - multirec = self.multirec_0_5_1; - }; + zipper = callPackage ../development/libraries/haskell/zipper {}; zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; @@ -1455,7 +1497,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. - darcs = callPackage ../applications/version-management/darcs {}; + darcs = callPackage ../applications/version-management/darcs { + regexCompat = self.regexCompat93; + }; leksah = callPackage ../applications/editors/leksah {}; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7381c23de7e..e1976b5d732 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -382,9 +382,8 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox50Pkgs.firefox = linux; - firefox70Pkgs.firefox = linux; firefox80Pkgs.firefox = linux; + firefox90Pkgs.firefox = linux; gnome = { gnome_panel = linux;