diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 7bcbadd8ea9..f0cabe425a3 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -6,7 +6,7 @@ The standard build environment in the Nix Packages collection -provides a environment for building Unix packages that does a lot of +provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard ./configure; make; make install build interface, you don’t need to write a build script at all; the standard diff --git a/maintainers/docs/cross.txt b/maintainers/docs/cross.txt index 32e09086b87..9c117774fc4 100644 --- a/maintainers/docs/cross.txt +++ b/maintainers/docs/cross.txt @@ -41,7 +41,7 @@ NB: Keep in mind that many programs are not very well suited for cross compilation. Either they are not intended to run on other platforms, -because the code is highly platform specific, or the configuration proces +because the code is highly platform specific, or the configuration process is not written with cross compilation in mind. Nix will not solve these problems for you! @@ -290,7 +290,7 @@ this compiler and verified to be working on a HP Jornada 820 running Linux are "patch", "make" and "wget". If we want to build C++ programs it gets a lot more difficult. GCC has a -three step compilation proces. In the first step a simple compiler, called +three step compilation process. In the first step a simple compiler, called xgcc, that can compile only C programs is built. With that compiler it compiles itself two more times: one time to build a full compiler, and another time to build a full compiler once again with the freshly built compiler from @@ -318,7 +318,7 @@ with compilation flags. This is still work in progress for Nix. --- -After succesfully completing the whole toolchain you can start building +After successfully completing the whole toolchain you can start building packages with the newly built tools. To make everything build correctly you will need a stdenv for your target platform. Setting up this platform will take some effort. Right now there is a very experimental setup for diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 4e34aad052b..c1b0db895bc 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -24,7 +24,7 @@ for source in $dbs; do echo "selector $selector does not match any revision"; fi else - echo "pulling branch $branch wasn't succesfull"; + echo "pulling branch $branch wasn't successful"; fi; if test -n "$done"; then break; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix new file mode 100644 index 00000000000..c5fe46f02c6 --- /dev/null +++ b/pkgs/development/compilers/orc/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "orc-0.4.17"; + + src = fetchurl { + url = "http://code.entropywave.com/download/orc/${name}.tar.gz"; + sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg"; + }; + + meta = { + description = "The Oil Runtime Compiler"; + homepage = "http://code.entropywave.com/orc/"; + # The source code implementing the Marsenne Twister algorithm is licensed + # under the 3-clause BSD license. The rest is 2-clause BSD license. + license = stdenv.lib.license.bsd3; + platform = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.iyzsong ]; + }; +} diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh index f8e4f5e0fd6..112dbe0c513 100644 --- a/pkgs/development/libraries/libxml2/setup-hook.sh +++ b/pkgs/development/libraries/libxml2/setup-hook.sh @@ -11,7 +11,7 @@ addXMLCatalogs () { if test -z "$libxmlHookDone"; then libxmlHookDone=1 - # Set http_proxy and ftp_proxy to a invalid host to prevent + # Set http_proxy and ftp_proxy to an invalid host to prevent # xmllint and xsltproc from trying to download DTDs from the # network even when --nonet is not given. That would be impure. # (Note that .invalid is a reserved domain guaranteed not to diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index ab76e2018c0..354bf39aea5 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -24,9 +24,10 @@ goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; iElectric = "Domen Kozar "; - lovek323 = "Jason O'Conal "; + iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; + lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4b5a7149e8..89c05bb87cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2763,6 +2763,8 @@ let ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { }; + orc = callPackage ../development/compilers/orc { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7c686addb9..5cfa7b94353 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -808,11 +808,11 @@ pythonPackages = modules // rec { colander = buildPythonPackage rec { - name = "colander-0.9.6"; + name = "colander-1.0a5"; src = fetchurl { url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz"; - md5 = "2d9f65a64cb6b7f35d6a0d7b607ce4c6"; + md5 = "569dea523561f5d94338ef9d9a98d249"; }; propagatedBuildInputs = [ pythonPackages.translationstring ]; @@ -1005,11 +1005,11 @@ pythonPackages = modules // rec { deform = buildPythonPackage rec { - name = "deform-0.9.4"; + name = "deform-0.9.7"; src = fetchurl { url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz"; - md5 = "2ed7b69644a6d8f4e1404e1892329240"; + md5 = "d450eef05432d473257da5621c72c8b7"; }; buildInputs = [] ++ optional isPy26 unittest2; @@ -1020,6 +1020,9 @@ pythonPackages = modules // rec { pythonPackages.colander pythonPackages.translationstring pythonPackages.chameleon + pythonPackages.zope_deprecation + pythonPackages.coverage + pythonPackages.nose ]; meta = { @@ -1394,6 +1397,8 @@ pythonPackages = modules // rec { }; + + zope_deprecation = buildPythonPackage rec { name = "zope.deprecation-3.5.0"; @@ -1627,6 +1632,26 @@ pythonPackages = modules // rec { }; + django_tagging = buildPythonPackage rec { + name = "django-tagging-0.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/django-tagging/${name}.tar.gz"; + md5 = "a0855f2b044db15f3f8a025fa1016ddf"; + }; + + # error: invalid command 'test' + doCheck = false; + + propagatedBuildInputs = [ django_1_3 ]; + + meta = { + description = "A generic tagging application for Django projects"; + homepage = http://code.google.com/p/django-tagging/; + }; + }; + + djblets = buildPythonPackage rec { name = "Djblets-0.6.28"; @@ -6308,11 +6333,11 @@ pythonPackages = modules // rec { }; translationstring = buildPythonPackage rec { - name = "translationstring-0.4"; + name = "translationstring-1.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz"; - md5 = "392287923c475b660b7549b2c2f03dbc"; + md5 = "0979b46d8f0f852810c8ec4be5c26cf2"; }; meta = { @@ -6475,7 +6500,19 @@ pythonPackages = modules // rec { sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag"; }; - buildInputs = [ django pkgs.pycairo ldap memcached modules.sqlite3 ]; + propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; + + postInstall = '' + wrapProgram $out/bin/run-graphite-devel-server.py \ + --prefix PATH : ${pkgs.which}/bin + ''; + + preConfigure = '' + substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo' + substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join(WEBAPP_DIR, 'webapp', 'content')" + cp webapp/graphite/manage.py bin/manage-graphite.py + substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings' + ''; # error: invalid command 'test' doCheck = false;