From 094ffb2b08d20f1b20aa62dd87921dc3ed7cbb4e Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 11:00:45 +0800 Subject: [PATCH 1/7] add orc 0.4.17 --- pkgs/development/compilers/orc/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/compilers/orc/default.nix diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix new file mode 100644 index 00000000000..25abd8f3e85 --- /dev/null +++ b/pkgs/development/compilers/orc/default.nix @@ -0,0 +1,16 @@ +{ 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/"; + platform = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2488f3339f5..0080661c1d3 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 { }; From 8e023d078cb2071edf2f5fd9fa5f9308ad05e5e3 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 12:07:57 +0800 Subject: [PATCH 2/7] orc: add missing license (bsd3) --- pkgs/development/compilers/orc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 25abd8f3e85..fbb25effdec 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "The Oil Runtime Compiler"; homepage = "http://code.entropywave.com/orc/"; + license = stdenv.lib.license.bsd3; platform = stdenv.lib.platforms.linux; }; } From 5f4fc730b12aba77bf02abeb494e45640192804b Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 15:14:12 +0800 Subject: [PATCH 3/7] add myself to maintainers list, keep it sorted orc: add myself as a maintainer --- pkgs/development/compilers/orc/default.nix | 1 + pkgs/lib/maintainers.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index fbb25effdec..c7582d0a90d 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { homepage = "http://code.entropywave.com/orc/"; license = stdenv.lib.license.bsd3; platform = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.iyzsong ]; }; } 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 "; From 50021ebb0a94d4dec5752dfea3e58b02c55f16af Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Aug 2013 12:05:02 +0200 Subject: [PATCH 4/7] pythonPackages: fix graphite_web, make it usable --- pkgs/top-level/python-packages.nix | 34 +++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7c686addb9..95a7b4195e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1627,6 +1627,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"; @@ -6475,7 +6495,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; From 1866619acc6bb163e4cc60b37333e9119a30a226 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sun, 11 Aug 2013 10:47:09 +0000 Subject: [PATCH 5/7] Fix a few typos --- doc/stdenv.xml | 2 +- maintainers/docs/cross.txt | 6 +++--- pkgs/build-support/fetchmtn/builder.sh | 2 +- pkgs/development/libraries/libxml2/setup-hook.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) 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/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 From 1cdc07296da25beb824991db2b5801b96e6877ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 11 Aug 2013 14:29:40 +0200 Subject: [PATCH 6/7] update deform,colander,translationstring python modules --- pkgs/top-level/python-packages.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95a7b4195e4..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"; @@ -6328,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 = { From 078213e892bc1bfbcc47815b7e598d0047de8ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 11 Aug 2013 14:50:55 +0200 Subject: [PATCH 7/7] orc: add a comment about the license --- pkgs/development/compilers/orc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index c7582d0a90d..c5fe46f02c6 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { 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 ];