diff options
49 files changed, 714 insertions, 386 deletions
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix new file mode 100644 index 000000000000..5de501ebd415 --- /dev/null +++ b/pkgs/applications/office/impressive/default.nix @@ -0,0 +1,77 @@ +{ fetchurl, stdenv, python, makeWrapper, lib +, xpdf, pil, pyopengl, pygame +, setuptools, mesa, freeglut }: + +let version = "0.10.2"; +in + stdenv.mkDerivation { + # This project was formerly known as KeyJNote. + # See http://keyj.s2000.ws/?p=77 for details. + + name = "impressive-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; + sha256 = "1py36h9085ycxj3qnmqdps0dfghlr5qb2i62l0ynzngn55dgz950"; + }; + + # Note: We need to have `setuptools' in the path to be able to use + # PyOpenGL. + buildInputs = [ makeWrapper xpdf pil pyopengl pygame ]; + + configurePhase = '' + sed -i "impressive.py" \ + -e 's|^#!/usr/bin/env.*$|#!${python}/bin/python|g' + ''; + + installPhase = '' + ensureDir "$out/bin" "$out/share/doc/impressive" + mv impressive.py "$out/bin/impressive" + mv * "$out/share/doc/impressive" + + # XXX: We have to reiterate PyOpenGL's dependencies here. + # + # `setuptools' must be in the Python path as it's used by + # PyOpenGL. + # + # We set $LIBRARY_PATH (no `LD_'!) so that ctypes can find + # `libGL.so', which it does by running `gcc', which in turn + # honors $LIBRARY_PATH. See + # http://python.net/crew/theller/ctypes/reference.html#id1 . + wrapProgram "$out/bin/impressive" \ + --prefix PATH ":" "${xpdf}" \ + --prefix PYTHONPATH ":" \ + ${lib.concatStringsSep ":" + (map (path: + path + "/lib/python2.5/site-packages:" + + path + "/lib/python2.4/site-packages") + [ pil pyopengl pygame setuptools ])} \ + --prefix LIBRARY_PATH ":" "${mesa}/lib:${freeglut}/lib" + ''; + + meta = { + description = "Impressive, an effect-rich presentation tool for PDFs"; + + longDescription = '' + Impressive is a program that displays presentation slides. + But unlike OpenOffice.org Impress or other similar + applications, it does so with style. Smooth alpha-blended + slide transitions are provided for the sake of eye candy, but + in addition to this, Impressive offers some unique tools that + are really useful for presentations. Read below if you want + to know more about these features. + + Creating presentations for Impressive is very simple: You just + need to export a PDF file from your presentation software. + This means that you can create slides in the application of + your choice and use Impressive for displaying them. If your + application does not support PDF output, you can alternatively + use a set of pre-rendered image files – or you use Impressive + to make a slideshow with your favorite photos. + ''; + + homepage = http://impressive.sourceforge.net/; + + license = "GPLv2"; + }; + } diff --git a/pkgs/applications/office/keyjnote/default.nix b/pkgs/applications/office/keyjnote/default.nix deleted file mode 100644 index 3d8093dc2668..000000000000 --- a/pkgs/applications/office/keyjnote/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ fetchurl, stdenv, python, makeWrapper, lib -, xpdf, pil, pyopengl, pygame -, setuptools, mesa, freeglut }: - -let version = "0.10.2"; -in - stdenv.mkDerivation { - name = "keyjnote-${version}"; - - src = fetchurl { - # XXX: This project has become homeless and Debian seems to be - # the only reliable way to get its source. - url = "mirror://debian/pool/main/k/keyjnote/keyjnote_${version}.orig.tar.gz"; - sha256 = "1rnc17da5fkfip2ijzlhxh31rykq5v5bknil8q6xnx30w8ydmy1s"; - }; - - # Note: We need to have `setuptools' in the path to be able to use - # PyOpenGL. - buildInputs = [ makeWrapper xpdf pil pyopengl pygame ]; - - configurePhase = '' - sed -i "keyjnote.py" \ - -e 's|^#!/usr/bin/env.*$|#!${python}/bin/python|g' - ''; - - installPhase = '' - ensureDir "$out/bin" "$out/share/doc/keyjnote" - mv keyjnote.py "$out/bin/keyjnote" - mv * "$out/share/doc/keyjnote" - - # XXX: We have to reiterate PyOpenGL's dependencies here. - # - # `setuptools' must be in the Python path as it's used by - # PyOpenGL. - # - # We set $LIBRARY_PATH (no `LD_'!) so that ctypes can find - # `libGL.so', which it does by running `gcc', which in turn - # honors $LIBRARY_PATH. See - # http://python.net/crew/theller/ctypes/reference.html#id1 . - wrapProgram "$out/bin/keyjnote" \ - --prefix PATH ":" "${xpdf}" \ - --prefix PYTHONPATH ":" \ - ${lib.concatStringsSep ":" - (map (path: - path + "/lib/python2.5/site-packages:" + - path + "/lib/python2.4/site-packages") - [ pil pyopengl pygame setuptools ])} \ - --prefix LIBRARY_PATH ":" "${mesa}/lib:${freeglut}/lib" - ''; - - meta = { - description = "KeyJnote, an effect-rich presentation tool for PDFs"; - - # This project has become homeless and will be renamed! - # See http://keyj.s2000.ws/?p=77 for details. - #homepage = http://keyjnote.sourceforge.net/; - - license = "GPLv2"; - }; - } diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index e148b8b56120..427c3e9c9558 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, boost, zlib}: stdenv.mkDerivation { - name = "monotone-0.40"; + name = "monotone-0.42"; src = fetchurl { - url = http://monotone.ca/downloads/0.40/monotone-0.40.tar.gz; - sha256 = "0zs1zxvdn0m27w1830qbbh5vqk948hkpdkxwnlghszcbzz49151h"; + url = http://monotone.ca/downloads/0.42/monotone-0.42.tar.gz; + sha256 = "0i6srfx0ps8hlgdbn0y7iy9gi33a7vpiwdm5rhxjxgvhn5j9svdr"; }; buildInputs = [boost zlib]; } diff --git a/pkgs/build-support/release/make-source-tarball.nix b/pkgs/build-support/release/make-source-tarball.nix index 2e40ad2d6231..731c29945275 100644 --- a/pkgs/build-support/release/make-source-tarball.nix +++ b/pkgs/build-support/release/make-source-tarball.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation ( postHook = '' ensureDir $out/nix-support + shopt -s nullglob ''; postUnpack = '' @@ -68,6 +69,11 @@ stdenv.mkDerivation ( autoconfPhase = '' export VERSION=${version} export VERSION_SUFFIX=${versionSuffix} + + # `svn-revision' is set for backwards compatibility with the old + # Nix buildfarm. (Stratego/XT's autoxt uses it. We should + # update it eventually.) + echo ${versionSuffix} | sed -e s/pre// > svn-revision eval "$preAutoconf" @@ -87,7 +93,6 @@ stdenv.mkDerivation ( tarballs = "*.tar.gz *.tar.bz2"; finalPhase = '' - shopt -s nullglob for i in $out/tarballs/*; do echo "file source-dist $i" >> $out/nix-support/hydra-build-products done diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 8adc7fb634bc..6ba17bc54256 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "man-pages-3.18"; + name = "man-pages-3.19"; src = fetchurl { - url = "mirror://kernel/linux/docs/man-pages/${name}.tar.bz2"; - sha256 = "7be08777fae2c873106f6d3ae09678444e635112ad9c52f9e9200439710dd8de"; + url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2"; + sha256 = "1xzazq6wknyi2bjw39z6jswifn3gq3f2wr0mp06xgz7fzr0d266q"; }; preBuild = " diff --git a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl index d3952ccff3cb..3867d5b171c0 100644 --- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl +++ b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl @@ -31,7 +31,7 @@ // rm -f /tmp/keyboard.xkm.ps /tmp/keyboard.xkm // -partial alphanumeric_keys +partial hidden alphanumeric_keys xkb_symbols "altgr-intl" { name[Group1]= "U.S. English - International (AltGr dead keys)"; @@ -70,7 +70,7 @@ xkb_symbols "altgr-intl" { key <AC03> { [ d, D, eth, ETH ] }; key <AC04> { [ f, F ] }; key <AC05> { [ g, G ] }; - key <AC06> { [ h, H ] }; + key <AC06> { [ h, H, hyphen, nobreakspace ] }; key <AC07> { [ j, J, idiaeresis, Idiaeresis ] }; key <AC08> { [ k, K ] }; key <AC09> { [ l, L, oslash, Ooblique ] }; @@ -83,7 +83,7 @@ xkb_symbols "altgr-intl" { key <AB04> { [ v, V, registered, registered ] }; key <AB05> { [ b, B, emdash, endash ] }; key <AB06> { [ n, N, ntilde, Ntilde ] }; - key <AB07> { [ m, M, mu, mu ] }; + key <AB07> { [ m, M, mu, plusminus ] }; key <AB08> { [ comma, less, ccedilla, Ccedilla ] }; key <AB09> { [ period, greater, dead_abovedot, dead_caron ] }; key <AB10> { [ slash, question, questiondown, dead_hook ] }; diff --git a/pkgs/development/compilers/java-front/builder.sh b/pkgs/development/compilers/java-front/builder.sh deleted file mode 100644 index 0177abcccea2..000000000000 --- a/pkgs/development/compilers/java-front/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-aterm=$aterm --with-sdf=$sdf --with-strategoxt=$strategoxt" -genericBuild diff --git a/pkgs/development/compilers/java-front/default.nix b/pkgs/development/compilers/java-front/default.nix deleted file mode 100644 index fc60e72a5627..000000000000 --- a/pkgs/development/compilers/java-front/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, strategoxt, pkgconfig}: - -stdenv.mkDerivation { - name = "java-front-0.9"; - builder = ./builder.sh; - - src = fetchurl { - url = http://buildfarm.st.ewi.tudelft.nl/releases/strategoxt/java-front-0.9pre17376-qi43zwhy/java-front-0.9pre17376.tar.gz; - md5 = "fec70158b110c77a2e5db29676438029"; - }; - - inherit aterm sdf strategoxt; - buildInputs = [pkgconfig aterm sdf strategoxt]; -} diff --git a/pkgs/development/compilers/strategoxt/0.16.nix b/pkgs/development/compilers/strategoxt/0.16.nix new file mode 100644 index 000000000000..5795787c06a7 --- /dev/null +++ b/pkgs/development/compilers/strategoxt/0.16.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, aterm, pkgconfig, getopt}: + +rec { + + inherit aterm; + + + sdf = stdenv.mkDerivation rec { + name = "sdf2-bundle-2.3.3"; + + src = fetchurl { + url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.3.3/sdf2-bundle-2.3.3.tar.gz; + md5 = "62ecabe5fbb8bbe043ee18470107ef88"; + }; + + buildInputs = [pkgconfig aterm getopt]; + + preConfigure = '' + substituteInPlace pgen/src/sdf2table.src \ + --replace getopt ${getopt}/bin/getopt + ''; + + configureFlags = "--disable-static"; + + meta = { + homepage = http://www.program-transformation.org/Sdf/SdfBundle; + meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser"; + }; + }; + + + strategoxt = stdenv.mkDerivation { + name = "strategoxt-0.16"; + + src = fetchurl { + url = ftp://ftp.strategoxt.org/pub/stratego/StrategoXT/strategoxt-0.16/strategoxt-0.16.tar.gz; + md5 = "8b8eabbd785faa84ec20134b63d4829e"; + }; + + buildInputs = [pkgconfig aterm sdf getopt]; + + configureFlags = "--disable-static"; + + meta = { + homepage = http://strategoxt.org/; + meta = "A language and toolset for program transformation"; + }; + }; + + +} diff --git a/pkgs/development/compilers/strategoxt/0.17.nix b/pkgs/development/compilers/strategoxt/0.17.nix new file mode 100644 index 000000000000..7bc045fd64c4 --- /dev/null +++ b/pkgs/development/compilers/strategoxt/0.17.nix @@ -0,0 +1,102 @@ +{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk}: + +rec { + + inherit aterm; + + + sdf = stdenv.mkDerivation rec { + name = "sdf2-bundle-2.4pre212034"; + + src = fetchurl { + url = "http://releases.strategoxt.org/strategoxt-0.17/sdf2-bundle/${name}-37nm9z7p/sdf2-bundle-2.4.tar.gz"; + sha256 = "2ec83151173378f48a3326e905d11049d094bf9f0c7cff781bc2fce0f3afbc11"; + }; + + buildInputs = [pkgconfig aterm]; + + preConfigure = '' + substituteInPlace pgen/src/sdf2table.src \ + --replace getopt ${getopt}/bin/getopt + ''; + + configureFlags = "--disable-static"; + + meta = { + homepage = http://www.program-transformation.org/Sdf/SdfBundle; + meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser"; + }; + }; + + + strategoxt = stdenv.mkDerivation rec { + name = "strategoxt-0.17pre18269"; + + src = fetchurl { + url = "http://releases.strategoxt.org/strategoxt/${name}-a0f0wy0j/${name}.tar.gz"; + sha256 = "7c51c2452bd45f34cd480b6b3cbaac50e0fc53fbb1a884d97cf4e2c2b5330577"; + }; + + buildInputs = [pkgconfig aterm sdf getopt]; + + configureFlags = "--disable-static"; + + meta = { + homepage = http://strategoxt.org/; + meta = "A language and toolset for program transformation"; + }; + }; + + + javafront = stdenv.mkDerivation rec { + name = "java-front-0.9pre1823618236"; + + src = fetchurl { + url = "http://releases.strategoxt.org/java-front/${name}-frb8zh7m/java-front-0.9pre18236.tar.gz"; + sha256 = "93d2919cfbda41a96a944f71ae57704ad1f0efcc0c1084b501a4536f82e25387"; + }; + + buildInputs = [pkgconfig aterm sdf strategoxt]; + + # !!! The explicit `--with-strategoxt' is necessary; otherwise we + # get an XTC registration that refers to "/share/strategoxt/XTC". + configureFlags = "--disable-static --enable-xtc --with-strategoxt=${strategoxt}"; + + meta = { + homepage = http://strategoxt.org/Stratego/JavaFront; + meta = "Tools for generating or transforming Java code"; + }; + }; + + + dryad = stdenv.mkDerivation rec { + name = "dryad-0.2pre1835518355"; + + src = fetchurl { + url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz"; + sha256 = "2c27b7f82f87ffc27b75969acc365560651275d348b3b5cbb530276d20ae83ab"; + }; + + buildInputs = [jdk pkgconfig aterm sdf strategoxt javafront]; + + configureFlags = "--disable-static"; + + meta = { + homepage = http://strategoxt.org/Stratego/TheDryad; + meta = "A collection of tools for developing transformation systems for Java source and bytecode"; + }; + }; + + + /* + libraries = ... { + configureFlags = + if stdenv ? isMinGW && stdenv.isMinGW then "--with-std=C99" else ""; + + # avoids loads of warnings about too big description fields because of a broken debug format + CFLAGS = + if stdenv ? isMinGW && stdenv.isMinGW then "-O2" else null; + }; + */ + +} diff --git a/pkgs/development/compilers/strategoxt/builder.sh b/pkgs/development/compilers/strategoxt/builder.sh deleted file mode 100644 index da02ebcb5e92..000000000000 --- a/pkgs/development/compilers/strategoxt/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-aterm=$aterm --with-sdf=$sdf" -genericBuild diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix deleted file mode 100644 index a607d30da6d8..000000000000 --- a/pkgs/development/compilers/strategoxt/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -import ./strategoxt-0.16.nix - diff --git a/pkgs/development/compilers/strategoxt/libraries/stratego-libraries-0.17pre.nix b/pkgs/development/compilers/strategoxt/libraries/stratego-libraries-0.17pre.nix deleted file mode 100644 index 89e26542f498..000000000000 --- a/pkgs/development/compilers/strategoxt/libraries/stratego-libraries-0.17pre.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, pkgconfig, aterm}: - -stdenv.mkDerivation { - name = "stratego-libraries-0.17"; - src = - fetchurl { - url = http://www.cs.uu.nl/people/martin/stratego-libraries.tar.gz; - md5 = "e99ce18179400c8ef373e8e668a4c576"; - }; - - buildInputs = [pkgconfig aterm]; - - configureFlags = - if stdenv ? isMinGW && stdenv.isMinGW then "--with-std=C99" else ""; - - # avoids loads of warnings about too big description fields because of a broken debug format - CFLAGS = - if stdenv ? isMinGW && stdenv.isMinGW then "-O2" else null; -} diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix deleted file mode 100644 index 003a9ece1004..000000000000 --- a/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, pkgconfig}: - -stdenv.mkDerivation { - - name = "strategoxt-0.14"; - builder = ./builder.sh; - - src = fetchurl { - url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.14/strategoxt-0.14.tar.gz; - md5 = "143f01cc27231ccd5eddb695a7b79c69"; - }; - - inherit aterm sdf; - buildInputs = [pkgconfig aterm sdf]; -} diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix deleted file mode 100644 index e87afc3bdc04..000000000000 --- a/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, pkgconfig}: - -stdenv.mkDerivation { - - name = "strategoxt-0.16"; - builder = ./builder.sh; - - src = fetchurl { - url = http://nix.cs.uu.nl/dist/stratego/strategoxt-0.16/strategoxt-0.16.tar.gz; - md5 = "8b8eabbd785faa84ec20134b63d4829e"; - }; - - inherit aterm sdf; - buildInputs = [pkgconfig aterm sdf]; -} diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.17.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.17.nix deleted file mode 100644 index fa56d6e35e63..000000000000 --- a/pkgs/development/compilers/strategoxt/strategoxt-0.17.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, pkgconfig}: - -stdenv.mkDerivation { - - name = "strategoxt-0.17"; - builder = ./builder.sh; - - src = fetchurl { - url = http://buildfarm.st.ewi.tudelft.nl/releases/strategoxt/strategoxt-0.17M3pre17099/strategoxt-0.17M3pre17099.tar.gz; - md5 = "fc9bc3cb6d80bfa6ee1fadd2dd828c72"; - }; - - inherit aterm sdf; - buildInputs = [pkgconfig aterm sdf]; -} diff --git a/pkgs/development/compilers/strategoxt/utils/default.nix b/pkgs/development/compilers/strategoxt/utils/default.nix deleted file mode 100644 index fabe0de9cb90..000000000000 --- a/pkgs/development/compilers/strategoxt/utils/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -import ./strategoxt-utils-0.16.nix - diff --git a/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.14.nix b/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.14.nix deleted file mode 100644 index 7de074f0a128..000000000000 --- a/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.14.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, strategoxt, pkgconfig}: - -stdenv.mkDerivation { - name = "strategoxt-utils-0.14"; - src = fetchurl { - url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.14/strategoxt-utils-0.14.tar.gz; - md5 = "d9aab7fbda5b93fb7c49434131393324"; - }; - - inherit aterm sdf; - buildInputs = [pkgconfig aterm sdf strategoxt]; -} diff --git a/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.16.nix b/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.16.nix deleted file mode 100644 index fa4aac54ba69..000000000000 --- a/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.16.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, strategoxt, pkgconfig}: - -stdenv.mkDerivation { - name = "strategoxt-utils-0.16"; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/stratego/strategoxt-utils-0.16/strategoxt-utils-0.16.tar.gz; - md5 = "a118d67e7a2f1eb61f0cfccbe61aa509"; - }; - - inherit aterm sdf; - buildInputs = [pkgconfig aterm sdf strategoxt]; -} diff --git a/pkgs/development/compilers/transformers/builder.sh b/pkgs/development/compilers/transformers/builder.sh deleted file mode 100644 index e8d0fc149e6d..000000000000 --- a/pkgs/development/compilers/transformers/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -. $stdenv/setup - -configureFlags="--with-stlport=$stlport/include" -genericBuild \ No newline at end of file diff --git a/pkgs/development/compilers/transformers/default.nix b/pkgs/development/compilers/transformers/default.nix deleted file mode 100644 index 1b08d2935c2c..000000000000 --- a/pkgs/development/compilers/transformers/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -import ./transformers-0.4.nix - diff --git a/pkgs/development/compilers/transformers/transformers-0.4.nix b/pkgs/development/compilers/transformers/transformers-0.4.nix deleted file mode 100644 index 557406cadca8..000000000000 --- a/pkgs/development/compilers/transformers/transformers-0.4.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, strategoxt, stlport, pkgconfig}: - -stdenv.mkDerivation { - builder = ./builder.sh; - name = "transformers-0.4"; - - src = fetchurl { - url = http://www.lrde.epita.fr/dload/transformers/transformers-0.4.tar.bz2; - md5 = "19f5b752aec5f4d09cf45cc199fd5bfb"; - }; - - inherit stlport; - buildInputs = [pkgconfig aterm sdf strategoxt stlport]; -} diff --git a/pkgs/development/compilers/webdsl/builder.sh b/pkgs/development/compilers/webdsl/builder.sh deleted file mode 100644 index d77094a91b0c..000000000000 --- a/pkgs/development/compilers/webdsl/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-aterm=$aterm --with-sdf=$sdf --with-strategoxt=$strategoxt" -genericBuild - -# Replace /bin/bash in WebDSL script (maybe there is a better solution?) - -sed -i -e "s|#!/bin/bash|#!/bin/sh|" $out/bin/webdsl diff --git a/pkgs/development/compilers/webdsl/default.nix b/pkgs/development/compilers/webdsl/default.nix index e99456b5d2fe..096a7164f9e5 100644 --- a/pkgs/development/compilers/webdsl/default.nix +++ b/pkgs/development/compilers/webdsl/default.nix @@ -1,14 +1,20 @@ -{stdenv, fetchurl, aterm, sdf, strategoxt, pkgconfig, javafront}: +{stdenv, fetchurl, pkgconfig, strategoPackages}: -stdenv.mkDerivation { - name = "webdsl-8.2pre1006"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "webdsl-8.8pre25482548"; src = fetchurl { - url = http://buildfarm.st.ewi.tudelft.nl/releases/strategoxt/webdsl-8.2pre1006-c8h623yn/webdsl-8.2.tar.gz; - md5 = "07c2471c961acc6467c55594e49da7c1"; + url = "http://releases.strategoxt.org/webdsl/${name}-chm695sm/webdsl-8.8pre2548.tar.gz"; + sha256 = "cc4bcc9ef98d35e96b9874d48e061c5bc18cb26300a031becc227a1cd5a1deac"; }; - inherit aterm sdf strategoxt javafront; - buildInputs = [pkgconfig aterm sdf strategoxt javafront]; + buildInputs = [ + pkgconfig strategoPackages.aterm strategoPackages.sdf + strategoPackages.strategoxt strategoPackages.javafront + ]; + + meta = { + homepage = http://webdsl.org/; + description = "A domain-specific language for developing dynamic web applications with a rich data model"; + }; } diff --git a/pkgs/development/libraries/gtk-libs/2.14/default.nix b/pkgs/development/libraries/gtk-libs/2.14/default.nix index a5ac93d068d1..89abc0e62086 100644 --- a/pkgs/development/libraries/gtk-libs/2.14/default.nix +++ b/pkgs/development/libraries/gtk-libs/2.14/default.nix @@ -12,7 +12,6 @@ rec { inherit glib atk pango; }); - glibmm = (import ./glibmm) (args // { inherit glib; }); pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; }); diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 192e22add6ef..cf91952534c4 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,18 +1,19 @@ -args: with args; +{stdenv, fetchurl, unzip, xlibs, libjpeg}: + stdenv.mkDerivation rec { - name = "jasper-1.900.1"; + name = "jasper-1.900.1"; - src = fetchurl { - url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip"; - sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; - }; + src = fetchurl { + url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip"; + sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; + }; - buildInputs = [ unzip libjpeg xproto libX11 libICE freeglut mesa libXmu - libXi libXext libXt ]; - configureFlags = "--enable-shared --disable-static --with-x"; + buildInputs = [unzip libjpeg]; + + configureFlags = "--enable-shared --disable-static"; - meta = { - homepage = http://www.ece.uvic.ca/~mdadams/jasper/; - description = "JasPer JPEG2000 Library"; - }; + meta = { + homepage = http://www.ece.uvic.ca/~mdadams/jasper/; + description = "JasPer JPEG2000 Library"; + }; } diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix new file mode 100644 index 000000000000..f1caa951f66c --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, jdk, python}: + +stdenv.mkDerivation { + name = "antlr-2.7.7"; + src = fetchurl { + url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz"; + sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5"; + }; + buildInputs = [jdk python]; +} diff --git a/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix b/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix deleted file mode 100644 index baadc510f89f..000000000000 --- a/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, jdk, python}: - -stdenv.mkDerivation { - name = "antlr-2.7.6"; - src = fetchurl { - url = http://www.antlr.org/download/antlr-2.7.6.tar.gz; - md5 = "17d8bf2e814f0a26631aadbbda8d7324"; - }; - buildInputs = [jdk python]; -} diff --git a/pkgs/development/tools/parsing/sdf/builder.sh b/pkgs/development/tools/parsing/sdf/builder.sh deleted file mode 100644 index 083b2be77964..000000000000 --- a/pkgs/development/tools/parsing/sdf/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-aterm=$aterm" - -genericBuild \ No newline at end of file diff --git a/pkgs/development/tools/parsing/sdf/default.nix b/pkgs/development/tools/parsing/sdf/default.nix deleted file mode 100644 index 02c0fe8579b1..000000000000 --- a/pkgs/development/tools/parsing/sdf/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ./sdf2-bundle-2.3.3.nix diff --git a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix deleted file mode 100644 index 46dcefd0eaaa..000000000000 --- a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, aterm, getopt}: - -stdenv.mkDerivation { - name = "sdf2-bundle-2.2"; - builder = ./builder.sh; - src = fetchurl { - url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.2.tar.gz; - md5 = "995a1739134615b60b1fe796d6c9d0e6"; - }; - - buildInputs = [aterm]; - propagatedBuildInputs = [getopt]; - inherit aterm; -} diff --git a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.3.nix b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.3.nix deleted file mode 100644 index c2620b561abe..000000000000 --- a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.3.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, aterm, getopt, pkgconfig}: - -stdenv.mkDerivation { - name = "sdf2-bundle-2.3.3"; - src = fetchurl { - url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.3.3/sdf2-bundle-2.3.3.tar.gz; - md5 = "62ecabe5fbb8bbe043ee18470107ef88"; - }; - - buildInputs = [aterm pkgconfig]; - propagatedBuildInputs = [getopt]; -} diff --git a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.4.nix b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.4.nix deleted file mode 100644 index 7d62d7430700..000000000000 --- a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.4.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, aterm, getopt, pkgconfig}: - -stdenv.mkDerivation { - name = "sdf2-bundle-2.4"; - src = fetchurl { - url = http://buildfarm.st.ewi.tudelft.nl/releases/meta-environment/sdf2-bundle-2.4pre212034-2nspl1xc/sdf2-bundle-2.4.tar.gz; - md5 = "00107bef17d3fb8486575f8974fb384b"; - }; - - buildInputs = [aterm pkgconfig]; - propagatedBuildInputs = [getopt]; -} diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix index 5687475d8fdd..9d8a641b4a8a 100644 --- a/pkgs/servers/portmap/default.nix +++ b/pkgs/servers/portmap/default.nix @@ -1,10 +1,11 @@ { fetchurl, stdenv, lib, tcpWrapper -, daemonUser, daemonUID, daemonGID }: +, daemonUser ? false, daemonUID ? false, daemonGID ? false }: assert daemonUser -> (!daemonUID && !daemonGID); stdenv.mkDerivation rec { name = "portmap-6.0"; + src = fetchurl { url = "http://neil.brown.name/portmap/${name}.tgz"; sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02"; diff --git a/pkgs/shells/bash/4.0.nix b/pkgs/shells/bash/4.0.nix new file mode 100644 index 000000000000..0554039f279c --- /dev/null +++ b/pkgs/shells/bash/4.0.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null, readline ? null}: + +assert interactive -> ncurses != null; +assert interactive -> readline != null; + +stdenv.mkDerivation { + name = "bash-4.0"; + + src = fetchurl { + url = mirror://gnu/bash/bash-4.0.tar.gz; + sha256 = "9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518"; + }; + + NIX_CFLAGS_COMPILE = '' + -DSYS_BASHRC="/etc/bashrc" + -DSYS_BASH_LOGOUT="/etc/bash_logout" + -DDEFAULT_PATH_VALUE="/no-such-path" + -DSTANDARD_UTILS_PATH="/no-such-path" + -DNON_INTERACTIVE_LOGIN_SHELLS + -DSSH_SOURCE_BASHRC + ''; + + postInstall = "ln -s bash $out/bin/sh"; + + patches = [ + # For dietlibc builds. + ./winsize.patch + ]; + + configureFlags = if interactive then "--enable-readline --with-installed-readline" else ""; + + # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch) + buildInputs = [bison] + ++ stdenv.lib.optional (texinfo != null) texinfo + ++ stdenv.lib.optional interactive readline + ++ stdenv.lib.optional interactive ncurses; + + meta = { + homepage = http://www.gnu.org/software/bash/; + description = + "GNU Bourne-Again Shell, the de facto standard shell on Linux" + + (if interactive then " (for interactive use)" else ""); + }; +} diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 16a0e5dc6cb8..edc3e7d51e3f 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth}: -# if you have any trouble connecting to the tightvnc server try $ rm ~/.Xauthority -# Dunno what happens here but it works. - stdenv.mkDerivation { - name = "tightvnc-1.3.9"; + name = "tightvnc-1.3.10"; builder = ./builder.sh; gcc=stdenv.gcc.gcc; inherit perl; src = fetchurl { - url = mirror://sourceforge/vnc-tight/tightvnc-1.3.9_unixsrc.tar.bz2; - sha256 = "0nij6kyzwxf7nblwd6riwqhzh8b8xwdffpj379zi5y9mcmiwmalr"; + url = mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2; + sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d"; }; + + # for the builder script + inherit xauth; + buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth]; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix new file mode 100644 index 000000000000..338bc16d85d1 --- /dev/null +++ b/pkgs/tools/compression/lrzip/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, zlib, lzo, bzip2, nasm}: + +stdenv.mkDerivation { + name = "lrzip-0.23"; + + src = fetchurl { + url = http://ck.kolivas.org/apps/lrzip/lrzip-0.23.tar.bz2; + sha256 = "52514a46228266230760fe8f7da9dd669b4c82160e9c238f029cd535d0988065"; + }; + + NIX_CFLAGS_COMPILE = "-isystem ${zlib}/include"; + + buildInputs = [ zlib lzo bzip2 nasm ]; + + meta = { + homepage = http://ck.kolivas.org/apps/lrzip/; + description = "The CK LRZIP compression program (LZMA + RZIP)"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix new file mode 100644 index 000000000000..8c4547753aa3 --- /dev/null +++ b/pkgs/tools/compression/rzip/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, bzip2}: + +stdenv.mkDerivation { + name = "rzip-2.1"; + src = fetchurl { + url = http://rzip.samba.org/ftp/rzip/rzip-2.1.tar.gz; + sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; + }; + buildInputs = [ bzip2 ]; + + meta = { + homepage = http://rzip.samba.org/; + description = "The RZIP compression program"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix index 3457a0ab4023..d6e7c0a42182 100644 --- a/pkgs/tools/graphics/dmtx/default.nix +++ b/pkgs/tools/graphics/dmtx/default.nix @@ -3,15 +3,16 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.getAttr ["version"] "0.5.2" args; + version = lib.getAttr ["version"] "0.7.0" args; buildInputs = with args; [ - libpng libtiff + libpng libtiff libjpeg librsvg imagemagick pkgconfig + zlib libX11 bzip2 ]; in rec { src = fetchurl { url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2"; - sha256 = "1xx61gykmq07m2vkqazns5whj8rv9nhwhjs6dakz9ai4qh7d53qz"; + sha256 = "00w0pvpbwqqa1c8s85v8vf8w1x116yh7qg5fplxj5jhmfizcama2"; }; inherit buildInputs; diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix new file mode 100644 index 000000000000..e799e5118f9e --- /dev/null +++ b/pkgs/tools/networking/iperf/default.nix @@ -0,0 +1,17 @@ +args: with args; +stdenv.mkDerivation { + name = "iperf-2.0.4"; + + src = args.fetchurl { + url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz; + sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv"; + }; + +#buildInputs =(with args; []); + + meta = { + homepage = ""; + description = "tool to measure IP bandwidth using UDP or TCP"; + license = "as-is"; + }; +} diff --git a/pkgs/tools/networking/tcng/default.nix b/pkgs/tools/networking/tcng/default.nix new file mode 100644 index 000000000000..e0f66df830d2 --- /dev/null +++ b/pkgs/tools/networking/tcng/default.nix @@ -0,0 +1,86 @@ +args: with args; + +# tcc can even compile kernel modules for speed reason. +# that would be a nice use case to test! + +# something is still wrong. The output can't be pasred sometimes +# Eg it contains continue/pass,drop/pass, drop/drop. I've replaced +# them by ok, drop, drop using sed. I'm not sure wether this is the correct way +# Man pages are missing as well. So use the link at the bottom + +let version = "10b"; in + +args.stdenv.mkDerivation { + + name = "tcng-${version}"; + + src = fetchurl { + url = mirror://debian/pool/main/t/tcng/tcng_10b.orig.tar.gz; + sha256 = "1xjs0yn90rfa8ibxybg3gab1xzcjg60njymq2bd1b0a9i0arx7ji"; + }; + + iproute2Src=iproute.src; + + patches = [ + (fetchurl { + url = mirror://debian/pool/main/t/tcng/tcng_10b-2.diff.gz; + sha256 = "17i4s2ffif0k4b78gfhkp08lvvharbfvyhwbd0vkwgpria0b9zrd"; + })]; + + # one mailinglist post says you should just add your kernel version to the list.. (?) + patchPhase = '' + unset patchPhase + patchPhase + unpackFile $iproute2Src + IPROUTESRC=$(echo iproute*) + for script in $(find . -type f); do sed -e 's@#![ ]*/bin/bash@#! /bin/sh@' -i $script; done + find . -type f | xargs sed -i 's@/usr/bin/perl@${perl}/bin/perl@g' + find . -type f | xargs sed -i 's@/lib/cpp@cpp@g' + ''; + + + # gentoo ebulid says tcsim doesn't compile with 2.6 headers.. + # DATADIR can still be overridden by env TOPDIR=... + # Don't know whats it for except including the default .tc files + configurePhase='' + cat >> config << EOF + YACC="yacc" + DATA_DIR="$out/lib/tcng" + EOF + ./configure \ + --kernel ${kernel}/lib/modules/2.6.28.6-default/build \ + --iproute2 $IPROUTESRC \ + --install-directory $out \ + --no-manual \ + --with-tcsim + ''; + + + # hacky, how to enable building tcc the correct way? + # adding shared and tcc to SUBDIRS and run make again isn't nice but works + buildPhase = '' + sed -i 's@^\(SUBDIRS.*\)@\1 shared tcc@' Makefile + make; + ''; + + # manually copy tcc and include files.. see comment above + installPhase = '' + ensureDir $out{,/sbin,/lib/tcng/include} + make DESTDIR=$out install + cp tcc/tcc $out/sbin + cp tcc/*.tc $out/lib/tcng/include + ''; + + buildInputs =(with args; [bison flex db4 perl]); + + meta = { + description="tcng - Traffic Control Next Generation"; + homepage = "http://tcng.sourceforge.net/"; + license = "GPLv2"; + longDescription = '' + useful links: http://linux-ip.net/articles/Traffic-Control-HOWTO, + http://blog.edseek.com/~jasonb/articles/traffic_shaping/ + tcng language: http://linux-ip.net/gl/tcng/node9.html tcng language + ''; + }; +} diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix new file mode 100644 index 000000000000..dbf13a6332b5 --- /dev/null +++ b/pkgs/tools/text/multitran/data/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl} : + +# This package requires a locale ru_RU.cp1251 locale entry. +# Waiting for a better idea, I created it modifying a store file using: +# localedef -f CP1251 -i ru_RU ru_RU.CP1251 +# The store file mentioned is in "${glibc}/lib/locale/locale-archive" + +stdenv.mkDerivation { + name = "multitran-data-0.3"; + src = fetchurl { + url = mirror://sourceforge/multitran/multitran-data.tar.bz2; + sha256 = "9c2ff5027c2fe72b0cdf056311cd7543f447feb02b455982f20d4a3966b7828c"; + }; + + patchPhase = '' + sed -i -e 's@\$(DESTDIR)/usr@'$out'@' Makefile + ''; + + meta = { + homepage = http://multitran.sourceforge.net/; + description = "Multitran data english-russian"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix new file mode 100644 index 000000000000..45dcf922d8e8 --- /dev/null +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation { + name = "libbtree-0.0.1alpha2"; + src = fetchurl { + url = mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2; + sha256 = "34a584e45058950337ff9342693b6739b52c3ce17e66440526c4bd6f9575802c"; + }; + patchPhase = '' + sed -i -e 's@\$(DESTDIR)/usr@'$out'@' src/Makefile; + ''; + + meta = { + homepage = http://multitran.sourceforge.net/; + description = "Multitran lib: library for reading Multitran's BTREE database format"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix new file mode 100644 index 000000000000..2111a2b8dc1d --- /dev/null +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, libmtsupport} : + +stdenv.mkDerivation { + name = "libfacet-0.0.1alpha2"; + src = fetchurl { + url = mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2; + sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; + }; + + buildInputs = [ libmtsupport ]; + + patchPhase = '' + sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \ + -e 's@/usr/include/mt/support@${libmtsupport}/include/mt/support@' \ + src/Makefile; + ''; + + + meta = { + homepage = http://multitran.sourceforge.net/; + description = "Multitran lib: enchanced locale facets"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix new file mode 100644 index 000000000000..fe3e3b7317d2 --- /dev/null +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } : + +stdenv.mkDerivation { + name = "libmtquery-0.0.1alpha3"; + src = fetchurl { + url = mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2; + sha256 = "e24c7c15772445f1b14871928d84dd03cf93bd88f9d2b2ed1bf0257c2cf2b15e"; + }; + + buildInputs = [ libmtsupport libfacet libbtree multitrandata ]; + + patchPhase = '' + sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \ + -e 's@/usr/include/mt/support@${libmtsupport}/include/mt/support@' \ + -e 's@/usr/include/btree@${libbtree}/include/btree@' \ + -e 's@/usr/include/facet@${libfacet}/include/facet@' \ + src/Makefile testsuite/Makefile; + sed -i -e 's@/usr/share/multitran@${multitrandata}/share/multitran@' src/config.cc + ''; + + meta = { + homepage = http://multitran.sourceforge.net/; + description = "Multitran lib: main engine to query translations"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix new file mode 100644 index 000000000000..3c77b50bee88 --- /dev/null +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation { + name = "libmtsupport-0.0.1alpha2"; + src = fetchurl { + url = mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2; + sha256 = "481f0f1ec15d7274f1e4eb93e7d060df10a181efd037eeff5e8056d283a9298b"; + }; + patchPhase = '' + sed -i -e 's@\$(DESTDIR)/usr@'$out'@' src/Makefile; + ''; + + meta = { + homepage = http://multitran.sourceforge.net/; + description = "Multitran lib: basic useful functions"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix new file mode 100644 index 000000000000..ea957cebb336 --- /dev/null +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} : + +stdenv.mkDerivation { + name = "mt-utils-0.0.1alpha3"; + src = fetchurl { + url = mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2; + sha256 = "e407702c90c5272882386914e1eeca5f6c5039393af9a44538536b94867b0a0e"; + }; + + buildInputs = [ libmtsupport libfacet libbtree libmtquery help2man ]; + + patchPhase = '' + sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \ + -e 's@/usr/include/mt/support@${libmtsupport}/include/mt/support@' \ + -e 's@/usr/include/btree@${libbtree}/include/btree@' \ + -e 's@/usr/include/facet@${libfacet}/include/facet@' \ + -e 's@/usr/include/mt/query@${libmtquery}/include/mt/query@' \ + -e 's@-lmtquery@-lmtquery -lmtsupport -lfacet@' \ + src/Makefile; + # Fixing multibyte locale output + sed -i -e 's@message.length()@message.length()*5@' \ + src/converter.cc; + ''; + + meta = { + homepage = http://multitran.sourceforge.net/; + description = "Multitran: simple command line utilities for dictionary maintainance"; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1794517af381..2e4a04cef97b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -447,7 +447,8 @@ let }; bibtextools = import ../tools/typesetting/bibtex-tools { - inherit fetchurl stdenv aterm tetex hevea sdf strategoxt; + inherit fetchurl stdenv aterm tetex hevea; + inherit (strategoPackages016) strategoxt sdf; }; bittorrent = import ../tools/networking/p2p/bittorrent { @@ -833,6 +834,10 @@ let inherit stdenv fetchurl zlib nettools; }; + iperf = import ../tools/networking/iperf { + inherit fetchurl stdenv; + }; + jdiskreport = import ../tools/misc/jdiskreport { inherit fetchurl stdenv unzip jdk; }; @@ -887,6 +892,10 @@ let inherit fetchurl stdenv ghostscript; }; + lrzip = import ../tools/compression/lrzip { + inherit fetchurl stdenv zlib lzo bzip2 nasm; + }; + lzma = import ../tools/compression/lzma { inherit fetchurl stdenv; }; @@ -949,6 +958,34 @@ let inherit fetchurl stdenv gettext; }; + multitran = recurseIntoAttrs (let + inherit fetchurl stdenv help2man; + in rec { + multitrandata = import ../tools/text/multitran/data { + inherit fetchurl stdenv; + }; + + libbtree = import ../tools/text/multitran/libbtree { + inherit fetchurl stdenv; + }; + + libmtsupport = import ../tools/text/multitran/libmtsupport { + inherit fetchurl stdenv; + }; + + libfacet = import ../tools/text/multitran/libfacet { + inherit fetchurl stdenv libmtsupport; + }; + + libmtquery = import ../tools/text/multitran/libmtquery { + inherit fetchurl stdenv libmtsupport libfacet libbtree multitrandata; + }; + + mtutils = import ../tools/text/multitran/mtutils { + inherit fetchurl stdenv libmtsupport libfacet libbtree libmtquery help2man; + }; + }); + mysql2pgsql = import ../tools/misc/mysql2pgsql { inherit fetchurl stdenv perl shebangfix; }; @@ -1127,6 +1164,10 @@ let inherit fetchurl stdenv; }; + rzip = import ../tools/compression/rzip { + inherit fetchurl stdenv bzip2; + }; + sablotron = import ../tools/text/xml/sablotron { inherit fetchurl stdenv expat; }; @@ -1214,6 +1255,11 @@ let inherit fetchurl stdenv libpcap; }; + tcng = import ../tools/networking/tcng { + inherit fetchurl stdenv iproute bison flex db4 perl; + kernel = kernel_2_6_28; + }; + telnet = import ../tools/networking/telnet { inherit fetchurl stdenv ncurses; }; @@ -1366,6 +1412,12 @@ let interactive = true; }); + bash4 = appendToName "interactive" (import ../shells/bash/4.0.nix { + inherit fetchurl stdenv ncurses texinfo bison; + readline = readline6; + interactive = true; + }); + tcsh = import ../shells/tcsh { inherit fetchurl stdenv ncurses; }; @@ -1763,13 +1815,6 @@ let inherit gmp; }; - javafront = import ../development/compilers/java-front { - inherit stdenv fetchurl pkgconfig; - sdf = sdf24; - aterm = aterm25; - strategoxt = strategoxt017; - }; - #TODO add packages http://cvs.haskell.org/Hugs/downloads/2006-09/packages/ and test # commented out because it's using the new configuration style proposal which is unstable hugs = import ../development/compilers/hugs { @@ -1903,24 +1948,15 @@ let inherit (xlibs) libX11; }; - strategoLibraries = import ../development/compilers/strategoxt/libraries/stratego-libraries-0.17pre.nix { - inherit stdenv fetchurl pkgconfig aterm; - }; + strategoPackages = strategoPackages017; - strategoxt = import ../development/compilers/strategoxt { - inherit fetchurl pkgconfig sdf aterm; + strategoPackages016 = import ../development/compilers/strategoxt/0.16.nix { + inherit fetchurl pkgconfig aterm getopt; stdenv = overrideInStdenv stdenv [gnumake380]; }; - strategoxt017 = import ../development/compilers/strategoxt/strategoxt-0.17.nix { - inherit fetchurl pkgconfig; - sdf = sdf24; - aterm = aterm25; - stdenv = overrideInStdenv stdenv [gnumake380]; - }; - - strategoxtUtils = import ../development/compilers/strategoxt/utils { - inherit fetchurl pkgconfig stdenv aterm sdf strategoxt; + strategoPackages017 = import ../development/compilers/strategoxt/0.17.nix { + inherit fetchurl stdenv pkgconfig aterm getopt jdk; }; swiProlog = composedArgsAndFun (selectVersion ../development/compilers/swi-prolog "5.6.51") { @@ -1931,26 +1967,12 @@ let inherit fetchurl stdenv perl texinfo; }; - transformers = import ../development/compilers/transformers { - inherit fetchurl pkgconfig sdf stlport aterm; - - stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; - - strategoxt = import ../development/compilers/strategoxt/strategoxt-0.14.nix { - inherit fetchurl pkgconfig sdf aterm; - stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; - }; - }; - visualcpp = import ../development/compilers/visual-c++ { inherit fetchurl stdenv cabextract; }; webdsl = import ../development/compilers/webdsl { - inherit stdenv fetchurl pkgconfig javafront; - aterm = aterm25; - sdf = sdf24; - strategoxt = strategoxt017; + inherit stdenv fetchurl pkgconfig strategoPackages; }; win32hello = import ../development/compilers/visual-c++/test { @@ -2211,7 +2233,7 @@ let inherit cabal perl; }; - antlr = import ../development/tools/parsing/antlr/antlr-2.7.6.nix { + antlr = import ../development/tools/parsing/antlr/2.7.7.nix { inherit fetchurl stdenv jdk python; }; @@ -2519,21 +2541,6 @@ let inherit fetchurl stdenv python makeWrapper; }; - sdf = import ../development/tools/parsing/sdf { - inherit fetchurl aterm getopt pkgconfig; - # Note: sdf2-bundle currently requires GNU make 3.80; remove - # explicit dependency when this is fixed. - stdenv = overrideInStdenv stdenv [gnumake380]; - }; - - sdf24 = import ../development/tools/parsing/sdf/sdf2-bundle-2.4.nix { - inherit fetchurl getopt pkgconfig; - aterm = aterm25; - # Note: sdf2-bundle currently requires GNU make 3.80; remove - # explicit dependency when this is fixed. - stdenv = overrideInStdenv stdenv [gnumake380]; - }; - sloccount = import ../development/tools/misc/sloccount { inherit fetchurl stdenv perl; }; @@ -2658,15 +2665,15 @@ let inherit fetchurl stdenv aspell which; }); - aterm = aterm242fixes; + aterm = aterm25; - aterm242fixes = import ../development/libraries/aterm/2.4.2-fixes.nix { + aterm242fixes = lowPrio (import ../development/libraries/aterm/2.4.2-fixes.nix { inherit fetchurl stdenv; - }; + }); - aterm25 = lowPrio (import ../development/libraries/aterm/2.5.nix { + aterm25 = import ../development/libraries/aterm/2.5.nix { inherit fetchurl stdenv; - }); + }; aterm28 = lowPrio (import ../development/libraries/aterm/2.8.nix { inherit fetchurl stdenv; @@ -2751,7 +2758,7 @@ let inherit (gtkLibs) glib; inherit (xlibs) libX11; }; - + coredumper = import ../development/libraries/coredumper { inherit fetchurl stdenv; }; @@ -3161,8 +3168,7 @@ let intltool = gnome.intltool; jasper = import ../development/libraries/jasper { - inherit fetchurl stdenv unzip libjpeg freeglut mesa; - inherit (xlibs) xproto libX11 libICE libXmu libXi libXext libXt; + inherit fetchurl stdenv unzip xlibs libjpeg; }; lablgtk = import ../development/libraries/lablgtk { @@ -5672,7 +5678,7 @@ let }; propagatedBuildInputs = [ perlTestDeep perlTestException perlTestWarn - ]; + ]; }; perlSQLAbstractLimit = buildPerlPackage rec { @@ -6428,15 +6434,9 @@ let inherit fetchurl stdenv apacheHttpd jdk; }; - # This function is typically called by the NixOS Upstart job to specify the - # right UID/GID for `portmap'. - makePortmap = { daemonUser ? false, daemonGID ? false, daemonUID ? false }: - (import ../servers/portmap { - inherit fetchurl stdenv lib tcpWrapper - daemonUser daemonGID daemonUID; - }); - - portmap = (makePortmap); + portmap = makeOverridable (import ../servers/portmap) { + inherit fetchurl stdenv lib tcpWrapper; + }; mysql4 = import ../servers/sql/mysql { inherit fetchurl stdenv ncurses zlib perl; @@ -7872,7 +7872,9 @@ let }; dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { - inherit libpng libtiff; + inherit libpng libtiff libjpeg imagemagick librsvg + pkgconfig bzip2 zlib; + inherit (xlibs) libX11; }; dvdauthor = import ../applications/video/dvdauthor { @@ -8203,6 +8205,14 @@ let inherit (xlibs) libX11; }; + # Impressive, formerly known as "KeyJNote". + impressive = import ../applications/office/impressive { + inherit fetchurl stdenv xpdf pil pyopengl pygame makeWrapper lib python; + + # XXX These are the PyOpenGL dependencies, which we need here. + inherit setuptools mesa freeglut; + }; + inkscape = import ../applications/graphics/inkscape { inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib popt libxml2 libxslt libpng boehmgc fontconfig @@ -8239,13 +8249,6 @@ let inherit stdenv fetchurl kdelibs x11 zlib libpng libjpeg perl qt3; }; - keyjnote = import ../applications/office/keyjnote { - inherit fetchurl stdenv xpdf pil pyopengl pygame makeWrapper lib python; - - # XXX These are the PyOpenGL dependencies, which we need here. - inherit setuptools mesa freeglut; - }; - kino = import ../applications/video/kino { inherit fetchurl stdenv pkgconfig libxml2 perl perlXMLParser libdv libraw1394 libavc1394 libiec61883 x11 gettext cairo; /* libavformat */ @@ -9250,7 +9253,7 @@ let kdelibs = kde3.kdelibs; kdebase = kde3.kdebase; - + ### SCIENCE/GEOMETRY drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) { @@ -9621,11 +9624,18 @@ let sqlite subversion pysqlite; }; - wine = import ../misc/emulators/wine { - inherit fetchurl stdenv flex bison mesa ncurses - libpng libjpeg alsaLib lcms xlibs freetype - fontconfig fontforge libxml2 libxslt openssl; - }; + wine = + if system == "x86_64-linux" then + # Can't build this in 64-bit; use a 32-bit build instead. + (import ./all-packages.nix {system = "i686-linux";}).wine + # some hackery to make nix-env show this package on x86_64... + // {system = "x86_64-linux";} + else + import ../misc/emulators/wine { + inherit fetchurl stdenv flex bison mesa ncurses + libpng libjpeg alsaLib lcms xlibs freetype + fontconfig fontforge libxml2 libxslt openssl; + }; xosd = import ../misc/xosd { inherit fetchurl stdenv; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 69c2a4ecc122..b35c55630785 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -320,10 +320,7 @@ let openoffice pidgin postgresql_jdbc - sdf splashutils_15 - strategoxt - strategoxtUtils syslinux tinycc uml |